瀏覽代碼

移除SearchData的ruleTypeId属性,危急值提醒分类使用featureType

hujing 5 年之前
父節點
當前提交
40016bc1ac

+ 0 - 10
common-push/src/main/java/org/diagbot/common/push/bean/SearchData.java

@@ -47,8 +47,6 @@ public class SearchData {
 
     //量表
     protected String scaleName = "";
-    //危急值规则类型id
-    protected String ruleTypeId;
     //指标结果
     protected String indications="";
     //模型
@@ -246,14 +244,6 @@ public class SearchData {
         this.scaleName = scaleName;
     }
 
-    public String getRuleTypeId() {
-        return ruleTypeId;
-    }
-
-    public void setRuleTypeId(String ruleTypeId) {
-        this.ruleTypeId = ruleTypeId;
-    }
-
     public String getAlgorithmClassifyValue() {
         return algorithmClassifyValue;
     }

+ 4 - 4
rule/src/main/java/org/diagbot/rule/crisis/CrisisApplication.java

@@ -31,10 +31,10 @@ public class CrisisApplication {
 
         Map<String, List<CrisisDetail>> crisisMap = new HashMap<>();
         List<CrisisDetail> crisisList = null;
-        if (StringUtils.isEmpty(searchData.getRuleTypeId())) {
-            ruleTypeIdList = getallRuleId(ruleApps);
+        if (StringUtils.isEmpty(searchData.getFeatureType())) {
+            ruleTypeIdList = getAllRuleId(ruleApps);
         } else {
-            ruleTypeIdList = Arrays.asList(searchData.getRuleTypeId().split(","));
+            ruleTypeIdList = Arrays.asList(searchData.getFeatureType().split(","));
         }
         for (Map.Entry<String, RuleApp> app : ruleApps.entrySet()) {
             if (StringUtils.isEmpty(app.getValue().getRuleIds()) || StringUtils.isEmpty(app.getValue().getTypeId())) {
@@ -90,7 +90,7 @@ public class CrisisApplication {
         return crisisMap;
     }
 
-    private List<String> getallRuleId(Map<String, RuleApp> ruleApps) {
+    private List<String> getAllRuleId(Map<String, RuleApp> ruleApps) {
         Set<String> typeIdSet = new HashSet<>();
         for (Map.Entry<String, RuleApp> ruleAppEntry : ruleApps.entrySet()) {
             typeIdSet.add(ruleAppEntry.getValue().getTypeId());