|
@@ -171,79 +171,78 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
|
public JSONObject queryDetailById(String id) throws Exception {
|
|
|
JSONObject returnJson = new JSONObject();
|
|
|
RuleTemplate template = ruleTemplateMapper.selectById(id);
|
|
|
- if (Check.isNull(ruleTemplateMapper)) {
|
|
|
+ if (Check.isNull(template)) {
|
|
|
throw new Exception("获取模板基本信息为空");
|
|
|
}
|
|
|
-
|
|
|
returnJson.put("templateId", template.getId());
|
|
|
returnJson.put("templateName", template.getTemplateName());
|
|
|
returnJson.put("mediaType", template.getMediaType());
|
|
|
JSONArray groupIds = JSONArray.parseArray(template.getGroupIds());
|
|
|
- if (Check.isNull(groupIds)) {
|
|
|
- throw new Exception("未获取规则集");
|
|
|
- }
|
|
|
- JSONArray ruleList = new JSONArray();
|
|
|
- for (int i = 0; i < groupIds.size(); i++) {
|
|
|
- Long groupId = groupIds.getLong(i);
|
|
|
- RuleGroup group = ruleGroupService.getById(groupId);
|
|
|
- if (Check.isNull(group)) {
|
|
|
- continue;
|
|
|
- }
|
|
|
- JSONObject groupJson = new JSONObject();
|
|
|
- groupJson.put("groupId", group.getId());
|
|
|
- groupJson.put("groupName", group.getGroupName());
|
|
|
- groupJson.put("ruleType", group.getRuleType());
|
|
|
- groupJson.put("ruleRelationship", group.getRuleRelationship());
|
|
|
- groupJson.put("remark", group.getRemark());
|
|
|
- groupJson.put("operate", group.getOperate());
|
|
|
- groupJson.put("sendType", group.getSendType());
|
|
|
- groupJson.put("isCopy", group.getIsCopy());
|
|
|
- groupJson.put("isRequired", group.getIsRequired());
|
|
|
- JSONArray ruleIds = JSONArray.parseArray(group.getRuleIds());
|
|
|
- if (Check.isNull(ruleIds)) {
|
|
|
- continue;
|
|
|
- }
|
|
|
- JSONArray ruleDetail = new JSONArray();
|
|
|
- for (int j = 0; j < ruleIds.size(); j++) {
|
|
|
- Long ruleId = ruleIds.getLong(j);
|
|
|
- RuleBase ruleBase = ruleBaseService.getById(ruleId);
|
|
|
- if (Check.isNull(ruleBase)) {
|
|
|
+ if (!Check.isNull(groupIds)) {
|
|
|
+ JSONArray ruleList = new JSONArray();
|
|
|
+ for (int i = 0; i < groupIds.size(); i++) {
|
|
|
+ Long groupId = groupIds.getLong(i);
|
|
|
+ RuleGroup group = ruleGroupService.getById(groupId);
|
|
|
+ if (Check.isNull(group)) {
|
|
|
continue;
|
|
|
}
|
|
|
- JSONObject ruleJson = new JSONObject();
|
|
|
- ruleJson.put("ruleId", ruleBase.getId());
|
|
|
- ruleJson.put("ruleName", ruleBase.getRuleName());
|
|
|
- ruleJson.put("judgeFormat", ruleBase.getJudgeFormat());
|
|
|
- ruleJson.put("indicatorCode", ruleBase.getIndicatorCode());
|
|
|
- ruleJson.put("ruleCondition", ruleBase.getRuleCondition());
|
|
|
- ruleJson.put("threshold", ruleBase.getThreshold());
|
|
|
- ruleJson.put("ruleDimension", ruleBase.getRuleDimension());
|
|
|
- ruleJson.put("variableType", ruleBase.getVariableType());
|
|
|
- ruleJson.put("isUnlimited", ruleBase.getIsUnlimited());
|
|
|
- /**
|
|
|
- * 查询指标对应信息
|
|
|
- */
|
|
|
- QueryWrapper<RuleIndicator> indicatorQueryWrapper = new QueryWrapper<>();
|
|
|
- indicatorQueryWrapper.eq("code", ruleBase.getIndicatorCode());
|
|
|
- indicatorQueryWrapper.eq("dimension", ruleBase.getRuleDimension());
|
|
|
- indicatorQueryWrapper.eq("media_type", template.getMediaType());
|
|
|
- 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());
|
|
|
- ruleJson.put("modelType", ruleIndicator.getModelType());
|
|
|
+ JSONObject groupJson = new JSONObject();
|
|
|
+ groupJson.put("groupId", group.getId());
|
|
|
+ groupJson.put("groupName", group.getGroupName());
|
|
|
+ groupJson.put("ruleType", group.getRuleType());
|
|
|
+ groupJson.put("ruleRelationship", group.getRuleRelationship());
|
|
|
+ groupJson.put("remark", group.getRemark());
|
|
|
+ groupJson.put("operate", group.getOperate());
|
|
|
+ groupJson.put("sendType", group.getSendType());
|
|
|
+ groupJson.put("isCopy", group.getIsCopy());
|
|
|
+ groupJson.put("isRequired", group.getIsRequired());
|
|
|
+ JSONArray ruleIds = JSONArray.parseArray(group.getRuleIds());
|
|
|
+ if (Check.isNull(ruleIds)) {
|
|
|
+ continue;
|
|
|
}
|
|
|
+ JSONArray ruleDetail = new JSONArray();
|
|
|
+ for (int j = 0; j < ruleIds.size(); j++) {
|
|
|
+ Long ruleId = ruleIds.getLong(j);
|
|
|
+ RuleBase ruleBase = ruleBaseService.getById(ruleId);
|
|
|
+ if (Check.isNull(ruleBase)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ JSONObject ruleJson = new JSONObject();
|
|
|
+ ruleJson.put("ruleId", ruleBase.getId());
|
|
|
+ ruleJson.put("ruleName", ruleBase.getRuleName());
|
|
|
+ ruleJson.put("judgeFormat", ruleBase.getJudgeFormat());
|
|
|
+ ruleJson.put("indicatorCode", ruleBase.getIndicatorCode());
|
|
|
+ ruleJson.put("ruleCondition", ruleBase.getRuleCondition());
|
|
|
+ ruleJson.put("threshold", ruleBase.getThreshold());
|
|
|
+ ruleJson.put("ruleDimension", ruleBase.getRuleDimension());
|
|
|
+ ruleJson.put("variableType", ruleBase.getVariableType());
|
|
|
+ ruleJson.put("isUnlimited", ruleBase.getIsUnlimited());
|
|
|
+ /**
|
|
|
+ * 查询指标对应信息
|
|
|
+ */
|
|
|
+ QueryWrapper<RuleIndicator> indicatorQueryWrapper = new QueryWrapper<>();
|
|
|
+ indicatorQueryWrapper.eq("code", ruleBase.getIndicatorCode());
|
|
|
+ indicatorQueryWrapper.eq("dimension", ruleBase.getRuleDimension());
|
|
|
+ indicatorQueryWrapper.eq("media_type", template.getMediaType());
|
|
|
+ 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());
|
|
|
+ ruleJson.put("modelType", ruleIndicator.getModelType());
|
|
|
+ }
|
|
|
|
|
|
- ruleDetail.add(ruleJson);
|
|
|
+ ruleDetail.add(ruleJson);
|
|
|
+ }
|
|
|
+ groupJson.put("ruleDetail", ruleDetail);
|
|
|
+ ruleList.add(groupJson);
|
|
|
}
|
|
|
- groupJson.put("ruleDetail", ruleDetail);
|
|
|
- ruleList.add(groupJson);
|
|
|
+ returnJson.put("ruleList", ruleList);
|
|
|
}
|
|
|
|
|
|
- returnJson.put("ruleList", ruleList);
|
|
|
+
|
|
|
return returnJson;
|
|
|
}
|
|
|
|