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());