瀏覽代碼

规则引擎,修改bug

zhaoxian 3 年之前
父節點
當前提交
e75c596544

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleGroupServiceImpl.java

@@ -1645,6 +1645,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                 ruleGroup.setIsRequired(groupJson.getInteger("isRequired"));
                 ruleGroup.setOperate(groupJson.getString("operate"));
                 ruleGroup.setSendType(groupJson.getString("sendType"));
+                ruleGroup.setOperation(groupJson.getInteger("operation"));
                 boolean save = ruleGroupService.save(ruleGroup); // 新增规则组
                 if (save) {
                     for (int j = 0; j < ruleIds.size(); j++) {
@@ -1660,7 +1661,6 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
                         updateThreshold.setId(threshold);
                         updateThreshold.setGroupId(ruleGroup.getId());
                         ruleAccountThresholdMapper.updateById(updateThreshold); // 同步到阈值之后 阈值关联到组id
-
                     }
                     JSONArray groupIds = JSONArray.parseArray(template.getGroupIds());
                     groupIds.add(ruleGroup.getId());

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleTemplateServiceImpl.java

@@ -243,7 +243,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
                     indicatorQueryWrapper.last("limit 1");
                     RuleIndicator ruleIndicator = ruleIndicatorService.getOne(indicatorQueryWrapper);
                     if (!Check.isNull(ruleIndicator)) {
-                        ruleJson.put("dataType", ruleIndicator.getDataType());
+                        ruleJson.put("dataType", ruleIndicator.getConditionType());
                         ruleJson.put("dictId", ruleIndicator.getDictId());
                         ruleJson.put("dataUnit", ruleIndicator.getDataUnit());
                         ruleJson.put("name", ruleIndicator.getName());