|
@@ -1,9 +1,17 @@
|
|
|
package cn.com.ctop.alarm.modules.service.impl;
|
|
|
|
|
|
-import cn.com.ctop.alarm.modules.entity.*;
|
|
|
+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.RuleBaseMapper;
|
|
|
import cn.com.ctop.alarm.modules.mapper.RuleTemplateMapper;
|
|
|
-import cn.com.ctop.alarm.modules.service.*;
|
|
|
+import cn.com.ctop.alarm.modules.service.IRuleAccountThresholdService;
|
|
|
+import cn.com.ctop.alarm.modules.service.IRuleBaseService;
|
|
|
+import cn.com.ctop.alarm.modules.service.IRuleGroupService;
|
|
|
+import cn.com.ctop.alarm.modules.service.IRuleIndicatorService;
|
|
|
+import cn.com.ctop.alarm.modules.service.IRuleTemplateService;
|
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
@@ -45,6 +53,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
|
|
|
|
/**
|
|
|
* 创建规则模板
|
|
|
+ *
|
|
|
* @param requestJson
|
|
|
* @return
|
|
|
*/
|
|
@@ -199,6 +208,9 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
|
groupJson.put("sendType", group.getSendType());
|
|
|
groupJson.put("isCopy", group.getIsCopy());
|
|
|
groupJson.put("isRequired", group.getIsRequired());
|
|
|
+ groupJson.put("operation", group.getOperation());
|
|
|
+ groupJson.put("operationType", group.getOperationType());
|
|
|
+ groupJson.put("operationValue", group.getOperationValue());
|
|
|
JSONArray ruleIds = JSONArray.parseArray(group.getRuleIds());
|
|
|
if (Check.isNull(ruleIds)) {
|
|
|
continue;
|
|
@@ -215,6 +227,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
|
ruleJson.put("ruleName", ruleBase.getRuleName());
|
|
|
ruleJson.put("judgeFormat", ruleBase.getJudgeFormat());
|
|
|
ruleJson.put("indicatorCode", ruleBase.getIndicatorCode());
|
|
|
+ ruleJson.put("cindicatorCode", ruleBase.getCindicatorCode());
|
|
|
ruleJson.put("ruleCondition", ruleBase.getRuleCondition());
|
|
|
ruleJson.put("threshold", ruleBase.getThreshold());
|
|
|
ruleJson.put("ruleDimension", ruleBase.getRuleDimension());
|
|
@@ -289,6 +302,9 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
|
groupJson.put("sendType", group.getSendType());
|
|
|
groupJson.put("isCopy", group.getIsCopy());
|
|
|
groupJson.put("isRequired", group.getIsRequired());
|
|
|
+ groupJson.put("operation", group.getOperation());
|
|
|
+ groupJson.put("operationType", group.getOperationType());
|
|
|
+ groupJson.put("operationValue", group.getOperationValue());
|
|
|
JSONArray ruleDetail = new JSONArray();
|
|
|
|
|
|
if (group.getIsCopy() == 0) { // 规则不可复制
|
|
@@ -307,6 +323,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
|
ruleJson.put("ruleName", ruleBase.getRuleName());
|
|
|
ruleJson.put("judgeFormat", ruleBase.getJudgeFormat());
|
|
|
ruleJson.put("indicatorCode", ruleBase.getIndicatorCode());
|
|
|
+ ruleJson.put("cindicatorCode", ruleBase.getCindicatorCode());
|
|
|
ruleJson.put("ruleCondition", ruleBase.getRuleCondition());
|
|
|
QueryWrapper<RuleAccountThreshold> accountThresholdQueryWrapper = new QueryWrapper<>();
|
|
|
accountThresholdQueryWrapper.eq("account_id", accountId);
|
|
@@ -456,6 +473,9 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
|
groupJson.put("sendType", group.getSendType());
|
|
|
groupJson.put("isCopy", group.getIsCopy());
|
|
|
groupJson.put("isRequired", group.getIsRequired());
|
|
|
+ groupJson.put("operation", group.getOperation());
|
|
|
+ groupJson.put("operationType", group.getOperationType());
|
|
|
+ groupJson.put("operationValue", group.getOperationValue());
|
|
|
JSONArray ruleIds = JSONArray.parseArray(group.getRuleIds());
|
|
|
if (Check.isNull(ruleIds)) {
|
|
|
continue;
|
|
@@ -473,6 +493,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
|
ruleJson.put("ruleName", ruleBase.getRuleName());
|
|
|
ruleJson.put("judgeFormat", ruleBase.getJudgeFormat());
|
|
|
ruleJson.put("indicatorCode", ruleBase.getIndicatorCode());
|
|
|
+ ruleJson.put("cindicatorCode", ruleBase.getCindicatorCode());
|
|
|
ruleJson.put("ruleCondition", ruleBase.getRuleCondition());
|
|
|
ruleJson.put("threshold", ruleBase.getThreshold());
|
|
|
ruleJson.put("ruleDimension", ruleBase.getRuleDimension());
|