equip config

amos-boot-data/amos-boot-data-equip/src/main/java/com/yeejoin/equip/service/HandleESMessage2TDService.java

@@ -39,7 +39,7 @@ public class HandleESMessage2TDService {
     /**
      * 十分钟拉取ES数据存入TdEngine
      */
-    @Scheduled(cron = "0 */10 * * * ?")
+    @Scheduled(cron = "0 */2 * * * ?")
     @Transactional(rollbackFor = Exception.class)
     public void syncEsData2TDEngine() throws Exception {
         SimpleDateFormat format = new SimpleDateFormat(datePattern);
@@ -56,7 +56,7 @@ public class HandleESMessage2TDService {
         try {
             HashMap<String, String> syncFlag = new HashMap<>();
             syncFlag.put("sync_flag", "success");
-            emqKeeper.getMqttClient().publish("sync_esdata_to_tdengine_notice", JSON.toJSONString(syncFlag).getBytes(), 0, false);
+            emqKeeper.getMqttClient().publish("sync_esdata_to_tdengine_notice1", JSON.toJSONString(syncFlag).getBytes(), 0, false);
             log.info("同步ES数据至发发送消息给业务发送通知成功！");
         } catch (Exception exception) {
             log.info("同步ES数据至发发送消息给业务发送通知失败！");

amos-boot-data/amos-boot-data-equip/src/main/resources/application-kingbase8.properties

+
 #mysql ???
 spring.datasource.mysql-server.driver-class-name=com.kingbase8.Driver
 spring.datasource.mysql-server.jdbc-url = jdbc:kingbase8://10.20.1.176:54321/equipment?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&currentSchema=root
@@ -14,7 +15,7 @@ spring.datasource.mysql-server.hikari.connection-timeout= 60000
 spring.datasource.mysql-server.hikari.connection-test-query= SELECT 1
 #TDengine ???
 spring.datasource.tdengine-server.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
-spring.datasource.tdengine-server.jdbc-url = jdbc:TAOS-RS://139.9.170.47:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+spring.datasource.tdengine-server.jdbc-url = jdbc:TAOS-RS://10.20.0.169:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
 spring.datasource.tdengine-server.username=root
 spring.datasource.tdengine-server.password=taosdata
 spring.datasource.tdengine-server.type=com.zaxxer.hikari.HikariDataSource
@@ -27,8 +28,11 @@ spring.datasource.tdengine-server.hikari.max-lifetime= 1800000
 spring.datasource.tdengine-server.hikari.connection-timeout= 60000
 spring.datasource.tdengine-server.hikari.connection-test-query= show tables
 
+
+
+
 spring.redis.database=0
-spring.redis.host=139.9.173.44
+spring.redis.host=10.20.0.169
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 spring.redis.timeout=3000
@@ -46,33 +50,35 @@ eureka.instance.lease-renewal-interval-in-seconds=5
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
 eureka.instance.status-page-url-path=/actuator/info
 eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
-eureka.instance.hostname= 139.9.173.44
+eureka.instance.hostname= 172.17.3.6
 eureka.instance.prefer-ip-address = true
-eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@139.9.173.44:10001/eureka/
+eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@10.20.1.160:10001/eureka/
 spring.security.user.name=admin
 spring.security.user.password=a1234560
 
+
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}-${random.int[1,65536]}
-emqx.biz-client-id=consumer-${random.int[1,65536]}
-emqx.broker=tcp://139.9.173.44:1883
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.biz-client-id=consumer-${random.int[1024,65536]}
+emqx.broker=tcp://10.20.1.210:2883
 emqx.client-user-name=admin
 emqx.client-password=public
 emqx.max-inflight=1000
-emqx.keep-alive-interval=10
+emqx.keep-alive-interval=100
 emqx.biz-topic[0]= iot/data/perspective
 
+
 #kafka
-spring.kafka.bootstrap-servers=139.9.173.44:9092
+spring.kafka.bootstrap-servers=10.20.0.169:9092
 spring.kafka.producer.retries=1
-spring.kafka.producer.bootstrap-servers=139.9.173.44:9092
+spring.kafka.producer.bootstrap-servers=10.20.0.169:9092
 spring.kafka.producer.batch-size=16384
 spring.kafka.producer.buffer-memory=33554432
 spring.kafka.producer.acks=1
 spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.consumer.group-id=messageConsumerGroup
-spring.kafka.consumer.bootstrap-servers=139.9.173.44:9092
+spring.kafka.consumer.bootstrap-servers=10.20.0.169:9092
 spring.kafka.consumer.enable-auto-commit=true
 spring.kafka.consumer.auto-offset-reset=earliest
 spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer
@@ -85,12 +91,12 @@ kafka.alarm.topic=EQUIPMENT_ALARM
 kafka.topic=PERSPECTIVE
 emq.topic=iot/data/perspective
 
-elasticsearch.address= 139.9.173.44:9200
-elasticsearch.username= elastic
-elasticsearch.password= Yeejoin@2020
-elasticsearch.scheme= http
-elasticsearch.connectTimeout= 50000
-elasticsearch.socketTimeout= 50000
-elasticsearch.connectionRequestTimeout= 50000
-elasticsearch.maxConnectNum= 1000
-elasticsearch.maxConnectPerRoute= 1000
+elasticsearch.address=10.20.0.169:9200
+elasticsearch.username=elastic
+elasticsearch.password=123456
+elasticsearch.scheme=http
+elasticsearch.connectTimeout=50000
+elasticsearch.socketTimeout=50000
+elasticsearch.connectionRequestTimeout=50000
+elasticsearch.maxConnectNum=1000
+elasticsearch.maxConnectPerRoute=1000
\ No newline at end of file

amos-boot-data/amos-boot-data-equip/src/main/resources/application.properties

-spring.application.name=AMOS-DATA-EQUIP
+spring.application.name=AMOS-DATA-EQUIP-CZ
 server.servlet.context-path=/data-equip
 server.port=8100
 
-spring.profiles.active=dev
+spring.profiles.active=kingbase8
 server.compression.enabled=true
 spring.jackson.dateFormat=yyyy-MM-dd HH:mm:ss