|
@@ -2,11 +2,13 @@ package cn.com.ctop.alarm.modules.service.impl;
|
|
|
|
|
|
import cn.com.ctop.alarm.modules.entity.RuleBase;
|
|
import cn.com.ctop.alarm.modules.entity.RuleBase;
|
|
import cn.com.ctop.alarm.modules.entity.RuleGroup;
|
|
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.entity.RuleTemplate;
|
|
import cn.com.ctop.alarm.modules.mapper.RuleBaseMapper;
|
|
import cn.com.ctop.alarm.modules.mapper.RuleBaseMapper;
|
|
import cn.com.ctop.alarm.modules.mapper.RuleTemplateMapper;
|
|
import cn.com.ctop.alarm.modules.mapper.RuleTemplateMapper;
|
|
import cn.com.ctop.alarm.modules.service.IRuleBaseService;
|
|
import cn.com.ctop.alarm.modules.service.IRuleBaseService;
|
|
import cn.com.ctop.alarm.modules.service.IRuleGroupService;
|
|
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.alarm.modules.service.IRuleTemplateService;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
@@ -37,6 +39,9 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
@Autowired
|
|
@Autowired
|
|
private RuleTemplateMapper ruleTemplateMapper;
|
|
private RuleTemplateMapper ruleTemplateMapper;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private IRuleIndicatorService ruleIndicatorService;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 创建规则模板
|
|
* 创建规则模板
|
|
*
|
|
*
|
|
@@ -157,6 +162,8 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
* @param id
|
|
* @param id
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public JSONObject queryDetailById(String id) throws Exception {
|
|
public JSONObject queryDetailById(String id) throws Exception {
|
|
JSONObject returnJson = new JSONObject();
|
|
JSONObject returnJson = new JSONObject();
|
|
@@ -208,6 +215,21 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
ruleJson.put("threshold", ruleBase.getThreshold());
|
|
ruleJson.put("threshold", ruleBase.getThreshold());
|
|
ruleJson.put("ruleDimension", ruleBase.getRuleDimension());
|
|
ruleJson.put("ruleDimension", ruleBase.getRuleDimension());
|
|
ruleJson.put("variableType", ruleBase.getVariableType());
|
|
ruleJson.put("variableType", ruleBase.getVariableType());
|
|
|
|
+ /**
|
|
|
|
+ * 查询指标对应信息
|
|
|
|
+ */
|
|
|
|
+ QueryWrapper<RuleIndicator> indicatorQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ indicatorQueryWrapper.eq("code", ruleBase.getIndicatorCode());
|
|
|
|
+ indicatorQueryWrapper.eq("dimension", ruleBase.getRuleDimension());
|
|
|
|
+ indicatorQueryWrapper.last("limit 1");
|
|
|
|
+ RuleIndicator ruleIndicator = ruleIndicatorService.getOne(indicatorQueryWrapper);
|
|
|
|
+ if (!Check.isNull(ruleIndicator)) {
|
|
|
|
+ ruleJson.put("dataType", ruleIndicator.getDataType());
|
|
|
|
+ ruleJson.put("dictId", ruleIndicator.getDictId());
|
|
|
|
+ ruleJson.put("dataUnit", ruleIndicator.getDataUnit());
|
|
|
|
+ ruleJson.put("name", ruleIndicator.getName());
|
|
|
|
+ }
|
|
|
|
+
|
|
ruleDetail.add(ruleJson);
|
|
ruleDetail.add(ruleJson);
|
|
}
|
|
}
|
|
groupJson.put("ruleDetail", ruleDetail);
|
|
groupJson.put("ruleDetail", ruleDetail);
|