diff --git a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleController.java b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleController.java index e12549c..27dcecd 100644 --- a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleController.java +++ b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleController.java @@ -52,6 +52,10 @@ public class StaticRuleController implements StaticRuleControllerApi { object.setStaticRuleCreateUserId(Integer.valueOf(user.uid)); object.setStaticRuleCreateDepart(user.getOrgName()); } + Integer duplicateRuleNum = staticRuleService.queryDuplicateStaticRule(object); + if (duplicateRuleNum > 0) { + return ResponseResult.invalid().setMessage("规则重复"); + } //调用service新增 staticRuleService.newStaticRuleObject(object); @@ -126,7 +130,7 @@ public class StaticRuleController implements StaticRuleControllerApi { //调用service修改 Boolean updateValid = staticRuleService.updateStaticRule(id, object); if (!updateValid) { - return ResponseResult.invalid().setMessage("id is invalid"); + return ResponseResult.invalid().setMessage("无效的规则"); } return ResponseResult.ok().setData("success",updateValid); } @@ -141,7 +145,7 @@ public class StaticRuleController implements StaticRuleControllerApi { log.info("根据id查询静态规则:{}", id); StaticRuleObject object = staticRuleService.queryStaticRuleById(id); if (object == null) { - return ResponseResult.invalid().setMessage("id is invalid"); + return ResponseResult.invalid().setMessage("无效的规则"); } return ResponseResult.ok().setData("static_rule", object); } @@ -199,7 +203,7 @@ public class StaticRuleController implements StaticRuleControllerApi { public ResponseResult updateStaticRuleAuditStatus(@PathVariable Integer id, @PathVariable Integer auditStatus, @Autowired HttpServletRequest request) { if (id <= 0 || auditStatus < 0 || auditStatus > 2) { - return new ResponseResult(400, "id or status is invalid") + return new ResponseResult(400, "规则或状态无效") .setData("staticRule_id", id) .setData("success", false); } @@ -238,7 +242,7 @@ public class StaticRuleController implements StaticRuleControllerApi { } } if (!errorIds.isEmpty()){ - return new ResponseResult(400, "id or status is invalid") + return new ResponseResult(400, "规则或状态无效") .setData("staticRule_id", errorIds) .setData("success", false); } diff --git a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleMapper.java b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleMapper.java index 5dce492..01b87ee 100644 --- a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleMapper.java +++ b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleMapper.java @@ -81,5 +81,7 @@ public interface StaticRuleMapper { void removeUsedTaskId(Long taskId); + Integer queryDuplicateStaticRule(StaticRuleObject object); + // boolean queryStaticRuleRepeat(StaticRuleObject object); } diff --git a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java index 545f1c8..b5b862a 100644 --- a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java +++ b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java @@ -428,4 +428,8 @@ public class StaticRuleService { public List queryHistory(Integer id, Integer page, Integer pageSize) { return staticRuleMapper.queryHistory(id, page, pageSize); } + + public Integer queryDuplicateStaticRule(StaticRuleObject object) { + return staticRuleMapper.queryDuplicateStaticRule(object); + } } diff --git a/src/main/resources/mappers/StaticRuleMapper.xml b/src/main/resources/mappers/StaticRuleMapper.xml index ee68a13..204153f 100644 --- a/src/main/resources/mappers/StaticRuleMapper.xml +++ b/src/main/resources/mappers/StaticRuleMapper.xml @@ -518,35 +518,50 @@ ORDER BY effective_time DESC LIMIT ${(page - 1) * pageSize}, #{pageSize} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file