From f1f1d523e0cbb70a80209c25952cbc2b24f1ae11 Mon Sep 17 00:00:00 2001 From: wurui Date: Thu, 9 Mar 2023 15:46:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E5=B8=83=E5=BC=8F?= =?UTF-8?q?=E5=85=89=E4=BC=8F=E6=A6=82=E8=A7=88-=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E4=BF=A1=E6=81=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/pojo/vo/SpecialAnalysisMonitorVO.java | 16 +++++----- .../majornetwork/mapping/OverviewMapper.xml | 32 +++++++++---------- .../mapping/SpecialAnalysisMapper.xml | 2 +- .../impl/OverviewServiceImpl.java | 6 ++-- .../impl/SpecialAnalysisServiceImpl.java | 8 ++--- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/SpecialAnalysisMonitorVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/SpecialAnalysisMonitorVO.java index ed285205d..569dc5c4e 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/SpecialAnalysisMonitorVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/SpecialAnalysisMonitorVO.java @@ -126,16 +126,16 @@ public class SpecialAnalysisMonitorVO implements Serializable { private String name; @ApiModelProperty(name = "tractionStation", value = "牵引站数量") - private String tractionStation; + private Integer tractionStation; @ApiModelProperty(name = "num", value = "监测点数量") - private String num; + private Integer num; @ApiModelProperty(name = "ytbSumNum", value = "同比数量") - private String ytbSumNum; + private Integer ytbSumNum; @ApiModelProperty(name = "yhbSumNum", value = "环比数量") - private String yhbSumNum; + private Integer yhbSumNum; @ApiModelProperty(name = "sameNum", value = "监测点数量同比") private String sameNum; @@ -157,16 +157,16 @@ public class SpecialAnalysisMonitorVO implements Serializable { private String connetGroupWay; @ApiModelProperty(name = "num", value = "牵引站数量") - private String num; + private Integer num; @ApiModelProperty(name = "rateAvg", value = "负载量（平均值）") - private String rateAvg; + private Integer rateAvg; @ApiModelProperty(name = "rate95", value = "负载量（95值）") - private String rate95; + private Integer rate95; @ApiModelProperty(name = "rate99", value = "负载量（99值）") - private String rate99; + private Integer rate99; } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/OverviewMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/OverviewMapper.xml index d3ef43f70..6e6b2e896 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/OverviewMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/OverviewMapper.xml @@ -32,7 +32,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) UNION ALL ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user @@ -42,7 +42,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) UNION ALL ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea @@ -52,7 +52,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) UNION ALL @@ -63,7 +63,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) @@ -95,7 +95,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) UNION ALL ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user @@ -105,7 +105,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) UNION ALL ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea @@ -115,7 +115,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) UNION ALL @@ -126,7 +126,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) @@ -160,7 +160,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) UNION ALL ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user @@ -170,7 +170,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) UNION ALL ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea @@ -180,7 +180,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) UNION ALL @@ -191,7 +191,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) @@ -236,7 +236,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) UNION ALL ( SELECT id,org_id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user @@ -246,7 +246,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) UNION ALL ( SELECT id,org_id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea @@ -256,7 +256,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) UNION ALL @@ -267,7 +267,7 @@ #{item} - AND Is_Up_To_Grid = 1 AND STATUS = 1 + AND STATUS = 1 ) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml index 6efa5d9fc..51b469b3d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml @@ -12,7 +12,7 @@ pm.Powerr_Id, pm.Terminal_Id, pm.Voltage_Level, - psm.capacity, + IFNULL(psm.capacity,0) as capacity, ps.Longitude, ps.Latitude FROM diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java index daf73e06d..e9572f29c 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java @@ -57,7 +57,8 @@ public class OverviewServiceImpl implements OverviewService { DicDataTypeEnum.LINE_SORT.getCode()).getData(); //获取部门数据 - List deptListCode = getDeptListCode(param.getId()); + List data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptListCode = data.stream().map(DeptDTO::getCode).collect(Collectors.toList()); if(CollectionUtil.isNotEmpty(deptListCode)){ List overviewVOS = overviewMapper.selectYoY(deptListCode, param); @@ -125,7 +126,8 @@ public class OverviewServiceImpl implements OverviewService { public List getAlarmProportion(OverviewParam.OverviewDateParam param) { List alarmVOS=new ArrayList<>(); //获取部门数据 - List deptListCode = getDeptListCode(param.getId()); + List deptDTOS = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptListCode = deptDTOS.stream().map(DeptDTO::getCode).collect(Collectors.toList()); DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData(); //获取监测点类别集合（配网1-2-3类监测点） diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java index 46f671475..0e171bced 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java @@ -167,10 +167,10 @@ public class SpecialAnalysisServiceImpl implements SpecialAnalysisService { for (DictData notData : notMeasurementList) { wiringTypeDetail = new SpecialAnalysisMonitorVO.WiringTypeDetail(); wiringTypeDetail.setConnetGroupWay(notData.getId()); - wiringTypeDetail.setNum("0"); - wiringTypeDetail.setRateAvg("0"); - wiringTypeDetail.setRate95("0"); - wiringTypeDetail.setRate99("0"); + wiringTypeDetail.setNum(0); + wiringTypeDetail.setRateAvg(0); + wiringTypeDetail.setRate95(0); + wiringTypeDetail.setRate99(0); wiringTypeRailway.add(wiringTypeDetail); } if (CollUtil.isNotEmpty(wiringTypeRailway)) {