From d7218d406dedf462b7d0ce1782f4bc510a5214f7 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 05 Jul 2023 14:46:43 +0800
Subject: [PATCH] xxl模块新增接口返回实体类；校验规则字段添加
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java
index 2312c6c..c61b5de 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java
@@ -24,6 +24,7 @@
public class RulesServiceImpl extends BaseServiceImpl<RulesMapper, Rules> implements IRulesService {
private final IRulesConditionService rulesConditionService;
+
@Override
public IPage<Rules> selectRulesPage(IPage<Rules> page, Rules rules) {
return page.setRecords(baseMapper.selectRulesPage(page,rules));
@@ -42,7 +43,6 @@
//批量保存condition
boolean saveCondition = rulesConditionService.saveBatch(rulesVO.getRulesConditionList());
-
return saveRules&&saveCondition;
}
@@ -52,15 +52,16 @@
//更新rules
boolean updateRules = updateById(rulesVO);
+ RulesCondition rulesCondition = new RulesCondition();
+ rulesCondition.setRuleId(rulesVO.getId().toString());
+ List<RulesCondition> list = rulesConditionService.list(Condition.getQueryWrapper(rulesCondition));
+ list.forEach(e->{
+ rulesConditionService.physicDelete(e.getId());
+ });
+
rulesVO.getRulesConditionList().forEach(condition->{
- //有id，更新
- if (ObjectUtil.isNotEmpty(condition.getId())){
- rulesConditionService.updateById(condition);
- }else {
- //没id，赋rulesId
- condition.setRuleId(rulesVO.getId().toString());
- rulesConditionService.save(condition);
- }
+ condition.setRuleId(rulesVO.getId().toString());
+ rulesConditionService.save(condition);
});
return updateRules;
}
@@ -71,7 +72,7 @@
RulesCondition rulesCondition = new RulesCondition();
rulesCondition.setRuleId(id);
- List<RulesCondition> list = rulesConditionService.list(Condition.getQueryWrapper(rulesCondition));
+ List<RulesCondition> list = rulesConditionService.list(Condition.getQueryWrapper(rulesCondition).orderByDesc("RELATION"));
rulesVO.setRulesConditionList(list);
return rulesVO;
--
Gitblit v1.9.3