From 8408ba671c704f6ad75148eb595aa9dbfb60abd3 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 18 Mar 2019 21:08:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=90=8E=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/SysLabelTemplateController.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java index 25228b6..501d4f9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java @@ -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()); From b853f785a41e247fe797d0dfe2b6673dc9f61462 Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 19 Mar 2019 13:30:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=8C=E8=A7=92=E8=89=B2=E5=BE=AE=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=8F=90=E4=BE=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/PersonnelController.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index 051f433..c3cbe84 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -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,19 @@ public class PersonnelController extends CoreBaseController { } } + @PostMapping(value = "/role/get-role-list") + @ApiOperation(value = "根据条件分页查询用户角色信息", notes = "根据条件分页查询用户角色信息") + public ResultBean queryPagerByRoleInfo(@RequestBody UserRolePagerModel model){ + try { + ListPager 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()); + } + } + /** * 数据必填校验 * @param model From 0b67e5b7490f8d62c9473cbbcb9d812f6edddc05 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 20 Mar 2019 09:20:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E5=BE=AE?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/controller/busi/PersonnelController.java | 13 +++++++++++++ .../serviceimpl/busi/PersonnelServiceService.java | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index c3cbe84..d42e992 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -481,6 +481,19 @@ public class PersonnelController extends CoreBaseController { } } + @PostMapping(value = "/pager/get-user-list") + @ApiOperation(value = "根据条件分页查询用户信息", notes = "根据条件分页查询用户信息") + public ResultBean queryPagerByUserInfo(@RequestBody UserDetailPagerModel model){ + try { + ListPager 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 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index c406377..7d4bc2a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -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 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