1.修改Rule.java

common-push/src/main/java/org/diagbot/common/push/bean/Rule.java

@@ -16,29 +16,29 @@ public class Rule {
     // 小类名称
     private String idx_name = "";
     // 大类名称是否参与比较 1-参与
-    private String set_status = "";
+    private String set_name_check = "";
+    // 最小值比较符
+    private String min_operator = "";
     // 最小值
     private String min_value = "";
-    // 最小值对应的标准文本
-    private String min_concept_text = "";
+    // 最小值单位
+    private String min_unit = "";
+    // 最大值比较符
+    private String max_operator = "";
     // 最大值
     private String max_value = "";
-    // 最小值对应的标准文本
-    private String max_concept_text = "";
+    // 最大值单位
+    private String max_unit = "";
     // 标准值 用作等于
-    private String set_value = "";
-    //转后标准术语
-    private String set_concept_text = "";
-    // 单位
-    private String unit = "";
-    //危机标识 用作危机值提醒
-    private String type_value = "";
+    private String eq_operator = "";
+    // 标准值
+    private String eq_value = "";
+    // 标准值单位
+    private String eq_unit = "";
     //提醒信息
-    private String minRemind = "";
+    private String remind = "";
     //提醒信息
-    private String maxRemind = "";
-    //提醒信息
-    private String setRemind = "";
+
 
     public String getSet_name() {
         return set_name;
@@ -56,99 +56,91 @@ public class Rule {
         this.idx_name = idx_name;
     }
 
-    public String getSet_status() {
-        return set_status;
+    public String getSet_name_check() {
+        return set_name_check;
     }
 
-    public void setSet_status(String set_status) {
-        this.set_status = set_status;
+    public void setSet_name_check(String set_name_check) {
+        this.set_name_check = set_name_check;
     }
 
-    public String getMin_value() {
-        return min_value;
+    public String getMin_operator() {
+        return min_operator;
     }
 
-    public void setMin_value(String min_value) {
-        this.min_value = min_value;
+    public void setMin_operator(String min_operator) {
+        this.min_operator = min_operator;
     }
 
-    public String getMin_concept_text() {
-        return min_concept_text;
-    }
-
-    public void setMin_concept_text(String min_concept_text) {
-        this.min_concept_text = min_concept_text;
-    }
-
-    public String getMax_value() {
-        return max_value;
+    public String getMin_value() {
+        return min_value;
     }
 
-    public void setMax_value(String max_value) {
-        this.max_value = max_value;
+    public void setMin_value(String min_value) {
+        this.min_value = min_value;
     }
 
-    public String getMax_concept_text() {
-        return max_concept_text;
+    public String getMin_unit() {
+        return min_unit;
     }
 
-    public void setMax_concept_text(String max_concept_text) {
-        this.max_concept_text = max_concept_text;
+    public void setMin_unit(String min_unit) {
+        this.min_unit = min_unit;
     }
 
-    public String getSet_value() {
-        return set_value;
+    public String getMax_operator() {
+        return max_operator;
     }
 
-    public void setSet_value(String set_value) {
-        this.set_value = set_value;
+    public void setMax_operator(String max_operator) {
+        this.max_operator = max_operator;
     }
 
-    public String getSet_concept_text() {
-        return set_concept_text;
+    public String getMax_value() {
+        return max_value;
     }
 
-    public void setSet_concept_text(String set_concept_text) {
-        this.set_concept_text = set_concept_text;
+    public void setMax_value(String max_value) {
+        this.max_value = max_value;
     }
 
-    public String getUnit() {
-        return unit;
+    public String getMax_unit() {
+        return max_unit;
     }
 
-    public void setUnit(String unit) {
-        this.unit = unit;
+    public void setMax_unit(String max_unit) {
+        this.max_unit = max_unit;
     }
 
-    public String getType_value() {
-        return type_value;
+    public String getEq_operator() {
+        return eq_operator;
     }
 
-    public void setType_value(String type_value) {
-        this.type_value = type_value;
+    public void setEq_operator(String eq_operator) {
+        this.eq_operator = eq_operator;
     }
 
-    public String getMinRemind() {
-        return minRemind;
+    public String getEq_value() {
+        return eq_value;
     }
 
-    public void setMinRemind(String minRemind) {
-        this.minRemind = minRemind;
+    public void setEq_value(String eq_value) {
+        this.eq_value = eq_value;
     }
 
-    public String getMaxRemind() {
-        return maxRemind;
+    public String getEq_unit() {
+        return eq_unit;
     }
 
-    public void setMaxRemind(String maxRemind) {
-        this.maxRemind = maxRemind;
+    public void setEq_unit(String eq_unit) {
+        this.eq_unit = eq_unit;
     }
 
-    public String getSetRemind() {
-        return setRemind;
+    public String getRemind() {
+        return remind;
     }
 
-    public void setSetRemind(String setRemind) {
-        this.setRemind = setRemind;
+    public void setRemind(String remind) {
+        this.remind = remind;
     }
 }

common-push/src/main/java/org/diagbot/common/push/cache/ApplicationCacheUtil.java

@@ -102,21 +102,20 @@ public class ApplicationCacheUtil {
         for (String line:fileContents) {
             String[] content = line.split("\\|");
             Rule rule = new Rule();
-            if (content.length == 14) {
+            if (content.length == 13) {
                 rule.setIdx_name(content[0]==null?"":content[0]);
                 rule.setSet_name(content[1]==null?"":content[1]);
-                rule.setSet_status(content[2]==null?"":content[2]);
-                rule.setMin_value(content[3]==null?"":content[3]);
-                rule.setMin_concept_text(content[4]==null?"":content[4]);
-                rule.setMax_value(content[5]==null?"":content[5]);
-                rule.setMax_concept_text(content[6]==null?"":content[6]);
-                rule.setSet_value(content[7]==null?"":content[7]);
-                rule.setSet_concept_text(content[8]==null?"":content[8]);
-                rule.setUnit(content[9]==null?"":content[9]);
-                rule.setType_value(content[10]==null?"":content[10]);
-                rule.setMinRemind(content[11]==null?"":content[11]);
-                rule.setMaxRemind(content[12]==null?"":content[12]);
-                rule.setSetRemind(content[13]==null?"":content[13]);
+                rule.setSet_name_check(content[2]==null?"":content[2]);
+                rule.setMin_operator(content[3]==null?"":content[3]);
+                rule.setMin_value(content[4]==null?"":content[4]);
+                rule.setMin_unit(content[5]==null?"":content[5]);
+                rule.setMax_operator(content[6]==null?"":content[6]);
+                rule.setMax_value(content[7]==null?"":content[7]);
+                rule.setMax_unit(content[8]==null?"":content[8]);
+                rule.setEq_operator(content[9]==null?"":content[9]);
+                rule.setEq_value(content[10]==null?"":content[10]);
+                rule.setEq_unit(content[11]==null?"":content[11]);
+                rule.setRemind(content[12]==null?"":content[12]);
                 if (kl_rule_filter_map.get(rule.getIdx_name()) == null) {
                     rules = new ArrayList<>();
                 } else {