I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
yun-zuoyi
yunhao.wang 6 years ago
parent e3454af8f6 0b67e5b749
commit fd74559fd8
3 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File

31
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.tool.EncryptTool;
import cn.estsh.i3plus.platform.common.tool.StringTool;
@ -13,6 +14,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
import cn.estsh.i3plus.pojo.model.platform.UserDetailPagerModel;
import cn.estsh.i3plus.pojo.model.platform.UserRolePagerModel;
import cn.estsh.i3plus.pojo.platform.bean.*;
import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
@ -51,6 +53,9 @@ public class PersonnelController extends CoreBaseController {
@Autowired
private ISysFileService fileService;
@Autowired
private ISysRoleService sysRoleService;
@PostMapping(value="/user-detail/insert")
@ApiOperation(value="添加用户信息",notes="返回内容添加用户信息")
public ResultBean insertUserDetailModel(UserDetailModel model) {
@ -463,6 +468,32 @@ public class PersonnelController extends CoreBaseController {
}
}
@PostMapping(value = "/role/get-role-list")
@ApiOperation(value = "根据条件分页查询用户角色信息", notes = "根据条件分页查询用户角色信息")
public ResultBean queryPagerByRoleInfo(@RequestBody UserRolePagerModel model){
try {
ListPager<SysRole> listPager = sysRoleService.querySysRole(model.getSysRole(), model.getPager());
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(listPager);
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@PostMapping(value = "/pager/get-user-list")
@ApiOperation(value = "根据条件分页查询用户信息", notes = "根据条件分页查询用户信息")
public ResultBean queryPagerByUserInfo(@RequestBody UserDetailPagerModel model){
try {
ListPager<SysUserInfo> listPager = personnelService.querySysUserInfo(model.getUserDetailModel(), model.getPager());
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(listPager);
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
/**
* 数据必填校验
* @param model

18
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java
Unescape Escape View File

@ -172,14 +172,7 @@ public class SysLabelTemplateController extends CoreBaseController {
@ApiOperation(value = "根据打印模板编号查询模板参数",notes = "根据打印模板编号查询模板参数")
public ResultBean getSysLabelTemplateByTemplateId(@PathVariable("id") String id) {
try {
if (StringUtils.isBlank(id)) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
.setErrorDetail("打印模板编号为空")
.setErrorSolution("请检查打印模板编号")
.build();
}
ValidatorBean.checkNotNull(id, "打印模板编号不能为空");
return ResultBean.success("操作成功").setResultList(sysLabelTemplateService.listSysLabelTemplateParam(id))
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@ -194,14 +187,7 @@ public class SysLabelTemplateController extends CoreBaseController {
@ApiOperation(value = "根据打印模板编号查询模板",notes = "根据打印模板编号查询模板")
public ResultBean getSysLabelTemplateInfoById(@PathVariable("id") String id) {
try {
if (StringUtils.isBlank(id)) {
throw ImppExceptionBuilder.newInstance()
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorDetail("打印模板编号为空")
.setErrorSolution("请检查打印模板编号")
.build();
}
ValidatorBean.checkNotNull(id, "打印模板编号不能为空");
return ResultBean.success("操作成功").setResultObject(sysLabelTemplateService.getLabelTemplateInfoById(id))
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());

4
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java
Unescape Escape View File

@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
import cn.estsh.i3plus.pojo.platform.bean.*;
import cn.estsh.i3plus.pojo.platform.repository.*;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.i3plus.pojo.wms.sqlpack.WmsHqlPack;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@ -197,7 +198,8 @@ public class PersonnelServiceService implements IPersonnelService {
@Override
public ListPager<SysUserInfo> querySysUserInfo(UserDetailModel model, Pager pager) {
return null;
pager = PagerHelper.getPager(pager, userInfoRDao.findByHqlWhereCount(CoreHqlPack.packHqlSysUserInfo(model.getSysUserInfo())));
return new ListPager<>(userInfoRDao.findByHqlWherePage(CoreHqlPack.packHqlSysUserInfo(model.getSysUserInfo()), pager), pager);
}
@Override

Write Preview
Loading…
Cancel
Save