越限数据源调整

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/java/com/pqs9000/mapper/report/GetICurrentMapper.java

@@ -11,6 +11,8 @@ import com.pqs9000.pojo.report.ReportValue;
 public interface GetICurrentMapper {
     List<Map<String, Object>> getICurrent(@Param("condition") Condition condition, @Param("listValue") List<Integer> list);
 
+    List<Map<String, Object>> getICurrentNew(@Param("condition") Condition condition);
+
     List<Map<String, Object>> getHICurrent(@Param("condition") Condition condition);
 
     ReportValue VsideValue(@Param("condition") Condition condition);

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 +

pqs9000/src/main/java/com/pqs9000/serviceimpl/report/GetICurrentServiceImpl.java

@@ -32,7 +32,8 @@ public class GetICurrentServiceImpl implements GetICurrentService {
         }
 
         //获取电流幅值，包含基波
-        List<Map<String, Object>> listResult = getICurrentMapper.getICurrent(condition, listValue);
+//        List<Map<String, Object>> listResult = getICurrentMapper.getICurrent(condition, listValue);
+        List<Map<String, Object>> listResult = getICurrentMapper.getICurrentNew(condition);
 
         if (0 == listResult.size() || null == listResult.get(0)) {
             for (int i = 0; i < 50; i++) {

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);

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);
             }
 

pqs9000/src/main/resources/mybatis/mappers/report/GetICurrentMapper.xml

@@ -3,107 +3,107 @@
 <mapper namespace="com.pqs9000.mapper.report.GetICurrentMapper">
     <select id="getICurrent" resultType="java.util.HashMap">
         select phasic_type PHASETYPE,
-        max(I_1_MAX) I_1_MAX,min(I_1_MIN) I_1_MIN,round(avg(I_1) ,2) I_1,max(case when I1CP95 =#{condition.count} then I_1 else null end) I_1_CP95,
-        max(I_2_MAX) I_2_MAX,min(I_2_MIN) I_2_MIN,round(avg(I_2) ,2) I_2,max(case when I2CP95 =#{condition.count} then I_2 else null end) I_2_CP95,
-        max(I_3_MAX) I_3_MAX,min(I_3_MIN) I_3_MIN,round(avg(I_3) ,2) I_3,max(case when I3CP95 =#{condition.count} then I_3 else null end) I_3_CP95,
-        max(I_4_MAX) I_4_MAX,min(I_4_MIN) I_4_MIN,round(avg(I_4) ,2) I_4,max(case when I4CP95 =#{condition.count} then I_4 else null end) I_4_CP95,
-        max(I_5_MAX) I_5_MAX,min(I_5_MIN) I_5_MIN,round(avg(I_5) ,2) I_5,max(case when I5CP95 =#{condition.count} then I_5 else null end) I_5_CP95,
-        max(I_6_MAX) I_6_MAX,min(I_6_MIN) I_6_MIN,round(avg(I_6) ,2) I_6,max(case when I6CP95 =#{condition.count} then I_6 else null end) I_6_CP95,
-        max(I_7_MAX) I_7_MAX,min(I_7_MIN) I_7_MIN,round(avg(I_7) ,2) I_7,max(case when I7CP95 =#{condition.count} then I_7 else null end) I_7_CP95,
-        max(I_8_MAX) I_8_MAX,min(I_8_MIN) I_8_MIN,round(avg(I_8) ,2) I_8,max(case when I8CP95 =#{condition.count} then I_8 else null end) I_8_CP95,
-        max(I_9_MAX) I_9_MAX,min(I_9_MIN) I_9_MIN,round(avg(I_9) ,2) I_9,max(case when I9CP95 =#{condition.count} then I_9 else null end) I_9_CP95,
-        max(I_10_MAX) I_10_MAX,min(I_10_MIN) I_10_MIN,round(avg(I_10) ,2) I_10,max(case when I10CP95 =#{condition.count} then I_10 else null end) I_10_CP95,
-        max(I_11_MAX) I_11_MAX,min(I_11_MIN) I_11_MIN,round(avg(I_11) ,2) I_11,max(case when I11CP95 =#{condition.count} then I_11 else null end) I_11_CP95,
-        max(I_12_MAX) I_12_MAX,min(I_12_MIN) I_12_MIN,round(avg(I_12) ,2) I_12,max(case when I12CP95 =#{condition.count} then I_12 else null end) I_12_CP95,
-        max(I_13_MAX) I_13_MAX,min(I_13_MIN) I_13_MIN,round(avg(I_13) ,2) I_13,max(case when I13CP95 =#{condition.count} then I_13 else null end) I_13_CP95,
-        max(I_14_MAX) I_14_MAX,min(I_14_MIN) I_14_MIN,round(avg(I_14) ,2) I_14,max(case when I14CP95 =#{condition.count} then I_14 else null end) I_14_CP95,
-        max(I_15_MAX) I_15_MAX,min(I_15_MIN) I_15_MIN,round(avg(I_15) ,2) I_15,max(case when I15CP95 =#{condition.count} then I_15 else null end) I_15_CP95,
-        max(I_16_MAX) I_16_MAX,min(I_16_MIN) I_16_MIN,round(avg(I_16) ,2) I_16,max(case when I16CP95 =#{condition.count} then I_16 else null end) I_16_CP95,
-        max(I_17_MAX) I_17_MAX,min(I_17_MIN) I_17_MIN,round(avg(I_17) ,2) I_17,max(case when I17CP95 =#{condition.count} then I_17 else null end) I_17_CP95,
-        max(I_18_MAX) I_18_MAX,min(I_18_MIN) I_18_MIN,round(avg(I_18) ,2) I_18,max(case when I18CP95 =#{condition.count} then I_18 else null end) I_18_CP95,
-        max(I_19_MAX) I_19_MAX,min(I_19_MIN) I_19_MIN,round(avg(I_19) ,2) I_19,max(case when I19CP95 =#{condition.count} then I_19 else null end) I_19_CP95,
-        max(I_20_MAX) I_20_MAX,min(I_20_MIN) I_20_MIN,round(avg(I_20) ,2) I_20,max(case when I20CP95 =#{condition.count} then I_20 else null end) I_20_CP95,
-        max(I_21_MAX) I_21_MAX,min(I_21_MIN) I_21_MIN,round(avg(I_21) ,2) I_21,max(case when I21CP95 =#{condition.count} then I_21 else null end) I_21_CP95,
-        max(I_22_MAX) I_22_MAX,min(I_22_MIN) I_22_MIN,round(avg(I_22) ,2) I_22,max(case when I22CP95 =#{condition.count} then I_22 else null end) I_22_CP95,
-        max(I_23_MAX) I_23_MAX,min(I_23_MIN) I_23_MIN,round(avg(I_23) ,2) I_23,max(case when I23CP95 =#{condition.count} then I_23 else null end) I_23_CP95,
-        max(I_24_MAX) I_24_MAX,min(I_24_MIN) I_24_MIN,round(avg(I_24) ,2) I_24,max(case when I24CP95 =#{condition.count} then I_24 else null end) I_24_CP95,
-        max(I_25_MAX) I_25_MAX,min(I_25_MIN) I_25_MIN,round(avg(I_25) ,2) I_25,max(case when I25CP95 =#{condition.count} then I_25 else null end) I_25_CP95,
-        max(I_26_MAX) I_26_MAX,min(I_26_MIN) I_26_MIN,round(avg(I_26) ,2) I_26,max(case when I26CP95 =#{condition.count} then I_26 else null end) I_26_CP95,
-        max(I_27_MAX) I_27_MAX,min(I_27_MIN) I_27_MIN,round(avg(I_27) ,2) I_27,max(case when I27CP95 =#{condition.count} then I_27 else null end) I_27_CP95,
-        max(I_28_MAX) I_28_MAX,min(I_28_MIN) I_28_MIN,round(avg(I_28) ,2) I_28,max(case when I28CP95 =#{condition.count} then I_28 else null end) I_28_CP95,
-        max(I_29_MAX) I_29_MAX,min(I_29_MIN) I_29_MIN,round(avg(I_29) ,2) I_29,max(case when I29CP95 =#{condition.count} then I_29 else null end) I_29_CP95,
-        max(I_30_MAX) I_30_MAX,min(I_30_MIN) I_30_MIN,round(avg(I_30) ,2) I_30,max(case when I30CP95 =#{condition.count} then I_30 else null end) I_30_CP95,
-        max(I_31_MAX) I_31_MAX,min(I_31_MIN) I_31_MIN,round(avg(I_31) ,2) I_31,max(case when I31CP95 =#{condition.count} then I_31 else null end) I_31_CP95,
-        max(I_32_MAX) I_32_MAX,min(I_32_MIN) I_32_MIN,round(avg(I_32) ,2) I_32,max(case when I32CP95 =#{condition.count} then I_32 else null end) I_32_CP95,
-        max(I_33_MAX) I_33_MAX,min(I_33_MIN) I_33_MIN,round(avg(I_33) ,2) I_33,max(case when I33CP95 =#{condition.count} then I_33 else null end) I_33_CP95,
-        max(I_34_MAX) I_34_MAX,min(I_34_MIN) I_34_MIN,round(avg(I_34) ,2) I_34,max(case when I34CP95 =#{condition.count} then I_34 else null end) I_34_CP95,
-        max(I_35_MAX) I_35_MAX,min(I_35_MIN) I_35_MIN,round(avg(I_35) ,2) I_35,max(case when I35CP95 =#{condition.count} then I_35 else null end) I_35_CP95,
-        max(I_36_MAX) I_36_MAX,min(I_36_MIN) I_36_MIN,round(avg(I_36) ,2) I_36,max(case when I36CP95 =#{condition.count} then I_36 else null end) I_36_CP95,
-        max(I_37_MAX) I_37_MAX,min(I_37_MIN) I_37_MIN,round(avg(I_37) ,2) I_37,max(case when I37CP95 =#{condition.count} then I_37 else null end) I_37_CP95,
-        max(I_38_MAX) I_38_MAX,min(I_38_MIN) I_38_MIN,round(avg(I_38) ,2) I_38,max(case when I38CP95 =#{condition.count} then I_38 else null end) I_38_CP95,
-        max(I_39_MAX) I_39_MAX,min(I_39_MIN) I_39_MIN,round(avg(I_39) ,2) I_39,max(case when I39CP95 =#{condition.count} then I_39 else null end) I_39_CP95,
-        max(I_40_MAX) I_40_MAX,min(I_40_MIN) I_40_MIN,round(avg(I_40) ,2) I_40,max(case when I40CP95 =#{condition.count} then I_40 else null end) I_40_CP95,
-        max(I_41_MAX) I_41_MAX,min(I_41_MIN) I_41_MIN,round(avg(I_41) ,2) I_41,max(case when I41CP95 =#{condition.count} then I_41 else null end) I_41_CP95,
-        max(I_42_MAX) I_42_MAX,min(I_42_MIN) I_42_MIN,round(avg(I_42) ,2) I_42,max(case when I42CP95 =#{condition.count} then I_42 else null end) I_42_CP95,
-        max(I_43_MAX) I_43_MAX,min(I_43_MIN) I_43_MIN,round(avg(I_43) ,2) I_43,max(case when I43CP95 =#{condition.count} then I_43 else null end) I_43_CP95,
-        max(I_44_MAX) I_44_MAX,min(I_44_MIN) I_44_MIN,round(avg(I_44) ,2) I_44,max(case when I44CP95 =#{condition.count} then I_44 else null end) I_44_CP95,
-        max(I_45_MAX) I_45_MAX,min(I_45_MIN) I_45_MIN,round(avg(I_45) ,2) I_45,max(case when I45CP95 =#{condition.count} then I_45 else null end) I_45_CP95,
-        max(I_46_MAX) I_46_MAX,min(I_46_MIN) I_46_MIN,round(avg(I_46) ,2) I_46,max(case when I46CP95 =#{condition.count} then I_46 else null end) I_46_CP95,
-        max(I_47_MAX) I_47_MAX,min(I_47_MIN) I_47_MIN,round(avg(I_47) ,2) I_47,max(case when I47CP95 =#{condition.count} then I_47 else null end) I_47_CP95,
-        max(I_48_MAX) I_48_MAX,min(I_48_MIN) I_48_MIN,round(avg(I_48) ,2) I_48,max(case when I48CP95 =#{condition.count} then I_48 else null end) I_48_CP95,
-        max(I_49_MAX) I_49_MAX,min(I_49_MIN) I_49_MIN,round(avg(I_49) ,2) I_49,max(case when I49CP95 =#{condition.count} then I_49 else null end) I_49_CP95,
-        max(I_50_MAX) I_50_MAX,min(I_50_MIN) I_50_MIN,round(avg(I_50) ,2) I_50,max(case when I50CP95 =#{condition.count} then I_50 else null end) I_50_CP95
+        max(I_1_MAX) I_1_MAX,min(I_1_MIN) I_1_MIN,round(avg(I_1) ,2) I_1,max(case when I1CP95 =#{condition.count} then I_1_CP95 else null end) I_1_CP95,
+        max(I_2_MAX) I_2_MAX,min(I_2_MIN) I_2_MIN,round(avg(I_2) ,2) I_2,max(case when I2CP95 =#{condition.count} then I_2_CP95 else null end) I_2_CP95,
+        max(I_3_MAX) I_3_MAX,min(I_3_MIN) I_3_MIN,round(avg(I_3) ,2) I_3,max(case when I3CP95 =#{condition.count} then I_3_CP95 else null end) I_3_CP95,
+        max(I_4_MAX) I_4_MAX,min(I_4_MIN) I_4_MIN,round(avg(I_4) ,2) I_4,max(case when I4CP95 =#{condition.count} then I_4_CP95 else null end) I_4_CP95,
+        max(I_5_MAX) I_5_MAX,min(I_5_MIN) I_5_MIN,round(avg(I_5) ,2) I_5,max(case when I5CP95 =#{condition.count} then I_5_CP95 else null end) I_5_CP95,
+        max(I_6_MAX) I_6_MAX,min(I_6_MIN) I_6_MIN,round(avg(I_6) ,2) I_6,max(case when I6CP95 =#{condition.count} then I_6_CP95 else null end) I_6_CP95,
+        max(I_7_MAX) I_7_MAX,min(I_7_MIN) I_7_MIN,round(avg(I_7) ,2) I_7,max(case when I7CP95 =#{condition.count} then I_7_CP95 else null end) I_7_CP95,
+        max(I_8_MAX) I_8_MAX,min(I_8_MIN) I_8_MIN,round(avg(I_8) ,2) I_8,max(case when I8CP95 =#{condition.count} then I_8_CP95 else null end) I_8_CP95,
+        max(I_9_MAX) I_9_MAX,min(I_9_MIN) I_9_MIN,round(avg(I_9) ,2) I_9,max(case when I9CP95 =#{condition.count} then I_9_CP95 else null end) I_9_CP95,
+        max(I_10_MAX) I_10_MAX,min(I_10_MIN) I_10_MIN,round(avg(I_10) ,2) I_10,max(case when I10CP95 =#{condition.count} then I_10_CP95 else null end) I_10_CP95,
+        max(I_11_MAX) I_11_MAX,min(I_11_MIN) I_11_MIN,round(avg(I_11) ,2) I_11,max(case when I11CP95 =#{condition.count} then I_11_CP95 else null end) I_11_CP95,
+        max(I_12_MAX) I_12_MAX,min(I_12_MIN) I_12_MIN,round(avg(I_12) ,2) I_12,max(case when I12CP95 =#{condition.count} then I_12_CP95 else null end) I_12_CP95,
+        max(I_13_MAX) I_13_MAX,min(I_13_MIN) I_13_MIN,round(avg(I_13) ,2) I_13,max(case when I13CP95 =#{condition.count} then I_13_CP95 else null end) I_13_CP95,
+        max(I_14_MAX) I_14_MAX,min(I_14_MIN) I_14_MIN,round(avg(I_14) ,2) I_14,max(case when I14CP95 =#{condition.count} then I_14_CP95 else null end) I_14_CP95,
+        max(I_15_MAX) I_15_MAX,min(I_15_MIN) I_15_MIN,round(avg(I_15) ,2) I_15,max(case when I15CP95 =#{condition.count} then I_15_CP95 else null end) I_15_CP95,
+        max(I_16_MAX) I_16_MAX,min(I_16_MIN) I_16_MIN,round(avg(I_16) ,2) I_16,max(case when I16CP95 =#{condition.count} then I_16_CP95 else null end) I_16_CP95,
+        max(I_17_MAX) I_17_MAX,min(I_17_MIN) I_17_MIN,round(avg(I_17) ,2) I_17,max(case when I17CP95 =#{condition.count} then I_17_CP95 else null end) I_17_CP95,
+        max(I_18_MAX) I_18_MAX,min(I_18_MIN) I_18_MIN,round(avg(I_18) ,2) I_18,max(case when I18CP95 =#{condition.count} then I_18_CP95 else null end) I_18_CP95,
+        max(I_19_MAX) I_19_MAX,min(I_19_MIN) I_19_MIN,round(avg(I_19) ,2) I_19,max(case when I19CP95 =#{condition.count} then I_19_CP95 else null end) I_19_CP95,
+        max(I_20_MAX) I_20_MAX,min(I_20_MIN) I_20_MIN,round(avg(I_20) ,2) I_20,max(case when I20CP95 =#{condition.count} then I_20_CP95 else null end) I_20_CP95,
+        max(I_21_MAX) I_21_MAX,min(I_21_MIN) I_21_MIN,round(avg(I_21) ,2) I_21,max(case when I21CP95 =#{condition.count} then I_21_CP95 else null end) I_21_CP95,
+        max(I_22_MAX) I_22_MAX,min(I_22_MIN) I_22_MIN,round(avg(I_22) ,2) I_22,max(case when I22CP95 =#{condition.count} then I_22_CP95 else null end) I_22_CP95,
+        max(I_23_MAX) I_23_MAX,min(I_23_MIN) I_23_MIN,round(avg(I_23) ,2) I_23,max(case when I23CP95 =#{condition.count} then I_23_CP95 else null end) I_23_CP95,
+        max(I_24_MAX) I_24_MAX,min(I_24_MIN) I_24_MIN,round(avg(I_24) ,2) I_24,max(case when I24CP95 =#{condition.count} then I_24_CP95 else null end) I_24_CP95,
+        max(I_25_MAX) I_25_MAX,min(I_25_MIN) I_25_MIN,round(avg(I_25) ,2) I_25,max(case when I25CP95 =#{condition.count} then I_25_CP95 else null end) I_25_CP95,
+        max(I_26_MAX) I_26_MAX,min(I_26_MIN) I_26_MIN,round(avg(I_26) ,2) I_26,max(case when I26CP95 =#{condition.count} then I_26_CP95 else null end) I_26_CP95,
+        max(I_27_MAX) I_27_MAX,min(I_27_MIN) I_27_MIN,round(avg(I_27) ,2) I_27,max(case when I27CP95 =#{condition.count} then I_27_CP95 else null end) I_27_CP95,
+        max(I_28_MAX) I_28_MAX,min(I_28_MIN) I_28_MIN,round(avg(I_28) ,2) I_28,max(case when I28CP95 =#{condition.count} then I_28_CP95 else null end) I_28_CP95,
+        max(I_29_MAX) I_29_MAX,min(I_29_MIN) I_29_MIN,round(avg(I_29) ,2) I_29,max(case when I29CP95 =#{condition.count} then I_29_CP95 else null end) I_29_CP95,
+        max(I_30_MAX) I_30_MAX,min(I_30_MIN) I_30_MIN,round(avg(I_30) ,2) I_30,max(case when I30CP95 =#{condition.count} then I_30_CP95 else null end) I_30_CP95,
+        max(I_31_MAX) I_31_MAX,min(I_31_MIN) I_31_MIN,round(avg(I_31) ,2) I_31,max(case when I31CP95 =#{condition.count} then I_31_CP95 else null end) I_31_CP95,
+        max(I_32_MAX) I_32_MAX,min(I_32_MIN) I_32_MIN,round(avg(I_32) ,2) I_32,max(case when I32CP95 =#{condition.count} then I_32_CP95 else null end) I_32_CP95,
+        max(I_33_MAX) I_33_MAX,min(I_33_MIN) I_33_MIN,round(avg(I_33) ,2) I_33,max(case when I33CP95 =#{condition.count} then I_33_CP95 else null end) I_33_CP95,
+        max(I_34_MAX) I_34_MAX,min(I_34_MIN) I_34_MIN,round(avg(I_34) ,2) I_34,max(case when I34CP95 =#{condition.count} then I_34_CP95 else null end) I_34_CP95,
+        max(I_35_MAX) I_35_MAX,min(I_35_MIN) I_35_MIN,round(avg(I_35) ,2) I_35,max(case when I35CP95 =#{condition.count} then I_35_CP95 else null end) I_35_CP95,
+        max(I_36_MAX) I_36_MAX,min(I_36_MIN) I_36_MIN,round(avg(I_36) ,2) I_36,max(case when I36CP95 =#{condition.count} then I_36_CP95 else null end) I_36_CP95,
+        max(I_37_MAX) I_37_MAX,min(I_37_MIN) I_37_MIN,round(avg(I_37) ,2) I_37,max(case when I37CP95 =#{condition.count} then I_37_CP95 else null end) I_37_CP95,
+        max(I_38_MAX) I_38_MAX,min(I_38_MIN) I_38_MIN,round(avg(I_38) ,2) I_38,max(case when I38CP95 =#{condition.count} then I_38_CP95 else null end) I_38_CP95,
+        max(I_39_MAX) I_39_MAX,min(I_39_MIN) I_39_MIN,round(avg(I_39) ,2) I_39,max(case when I39CP95 =#{condition.count} then I_39_CP95 else null end) I_39_CP95,
+        max(I_40_MAX) I_40_MAX,min(I_40_MIN) I_40_MIN,round(avg(I_40) ,2) I_40,max(case when I40CP95 =#{condition.count} then I_40_CP95 else null end) I_40_CP95,
+        max(I_41_MAX) I_41_MAX,min(I_41_MIN) I_41_MIN,round(avg(I_41) ,2) I_41,max(case when I41CP95 =#{condition.count} then I_41_CP95 else null end) I_41_CP95,
+        max(I_42_MAX) I_42_MAX,min(I_42_MIN) I_42_MIN,round(avg(I_42) ,2) I_42,max(case when I42CP95 =#{condition.count} then I_42_CP95 else null end) I_42_CP95,
+        max(I_43_MAX) I_43_MAX,min(I_43_MIN) I_43_MIN,round(avg(I_43) ,2) I_43,max(case when I43CP95 =#{condition.count} then I_43_CP95 else null end) I_43_CP95,
+        max(I_44_MAX) I_44_MAX,min(I_44_MIN) I_44_MIN,round(avg(I_44) ,2) I_44,max(case when I44CP95 =#{condition.count} then I_44_CP95 else null end) I_44_CP95,
+        max(I_45_MAX) I_45_MAX,min(I_45_MIN) I_45_MIN,round(avg(I_45) ,2) I_45,max(case when I45CP95 =#{condition.count} then I_45_CP95 else null end) I_45_CP95,
+        max(I_46_MAX) I_46_MAX,min(I_46_MIN) I_46_MIN,round(avg(I_46) ,2) I_46,max(case when I46CP95 =#{condition.count} then I_46_CP95 else null end) I_46_CP95,
+        max(I_47_MAX) I_47_MAX,min(I_47_MIN) I_47_MIN,round(avg(I_47) ,2) I_47,max(case when I47CP95 =#{condition.count} then I_47_CP95 else null end) I_47_CP95,
+        max(I_48_MAX) I_48_MAX,min(I_48_MIN) I_48_MIN,round(avg(I_48) ,2) I_48,max(case when I48CP95 =#{condition.count} then I_48_CP95 else null end) I_48_CP95,
+        max(I_49_MAX) I_49_MAX,min(I_49_MIN) I_49_MIN,round(avg(I_49) ,2) I_49,max(case when I49CP95 =#{condition.count} then I_49_CP95 else null end) I_49_CP95,
+        max(I_50_MAX) I_50_MAX,min(I_50_MIN) I_50_MIN,round(avg(I_50) ,2) I_50,max(case when I50CP95 =#{condition.count} then I_50_CP95 else null end) I_50_CP95
         from ( select t.*,
-        row_number() over (partition by phasic_type order by I_1 desc) I1CP95,
-        row_number() over (partition by phasic_type order by I_2 desc) I2CP95,
-        row_number() over (partition by phasic_type order by I_3 desc) I3CP95,
-        row_number() over (partition by phasic_type order by I_4 desc) I4CP95,
-        row_number() over (partition by phasic_type order by I_5 desc) I5CP95,
-        row_number() over (partition by phasic_type order by I_6 desc) I6CP95,
-        row_number() over (partition by phasic_type order by I_7 desc) I7CP95,
-        row_number() over (partition by phasic_type order by I_8 desc) I8CP95,
-        row_number() over (partition by phasic_type order by I_9 desc) I9CP95,
-        row_number() over (partition by phasic_type order by I_10 desc) I10CP95,
-        row_number() over (partition by phasic_type order by I_11 desc) I11CP95,
-        row_number() over (partition by phasic_type order by I_12 desc) I12CP95,
-        row_number() over (partition by phasic_type order by I_13 desc) I13CP95,
-        row_number() over (partition by phasic_type order by I_14 desc) I14CP95,
-        row_number() over (partition by phasic_type order by I_15 desc) I15CP95,
-        row_number() over (partition by phasic_type order by I_16 desc) I16CP95,
-        row_number() over (partition by phasic_type order by I_17 desc) I17CP95,
-        row_number() over (partition by phasic_type order by I_18 desc) I18CP95,
-        row_number() over (partition by phasic_type order by I_19 desc) I19CP95,
-        row_number() over (partition by phasic_type order by I_20 desc) I20CP95,
-        row_number() over (partition by phasic_type order by I_21 desc) I21CP95,
-        row_number() over (partition by phasic_type order by I_22 desc) I22CP95,
-        row_number() over (partition by phasic_type order by I_23 desc) I23CP95,
-        row_number() over (partition by phasic_type order by I_24 desc) I24CP95,
-        row_number() over (partition by phasic_type order by I_25 desc) I25CP95,
-        row_number() over (partition by phasic_type order by I_26 desc) I26CP95,
-        row_number() over (partition by phasic_type order by I_27 desc) I27CP95,
-        row_number() over (partition by phasic_type order by I_28 desc) I28CP95,
-        row_number() over (partition by phasic_type order by I_29 desc) I29CP95,
-        row_number() over (partition by phasic_type order by I_30 desc) I30CP95,
-        row_number() over (partition by phasic_type order by I_31 desc) I31CP95,
-        row_number() over (partition by phasic_type order by I_32 desc) I32CP95,
-        row_number() over (partition by phasic_type order by I_33 desc) I33CP95,
-        row_number() over (partition by phasic_type order by I_34 desc) I34CP95,
-        row_number() over (partition by phasic_type order by I_35 desc) I35CP95,
-        row_number() over (partition by phasic_type order by I_36 desc) I36CP95,
-        row_number() over (partition by phasic_type order by I_37 desc) I37CP95,
-        row_number() over (partition by phasic_type order by I_38 desc) I38CP95,
-        row_number() over (partition by phasic_type order by I_39 desc) I39CP95,
-        row_number() over (partition by phasic_type order by I_40 desc) I40CP95,
-        row_number() over (partition by phasic_type order by I_41 desc) I41CP95,
-        row_number() over (partition by phasic_type order by I_42 desc) I42CP95,
-        row_number() over (partition by phasic_type order by I_43 desc) I43CP95,
-        row_number() over (partition by phasic_type order by I_44 desc) I44CP95,
-        row_number() over (partition by phasic_type order by I_45 desc) I45CP95,
-        row_number() over (partition by phasic_type order by I_46 desc) I46CP95,
-        row_number() over (partition by phasic_type order by I_47 desc) I47CP95,
-        row_number() over (partition by phasic_type order by I_48 desc) I48CP95,
-        row_number() over (partition by phasic_type order by I_49 desc) I49CP95,
-        row_number() over (partition by phasic_type order by I_50 desc) I50CP95
+        row_number() over (partition by phasic_type order by I_1_CP95 desc) I1CP95,
+        row_number() over (partition by phasic_type order by I_2_CP95 desc) I2CP95,
+        row_number() over (partition by phasic_type order by I_3_CP95 desc) I3CP95,
+        row_number() over (partition by phasic_type order by I_4_CP95 desc) I4CP95,
+        row_number() over (partition by phasic_type order by I_5_CP95 desc) I5CP95,
+        row_number() over (partition by phasic_type order by I_6_CP95 desc) I6CP95,
+        row_number() over (partition by phasic_type order by I_7_CP95 desc) I7CP95,
+        row_number() over (partition by phasic_type order by I_8_CP95 desc) I8CP95,
+        row_number() over (partition by phasic_type order by I_9_CP95 desc) I9CP95,
+        row_number() over (partition by phasic_type order by I_10_CP95 desc) I10CP95,
+        row_number() over (partition by phasic_type order by I_11_CP95 desc) I11CP95,
+        row_number() over (partition by phasic_type order by I_12_CP95 desc) I12CP95,
+        row_number() over (partition by phasic_type order by I_13_CP95 desc) I13CP95,
+        row_number() over (partition by phasic_type order by I_14_CP95 desc) I14CP95,
+        row_number() over (partition by phasic_type order by I_15_CP95 desc) I15CP95,
+        row_number() over (partition by phasic_type order by I_16_CP95 desc) I16CP95,
+        row_number() over (partition by phasic_type order by I_17_CP95 desc) I17CP95,
+        row_number() over (partition by phasic_type order by I_18_CP95 desc) I18CP95,
+        row_number() over (partition by phasic_type order by I_19_CP95 desc) I19CP95,
+        row_number() over (partition by phasic_type order by I_20_CP95 desc) I20CP95,
+        row_number() over (partition by phasic_type order by I_21_CP95 desc) I21CP95,
+        row_number() over (partition by phasic_type order by I_22_CP95 desc) I22CP95,
+        row_number() over (partition by phasic_type order by I_23_CP95 desc) I23CP95,
+        row_number() over (partition by phasic_type order by I_24_CP95 desc) I24CP95,
+        row_number() over (partition by phasic_type order by I_25_CP95 desc) I25CP95,
+        row_number() over (partition by phasic_type order by I_26_CP95 desc) I26CP95,
+        row_number() over (partition by phasic_type order by I_27_CP95 desc) I27CP95,
+        row_number() over (partition by phasic_type order by I_28_CP95 desc) I28CP95,
+        row_number() over (partition by phasic_type order by I_29_CP95 desc) I29CP95,
+        row_number() over (partition by phasic_type order by I_30_CP95 desc) I30CP95,
+        row_number() over (partition by phasic_type order by I_31_CP95 desc) I31CP95,
+        row_number() over (partition by phasic_type order by I_32_CP95 desc) I32CP95,
+        row_number() over (partition by phasic_type order by I_33_CP95 desc) I33CP95,
+        row_number() over (partition by phasic_type order by I_34_CP95 desc) I34CP95,
+        row_number() over (partition by phasic_type order by I_35_CP95 desc) I35CP95,
+        row_number() over (partition by phasic_type order by I_36_CP95 desc) I36CP95,
+        row_number() over (partition by phasic_type order by I_37_CP95 desc) I37CP95,
+        row_number() over (partition by phasic_type order by I_38_CP95 desc) I38CP95,
+        row_number() over (partition by phasic_type order by I_39_CP95 desc) I39CP95,
+        row_number() over (partition by phasic_type order by I_40_CP95 desc) I40CP95,
+        row_number() over (partition by phasic_type order by I_41_CP95 desc) I41CP95,
+        row_number() over (partition by phasic_type order by I_42_CP95 desc) I42CP95,
+        row_number() over (partition by phasic_type order by I_43_CP95 desc) I43CP95,
+        row_number() over (partition by phasic_type order by I_44_CP95 desc) I44CP95,
+        row_number() over (partition by phasic_type order by I_45_CP95 desc) I45CP95,
+        row_number() over (partition by phasic_type order by I_46_CP95 desc) I46CP95,
+        row_number() over (partition by phasic_type order by I_47_CP95 desc) I47CP95,
+        row_number() over (partition by phasic_type order by I_48_CP95 desc) I48CP95,
+        row_number() over (partition by phasic_type order by I_49_CP95 desc) I49CP95,
+        row_number() over (partition by phasic_type order by I_50_CP95 desc) I50CP95
         from
         <choose>
             <when test="condition.b == true">
@@ -125,6 +125,232 @@
         group by phasic_type
     </select>
 
+    <select id="getICurrentNew" resultType="java.util.HashMap">
+        SELECT
+            phasic_type PHASETYPE,
+            max( I_1_MAX ) I_1_MAX,
+            min( I_1_MIN ) I_1_MIN,
+            round( avg( I_1 ), 2 ) I_1,
+            max(I_1_CP95) I_1_CP95,
+            max( I_2_MAX ) I_2_MAX,
+            min( I_2_MIN ) I_2_MIN,
+            round( avg( I_2 ), 2 ) I_2,
+            max(I_2_CP95) I_2_CP95,
+            max( I_3_MAX ) I_3_MAX,
+            min( I_3_MIN ) I_3_MIN,
+            round(avg( I_3 ), 2 ) I_3,
+            max(I_3_CP95) I_3_CP95,
+            max( I_4_MAX ) I_4_MAX,
+            min( I_4_MIN ) I_4_MIN,
+            round( avg( I_4 ), 2 ) I_4,
+            max(I_4_CP95) I_4_CP95,
+            max( I_5_MAX ) I_5_MAX,
+            min( I_5_MIN ) I_5_MIN,
+            round( avg( I_5 ), 2 ) I_5,
+            max(I_5_CP95) I_5_CP95,
+            max( I_6_MAX ) I_6_MAX,
+            min( I_6_MIN ) I_6_MIN,
+            round( avg( I_6 ), 2 ) I_6,
+            max(I_6_CP95) I_6_CP95,
+            max( I_7_MAX ) I_7_MAX,
+            min( I_7_MIN ) I_7_MIN,
+            round( avg( I_7 ), 2 ) I_7,
+            max(I_7_CP95) I_7_CP95,
+            max( I_8_MAX ) I_8_MAX,
+            min( I_8_MIN ) I_8_MIN,
+            round( avg( I_8 ), 2 ) I_8,
+            max(I_8_CP95) I_8_CP95,
+            max( I_9_MAX ) I_9_MAX,
+            min( I_9_MIN ) I_9_MIN,
+            round( avg( I_9 ), 2 ) I_9,
+            max(I_9_CP95) I_9_CP95,
+            max( I_10_MAX ) I_10_MAX,
+            min( I_10_MIN ) I_10_MIN,
+            round( avg( I_10 ), 2 ) I_10,
+            max(I_10_CP95) I_10_CP95,
+            max( I_11_MAX ) I_11_MAX,
+            min( I_11_MIN ) I_11_MIN,
+            round( avg( I_11 ), 2 ) I_11,
+            max(I_11_CP95) I_11_CP95,
+            max( I_12_MAX ) I_12_MAX,
+            min( I_12_MIN ) I_12_MIN,
+            round( avg( I_12 ), 2 ) I_12,
+            max(I_12_CP95) I_12_CP95,
+            max( I_13_MAX ) I_13_MAX,
+            min( I_13_MIN ) I_13_MIN,
+            round( avg( I_13 ), 2 ) I_13,
+            max(I_13_CP95) I_13_CP95,
+            max( I_14_MAX ) I_14_MAX,
+            min( I_14_MIN ) I_14_MIN,
+            round( avg( I_14 ), 2 ) I_14,
+            max(I_14_CP95) I_14_CP95,
+            max( I_15_MAX ) I_15_MAX,
+            min( I_15_MIN ) I_15_MIN,
+            round( avg( I_15 ), 2 ) I_15,
+            max(I_15_CP95) I_15_CP95,
+            max( I_16_MAX ) I_16_MAX,
+            min( I_16_MIN ) I_16_MIN,
+            round( avg( I_16 ), 2 ) I_16,
+            max(I_16_CP95) I_16_CP95,
+            max( I_17_MAX ) I_17_MAX,
+            min( I_17_MIN ) I_17_MIN,
+            round( avg( I_17 ), 2 ) I_17,
+            max(I_17_CP95) I_17_CP95,
+            max( I_18_MAX ) I_18_MAX,
+            min( I_18_MIN ) I_18_MIN,
+            round( avg( I_18 ), 2 ) I_18,
+            max(I_18_CP95) I_18_CP95,
+            max( I_19_MAX ) I_19_MAX,
+            min( I_19_MIN ) I_19_MIN,
+            round( avg( I_19 ), 2 ) I_19,
+            max(I_19_CP95) I_19_CP95,
+            max( I_20_MAX ) I_20_MAX,
+            min( I_20_MIN ) I_20_MIN,
+            round( avg( I_20 ), 2 ) I_20,
+            max(I_20_CP95) I_20_CP95,
+            max( I_21_MAX ) I_21_MAX,
+            min( I_21_MIN ) I_21_MIN,
+            round( avg( I_21 ), 2 ) I_21,
+            max(I_21_CP95) I_21_CP95,
+            max( I_22_MAX ) I_22_MAX,
+            min( I_22_MIN ) I_22_MIN,
+            round( avg( I_22 ), 2 ) I_22,
+            max(I_22_CP95) I_22_CP95,
+            max( I_23_MAX ) I_23_MAX,
+            min( I_23_MIN ) I_23_MIN,
+            round( avg( I_23 ), 2 ) I_23,
+            max(I_23_CP95) I_23_CP95,
+            max( I_24_MAX ) I_24_MAX,
+            min( I_24_MIN ) I_24_MIN,
+            round( avg( I_24 ), 2 ) I_24,
+            max(I_24_CP95) I_24_CP95,
+            max( I_25_MAX ) I_25_MAX,
+            min( I_25_MIN ) I_25_MIN,
+            round( avg( I_25 ), 2 ) I_25,
+            max(I_25_CP95) I_25_CP95,
+            max( I_26_MAX ) I_26_MAX,
+            min( I_26_MIN ) I_26_MIN,
+            round( avg( I_26 ), 2 ) I_26,
+            max(I_26_CP95) I_26_CP95,
+            max( I_27_MAX ) I_27_MAX,
+            min( I_27_MIN ) I_27_MIN,
+            round( avg( I_27 ), 2 ) I_27,
+            max(I_27_CP95) I_27_CP95,
+            max( I_28_MAX ) I_28_MAX,
+            min( I_28_MIN ) I_28_MIN,
+            round( avg( I_28 ), 2 ) I_28,
+            max(I_28_CP95) I_28_CP95,
+            max( I_29_MAX ) I_29_MAX,
+            min( I_29_MIN ) I_29_MIN,
+            round( avg( I_29 ), 2 ) I_29,
+            max(I_29_CP95) I_29_CP95,
+            max( I_30_MAX ) I_30_MAX,
+            min( I_30_MIN ) I_30_MIN,
+            round( avg( I_30 ), 2 ) I_30,
+            max(I_30_CP95) I_30_CP95,
+            max( I_31_MAX ) I_31_MAX,
+            min( I_31_MIN ) I_31_MIN,
+            round( avg( I_31 ), 2 ) I_31,
+            max(I_31_CP95) I_31_CP95,
+            max( I_32_MAX ) I_32_MAX,
+            min( I_32_MIN ) I_32_MIN,
+            round( avg( I_32 ), 2 ) I_32,
+            max(I_32_CP95) I_32_CP95,
+            max( I_33_MAX ) I_33_MAX,
+            min( I_33_MIN ) I_33_MIN,
+            round( avg( I_33 ), 2 ) I_33,
+            max(I_33_CP95) I_33_CP95,
+            max( I_34_MAX ) I_34_MAX,
+            min( I_34_MIN ) I_34_MIN,
+            round( avg( I_34 ), 2 ) I_34,
+            max(I_34_CP95) I_34_CP95,
+            max( I_35_MAX ) I_35_MAX,
+            min( I_35_MIN ) I_35_MIN,
+            round( avg( I_35 ), 2 ) I_35,
+            max(I_35_CP95) I_35_CP95,
+            max( I_36_MAX ) I_36_MAX,
+            min( I_36_MIN ) I_36_MIN,
+            round( avg( I_36 ), 2 ) I_36,
+            max(I_36_CP95) I_36_CP95,
+            max( I_37_MAX ) I_37_MAX,
+            min( I_37_MIN ) I_37_MIN,
+            round( avg( I_37 ), 2 ) I_37,
+            max(I_37_CP95) I_37_CP95,
+            max( I_38_MAX ) I_38_MAX,
+            min( I_38_MIN ) I_38_MIN,
+            round( avg( I_38 ), 2 ) I_38,
+            max(I_38_CP95) I_38_CP95,
+            max( I_39_MAX ) I_39_MAX,
+            min( I_39_MIN ) I_39_MIN,
+            round( avg( I_39 ), 2 ) I_39,
+            max(I_39_CP95) I_39_CP95,
+            max( I_40_MAX ) I_40_MAX,
+            min( I_40_MIN ) I_40_MIN,
+            round( avg( I_40 ), 2 ) I_40,
+            max(I_40_CP95) I_40_CP95,
+            max( I_41_MAX ) I_41_MAX,
+            min( I_41_MIN ) I_41_MIN,
+            round( avg( I_41 ), 2 ) I_41,
+            max(I_41_CP95) I_41_CP95,
+            max( I_42_MAX ) I_42_MAX,
+            min( I_42_MIN ) I_42_MIN,
+            round( avg( I_42 ), 2 ) I_42,
+            max(I_42_CP95) I_42_CP95,
+            max( I_43_MAX ) I_43_MAX,
+            min( I_43_MIN ) I_43_MIN,
+            round( avg( I_43 ), 2 ) I_43,
+            max(I_43_CP95) I_43_CP95,
+            max( I_44_MAX ) I_44_MAX,
+            min( I_44_MIN ) I_44_MIN,
+            round( avg( I_44 ), 2 ) I_44,
+            max(I_44_CP95) I_44_CP95,
+            max( I_45_MAX ) I_45_MAX,
+            min( I_45_MIN ) I_45_MIN,
+            round( avg( I_45 ), 2 ) I_45,
+            max(I_45_CP95) I_45_CP95,
+            max( I_46_MAX ) I_46_MAX,
+            min( I_46_MIN ) I_46_MIN,
+            round( avg( I_46 ), 2 ) I_46,
+            max(I_46_CP95) I_46_CP95,
+            max( I_47_MAX ) I_47_MAX,
+            min( I_47_MIN ) I_47_MIN,
+            round( avg( I_47 ), 2 ) I_47,
+            max(I_47_CP95) I_47_CP95,
+            max( I_48_MAX ) I_48_MAX,
+            min( I_48_MIN ) I_48_MIN,
+            round( avg( I_48 ), 2 ) I_48,
+            max(I_48_CP95) I_48_CP95,
+            max( I_49_MAX ) I_49_MAX,
+            min( I_49_MIN ) I_49_MIN,
+            round( avg( I_49 ), 2 ) I_49,
+            max(I_49_CP95) I_49_CP95,
+            max( I_50_MAX ) I_50_MAX,
+            min( I_50_MIN ) I_50_MIN,
+            round( avg( I_50 ), 2 ) I_50,
+            max(I_50_CP95) I_50_CP95
+        FROM
+            <choose>
+                <when test="condition.b == true">
+                    Data_i
+                </when>
+                <otherwise>
+                    Day_i
+                </otherwise>
+            </choose>
+        WHERE
+            lineid = #{condition.pointIndex}
+            and phasic_type in ('A','B','C')
+            and timeid between #{condition.start} and #{condition.end}
+            <if test="condition.b == true">
+                and QualityFlag = 0
+            </if>
+            <foreach collection="condition.exceptTime" index="index" item="item" open=" " separator=" " close="">
+                and timeid not between #{item.start} and #{item.end}
+            </foreach>
+        GROUP BY
+            phasic_type
+    </select>
+
     <select id="getHICurrent" resultType="java.util.HashMap">
         SELECT
         PHASIC_TYPE PHASETYPE,

pqs9000/src/main/resources/mybatis/mappers/report/GetVoltageRateMapper.xml

@@ -3,105 +3,105 @@
 <mapper namespace="com.pqs9000.mapper.report.GetVoltageRateMapper">
     <select id="getVoltageRate" resultType="java.util.HashMap">
         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
         <choose>
             <when test="condition.b == true">
@@ -126,9 +126,9 @@
     <select id="getFirstHarmonic" resultType="ReportValue">
         SELECT PHASIC_TYPE PHASETYPE,
         MAX(V_1_MAX) FMAXVALUE,MIN(V_1_MIN) MINVALUE,ROUND(AVG(V_1) ,2) MEANVALUE
-        ,MAX(CASE WHEN V1CP95 =#{condition.count} THEN V_1 ELSE NULL END) CP95VALUE
+        ,MAX(CASE WHEN V1CP95 =#{condition.count} THEN V_1_CP95 ELSE NULL END) CP95VALUE
         FROM ( SELECT T.*,
-        ROW_NUMBER() OVER (PARTITION BY PHASIC_TYPE ORDER BY V_1 DESC) V1CP95
+        ROW_NUMBER() OVER (PARTITION BY PHASIC_TYPE ORDER BY V_1_CP95 DESC) V1CP95
         from
         <choose>
             <when test="condition.b == true">

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
-        count(distinct myindex) frequencyOverLine
-        from
-        limit_target
-        where
-        myindex IN
-        <foreach collection="list" item="list3" open="(" close=")" separator=",">
-            #{list3}
-        </foreach>
-        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
+            select
+            count(distinct myindex) frequencyOverLine
+            from
+            limit_rate
+            where
+            myindex IN
+            <foreach collection="list" item="list3" open="(" close=")" separator=",">
+                #{list3}
+            </foreach>
+            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
         ) 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

@@ -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
         <foreach collection="list" item="list1" open="(" close=")" separator=",">
             #{list1}
@@ -96,6 +100,7 @@
         <if test=" vollevel != ''">
             AND A.SCALE=#{vollevel}
         </if>
+        AND A.DEV_INDEX = F.DEV_INDEX
         ) fir
         LEFT JOIN
         PQS_DICDATA A
@@ -228,6 +233,7 @@
             #{list3}
         </foreach>
         AND freq_dev_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -256,6 +262,7 @@
             #{list4}
         </foreach>
         AND voltage_dev_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -297,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
@@ -326,6 +334,7 @@
             #{list6}
         </foreach>
         AND uaberrance_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -366,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
@@ -394,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
@@ -422,6 +433,7 @@
             #{list9}
         </foreach>
         AND uharm_3_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -450,6 +462,7 @@
             #{list10}
         </foreach>
         AND uharm_5_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -478,6 +491,7 @@
             #{list11}
         </foreach>
         AND uharm_7_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -506,6 +520,7 @@
             #{list12}
         </foreach>
         AND uharm_11_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -534,6 +549,7 @@
             #{list13}
         </foreach>
         AND uharm_13_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -562,6 +578,7 @@
             #{list14}
         </foreach>
         AND uharm_23_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -590,6 +607,7 @@
             #{list15}
         </foreach>
         AND uharm_25_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -618,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
@@ -646,6 +665,7 @@
             #{list16}
         </foreach>
         AND iharm_3_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -674,6 +694,7 @@
             #{list17}
         </foreach>
         AND iharm_5_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -702,6 +723,7 @@
             #{list18}
         </foreach>
         AND iharm_7_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -730,6 +752,7 @@
             #{list19}
         </foreach>
         AND iharm_11_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -758,6 +781,7 @@
             #{list20}
         </foreach>
         AND iharm_13_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -786,6 +810,7 @@
             #{list21}
         </foreach>
         AND iharm_23_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -814,6 +839,7 @@
             #{list22}
         </foreach>
         AND iharm_25_overtime >0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -842,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
@@ -870,6 +897,7 @@
             #{list24}
         </foreach>
         AND ubalance_overtime>0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -898,6 +926,7 @@
             #{list25}
         </foreach>
         AND flicker_overtime>0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -939,6 +968,7 @@
             #{list27}
         </foreach>
         AND I_Neg_OverTime>0
+        AND phasic_type = 'T'
         GROUP BY
         TIMEID,
         MYINDEX
@@ -969,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

pqs9000/src/main/webapp/WEB-INF/views/business/responsibility/overLimitMonitor.jsp

@@ -146,7 +146,9 @@
             <th style="line-height: 90px" rowspan="3">供电设备容量</th>
             <th style="line-height: 90px" rowspan="3">用户协议容量</th>
             <th style="line-height: 90px" rowspan="3">超标天数</th>
-            <th colspan="57">各项指标超标明细</th>
+            <th colspan="56">各项指标超标明细</th>
+            <th style="line-height: 90px" rowspan="3">监测点编号</th>
+            <th style="line-height: 90px" rowspan="3">监测装置安装位置</th>
         </tr>
         <tr>
             <th colspan="4">电压偏差</th>
@@ -161,7 +163,6 @@
             <th colspan="4">闪变</th>
             <th colspan="8">各次谐波电压含有率超标天数</th>
             <th colspan="8">各次谐波电流含量超标天数</th>
-            <th style="line-height: 50px" rowspan="2">监测点编号</th>
         </tr>
         <tr>
             <th>超标天数</th>

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,

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
-		c,pq_subvoltage d,pq_device e,pqs_map
-		f,pq_devicedetail g
+		pq_line a,
+		pq_substation c,
+		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.dev_index=e.dev_index
-		and a.sub_index=f.sub_index and
+		a.sub_index=c.sub_index and
+		a.subv_index=d.subv_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>