diff options
| author | tanghao <[email protected]> | 2023-10-27 11:08:12 +0800 |
|---|---|---|
| committer | tanghao <[email protected]> | 2023-10-27 11:08:12 +0800 |
| commit | 8083067d1c345f6a4fc39a8ff08042965d218386 (patch) | |
| tree | ba91b6029c221827980dd7e64953d0c60ca2744d | |
| parent | efa94cf4a67deb93bc5f0b234971be2a93c29685 (diff) | |
fix: 规则全量增量接口返回内容修改
| -rw-r--r-- | cn-admin/src/main/java/net/geedge/modules/rule/service/impl/DetectionRuleServiceImpl.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cn-admin/src/main/java/net/geedge/modules/rule/service/impl/DetectionRuleServiceImpl.java b/cn-admin/src/main/java/net/geedge/modules/rule/service/impl/DetectionRuleServiceImpl.java index 8bfc1ba..7f20ee0 100644 --- a/cn-admin/src/main/java/net/geedge/modules/rule/service/impl/DetectionRuleServiceImpl.java +++ b/cn-admin/src/main/java/net/geedge/modules/rule/service/impl/DetectionRuleServiceImpl.java @@ -269,7 +269,7 @@ public class DetectionRuleServiceImpl extends ServiceImpl<DetectionRuleDao, Dete result.put("version", ruleVersion.getVersion()); if(ObjectUtil.isEmpty(ruleVersion) || (ObjectUtil.isNotEmpty(queryDetection) && queryDetection >= ruleVersion.getVersion())) { result.put("addList", ListUtil.list(true)); - result.put("deleteList", ListUtil.list(true)); + result.put("deleteIds", ListUtil.list(true)); result.put("updateList", ListUtil.list(true)); return result; } @@ -289,7 +289,8 @@ public class DetectionRuleServiceImpl extends ServiceImpl<DetectionRuleDao, Dete if(ObjectUtil.isNotEmpty(drRuleIds)) { // 删除的规则信息 List<DetectionRule> deleteRules = rules.stream().filter(rule -> rule.getIsValid().equals(1) && drRuleIds.contains(rule.getRuleId())).collect(Collectors.toList()); - result.put("deleteList", deleteRules); + List<Integer> deleteListIds = deleteRules.stream().map(DetectionRule::getRuleId).collect(Collectors.toList()); + result.put("deleteIds", deleteListIds); // 修改的规则信息 List<DetectionRule> updateRules = rules.stream().filter(rule -> rule.getIsValid().equals(0)&&drRuleIds.contains(rule.getRuleId())).collect(Collectors.toList()); |