diff --git a/laws-base/laws-base-core/pom.xml b/laws-base/laws-base-core/pom.xml index 677423b7..0d104ea1 100644 --- a/laws-base/laws-base-core/pom.xml +++ b/laws-base/laws-base-core/pom.xml @@ -109,7 +109,7 @@ commons-io commons-io - ${commons.version} + 2.16.1 commons-lang diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java index 8ca8738e..4f51f2e9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java @@ -257,4 +257,21 @@ public class MarketStandardController { public Result 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 editManifestVersion(@RequestBody LawsMarketStandard lawsMarketStandard) { + this.marketStandardService.editManifestVersion(lawsMarketStandard); + return Result.OK(ResultCommon.OK); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java index 3f0c15cc..086bd307 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java +++ b/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; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java index 7f24e98b..c243f5a0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java +++ b/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) - @NotBlank(message = "新生产车实施日期不能为空") + @Excel(name = "新生产车实施日期", width = 15) @ApiModelProperty(value = "新生产车实施日期") private String newProductImplDate; /** * 新认证车实施日期 */ - @Excel(name = "*新认证车实施日期", width = 15) - @NotBlank(message = "新认证车实施日期不能为空") + @Excel(name = "新认证车实施日期", width = 15) @ApiModelProperty(value = "新认证车实施日期") private String newAuthImplDate; /** * 注册日期 */ - @Excel(name = "*注册日期", width = 15) - @NotBlank(message = "注册日期不能为空") + @Excel(name = "注册日期", width = 15) @ApiModelProperty(value = "注册日期") private String registrationDate; /** * 适用市场 */ - @Excel(name = "*适用市场", width = 15,dicCode = "market_state") - @NotBlank(message = "适用市场不能为空") + @Excel(name = "适用市场", width = 15,dicCode = "market_state") @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; /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java index 29207305..58cb5fff 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java @@ -127,4 +127,10 @@ public interface ILawsMarketStandardService extends IService * @return */ Result getManifestNo(LawsMarketStandard marketStandard); + + /** + * 修改版本号 + * @param marketStandard + */ + void editManifestVersion(LawsMarketStandard marketStandard); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java index 77c7f96a..00a91cbf 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java @@ -308,27 +308,15 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl queryLawsMarketStandard = new LambdaQueryWrapper<>(); - queryLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,lawsMarketStandard.getVersionFlag()); - long l = count(queryLawsMarketStandard); - lawsMarketStandard.setManifestVersion("V" + l + ".0"); + QueryWrapper queryLawsMarketStandard = new QueryWrapper<>(); + queryLawsMarketStandard.select("max(manifest_version) as manifest_version"); + queryLawsMarketStandard.eq("version_flag",lawsMarketStandard.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"; + } + lawsMarketStandard.setManifestVersion(manifestVersion); return lawsMarketStandard; } @@ -549,14 +557,22 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl queryLawsMarketStandard = new LambdaQueryWrapper<>(); - queryLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,lawsMarketStandardOld.getVersionFlag()); - long l = count(queryLawsMarketStandard); + QueryWrapper queryLawsMarketStandard = new QueryWrapper<>(); + queryLawsMarketStandard.select("max(manifest_version) as manifest_version"); + 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 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 queryLawsMarketStandard = new LambdaQueryWrapper<>(); - queryLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,lawsMarketStandardOld.getVersionFlag()); - long l = count(queryLawsMarketStandard); + QueryWrapper queryLawsMarketStandard = new QueryWrapper<>(); + queryLawsMarketStandard.select("max(manifest_version) as manifest_version"); + 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 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 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 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); + } } diff --git a/laws-modules/src/main/resources/excelTemplate/marketStandard.xls b/laws-modules/src/main/resources/excelTemplate/marketStandard.xls index c23798e1..b0568630 100644 Binary files a/laws-modules/src/main/resources/excelTemplate/marketStandard.xls and b/laws-modules/src/main/resources/excelTemplate/marketStandard.xls differ