From 4c4d181faf3c76e110c7bc7c5424e7dba1ef8cde Mon Sep 17 00:00:00 2001 From: liao Date: Thu, 14 Sep 2023 17:00:15 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=9B=BD=E5=86=85=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E7=94=9F=E6=88=90=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/laws/common/constant/FieldCommon.java | 8 ++++---- .../laws/common/service/ILawsCommonService.java | 2 +- .../common/service/impl/LawsCommonServiceImpl.java | 10 +++++++--- .../standard/controller/LawsDomesticController.java | 2 +- .../standard/controller/LawsOverseasController.java | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java index dba7d515..bd45f717 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java @@ -48,10 +48,10 @@ public class FieldCommon { public static final String YEAR_NUMBER = "year_number"; // 标准名称 public static final String STANDARD_NAME = "standard_name"; - // 国标 - public static final String GB = "GB"; - // 外标 - public static final String FB = "FB"; + // 标准类别 + public static final String STANDARD_CLASS = "standard_class"; + // 字典值统一后缀 + public static final String _DICT_TEXT = "_dictText"; // 树节点编码 public static final String NODE_CODE = "nodeCode"; // 分隔符 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java index 8570f1ed..53ab16a3 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java @@ -90,5 +90,5 @@ public interface ILawsCommonService { * @Date: 2023/9/14 15:42 * @Description: 生成法规编号 **/ - void setStandardNumber(Map parameterMap, String type); + void setStandardNumber(Map parameterMap); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 276e1bdb..1cf8d68a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -496,11 +496,16 @@ public class LawsCommonServiceImpl implements ILawsCommonService { * @Description: 生成法规编号 **/ @Override - public void setStandardNumber(Map parameterMap, String type) { + public void setStandardNumber(Map parameterMap) { + // 标准类别 + String standardClass = (String) parameterMap.get(FieldCommon.STANDARD_CLASS); // 法规编号不能为空 String standardNumber = (String) parameterMap.get(FieldCommon.STANDARD_NUMBER); // 年代号 String yearNumber = (String) parameterMap.get(FieldCommon.YEAR_NUMBER); + if (StringUtils.isBlank(standardClass)) { + throw new JeroBootException(ResultCommon.EMPTY_COMMON, FieldCommon.STANDARD_CLASS); + } if (StringUtils.isBlank(standardNumber)) { throw new JeroBootException(ResultCommon.EMPTY_STANDARD_NUMBER, ""); } @@ -508,8 +513,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { throw new JeroBootException(ResultCommon.EMPTY_COMMON, FieldCommon.YEAR_NUMBER); } // 最后生成的法规编号 - standardNumber = type + standardNumber + "-" + yearNumber; - + standardNumber = standardClass + standardNumber + "-" + yearNumber; parameterMap.put(FieldCommon.STANDARD_NUMBER, standardNumber); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index f58fdb27..5416859d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -68,7 +68,7 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-新增数据", notes="国内法规标准-新增数据") @PostMapping(value = "/commonAdd") public Result commonAdd(@RequestBody Map parameterMap) { - lawsCommonService.setStandardNumber(parameterMap, FieldCommon.GB); + lawsCommonService.setStandardNumber(parameterMap); parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.commonAdd(parameterMap)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index 2f06b590..b03f1bf4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -66,7 +66,7 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-新增数据", notes="海外法规标准-新增数据") @PostMapping(value = "/commonAdd") public Result commonAdd(@RequestBody Map parameterMap) { - lawsCommonService.setStandardNumber(parameterMap, FieldCommon.FB); + lawsCommonService.setStandardNumber(parameterMap); parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.commonAdd(parameterMap)); }