修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -172,7 +172,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 
 	private static int comparingByGroupVal(Map<String, Object> map, Map<String, Object> map2, String key) {
 		int result = 0;
-		if (map.get(key) instanceof DateTime) {
+		if (map.get(key) instanceof Date) {
 			long r1 = ((Date) map.get(key)).getTime();
 			long r2 = ((Date) map2.get(key)).getTime();
 			result = Long.compare(r1, r2);

amos-boot-system-equip/src/main/resources/application-dev.properties

 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://172.16.10.211/xiy_safety_business_v3.0.1_20100712?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://172.16.3.6/xiy_safety_business_v3.0.1_20100712?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 spring.datasource.username=root
-spring.datasource.password=Yeejoin@2020
+spring.datasource.password=cz123456
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.pool-name=DatebookHikariCP
 spring.datasource.hikari.minimum-idle= 3
@@ -93,7 +93,7 @@ spring.mqtt.completionTimeout=3000
 #数据同步开关
 systemctl.sync.switch=false
 #数据JCS开关
-systemctl.jcs.switch=false
+systemctl.jcs.switch=true
 #平台数据开关
 systemctl.amos.switch=false
 isSendApp=false

amos-boot-system-jcs/pom.xml

@@ -9,7 +9,7 @@
 
 
   <artifactId>amos-boot-system-jcs</artifactId>
-    <version>1.0.0.16.1</version>
+    <version>1.0.0.16.2</version>
 
   <dependencies>
         <dependency>

amos-boot-system-jcs/src/main/resources/application-cluster.properties

 ## DB properties:
-spring.datasource.url=jdbc:mysql://172.16.10.211:3306/xiy_bootsystem_jcs_v1.0.0.1_20210729?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://172.16.3.6:3306/xiy_bootsystem_jcs_v1.0.0.1_20210729?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
-spring.datasource.password=Yeejoin@2020
+spring.datasource.password=cz123456
 
 ## eureka properties:
-eureka.client.serviceUrl.defaultZone=http://172.16.10.211:10001/eureka/
+eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@172.16.10.211:10001/eureka/
 
 #redis 基础配置
 spring.redis.database=0
@@ -62,7 +62,7 @@ emqx.keep-alive-interval=10
 rule.definition.load=false
 rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
 rule.definition.default-agency=jcs
-rule.definition.localIp=172.16.3.35
+
 
 
 ## file properties:

amos-boot-system-patrol/src/main/resources/application-dev.properties

@@ -16,9 +16,9 @@ ribbon.MaxAutoRetries = 1
 xiy_amos_satety_business
 spring.reactor.debug-agent.enabled=true
 #DB properties:
-spring.datasource.url=jdbc:mysql://172.16.10.211:3306/xiy_safety_business_v3.0.1_20100712?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://172.16.3.6:3306/xiy_safety_business_v3.0.1_20100712?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 spring.datasource.username=root
-spring.datasource.password=Yeejoin@2020
+spring.datasource.password=cz123456
 spring.datasource.driver-class-name = com.mysql.jdbc.Driver
 spring.datasource.hikari.maxLifetime = 1765000
 spring.datasource.testWhileIdle = true

amos-boot-system-patrol/src/main/resources/application.properties

@@ -67,7 +67,7 @@ rule.definition.model-package=com.yeejoin.amos.patrol.business.entity.mybatis
 rule.definition.default-agency=STATE_GRID
 
 jcs.fegin.name=JCS
-emergency.command.section.id=1418223840361709569
+emergency.command.section.id=1435847875492880385
 
 ##  增加接口文档验证
 knife4j.enable=true