From a3329be78831e5213f6047aa8affc38807189b40 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Mon, 19 Aug 2024 14:15:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../responsibility/OverLimitMonitorMapper.xml | 723 ++++++++++++++---- 1 file changed, 575 insertions(+), 148 deletions(-) diff --git a/pqs9000/src/main/resources/mybatis/mappers/responsibility/OverLimitMonitorMapper.xml b/pqs9000/src/main/resources/mybatis/mappers/responsibility/OverLimitMonitorMapper.xml index 00e6e0b..209019e 100644 --- a/pqs9000/src/main/resources/mybatis/mappers/responsibility/OverLimitMonitorMapper.xml +++ b/pqs9000/src/main/resources/mybatis/mappers/responsibility/OverLimitMonitorMapper.xml @@ -112,70 +112,179 @@ ORDER BY fir.LINE ) primary LEFT JOIN - (SELECT - MYINDEX,COUNT(1) overTimes + ( + SELECT + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN #{list2} - and (flicker_overtime >0 or ubalance_overtime >0 or freq_dev_overtime >0 or uaberrance_overtime >0 or voltage_dev_overtime >0 or uharm_2_overtime >0 or iharm_2_overtime >0 or uharm_3_overtime >0 or iharm_3_overtime >0 or uharm_4_overtime >0 or iharm_4_overtime >0 - or uharm_5_overtime >0 or iharm_5_overtime >0 or uharm_6_overtime >0 or iharm_6_overtime >0 or uharm_7_overtime >0 or iharm_7_overtime >0 - or uharm_8_overtime >0 or iharm_8_overtime >0 or uharm_9_overtime >0 or iharm_9_overtime >0 or uharm_10_overtime >0 or iharm_10_overtime >0 - or uharm_11_overtime >0 or iharm_11_overtime >0 or uharm_12_overtime >0 or iharm_12_overtime >0 or uharm_13_overtime >0 or iharm_13_overtime >0 - or uharm_14_overtime >0 or iharm_14_overtime >0 or uharm_15_overtime >0 or iharm_15_overtime >0 or uharm_16_overtime >0 or iharm_16_overtime >0 - or uharm_17_overtime >0 or iharm_17_overtime >0 or uharm_18_overtime >0 or iharm_18_overtime >0 or uharm_19_overtime >0 or iharm_19_overtime >0 - or uharm_20_overtime >0 or iharm_20_overtime >0 or uharm_21_overtime >0 or iharm_24_overtime >0 or uharm_22_overtime >0 or iharm_22_overtime >0 - or uharm_23_overtime >0 or iharm_23_overtime >0 or uharm_24_overtime >0 or iharm_24_overtime >0 or uharm_25_overtime >0 or iharm_25_overtime >0 - or I_NEG_OVERTIME > 0 or INUHARM_1_OVERTIME >0 or INUHARM_2_OVERTIME >0 or INUHARM_3_OVERTIME >0 or INUHARM_4_OVERTIME >0 or INUHARM_5_OVERTIME >0 - or INUHARM_6_OVERTIME >0 or INUHARM_7_OVERTIME >0 or INUHARM_8_OVERTIME >0 or INUHARM_9_OVERTIME >0 or INUHARM_10_OVERTIME >0 or INUHARM_11_OVERTIME >0 - or INUHARM_12_OVERTIME >0 or INUHARM_13_OVERTIME >0 or INUHARM_14_OVERTIME >0 or INUHARM_15_OVERTIME >0 or INUHARM_16_OVERTIME >0 - ) GROUP BY MYINDEX + AND (flicker_overtime >0 + OR ubalance_overtime >0 + OR freq_dev_overtime >0 + OR uaberrance_overtime >0 + OR voltage_dev_overtime >0 + OR uharm_2_overtime >0 + OR iharm_2_overtime >0 + OR uharm_3_overtime >0 + OR iharm_3_overtime >0 + OR uharm_4_overtime >0 + OR iharm_4_overtime >0 + OR uharm_5_overtime >0 + OR iharm_5_overtime >0 + OR uharm_6_overtime >0 + OR iharm_6_overtime >0 + OR uharm_7_overtime >0 + OR iharm_7_overtime >0 + OR uharm_8_overtime >0 + OR iharm_8_overtime >0 + OR uharm_9_overtime >0 + OR iharm_9_overtime >0 + OR uharm_10_overtime >0 + OR iharm_10_overtime >0 + OR uharm_11_overtime >0 + OR iharm_11_overtime >0 + OR uharm_12_overtime >0 + OR iharm_12_overtime >0 + OR uharm_13_overtime >0 + OR iharm_13_overtime >0 + OR uharm_14_overtime >0 + OR iharm_14_overtime >0 + OR uharm_15_overtime >0 + OR iharm_15_overtime >0 + OR uharm_16_overtime >0 + OR iharm_16_overtime >0 + OR uharm_17_overtime >0 + OR iharm_17_overtime >0 + OR uharm_18_overtime >0 + OR iharm_18_overtime >0 + OR uharm_19_overtime >0 + OR iharm_19_overtime >0 + OR uharm_20_overtime >0 + OR iharm_20_overtime >0 + OR uharm_21_overtime >0 + OR iharm_24_overtime >0 + OR uharm_22_overtime >0 + OR iharm_22_overtime >0 + OR uharm_23_overtime >0 + OR iharm_23_overtime >0 + OR uharm_24_overtime >0 + OR iharm_24_overtime >0 + OR uharm_25_overtime >0 + OR iharm_25_overtime >0 + OR I_NEG_OVERTIME > 0 + OR INUHARM_1_OVERTIME >0 + OR INUHARM_2_OVERTIME >0 + OR INUHARM_3_OVERTIME >0 + OR INUHARM_4_OVERTIME >0 + OR INUHARM_5_OVERTIME >0 + OR INUHARM_6_OVERTIME >0 + OR INUHARM_7_OVERTIME >0 + OR INUHARM_8_OVERTIME >0 + OR INUHARM_9_OVERTIME >0 + OR INUHARM_10_OVERTIME >0 + OR INUHARM_11_OVERTIME >0 + OR INUHARM_12_OVERTIME >0 + OR INUHARM_13_OVERTIME >0 + OR INUHARM_14_OVERTIME >0 + OR INUHARM_15_OVERTIME >0 + OR INUHARM_16_OVERTIME >0 + ) + GROUP BY + TIMEID,MYINDEX + ) + GROUP BY + MYINDEX )A ON primary.LINE_INDEX = A.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN #{list3} - and freq_dev_overtime >0 GROUP BY MYINDEX + AND freq_dev_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) B ON primary.LINE_INDEX = B.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN #{list4} - and voltage_dev_overtime >0 GROUP BY MYINDEX + AND voltage_dev_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) C ON primary.LINE_INDEX = C.MYINDEX LEFT JOIN - (select MYINDEX,COUNT(1) overTimes - from limit_target - where phasic_type = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + ( + + SELECT + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes + FROM + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate + WHERE + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN - - #{list4} + + #{list5} - and (uaberrance_overtime > 0 or uharm_2_overtime > 0 or + AND (uaberrance_overtime > 0 or uharm_2_overtime > 0 or uharm_3_overtime > 0 or uharm_4_overtime > 0 or uharm_5_overtime > 0 or uharm_6_overtime > 0 or uharm_7_overtime > 0 or uharm_8_overtime > 0 or @@ -187,324 +296,614 @@ uharm_19_overtime > 0 or uharm_20_overtime > 0 or uharm_21_overtime > 0 or uharm_22_overtime > 0 or uharm_23_overtime > 0 or uharm_24_overtime > 0 or - uharm_25_overtime > 0) GROUP BY MYINDEX + uharm_25_overtime > 0) + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) harmV ON primary.LINE_INDEX = harmV.MYINDEX LEFT JOIN ( + SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN - - #{list5} + + #{list6} - and uaberrance_overtime >0 GROUP BY MYINDEX + AND uaberrance_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) D ON primary.LINE_INDEX = D.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN - - #{list6} + + #{list7} - and (uharm_2_overtime >0 or uharm_3_overtime >0 or uharm_4_overtime >0 or uharm_5_overtime >0 or uharm_6_overtime >0 or uharm_7_overtime >0 or uharm_8_overtime >0 or uharm_9_overtime >0 or uharm_10_overtime >0 or uharm_11_overtime >0 or uharm_12_overtime >0 or uharm_13_overtime >0 or uharm_14_overtime >0 or uharm_15_overtime >0 or uharm_16_overtime >0 or uharm_17_overtime >0 or uharm_18_overtime >0 or uharm_19_overtime >0 or uharm_20_overtime >0 or uharm_21_overtime >0 or uharm_22_overtime >0 or uharm_23_overtime >0 or uharm_24_overtime >0 or uharm_25_overtime >0) GROUP BY MYINDEX + AND (uharm_2_overtime > 0 or + uharm_3_overtime > 0 or uharm_4_overtime > 0 or + uharm_5_overtime > 0 or uharm_6_overtime > 0 or + uharm_7_overtime > 0 or uharm_8_overtime > 0 or + uharm_9_overtime > 0 or uharm_10_overtime > 0 or + uharm_11_overtime > 0 or uharm_12_overtime > 0 or + uharm_13_overtime > 0 or uharm_14_overtime > 0 or + uharm_15_overtime > 0 or uharm_16_overtime > 0 or + uharm_17_overtime > 0 or uharm_18_overtime > 0 or + uharm_19_overtime > 0 or uharm_20_overtime > 0 or + uharm_21_overtime > 0 or uharm_22_overtime > 0 or + uharm_23_overtime > 0 or uharm_24_overtime > 0 or + uharm_25_overtime > 0) + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) E ON primary.LINE_INDEX = E.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN - - #{list7} + + #{list8} - and (iharm_2_overtime >0 or iharm_3_overtime >0 or iharm_4_overtime >0 or iharm_5_overtime >0 or iharm_6_overtime >0 or iharm_7_overtime >0 or iharm_8_overtime >0 or iharm_9_overtime >0 or iharm_10_overtime >0 or iharm_11_overtime >0 or iharm_12_overtime >0 or iharm_13_overtime >0 or iharm_14_overtime >0 or iharm_15_overtime >0 or iharm_16_overtime >0 or iharm_17_overtime >0 or iharm_18_overtime >0 or iharm_19_overtime >0 or iharm_20_overtime >0 or iharm_21_overtime >0 or iharm_22_overtime >0 or iharm_23_overtime >0 or iharm_24_overtime >0 or iharm_25_overtime >0) GROUP BY MYINDEX + AND (iharm_2_overtime >0 or iharm_3_overtime >0 or iharm_4_overtime >0 or iharm_5_overtime >0 or iharm_6_overtime >0 or iharm_7_overtime >0 or iharm_8_overtime >0 or iharm_9_overtime >0 or iharm_10_overtime >0 or iharm_11_overtime >0 or iharm_12_overtime >0 or iharm_13_overtime >0 or iharm_14_overtime >0 or iharm_15_overtime >0 or iharm_16_overtime >0 or iharm_17_overtime >0 or iharm_18_overtime >0 or iharm_19_overtime >0 or iharm_20_overtime >0 or iharm_21_overtime >0 or iharm_22_overtime >0 or iharm_23_overtime >0 or iharm_24_overtime >0 or iharm_25_overtime >0) + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) F ON primary.LINE_INDEX = F.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN - - #{list8} + + #{list9} - and uharm_3_overtime >0 GROUP BY MYINDEX + AND uharm_3_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) G ON primary.LINE_INDEX = G.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN - - #{list9} + + #{list10} - and uharm_5_overtime >0 GROUP BY MYINDEX + AND uharm_5_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) H ON primary.LINE_INDEX = H.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN - - #{list10} + + #{list11} - and uharm_7_overtime >0 GROUP BY MYINDEX + AND uharm_7_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) I ON primary.LINE_INDEX = I.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN - - #{list11} + + #{list12} - and uharm_11_overtime >0 GROUP BY MYINDEX + AND uharm_11_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) J ON primary.LINE_INDEX = J.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN - - #{list12} + + #{list13} - and uharm_13_overtime >0 GROUP BY MYINDEX + AND uharm_13_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) K ON primary.LINE_INDEX = K.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN - - #{list13} + + #{list14} - and uharm_23_overtime >0 GROUP BY MYINDEX + AND uharm_23_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) L ON primary.LINE_INDEX = L.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN - - #{list14} + + #{list15} - and uharm_25_overtime >0 GROUP BY MYINDEX + AND uharm_25_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) M ON primary.LINE_INDEX = M.MYINDEX LEFT JOIN ( SELECT MYINDEX, - SUM(CASE WHEN uharm_2_overtime + uharm_4_overtime + uharm_6_overtime + uharm_8_overtime + uharm_9_overtime + uharm_10_overtime + uharm_12_overtime + uharm_14_overtime + uharm_15_overtime + uharm_16_overtime + uharm_17_overtime + uharm_18_overtime + uharm_19_overtime + uharm_20_overtime + uharm_21_overtime + uharm_22_overtime + uharm_24_overtime > 0 THEN 1 else 0 END ) overTimes + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN #{list15} - and (uharm_2_overtime >0 or uharm_4_overtime >0 or uharm_6_overtime >0 or uharm_8_overtime >0 or uharm_9_overtime >0 or uharm_10_overtime >0 or uharm_12_overtime >0 or uharm_14_overtime >0 or uharm_15_overtime >0 or uharm_16_overtime >0 or uharm_17_overtime >0 or uharm_18_overtime >0 or uharm_19_overtime >0 or uharm_20_overtime >0 or uharm_21_overtime >0 or uharm_22_overtime >0 or uharm_24_overtime >0) GROUP BY MYINDEX + AND (uharm_2_overtime >0 or uharm_4_overtime >0 or uharm_6_overtime >0 or uharm_8_overtime >0 or uharm_9_overtime >0 or uharm_10_overtime >0 or uharm_12_overtime >0 or uharm_14_overtime >0 or uharm_15_overtime >0 or uharm_16_overtime >0 or uharm_17_overtime >0 or uharm_18_overtime >0 or uharm_19_overtime >0 or uharm_20_overtime >0 or uharm_21_overtime >0 or uharm_22_overtime >0 or uharm_24_overtime >0) + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) N ON primary.LINE_INDEX = N.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN #{list16} - and iharm_3_overtime >0 GROUP BY MYINDEX + AND iharm_3_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) O ON primary.LINE_INDEX = O.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN #{list17} - and iharm_5_overtime >0 GROUP BY MYINDEX + AND iharm_5_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) P ON primary.LINE_INDEX = P.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN #{list18} - and iharm_7_overtime >0 GROUP BY MYINDEX + AND iharm_7_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) Q ON primary.LINE_INDEX = Q.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN #{list19} - and iharm_11_overtime >0 GROUP BY MYINDEX + AND iharm_11_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) R ON primary.LINE_INDEX = R.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN #{list20} - and iharm_13_overtime >0 GROUP BY MYINDEX + AND iharm_13_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) S ON primary.LINE_INDEX = S.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN #{list21} - and iharm_23_overtime >0 GROUP BY MYINDEX + AND iharm_23_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) T ON primary.LINE_INDEX = T.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN #{list22} - and iharm_25_overtime >0 GROUP BY MYINDEX + AND iharm_25_overtime >0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) U ON primary.LINE_INDEX = U.MYINDEX LEFT JOIN ( SELECT - MYINDEX, - SUM(CASE WHEN iharm_2_overtime + iharm_4_overtime + iharm_6_overtime + iharm_8_overtime + iharm_9_overtime + iharm_10_overtime + iharm_12_overtime + iharm_14_overtime + iharm_15_overtime + iharm_16_overtime + iharm_17_overtime + iharm_18_overtime + iharm_19_overtime + iharm_20_overtime + iharm_21_overtime + iharm_22_overtime + iharm_24_overtime > 0 THEN 1 ELSE 0 END) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN #{list23} - and (iharm_2_overtime >0 or iharm_4_overtime >0 or iharm_6_overtime >0 or iharm_8_overtime >0 or iharm_9_overtime >0 or iharm_10_overtime >0 or iharm_12_overtime >0 or iharm_14_overtime >0 or iharm_15_overtime >0 or iharm_16_overtime >0 or iharm_17_overtime >0 or iharm_18_overtime >0 or iharm_19_overtime >0 or iharm_20_overtime >0 or iharm_21_overtime >0 or iharm_22_overtime >0 or iharm_24_overtime >0) GROUP BY MYINDEX + AND (iharm_2_overtime >0 or iharm_4_overtime >0 or iharm_6_overtime >0 or iharm_8_overtime >0 or iharm_9_overtime >0 or iharm_10_overtime >0 or iharm_12_overtime >0 or iharm_14_overtime >0 or iharm_15_overtime >0 or iharm_16_overtime >0 or iharm_17_overtime >0 or iharm_18_overtime >0 or iharm_19_overtime >0 or iharm_20_overtime >0 or iharm_21_overtime >0 or iharm_22_overtime >0 or iharm_24_overtime >0) + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) V ON primary.LINE_INDEX = V.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN #{list24} - and ubalance_overtime >0 GROUP BY MYINDEX + AND ubalance_overtime>0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) W ON primary.LINE_INDEX = W.MYINDEX LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN #{list25} - and flicker_overtime >0 GROUP BY MYINDEX + AND flicker_overtime>0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) X ON primary.LINE_INDEX = X.MYINDEX LEFT JOIN @@ -523,32 +922,60 @@ LEFT JOIN ( SELECT - MYINDEX,COUNT(1) overTimes + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND MYINDEX IN #{list27} - and I_Neg_OverTime >0 GROUP BY MYINDEX + AND I_Neg_OverTime>0 + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX ) Z ON primary.LINE_INDEX = Z.MYINDEX LEFT JOIN - (SELECT - MYINDEX,COUNT(1) overTimes + ( + SELECT + MYINDEX, + sum(CASE WHEN overTimes > 0 THEN 1 ELSE 0 END) overTimes FROM - limit_target + ( + SELECT + TIMEID, + MYINDEX, + COUNT(1) overTimes + FROM + limit_rate WHERE - PHASIC_TYPE = 'T' AND TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') AND - MYINDEX IN + TIMEID BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS') + AND MYINDEX IN #{list28} - and (InUHARM_1_OverTime >0 or InUHARM_2_OverTime >0 or InUHARM_3_OverTime >0 or InUHARM_4_OverTime >0 or InUHARM_5_OverTime >0 or InUHARM_6_OverTime >0 + AND (InUHARM_1_OverTime >0 or InUHARM_2_OverTime >0 or InUHARM_3_OverTime >0 or InUHARM_4_OverTime >0 or InUHARM_5_OverTime >0 or InUHARM_6_OverTime >0 or InUHARM_7_OverTime >0 or InUHARM_8_OverTime >0 or InUHARM_9_OverTime >0 or InUHARM_10_OverTime >0 or InUHARM_11_OverTime >0 or InUHARM_12_OverTime >0 - or InUHARM_13_OverTime >0 or InUHARM_14_OverTime >0 or InUHARM_15_OverTime >0 or InUHARM_16_OverTime >0) GROUP BY MYINDEX) interharmonics + or InUHARM_13_OverTime >0 or InUHARM_14_OverTime >0 or InUHARM_15_OverTime >0 or InUHARM_16_OverTime >0) + GROUP BY + TIMEID, + MYINDEX + ) + GROUP BY + MYINDEX + ) interharmonics ON primary.LINE_INDEX = interharmonics.MYINDEX ORDER BY primary.provinceCompany,primary.cityCompany,primary.NAME ) where overLimitDay >0 From 119e26728f993e6472c097f10c0924167a1e9f50 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Wed, 25 Sep 2024 15:09:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/responsibility/OverLimitMonitorServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pqs9000/src/main/java/com/pqs9000/serviceimpl/responsibility/OverLimitMonitorServiceImpl.java b/pqs9000/src/main/java/com/pqs9000/serviceimpl/responsibility/OverLimitMonitorServiceImpl.java index 34a0f1d..3d55292 100644 --- a/pqs9000/src/main/java/com/pqs9000/serviceimpl/responsibility/OverLimitMonitorServiceImpl.java +++ b/pqs9000/src/main/java/com/pqs9000/serviceimpl/responsibility/OverLimitMonitorServiceImpl.java @@ -376,7 +376,7 @@ public class OverLimitMonitorServiceImpl implements OverLimitMonitorService { } if (CollUtil.isNotEmpty(list11)){ - list9.forEach(item->{ + list11.forEach(item->{ DataHarmonicDetail pojo = new DataHarmonicDetail(); pojo.setTimeId(date); pojo.setTargetType(6); From e52db859a3ab35f4e15b1eb0578204dc9d482698 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Thu, 17 Oct 2024 14:34:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E7=A8=B3?= =?UTF-8?q?=E6=80=81=E8=B6=85=E6=A0=87=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/responsibility/OverLimitMonitor.java | 12 ++++++++++ .../com/pqs9000/util/ComplexHeadExcel.java | 24 ++++++++++++++----- .../responsibility/OverLimitMonitorMapper.xml | 9 +++++-- .../responsibility/overLimitMonitor.jsp | 5 ++-- .../webapp/jspJS/area/overLimitMonitor.js | 3 ++- 5 files changed, 42 insertions(+), 11 deletions(-) diff --git a/pqs9000/src/main/java/com/pqs9000/pojo/responsibility/OverLimitMonitor.java b/pqs9000/src/main/java/com/pqs9000/pojo/responsibility/OverLimitMonitor.java index 1295a47..094c19b 100644 --- a/pqs9000/src/main/java/com/pqs9000/pojo/responsibility/OverLimitMonitor.java +++ b/pqs9000/src/main/java/com/pqs9000/pojo/responsibility/OverLimitMonitor.java @@ -46,6 +46,9 @@ public class OverLimitMonitor { //协议容量 private Float xycMp; + //监测装置安装位置 + private String devLocation; + //超标天数 private int overLimitDay; @@ -750,6 +753,14 @@ public class OverLimitMonitor { this.diffFlickerData = diffFlickerData; } + public String getDevLocation() { + return devLocation; + } + + public void setDevLocation(String devLocation) { + this.devLocation = devLocation; + } + @Override public String toString() { return "OverLimitMonitor{" + @@ -766,6 +777,7 @@ public class OverLimitMonitor { ", dlcMp=" + dlcMp + ", devcMp=" + devcMp + ", xycMp=" + xycMp + + ", devLocation='" + devLocation + '\'' + ", overLimitDay=" + overLimitDay + ", overVoltageDeviationDay=" + overVoltageDeviationDay + ", maxVoltageDeviationData=" + maxVoltageDeviationData + diff --git a/pqs9000/src/main/java/com/pqs9000/util/ComplexHeadExcel.java b/pqs9000/src/main/java/com/pqs9000/util/ComplexHeadExcel.java index 12b8c0b..3085af6 100644 --- a/pqs9000/src/main/java/com/pqs9000/util/ComplexHeadExcel.java +++ b/pqs9000/src/main/java/com/pqs9000/util/ComplexHeadExcel.java @@ -709,7 +709,7 @@ public class ComplexHeadExcel{ xssfSheet.addMergedRegion(region12); CellRangeAddress region13 = new CellRangeAddress(0, 2, 13, 13); xssfSheet.addMergedRegion(region13); - CellRangeAddress region14 = new CellRangeAddress(0, 0, 14, 70); + CellRangeAddress region14 = new CellRangeAddress(0, 0, 14, 69); xssfSheet.addMergedRegion(region14); //电压变差 CellRangeAddress region15 = new CellRangeAddress(1, 1, 14, 17); @@ -748,8 +748,11 @@ public class ComplexHeadExcel{ CellRangeAddress region26 = new CellRangeAddress(1, 1, 62, 69); xssfSheet.addMergedRegion(region26); //监测点编号 - CellRangeAddress region27 = new CellRangeAddress(1, 2, 70, 70); + CellRangeAddress region27 = new CellRangeAddress(0, 2, 70, 70); xssfSheet.addMergedRegion(region27); + //监测装置安装位置 + CellRangeAddress region28 = new CellRangeAddress(0, 2, 71, 71); + xssfSheet.addMergedRegion(region28); //设置单元格大小 xssfSheet.setColumnWidth(0, 2000); @@ -823,6 +826,7 @@ public class ComplexHeadExcel{ xssfSheet.setColumnWidth(68, 2500); xssfSheet.setColumnWidth(69, 2500); xssfSheet.setColumnWidth(70, 2500); + xssfSheet.setColumnWidth(71, 2500); //一级表头 cell = row.createCell(0); @@ -885,6 +889,14 @@ public class ComplexHeadExcel{ cell.setCellValue("各项指标超标明细"); cell.setCellStyle(getStyle(1)); + cell = row.createCell(70); + cell.setCellValue("监测点编号"); + cell.setCellStyle(getStyle(1)); + + cell = row.createCell(71); + cell.setCellValue("监测装置安装位置"); + cell.setCellStyle(getStyle(1)); + //二级表头 cell = row2.createCell(14); cell.setCellValue("电压偏差"); @@ -934,10 +946,6 @@ public class ComplexHeadExcel{ cell.setCellValue("各次谐波电流幅值"); cell.setCellStyle(getStyle(1)); - cell = row2.createCell(70); - cell.setCellValue("监测点编号"); - cell.setCellStyle(getStyle(1)); - //三级表头 cell = row3.createCell(14); cell.setCellValue("超标天数"); @@ -1292,6 +1300,10 @@ public class ComplexHeadExcel{ cell = row.createCell(70); cell.setCellValue(list.get(i).getMonitorNumber()); + + cell = row.createCell(71); + cell.setCellValue(list.get(i).getDevLocation()); + xssfWorkbook.write(os); } diff --git a/pqs9000/src/main/resources/mybatis/mappers/responsibility/OverLimitMonitorMapper.xml b/pqs9000/src/main/resources/mybatis/mappers/responsibility/OverLimitMonitorMapper.xml index 209019e..dd4be7b 100644 --- a/pqs9000/src/main/resources/mybatis/mappers/responsibility/OverLimitMonitorMapper.xml +++ b/pqs9000/src/main/resources/mybatis/mappers/responsibility/OverLimitMonitorMapper.xml @@ -17,6 +17,7 @@ primary.DLCMP dlcMp, primary.DEVCMP devcMp, primary.XYCMP xycMp, + primary.devLocation devLocation, NVL(A.OVERTIMES, 0) overLimitDay, NVL(B.OVERTIMES, 0) overFrequencyDeviationDay, NVL(C.OVERTIMES, 0) overVoltageDeviationDay, @@ -55,6 +56,7 @@ fir.DLCMP , fir.DEVCMP , fir.XYCMP , + fir.devLocation, A.DIC_NAME cityCompany, B.DEPTSNAME provinceCompany, C.DIC_NAME MONITORVOLTAGELEVEL, @@ -75,13 +77,15 @@ D.NAME subName, D.SCALE subScale, E.objname objName, - E.POWER_SUBSTATION_NAME powerSubstationName + E.POWER_SUBSTATION_NAME powerSubstationName, + F.DEV_LOCATION devLocation FROM PQ_LINE A, PQS_DEPTSLINE B, PQS_DEPTS C, PQ_SUBSTATION D, - PQ_LINEDETAIL E + PQ_LINEDETAIL E, + PQ_DEVICEDETAIL F WHERE A.LINE_INDEX IN #{list1} @@ -96,6 +100,7 @@ AND A.SCALE=#{vollevel} + AND A.DEV_INDEX = F.DEV_INDEX ) fir LEFT JOIN PQS_DICDATA A diff --git a/pqs9000/src/main/webapp/WEB-INF/views/business/responsibility/overLimitMonitor.jsp b/pqs9000/src/main/webapp/WEB-INF/views/business/responsibility/overLimitMonitor.jsp index 84d5775..38fc3c1 100644 --- a/pqs9000/src/main/webapp/WEB-INF/views/business/responsibility/overLimitMonitor.jsp +++ b/pqs9000/src/main/webapp/WEB-INF/views/business/responsibility/overLimitMonitor.jsp @@ -146,7 +146,9 @@ 供电设备容量 用户协议容量 超标天数 - 各项指标超标明细 + 各项指标超标明细 + 监测点编号 + 监测装置安装位置 电压偏差 @@ -161,7 +163,6 @@ 闪变 各次谐波电压含有率超标天数 各次谐波电流含量超标天数 - 监测点编号 超标天数 diff --git a/pqs9000/src/main/webapp/jspJS/area/overLimitMonitor.js b/pqs9000/src/main/webapp/jspJS/area/overLimitMonitor.js index e4f98a4..4e8205c 100644 --- a/pqs9000/src/main/webapp/jspJS/area/overLimitMonitor.js +++ b/pqs9000/src/main/webapp/jspJS/area/overLimitMonitor.js @@ -279,7 +279,8 @@ function initTable(data){ {width: "1%",data:"overCurrentTwentyThirdTimes"}, {width: "1%",data:"overCurrentTwentyFiveTimes"}, {width: "1%",data:"overCurrentOtherTimes"}, - {width: "2%",data:"monitorNumber"} + {width: "2%",data:"monitorNumber"}, + {width: "2%",data:"devLocation"} ], bAutoWidth:false, serverSide : false, From f383877ffcd714b6882e7bb1cf159aa9dabdbae4 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Wed, 23 Oct 2024 14:52:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/report/GetICurrentMapper.java | 2 + .../report/GetICurrentServiceImpl.java | 3 +- .../mappers/report/GetICurrentMapper.xml | 426 ++++++++++++++---- .../mappers/report/GetVoltageRateMapper.xml | 200 ++++---- 4 files changed, 430 insertions(+), 201 deletions(-) diff --git a/pqs9000/src/main/java/com/pqs9000/mapper/report/GetICurrentMapper.java b/pqs9000/src/main/java/com/pqs9000/mapper/report/GetICurrentMapper.java index 993bbc0..f273f41 100644 --- a/pqs9000/src/main/java/com/pqs9000/mapper/report/GetICurrentMapper.java +++ b/pqs9000/src/main/java/com/pqs9000/mapper/report/GetICurrentMapper.java @@ -11,6 +11,8 @@ import com.pqs9000.pojo.report.ReportValue; public interface GetICurrentMapper { List> getICurrent(@Param("condition") Condition condition, @Param("listValue") List list); + List> getICurrentNew(@Param("condition") Condition condition); + List> getHICurrent(@Param("condition") Condition condition); ReportValue VsideValue(@Param("condition") Condition condition); diff --git a/pqs9000/src/main/java/com/pqs9000/serviceimpl/report/GetICurrentServiceImpl.java b/pqs9000/src/main/java/com/pqs9000/serviceimpl/report/GetICurrentServiceImpl.java index 0c36fb0..26b663f 100644 --- a/pqs9000/src/main/java/com/pqs9000/serviceimpl/report/GetICurrentServiceImpl.java +++ b/pqs9000/src/main/java/com/pqs9000/serviceimpl/report/GetICurrentServiceImpl.java @@ -32,7 +32,8 @@ public class GetICurrentServiceImpl implements GetICurrentService { } //获取电流幅值，包含基波 - List> listResult = getICurrentMapper.getICurrent(condition, listValue); +// List> listResult = getICurrentMapper.getICurrent(condition, listValue); + List> listResult = getICurrentMapper.getICurrentNew(condition); if (0 == listResult.size() || null == listResult.get(0)) { for (int i = 0; i < 50; i++) { diff --git a/pqs9000/src/main/resources/mybatis/mappers/report/GetICurrentMapper.xml b/pqs9000/src/main/resources/mybatis/mappers/report/GetICurrentMapper.xml index 94f55fd..b281d0c 100644 --- a/pqs9000/src/main/resources/mybatis/mappers/report/GetICurrentMapper.xml +++ b/pqs9000/src/main/resources/mybatis/mappers/report/GetICurrentMapper.xml @@ -3,107 +3,107 @@ + + select phasic_type PHASETYPE, - max(V_2_MAX) V_2_MAX,min(V_2_MIN) V_2_MIN,round(avg(V_2) ,2) V_2,max(case when V2CP95 =#{condition.count} then V_2 else null end) V_2_CP95, - max(V_3_MAX) V_3_MAX,min(V_3_MIN) V_3_MIN,round(avg(V_3) ,2) V_3,max(case when V3CP95 =#{condition.count} then V_3 else null end) V_3_CP95, - max(V_4_MAX) V_4_MAX,min(V_4_MIN) V_4_MIN,round(avg(V_4) ,2) V_4,max(case when V4CP95 =#{condition.count} then V_4 else null end) V_4_CP95, - max(V_5_MAX) V_5_MAX,min(V_5_MIN) V_5_MIN,round(avg(V_5) ,2) V_5,max(case when V5CP95 =#{condition.count} then V_5 else null end) V_5_CP95, - max(V_6_MAX) V_6_MAX,min(V_6_MIN) V_6_MIN,round(avg(V_6) ,2) V_6,max(case when V6CP95 =#{condition.count} then V_6 else null end) V_6_CP95, - max(V_7_MAX) V_7_MAX,min(V_7_MIN) V_7_MIN,round(avg(V_7) ,2) V_7,max(case when V7CP95 =#{condition.count} then V_7 else null end) V_7_CP95, - max(V_8_MAX) V_8_MAX,min(V_8_MIN) V_8_MIN,round(avg(V_8) ,2) V_8,max(case when V8CP95 =#{condition.count} then V_8 else null end) V_8_CP95, - max(V_9_MAX) V_9_MAX,min(V_9_MIN) V_9_MIN,round(avg(V_9) ,2) V_9,max(case when V9CP95 =#{condition.count} then V_9 else null end) V_9_CP95, - max(V_10_MAX) V_10_MAX,min(V_10_MIN) V_10_MIN,round(avg(V_10) ,2) V_10,max(case when V10CP95 =#{condition.count} then V_10 else null end) V_10_CP95, - max(V_11_MAX) V_11_MAX,min(V_11_MIN) V_11_MIN,round(avg(V_11) ,2) V_11,max(case when V11CP95 =#{condition.count} then V_11 else null end) V_11_CP95, - max(V_12_MAX) V_12_MAX,min(V_12_MIN) V_12_MIN,round(avg(V_12) ,2) V_12,max(case when V12CP95 =#{condition.count} then V_12 else null end) V_12_CP95, - max(V_13_MAX) V_13_MAX,min(V_13_MIN) V_13_MIN,round(avg(V_13) ,2) V_13,max(case when V13CP95 =#{condition.count} then V_13 else null end) V_13_CP95, - max(V_14_MAX) V_14_MAX,min(V_14_MIN) V_14_MIN,round(avg(V_14) ,2) V_14,max(case when V14CP95 =#{condition.count} then V_14 else null end) V_14_CP95, - max(V_15_MAX) V_15_MAX,min(V_15_MIN) V_15_MIN,round(avg(V_15) ,2) V_15,max(case when V15CP95 =#{condition.count} then V_15 else null end) V_15_CP95, - max(V_16_MAX) V_16_MAX,min(V_16_MIN) V_16_MIN,round(avg(V_16) ,2) V_16,max(case when V16CP95 =#{condition.count} then V_16 else null end) V_16_CP95, - max(V_17_MAX) V_17_MAX,min(V_17_MIN) V_17_MIN,round(avg(V_17) ,2) V_17,max(case when V17CP95 =#{condition.count} then V_17 else null end) V_17_CP95, - max(V_18_MAX) V_18_MAX,min(V_18_MIN) V_18_MIN,round(avg(V_18) ,2) V_18,max(case when V18CP95 =#{condition.count} then V_18 else null end) V_18_CP95, - max(V_19_MAX) V_19_MAX,min(V_19_MIN) V_19_MIN,round(avg(V_19) ,2) V_19,max(case when V19CP95 =#{condition.count} then V_19 else null end) V_19_CP95, - max(V_20_MAX) V_20_MAX,min(V_20_MIN) V_20_MIN,round(avg(V_20) ,2) V_20,max(case when V20CP95 =#{condition.count} then V_20 else null end) V_20_CP95, - max(V_21_MAX) V_21_MAX,min(V_21_MIN) V_21_MIN,round(avg(V_21) ,2) V_21,max(case when V21CP95 =#{condition.count} then V_21 else null end) V_21_CP95, - max(V_22_MAX) V_22_MAX,min(V_22_MIN) V_22_MIN,round(avg(V_22) ,2) V_22,max(case when V22CP95 =#{condition.count} then V_22 else null end) V_22_CP95, - max(V_23_MAX) V_23_MAX,min(V_23_MIN) V_23_MIN,round(avg(V_23) ,2) V_23,max(case when V23CP95 =#{condition.count} then V_23 else null end) V_23_CP95, - max(V_24_MAX) V_24_MAX,min(V_24_MIN) V_24_MIN,round(avg(V_24) ,2) V_24,max(case when V24CP95 =#{condition.count} then V_24 else null end) V_24_CP95, - max(V_25_MAX) V_25_MAX,min(V_25_MIN) V_25_MIN,round(avg(V_25) ,2) V_25,max(case when V25CP95 =#{condition.count} then V_25 else null end) V_25_CP95, - max(V_26_MAX) V_26_MAX,min(V_26_MIN) V_26_MIN,round(avg(V_26) ,2) V_26,max(case when V26CP95 =#{condition.count} then V_26 else null end) V_26_CP95, - max(V_27_MAX) V_27_MAX,min(V_27_MIN) V_27_MIN,round(avg(V_27) ,2) V_27,max(case when V27CP95 =#{condition.count} then V_27 else null end) V_27_CP95, - max(V_28_MAX) V_28_MAX,min(V_28_MIN) V_28_MIN,round(avg(V_28) ,2) V_28,max(case when V28CP95 =#{condition.count} then V_28 else null end) V_28_CP95, - max(V_29_MAX) V_29_MAX,min(V_29_MIN) V_29_MIN,round(avg(V_29) ,2) V_29,max(case when V29CP95 =#{condition.count} then V_29 else null end) V_29_CP95, - max(V_30_MAX) V_30_MAX,min(V_30_MIN) V_30_MIN,round(avg(V_30) ,2) V_30,max(case when V30CP95 =#{condition.count} then V_30 else null end) V_30_CP95, - max(V_31_MAX) V_31_MAX,min(V_31_MIN) V_31_MIN,round(avg(V_31) ,2) V_31,max(case when V31CP95 =#{condition.count} then V_31 else null end) V_31_CP95, - max(V_32_MAX) V_32_MAX,min(V_32_MIN) V_32_MIN,round(avg(V_32) ,2) V_32,max(case when V32CP95 =#{condition.count} then V_32 else null end) V_32_CP95, - max(V_33_MAX) V_33_MAX,min(V_33_MIN) V_33_MIN,round(avg(V_33) ,2) V_33,max(case when V33CP95 =#{condition.count} then V_33 else null end) V_33_CP95, - max(V_34_MAX) V_34_MAX,min(V_34_MIN) V_34_MIN,round(avg(V_34) ,2) V_34,max(case when V34CP95 =#{condition.count} then V_34 else null end) V_34_CP95, - max(V_35_MAX) V_35_MAX,min(V_35_MIN) V_35_MIN,round(avg(V_35) ,2) V_35,max(case when V35CP95 =#{condition.count} then V_35 else null end) V_35_CP95, - max(V_36_MAX) V_36_MAX,min(V_36_MIN) V_36_MIN,round(avg(V_36) ,2) V_36,max(case when V36CP95 =#{condition.count} then V_36 else null end) V_36_CP95, - max(V_37_MAX) V_37_MAX,min(V_37_MIN) V_37_MIN,round(avg(V_37) ,2) V_37,max(case when V37CP95 =#{condition.count} then V_37 else null end) V_37_CP95, - max(V_38_MAX) V_38_MAX,min(V_38_MIN) V_38_MIN,round(avg(V_38) ,2) V_38,max(case when V38CP95 =#{condition.count} then V_38 else null end) V_38_CP95, - max(V_39_MAX) V_39_MAX,min(V_39_MIN) V_39_MIN,round(avg(V_39) ,2) V_39,max(case when V39CP95 =#{condition.count} then V_39 else null end) V_39_CP95, - max(V_40_MAX) V_40_MAX,min(V_40_MIN) V_40_MIN,round(avg(V_40) ,2) V_40,max(case when V40CP95 =#{condition.count} then V_40 else null end) V_40_CP95, - max(V_41_MAX) V_41_MAX,min(V_41_MIN) V_41_MIN,round(avg(V_41) ,2) V_41,max(case when V41CP95 =#{condition.count} then V_41 else null end) V_41_CP95, - max(V_42_MAX) V_42_MAX,min(V_42_MIN) V_42_MIN,round(avg(V_42) ,2) V_42,max(case when V42CP95 =#{condition.count} then V_42 else null end) V_42_CP95, - max(V_43_MAX) V_43_MAX,min(V_43_MIN) V_43_MIN,round(avg(V_43) ,2) V_43,max(case when V43CP95 =#{condition.count} then V_43 else null end) V_43_CP95, - max(V_44_MAX) V_44_MAX,min(V_44_MIN) V_44_MIN,round(avg(V_44) ,2) V_44,max(case when V44CP95 =#{condition.count} then V_44 else null end) V_44_CP95, - max(V_45_MAX) V_45_MAX,min(V_45_MIN) V_45_MIN,round(avg(V_45) ,2) V_45,max(case when V45CP95 =#{condition.count} then V_45 else null end) V_45_CP95, - max(V_46_MAX) V_46_MAX,min(V_46_MIN) V_46_MIN,round(avg(V_46) ,2) V_46,max(case when V46CP95 =#{condition.count} then V_46 else null end) V_46_CP95, - max(V_47_MAX) V_47_MAX,min(V_47_MIN) V_47_MIN,round(avg(V_47) ,2) V_47,max(case when V47CP95 =#{condition.count} then V_47 else null end) V_47_CP95, - max(V_48_MAX) V_48_MAX,min(V_48_MIN) V_48_MIN,round(avg(V_48) ,2) V_48,max(case when V48CP95 =#{condition.count} then V_48 else null end) V_48_CP95, - max(V_49_MAX) V_49_MAX,min(V_49_MIN) V_49_MIN,round(avg(V_49) ,2) V_49,max(case when V49CP95 =#{condition.count} then V_49 else null end) V_49_CP95, - max(V_50_MAX) V_50_MAX,min(V_50_MIN) V_50_MIN,round(avg(V_50) ,2) V_50,max(case when V50CP95 =#{condition.count} then V_50 else null end) V_50_CP95 + max(V_2_MAX) V_2_MAX,min(V_2_MIN) V_2_MIN,round(avg(V_2) ,2) V_2,max(case when V2CP95 =#{condition.count} then V_2_CP95 else null end) V_2_CP95, + max(V_3_MAX) V_3_MAX,min(V_3_MIN) V_3_MIN,round(avg(V_3) ,2) V_3,max(case when V3CP95 =#{condition.count} then V_3_CP95 else null end) V_3_CP95, + max(V_4_MAX) V_4_MAX,min(V_4_MIN) V_4_MIN,round(avg(V_4) ,2) V_4,max(case when V4CP95 =#{condition.count} then V_4_CP95 else null end) V_4_CP95, + max(V_5_MAX) V_5_MAX,min(V_5_MIN) V_5_MIN,round(avg(V_5) ,2) V_5,max(case when V5CP95 =#{condition.count} then V_5_CP95 else null end) V_5_CP95, + max(V_6_MAX) V_6_MAX,min(V_6_MIN) V_6_MIN,round(avg(V_6) ,2) V_6,max(case when V6CP95 =#{condition.count} then V_6_CP95 else null end) V_6_CP95, + max(V_7_MAX) V_7_MAX,min(V_7_MIN) V_7_MIN,round(avg(V_7) ,2) V_7,max(case when V7CP95 =#{condition.count} then V_7_CP95 else null end) V_7_CP95, + max(V_8_MAX) V_8_MAX,min(V_8_MIN) V_8_MIN,round(avg(V_8) ,2) V_8,max(case when V8CP95 =#{condition.count} then V_8_CP95 else null end) V_8_CP95, + max(V_9_MAX) V_9_MAX,min(V_9_MIN) V_9_MIN,round(avg(V_9) ,2) V_9,max(case when V9CP95 =#{condition.count} then V_9_CP95 else null end) V_9_CP95, + max(V_10_MAX) V_10_MAX,min(V_10_MIN) V_10_MIN,round(avg(V_10) ,2) V_10,max(case when V10CP95 =#{condition.count} then V_10_CP95 else null end) V_10_CP95, + max(V_11_MAX) V_11_MAX,min(V_11_MIN) V_11_MIN,round(avg(V_11) ,2) V_11,max(case when V11CP95 =#{condition.count} then V_11_CP95 else null end) V_11_CP95, + max(V_12_MAX) V_12_MAX,min(V_12_MIN) V_12_MIN,round(avg(V_12) ,2) V_12,max(case when V12CP95 =#{condition.count} then V_12_CP95 else null end) V_12_CP95, + max(V_13_MAX) V_13_MAX,min(V_13_MIN) V_13_MIN,round(avg(V_13) ,2) V_13,max(case when V13CP95 =#{condition.count} then V_13_CP95 else null end) V_13_CP95, + max(V_14_MAX) V_14_MAX,min(V_14_MIN) V_14_MIN,round(avg(V_14) ,2) V_14,max(case when V14CP95 =#{condition.count} then V_14_CP95 else null end) V_14_CP95, + max(V_15_MAX) V_15_MAX,min(V_15_MIN) V_15_MIN,round(avg(V_15) ,2) V_15,max(case when V15CP95 =#{condition.count} then V_15_CP95 else null end) V_15_CP95, + max(V_16_MAX) V_16_MAX,min(V_16_MIN) V_16_MIN,round(avg(V_16) ,2) V_16,max(case when V16CP95 =#{condition.count} then V_16_CP95 else null end) V_16_CP95, + max(V_17_MAX) V_17_MAX,min(V_17_MIN) V_17_MIN,round(avg(V_17) ,2) V_17,max(case when V17CP95 =#{condition.count} then V_17_CP95 else null end) V_17_CP95, + max(V_18_MAX) V_18_MAX,min(V_18_MIN) V_18_MIN,round(avg(V_18) ,2) V_18,max(case when V18CP95 =#{condition.count} then V_18_CP95 else null end) V_18_CP95, + max(V_19_MAX) V_19_MAX,min(V_19_MIN) V_19_MIN,round(avg(V_19) ,2) V_19,max(case when V19CP95 =#{condition.count} then V_19_CP95 else null end) V_19_CP95, + max(V_20_MAX) V_20_MAX,min(V_20_MIN) V_20_MIN,round(avg(V_20) ,2) V_20,max(case when V20CP95 =#{condition.count} then V_20_CP95 else null end) V_20_CP95, + max(V_21_MAX) V_21_MAX,min(V_21_MIN) V_21_MIN,round(avg(V_21) ,2) V_21,max(case when V21CP95 =#{condition.count} then V_21_CP95 else null end) V_21_CP95, + max(V_22_MAX) V_22_MAX,min(V_22_MIN) V_22_MIN,round(avg(V_22) ,2) V_22,max(case when V22CP95 =#{condition.count} then V_22_CP95 else null end) V_22_CP95, + max(V_23_MAX) V_23_MAX,min(V_23_MIN) V_23_MIN,round(avg(V_23) ,2) V_23,max(case when V23CP95 =#{condition.count} then V_23_CP95 else null end) V_23_CP95, + max(V_24_MAX) V_24_MAX,min(V_24_MIN) V_24_MIN,round(avg(V_24) ,2) V_24,max(case when V24CP95 =#{condition.count} then V_24_CP95 else null end) V_24_CP95, + max(V_25_MAX) V_25_MAX,min(V_25_MIN) V_25_MIN,round(avg(V_25) ,2) V_25,max(case when V25CP95 =#{condition.count} then V_25_CP95 else null end) V_25_CP95, + max(V_26_MAX) V_26_MAX,min(V_26_MIN) V_26_MIN,round(avg(V_26) ,2) V_26,max(case when V26CP95 =#{condition.count} then V_26_CP95 else null end) V_26_CP95, + max(V_27_MAX) V_27_MAX,min(V_27_MIN) V_27_MIN,round(avg(V_27) ,2) V_27,max(case when V27CP95 =#{condition.count} then V_27_CP95 else null end) V_27_CP95, + max(V_28_MAX) V_28_MAX,min(V_28_MIN) V_28_MIN,round(avg(V_28) ,2) V_28,max(case when V28CP95 =#{condition.count} then V_28_CP95 else null end) V_28_CP95, + max(V_29_MAX) V_29_MAX,min(V_29_MIN) V_29_MIN,round(avg(V_29) ,2) V_29,max(case when V29CP95 =#{condition.count} then V_29_CP95 else null end) V_29_CP95, + max(V_30_MAX) V_30_MAX,min(V_30_MIN) V_30_MIN,round(avg(V_30) ,2) V_30,max(case when V30CP95 =#{condition.count} then V_30_CP95 else null end) V_30_CP95, + max(V_31_MAX) V_31_MAX,min(V_31_MIN) V_31_MIN,round(avg(V_31) ,2) V_31,max(case when V31CP95 =#{condition.count} then V_31_CP95 else null end) V_31_CP95, + max(V_32_MAX) V_32_MAX,min(V_32_MIN) V_32_MIN,round(avg(V_32) ,2) V_32,max(case when V32CP95 =#{condition.count} then V_32_CP95 else null end) V_32_CP95, + max(V_33_MAX) V_33_MAX,min(V_33_MIN) V_33_MIN,round(avg(V_33) ,2) V_33,max(case when V33CP95 =#{condition.count} then V_33_CP95 else null end) V_33_CP95, + max(V_34_MAX) V_34_MAX,min(V_34_MIN) V_34_MIN,round(avg(V_34) ,2) V_34,max(case when V34CP95 =#{condition.count} then V_34_CP95 else null end) V_34_CP95, + max(V_35_MAX) V_35_MAX,min(V_35_MIN) V_35_MIN,round(avg(V_35) ,2) V_35,max(case when V35CP95 =#{condition.count} then V_35_CP95 else null end) V_35_CP95, + max(V_36_MAX) V_36_MAX,min(V_36_MIN) V_36_MIN,round(avg(V_36) ,2) V_36,max(case when V36CP95 =#{condition.count} then V_36_CP95 else null end) V_36_CP95, + max(V_37_MAX) V_37_MAX,min(V_37_MIN) V_37_MIN,round(avg(V_37) ,2) V_37,max(case when V37CP95 =#{condition.count} then V_37_CP95 else null end) V_37_CP95, + max(V_38_MAX) V_38_MAX,min(V_38_MIN) V_38_MIN,round(avg(V_38) ,2) V_38,max(case when V38CP95 =#{condition.count} then V_38_CP95 else null end) V_38_CP95, + max(V_39_MAX) V_39_MAX,min(V_39_MIN) V_39_MIN,round(avg(V_39) ,2) V_39,max(case when V39CP95 =#{condition.count} then V_39_CP95 else null end) V_39_CP95, + max(V_40_MAX) V_40_MAX,min(V_40_MIN) V_40_MIN,round(avg(V_40) ,2) V_40,max(case when V40CP95 =#{condition.count} then V_40_CP95 else null end) V_40_CP95, + max(V_41_MAX) V_41_MAX,min(V_41_MIN) V_41_MIN,round(avg(V_41) ,2) V_41,max(case when V41CP95 =#{condition.count} then V_41_CP95 else null end) V_41_CP95, + max(V_42_MAX) V_42_MAX,min(V_42_MIN) V_42_MIN,round(avg(V_42) ,2) V_42,max(case when V42CP95 =#{condition.count} then V_42_CP95 else null end) V_42_CP95, + max(V_43_MAX) V_43_MAX,min(V_43_MIN) V_43_MIN,round(avg(V_43) ,2) V_43,max(case when V43CP95 =#{condition.count} then V_43_CP95 else null end) V_43_CP95, + max(V_44_MAX) V_44_MAX,min(V_44_MIN) V_44_MIN,round(avg(V_44) ,2) V_44,max(case when V44CP95 =#{condition.count} then V_44_CP95 else null end) V_44_CP95, + max(V_45_MAX) V_45_MAX,min(V_45_MIN) V_45_MIN,round(avg(V_45) ,2) V_45,max(case when V45CP95 =#{condition.count} then V_45_CP95 else null end) V_45_CP95, + max(V_46_MAX) V_46_MAX,min(V_46_MIN) V_46_MIN,round(avg(V_46) ,2) V_46,max(case when V46CP95 =#{condition.count} then V_46_CP95 else null end) V_46_CP95, + max(V_47_MAX) V_47_MAX,min(V_47_MIN) V_47_MIN,round(avg(V_47) ,2) V_47,max(case when V47CP95 =#{condition.count} then V_47_CP95 else null end) V_47_CP95, + max(V_48_MAX) V_48_MAX,min(V_48_MIN) V_48_MIN,round(avg(V_48) ,2) V_48,max(case when V48CP95 =#{condition.count} then V_48_CP95 else null end) V_48_CP95, + max(V_49_MAX) V_49_MAX,min(V_49_MIN) V_49_MIN,round(avg(V_49) ,2) V_49,max(case when V49CP95 =#{condition.count} then V_49_CP95 else null end) V_49_CP95, + max(V_50_MAX) V_50_MAX,min(V_50_MIN) V_50_MIN,round(avg(V_50) ,2) V_50,max(case when V50CP95 =#{condition.count} then V_50_CP95 else null end) V_50_CP95 from ( select t.*, - row_number() over (partition by phasic_type order by V_2 desc) V2CP95, - row_number() over (partition by phasic_type order by V_3 desc) V3CP95, - row_number() over (partition by phasic_type order by V_4 desc) V4CP95, - row_number() over (partition by phasic_type order by V_5 desc) V5CP95, - row_number() over (partition by phasic_type order by V_6 desc) V6CP95, - row_number() over (partition by phasic_type order by V_7 desc) V7CP95, - row_number() over (partition by phasic_type order by V_8 desc) V8CP95, - row_number() over (partition by phasic_type order by V_9 desc) V9CP95, - row_number() over (partition by phasic_type order by V_10 desc) V10CP95, - row_number() over (partition by phasic_type order by V_11 desc) V11CP95, - row_number() over (partition by phasic_type order by V_12 desc) V12CP95, - row_number() over (partition by phasic_type order by V_13 desc) V13CP95, - row_number() over (partition by phasic_type order by V_14 desc) V14CP95, - row_number() over (partition by phasic_type order by V_15 desc) V15CP95, - row_number() over (partition by phasic_type order by V_16 desc) V16CP95, - row_number() over (partition by phasic_type order by V_17 desc) V17CP95, - row_number() over (partition by phasic_type order by V_18 desc) V18CP95, - row_number() over (partition by phasic_type order by V_19 desc) V19CP95, - row_number() over (partition by phasic_type order by V_20 desc) V20CP95, - row_number() over (partition by phasic_type order by V_21 desc) V21CP95, - row_number() over (partition by phasic_type order by V_22 desc) V22CP95, - row_number() over (partition by phasic_type order by V_23 desc) V23CP95, - row_number() over (partition by phasic_type order by V_24 desc) V24CP95, - row_number() over (partition by phasic_type order by V_25 desc) V25CP95, - row_number() over (partition by phasic_type order by V_26 desc) V26CP95, - row_number() over (partition by phasic_type order by V_27 desc) V27CP95, - row_number() over (partition by phasic_type order by V_28 desc) V28CP95, - row_number() over (partition by phasic_type order by V_29 desc) V29CP95, - row_number() over (partition by phasic_type order by V_30 desc) V30CP95, - row_number() over (partition by phasic_type order by V_31 desc) V31CP95, - row_number() over (partition by phasic_type order by V_32 desc) V32CP95, - row_number() over (partition by phasic_type order by V_33 desc) V33CP95, - row_number() over (partition by phasic_type order by V_34 desc) V34CP95, - row_number() over (partition by phasic_type order by V_35 desc) V35CP95, - row_number() over (partition by phasic_type order by V_36 desc) V36CP95, - row_number() over (partition by phasic_type order by V_37 desc) V37CP95, - row_number() over (partition by phasic_type order by V_38 desc) V38CP95, - row_number() over (partition by phasic_type order by V_39 desc) V39CP95, - row_number() over (partition by phasic_type order by V_40 desc) V40CP95, - row_number() over (partition by phasic_type order by V_41 desc) V41CP95, - row_number() over (partition by phasic_type order by V_42 desc) V42CP95, - row_number() over (partition by phasic_type order by V_43 desc) V43CP95, - row_number() over (partition by phasic_type order by V_44 desc) V44CP95, - row_number() over (partition by phasic_type order by V_45 desc) V45CP95, - row_number() over (partition by phasic_type order by V_46 desc) V46CP95, - row_number() over (partition by phasic_type order by V_47 desc) V47CP95, - row_number() over (partition by phasic_type order by V_48 desc) V48CP95, - row_number() over (partition by phasic_type order by V_49 desc) V49CP95, - row_number() over (partition by phasic_type order by V_50 desc) V50CP95 + row_number() over (partition by phasic_type order by V_2_CP95 desc) V2CP95, + row_number() over (partition by phasic_type order by V_3_CP95 desc) V3CP95, + row_number() over (partition by phasic_type order by V_4_CP95 desc) V4CP95, + row_number() over (partition by phasic_type order by V_5_CP95 desc) V5CP95, + row_number() over (partition by phasic_type order by V_6_CP95 desc) V6CP95, + row_number() over (partition by phasic_type order by V_7_CP95 desc) V7CP95, + row_number() over (partition by phasic_type order by V_8_CP95 desc) V8CP95, + row_number() over (partition by phasic_type order by V_9_CP95 desc) V9CP95, + row_number() over (partition by phasic_type order by V_10_CP95 desc) V10CP95, + row_number() over (partition by phasic_type order by V_11_CP95 desc) V11CP95, + row_number() over (partition by phasic_type order by V_12_CP95 desc) V12CP95, + row_number() over (partition by phasic_type order by V_13_CP95 desc) V13CP95, + row_number() over (partition by phasic_type order by V_14_CP95 desc) V14CP95, + row_number() over (partition by phasic_type order by V_15_CP95 desc) V15CP95, + row_number() over (partition by phasic_type order by V_16_CP95 desc) V16CP95, + row_number() over (partition by phasic_type order by V_17_CP95 desc) V17CP95, + row_number() over (partition by phasic_type order by V_18_CP95 desc) V18CP95, + row_number() over (partition by phasic_type order by V_19_CP95 desc) V19CP95, + row_number() over (partition by phasic_type order by V_20_CP95 desc) V20CP95, + row_number() over (partition by phasic_type order by V_21_CP95 desc) V21CP95, + row_number() over (partition by phasic_type order by V_22_CP95 desc) V22CP95, + row_number() over (partition by phasic_type order by V_23_CP95 desc) V23CP95, + row_number() over (partition by phasic_type order by V_24_CP95 desc) V24CP95, + row_number() over (partition by phasic_type order by V_25_CP95 desc) V25CP95, + row_number() over (partition by phasic_type order by V_26_CP95 desc) V26CP95, + row_number() over (partition by phasic_type order by V_27_CP95 desc) V27CP95, + row_number() over (partition by phasic_type order by V_28_CP95 desc) V28CP95, + row_number() over (partition by phasic_type order by V_29_CP95 desc) V29CP95, + row_number() over (partition by phasic_type order by V_30_CP95 desc) V30CP95, + row_number() over (partition by phasic_type order by V_31_CP95 desc) V31CP95, + row_number() over (partition by phasic_type order by V_32_CP95 desc) V32CP95, + row_number() over (partition by phasic_type order by V_33_CP95 desc) V33CP95, + row_number() over (partition by phasic_type order by V_34_CP95 desc) V34CP95, + row_number() over (partition by phasic_type order by V_35_CP95 desc) V35CP95, + row_number() over (partition by phasic_type order by V_36_CP95 desc) V36CP95, + row_number() over (partition by phasic_type order by V_37_CP95 desc) V37CP95, + row_number() over (partition by phasic_type order by V_38_CP95 desc) V38CP95, + row_number() over (partition by phasic_type order by V_39_CP95 desc) V39CP95, + row_number() over (partition by phasic_type order by V_40_CP95 desc) V40CP95, + row_number() over (partition by phasic_type order by V_41_CP95 desc) V41CP95, + row_number() over (partition by phasic_type order by V_42_CP95 desc) V42CP95, + row_number() over (partition by phasic_type order by V_43_CP95 desc) V43CP95, + row_number() over (partition by phasic_type order by V_44_CP95 desc) V44CP95, + row_number() over (partition by phasic_type order by V_45_CP95 desc) V45CP95, + row_number() over (partition by phasic_type order by V_46_CP95 desc) V46CP95, + row_number() over (partition by phasic_type order by V_47_CP95 desc) V47CP95, + row_number() over (partition by phasic_type order by V_48_CP95 desc) V48CP95, + row_number() over (partition by phasic_type order by V_49_CP95 desc) V49CP95, + row_number() over (partition by phasic_type order by V_50_CP95 desc) V50CP95 from @@ -126,9 +126,9 @@