报警条件中增加了rules字段用于记录中文的报警规则

pom.xml

@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.googlecode.aviator</groupId>
             <artifactId>aviator</artifactId>
-            <version>5.1.4</version>
+            <version>5.2.5</version>
         </dependency>
         <!-- netty -->
         <dependency>

src/main/java/com/persagy/controller/HelloWorld.java

@@ -165,11 +165,10 @@ public class HelloWorld {
 		return (Boolean) triggerExp.execute(paramMap);
 	}
 	public static void main(String[] args) {
-//		String expression = "EnergyData>Pclose*5%&&CS-ChillersCOP<=1.0";
-//		String expression = "EnergyData>Pclose*0.05&&CsWTFch<0.01";
-		String expression = "(EnergyData!=NaN&&Pclose!=NaN)?EnergyData>Pclose*0.05:true||CsWTFch<0.01";
+		String expression = "((Eq11010600015b743693f66e430e85334cc5e48cbf6d_ACATFU_SupplyAirTemp!=NaN && Eq11010600015b743693f66e430e85334cc5e48cbf6d_ACATFU_SupplyAirTemp!=NaN)) && (((Eq11010600015b743693f66e430e85334cc5e48cbf6d_ACATFU_SupplyAirTemp==NaN || Eq11010600015b743693f66e430e85334cc5e48cbf6d_ACATFU_SupplyAirTemp==NaN)?true:((Eq11010600015b743693f66e430e85334cc5e48cbf6d_ACATFU_SupplyAirTemp>=Eq11010600015b743693f66e430e85334cc5e48cbf6d_ACATFU_SupplyAirTemp))))";
+
 		HashMap<String, Object> paramMap = new HashMap<>();
-		paramMap.put("CsWTFch", -0.00762122);
+		paramMap.put("Eq11010600015b743693f66e430e85334cc5e48cbf6d_ACATFU_SupplyAirTemp", 1.0);
 //		paramMap.put("EnergyData", 6.125);
 //		paramMap.put("Pclose", 5.0);
 		System.out.println(checkExpression(expression, paramMap));

src/main/java/com/persagy/entity/Condition.java

@@ -46,6 +46,7 @@ import java.util.List;
 public class Condition {
     List<String> infoCode;
     private String configs;
+    private List<String> rules;
     List<JSONObject> infoCodes;
     private String trigger;
     private String end;

src/main/resources/application.yml

@@ -37,17 +37,15 @@ spring:
     hibernate:
       ddl-auto: none
 group:
-  code: HR   #标识哪个集团 比如万达使用WD, 华润使用HR
+  code: WD   #标识哪个集团 比如万达使用WD, 华润使用HR
   alarm:
-#    host: 192.168.100.215     #netty IP
-    host: localhost     #netty IP
+    host: 192.168.17.57    #netty IP
     port: 9986          #netty 端口9986
 terminal:  #边缘端IOT采集程序地址
   alarm:  # 拼接后的地址为ws://host:port/suffix
     compress: false    #采用的是压缩方式还是不压缩方式  true-压缩 false-不压缩
-#    host: 192.168.100.215
-    host: localhost
-    port: 9925
+    host: 192.168.17.57
+    port: 8080
     suffix: websocket/iot   #websocker后缀
 project:
   iotid:   #iot使用项目ID，不包含PJ