diff --git a/pqs9000/src/main/java/com/pqs9000/pojo/responsibility/OverLimitMonitor.java b/pqs9000/src/main/java/com/pqs9000/pojo/responsibility/OverLimitMonitor.java index 1295a47..094c19b 100644 --- a/pqs9000/src/main/java/com/pqs9000/pojo/responsibility/OverLimitMonitor.java +++ b/pqs9000/src/main/java/com/pqs9000/pojo/responsibility/OverLimitMonitor.java @@ -46,6 +46,9 @@ public class OverLimitMonitor { //协议容量 private Float xycMp; + //监测装置安装位置 + private String devLocation; + //超标天数 private int overLimitDay; @@ -750,6 +753,14 @@ public class OverLimitMonitor { this.diffFlickerData = diffFlickerData; } + public String getDevLocation() { + return devLocation; + } + + public void setDevLocation(String devLocation) { + this.devLocation = devLocation; + } + @Override public String toString() { return "OverLimitMonitor{" + @@ -766,6 +777,7 @@ public class OverLimitMonitor { ", dlcMp=" + dlcMp + ", devcMp=" + devcMp + ", xycMp=" + xycMp + + ", devLocation='" + devLocation + '\'' + ", overLimitDay=" + overLimitDay + ", overVoltageDeviationDay=" + overVoltageDeviationDay + ", maxVoltageDeviationData=" + maxVoltageDeviationData + diff --git a/pqs9000/src/main/java/com/pqs9000/util/ComplexHeadExcel.java b/pqs9000/src/main/java/com/pqs9000/util/ComplexHeadExcel.java index 12b8c0b..3085af6 100644 --- a/pqs9000/src/main/java/com/pqs9000/util/ComplexHeadExcel.java +++ b/pqs9000/src/main/java/com/pqs9000/util/ComplexHeadExcel.java @@ -709,7 +709,7 @@ public class ComplexHeadExcel{ xssfSheet.addMergedRegion(region12); CellRangeAddress region13 = new CellRangeAddress(0, 2, 13, 13); xssfSheet.addMergedRegion(region13); - CellRangeAddress region14 = new CellRangeAddress(0, 0, 14, 70); + CellRangeAddress region14 = new CellRangeAddress(0, 0, 14, 69); xssfSheet.addMergedRegion(region14); //电压变差 CellRangeAddress region15 = new CellRangeAddress(1, 1, 14, 17); @@ -748,8 +748,11 @@ public class ComplexHeadExcel{ CellRangeAddress region26 = new CellRangeAddress(1, 1, 62, 69); xssfSheet.addMergedRegion(region26); //监测点编号 - CellRangeAddress region27 = new CellRangeAddress(1, 2, 70, 70); + CellRangeAddress region27 = new CellRangeAddress(0, 2, 70, 70); xssfSheet.addMergedRegion(region27); + //监测装置安装位置 + CellRangeAddress region28 = new CellRangeAddress(0, 2, 71, 71); + xssfSheet.addMergedRegion(region28); //设置单元格大小 xssfSheet.setColumnWidth(0, 2000); @@ -823,6 +826,7 @@ public class ComplexHeadExcel{ xssfSheet.setColumnWidth(68, 2500); xssfSheet.setColumnWidth(69, 2500); xssfSheet.setColumnWidth(70, 2500); + xssfSheet.setColumnWidth(71, 2500); //一级表头 cell = row.createCell(0); @@ -885,6 +889,14 @@ public class ComplexHeadExcel{ cell.setCellValue("各项指标超标明细"); cell.setCellStyle(getStyle(1)); + cell = row.createCell(70); + cell.setCellValue("监测点编号"); + cell.setCellStyle(getStyle(1)); + + cell = row.createCell(71); + cell.setCellValue("监测装置安装位置"); + cell.setCellStyle(getStyle(1)); + //二级表头 cell = row2.createCell(14); cell.setCellValue("电压偏差"); @@ -934,10 +946,6 @@ public class ComplexHeadExcel{ cell.setCellValue("各次谐波电流幅值"); cell.setCellStyle(getStyle(1)); - cell = row2.createCell(70); - cell.setCellValue("监测点编号"); - cell.setCellStyle(getStyle(1)); - //三级表头 cell = row3.createCell(14); cell.setCellValue("超标天数"); @@ -1292,6 +1300,10 @@ public class ComplexHeadExcel{ cell = row.createCell(70); cell.setCellValue(list.get(i).getMonitorNumber()); + + cell = row.createCell(71); + cell.setCellValue(list.get(i).getDevLocation()); + xssfWorkbook.write(os); } diff --git a/pqs9000/src/main/resources/mybatis/mappers/responsibility/OverLimitMonitorMapper.xml b/pqs9000/src/main/resources/mybatis/mappers/responsibility/OverLimitMonitorMapper.xml index 209019e..dd4be7b 100644 --- a/pqs9000/src/main/resources/mybatis/mappers/responsibility/OverLimitMonitorMapper.xml +++ b/pqs9000/src/main/resources/mybatis/mappers/responsibility/OverLimitMonitorMapper.xml @@ -17,6 +17,7 @@ primary.DLCMP dlcMp, primary.DEVCMP devcMp, primary.XYCMP xycMp, + primary.devLocation devLocation, NVL(A.OVERTIMES, 0) overLimitDay, NVL(B.OVERTIMES, 0) overFrequencyDeviationDay, NVL(C.OVERTIMES, 0) overVoltageDeviationDay, @@ -55,6 +56,7 @@ fir.DLCMP , fir.DEVCMP , fir.XYCMP , + fir.devLocation, A.DIC_NAME cityCompany, B.DEPTSNAME provinceCompany, C.DIC_NAME MONITORVOLTAGELEVEL, @@ -75,13 +77,15 @@ D.NAME subName, D.SCALE subScale, E.objname objName, - E.POWER_SUBSTATION_NAME powerSubstationName + E.POWER_SUBSTATION_NAME powerSubstationName, + F.DEV_LOCATION devLocation FROM PQ_LINE A, PQS_DEPTSLINE B, PQS_DEPTS C, PQ_SUBSTATION D, - PQ_LINEDETAIL E + PQ_LINEDETAIL E, + PQ_DEVICEDETAIL F WHERE A.LINE_INDEX IN #{list1} @@ -96,6 +100,7 @@ AND A.SCALE=#{vollevel} + AND A.DEV_INDEX = F.DEV_INDEX ) fir LEFT JOIN PQS_DICDATA A diff --git a/pqs9000/src/main/webapp/WEB-INF/views/business/responsibility/overLimitMonitor.jsp b/pqs9000/src/main/webapp/WEB-INF/views/business/responsibility/overLimitMonitor.jsp index 84d5775..38fc3c1 100644 --- a/pqs9000/src/main/webapp/WEB-INF/views/business/responsibility/overLimitMonitor.jsp +++ b/pqs9000/src/main/webapp/WEB-INF/views/business/responsibility/overLimitMonitor.jsp @@ -146,7 +146,9 @@ 供电设备容量 用户协议容量 超标天数 - 各项指标超标明细 + 各项指标超标明细 + 监测点编号 + 监测装置安装位置 电压偏差 @@ -161,7 +163,6 @@ 闪变 各次谐波电压含有率超标天数 各次谐波电流含量超标天数 - 监测点编号 超标天数 diff --git a/pqs9000/src/main/webapp/jspJS/area/overLimitMonitor.js b/pqs9000/src/main/webapp/jspJS/area/overLimitMonitor.js index e4f98a4..4e8205c 100644 --- a/pqs9000/src/main/webapp/jspJS/area/overLimitMonitor.js +++ b/pqs9000/src/main/webapp/jspJS/area/overLimitMonitor.js @@ -279,7 +279,8 @@ function initTable(data){ {width: "1%",data:"overCurrentTwentyThirdTimes"}, {width: "1%",data:"overCurrentTwentyFiveTimes"}, {width: "1%",data:"overCurrentOtherTimes"}, - {width: "2%",data:"monitorNumber"} + {width: "2%",data:"monitorNumber"}, + {width: "2%",data:"devLocation"} ], bAutoWidth:false, serverSide : false,