From 542cdbc9b35fa0ed5159a19cbe24c0e40da09365 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 2 Apr 2024 14:31:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=A6=82=E8=A7=88-=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E6=9A=82=E9=99=8D=E8=AF=84=E4=BC=B0-=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E6=9A=82=E9=99=8D=E8=AF=84=E4=BC=B0->=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E8=8C=83=E5=9B=B4=E5=80=BC=202.=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F-=E7=BB=88=E7=AB=AF=E7=8A=B6=E6=80=81=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1->=E5=A2=9E=E5=8A=A0=E5=9B=BD=E7=BD=91=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=203.=E5=8F=B0=E8=B4=A6=E7=AE=A1=E7=90=86-=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E6=A8=A1=E6=9D=BF->=E5=AF=BC=E5=85=A5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=A2=9E=E5=8A=A0=EF=BC=88=E5=AF=BC=E5=85=A5=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E7=9A=84=E6=A8=A1=E6=9D=BF=EF=BC=9A=EF=BC=89=E5=8A=A0?= =?UTF-8?q?=E7=BB=88=E7=AB=AF=E5=AD=97=E6=AE=B5=EF=BC=9A=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=E8=A3=85=E7=BD=AE=E5=AE=89=E8=A3=85=E4=BD=8D=E7=BD=AE=E3=80=81?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E5=8E=82=E5=AE=B6=E8=AE=BE=E5=A4=87=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E3=80=81SIM=E5=8D=A1=E5=8F=B7=EF=BC=9B=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E7=82=B9=E5=AD=97=E6=AE=B5=EF=BC=9A=E8=A1=8C=E4=B8=9A?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=81=E7=9B=91=E6=B5=8B=E7=82=B9=E6=80=A7?= =?UTF-8?q?=E8=B4=A8=EF=BC=8C=E7=94=B5=E7=BD=91=E4=BE=A7=E5=8F=98=E7=94=B5?= =?UTF-8?q?=E7=AB=99=E3=80=81=E6=98=AF=E5=90=A6=E5=B9=B6=E7=BD=91=E7=82=B9?= =?UTF-8?q?=E3=80=81=E7=9B=91=E6=B5=8B=E7=82=B9=E8=BF=90=E8=A1=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E3=80=82=204.=E8=BF=90=E8=A1=8C=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E5=8F=B0=E8=B4=A6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?->=E5=A2=9E=E5=8A=A0=E5=8F=98=E7=94=B5=E7=AB=99=E5=90=8D?= =?UTF-8?q?=E7=A7=B0+=E6=AF=8D=E7=BA=BF+=E7=9B=91=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/pojo/commons/DevList.java | 87 ++++++++++++++++++ .../com/njcn/pojo/pointInfo/LineLedger.java | 10 +++ .../service/configuration/DeviceService.java | 2 +- .../configuration/DeviceServiceImpl.java | 5 +- .../main/java/com/njcn/utils/ImportExl.java | 64 ++++++++----- .../business/BusinessController.java | 3 +- .../controller/business/DeviceController.java | 4 +- .../mybatis/mappers/point/PointInfoMapper.xml | 4 +- .../views/business/area/deviceStatus.jsp | 3 +- .../views/business/manage/lineLedger.jsp | 1 + .../WEB-INF/views/business/manage/runtime.jsp | 11 ++- .../main/webapp/jspJS/manage/lineLedger.js | 1 + .../src/main/webapp/jspJS/manage/runtime.js | 35 +++++++- .../controller/business/DeviceController.java | 4 +- .../WEB-INF/views/business/area/balance.jsp | 8 +- .../controller/business/DeviceController.java | 59 +++++++++++- .../mapper/HisData/ManaDeviceMapper.java | 1 + .../configuration/ManaDeviceService.java | 7 +- .../configuration/ManaDeviceServiceImpl.java | 89 ++++++++++++++++--- .../configuration/ManaDeviceMapper.xml | 3 + 20 files changed, 346 insertions(+), 55 deletions(-) diff --git a/comService/src/main/java/com/njcn/pojo/commons/DevList.java b/comService/src/main/java/com/njcn/pojo/commons/DevList.java index ce7124a..892010d 100644 --- a/comService/src/main/java/com/njcn/pojo/commons/DevList.java +++ b/comService/src/main/java/com/njcn/pojo/commons/DevList.java @@ -27,6 +27,12 @@ public class DevList implements Serializable { private String devtype; private String nodename; private int portid; + + + private String sim; + private String devLocation; + private String devNo; + private String series; private String key; private String monitorid; @@ -38,6 +44,23 @@ public class DevList implements Serializable { private String objName; private String statFlag; + //行业类型 + private String businessType; + + //监测点性质 + private String powerId; + + //电网侧变电站 + private String powerSubstationName; + //是否并网点 + private String isGridPoint; + //监测运行状态 + private String status; + + + + + public String getFileName() { return fileName; } @@ -238,6 +261,30 @@ public class DevList implements Serializable { this.portid = portid; } + public String getSim() { + return sim; + } + + public void setSim(String sim) { + this.sim = sim; + } + + public String getDevLocation() { + return devLocation; + } + + public void setDevLocation(String devLocation) { + this.devLocation = devLocation; + } + + public String getDevNo() { + return devNo; + } + + public void setDevNo(String devNo) { + this.devNo = devNo; + } + public String getSeries() { return series; } @@ -307,4 +354,44 @@ public String getProjectName() { public void setStatFlag(String statFlag) { this.statFlag = statFlag; } + + public String getBusinessType() { + return businessType; + } + + public void setBusinessType(String businessType) { + this.businessType = businessType; + } + + public String getPowerId() { + return powerId; + } + + public void setPowerId(String powerId) { + this.powerId = powerId; + } + + public String getPowerSubstationName() { + return powerSubstationName; + } + + public void setPowerSubstationName(String powerSubstationName) { + this.powerSubstationName = powerSubstationName; + } + + public String getIsGridPoint() { + return isGridPoint; + } + + public void setIsGridPoint(String isGridPoint) { + this.isGridPoint = isGridPoint; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } } diff --git a/comService/src/main/java/com/njcn/pojo/pointInfo/LineLedger.java b/comService/src/main/java/com/njcn/pojo/pointInfo/LineLedger.java index 29a1a5b..b98d28a 100644 --- a/comService/src/main/java/com/njcn/pojo/pointInfo/LineLedger.java +++ b/comService/src/main/java/com/njcn/pojo/pointInfo/LineLedger.java @@ -11,6 +11,8 @@ public class LineLedger { private String lineIndex; private String lineName; + private String electricityQualityName; + private Long devIndex; private String objName; @@ -645,4 +647,12 @@ public class LineLedger { public void setNodeName(String nodeName) { this.nodeName = nodeName; } + + public String getElectricityQualityName() { + return electricityQualityName; + } + + public void setElectricityQualityName(String electricityQualityName) { + this.electricityQualityName = electricityQualityName; + } } \ No newline at end of file diff --git a/comService/src/main/java/com/njcn/service/configuration/DeviceService.java b/comService/src/main/java/com/njcn/service/configuration/DeviceService.java index 9d0fbae..a7fb205 100644 --- a/comService/src/main/java/com/njcn/service/configuration/DeviceService.java +++ b/comService/src/main/java/com/njcn/service/configuration/DeviceService.java @@ -152,7 +152,7 @@ public interface DeviceService { List getDeviceMainTree(); List getDeviceDetails(String status, String devflag, String gdName, String - manufacturer, String area); + manufacturer, String area, String type); List getGdname(); diff --git a/comService/src/main/java/com/njcn/serviceimpl/configuration/DeviceServiceImpl.java b/comService/src/main/java/com/njcn/serviceimpl/configuration/DeviceServiceImpl.java index 14bd7cf..5e466fd 100644 --- a/comService/src/main/java/com/njcn/serviceimpl/configuration/DeviceServiceImpl.java +++ b/comService/src/main/java/com/njcn/serviceimpl/configuration/DeviceServiceImpl.java @@ -3273,10 +3273,13 @@ public class DeviceServiceImpl implements DeviceService { @Override public List getDeviceDetails(String status, String devflag, String gdName, String - manufacturer, String area) { + manufacturer, String area, String type) { List result = new ArrayList<>(); List listline = userUtil.listLineDepts(area); + if("1".equals(type)){ + listline =getGwLine(listline); + } if (listline.size() == 0) { return null; } else { diff --git a/comService/src/main/java/com/njcn/utils/ImportExl.java b/comService/src/main/java/com/njcn/utils/ImportExl.java index 13c7684..427d1dc 100644 --- a/comService/src/main/java/com/njcn/utils/ImportExl.java +++ b/comService/src/main/java/com/njcn/utils/ImportExl.java @@ -171,44 +171,50 @@ public class ImportExl { } else if (c == 13) { user.setNodename(cell.getStringCellValue());//所属前置机 } else if (c == 14) { - user.setPortid((int) cell.getNumericCellValue());//端口号 - } else if (c == 15) { + user.setPortid((int) cell.getNumericCellValue());//SIM卡号 + } else if (c == 15) { + user.setSim( cell.getStringCellValue());//监测装置安装位置 + } else if (c == 16) { + user.setDevLocation( cell.getStringCellValue());//监测厂家设备编号 + }else if (c == 17) { + user.setDevNo( cell.getStringCellValue());//监测厂家设备编号 + } else if (c == 18) { if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) { user.setSeries(String.valueOf((long)cell.getNumericCellValue()));//识别码 } else { user.setSeries(cell.getStringCellValue());//识别码 } - } else if (c == 16) { + } else if (c == 19) { if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) { user.setKey(String.valueOf((long)cell.getNumericCellValue()));//秘钥 } else { user.setKey(cell.getStringCellValue());//秘钥 } - } else if (c == 17) { + } else if (c == 20) { if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) { user.setSubvName(String.valueOf((long) cell.getNumericCellValue()));//母线名称 } else { user.setSubvName(cell.getStringCellValue()); } - } else if (c == 18) { + } else if (c == 21) { user.setSubvnum((int) cell.getNumericCellValue());//母线号 - } else if (c == 19) { + } else if (c == 22) { user.setScale(cell.getStringCellValue()); - } else if (c == 20) { + } else if (c == 23) { if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) { user.setLineName(String.valueOf((long) cell.getNumericCellValue()));//监测点名称 } else { user.setLineName(cell.getStringCellValue()); } - } else if (c == 21) { - user.setLineNum((int) cell.getNumericCellValue());//监测点号 - } else if (c == 22) { - user.setPt(cell.getStringCellValue());//pt - } else if (c == 23) { - user.setCt(cell.getStringCellValue());//ct } else if (c == 24) { + user.setLineNum((int) cell.getNumericCellValue());//监测点号 + } else if (c == 25) { + user.setPt(cell.getStringCellValue());//pt + } else if (c == 26) { + user.setCt(cell.getStringCellValue());//ct + } else if (c == 27) { if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) { Float dlrl = Float.valueOf((float) cell.getNumericCellValue()); user.setDlrl(dlrl);//短路容量 @@ -216,7 +222,7 @@ public class ImportExl { } else { //判断失败 } - } else if (c == 25) { + } else if (c == 28) { if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) { Float sbrl = Float.valueOf((float) cell.getNumericCellValue()); user.setSbrl(sbrl);//设备容量 @@ -224,7 +230,7 @@ public class ImportExl { } else { //判断失败 } - } else if (c == 26) { + } else if (c == 29) { if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) { Float xyrl = Float.valueOf((float) cell.getNumericCellValue()); user.setXyrl(xyrl);//协议容量 @@ -232,19 +238,29 @@ public class ImportExl { } else { //判断失败 } - } else if (c == 27) { - user.setPttype(cell.getStringCellValue());//接线方式 - } else if (c == 28) { - user.setInterval((int) cell.getNumericCellValue());//间隔时间 - } else if (c == 29) { - user.setLoadType(cell.getStringCellValue());//干扰源类型终 } else if (c == 30) { - user.setMonitorid(cell.getStringCellValue());//国网ID + user.setPttype(cell.getStringCellValue());//接线方式 } else if (c == 31) { + user.setInterval((int) cell.getNumericCellValue());//间隔时间 + } else if (c == 32) { + user.setLoadType(cell.getStringCellValue());//干扰源类型 + } else if (c == 33) { + user.setBusinessType(cell.getStringCellValue());//行业类型 + } else if (c == 34) { + user.setPowerId(cell.getStringCellValue());//监测点性质 + } else if (c == 35) { + user.setPowerSubstationName(cell.getStringCellValue());//电网侧变电站 + } else if (c == 36) { + user.setIsGridPoint(cell.getStringCellValue());//是否并网点 + } else if (c == 37) { + user.setStatus(cell.getStringCellValue());//监测点运行状态 + } else if (c == 38) { + user.setMonitorid(cell.getStringCellValue());//国网ID + } else if (c == 39) { user.setObjName(cell.getStringCellValue()); //监测点对象名称 - }else if (c == 32) { + }else if (c == 40) { user.setStatFlag(cell.getStringCellValue()); //统计类型 - }else if (c == 33) { //add by sw + }else if (c == 41) { //add by sw user.setFileName(cell.getStringCellValue()); //文件名 } } diff --git a/pqs9000/src/main/java/com/pqs9000/controller/business/BusinessController.java b/pqs9000/src/main/java/com/pqs9000/controller/business/BusinessController.java index 89568d0..18f1f17 100644 --- a/pqs9000/src/main/java/com/pqs9000/controller/business/BusinessController.java +++ b/pqs9000/src/main/java/com/pqs9000/controller/business/BusinessController.java @@ -348,10 +348,11 @@ public class BusinessController { // 跳转终端运行管理页面 @GetMapping(value = "runtime") - public ModelAndView runtime(String area) { + public ModelAndView runtime(String area,String type) { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("business/manage/runtime"); modelAndView.addObject("area", area); + modelAndView.addObject("type", type); return modelAndView; } diff --git a/pqs9000/src/main/java/com/pqs9000/controller/business/DeviceController.java b/pqs9000/src/main/java/com/pqs9000/controller/business/DeviceController.java index cee10d1..c639a12 100644 --- a/pqs9000/src/main/java/com/pqs9000/controller/business/DeviceController.java +++ b/pqs9000/src/main/java/com/pqs9000/controller/business/DeviceController.java @@ -1995,7 +1995,7 @@ public class DeviceController { @RequestMapping(value = "getDeviceDetail", method = RequestMethod.POST) @ResponseBody public String getDeviceDetail(HttpServletRequest request, HttpSession session, String status, String devflag, String gdName, String - manufacturer, String lineIndex, String area) + manufacturer, String lineIndex, String area,String type) throws JsonProcessingException, AccountException { if (session.getAttribute("line_index") != null || session.getAttribute("line_index") != "") { @@ -2023,7 +2023,7 @@ public class DeviceController { } manufacturer = "%" + manufacturer + "%"; if (lineIndex == null || lineIndex.length() == 0) { - result = deviceService.getDeviceDetails(status, devflag, gdName, manufacturer, area); + result = deviceService.getDeviceDetails(status, devflag, gdName, manufacturer, area,type); } else { result = deviceService.queryDeviceDetailById(lineIndex); } diff --git a/pqs9000/src/main/resources/mybatis/mappers/point/PointInfoMapper.xml b/pqs9000/src/main/resources/mybatis/mappers/point/PointInfoMapper.xml index ae99b76..89a21ed 100644 --- a/pqs9000/src/main/resources/mybatis/mappers/point/PointInfoMapper.xml +++ b/pqs9000/src/main/resources/mybatis/mappers/point/PointInfoMapper.xml @@ -107,7 +107,8 @@ j.dic_name province, a.line_index lineIndex, mod(a.line_index,10) as lineNum, - a.name lineName, + a.name as lineName, + nvl(b.POWER_SUBSTATION_NAME,e.name)||'_'||sv.NAME||'_'||a.name as electricityQualityName, a.dev_index devIndex, a.status lineStatus, b.pttype ptType, @@ -167,6 +168,7 @@ LEFT JOIN overlimit c ON a.line_index = myindex LEFT JOIN pq_device d ON a.dev_index = d.dev_index LEFT JOIN pq_substation e ON a.sub_index = e.sub_index + LEFT JOIN pq_subvoltage sv ON a.SUBV_INDEX = sv.SUBV_INDEX LEFT JOIN pq_gdinformation f ON a.gd_index = f.gd_index LEFT JOIN pqs_dicdata g ON a.scale = g.dic_index LEFT JOIN pqs_dicdata h ON b.loadtype = h.dic_index diff --git a/pqs9000/src/main/webapp/WEB-INF/views/business/area/deviceStatus.jsp b/pqs9000/src/main/webapp/WEB-INF/views/business/area/deviceStatus.jsp index ca0103f..8db9b4e 100644 --- a/pqs9000/src/main/webapp/WEB-INF/views/business/area/deviceStatus.jsp +++ b/pqs9000/src/main/webapp/WEB-INF/views/business/area/deviceStatus.jsp @@ -623,7 +623,8 @@ district.on('click', function (params) { if (getRole("/pqs9000/business/runtime") === 1) { var city=params.data.areaIndex; - window.top.addTab('runtime?area='+city, '终端运行情况') + var type= tiggleValue=="冀北省"?"0":"1"; + window.top.addTab('runtime?area='+city+'&&type='+ type, '终端运行情况') } }); } diff --git a/pqs9000/src/main/webapp/WEB-INF/views/business/manage/lineLedger.jsp b/pqs9000/src/main/webapp/WEB-INF/views/business/manage/lineLedger.jsp index 6fc8157..3325c54 100644 --- a/pqs9000/src/main/webapp/WEB-INF/views/business/manage/lineLedger.jsp +++ b/pqs9000/src/main/webapp/WEB-INF/views/business/manage/lineLedger.jsp @@ -90,6 +90,7 @@ 市公司 监测点电压等级 监测点名称 + 电能质量名称 所属电站 干扰源类型 监测对象名称 diff --git a/pqs9000/src/main/webapp/WEB-INF/views/business/manage/runtime.jsp b/pqs9000/src/main/webapp/WEB-INF/views/business/manage/runtime.jsp index 248c27f..8e980ba 100644 --- a/pqs9000/src/main/webapp/WEB-INF/views/business/manage/runtime.jsp +++ b/pqs9000/src/main/webapp/WEB-INF/views/business/manage/runtime.jsp @@ -16,6 +16,7 @@ +