修改日志记录的bug

src/main/java/com/persagy/client/GroupNettyClient.java

@@ -151,7 +151,7 @@ public class GroupNettyClient {
         }
     }*/
     public void sendMessage(String msg) throws InterruptedException {
-        log.info("给云端发送数据", msg);
+        log.info("给云端发送数据: {}", msg);
         if (channelGroup.isWritable()) {
             channelGroup.writeAndFlush(msg);
         } else {

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

@@ -54,6 +54,18 @@ public class HelloWorld {
 		return "成功";
 	}
 
+	@PostMapping("/testMesage5")
+	public String testMesage5(@RequestBody JSONObject jsonObject) throws Exception {
+		NettyMessage nettyMessage = new NettyMessage(groupNettyClient.projectId);
+		nettyMessage.setRemark("连接已经建立；");
+		nettyMessage.setOpCode(5);
+		jsonObject.put("groupCode", groupNettyClient.groupCode);
+		jsonObject.put("projectId", groupNettyClient.projectId);
+		nettyMessage.setContent(Arrays.asList(jsonObject));
+		groupNettyClient.sendMessage(nettyMessage.toString());
+		return "成功";
+	}
+
 	@PostMapping("/test")
 	public String test(@RequestBody JSONObject jsonObject) throws Exception {
 		LockUtil.getInstance().lock.lock();
@@ -154,11 +166,12 @@ public class HelloWorld {
 	}
 	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>Pclose*0.05&&CsWTFch<0.01";
+		String expression = "(EnergyData!=NaN&&Pclose!=NaN)?EnergyData>Pclose*0.05:true||CsWTFch<0.01";
 		HashMap<String, Object> paramMap = new HashMap<>();
 		paramMap.put("CsWTFch", -0.00762122);
-		paramMap.put("EnergyData", 6.125);
-		paramMap.put("Pclose", 5.0);
+//		paramMap.put("EnergyData", 6.125);
+//		paramMap.put("Pclose", 5.0);
 		System.out.println(checkExpression(expression, paramMap));
 	}
 }

src/main/java/com/persagy/utils/DateUtils.java

@@ -305,11 +305,14 @@ public class DateUtils {
 
     @SuppressWarnings("deprecation")
     public static void main(String[] args) {
-        System.out.println(getSdfTimeNotDate(sdfTime));
-        LocalDateTime parse1 = DateUtils.parse("20150612152611");
-        LocalDateTime parse2 = DateUtils.parse("20150613152610");
-        System.out.println(betweenTwoTime(parse1, parse2, ChronoUnit.HOURS));
-        test1();
+//        System.out.println(getSdfTimeNotDate(sdfTime));
+//        LocalDateTime parse1 = DateUtils.parse("20150612152611");
+//        LocalDateTime parse2 = DateUtils.parse("20150613152610");
+//        System.out.println(betweenTwoTime(parse1, parse2, ChronoUnit.HOURS));
+//        test1();
+        String time = "20210913162100";
+        Date date = parseDate(time);
+        System.out.println(date);
 
     }
 

src/main/resources/application.yml

@@ -5,10 +5,10 @@ spring:
   application:
     name: alarm-engine
   datasource:
-    url: jdbc:mysql://192.168.100.210:33306/alarm_engine2?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+    url: jdbc:mysql://192.168.100.94:9934/alarm-quartz?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
     driver-class-name: com.mysql.jdbc.Driver  # mysql8.0以前使用com.mysql.jdbc.Driver
     username: root
-    password: 123456
+    password: persagy@2020
     type: com.alibaba.druid.pool.DruidDataSource
     initial-size: 5  # 初始化大小
     min-idle: 5  # 最小
@@ -40,13 +40,13 @@ group:
   code: HR   #标识哪个集团 比如万达使用WD, 华润使用HR
   alarm:
 #    host: 192.168.100.215     #netty IP
-    host: 192.168.16.148     #netty IP
+    host: localhost     #netty IP
     port: 9986          #netty 端口9986
 terminal:  #边缘端IOT采集程序地址
   alarm:  # 拼接后的地址为ws://host:port/suffix
     compress: false    #采用的是压缩方式还是不压缩方式  true-压缩 false-不压缩
 #    host: 192.168.100.215
-    host: 192.168.16.148
+    host: localhost
     port: 9925
     suffix: websocket/iot   #websocker后缀
 project: