Skip to content

A
amos-boot-zx-biz
Commit 1768969f authored by chenzhao's avatar chenzhao
Browse files
Options

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

parents 332a411c ff6788f1
Show whitespace changes
Inline Side-by-side
Showing with 93 additions and 29 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/AmosJxiopAnalyseApplication.java
View file @ 1768969f
...@@ -84,7 +84,7 @@ public class AmosJxiopAnalyseApplication { ...@@ -84,7 +84,7 @@ public class AmosJxiopAnalyseApplication {
public void initMqtt() throws Exception { public void initMqtt() throws Exception {
if (openHealth) { 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); 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
View file @ 1768969f
...@@ -2501,7 +2501,8 @@ public class CommonServiceImpl { ...@@ -2501,7 +2501,8 @@ public class CommonServiceImpl {
Map<String, Float> indicatorDataListAllMap = indicatorDataListAll.stream() Map<String, Float> indicatorDataListAllMap = indicatorDataListAll.stream()
.collect(Collectors.toMap( .collect(Collectors.toMap(
indicatorData -> indicatorData.getAddress() + "_" + indicatorData.getGatewayId(), indicatorData -> indicatorData.getAddress() + "_" + indicatorData.getGatewayId(),
IndicatorData::getValueF)); IndicatorData::getValueF,
(value1, value2) -> value1));
HashMap<String, Double> idxBizPvPointProcessVariableClassificationDtoIdValueMap = new HashMap<>(); HashMap<String, Double> idxBizPvPointProcessVariableClassificationDtoIdValueMap = new HashMap<>();
for (IdxBizPvPointProcessVariableClassificationDto datum : data) { for (IdxBizPvPointProcessVariableClassificationDto datum : data) {
// for (ESEquipments equipment : equipments) { // for (ESEquipments equipment : equipments) {
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanPointProcessVariableClassificationMapper.xml
View file @ 1768969f
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
<mapper namespace="com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanPointProcessVariableClassificationMapper"> <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 id="getInfluxDBData" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointProcessVariableClassificationDto">
SELECT SELECT
b.*, b.SEQUENCE_NBR,
b.INDEX_ADDRESS,
b.GATEWAY_ID,
ibfpvcv.PROCESS_POINT1_ID AS pointOneId, ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
ibfpvcv.PROCESS_POINT2_ID AS pointTwoId, ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
ibfpvcv.PROCESS_POINT3_ID AS pointThreeId, ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
...@@ -21,9 +23,17 @@ ...@@ -21,9 +23,17 @@
WHERE WHERE
b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT1_ID b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT1_ID
GROUP BY GROUP BY
b.SEQUENCE_NBR UNION ALL b.SEQUENCE_NBR,
SELECT b.INDEX_ADDRESS,
b.*, b.GATEWAY_ID,
ibfpvcv.PROCESS_POINT1_ID,
ibfpvcv.PROCESS_POINT2_ID,
ibfpvcv.PROCESS_POINT3_ID,
ibfpvcv.ANALYSIS_POINT_ID UNION ALL
SELECT
b.SEQUENCE_NBR,
b.INDEX_ADDRESS,
b.GATEWAY_ID,
ibfpvcv.PROCESS_POINT1_ID AS pointOneId, ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
ibfpvcv.PROCESS_POINT2_ID AS pointTwoId, ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
ibfpvcv.PROCESS_POINT3_ID AS pointThreeId, ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
...@@ -41,9 +51,17 @@ ...@@ -41,9 +51,17 @@
WHERE WHERE
b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT2_ID b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT2_ID
GROUP BY GROUP BY
b.SEQUENCE_NBR UNION ALL b.SEQUENCE_NBR,
SELECT b.INDEX_ADDRESS,
b.*, b.GATEWAY_ID,
ibfpvcv.PROCESS_POINT1_ID,
ibfpvcv.PROCESS_POINT2_ID,
ibfpvcv.PROCESS_POINT3_ID,
ibfpvcv.ANALYSIS_POINT_ID UNION ALL
SELECT
b.SEQUENCE_NBR,
b.INDEX_ADDRESS,
b.GATEWAY_ID,
ibfpvcv.PROCESS_POINT1_ID AS pointOneId, ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
ibfpvcv.PROCESS_POINT2_ID AS pointTwoId, ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
ibfpvcv.PROCESS_POINT3_ID AS pointThreeId, ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
...@@ -61,9 +79,17 @@ ...@@ -61,9 +79,17 @@
WHERE WHERE
b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT3_ID b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT3_ID
GROUP BY GROUP BY
b.SEQUENCE_NBR UNION ALL b.SEQUENCE_NBR,
SELECT b.INDEX_ADDRESS,
b.*, b.GATEWAY_ID ,
ibfpvcv.PROCESS_POINT1_ID,
ibfpvcv.PROCESS_POINT2_ID,
ibfpvcv.PROCESS_POINT3_ID,
ibfpvcv.ANALYSIS_POINT_ID UNION ALL
SELECT
b.SEQUENCE_NBR,
b.INDEX_ADDRESS,
b.GATEWAY_ID,
ibfpvcv.PROCESS_POINT1_ID AS pointOneId, ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
ibfpvcv.PROCESS_POINT2_ID AS pointTwoId, ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
ibfpvcv.PROCESS_POINT3_ID AS pointThreeId, ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
...@@ -81,7 +107,13 @@ ...@@ -81,7 +107,13 @@
WHERE WHERE
b.SEQUENCE_NBR = ibfpvcv.ANALYSIS_POINT_ID b.SEQUENCE_NBR = ibfpvcv.ANALYSIS_POINT_ID
GROUP BY 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>
<select id="getInfluxDBDataByGatewayId" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointProcessVariableClassificationDto"> <select id="getInfluxDBDataByGatewayId" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointProcessVariableClassificationDto">
SELECT SELECT
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvPointProcessVariableClassificationMapper.xml
View file @ 1768969f
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
<select id="getInfluxDBData" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointProcessVariableClassificationDto"> <select id="getInfluxDBData" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointProcessVariableClassificationDto">
SELECT SELECT
b.*, b.SEQUENCE_NBR,
b.INDEX_ADDRESS,
b.GATEWAY_ID,
ibfpvcv.PROCESS_POINT1_ID AS pointOneId, ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
ibfpvcv.PROCESS_POINT2_ID AS pointTwoId, ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
ibfpvcv.PROCESS_POINT3_ID AS pointThreeId, ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
...@@ -19,15 +21,23 @@ ...@@ -19,15 +21,23 @@
FROM FROM
idx_biz_pv_point_process_variable_classification uxfv idx_biz_pv_point_process_variable_classification uxfv
WHERE 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, ) AS b,
idx_biz_pv_point_var_central_value ibfpvcv idx_biz_pv_point_var_central_value ibfpvcv
WHERE WHERE
b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT1_ID b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT1_ID
GROUP BY GROUP BY
b.SEQUENCE_NBR UNION ALL b.SEQUENCE_NBR,
SELECT b.INDEX_ADDRESS,
b.*, b.GATEWAY_ID,
ibfpvcv.PROCESS_POINT1_ID,
ibfpvcv.PROCESS_POINT2_ID,
ibfpvcv.PROCESS_POINT3_ID,
ibfpvcv.ANALYSIS_POINT_ID UNION ALL
SELECT
b.SEQUENCE_NBR,
b.INDEX_ADDRESS,
b.GATEWAY_ID,
ibfpvcv.PROCESS_POINT1_ID AS pointOneId, ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
ibfpvcv.PROCESS_POINT2_ID AS pointTwoId, ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
ibfpvcv.PROCESS_POINT3_ID AS pointThreeId, ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
...@@ -39,15 +49,23 @@ ...@@ -39,15 +49,23 @@
FROM FROM
idx_biz_pv_point_process_variable_classification uxfv idx_biz_pv_point_process_variable_classification uxfv
WHERE 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, ) AS b,
idx_biz_pv_point_var_central_value ibfpvcv idx_biz_pv_point_var_central_value ibfpvcv
WHERE WHERE
b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT2_ID b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT2_ID
GROUP BY GROUP BY
b.SEQUENCE_NBR UNION ALL b.SEQUENCE_NBR,
SELECT b.INDEX_ADDRESS,
b.*, b.GATEWAY_ID,
ibfpvcv.PROCESS_POINT1_ID,
ibfpvcv.PROCESS_POINT2_ID,
ibfpvcv.PROCESS_POINT3_ID,
ibfpvcv.ANALYSIS_POINT_ID UNION ALL
SELECT
b.SEQUENCE_NBR,
b.INDEX_ADDRESS,
b.GATEWAY_ID,
ibfpvcv.PROCESS_POINT1_ID AS pointOneId, ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
ibfpvcv.PROCESS_POINT2_ID AS pointTwoId, ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
ibfpvcv.PROCESS_POINT3_ID AS pointThreeId, ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
...@@ -59,16 +77,23 @@ ...@@ -59,16 +77,23 @@
FROM FROM
idx_biz_pv_point_process_variable_classification uxfv idx_biz_pv_point_process_variable_classification uxfv
WHERE 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, ) AS b,
idx_biz_pv_point_var_central_value ibfpvcv idx_biz_pv_point_var_central_value ibfpvcv
WHERE WHERE
b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT3_ID b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT3_ID
GROUP BY GROUP BY
b.SEQUENCE_NBR UNION ALL b.SEQUENCE_NBR,
SELECT b.INDEX_ADDRESS,
b.*, b.GATEWAY_ID,
ibfpvcv.PROCESS_POINT1_ID,
ibfpvcv.PROCESS_POINT2_ID,
ibfpvcv.PROCESS_POINT3_ID,
ibfpvcv.ANALYSIS_POINT_ID UNION ALL
SELECT
b.SEQUENCE_NBR,
b.INDEX_ADDRESS,
b.GATEWAY_ID,
ibfpvcv.PROCESS_POINT1_ID AS pointOneId, ibfpvcv.PROCESS_POINT1_ID AS pointOneId,
ibfpvcv.PROCESS_POINT2_ID AS pointTwoId, ibfpvcv.PROCESS_POINT2_ID AS pointTwoId,
ibfpvcv.PROCESS_POINT3_ID AS pointThreeId, ibfpvcv.PROCESS_POINT3_ID AS pointThreeId,
...@@ -80,13 +105,19 @@ ...@@ -80,13 +105,19 @@
FROM FROM
idx_biz_pv_point_process_variable_classification uxfv idx_biz_pv_point_process_variable_classification uxfv
WHERE 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, ) AS b,
idx_biz_pv_point_var_central_value ibfpvcv idx_biz_pv_point_var_central_value ibfpvcv
WHERE WHERE
b.SEQUENCE_NBR = ibfpvcv.ANALYSIS_POINT_ID b.SEQUENCE_NBR = ibfpvcv.ANALYSIS_POINT_ID
GROUP BY 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>
<select id="getInfluxDBDataByGatewayId" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointProcessVariableClassificationDto"> <select id="getInfluxDBDataByGatewayId" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointProcessVariableClassificationDto">
SELECT SELECT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment