提交代码

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
+#spring.datasource.mysql-server.jdbc-url = jdbc:mysql://172.16.4.23:3306/${EQUIP_DATABASE}?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+
+spring.datasource.mysql-server.jdbc-url = jdbc:kingbase8://192.168.0.68:54321/equipment?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTime
+zoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&currentSchema=root
+
+
+
 spring.datasource.mysql-server.username=root
 spring.datasource.mysql-server.password=Yeejoin@2020
 spring.datasource.mysql-server.type=com.zaxxer.hikari.HikariDataSource
@@ -15,7 +20,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://10.20.0.169:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+spring.datasource.tdengine-server.jdbc-url = jdbc:TAOS-RS://192.168.0.61: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
@@ -28,75 +33,82 @@ 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=10.20.0.169
+spring.redis.host=192.168.0.70
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
-spring.redis.timeout=3000
-spring.redis.lettuce.pool.max-active=300
+spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1
-spring.redis.lettuce.pool.max-idle=64
+spring.redis.lettuce.pool.max-idle=10
 spring.redis.lettuce.pool.min-idle=0
 
-eureka.client.registry-fetch-interval-seconds=5
-management.endpoint.health.show-details=always
-management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url-path=/actuator/health
-eureka.instance.lease-expiration-duration-in-seconds=10
-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= 172.17.3.6
+
+#eureka.instance.ip-address= 172.16.3.135
+eureka.instance.hostname=192.168.0.46
+
 eureka.instance.prefer-ip-address = true
-eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@47.92.234.253:10001/eureka/
+eureka.client.serviceUrl.defaultZone=http://admin:a1234560@192.168.0.46:10001/eureka/
 spring.security.user.name=admin
 spring.security.user.password=a1234560
-
+#security config
+#security.password=a1234560
+#security.loginId=fas_system
+security.productApp=STUDIO_APP_MOBILE
+#security.productWeb=STUDIO_APP_WEB
+#security.appKeyApp=studio_normalapp_3056965
 
 emqx.clean-session=true
 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.broker=tcp://192.168.0.70:2883
 emqx.client-user-name=admin
-emqx.client-password=public
+emqx.client-password=Yeejoin@2020
 emqx.max-inflight=1000
 emqx.keep-alive-interval=100
 emqx.biz-topic[0]= iot/data/perspective
 
+# influxDB
+spring.influx.url=http://192.168.0.70:18086
+spring.influx.user=root
+spring.influx.password=Yeejoin@2020
+spring.influx.database=iot_platform
+spring.influx.retention_policy=default
+spring.influx.retention_policy_time=960d
+spring.influx.actions=10000
+spring.influx.bufferLimit=20000
 
 #kafka
-spring.kafka.bootstrap-servers=10.20.0.169:9092
+spring.kafka.bootstrap-servers=192.168.0.52:9092
 spring.kafka.producer.retries=1
-spring.kafka.producer.bootstrap-servers=10.20.0.169:9092
+spring.kafka.producer.bootstrap-servers=192.168.0.52: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=10.20.0.169:9092
+spring.kafka.consumer.bootstrap-servers=192.168.0.52: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
 spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer
+spring.kafka.listener.ack-mode=manual_immediate
 spring.kafka.consumer.fetch-max-wait= 1000
 spring.kafka.consumer.max-poll-records=1000
-spring.kafka.listener.ack-mode=manual_immediate
 spring.kafka.listener.type=batch
-kafka.alarm.topic=EQUIPMENT_ALARM
 kafka.topic=PERSPECTIVE
+kafka.alarm.topic=EQUIPMENT_ALARM
 emq.topic=iot/data/perspective
+kafka.equipment.alarm=EQUIPMENT_ALARM
 
-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
+elasticsearch.address= 192.168.0.52:9200
+elasticsearch.username= elastic
+elasticsearch.password= Yeejoin@2020
+elasticsearch.scheme= http
+elasticsearch.connectTimeout= 500000
+elasticsearch.socketTimeout= 500000
+elasticsearch.connectionRequestTimeout= 50000
+elasticsearch.maxConnectNum= 40000
+elasticsearch.maxConnectPerRoute= 6000
+spring.elasticsearch.rest.read-timeout=600000
+spring.elasticsearch.rest.connection-timeout=600000

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarInfoController.java

@@ -66,7 +66,7 @@ public class CarInfoController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
     public boolean updateByIdCarInfo(HttpServletRequest request, @RequestBody CarInfo carInfo){
-    return iCarInfoService.updateById(carInfo);
+       return iCarInfoService.updateById(carInfo);
     }
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/icbc.puml

+@startuml
+'https://plantuml.com/class-diagram
+
+abstract class AbstractList
+abstract AbstractCollection
+interface List
+interface Collection
+
+List <|-- AbstractList
+Collection <|-- AbstractCollection
+
+Collection <|- List
+AbstractCollection <|- AbstractList
+AbstractList <|-- ArrayList
+
+class ArrayList {
+Object[] elementData
+size()
+}
+
+enum TimeUnit {
+DAYS
+HOURS
+MINUTES
+}
+
+@enduml
\ No newline at end of file