zhaoxian пре 3 година
родитељ
комит
91e195f2e4

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

@@ -1161,15 +1161,8 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
     private boolean groupThresholdFromIndicator(JSONObject thresholdJson, String operate) {
         if ("SEND".equals(operate) || "PAUSE".equals(operate)) {
             return false;
-        }
-        RuleBase base = ruleBaseMapper.selectById(thresholdJson.getLong("ruleId"));
-        String code = base.getIndicatorCode();
-        if ("BID".equals(operate)) {
-            return "charge".equals(code) || "cost".equals(code);
-        } else if ("BUDGET".equals(operate)) {
-            return "convertCost".equals(code);
-        } else if ("TIME".equals(operate)) {
-            return "scheduleTime".equals(code);
+        } else if ("BID".equals(operate) || "BUDGET".equals(operate) || "TIME".equals(operate)) {
+            return true;
         }
         return false;
     }