修改规则判断代码

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

@@ -13,11 +13,7 @@ import lombok.Setter;
 public class Rule {
     private String id = "";
     // 大类名称
-    private String set_name = "";
-    // 小类名称
-    private String idx_name = "";
-    // 大类名称是否参与比较 1-参与
-    private String set_name_check = "";
+    private String pub_name = "";
     // 最小值比较符
     private String min_operator = "";
     // 最小值
@@ -49,28 +45,12 @@ public class Rule {
         this.id = id;
     }
 
-    public String getSet_name() {
-        return set_name;
+    public String getPub_name() {
+        return pub_name;
     }
 
-    public void setSet_name(String set_name) {
-        this.set_name = set_name;
-    }
-
-    public String getIdx_name() {
-        return idx_name;
-    }
-
-    public void setIdx_name(String idx_name) {
-        this.idx_name = idx_name;
-    }
-
-    public String getSet_name_check() {
-        return set_name_check;
-    }
-
-    public void setSet_name_check(String set_name_check) {
-        this.set_name_check = set_name_check;
+    public void setPub_name(String pub_name) {
+        this.pub_name = pub_name;
     }
 
     public String getMin_operator() {

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

@@ -105,28 +105,26 @@ public class ApplicationCacheUtil {
         for (String line : fileContents) {
             String[] content = line.split("\\|");
             Rule rule = new Rule();
-            if (content.length == 14) {
+            if (content.length == 12) {
                 rule.setId(content[0] == null ? "" : content[0]);
-                rule.setIdx_name(content[1] == null ? "" : content[1]);
-                rule.setSet_name(content[2] == null ? "" : content[2]);
-                rule.setSet_name_check(content[3] == null ? "" : content[3]);
-                rule.setMin_operator(content[4] == null ? "" : content[4]);
-                rule.setMin_value(content[5] == null ? "" : content[5]);
-                rule.setMin_unit(content[6] == null ? "" : content[6]);
-                rule.setMax_operator(content[7] == null ? "" : content[7]);
-                rule.setMax_value(content[8] == null ? "" : content[8]);
-                rule.setMax_unit(content[9] == null ? "" : content[9]);
-                rule.setEq_operator(content[10] == null ? "" : content[10]);
-                rule.setEq_value(content[11] == null ? "" : content[11]);
-                rule.setEq_unit(content[12] == null ? "" : content[12]);
-                rule.setRemind(content[13] == null ? "" : content[13]);
-                if (kl_rule_filter_map.get(rule.getIdx_name()) == null) {
+                rule.setPub_name(content[1] == null ? "" : content[1]);
+                rule.setMin_operator(content[2] == null ? "" : content[2]);
+                rule.setMin_value(content[3] == null ? "" : content[3]);
+                rule.setMin_unit(content[4] == null ? "" : content[4]);
+                rule.setMax_operator(content[5] == null ? "" : content[5]);
+                rule.setMax_value(content[6] == null ? "" : content[6]);
+                rule.setMax_unit(content[7] == null ? "" : content[7]);
+                rule.setEq_operator(content[8] == null ? "" : content[8]);
+                rule.setEq_value(content[9] == null ? "" : content[9]);
+                rule.setEq_unit(content[10] == null ? "" : content[10]);
+                rule.setRemind(content[11] == null ? "" : content[11]);
+                if (kl_rule_filter_map.get(rule.getPub_name()) == null) {
                     rules = new ArrayList<>();
                 } else {
-                    rules = kl_rule_filter_map.get(rule.getIdx_name());
+                    rules = kl_rule_filter_map.get(rule.getPub_name());
                 }
                 rules.add(rule);
-                kl_rule_filter_map.put(rule.getIdx_name(), rules);
+                kl_rule_filter_map.put(rule.getPub_name(), rules);
             }
         }
     }

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

@@ -331,12 +331,12 @@ public class CacheFileManager {
             fw.close();
 
             //规则过滤信息
-            sql = "SELECT id, idx_name, set_name, set_name_check, min_operator, min_value, min_unit, max_operator, max_value, " +
-                    "max_unit, eq_operator, eq_value, eq_unit, remind FROM kl_rule";
+            sql = "SELECT id, pub_name, min_operator, min_value, min_unit, max_operator, max_value, " +
+                    "max_unit, eq_operator, eq_value, eq_unit, remind FROM kl_rule_pub";
             st = conn.createStatement();
             rs = st.executeQuery(sql);
             fw = new FileWriter(path + "bigdata_rule_filter.dict");
-            String r6, r7, r8, r9, r10, r11, r12, r13, r14;
+            String r6, r7, r8, r9, r10, r11, r12;
             while (rs.next()) {
                 r1 = String.valueOf(rs.getInt(1));
                 r2 = rs.getString(2);
@@ -350,8 +350,6 @@ public class CacheFileManager {
                 r10 = rs.getString(10);
                 r11 = rs.getString(11);
                 r12 = rs.getString(12);
-                r13 = rs.getString(13);
-                r14 = rs.getString(14);
                 r1 = StringUtils.isEmpty(r1) ? "" : r1;
                 r2 = StringUtils.isEmpty(r2) ? "" : r2;
                 r3 = StringUtils.isEmpty(r3) ? "" : r3;
@@ -364,11 +362,9 @@ public class CacheFileManager {
                 r10 = StringUtils.isEmpty(r10) ? "" : r10;
                 r11 = StringUtils.isEmpty(r11) ? "" : r11;
                 r12 = StringUtils.isEmpty(r12) ? "" : r12;
-                r13 = StringUtils.isEmpty(r13) ? "" : r13;
-                r14 = StringUtils.isEmpty(r14) ? "" : r14;
                 fw.write(encrypDES.encrytor(r1 + "|" + r2 + "|" + r3 + "|" + r4 + "|" + r5
                         + "|" + r6 + "|" + r7 + "|" + r8 + "|" + r9 + "|" + r10 + "|" + r11
-                        + "|" + r12 + "|" + r13 + "|" + r14));
+                        + "|" + r12));
                 fw.write("\n");
             }
             fw.close();

common-push/src/main/java/org/diagbot/common/push/filter/rule/PretreatmentRule.java

@@ -64,10 +64,8 @@ public class PretreatmentRule {
                         continue;
                     }
                     for (Rule rule : rules) {
-                        if (Constants.COMMON_STRING_1.equals(rule.getSet_name_check())) {
-                            if (StringUtils.isEmpty(rule.getSet_name()) || !result.getName().equals(rule.getSet_name())) {
-                                continue;
-                            }
+                        if (StringUtils.isEmpty(rule.getPub_name()) || !result.getUniqueName().equals(rule.getPub_name())) {
+                            continue;
                         }
                         content = conceptConvert(result, rule, content);
                         rule.setOriginText(result.getDetailName() + ":" + result.getValue() + result.getUnits());