From bcf57910109cac1c9558c9566dde1a33ac7bfcf0 Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Fri, 12 May 2023 12:37:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=80=E5=8C=97=E4=B8=BB=E7=BD=91=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E7=82=B9=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pms/pojo/po/SubstationExpend.java | 2 + .../SubstationExpendController.java | 25 -------- .../DistributionMonitorMapper.java | 2 +- .../mapping/DistributionMonitorMapper.xml | 57 +++++++++++-------- .../impl/SubstationExpendServiceImpl.java | 15 +++-- 5 files changed, 44 insertions(+), 57 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SubstationExpend.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SubstationExpend.java index 5b0f69074..051f8c59d 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SubstationExpend.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SubstationExpend.java @@ -63,6 +63,8 @@ public class SubstationExpend implements Serializable { private String deptName; + private String area; + /** * 关联台账变电站：pq_substation表主键 */ diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java index e136d7456..54c03e068 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java @@ -67,30 +67,5 @@ public class SubstationExpendController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } -// @OperateInfo(info = LogEnum.BUSINESS_COMMON) -// @PostMapping("/insert") -// @ApiOperation("变电站信息") -// @ApiImplicitParam(name = "insert", value = "变电站信息", required = true) -// public HttpResult insert(@RequestBody StatisticsBizBaseParam param) { -// String methodDescribe = getMethodDescribe("insert"); -// List list = Arrays.asList( -// new SubstationExpend("500kV天马变电站", "1fa650685c77db1656c70f9db4a2edc6",new BigDecimal(119.292327),new BigDecimal(40.215015),"17439407bfee299b7e38f2e54a8f6d28"), -// new SubstationExpend("500kV昌黎变电站", "1fa650685c77db1656c70f9db4a2edc6",new BigDecimal(118.990809),new BigDecimal(40.016014),"17439407bfee299b7e38f2e54a8f6d28"), -// new SubstationExpend("220kV陈官屯变电站", "1b7b58ed8fcc2992b95334eaa9010c41",new BigDecimal(118.998356),new BigDecimal(39.990971),"17439407bfee299b7e38f2e54a8f6d28"), -// new SubstationExpend("220kV小营变电站", "1b7b58ed8fcc2992b95334eaa9010c41",new BigDecimal(119.298044),new BigDecimal(39.814401),"17439407bfee299b7e38f2e54a8f6d28"), -// new SubstationExpend("220kV深河变电站", "1b7b58ed8fcc2992b95334eaa9010c41",new BigDecimal(119.453054),new BigDecimal(39.940208),"17439407bfee299b7e38f2e54a8f6d28"), -// new SubstationExpend("220kV杜庄变电站", "1b7b58ed8fcc2992b95334eaa9010c41",new BigDecimal(119.540182),new BigDecimal(40.026883),"17439407bfee299b7e38f2e54a8f6d28"), -// new SubstationExpend("220kV平方变电站", "1b7b58ed8fcc2992b95334eaa9010c41",new BigDecimal(119.173903),new BigDecimal(39.730601),"17439407bfee299b7e38f2e54a8f6d28"), -// new SubstationExpend("220kV肖营子变电站", "1b7b58ed8fcc2992b95334eaa9010c41",new BigDecimal(118.866099),new BigDecimal(40.279209),"17439407bfee299b7e38f2e54a8f6d28"), -// new SubstationExpend("220kV丰钢变电站", "1b7b58ed8fcc2992b95334eaa9010c41",new BigDecimal(118.913885),new BigDecimal(39.663569),"17439407bfee299b7e38f2e54a8f6d28"), -// new SubstationExpend("220kV碣石变电站", "1b7b58ed8fcc2992b95334eaa9010c41",new BigDecimal(119.191153),new BigDecimal(39.723464),"17439407bfee299b7e38f2e54a8f6d28"), -// new SubstationExpend("220kV龙家店变电站", "1b7b58ed8fcc2992b95334eaa9010c41",new BigDecimal(119.062243),new BigDecimal(39.719279),"17439407bfee299b7e38f2e54a8f6d28"), -// new SubstationExpend("220kV仙螺岛变电站", "1b7b58ed8fcc2992b95334eaa9010c41",new BigDecimal(119.446926),new BigDecimal(39.792502),"17439407bfee299b7e38f2e54a8f6d28") -// ); -// -// boolean b = substationExpendService.saveBatch(list); -// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); -// } - } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/DistributionMonitorMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/DistributionMonitorMapper.java index cca88a5fd..a312a7b2a 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/DistributionMonitorMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/DistributionMonitorMapper.java @@ -68,7 +68,7 @@ public interface DistributionMonitorMapper extends BaseMapper distributionMonitorListByCondition(@Param("deptIds")List deptIds, @Param("monitorSort")String monitorSort); - List statisticMonitorWithMonitorSort(@Param("list") List monitorIds); + List statisticMonitor(@Param("list") List monitorIds); List statisticTerminal(@Param("list") List terminalIds); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml index 1b974a615..d8d057a67 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml @@ -182,51 +182,58 @@ AND EXISTS ( a.Monitor_Id = temp.id ) - SELECT - COUNT(pdm.Monitor_Id) AS statistics, - pdm.Monitor_Sort AS name - FROM pms_distribution_monitor pdm - WHERE pdm.Monitor_Id IN + COUNT(pm.Id) AS statistics, + pm.Voltage_Level AS name + FROM pms_monitor pm + WHERE pm.Id IN #{item} - GROUP BY pdm.Monitor_Sort + GROUP BY pm.Voltage_Level diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SubstationExpendServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SubstationExpendServiceImpl.java index 63dad73f3..9e47a1bba 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SubstationExpendServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SubstationExpendServiceImpl.java @@ -62,7 +62,7 @@ public class SubstationExpendServiceImpl extends ServiceImpl { if (t.getDeptId()!=null){ - t.setDeptName(deptMap.get(t.getDeptId()).get(0).getName()); + t.setArea(deptMap.get(t.getDeptId()).get(0).getArea()); } if (t.getBreakSite()!=null) { List simpleDTOS = new ArrayList<>(); @@ -82,7 +82,7 @@ public class SubstationExpendServiceImpl extends ServiceImpl monitorIds = new ArrayList<>(); generalDeviceDTOS.stream().forEach(e -> monitorIds.addAll(e.getMonitorIdList())); - List monitorStatistic = distributionMonitorMapper.statisticMonitorWithMonitorSort(monitorIds); + List monitorStatistic = distributionMonitorMapper.statisticMonitor(monitorIds); ledgerStaticDTO.setMonitorStatistics(monitorStatistic); // 根据单位统计监测点数量 @@ -103,7 +103,7 @@ public class SubstationExpendServiceImpl extends ServiceImpl monitors = new ArrayList<>(); if (CollectionUtil.isNotEmpty(generalDeviceDTO.getMonitorIdList())) { - monitors = distributionMonitorMapper.statisticMonitorWithMonitorSort(generalDeviceDTO.getMonitorIdList()); + monitors = distributionMonitorMapper.statisticMonitor(generalDeviceDTO.getMonitorIdList()); } monitorMap.put(generalDeviceDTO.getName(),monitors); @@ -111,7 +111,9 @@ public class SubstationExpendServiceImpl extends ServiceImpl terminalIds = new ArrayList<>(); - generalDeviceDTOS.stream().forEach(e -> terminalIds.addAll(e.getTerminalIdList())); + List filterList = generalDeviceDTOS.stream().filter(e -> e.getTerminalIdList().size() != 0).collect(Collectors.toList()); + filterList.stream().forEach(e -> terminalIds.addAll(e.getTerminalIdList())); + terminalIds.removeAll(Collections.singleton(null)); List terminalNumStatistic = distributionMonitorMapper.statisticTerminal(terminalIds); ledgerStaticDTO.setTerminalStatistics(terminalNumStatistic); @@ -127,12 +129,13 @@ public class SubstationExpendServiceImpl extends ServiceImpl onlineRateStatistic = distributionMonitorMapper.getOnlineRate(terminalIds); double sum = onlineRateStatistic.stream().mapToDouble(PmsSimpleDTO::getDoubleValue).sum()!=0?onlineRateStatistic.stream().mapToDouble(PmsSimpleDTO::getDoubleValue).sum():3.14159; onlineRateStatistic.forEach(dto -> dto.setDoubleValue(new BigDecimal(dto.getDoubleValue() * 100 / sum).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())); - ledgerStaticDTO.setTerminalStatistics(onlineRateStatistic); + ledgerStaticDTO.setOnlineRateStatistics(onlineRateStatistic); // 完整性 List integrityStatistic = distributionMonitorMapper.getIntegrity(terminalIds); double s = integrityStatistic.stream().mapToDouble(PmsSimpleDTO::getDoubleValue).sum()!=0?integrityStatistic.stream().mapToDouble(PmsSimpleDTO::getDoubleValue).sum():3.14159; integrityStatistic.forEach(dto -> dto.setDoubleValue(new BigDecimal(dto.getDoubleValue() * 100 / s).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())); + ledgerStaticDTO.setIntegrityStatistics(integrityStatistic); return ledgerStaticDTO; } }