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

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_notice", 1, syncESDataToTdengineMqttListener);
+			emqKeeper.subscript("sync_esdata_to_tdengine_notice1", 1, syncESDataToTdengineMqttListener);
 			//订阅业务固化同步数据成功消息
 			emqKeeper.subscript("sync_iotdata_to_tdengine_notice", 1, syncDasSuccessMqttListener);
 		}

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

@@ -2501,7 +2501,8 @@ public class CommonServiceImpl {
         Map<String, Float> indicatorDataListAllMap = indicatorDataListAll.stream()
                 .collect(Collectors.toMap(
                         indicatorData -> indicatorData.getAddress() + "_" + indicatorData.getGatewayId(),
-                        IndicatorData::getValueF));
+                        IndicatorData::getValueF,
+                        (value1, value2) -> value1));
         HashMap<String, Double> idxBizPvPointProcessVariableClassificationDtoIdValueMap = new HashMap<>();
         for (IdxBizPvPointProcessVariableClassificationDto datum : data) {
 //            for (ESEquipments equipment : equipments) {

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanPointProcessVariableClassificationMapper.xml

@@ -3,7 +3,9 @@
 <mapper namespace="com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanPointProcessVariableClassificationMapper">
     <select id="getInfluxDBData" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointProcessVariableClassificationDto">
         SELECT
-            b.*,
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID,
             ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
             ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
             ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
@@ -21,9 +23,17 @@
         WHERE
             b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT1_ID
         GROUP BY
-            b.SEQUENCE_NBR UNION ALL
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID,
+            ibfpvcv.PROCESS_POINT1_ID,
+            ibfpvcv.PROCESS_POINT2_ID,
+            ibfpvcv.PROCESS_POINT3_ID,
+            ibfpvcv.ANALYSIS_POINT_ID     UNION ALL
         SELECT
-            b.*,
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID,
             ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
             ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
             ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
@@ -41,9 +51,17 @@
         WHERE
             b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT2_ID
         GROUP BY
-            b.SEQUENCE_NBR UNION ALL
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID,
+            ibfpvcv.PROCESS_POINT1_ID,
+            ibfpvcv.PROCESS_POINT2_ID,
+            ibfpvcv.PROCESS_POINT3_ID,
+            ibfpvcv.ANALYSIS_POINT_ID  UNION ALL
         SELECT
-            b.*,
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID,
             ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
             ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
             ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
@@ -61,9 +79,17 @@
         WHERE
             b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT3_ID
         GROUP BY
-            b.SEQUENCE_NBR UNION ALL
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID ,
+            ibfpvcv.PROCESS_POINT1_ID,
+            ibfpvcv.PROCESS_POINT2_ID,
+            ibfpvcv.PROCESS_POINT3_ID,
+            ibfpvcv.ANALYSIS_POINT_ID UNION ALL
         SELECT
-            b.*,
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID,
             ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
             ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
             ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
@@ -79,9 +105,15 @@
             ) AS b,
             idx_biz_fan_point_var_central_value ibfpvcv
         WHERE
-           b.SEQUENCE_NBR = ibfpvcv.ANALYSIS_POINT_ID
+            b.SEQUENCE_NBR = ibfpvcv.ANALYSIS_POINT_ID
         GROUP BY
-            b.SEQUENCE_NBR
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID,
+            ibfpvcv.PROCESS_POINT1_ID,
+            ibfpvcv.PROCESS_POINT2_ID,
+            ibfpvcv.PROCESS_POINT3_ID,
+            ibfpvcv.ANALYSIS_POINT_ID
     </select>
     <select id="getInfluxDBDataByGatewayId" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointProcessVariableClassificationDto">
         SELECT

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvPointProcessVariableClassificationMapper.xml

@@ -7,7 +7,9 @@
 
     <select id="getInfluxDBData" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointProcessVariableClassificationDto">
         SELECT
-            b.*,
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID,
             ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
             ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
             ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
@@ -19,15 +21,23 @@
                 FROM
                     idx_biz_pv_point_process_variable_classification uxfv
                 WHERE
-                        uxfv.SEQUENCE_NBR IN ( SELECT PROCESS_POINT1_ID FROM `idx_biz_pv_point_var_central_value` WHERE ANALYSIS_POINT_ID IS NOT NULL GROUP BY ANALYSIS_POINT_ID, PROCESS_POINT1_ID, PROCESS_POINT3_ID, PROCESS_POINT2_ID )
+                        uxfv.SEQUENCE_NBR IN ( SELECT PROCESS_POINT1_ID FROM idx_biz_pv_point_var_central_value WHERE ANALYSIS_POINT_ID IS NOT NULL GROUP BY ANALYSIS_POINT_ID, PROCESS_POINT1_ID, PROCESS_POINT3_ID, PROCESS_POINT2_ID )
             ) AS b,
             idx_biz_pv_point_var_central_value ibfpvcv
         WHERE
             b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT1_ID
         GROUP BY
-            b.SEQUENCE_NBR UNION ALL
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID,
+            ibfpvcv.PROCESS_POINT1_ID,
+            ibfpvcv.PROCESS_POINT2_ID,
+            ibfpvcv.PROCESS_POINT3_ID,
+            ibfpvcv.ANALYSIS_POINT_ID UNION ALL
         SELECT
-            b.*,
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID,
             ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
             ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
             ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
@@ -39,15 +49,23 @@
                 FROM
                     idx_biz_pv_point_process_variable_classification uxfv
                 WHERE
-                        uxfv.SEQUENCE_NBR IN ( SELECT PROCESS_POINT2_ID FROM `idx_biz_pv_point_var_central_value` WHERE ANALYSIS_POINT_ID IS NOT NULL GROUP BY ANALYSIS_POINT_ID, PROCESS_POINT1_ID, PROCESS_POINT3_ID, PROCESS_POINT2_ID )
+                        uxfv.SEQUENCE_NBR IN ( SELECT PROCESS_POINT2_ID FROM idx_biz_pv_point_var_central_value WHERE ANALYSIS_POINT_ID IS NOT NULL GROUP BY ANALYSIS_POINT_ID, PROCESS_POINT1_ID, PROCESS_POINT3_ID, PROCESS_POINT2_ID )
             ) AS b,
             idx_biz_pv_point_var_central_value ibfpvcv
         WHERE
-         b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT2_ID
+            b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT2_ID
         GROUP BY
-            b.SEQUENCE_NBR UNION ALL
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID,
+            ibfpvcv.PROCESS_POINT1_ID,
+            ibfpvcv.PROCESS_POINT2_ID,
+            ibfpvcv.PROCESS_POINT3_ID,
+            ibfpvcv.ANALYSIS_POINT_ID UNION ALL
         SELECT
-            b.*,
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID,
             ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
             ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
             ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
@@ -59,16 +77,23 @@
                 FROM
                     idx_biz_pv_point_process_variable_classification uxfv
                 WHERE
-                        uxfv.SEQUENCE_NBR IN ( SELECT PROCESS_POINT3_ID FROM `idx_biz_pv_point_var_central_value` WHERE ANALYSIS_POINT_ID IS NOT NULL GROUP BY ANALYSIS_POINT_ID, PROCESS_POINT1_ID, PROCESS_POINT3_ID, PROCESS_POINT2_ID )
+                        uxfv.SEQUENCE_NBR IN ( SELECT PROCESS_POINT3_ID FROM idx_biz_pv_point_var_central_value WHERE ANALYSIS_POINT_ID IS NOT NULL GROUP BY ANALYSIS_POINT_ID, PROCESS_POINT1_ID, PROCESS_POINT3_ID, PROCESS_POINT2_ID )
             ) AS b,
             idx_biz_pv_point_var_central_value ibfpvcv
         WHERE
             b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT3_ID
-
         GROUP BY
-            b.SEQUENCE_NBR UNION ALL
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID,
+            ibfpvcv.PROCESS_POINT1_ID,
+            ibfpvcv.PROCESS_POINT2_ID,
+            ibfpvcv.PROCESS_POINT3_ID,
+            ibfpvcv.ANALYSIS_POINT_ID UNION ALL
         SELECT
-            b.*,
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID,
             ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
             ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
             ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
@@ -80,13 +105,19 @@
                 FROM
                     idx_biz_pv_point_process_variable_classification uxfv
                 WHERE
-                        uxfv.SEQUENCE_NBR IN ( SELECT ANALYSIS_POINT_ID FROM `idx_biz_pv_point_var_central_value` WHERE ANALYSIS_POINT_ID IS NOT NULL GROUP BY ANALYSIS_POINT_ID, PROCESS_POINT1_ID, PROCESS_POINT3_ID, PROCESS_POINT2_ID )
+                        uxfv.SEQUENCE_NBR IN ( SELECT ANALYSIS_POINT_ID FROM idx_biz_pv_point_var_central_value WHERE ANALYSIS_POINT_ID IS NOT NULL GROUP BY ANALYSIS_POINT_ID, PROCESS_POINT1_ID, PROCESS_POINT3_ID, PROCESS_POINT2_ID )
             ) AS b,
             idx_biz_pv_point_var_central_value ibfpvcv
         WHERE
-           b.SEQUENCE_NBR = ibfpvcv.ANALYSIS_POINT_ID
+            b.SEQUENCE_NBR = ibfpvcv.ANALYSIS_POINT_ID
         GROUP BY
-            b.SEQUENCE_NBR
+            b.SEQUENCE_NBR,
+            b.INDEX_ADDRESS,
+            b.GATEWAY_ID,
+            ibfpvcv.PROCESS_POINT1_ID,
+            ibfpvcv.PROCESS_POINT2_ID,
+            ibfpvcv.PROCESS_POINT3_ID,
+            ibfpvcv.ANALYSIS_POINT_ID
     </select>
     <select id="getInfluxDBDataByGatewayId" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointProcessVariableClassificationDto">
         SELECT