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

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/AcceptanceStatusEnum.java

@@ -35,7 +35,7 @@ public enum AcceptanceStatusEnum {
     
     线下验收完成("验收完成", "10", "hygf_ys6","0"),
     
-    工程审核不通过("审核不通过", "12", "hygf_bw2","5");
+    工程审核不通过("并网审核不通过", "12", "hygf_bw2","5");
     /**
      * 名称，描述
      */

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

@@ -22,7 +22,7 @@
             WHEN bga.acceptance_status  = '8' THEN '待线下验收'
             WHEN bga.acceptance_status  = '9' THEN '线下验收不通过'
             WHEN bga.acceptance_status  = '11' THEN '是否线下验收'
-
+            WHEN bga.acceptance_status  = '12' THEN '并网审核不通过'
             ELSE '验收完成' END AS acceptanceStatus,
 
             bga.work_order_id workOrderId,
@@ -55,7 +55,7 @@
               LEFT JOIN hygf_work_order  ON hygf_work_order.sequence_nbr = bga.work_order_id
         <where>
             bga.is_delete = 0
-            AND bga.acceptance_status IS NOT NULL AND bga.acceptance_status != ''
+            AND bga.acceptance_status IS NOT NULL AND bga.acceptance_status != '' AND bga.acceptance_status !=12
             <if test="param != null">
                 <if test="param.sequenceNbr != null and param.sequenceNbr != ''">
                     AND bga.sequence_nbr = #{param.sequenceNbr}

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

@@ -84,7 +84,7 @@ public class AmosJxiopAnalyseApplication {
 	public void initMqtt() throws Exception {
 		if (openHealth) {
 			//订阅固化周期性数据成功的消息
-			emqKeeper.subscript("sync_esdata_to_tdengine_notice1", 1, syncESDataToTdengineMqttListener);
+			emqKeeper.subscript("sync_esdata_to_tdengine_notice", 1, syncESDataToTdengineMqttListener);
 			//订阅业务固化同步数据成功消息
 			emqKeeper.subscript("sync_iotdata_to_tdengine_notice", 1, syncDasSuccessMqttListener);
 		}

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

@@ -191,13 +191,13 @@ spring.kafka.consumer.max-poll-records=30
 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=
 

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=dev
+spring.profiles.active=dev1
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml