From e21dc1965ae0b4475356b588df0028dcb2790b57 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Sat, 7 Oct 2023 16:37:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3pmsBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/pojo/dto/PmsMonitorInfoDTO.java | 10 ------ .../device/pms/pojo/vo/RStatDevSignalVO.java | 25 +++++++++++++++ .../mapper/majornetwork/TerminalMapper.java | 6 ++++ .../majornetwork/mapping/MonitorMapper.xml | 4 --- .../majornetwork/mapping/TerminalMapper.xml | 32 +++++++++++++++++++ .../impl/DataQualityStatServiceImpl.java | 30 +++++++++++------ .../impl/RStatDevSignalDServiceImpl.java | 10 ++++-- 7 files changed, 90 insertions(+), 27 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorInfoDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorInfoDTO.java index e53e87314..21d5911fb 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorInfoDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorInfoDTO.java @@ -33,16 +33,6 @@ public class PmsMonitorInfoDTO implements Serializable { */ private String powerName; - /** - * 母线id - */ - private String generatrixId; - - /** - * 母线名称 - */ - private String generatrixName; - /** * 监测点id */ diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatDevSignalVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatDevSignalVO.java index d11d76694..c225e9839 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatDevSignalVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatDevSignalVO.java @@ -1,5 +1,6 @@ package com.njcn.device.pms.pojo.vo; +import cn.hutool.core.util.StrUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -42,4 +43,28 @@ public class RStatDevSignalVO { @ApiModelProperty(name = "updateTime", value = "最后通讯时间") private String updateTime; //最后通讯时间 + + public void setDeviceStatus(String deviceStatus) { + if(StrUtil.isNotBlank(deviceStatus)){ + this.deviceStatus = deviceStatus; + }else{ + this.deviceStatus = "/"; + } + } + + public void setRunStatus(String runStatus) { + if(StrUtil.isNotBlank(runStatus)){ + this.runStatus = runStatus; + }else{ + this.runStatus = "/"; + } + } + + public void setUpdateTime(String updateTime) { + if(StrUtil.isNotBlank(updateTime)){ + this.updateTime = updateTime; + }else{ + this.updateTime = "/"; + } + } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TerminalMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TerminalMapper.java index dc74d6286..a32ab23d7 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TerminalMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TerminalMapper.java @@ -3,10 +3,14 @@ package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.device.pms.pojo.param.RStatDevSignalParam; import com.njcn.device.pms.pojo.po.PmsTerminal; import com.njcn.device.pms.pojo.vo.PmsTerminalVO; +import com.njcn.device.pms.pojo.vo.RStatDevSignalVO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* Mapper 接口 @@ -18,4 +22,6 @@ import org.apache.ibatis.annotations.Param; public interface TerminalMapper extends BaseMapper { Page page(@Param("page")Page page, @Param("ew") QueryWrapper queryWrapper); + + List selectTerminalList(@Param("ids") List ids,@Param("param") RStatDevSignalParam rStatDevSignalParam); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml index e96219377..323d11ec3 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml @@ -91,12 +91,8 @@ pm.Org_Name AS orgName, pm.Powerr_Id AS powerId, pm.Powerr_Name AS powerName, - pm.Generatrix_Id AS generatrixId, - pm.Generatrix_Name AS generatrixName, pm.Id AS monitorId, pm.`Name` AS monitorName, - pm.Generatrix_Id AS generatrixId, - pm.Generatrix_Name AS generatrixName, pm.Voltage_Level AS monitorVoltageLevel, pm.Monitor_Type AS monitorType, pm.Monitor_State AS monitorState diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TerminalMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TerminalMapper.xml index f069d8e2a..ed58c44b6 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TerminalMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TerminalMapper.xml @@ -7,4 +7,36 @@ FROM pms_terminal pms_terminal WHERE ${ew.sqlSegment} + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java index 6b7f81c47..3a1d48907 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java @@ -152,11 +152,16 @@ public class DataQualityStatServiceImpl implements DataQualityStatService { // 计算有效接入率【有效接入监测点数量/在运监测点数】 return result.stream().peek(vo -> { vo.setOrgName(deptDTOMap.get(vo.getOrgNo()).getName()); - vo.setEffectiveAccessRate( - Double.parseDouble( - df.format((vo.getEffectiveAccessMeasurementCount() * 1.0) - / (vo.getMeasurementCount() * 1.0)) - ) * 100); + if(vo.getMeasurementCount()!=0&&vo.getMeasurementCount()!=null){ + vo.setEffectiveAccessRate( + Double.parseDouble( + df.format((vo.getEffectiveAccessMeasurementCount() * 1.0) + / (vo.getMeasurementCount() * 1.0)) + ) * 100); + }else{ + vo.setEffectiveAccessRate(0.0); + } + }).collect(Collectors.toList()); } @@ -196,11 +201,16 @@ public class DataQualityStatServiceImpl implements DataQualityStatService { BeanUtils.copyProperties(po, vo); vo.setOrgId(po.getOrgNo()); vo.setOrgName(deptDTOMap.get(vo.getOrgId()).getName()); - vo.setProblemProportion( - Double.parseDouble( - df.format((po.getProblem() * 1.0) - / (po.getEffectiveAccessMeasurementCount() * 1.0)) - ) * 100); + if(po.getEffectiveAccessMeasurementCount()!=0&&po.getEffectiveAccessMeasurementCount()!=null){ + vo.setProblemProportion( + Double.parseDouble( + df.format((po.getProblem() * 1.0) + / (po.getEffectiveAccessMeasurementCount() * 1.0)) + ) * 100); + }else{ + vo.setProblemProportion(0.0); + } + if (po.getProblemYearOnYear() == null) { vo.setProblemYearOnYear("3.14159"); } else { diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatDevSignalDServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatDevSignalDServiceImpl.java index bd6aaedb8..a93c551bc 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatDevSignalDServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatDevSignalDServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.pms.mapper.majornetwork.TerminalMapper; import com.njcn.device.pms.pojo.param.RStatDevSignalParam; import com.njcn.device.pms.pojo.po.RStatDevSignalD; import com.njcn.device.pms.pojo.po.PmsTerminal; @@ -26,6 +27,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -38,7 +40,7 @@ import java.util.stream.Collectors; public class RStatDevSignalDServiceImpl extends ServiceImpl implements RStatDevSignalDService{ - private final ITerminalService iTerminalService; + private final TerminalMapper terminalMapper; private final DeptFeignClient deptFeignClient; @@ -63,7 +65,8 @@ public class RStatDevSignalDServiceImpl extends ServiceImpl orgCodeList = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - + return terminalMapper.selectTerminalList(orgCodeList, rStatDevSignalParam); + /* //查询终端数据 LambdaQueryWrapper terminalWrapper = new LambdaQueryWrapper<>(); terminalWrapper.in(PmsTerminal::getOrgId, orgCodeList) @@ -96,7 +99,7 @@ public class RStatDevSignalDServiceImpl extends ServiceImpl signalMap = list.stream().collect(Collectors.toMap(RStatDevSignalD::getDeviceId, terminal -> terminal)); + Map signalMap = list.stream().collect(Collectors.toMap(RStatDevSignalD::getDeviceId, Function.identity(),(key1, key2)->key1)); List notList = terminalList.stream().filter(r -> !signalMap.containsKey(r.getId())) .collect(Collectors.toList()); @@ -117,6 +120,7 @@ public class RStatDevSignalDServiceImpl extends ServiceImpl