修改告警时间格式化

amos-boot-system-jxiop/amos-boot-module-jxiop-warn-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/EquipAlarmEventServiceImpl.java

@@ -64,10 +64,16 @@ public class EquipAlarmEventServiceImpl
 			} else if ("false".equals(i.getValue())) {
 				i.setValue("分");
 			}
-			long mills = i.getCreatedTime() / 1000000;
+			long mills = i.getCreatedTime() ;
 			car.setTimeInMillis(mills);
 			// System.out.println(sdf.format(car.getTime()));
-			i.setTime(sdf.format(car.getTime()));
+			String time = sdf.format(car.getTime());
+			if (time.contains("1970")) {
+				mills = i.getCreatedTime()/ 1000000;;
+				car.setTimeInMillis(mills);
+				time = sdf.format(car.getTime());
+			}
+			i.setTime(time);
 			// car.add(Calendar.HOUR, 12);
 			// System.out.println(sdf.format(car.getTime()));
 		});

amos-boot-system-jxiop/amos-boot-module-jxiop-warn-biz/src/main/resources/application-dev.properties

@@ -14,17 +14,17 @@ spring.db2.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
 
 ## db3-td-engine
 #spring.db3.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db3.datasource.url=jdbc:TAOS-RS://139.9.170.47:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+spring.db3.datasource.url=jdbc:TAOS-RS://10.20.0.203:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
 spring.db3.datasource.username=root
 spring.db3.datasource.password=taosdata
 spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
 
 ## eureka properties:
-eureka.instance.hostname=172.16.10.220
+eureka.instance.hostname=139.9.173.44
 eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
 ## redis properties:
 spring.redis.database=1
-spring.redis.host=172.16.10.220
+spring.redis.host=139.9.173.44
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
@@ -60,10 +60,10 @@ lettuce.timeout=10000
 
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.10.220:1883
+emqx.broker=tcp://139.9.173.44:2883
 emqx.user-name=admin
 emqx.password=public
-mqtt.scene.host=mqtt://172.16.10.220:8083/mqtt
+mqtt.scene.host=mqtt://139.9.173.44:8083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000