yumeng 5 سال پیش
والد
کامیت
b673505ac5

+ 1 - 0
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/RuleBase.java

@@ -68,6 +68,7 @@ public class RuleBase {
 
     private Integer variableType;// 变量类型
     private Integer judgeFormat;// 判断类型
+    private Boolean isUnlimited;//  是否支持不限  true 是 false 否
 
     /**
      * createTime

+ 1 - 13
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleGroupServiceImpl.java

@@ -1,19 +1,6 @@
 package cn.com.ctop.alarm.modules.service.impl;
 
 import cn.com.ctop.alarm.modules.constant.MatchLogic;
-import cn.com.ctop.alarm.modules.entity.AlarmEventRule;
-import cn.com.ctop.alarm.modules.entity.RuleAccountTemplate;
-import cn.com.ctop.alarm.modules.entity.RuleAccountThreshold;
-import cn.com.ctop.alarm.modules.entity.RuleBase;
-import cn.com.ctop.alarm.modules.entity.RuleGroup;
-import cn.com.ctop.alarm.modules.entity.RuleIndicator;
-import cn.com.ctop.alarm.modules.entity.RuleTemplate;
-import cn.com.ctop.alarm.modules.mapper.RuleAccountTemplateMapper;
-import cn.com.ctop.alarm.modules.mapper.RuleAccountThresholdMapper;
-import cn.com.ctop.alarm.modules.mapper.RuleBaseMapper;
-import cn.com.ctop.alarm.modules.mapper.RuleGroupMapper;
-import cn.com.ctop.alarm.modules.mapper.RuleIndicatorMapper;
-import cn.com.ctop.alarm.modules.mapper.RuleTemplateMapper;
 import cn.com.ctop.alarm.modules.entity.*;
 import cn.com.ctop.alarm.modules.mapper.*;
 import cn.com.ctop.alarm.modules.service.IRuleAccountTemplateService;
@@ -367,6 +354,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                     ruleBase.setVariableType(ruleDetailJson.getInteger("variableType"));
                     ruleBase.setRuleDimension(ruleDetailJson.getString("ruleDimension"));
                     ruleBase.setJudgeFormat(ruleDetailJson.getInteger("judgeFormat"));
+                    ruleBase.setIsUnlimited(ruleDetailJson.getBoolean("isUnlimited"));
                     int insert = ruleBaseMapper.insert(ruleBase);  // 添加基础规则
                     if (insert > 0) {
                         if (!Check.isNull(accountList)) {

+ 3 - 1
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleTemplateServiceImpl.java

@@ -91,7 +91,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
                                 ruleBase.setVariableType(ruleDetailJson.getInteger("variableType"));
                                 ruleBase.setRuleDimension(ruleDetailJson.getString("ruleDimension"));
                                 ruleBase.setJudgeFormat(ruleDetailJson.getInteger("judgeFormat"));
-
+                                ruleBase.setIsUnlimited(ruleDetailJson.getBoolean("isUnlimited"));
                                 int insert = ruleBaseMapper.insert(ruleBase);
                                 if (insert > 0) {
                                     ruleIds.add(ruleBase.getId());
@@ -216,6 +216,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
                 ruleJson.put("threshold", ruleBase.getThreshold());
                 ruleJson.put("ruleDimension", ruleBase.getRuleDimension());
                 ruleJson.put("variableType", ruleBase.getVariableType());
+                ruleJson.put("isUnlimited", ruleBase.getIsUnlimited());
                 /**
                  * 查询指标对应信息
                  */
@@ -310,6 +311,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
                 }
                 ruleJson.put("ruleDimension", ruleBase.getRuleDimension());
                 ruleJson.put("variableType", ruleBase.getVariableType());
+                ruleJson.put("isUnlimited", ruleBase.getIsUnlimited());
                 /**
                  * 查询指标对应信息
                  */