From ae14d9a820bc9132f10e614bd956426ccbb5e801 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Mon, 29 Jun 2026 10:38:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E9=80=82=E9=85=8D=E8=BE=BD?= =?UTF-8?q?=E5=AE=81=E7=8E=B0=E5=9C=BA=E6=96=B0=E8=83=BD=E6=BA=90=E5=9C=BA?= =?UTF-8?q?=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/device/pq/pojo/po/LineDetail.java | 4 ---- .../com/njcn/device/line/mapper/mapping/LineMapper.xml | 6 +++++- .../njcn/device/line/service/impl/LineServiceImpl.java | 1 + .../mapper/mapping/RStatIntegrityDMapper.xml | 2 +- .../njcn/harmonic/service/impl/GridServiceImpl.java | 2 +- .../service/impl/MonitorHarmonicReportServiceImpl.java | 10 +++++++++- pqs-system/system-boot/pom.xml | 4 ++-- 7 files changed, 19 insertions(+), 10 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java index 37bce22fa..24110fbd1 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java @@ -111,7 +111,6 @@ public class LineDetail{ /** * 监测点对象名称 */ - @Deprecated private String objName; /** @@ -171,19 +170,16 @@ public class LineDetail{ /** * 监测点拥有者 */ - @Deprecated private String owner; /** * 拥有者职务 */ - @Deprecated private String ownerDuty; /** * 拥有者联系方式 */ - @Deprecated private String ownerTel; /** diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml index 499306fe1..5ea5d9718 100644 --- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml @@ -1504,7 +1504,10 @@ diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/LineServiceImpl.java index 5586f2bd6..461f36b98 100644 --- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/LineServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/LineServiceImpl.java @@ -162,6 +162,7 @@ public class LineServiceImpl extends ServiceImpl implements Li lineDetailDataVO.setDevId(device.getId()); lineDetailDataVO.setBusinessType(dicDataFeignClient.getDicDataById(lineDetail.getBusinessType()).getData().getName()); lineDetailDataVO.setLoadType(dicDataFeignClient.getDicDataById(lineDetail.getLoadType()).getData().getName()); + lineDetailDataVO.setObjId(lineDetail.getObjId()); lineDetailDataVO.setObjName(lineDetail.getObjName()); lineDetailDataVO.setId(lineDetail.getNum()); lineDetailDataVO.setPtType(PubUtils.ptType(lineDetail.getPtType())); diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml index 4848c4194..c0d197055 100644 --- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml @@ -69,7 +69,7 @@ select if(sum(real_time*1.0)/sum(due_time)*100>100, 100, - IFNULL(ROUND( sum(real_time)/sum(due_time)*100,2),0)) + IFNULL(ROUND( sum(real_time*1.0)/sum(due_time)*100,2),0)) as integrityRate from r_stat_integrity_d diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java index 7c2bb52ca..4e31d0bb4 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java @@ -577,7 +577,7 @@ public class GridServiceImpl implements IGridService { //筛选出9项指标(电压偏差、频率偏差、电压总谐波畸变率、电压闪变、三相电压不平衡度、负序电流、谐波电流、间谐波电压、谐波电压)超标监测点 long allNum = list2.stream().filter(o -> o.getAllOvertime() > 0 || o.getFlickerAllTime() > 0 ).count(); detail.setOverNum((int) allNum); - detail.setOverRatio(PubUtils.doubleRound(2, detail.getOverNum() * 100.0 / detail.getOnlineNum())); + detail.setOverRatio(detail.getOnlineNum() == 0 ? 0 : PubUtils.doubleRound(2, detail.getOverNum() * 100.0 / detail.getOnlineNum())); //筛选出电压偏差超标监测点 long num1 = list2.stream().filter(o -> o.getFreqDevOvertime() > 0).count(); Integer day1 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getFreqDevOvertime)).get().getFreqDevOvertime(); diff --git a/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java b/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java index 0a57f5a6d..8fedb8760 100644 --- a/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java +++ b/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java @@ -10,9 +10,11 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.utils.PubUtils; +import com.njcn.device.biz.commApi.CommLineClient; import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.device.pq.api.DeviceUnitClient; +import com.njcn.device.pq.api.LineFeignClient; import com.njcn.harmonic.common.pojo.dto.DeviceUnitCommDTO; import com.njcn.harmonic.common.pojo.dto.HarmLineDetailDataCommDTO; import com.njcn.harmonic.common.pojo.dto.OverLimitInfoCommDTO; @@ -48,6 +50,7 @@ import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * pqs @@ -132,7 +135,12 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe if (ObjectUtil.isNull(lineDto)) { throw new BusinessException(CommonResponseEnum.NO_DATA); } - bdname = lineDto.getBdName(); + if(StrUtil.isNotBlank(lineDto.getObjId())){ + bdname = lineDto.getObjName(); + name = lineDto.getLineName(); + }else { + bdname = lineDto.getBdName(); + } areaName = lineDto.getAreaName(); if("冀北".equals(areaName)){ areaName="国网"+areaName; diff --git a/pqs-system/system-boot/pom.xml b/pqs-system/system-boot/pom.xml index baf9f6faf..2fa2e7f60 100644 --- a/pqs-system/system-boot/pom.xml +++ b/pqs-system/system-boot/pom.xml @@ -64,11 +64,11 @@ 1.0.0 compile - + com.njcn process-api