weizhiqiang1995/erp-pro
1
1
Fork 0
mirror of https://github.com/weizhiqiang1995/erp-pro.git synced 2025-01-19 13:48:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

编码规则的注解修改，添加分组属性

Browse source
This commit is contained in:
weizhiqiang 2022-10-07 18:31:53 +08:00
parent cb315830c8
commit d12d04f03b
3 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/entity/coderule/SkyeyeClassCodeRuleMation.java
View file

@ -60,6 +60,13 @@ public class SkyeyeClassCodeRuleMation extends CommonOperatorUserInfo implements
@ApiModelProperty(value = "className对应的服务名称", required = "required")
private String serviceName;
/**
* className对应的服务名称
*/
@TableField("group_name")
@ApiModelProperty(value = "className对应的分组名称", required = "required")
private String groupName;
/**
* 编码规则id
*/

3
skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/CodeRuleServiceImpl.java
View file

@ -111,7 +111,8 @@ public class CodeRuleServiceImpl extends ServiceImpl<CodeRuleDao, CodeRuleMation
QueryWrapper<CodeRuleMation> queryWrapper = new QueryWrapper<>();
queryWrapper.and(wrapper ->
wrapper.eq(MybatisPlusUtil.toColumns(CodeRuleMation::getCodeNum), codeRule.getCodeNum())
.or().eq(MybatisPlusUtil.toColumns(CodeRuleMation::getName), codeRule.getName()));
.or().eq(MybatisPlusUtil.toColumns(CodeRuleMation::getName), codeRule.getName())
.or().eq(MybatisPlusUtil.toColumns(CodeRuleMation::getPattern), codeRule.getPattern()));
if (StringUtils.isNotEmpty(codeRule.getId())) {
queryWrapper.ne(CommonConstants.ID, codeRule.getId());
}

23
skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SkyeyeClassCodeRuleServiceImpl.java
View file

@ -57,7 +57,7 @@ public class SkyeyeClassCodeRuleServiceImpl extends ServiceImpl<SkyeyeClassCodeR
QueryWrapper<SkyeyeClassCodeRuleMation> wrapper = new QueryWrapper<>();
wrapper.eq(MybatisPlusUtil.toColumns(SkyeyeClassCodeRuleMation::getAppId), skyeyeClassCodeRuleApiMation.getAppId());
List<SkyeyeClassCodeRuleMation> oldList = super.list(wrapper);
List<String> oldKeys = oldList.stream().map(bean -> bean.getClassName() + bean.getServiceName()).collect(Collectors.toList());
List<String> oldKeys = oldList.stream().map(bean -> bean.getClassName() + bean.getGroupName() + bean.getServiceName()).collect(Collectors.toList());
// 获取入参的数据
List<SkyeyeClassCodeRuleMation> classNameList = skyeyeClassCodeRuleApiMation.getClassNameList();
@ -66,18 +66,11 @@ public class SkyeyeClassCodeRuleServiceImpl extends ServiceImpl<SkyeyeClassCodeR
classNameBean.setAppName(skyeyeClassCodeRuleApiMation.getAppName());
DataCommonUtil.setCommonDataByGenericity(classNameBean, "0dc9dd4cd4d446ae9455215fe753c44e");
}
List<String> newKeys = classNameList.stream().map(bean -> bean.getClassName() + bean.getServiceName()).collect(Collectors.toList());
// (新数据 - 旧数据) 添加到数据库
List<SkyeyeClassCodeRuleMation> addBeans = classNameList.stream()
.filter(item -> !oldKeys.contains(item.getClassName() + item.getServiceName())).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(addBeans)) {
saveBatch(addBeans);
}
List<String> newKeys = classNameList.stream().map(bean -> bean.getClassName() + bean.getGroupName() + bean.getServiceName()).collect(Collectors.toList());
// (旧数据 - 新数据) 从数据库删除
List<SkyeyeClassCodeRuleMation> deleteBeans = oldList.stream()
.filter(item -> !newKeys.contains(item.getClassName() + item.getServiceName())).collect(Collectors.toList());
.filter(item -> !newKeys.contains(item.getClassName() + item.getGroupName() + item.getServiceName())).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(deleteBeans)) {
List<String> classNames = deleteBeans.stream().map(bean -> bean.getClassName()).collect(Collectors.toList());
QueryWrapper<SkyeyeClassCodeRuleApiMation> deleteWrapper = new QueryWrapper<>();
@ -86,6 +79,13 @@ public class SkyeyeClassCodeRuleServiceImpl extends ServiceImpl<SkyeyeClassCodeR
remove(wrapper);
}
// (新数据 - 旧数据) 添加到数据库
List<SkyeyeClassCodeRuleMation> addBeans = classNameList.stream()
.filter(item -> !oldKeys.contains(item.getClassName() + item.getGroupName() + item.getServiceName())).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(addBeans)) {
saveBatch(addBeans);
}
}
/**
@ -131,7 +131,8 @@ public class SkyeyeClassCodeRuleServiceImpl extends ServiceImpl<SkyeyeClassCodeR
@Override
public void queryClassCodeRuleList(InputObject inputObject, OutputObject outputObject) {
List<SkyeyeClassCodeRuleMation> classCodeRuleMationList = super.list();
Map<String, List<SkyeyeClassCodeRuleMation>> collect = classCodeRuleMationList.stream().collect(Collectors.groupingBy(SkyeyeClassCodeRuleMation::getAppName));
Map<String, Map<String, List<SkyeyeClassCodeRuleMation>>> collect = classCodeRuleMationList.stream()
.collect(Collectors.groupingBy(SkyeyeClassCodeRuleMation::getAppName, Collectors.groupingBy(SkyeyeClassCodeRuleMation::getGroupName)));
outputObject.setBean(collect);
outputObject.settotal(CommonNumConstants.NUM_ONE);
}