Merge branch 'master' into SecondStage

laws-base/laws-base-core/pom.xml

@@ -109,7 +109,7 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>${commons.version}</version>
+			<version>2.16.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java

@@ -257,4 +257,21 @@ public class MarketStandardController {
     public Result<String> getManifestNo(LawsMarketStandard marketStandard) {
         return marketStandardService.getManifestNo(marketStandard);
     }
+
+
+    /**
+     * 修改版本号
+     *
+     * @param lawsMarketStandard
+     * @return
+     */
+    @AutoLog(value = "外部标准库-市场法规清单-修改版本号")
+    @ApiOperation(value = "外部标准库-市场法规清单-修改版本号", notes = "外部标准库-市场法规清单-修改版本号")
+    @ApiOperationSupport(order = 6)
+    @PostMapping(value = "/editManifestVersion")
+    @RequiresPermissions("marketStandard:editVersion")
+    public Result<T> editManifestVersion(@RequestBody LawsMarketStandard lawsMarketStandard) {
+        this.marketStandardService.editManifestVersion(lawsMarketStandard);
+        return Result.OK(ResultCommon.OK);
+    }
 }

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java

@@ -123,7 +123,6 @@ public class LawsMarketStandardDetail implements Serializable {
      * 适用市场
      */
     @Excel(name = "适用市场", width = 15,dicCode = "market_state", mergeVertical = true, mergeRely = {0})
-    @NotBlank(message = "适用适用市场不能为空")
     @ApiModelProperty(value = "适用市场")
     @Dict(dicCode = "market_state")
     private String country;
@@ -172,7 +171,6 @@ public class LawsMarketStandardDetail implements Serializable {
      */
     @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
     @ApiModelProperty(value = "主控部门")
-    @NotBlank(message = "主控部门不能为空")
     @Excel(name = "主控部门", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name", mergeVertical = true, mergeRely = {0})
     private String mainDept;
 
@@ -180,7 +178,6 @@ public class LawsMarketStandardDetail implements Serializable {
      * 主控部门专业模块
      */
     @ApiModelProperty(value = "主控部门专业模块")
-    @NotBlank(message = "主控部门专业模块不能为空")
     @Dict(dicCode = "professional_module")
     @Excel(name = "主控部门专业模块", width = 15, dicCode = "professional_module", mergeVertical = true, mergeRely = {0})
     private String mainDeptProfMode;

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java

@@ -93,38 +93,33 @@ public class LawsMarketStandardDetailExcel implements Serializable {
      * 标准英文名称
      */
     @ApiModelProperty(value = "标准英文名称")
-    @Excel(name = "标准英文名称", width = 15)
     private String standardEnglishName;
 
     /**
      * 新生产车实施日期
      */
-    @Excel(name = "*新生产车实施日期", width = 15)
+    @Excel(name = "新生产车实施日期", width = 15)
-    @NotBlank(message = "新生产车实施日期不能为空")
     @ApiModelProperty(value = "新生产车实施日期")
     private String newProductImplDate;
 
     /**
      * 新认证车实施日期
      */
-    @Excel(name = "*新认证车实施日期", width = 15)
+    @Excel(name = "新认证车实施日期", width = 15)
-    @NotBlank(message = "新认证车实施日期不能为空")
     @ApiModelProperty(value = "新认证车实施日期")
     private String newAuthImplDate;
 
     /**
      * 注册日期
      */
-    @Excel(name = "*注册日期", width = 15)
+    @Excel(name = "注册日期", width = 15)
-    @NotBlank(message = "注册日期不能为空")
     @ApiModelProperty(value = "注册日期")
     private String registrationDate;
 
     /**
      * 适用市场
      */
-    @Excel(name = "*适用市场", width = 15,dicCode = "market_state")
+    @Excel(name = "适用市场", width = 15,dicCode = "market_state")
-    @NotBlank(message = "适用市场不能为空")
     @ApiModelProperty(value = "适用市场")
     @Dict(dicCode = "market_state")
     private String country;
@@ -157,7 +152,6 @@ public class LawsMarketStandardDetailExcel implements Serializable {
      * 类型
      */
     @Dict(dicCode = "type")
-    @Excel(name = "类型", width = 15, dicCode = "type")
     @ApiModelProperty(value = "类型")
     private String type;
 
@@ -174,17 +168,15 @@ public class LawsMarketStandardDetailExcel implements Serializable {
      */
     @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
     @ApiModelProperty(value = "主控部门")
-    @NotBlank(message = "主控部门不能为空")
+    @Excel(name = "主控部门", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
-    @Excel(name = "*主控部门", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
     private String mainDept;
 
     /**
      * 主控部门专业模块
      */
     @ApiModelProperty(value = "主控部门专业模块")
-    @NotBlank(message = "主控部门专业模块不能为空")
     @Dict(dicCode = "professional_module")
-    @Excel(name = "*主控部门专业模块", width = 15, dicCode = "professional_module")
+    @Excel(name = "主控部门专业模块", width = 15, dicCode = "professional_module")
     private String mainDeptProfMode;
 
     /**

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java

@@ -127,4 +127,10 @@ public interface ILawsMarketStandardService extends IService<LawsMarketStandard>
      * @return
      */
     Result<String> getManifestNo(LawsMarketStandard marketStandard);
+
+    /**
+     * 修改版本号
+     * @param marketStandard
+     */
+    void editManifestVersion(LawsMarketStandard marketStandard);
 }

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java

@@ -308,27 +308,15 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
                 String name = ValidUtil.getAnnotation(LawsMarketStandardDetail.class,"standardName");
                 s.append(MessageUtils.getMessage(ResultCommon.DATA_MISMATCH,name)).append(",");
             }
-            // 验证标准英文名称
+            // 带入标准英文名称
-            appendStandardEnglishName(p, s, obj);
+            p.setStandardEnglishName(obj.getStandardEnglishName());
             checkDate(p, s);
-            // 验证类型
+            // 带入类型
-            if(!Objects.equals(StringUtils.isEmpty(obj.getType()) ? "" : obj.getType(),
+            p.setType(obj.getType());
-                    StringUtils.isEmpty(p.getType()) ? "" : p.getType())){
-                String name = ValidUtil.getAnnotation(LawsMarketStandardDetail.class,"type");
-                s.append(MessageUtils.getMessage(ResultCommon.DATA_MISMATCH,name)).append(",");
-            }
         }
         listStandardIdRepeat.add(id);
     }
 
-    private void appendStandardEnglishName(LawsMarketStandardDetail p, StringBuilder s, LawsMarketStandardDetail obj) {
-        if(!Objects.equals(StringUtils.isEmpty(obj.getStandardEnglishName()) ? "" : obj.getStandardEnglishName(),
-                StringUtils.isEmpty(p.getStandardEnglishName()) ? "" : p.getStandardEnglishName())){
-            String name = ValidUtil.getAnnotation(LawsMarketStandardDetail.class,"standardEnglishName");
-            s.append(MessageUtils.getMessage(ResultCommon.DATA_MISMATCH,name)).append(",");
-        }
-    }
-
     private void checkDate(LawsMarketStandardDetail p, StringBuilder s) {
         // 验证字典值是否满足条件
         StringBuilder dict = lawsCommonService.validateFieldByDict(p);

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java

@@ -482,10 +482,18 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         if(Objects.isNull(lawsMarketStandard)){
             throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
         }
-        LambdaQueryWrapper<LawsMarketStandard> queryLawsMarketStandard = new LambdaQueryWrapper<>();
+        QueryWrapper<LawsMarketStandard> queryLawsMarketStandard = new QueryWrapper<>();
-        queryLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,lawsMarketStandard.getVersionFlag());
+        queryLawsMarketStandard.select("max(manifest_version) as manifest_version");
-        long l = count(queryLawsMarketStandard);
+        queryLawsMarketStandard.eq("version_flag",lawsMarketStandard.getVersionFlag());
-        lawsMarketStandard.setManifestVersion("V" + l + ".0");
+        LawsMarketStandard obj = getOne(queryLawsMarketStandard);
+        String manifestVersion = "";
+        if(Objects.isNull(obj) || StringUtils.isEmpty(obj.getManifestVersion())){
+            manifestVersion = "V1.0";
+        }else{
+            int str = (int) Double.parseDouble(obj.getManifestVersion().replace("V","")) + 1;
+            manifestVersion = "V" + str + ".0";
+        }
+        lawsMarketStandard.setManifestVersion(manifestVersion);
         return lawsMarketStandard;
     }
 
@@ -549,14 +557,22 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
             return Result.error(msg.toString().substring(0,msg.toString().length() - 1));
         }
         for (LawsMarketStandard lawsMarketStandardOld : lawsMarketStandardOldList) {
-            LambdaQueryWrapper<LawsMarketStandard> queryLawsMarketStandard = new LambdaQueryWrapper<>();
+            QueryWrapper<LawsMarketStandard> queryLawsMarketStandard = new QueryWrapper<>();
-            queryLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,lawsMarketStandardOld.getVersionFlag());
+            queryLawsMarketStandard.select("max(manifest_version) as manifest_version");
-            long l = count(queryLawsMarketStandard);
+            queryLawsMarketStandard.eq("version_flag",lawsMarketStandardOld.getVersionFlag());
+            LawsMarketStandard obj = getOne(queryLawsMarketStandard,false);
+            String manifestVersion = "";
+            if(Objects.isNull(obj) || StringUtils.isEmpty(obj.getManifestVersion())){
+                manifestVersion = "V1.0";
+            }else{
+                int str = (int) Double.parseDouble(obj.getManifestVersion().replace("V","")) + 1;
+                manifestVersion = "V" + str + ".0";
+            }
             // 更新状态
             LambdaUpdateWrapper<LawsMarketStandard> updateLawsMarketStandard = new LambdaUpdateWrapper<>();
             updateLawsMarketStandard.eq(LawsMarketStandard::getId, lawsMarketStandardOld.getId());
             updateLawsMarketStandard.set(LawsMarketStandard::getReleaseDate,new Date());
-            updateLawsMarketStandard.set(LawsMarketStandard::getManifestVersion, "V" + l + ".0");
+            updateLawsMarketStandard.set(LawsMarketStandard::getManifestVersion, manifestVersion);
             updateLawsMarketStandard.set(LawsMarketStandard::getManifestStatus,MarketStandardConstants.MANIFEST_STATUS_PUBLISH);
             updateLawsMarketStandard.set(LawsMarketStandard::getUpdateTime,new Date());
             updateLawsMarketStandard.set(LawsMarketStandard::getUpdateBy,sysUser.getUsername());
@@ -599,14 +615,23 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         if(Objects.equals(lawsMarketStandardOld.getManifestStatus(),MarketStandardConstants.MANIFEST_STATUS_PUBLISH)){
             return Result.error(ResultCommon.DATA_PUBLISHED);
         }
-        LambdaQueryWrapper<LawsMarketStandard> queryLawsMarketStandard = new LambdaQueryWrapper<>();
+        QueryWrapper<LawsMarketStandard> queryLawsMarketStandard = new QueryWrapper<>();
-        queryLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,lawsMarketStandardOld.getVersionFlag());
+        queryLawsMarketStandard.select("max(manifest_version) as manifest_version");
-        long l = count(queryLawsMarketStandard);
+        queryLawsMarketStandard.eq("version_flag",lawsMarketStandardOld.getVersionFlag());
+        LawsMarketStandard obj = getOne(queryLawsMarketStandard);
+        String manifestVersion = "";
+        if(Objects.isNull(obj) || StringUtils.isEmpty(obj.getManifestVersion())){
+            manifestVersion = "V1.0";
+        }else{
+            int str = (int) Double.parseDouble(obj.getManifestVersion().replace("V","")) + 1;
+            manifestVersion = "V" + str + ".0";
+        }
+
         // 更新状态
         LambdaUpdateWrapper<LawsMarketStandard> updateLawsMarketStandard = new LambdaUpdateWrapper<>();
         updateLawsMarketStandard.eq(LawsMarketStandard::getId,id);
         updateLawsMarketStandard.set(LawsMarketStandard::getReleaseDate,new Date());
-        updateLawsMarketStandard.set(LawsMarketStandard::getManifestVersion, "V" + l + ".0");
+        updateLawsMarketStandard.set(LawsMarketStandard::getManifestVersion, manifestVersion);
         updateLawsMarketStandard.set(LawsMarketStandard::getManifestStatus,MarketStandardConstants.MANIFEST_STATUS_PUBLISH);
         updateLawsMarketStandard.set(LawsMarketStandard::getUpdateTime,new Date());
         updateLawsMarketStandard.set(LawsMarketStandard::getUpdateBy,sysUser.getUsername());
@@ -692,6 +717,37 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         }
         return Result.OK(String.join(",",listCountry));
     }
+
+    @Override
+    public void editManifestVersion(LawsMarketStandard marketStandard) {
+        if(StringUtils.isEmpty(marketStandard.getManifestVersion())){
+            throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED);
+        }
+        LawsMarketStandard obj = getById(marketStandard.getId());
+        if(Objects.isNull(obj)){
+            throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
+        }
+        if(!Objects.equals(obj.getManifestStatus(),MarketStandardConstants.MANIFEST_STATUS_PUBLISH)){
+            throw new JeroBootException(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
+                    "Out of state" : "状态不正确");
+        }
+        LambdaQueryWrapper<LawsMarketStandard> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(LawsMarketStandard::getVersionFlag,obj.getVersionFlag());
+        queryWrapper.ne(LawsMarketStandard::getId,marketStandard.getId());
+        queryWrapper.eq(LawsMarketStandard::getManifestVersion,marketStandard.getManifestVersion());
+        long l = count(queryWrapper);
+        if(l > 0){
+            throw new JeroBootException(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
+                    "Version Already exist" : "清单版本已存在");
+        }
+        LambdaUpdateWrapper<LawsMarketStandard> update = new LambdaUpdateWrapper<>();
+        update.eq(LawsMarketStandard::getId,marketStandard.getId());
+        update.set(LawsMarketStandard::getManifestVersion,marketStandard.getManifestVersion());
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        update.set(LawsMarketStandard::getUpdateBy,sysUser.getUsername());
+        update.set(LawsMarketStandard::getUpdateTime,new Date());
+        update(update);
+    }
 }