预警

2：预警规则配置

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

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;
 
     /**
      * 创建人

src/main/java/com/gunshi/project/hsz/service/WarningConditionService.java

@@ -23,6 +23,7 @@ public class WarningConditionService extends ServiceImpl<WarningConditionMapper,
     public List<WarningCondition> getListByRuleId(Serializable id){
         LambdaQueryWrapper<WarningCondition> queryWrapper = new LambdaQueryWrapper<WarningCondition>();
         queryWrapper.eq(WarningCondition::getRuleId,id);
+        queryWrapper.orderByAsc(WarningCondition::getOrder);
         return this.list(queryWrapper);
     }
 

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);
             }
         }