From 33de5b5291ebd7ea4d8bf559407e98cdad946df0 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 18 Mar 2019 19:53:07 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index cacede1..caa9081 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -1,15 +1,15 @@ #项目端口 server.port=8100 #本机ip -impp.server.ip=192.168.1.20 +impp.server.ip=192.168.1.56 #console控制台服务（zipkin追踪全路径） -impp.console.ip=http://192.168.1.20:8010 +impp.console.ip=http://192.168.1.56:8010 ################ 功能配置1 ################ #若无法连接注册中心，是否需要一直检测加入 impp.cluster.fetch=true #服务注册中心 -impp.cluster.regist.center=http://192.168.1.20:8000/eureka/ +impp.cluster.regist.center=http://192.168.1.56:8000/eureka/ #多注册中心 #impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/ From ffb6a92e487129531676afc7fe4d5372414a4ace Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 18 Mar 2019 19:53:30 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/iservice/busi/ISysDictionaryService.java | 6 ++-- .../controller/busi/SysDictionaryController.java | 39 ++++++++++++++-------- .../serviceimpl/busi/SysDictionaryService.java | 18 +++++----- .../core/apiservice/util/BarcodeParseUtil.java | 2 +- 4 files changed, 39 insertions(+), 26 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java index 9f1d1fa..dcb3ed9 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java @@ -53,12 +53,12 @@ public interface ISysDictionaryService { SysDictionary getSysDictionaryById(Long id); /** - * 根据父级代码查询字典项信息 + * 根据微服务与父级代码查询字典项 * @param parentCode * @return */ - @ApiOperation(value = "根据父级代码查询字典项信息") - List findSysDictionaryByParentCode(String parentCode); + @ApiOperation(value = "根据微服务与父级代码查询字典项") + List findSysDictionaryBySoftTypeAndParentCode(Integer softType,String parentCode); /** * 字典复杂查询，分页，排序 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index b29a18e..36dc533 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -53,6 +53,7 @@ public class SysDictionaryController extends CoreBaseController{ ValidatorBean.beginValid(sysDictionary) .notNull("id",sysDictionary.getId()) .notNull("name",sysDictionary.getName()) + .notNull("softType",sysDictionary.getSoftType()) .notNull("dictionaryCode",sysDictionary.getDictionaryCode()) .notNull("dictionaryValue",sysDictionary.getDictionaryValue()); @@ -78,6 +79,7 @@ public class SysDictionaryController extends CoreBaseController{ // 条件验证 ValidatorBean.beginValid(sysDictionary) .notNull("name",sysDictionary.getName()) + .notNull("softType",sysDictionary.getSoftType()) .notNull("dictionaryCode",sysDictionary.getDictionaryCode()) .notNull("dictionaryValue",sysDictionary.getDictionaryValue()); @@ -159,11 +161,11 @@ public class SysDictionaryController extends CoreBaseController{ } } - @GetMapping(value = "/find/{code}") - @ApiOperation(value = "根据父级code查询字典项", notes = "根据父级code查询字典项") - public ResultBean findSysDictionaryByParentCode(@PathVariable("code") String code) { + @GetMapping(value = "/find/{softType}/{code}") + @ApiOperation(value = "根据微服务与父级code查询字典项", notes = "根据微服务与父级code查询字典项") + public ResultBean findSysDictionaryByParentCode(@PathVariable("softType")Integer softType,@PathVariable("code") String code) { try { - List sysDictionaryList = sysDictionaryService.findSysDictionaryByParentCode(code); + List sysDictionaryList = sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode(softType,code); return ResultBean.success("操作成功").setResultList(sysDictionaryList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -176,16 +178,25 @@ public class SysDictionaryController extends CoreBaseController{ @ApiOperation(value = "查询跟用户相关所有字典") public ResultBean findSysDictionaryUserInfo() { try { - Map resultMap = new HashMap<>(); - resultMap.put("1",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_SEX)); - resultMap.put("2",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_FILE_TYPE)); - resultMap.put("3",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_MARRIAGE)); - resultMap.put("4",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_EDUCATION)); - resultMap.put("5",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_NATIONALITY)); - resultMap.put("6",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_CERTIFICATE_TYPE)); - resultMap.put("7",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_EMPLOYEE_GRADE)); - resultMap.put("8",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_POLITICAL_STATUS)); - resultMap.put("9",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_EMPLOYEE_TYPE)); + Map resultMap = new HashMap<>(); + resultMap.put("1", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_SEX)); + resultMap.put("2", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_FILE_TYPE)); + resultMap.put("3", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_MARRIAGE)); + resultMap.put("4", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_EDUCATION)); + resultMap.put("5", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_NATIONALITY)); + resultMap.put("6", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_CERTIFICATE_TYPE)); + resultMap.put("7", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_EMPLOYEE_GRADE)); + resultMap.put("8", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_POLITICAL_STATUS)); + resultMap.put("9", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_EMPLOYEE_TYPE)); return ResultBean.success("操作成功").setResultMap(resultMap).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java index 3ddda96..eb728f1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java @@ -40,9 +40,10 @@ public class SysDictionaryService implements ISysDictionaryService { @Override @ApiOperation(value = "添加字典") public void insertSysDictionary(SysDictionary sysDictionary) { - long repeatCodeCount = sysDictionaryRDao.findByPropertyCount("dictionaryCode",sysDictionary.getDictionaryCode()); - long repeatValueCount = sysDictionaryRDao.findByPropertyCount(new String[]{"parentId","dictionaryValue"}, - new Object[]{sysDictionary.getParentId(),sysDictionary.getDictionaryValue()}); + long repeatCodeCount = sysDictionaryRDao.findByPropertyCount(new String[]{"dictionaryCode", "softType"}, + new Object[]{sysDictionary.getDictionaryCode(), sysDictionary.getSoftType()}); + long repeatValueCount = sysDictionaryRDao.findByPropertyCount(new String[]{"parentId", "dictionaryValue", "softType"}, + new Object[]{sysDictionary.getParentId(), sysDictionary.getDictionaryValue(), sysDictionary.getSoftType()}); if (repeatCodeCount > 0 || repeatValueCount > 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) @@ -87,8 +88,8 @@ public class SysDictionaryService implements ISysDictionaryService { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) - .setErrorDetail("字典代码已存在") - .setErrorSolution("请重新输入字典代码") + .setErrorDetail("字典代码或字典值已存在") + .setErrorSolution("请重新输入字典代码或字典值") .build(); } @@ -132,9 +133,9 @@ public class SysDictionaryService implements ISysDictionaryService { @Override @ApiOperation(value = "根据父级代码查询字典项信息") - public List findSysDictionaryByParentCode(String parentCode) { + public List findSysDictionaryBySoftTypeAndParentCode(Integer softType,String parentCode) { LOGGER.info("字典 SYS_DICTIONARY parentCode:{}",parentCode); - return sysDictionaryRDao.findByProperty("parentCodeRdd",parentCode); + return sysDictionaryRDao.findByProperty(new String[]{"softType", "parentCodeRdd"}, new Object[]{softType, parentCode}); } @Override @@ -173,7 +174,8 @@ public class SysDictionaryService implements ISysDictionaryService { @Override @ApiOperation(value = "检出文件名称是否符合系统规范") public boolean checkFileName(String fileName) { - List list = findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_FILE_TYPE); + List list = findSysDictionaryBySoftTypeAndParentCode(CommonEnumUtil.SOFT_TYPE.CORE.getValue(), + BaseConstWords.DICTIONARY_FILE_TYPE); if(list != null && list.size()> 0){ String suffix = StringTool.getStringFileSuffix(fileName,true); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java index 7c310de..f0a8d61 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java @@ -36,9 +36,9 @@ public class BarcodeParseUtil { } //特殊分隔符处理 + barcodeRule.setBarcodeSeparator(barcodeRule.getBarcodeSeparator().replaceAll("\\\\","\\\\\\\\")); barcodeRule.setBarcodeSeparator(barcodeRule.getBarcodeSeparator().replaceAll("\\|","\\\\|")); barcodeRule.setBarcodeSeparator(barcodeRule.getBarcodeSeparator().replaceAll("\\.","\\\\.")); - barcodeRule.setBarcodeSeparator(barcodeRule.getBarcodeSeparator().replaceAll("\\\\","\\\\\\\\")); // 分隔条码信息 String[] barcodeKey = barcodeRule.getBarcodeRule().split(barcodeRule.getBarcodeSeparator()); From 8408ba671c704f6ad75148eb595aa9dbfb60abd3 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 18 Mar 2019 21:08:10 +0800 Subject: [PATCH 3/6] =?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 4/6] =?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 5/6] =?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 From e3454af8f6eaf7184f0d4f1affad207dcf82a813 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 20 Mar 2019 09:37:11 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=A0=91=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=20=E5=8D=95=E5=8F=B7=E8=A7=84=E5=88=99=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E4=BC=98=E5=8C=96=20=E5=AD=97=E5=85=B8=E5=BE=AE?= =?UTF-8?q?=E6=9C=8D=E8=B0=83=E7=94=A8=E6=96=B9=E6=B3=95=E5=8F=8A=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/SysDictionaryController.java | 28 ++++++++++++++++++++++ .../core/apiservice/util/OrderNoMakeUtil.java | 14 +++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index 36dc533..b809da5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -25,9 +25,11 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @Description : 字典管理服务 @@ -267,4 +269,30 @@ public class SysDictionaryController extends CoreBaseController{ return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + + @GetMapping("/tree") + @ApiOperation(value = "查询字典树",notes = "查询字典树") + public ResultBean findSysDictionaryTree(){ + try { + // 根据软件类型分组 + Map group = sysDictionaryService.findSysDictionaryByTop().stream().collect(Collectors.groupingBy(SysDictionary::getSoftType)); + + List> dictTree = new ArrayList<>(); + Map child; + for (CommonEnumUtil.SOFT_TYPE softType :CommonEnumUtil.SOFT_TYPE.values()) { + if(group.containsKey(softType.getValue())){ + child = new HashMap(); + child.put("id",softType.getCode()); + child.put("name",softType.getValue()); + child.put("childList",group.get(softType.getValue())); + dictTree.add(child); + } + } + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(dictTree); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java index 3dca8cb..4bc4f46 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java @@ -3,7 +3,9 @@ package cn.estsh.i3plus.core.apiservice.util; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; -import com.alibaba.fastjson.JSON; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import org.apache.commons.lang3.StringUtils; import java.text.MessageFormat; import java.text.SimpleDateFormat; @@ -18,8 +20,16 @@ import java.text.SimpleDateFormat; public class OrderNoMakeUtil { public static SysOrderNoRule next(SysOrderNoRule orderNoRule) { - StringBuilder orderNo = new StringBuilder(orderNoRule.getOrderNoRule()); + // 数据校验 + if(orderNoRule == null || StringUtils.isBlank(orderNoRule.getOrderNoRule())){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) + .setErrorDetail("单号生成规则不存在") + .build(); + } + StringBuilder orderNo = new StringBuilder(orderNoRule.getOrderNoRule()); String[] dateTime = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(System.currentTimeMillis()).split("-"); // 单号表达式 replace(orderNo, PlatformConstWords.YEAR, dateTime[0]);