add 配置标准、移除标准

This commit is contained in:
liao
2023-09-13 14:42:54 +08:00
parent d875f7d235
commit ea8d137395
11 changed files with 132 additions and 2 deletions
@@ -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 = "";
@@ -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条
@@ -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<String> 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<String> removeStandard(@RequestParam(name="nodeCode") String nodeCode,
@RequestParam("ids") String ids) {
lawsNodeRelationService.removeStandard(nodeCode, ids);
return Result.OK(ResultCommon.OK);
}
}
@@ -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<String> 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<String> removeStandard(@RequestParam(name="nodeCode") String nodeCode,
@RequestParam("ids") String ids) {
lawsNodeRelationService.removeStandard(nodeCode, ids);
return Result.OK(ResultCommon.OK);
}
}
@@ -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<String> 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<String> removeStandard(@RequestParam(name="nodeCode") String nodeCode,
@RequestParam("ids") String ids) {
lawsNodeRelationService.removeStandard(nodeCode, ids);
return Result.OK(ResultCommon.OK);
}
}
@@ -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)
@@ -16,5 +16,13 @@ public interface ILawsNodeRelationService extends IService<LawsNodeRelation> {
* @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);
}
@@ -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<LawsNodeRelationMapper, LawsNodeRelation> implements ILawsNodeRelationService {
/**
* @Author: liao
* @Date: 2023/9/13 14:26
* @Description: 配置标准
**/
@Override
public void relatedStandard(String nodeCode, String ids) {
// 标准id集合
List<String> idList = Arrays.asList(ids.split(FieldCommon.SEPARATOR));
// 添加之前先删除原来存储的
removeStandard(nodeCode, ids);
// 批量添加到数据库
List<LawsNodeRelation> 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<String> idList = Arrays.asList(ids.split(FieldCommon.SEPARATOR));
LambdaQueryWrapper<LawsNodeRelation> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(LawsNodeRelation::getNodeCode, nodeCode);
queryWrapper.in(LawsNodeRelation::getUniqueRelationFlag, idList);
remove(queryWrapper);
}
}