|
@@ -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) {
|
|
|
|