越限数据源调整

pqs9000/src/main/java/com/pqs9000/controller/responsibility/ResponsibilityAreaOverNormalController.java

@@ -1,6 +1,5 @@
 package com.pqs9000.controller.responsibility;
 
-import cn.hutool.json.JSONArray;
 import com.alibaba.fastjson.JSON;
 import com.njcn.pojo.commons.DatePojo;
 import com.njcn.pojo.commons.HttpResult;
@@ -8,10 +7,8 @@ import com.njcn.pojo.commons.RedisDB;
 import com.njcn.utils.PubUtils;
 import com.njcn.utils.redis.JedisManager;
 import com.pqs9000.pojo.responsibility.AreaOverNoraml;
-import com.pqs9000.pojo.responsibility.OverLimitMonitor;
 import com.pqs9000.service.responsibility.AreaOverNoramlService;
 import com.pqs9000.util.ComplexHeadExcel;
-import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +20,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

pqs9000/src/main/resources/mybatis/mappers/responsibility/AreaOverNormalMapper.xml

@@ -21,7 +21,7 @@
         select
         count(distinct myindex) allLine
         from
-        limit_target
+        limit_rate
         where
         myindex IN
         <foreach collection="list" item="list1" open="(" close=")" separator=",">
@@ -34,7 +34,7 @@
         SELECT
         COUNT(DISTINCT(MYINDEX)) overLine
         FROM
-        limit_target b1,
+        limit_rate b1,
         PQS_DEPTSLINE b2,
         PQS_DEPTS b3
         WHERE
@@ -44,7 +44,8 @@
         <foreach collection="list" item="list2" open="(" close=")" separator=",">
             #{list2}
         </foreach>
-        AND b1.MYINDEX = b2.LINE_INDEX AND b2.DEPTS_INDEX = b3.DEPTS_INDEX AND b3.CUSTOM_DEPT = 0
+        AND b1.MYINDEX = b2.LINE_INDEX AND b2.DEPTS_INDEX = b3.DEPTS_INDEX
+--         AND b3.CUSTOM_DEPT = 0
         AND (b1.flicker_overtime >0 or b1.ubalance_overtime >0 or b1.freq_dev_overtime >0 or b1.uaberrance_overtime >0 or b1.voltage_dev_overtime >0 or b1.uharm_2_overtime >0 or b1.iharm_2_overtime >0 or b1.uharm_3_overtime >0 or b1.iharm_3_overtime >0 or b1.uharm_4_overtime >0 or b1.iharm_4_overtime >0
         or b1.uharm_5_overtime >0 or b1.iharm_5_overtime >0 or b1.uharm_6_overtime >0 or b1.iharm_6_overtime >0 or b1.uharm_7_overtime >0 or b1.iharm_7_overtime >0
         or b1.uharm_8_overtime >0 or b1.iharm_8_overtime >0 or b1.uharm_9_overtime >0 or b1.iharm_9_overtime >0 or b1.uharm_10_overtime >0 or b1.iharm_10_overtime >0
@@ -58,22 +59,22 @@
         or b1.INUHARM_12_OVERTIME >0 or b1.INUHARM_13_OVERTIME >0 or b1.INUHARM_14_OVERTIME >0 or b1.INUHARM_15_OVERTIME >0 or b1.INUHARM_16_OVERTIME >0)
         ) Y,
         (
-        select
+            select
-        count(distinct myindex) frequencyOverLine
+            count(distinct myindex) frequencyOverLine
-        from
+            from
-        limit_target
+            limit_rate
-        where
+            where
-        myindex IN
+            myindex IN
-        <foreach collection="list" item="list3" open="(" close=")" separator=",">
+            <foreach collection="list" item="list3" open="(" close=")" separator=",">
-            #{list3}
+                #{list3}
-        </foreach>
+            </foreach>
-        and timeid BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS')
+            and timeid BETWEEN TO_DATE(#{startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{endTime}, 'YYYY-MM-DD HH24:MI:SS')
-        and phasic_type = 'T' and FREQ_DEV_OVERTIME > 0
+            and phasic_type = 'T' and FREQ_DEV_OVERTIME > 0
         ) P,
         (select
         count(distinct myindex) voltageOverLine
         from
-        limit_target
+        limit_rate
         where
         myindex IN
         <foreach collection="list" item="list4" open="(" close=")" separator=",">
@@ -86,7 +87,7 @@
         select
         count(distinct c.myindex) harmonicVoltageOverLine
         from
-        limit_target c
+        limit_rate c
         where
         c.myindex in
         <foreach collection="list" item="harmonicVoltageList" open="(" close=")" separator=",">
@@ -99,7 +100,7 @@
         select
         count(distinct c.myindex) harmonicCurrentOverLine
         from
-        limit_target c
+        limit_rate c
         where
         c.myindex in
         <foreach collection="list" item="harmonicCurrentList" open="(" close=")" separator=",">
@@ -112,7 +113,7 @@
         select
         count(distinct c.myindex) ubalanceOverLine
         from
-        limit_target c
+        limit_rate c
         where
         c.myindex in
         <foreach collection="list" item="threePhaseVoltageList" open="(" close=")" separator=",">
@@ -125,7 +126,7 @@
         select
         count(distinct c.myindex) flicketOverLine
         from
-        limit_target c
+        limit_rate c
         where
         c.myindex in
         <foreach collection="list" item="flickerList" open="(" close=")" separator=",">
@@ -138,7 +139,7 @@
         select
         count(distinct c.myindex) negativeOverLine
         from
-        limit_target c
+        limit_rate c
         where
         c.myindex in
         <foreach collection="list" item="negativeList" open="(" close=")" separator=",">
@@ -151,7 +152,7 @@
         select
         count(distinct c.myindex) interharmonicOverLine
         from
-        limit_target c
+        limit_rate c
         where
         c.myindex in
         <foreach collection="list" item="harmonicCurrentList" open="(" close=")" separator=",">

pqs9000/src/main/resources/mybatis/mappers/responsibility/OverLimitMonitorMapper.xml

@@ -233,6 +233,7 @@
             #{list3}
         </foreach>
         AND freq_dev_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -261,6 +262,7 @@
             #{list4}
         </foreach>
         AND voltage_dev_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -302,6 +304,7 @@
         uharm_21_overtime > 0 or uharm_22_overtime > 0 or
         uharm_23_overtime > 0 or uharm_24_overtime > 0 or
         uharm_25_overtime > 0)
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -331,6 +334,7 @@
             #{list6}
         </foreach>
         AND uaberrance_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -371,6 +375,7 @@
         uharm_21_overtime > 0 or uharm_22_overtime > 0 or
         uharm_23_overtime > 0 or uharm_24_overtime > 0 or
         uharm_25_overtime > 0)
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -399,6 +404,7 @@
             #{list8}
         </foreach>
         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)
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -427,6 +433,7 @@
             #{list9}
         </foreach>
         AND uharm_3_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -455,6 +462,7 @@
             #{list10}
         </foreach>
         AND uharm_5_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -483,6 +491,7 @@
             #{list11}
         </foreach>
         AND uharm_7_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -511,6 +520,7 @@
             #{list12}
         </foreach>
         AND uharm_11_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -539,6 +549,7 @@
             #{list13}
         </foreach>
         AND uharm_13_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -567,6 +578,7 @@
             #{list14}
         </foreach>
         AND uharm_23_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -595,6 +607,7 @@
             #{list15}
         </foreach>
         AND uharm_25_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -623,6 +636,7 @@
             #{list15}
         </foreach>
         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)
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -651,6 +665,7 @@
             #{list16}
         </foreach>
         AND iharm_3_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -679,6 +694,7 @@
             #{list17}
         </foreach>
         AND iharm_5_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -707,6 +723,7 @@
             #{list18}
         </foreach>
         AND iharm_7_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -735,6 +752,7 @@
             #{list19}
         </foreach>
         AND iharm_11_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -763,6 +781,7 @@
             #{list20}
         </foreach>
         AND iharm_13_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -791,6 +810,7 @@
             #{list21}
         </foreach>
         AND iharm_23_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -819,6 +839,7 @@
             #{list22}
         </foreach>
         AND iharm_25_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -847,6 +868,7 @@
             #{list23}
         </foreach>
         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)
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -875,6 +897,7 @@
             #{list24}
         </foreach>
         AND ubalance_overtime>0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -903,6 +926,7 @@
             #{list25}
         </foreach>
         AND flicker_overtime>0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -944,6 +968,7 @@
             #{list27}
         </foreach>
         AND I_Neg_OverTime>0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -974,6 +999,7 @@
         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)
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX

pqs9200/src/main/resources/mybatis/mappers/weeklyReport/GetAreaPointInfoMapper.xml

@@ -96,13 +96,17 @@
 		f.longitude
 		longitude,f.latitude latitude
 		from
-		pq_line a,pq_substation
+		pq_line a,
-		c,pq_subvoltage d,pq_device e,pqs_map
+		pq_substation c,
-		f,pq_devicedetail g
+		pq_subvoltage d,
+		pq_device e,
+		pqs_map f,
+		pq_devicedetail g
 		where
-		a.sub_index=c.sub_index and a.subv_index=d.subv_index and
+		a.sub_index=c.sub_index and
-		a.dev_index=e.dev_index
+		a.subv_index=d.subv_index and
-		and a.sub_index=f.sub_index and
+		a.dev_index=e.dev_index and
+		a.sub_index=f.sub_index and
 		e.dev_index=g.dev_index and f.state =1
 		and e.devmodel=1
 		and e.datatype

pqs9200/src/main/webapp/jspJS/area/vdList.js

@@ -260,7 +260,7 @@
                     extend: 'csv',
                     title: name + '暂降事件列表',//导出csv名称
                     exportOptions: {
-                        columns: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,14],
+                        columns: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,14,15],
                         format: {
                             body: function (data, rID, cID) {
                                 if (cID === 0) {

pqs9900/src/main/webapp/WEB-INF/views/business/device/devmanage.jsp

@@ -178,9 +178,9 @@
 		</tr>
 		<tr>
 			<td align="right" class="width1">识别码:</td>
-			<td align="left" class="width2"><input type="password" class="width3" name="series" id="series" autocomplete="off" maxlength="255"></td>
+			<td align="left" class="width2"><input type="text" class="width3" name="series" id="series" autocomplete="off" maxlength="255"></td>
 			<td align="right" class="width1">秘钥:</td>
-			<td align="left" class="width2"><input type="password" class="width3" name="key" id="key" autocomplete="off" maxlength="255"></td>
+			<td align="left" class="width2"><input type="text" class="width3" name="key" id="key" autocomplete="off" maxlength="255"></td>
 			<td align="right" class="width1" id="call"></td>
 			<td align="left" class="width2"><select class="width3" id="callflag" hidden>
 			</select></td>