From be929732769d27b5ac3659c8bbe01f0af8bb2384 Mon Sep 17 00:00:00 2001 From: yangzhe123 <2824096059@qq.com> Date: Fri, 21 Nov 2025 10:53:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=202=EF=BC=9A=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E8=A7=84=E5=88=99=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gunshi/project/hsz/controller/WarningRuleController.java | 2 +- .../java/com/gunshi/project/hsz/model/WarningRuleInfo.java | 5 ----- .../gunshi/project/hsz/service/WarningConditionService.java | 1 + .../com/gunshi/project/hsz/timetask/WarningRuleTask.java | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gunshi/project/hsz/controller/WarningRuleController.java b/src/main/java/com/gunshi/project/hsz/controller/WarningRuleController.java index 644d0f0..4b97c30 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/WarningRuleController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/WarningRuleController.java @@ -25,7 +25,7 @@ import java.io.Serializable; @Tag(name = "预警规则") @RestController -@RequestMapping(value="/warnRule") +@RequestMapping(value="/warningRule") public class WarningRuleController extends AbstractCommonFileController { @Autowired diff --git a/src/main/java/com/gunshi/project/hsz/model/WarningRuleInfo.java b/src/main/java/com/gunshi/project/hsz/model/WarningRuleInfo.java index 595661b..fc705d7 100644 --- a/src/main/java/com/gunshi/project/hsz/model/WarningRuleInfo.java +++ b/src/main/java/com/gunshi/project/hsz/model/WarningRuleInfo.java @@ -36,11 +36,6 @@ public class WarningRuleInfo { @TableField("warning_type") private String warningType; - /** - * 状态：0-未启用，1-启用 - */ - @TableField("status") - private Integer status; /** * 创建人 diff --git a/src/main/java/com/gunshi/project/hsz/service/WarningConditionService.java b/src/main/java/com/gunshi/project/hsz/service/WarningConditionService.java index 0b9c55e..8c1ffb6 100644 --- a/src/main/java/com/gunshi/project/hsz/service/WarningConditionService.java +++ b/src/main/java/com/gunshi/project/hsz/service/WarningConditionService.java @@ -23,6 +23,7 @@ public class WarningConditionService extends ServiceImpl getListByRuleId(Serializable id){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(WarningCondition::getRuleId,id); + queryWrapper.orderByAsc(WarningCondition::getOrder); return this.list(queryWrapper); } diff --git a/src/main/java/com/gunshi/project/hsz/timetask/WarningRuleTask.java b/src/main/java/com/gunshi/project/hsz/timetask/WarningRuleTask.java index 003483c..008c7e6 100644 --- a/src/main/java/com/gunshi/project/hsz/timetask/WarningRuleTask.java +++ b/src/main/java/com/gunshi/project/hsz/timetask/WarningRuleTask.java @@ -102,10 +102,10 @@ public class WarningRuleTask { warningRuleInfo.setRuleId(warningRule.getId()); warningRuleInfo.setRuleName(warningRule.getRuleName()); warningRuleInfo.setConditions(conditions); - warningRuleInfo.setStatus(1); warningRuleInfo.setCreateTime(LocalDateTime.now()); warningRuleInfo.setRuleInfo(ruleInfo); warningRuleInfo.setWarningType(warningType); + warningRuleInfo.setWarningLevel(warningRule.getWarningLevel()); warningRuleInfoService.save(warningRuleInfo); } }