mcj:更新规则查询数据结构

src/main/java/com/zjty/inspect/controller/RuleController.java

@@ -53,13 +53,13 @@ public class RuleController {
     }
     /**
      * 根据id删除规则
-     * @param id id
+     * @param ruleQo 数据封装
      * @return
      */
-    @ApiOperation("根据id删除规则")
-    @DeleteMapping(value = "/{id}")
-    public ResponseEntity deleteById(@PathVariable String id){
-        ruleService.deleteById(id);
+    @ApiOperation("根据数据封装删除规则")
+    @DeleteMapping
+    public ResponseEntity deleteByQo(@RequestBody RuleQo ruleQo){
+        ruleService.deleteRule(ruleQo);
         return ResponseEntity.ok(200);
     }
     @ApiOperation("根据name查询规则")

src/main/java/com/zjty/inspect/entity/RuleQo.java

@@ -12,6 +12,7 @@ import java.util.List;
 @Data
 public class RuleQo {
 
+    private RuleQo oldRule;
     /**
      * 规则id
      */

src/main/java/com/zjty/inspect/service/impl/RuleServiceImpl.java

@@ -138,7 +138,8 @@ public class RuleServiceImpl implements RuleService {
 
     @Override
     public void upRule(RuleQo ruleQo) {
-        List<Rule> rules = ruleDao.findAllByTechnologyIdEqualsAndTargetEquals(ruleQo.getTechnologyId(), ruleQo.getTarget());
+        RuleQo oldRule = ruleQo.getOldRule();
+        List<Rule> rules = ruleDao.findAllByTechnologyIdEqualsAndTargetEquals(oldRule.getTechnologyId(), oldRule.getTarget());
         for (Rule rule : rules) {
             ruleDao.deleteById(rule.getId());
         }
@@ -153,7 +154,10 @@ public class RuleServiceImpl implements RuleService {
     @Override
     @Modifying
     public void deleteRule(RuleQo ruleQo) {
-        ruleDao.deleteById(ruleQo.getId());
+        List<Rule> rules = ruleDao.findAllByTechnologyIdEqualsAndTargetEquals(ruleQo.getTechnologyId(), ruleQo.getTarget());
+        for (Rule rule : rules) {
+            ruleDao.deleteById(rule.getId());
+        }
     }
 
     /**
@@ -199,10 +203,6 @@ public class RuleServiceImpl implements RuleService {
             }else{
                 RuleQo ruleQo = hashMap.get(rule.getTarget() + rule.getTechnologyId());
                 ruleQo.getSuffix().add(rule.getSuffix());
-                if(ruleQo.getSuffix().size()>1){
-                    System.out.println(rule.getTarget()+rule.getTechnologyId());
-                    System.out.println(ruleQo.getSuffix());
-                }
             }
         }
         return new ArrayList<>(hashMap.values());