Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml

@@ -64,7 +64,7 @@
                 AND hbga.grid_status = #{map.gridStatus}
             </if>
             <if test="map.gridConnectionTime != null">
-                AND DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d') = DATE_FORMAT( #{map.gridConnectionTime}, '%Y-%m-%d')
+                AND DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d') = #{map.gridConnectionTime}
             </if>
         </where>
         ORDER BY

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

@@ -963,6 +963,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
             d.add(WorkOrderEnum.待施工.getCode());
             d.add(WorkOrderEnum.待登记.getCode());
             d.add(WorkOrderEnum.待审核.getCode());
+            d.add(WorkOrderEnum.未通过.getCode());
             qu1.in(WorkOrderPowerStation::getPowerStationConstructionStatus, d);
             List<WorkOrderPowerStation> list = workOrderPowerStationMapper.selectList(qu1);
             LambdaUpdateWrapper<WorkOrder> upq = new LambdaUpdateWrapper();

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-kingbase8.properties

 ## DB properties:
 spring.datasource.dynamic.primary= mysql-service
-
-#spring.datasource.mysql-service.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.mysql-service.jdbc-url=jdbc:mysql://47.92.234.253:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
-
+spring.datasource.mysql-service.driver-class-name=com.kingbase8.Driver
+spring.datasource.mysql-service.jdbc-url=jdbc:kingbase8://10.20.1.176:54321/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.mysql-service.username=root
 spring.datasource.mysql-service.password=Yeejoin@2020
-spring.datasource.mysql-service.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.mysql-service.type=com.alibaba.druid.pool.DruidDataSource
 #最小连接
 spring.datasource.mysql-service.minimum-idle: 5
 #最大连接
@@ -25,7 +23,7 @@ spring.datasource.mysql-service.connection-timeout: 30000
 
 
 spring.datasource.tdengine-service.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
-spring.datasource.tdengine-service.jdbc-url=jdbc:TAOS-RS://47.92.234.253:6041/house_pv_data?user=root&password=taosdata&timezone=GMT+8
+spring.datasource.tdengine-service.jdbc-url=jdbc:TAOS-RS://10.20.0.169:6041/house_pv_data?user=root&password=taosdata&timezone=GMT+8
 spring.datasource.tdengine-service.username=root
 spring.datasource.tdengine-service.password=taosdata
 spring.datasource.tdengine-service.type=com.zaxxer.hikari.HikariDataSource
@@ -52,11 +50,11 @@ spring.datasource.tdengine-service.connection-test-query: SELECT 1
 
 
 ## eureka properties:
-eureka.instance.hostname=47.92.234.253
+eureka.instance.hostname=10.20.1.160
 eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
 ## redis properties:
 spring.redis.database=1
-spring.redis.host=47.92.234.253
+spring.redis.host=10.20.1.210
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
@@ -92,13 +90,13 @@ lettuce.timeout=10000
 
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://47.92.234.253:2883
+emqx.broker=tcp://10.20.1.210:2883
 emqx.user-name=admin
 emqx.password=public
 emqx.max-inflight=1000
 
 
-spring.influx.url=http://47.92.234.253:8086
+spring.influx.url=http://10.20.0.203:8086
 spring.influx.password=Yeejoin@2020
 spring.influx.user=root
 spring.influx.database=iot_platform
@@ -127,7 +125,7 @@ amos.secret.key=qaz
 # if your service can't be access ,you can use this setting , you need change ip as your.
 #eureka.instance.prefer-ip-address=true
 #eureka.instance.ip-address=172.16.3.122
-spring.activemq.broker-url=tcp://47.92.234.253:61616
+spring.activemq.broker-url=tcp://10.20.1.210:61616
 spring.activemq.user=admin
 spring.activemq.password=admin
 spring.jms.pub-sub-domain=false
@@ -233,17 +231,18 @@ dealer.amosDealerId=1767820997374775298
 
 #Seata Config
 seata.tx-service-group=hygf-seata
-seata.service.grouplist.hygf-seata=172.16.0.29:8091
+seata.service.grouplist.hygf-seata=10.20.0.203:8091
 # Seata 配置
 seata.enabled=true
 seata.enable-auto-data-source-proxy=false
-#seata.client.undo.log-serialization=kryo
-#
 
+seata.datasource.autoproxy.datasource-proxy-mode=original
+seata.datasource.autoproxy.enabled=true
+seata.datasource.autoproxy.data-source-names=mysql
 
 
 ## 47环境 排除es报错引进无用配置 业务未实际使用es
-spring.elasticsearch.rest.uris=http://47.92.234.253:9200
+spring.elasticsearch.rest.uris=http://10.20.0.203:9200
 spring.elasticsearch.rest.connection-timeout=30000
 spring.elasticsearch.rest.username=elastic
 spring.elasticsearch.rest.password=123456