From ea8d137395982060d26bd9b06b52148bf48f2365 Mon Sep 17 00:00:00 2001 From: liao Date: Wed, 13 Sep 2023 14:42:54 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E9=85=8D=E7=BD=AE=E6=A0=87=E5=87=86?= =?UTF-8?q?=E3=80=81=E7=A7=BB=E9=99=A4=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/common/constant/FieldCommon.java | 6 +++ .../laws/common/constant/ResultCommon.java | 1 + .../controller/LawsDomesticController.java | 22 +++++++++ .../controller/LawsEnterpriseController.java | 22 +++++++++ .../controller/LawsOverseasController.java | 22 +++++++++ .../standard/entity/LawsNodeRelation.java | 4 +- .../service/ILawsNodeRelationService.java | 8 ++++ .../impl/LawsNodeRelationServiceImpl.java | 46 +++++++++++++++++++ .../main/resources/i18n/messages.properties | 1 + .../resources/i18n/messages_en.properties | 1 + .../resources/i18n/messages_zh.properties | 1 + 11 files changed, 132 insertions(+), 2 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 bb0f57e8..0cb133af 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 @@ -46,6 +46,12 @@ public class FieldCommon { public static final String STANDARD_NUMBER = "standard_number"; // 标准名称 public static final String STANDARD_NAME = "standard_name"; + // 树节点编码 + public static final String NODE_CODE = "nodeCode"; + // ids + public static final String IDS = "ids"; + // 分隔符 + public static final String SEPARATOR = ","; // 中文双引号 public static final String QUOTE = "“"; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java index 8374c75a..f0befd98 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java @@ -15,6 +15,7 @@ public class ResultCommon { public static final String EMPTY_SOURCE = "message.empty.source"; // 来源不能为空 public static final String EMPTY_STANDARD_NUMBER = "message.empty.standard.number"; // 标准编号不能为空 public static final String EMPTY_STANDARD_NAME = "message.empty.standard.name"; // 标准名称不能为空 + public static final String EMPTY_COMMON = "message.empty.common"; // {0}不能为空 public static final String RMR_SET_QUALITY_OVER_TEN = "es.rmr.setQuality.overTen"; // 请最多选择10条 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 64d40824..8cec4b66 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 @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.modules.laws.common.constant.FieldCommon; +import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; +import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; import io.swagger.annotations.Api; @@ -27,6 +29,8 @@ public class LawsDomesticController { @Autowired private ILawsCommonService lawsCommonService; + @Autowired + private ILawsNodeRelationService lawsNodeRelationService; private static final String MODULE_VALUE = TableNameEnum.DOMESTIC_REGULATIONS.getValue(); @@ -89,4 +93,22 @@ public class LawsDomesticController { return Result.OK(lawsCommonService.deleteByIdsAndModule((String) parameterMap.get("ids"), MODULE_VALUE)); } + @AutoLog(value = "国内法规标准-配置标准") + @ApiOperation(value="国内法规标准-配置标准", notes="国内法规标准-配置标准") + @GetMapping(value = "relatedStandard") + public Result relatedStandard(@RequestParam(name="nodeCode") String nodeCode, + @RequestParam("ids") String ids) { + lawsNodeRelationService.relatedStandard(nodeCode, ids); + return Result.OK(ResultCommon.OK); + } + + @AutoLog(value = "国内法规标准-移除标准") + @ApiOperation(value="国内法规标准-移除标准", notes="国内法规标准-移除标准") + @GetMapping(value = "removeStandard") + public Result removeStandard(@RequestParam(name="nodeCode") String nodeCode, + @RequestParam("ids") String ids) { + lawsNodeRelationService.removeStandard(nodeCode, ids); + return Result.OK(ResultCommon.OK); + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index d4a2054a..27ae4133 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.modules.laws.common.constant.FieldCommon; +import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; +import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; import io.swagger.annotations.Api; @@ -27,6 +29,8 @@ public class LawsEnterpriseController { @Autowired private ILawsCommonService lawsCommonService; + @Autowired + private ILawsNodeRelationService lawsNodeRelationService; private static final String MODULE_VALUE = TableNameEnum.ENTERPRISE_STANDARDS.getValue(); @@ -89,4 +93,22 @@ public class LawsEnterpriseController { return Result.OK(lawsCommonService.deleteByIdsAndModule((String) parameterMap.get("ids"), MODULE_VALUE)); } + @AutoLog(value = "企业法规标准-配置标准") + @ApiOperation(value="企业法规标准-配置标准", notes="企业法规标准-配置标准") + @GetMapping(value = "relatedStandard") + public Result relatedStandard(@RequestParam(name="nodeCode") String nodeCode, + @RequestParam("ids") String ids) { + lawsNodeRelationService.relatedStandard(nodeCode, ids); + return Result.OK(ResultCommon.OK); + } + + @AutoLog(value = "企业法规标准-移除标准") + @ApiOperation(value="企业法规标准-移除标准", notes="企业法规标准-移除标准") + @GetMapping(value = "removeStandard") + public Result removeStandard(@RequestParam(name="nodeCode") String nodeCode, + @RequestParam("ids") String ids) { + lawsNodeRelationService.removeStandard(nodeCode, ids); + return Result.OK(ResultCommon.OK); + } + } 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 18c1d519..98e49dc3 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 @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.modules.laws.common.constant.FieldCommon; +import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; +import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; import io.swagger.annotations.Api; @@ -27,6 +29,8 @@ public class LawsOverseasController { @Autowired private ILawsCommonService lawsCommonService; + @Autowired + private ILawsNodeRelationService lawsNodeRelationService; private static final String MODULE_VALUE = TableNameEnum.FOREIGN_REGULATIONS.getValue(); @@ -89,4 +93,22 @@ public class LawsOverseasController { return Result.OK(lawsCommonService.deleteByIdsAndModule((String) parameterMap.get("ids"), MODULE_VALUE)); } + @AutoLog(value = "海外法规标准-配置标准") + @ApiOperation(value="海外法规标准-配置标准", notes="海外法规标准-配置标准") + @GetMapping(value = "relatedStandard") + public Result relatedStandard(@RequestParam(name="nodeCode") String nodeCode, + @RequestParam("ids") String ids) { + lawsNodeRelationService.relatedStandard(nodeCode, ids); + return Result.OK(ResultCommon.OK); + } + + @AutoLog(value = "海外法规标准-移除标准") + @ApiOperation(value="海外法规标准-移除标准", notes="海外法规标准-移除标准") + @GetMapping(value = "removeStandard") + public Result removeStandard(@RequestParam(name="nodeCode") String nodeCode, + @RequestParam("ids") String ids) { + lawsNodeRelationService.removeStandard(nodeCode, ids); + return Result.OK(ResultCommon.OK); + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNodeRelation.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNodeRelation.java index d83b3ad2..cce75001 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNodeRelation.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNodeRelation.java @@ -47,8 +47,8 @@ public class LawsNodeRelation implements Serializable { @ApiModelProperty(value = "节点code") private java.lang.String nodeCode; /**唯一关联标识（id或者编号）*/ - @Excel(name = "唯一关联标识（编号）", width = 15) - @ApiModelProperty(value = "唯一关联标识（编号）") + @Excel(name = "唯一关联标识", width = 15) + @ApiModelProperty(value = "唯一关联标识（id）") private java.lang.String uniqueRelationFlag; /**所属模块编码（1国标、2外标、3企标）*/ @Excel(name = "所属模块编码", width = 15) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNodeRelationService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNodeRelationService.java index 7e73d8e5..8d999a4d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNodeRelationService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNodeRelationService.java @@ -16,5 +16,13 @@ public interface ILawsNodeRelationService extends IService { * @Date: 2023/9/13 10:52 * @Description: 配置标准 **/ + void relatedStandard(String nodeCode, String ids); + + /** + * @Author: liao + * @Date: 2023/9/13 10:52 + * @Description: 移除标准 + **/ + void removeStandard(String nodeCode, String ids); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java index 9fd3a256..72be0c9a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java @@ -1,13 +1,21 @@ package com.jero.modules.laws.standard.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.laws.common.constant.FieldCommon; +import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.standard.entity.LawsNodeRelation; import com.jero.modules.laws.standard.mapper.LawsNodeRelationMapper; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; +import com.spire.ms.System.Collections.ArrayList; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.Arrays; +import java.util.List; + /** * @Description: 树型节点关联 @@ -19,4 +27,42 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Transactional(rollbackFor = JeroBootException.class) public class LawsNodeRelationServiceImpl extends ServiceImpl implements ILawsNodeRelationService { + /** + * @Author: liao + * @Date: 2023/9/13 14:26 + * @Description: 配置标准 + **/ + @Override + public void relatedStandard(String nodeCode, String ids) { + // 标准id集合 + List idList = Arrays.asList(ids.split(FieldCommon.SEPARATOR)); + + // 添加之前先删除原来存储的 + removeStandard(nodeCode, ids); + + // 批量添加到数据库 + List relationList = new ArrayList(); + idList.forEach(id -> { + LawsNodeRelation relation = new LawsNodeRelation(); + relation.setNodeCode(nodeCode); + relation.setUniqueRelationFlag(id); + relationList.add(relation); + }); + saveBatch(relationList); + } + + /** + * @Author: liao + * @Date: 2023/9/13 14:38 + * @Description: 移除标准 + **/ + @Override + public void removeStandard(String nodeCode, String ids) { + List idList = Arrays.asList(ids.split(FieldCommon.SEPARATOR)); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(LawsNodeRelation::getNodeCode, nodeCode); + queryWrapper.in(LawsNodeRelation::getUniqueRelationFlag, idList); + remove(queryWrapper); + } + } diff --git a/laws-single-startup/src/main/resources/i18n/messages.properties b/laws-single-startup/src/main/resources/i18n/messages.properties index dc4f8e01..eda12c09 100644 --- a/laws-single-startup/src/main/resources/i18n/messages.properties +++ b/laws-single-startup/src/main/resources/i18n/messages.properties @@ -8,6 +8,7 @@ tag.edit.\u5C5E\u6027\u5DF2\u5B58\u5728,\u8BF7\u68C0\u67E5=\u5C5E\u6027\u5DF2\u5 message.ok=\u64CD\u4F5C\u6210\u529F message.error=\u64CD\u4F5C\u5931\u8D25 message.empty.source=The source cannot be empty +message.empty.common=The {0} cannot be empty message.empty.standard.number=The standard number cannot be empty message.empty.standard.name=The standard name cannot be empty es.rmr.setQuality.overTen=\u8BF7\u6700\u591A\u9009\u62E910\u6761 \ No newline at end of file diff --git a/laws-single-startup/src/main/resources/i18n/messages_en.properties b/laws-single-startup/src/main/resources/i18n/messages_en.properties index 48a63a1e..b58a54d2 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_en.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_en.properties @@ -8,6 +8,7 @@ tag.edit.\u5C5E\u6027\u5DF2\u5B58\u5728,\u8BF7\u68C0\u67E5=Attribute already exi message.ok=Successful operation message.error=Operation failure message.empty.source=The source cannot be empty +message.empty.common=The {0} cannot be empty message.empty.standard.number=The standard number cannot be empty message.empty.standard.name=The standard name cannot be empty es.rmr.setQuality.overTen=Please select up to 10 \ No newline at end of file diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties index 70c5389e..bef12298 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -9,5 +9,6 @@ es.rmr.setQuality.overTen=\u8BF7\u6700\u591A\u9009\u62E910\u6761 message.ok=\u64cd\u4f5c\u6210\u529f message.error=\u64cd\u4f5c\u5931\u8d25 message.empty.source=来源不能为空 +message.empty.common={0}不能为空 message.empty.standard.number=标准编号不能为空 message.empty.standard.name=标准名称不能为空 \ No newline at end of file