Bläddra i källkod

调整规则逻辑

yumeng 4 år sedan
förälder
incheckning
06fcc75861

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

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

+ 2 - 2
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/RuleGroup.java

@@ -69,8 +69,8 @@ public class RuleGroup {
     private String remark;
 
 
-    private Boolean isRequired;//  是否必填  true 是 false 否
-    private Boolean isCopy;//  是否可复制  true 是 false 否
+    private Integer isRequired;//  是否必填  true 是 false 否
+    private Integer isCopy;//  是否可复制  true 是 false 否
 
     /**
      * createTime

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

@@ -3,19 +3,6 @@ package cn.com.ctop.alarm.modules.service.impl;
 import cn.com.ctop.alarm.modules.constant.MatchLogic;
 import cn.com.ctop.alarm.modules.entity.*;
 import cn.com.ctop.alarm.modules.mapper.*;
-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.service.IRuleAccountTemplateService;
 import cn.com.ctop.alarm.modules.service.IRuleGroupService;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
@@ -360,7 +347,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"));
+                    ruleBase.setIsUnlimited(ruleDetailJson.getInteger("isUnlimited"));
                     int insert = ruleBaseMapper.insert(ruleBase);  // 添加基础规则
                     if (insert > 0) {
                         if (!Check.isNull(accountList)) {
@@ -390,8 +377,8 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                 ruleGroup.setRuleRelationship(groupJson.getString("ruleRelationship"));
                 ruleGroup.setGroupName(groupJson.getString("groupName"));
                 ruleGroup.setRemark(groupJson.getString("remark"));
-                ruleGroup.setIsCopy(groupJson.getBoolean("isCopy"));
-                ruleGroup.setIsRequired(groupJson.getBoolean("isRequired"));
+                ruleGroup.setIsCopy(groupJson.getInteger("isCopy"));
+                ruleGroup.setIsRequired(groupJson.getInteger("isRequired"));
                 boolean save = ruleGroupService.save(ruleGroup); // 新增规则组
                 if (save) {
 

+ 3 - 3
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"));
+                                ruleBase.setIsUnlimited(ruleDetailJson.getInteger("isUnlimited"));
                                 int insert = ruleBaseMapper.insert(ruleBase);
                                 if (insert > 0) {
                                     ruleIds.add(ruleBase.getId());
@@ -104,8 +104,8 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
                         ruleGroup.setRuleRelationship(ruleGroupJson.getString("ruleRelationship"));
                         ruleGroup.setGroupName(ruleGroupJson.getString("groupName"));
                         ruleGroup.setRemark(ruleGroupJson.getString("remark"));
-                        ruleGroup.setIsCopy(ruleGroupJson.getBoolean("isCopy"));
-                        ruleGroup.setIsRequired(ruleGroupJson.getBoolean("isRequired"));
+                        ruleGroup.setIsCopy(ruleGroupJson.getInteger("isCopy"));
+                        ruleGroup.setIsRequired(ruleGroupJson.getInteger("isRequired"));
                         boolean save = ruleGroupService.save(ruleGroup);
                         if (save) {
                             String ruleIdsArrStr = ruleGroup.getRuleIds();