Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanWeightController.java

@@ -317,7 +317,7 @@ public class IdxBizFanWeightController extends BaseController {
                 }
 
                 //剩余权重值
-                float formattedNum = num != 0 ? Float.parseFloat(new DecimalFormat("0.000").format((1 - valued) / num)) : 0;
+                float formattedNum = num != 0 ? Float.parseFloat(new DecimalFormat("0.0000000000").format((1 - valued) / num)) : 0;
 
                 for (IdxBizFanWeight listdatum : listdata) {
                     for (IdxBizFanWeight idxBizPvWeight : list) {

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvWeightController.java

@@ -326,7 +326,7 @@ public class IdxBizPvWeightController extends BaseController {
             }
 
             //剩余权重值
-            float formattedNum = num != 0 ? Float.parseFloat(new DecimalFormat("0.000").format((1 - valued) / num)) : 0;
+            float formattedNum = num != 0 ? Float.parseFloat(new DecimalFormat("0.0000000000").format((1 - valued) / num)) : 0;
 
             for (IdxBizPvWeight listdatum : listdata) {
                 for (IdxBizPvWeight idxBizPvWeight : list) {

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

@@ -26,14 +26,15 @@ spring.db6.datasource.password=Yeejoin@2020
 spring.db6.datasource.driver-class-name=com.kingbase8.Driver
 
 ## eureka properties:
-eureka.instance.hostname=10.20.1.160
+eureka.instance.hostname=47.92.234.253
 eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
 ## redis properties:
 spring.redis.database=1
-spring.redis.host=10.20.0.169
+spring.redis.host=10.20.1.210
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
+openHealth=false
 spring.cache.type=GENERIC
 j2cache.open-spring-cache=true
 j2cache.cache-clean-mode=passive
@@ -78,13 +79,13 @@ emqx.client-password=public
 
 tdengine-server:
 driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
-jdbc-url: jdbc:TAOS-RS://10.20.0.169:6041/iot_data_1?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+jdbc-url: jdbc:TAOS-RS://10.20.0.203:6041/iot_data_1?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
 username: root
 password: taosdata
 
 
 #spring.db3.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db3.datasource.url=jdbc:TAOS-RS://10.20.0.169: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
@@ -92,7 +93,7 @@ spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
 
 # ����ר��td���ݿ� analyse_data
 #spring.db4.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db4.datasource.url=jdbc:TAOS-RS://10.20.0.169:6041/analysis_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+spring.db4.datasource.url=jdbc:TAOS-RS://10.20.0.203:6041/analysis_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
 spring.db4.datasource.username=root
 spring.db4.datasource.password=taosdata
 spring.db4.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
@@ -149,7 +150,7 @@ amos.secret.key=qaz
 #eureka.instance.ip-address=172.16.3.122
 
 
-spring.activemq.broker-url=tcp://10.20.0.169: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
@@ -165,16 +166,16 @@ pictureUrl=upload/jxiop/syz/
 
 
 #kafka
-spring.kafka.bootstrap-servers=10.20.0.169:9092
+spring.kafka.bootstrap-servers=10.20.0.223:9092,10.20.0.133:9200
 spring.kafka.producer.retries=1
-spring.kafka.producer.bootstrap-servers=10.20.0.169:9092
+spring.kafka.producer.bootstrap-servers=10.20.0.223:9092,10.20.0.133:9200
 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=consumerGroup
-spring.kafka.consumer.bootstrap-servers=10.20.0.169:9092
+spring.kafka.consumer.bootstrap-servers=10.20.0.223:9092,10.20.0.133:9200
 spring.kafka.consumer.enable-auto-commit=false
 spring.kafka.consumer.auto-offset-reset=earliest
 spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer
@@ -182,21 +183,22 @@ spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.S
 spring.kafka.listener.ack-mode=manual_immediate
 spring.kafka.listener.type=batch
 #һ����ȡ���� && �߳�����
-spring.kafka.consumer.max-poll-records=30
-#spring.kafka.consumer.fetch-max-wait= 10000
+spring.kafka.consumer.max-poll-records=50
+spring.kafka.consumer.fetch-max-wait= 10000
 
 
 #��ǰʱ����ǰƫ������    ����ʷƫ������
 last.month.num = 12
 
 #����� �㷨����
-base.url.XGX=http://139.9.171.247:8052/intelligent-analysis/correlation
+base.url.XGX=http://10.20.1.29:8052/intelligent-analysis/correlation
 #�������� �㷨���õ�ַ
-base.url.GKHF=http://139.9.171.247:8052/intelligent-analysis/working-condition-division
+base.url.GKHF=http://10.20.1.29:8052/intelligent-analysis/working-condition-division
 #����� �㷨����
-base.url.ZXZ=http://139.9.171.247:8052/intelligent-analysis/central-value
+base.url.ZXZ=http://10.20.1.29:8052/intelligent-analysis/central-value
 #ָ���������㷨����
-base.url.zsfx:http://139.9.171.247:8052/intelligent-analysis/index-analysis
+base.url.zsfx:http://10.20.1.29:8052/intelligent-analysis/index-analysis
 
 forecast.url=
-logic=
\ No newline at end of file
+analyse.cycle.offset=5
+logic=false
\ No newline at end of file

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

@@ -2,7 +2,7 @@ spring.application.name=AMOS-JXIOP-ANALYSE-CZ
 server.servlet.context-path=/jxiop-analyse
 server.port=33400
 server.uri-encoding=UTF-8
-spring.profiles.active=dev1
+spring.profiles.active=kingbase8
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml
@@ -75,7 +75,7 @@ station.section=10
 gl.sum.column=日发电量,月发电量,年发电量
 gl.avg.column=有功功率,日利用小时,瞬时风速
 
-spring.elasticsearch.rest.uris=http://10.20.0.169:9200
+spring.elasticsearch.rest.uris=http://10.20.0.223:9200
 spring.elasticsearch.rest.connection-timeout=30000
 spring.elasticsearch.rest.username=elastic
 spring.elasticsearch.rest.password=Yeejoin@2020

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml

@@ -26,21 +26,7 @@
         FROM
             sjgl_zsj_zsbtz
         WHERE
-                FSB IN (
-                SELECT
-                    DBID
-                FROM
-                    sjgl_zsj_zsbtz
-                WHERE
-                        MACHGENRE = (
-                        SELECT
-                            DATAID
-                        FROM
-                            tpri_dmp_databook
-                        WHERE
-                            MACHGENRE = #{DATAID} and WERKS = #{WERKS}
-                    )
-            )
+            MACHGENRE = #{DATAID} and WERKS = #{WERKS}
 
     </select>
     <select id="getStationInfoMapByStationGFWerks" resultType="map">