规则数据库中添加了对内容相等的判断，程序中对于内容相等的判断逻辑重新改写

bigdata-web/src/main/java/org/diagbot/bigdata/common/ApplicationCacheUtil.java

@@ -233,7 +233,7 @@ public class ApplicationCacheUtil {
         String key;
 
         String[] labels = {"set_name","idx_name","min_operator","min_value","min_unit",
-                "max_operator","max_value","max_unit","remind"};
+                "max_operator","max_value","max_unit","eq_operator","eq_value","eq_unit","remind"};
 
         Configuration configuration = new DefaultConfig();
         List<String> fileContents = configuration.readFileContents("rule_filter.dict");

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

@@ -332,11 +332,11 @@ public class CacheFileManager {
 
             //规则过滤信息
             sql = "SELECT set_name, idx_name, min_operator, min_value, min_unit, max_operator, " +
-                    " max_value, max_unit, remind FROM kl_rule ";
+                    " max_value, max_unit, eq_operator, eq_value, eq_unit, remind FROM kl_rule ";
             st = conn.createStatement();
             rs = st.executeQuery(sql);
             fw = new FileWriter(path + "rule_filter.dict");
-            String r6, r7, r8, r9;
+            String r6, r7, r8, r9, r10, r11, r12;
             while (rs.next()) {
                 r1 = rs.getString(1);
                 r2 = rs.getString(2);
@@ -347,8 +347,11 @@ public class CacheFileManager {
                 r7 = rs.getString(7);
                 r8 = rs.getString(8);
                 r9 = rs.getString(9);
+                r10 = rs.getString(10);
+                r11 = rs.getString(11);
+                r12 = rs.getString(12);
                 fw.write(encrypDES.encrytor(r1+ "|" + r2 + "|" + r3 + "|" + r4 + "|" + r5
-                        + "|" + r6 + "|" + r7 + "|" + r8 + "|" + r9));
+                        + "|" + r6 + "|" + r7 + "|" + r8 + "|" + r9 + "|" + r10 + "|" + r11 + "|" + r12));
                 fw.write("\n");
             }
             fw.close();

common-service/src/main/java/org/diagbot/common/javabean/Rule.java

@@ -27,6 +27,12 @@ public class Rule {
     private String max_value;
     // 最大值单位
     private String max_unit;
+    // 相等操作符
+    private String eq_operator;
+    // 等于值
+    private String eq_value;
+    // 等于值单位
+    private String eq_unit;
     // 推送名称
     private String remind;
 
@@ -35,16 +41,19 @@ public class Rule {
     public Rule(String[] elements) {
 //        Rule rule = new Rule();
 
-        if (elements.length == 9) {
-            this.set_name = elements[0];
-            this.idx_name = elements[1];
-            this.min_operator = elements[2];
-            this.min_value = elements[3];
-            this.min_unit = elements[4];
-            this.max_operator = elements[5];
-            this.max_value = elements[6];
-            this.max_unit = elements[7];
-            this.remind = elements[8];
+        if (elements.length == 12) {
+            this.set_name = (null == elements[0])?"":elements[0];
+            this.idx_name = (null == elements[1])?"":elements[1];
+            this.min_operator = (null == elements[2])?"":elements[2];
+            this.min_value = (null == elements[3])?"":elements[3];
+            this.min_unit = (null == elements[4])?"":elements[4];
+            this.max_operator = (null == elements[5])?"":elements[5];
+            this.max_value = (null == elements[6])?"":elements[6];
+            this.max_unit = (null == elements[7])?"":elements[7];
+            this.eq_operator = (null == elements[8])?"":elements[8];
+            this.eq_value = (null == elements[9])?"":elements[9];
+            this.eq_unit = (null == elements[10])?"":elements[10];
+            this.remind = (null == elements[11])?"":elements[11];
         }
     }
 }

push-web/src/main/java/org/diagbot/push/convert/PreProcess.java

@@ -194,10 +194,11 @@ public class PreProcess {
         try {
             if (null == numval && otherval.trim().length() > 0) {
                 for (Rule rule : rules) {
-                    if (rule.getMin_operator().equals("=") && otherval.contains(rule.getMin_value())) {
+                    if (rule.getEq_operator().equals("=") && otherval.contains(rule.getEq_value())) {
                         StringBuffer rulesContent = new StringBuffer();
                         StringBuffer append = rulesContent.append(rule.getIdx_name()).append(rule.getMin_operator()).append(rule.getMin_value()).append(rule.getMin_unit())
-                                .append(rule.getMax_operator()).append(rule.getMax_value()).append(rule.getMax_unit());
+                                .append(rule.getMax_operator()).append(rule.getMax_value()).append(rule.getMax_unit())
+                                .append(rule.getEq_operator()).append(rule.getEq_value()).append(rule.getEq_unit());
                         MedicalIndication medind = new MedicalIndication();
                         List<MedicalIndicationDetail> k = new ArrayList<>();
                         MedicalIndicationDetail mid = new MedicalIndicationDetail();
@@ -210,6 +211,7 @@ public class PreProcess {
                         k.add(mid);
                         medind.setName(rule.getRemind());
                         medind.setDetails(k);
+                        medind.setRule(append.toString());
                         reminder.add(medind);
 
                         System.out.println(medind.getRule() + " -> " + medind.getName());
@@ -272,6 +274,7 @@ public class PreProcess {
                         k.add(mid);
                         medind.setName(rule.getRemind());
                         medind.setDetails(k);
+                        medind.setRule(append.toString());
                         reminder.add(medind);
 
                         System.out.println(medind.getRule() + " -> " + medind.getName());