From 731f6f2d129eff7d08c145400dfb32fb8154a688 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Thu, 20 Jun 2024 19:14:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=8A=9F=E8=83=BD=E5=90=84?= =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91=E5=BC=95=E8=B5=B7?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2bug=EF=BC=8C=E9=A2=84=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E5=8D=95=E6=96=B0=E5=A2=9E=E6=95=B4=E6=94=B9=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pq/service/impl/LineServiceImpl.java | 129 +++++++++--------- 1 file changed, 67 insertions(+), 62 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java index 87ce357df..575960092 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java @@ -16,10 +16,11 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.utils.EnumUtils; import com.njcn.common.utils.PubUtils; import com.njcn.device.biz.enums.DeviceResponseEnum; -import com.njcn.device.biz.pojo.dto.LineDTO; import com.njcn.device.biz.pojo.dto.LineALLInfoDTO; +import com.njcn.device.biz.pojo.dto.LineDTO; import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.pq.enums.LineBaseEnum; +import com.njcn.device.pq.mapper.*; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.dto.PollutionLineDTO; import com.njcn.device.pq.pojo.dto.PollutionParamDTO; @@ -30,7 +31,6 @@ import com.njcn.device.pq.pojo.param.PqsParam; import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; import com.njcn.device.pq.pojo.po.*; import com.njcn.device.pq.pojo.vo.*; -import com.njcn.device.pq.mapper.*; import com.njcn.device.pq.service.DeptLineService; import com.njcn.device.pq.service.LineService; import com.njcn.influx.constant.InfluxDbSqlConstant; @@ -44,7 +44,6 @@ import com.njcn.system.pojo.po.Area; import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; -import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.pojo.vo.LineDataVO; import com.njcn.web.utils.GeneralUtil; import com.njcn.web.utils.RequestUtil; @@ -52,6 +51,7 @@ import com.njcn.web.utils.WebUtil; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -100,67 +100,72 @@ public class LineServiceImpl extends ServiceImpl implements Li private final DeptLineService deptLineService; @Override public LineDetailDataVO getLineDetailData(String id) { - //根据id查询当前信息的pids - List pids = Arrays.asList(this.baseMapper.selectById(id).getPids().split(",")); - List list = new ArrayList(pids); - list.add(id); - List lineDataVOList = this.baseMapper.getLineDetail(list); - LineDetailDataVO lineDetailDataVO = new LineDetailDataVO(); - String areaId = "", devId = "", voId = ""; - for (LineDataVO lineDataVO : lineDataVOList) { - switch (lineDataVO.getLevel()) { - case 1: - areaId = lineDataVO.getName(); - break; - case 2: - lineDetailDataVO.setGdName(lineDataVO.getName()); - break; - case 3: - lineDetailDataVO.setBdName(lineDataVO.getName()); - break; - case 4: - devId = lineDataVO.getId(); - lineDetailDataVO.setDevName(lineDataVO.getName()); - break; - case 5: - voId = lineDataVO.getId(); - break; - case 6: - lineDetailDataVO.setLineName(lineDataVO.getName()); - break; - default: - break; + if(StringUtils.isEmpty(id)){ + return new LineDetailDataVO(); + }else { + //根据id查询当前信息的pids + List pids = Arrays.asList(this.baseMapper.selectById(id).getPids().split(",")); + List list = new ArrayList(pids); + list.add(id); + List lineDataVOList = this.baseMapper.getLineDetail(list); + LineDetailDataVO lineDetailDataVO = new LineDetailDataVO(); + String areaId = "", devId = "", voId = ""; + for (LineDataVO lineDataVO : lineDataVOList) { + switch (lineDataVO.getLevel()) { + case 1: + areaId = lineDataVO.getName(); + break; + case 2: + lineDetailDataVO.setGdName(lineDataVO.getName()); + break; + case 3: + lineDetailDataVO.setBdName(lineDataVO.getName()); + break; + case 4: + devId = lineDataVO.getId(); + lineDetailDataVO.setDevName(lineDataVO.getName()); + break; + case 5: + voId = lineDataVO.getId(); + break; + case 6: + lineDetailDataVO.setLineName(lineDataVO.getName()); + break; + default: + break; + } } + lineDetailDataVO.setAreaName(areaFeignClient.selectIdArea(areaId).getData().getName()); + lineDetailDataVO.setScale(dicDataFeignClient.getDicDataById(voltageMapper.selectById(voId).getScale()).getData().getName()); + LineDetail lineDetail = lineDetailMapper.selectById(id); + Device device = deviceMapper.selectById(devId); + lineDetailDataVO.setManufacturer(dicDataFeignClient.getDicDataById(device.getManufacturer()).getData().getName()); + lineDetailDataVO.setComFlag(PubUtils.comFlag(device.getComFlag())); + lineDetailDataVO.setRunFlag(PubUtils.lineRunFlag(lineDetail.getRunFlag())); + lineDetailDataVO.setIp(device.getIp()); + lineDetailDataVO.setLoginTime(device.getLoginTime()); + lineDetailDataVO.setDevId(device.getId()); + lineDetailDataVO.setBusinessType(dicDataFeignClient.getDicDataById(lineDetail.getBusinessType()).getData().getName()); + lineDetailDataVO.setLoadType(dicDataFeignClient.getDicDataById(lineDetail.getLoadType()).getData().getName()); + lineDetailDataVO.setObjName(lineDetail.getObjName()); + lineDetailDataVO.setId(lineDetail.getNum()); + lineDetailDataVO.setPtType(PubUtils.ptType(lineDetail.getPtType())); + lineDetailDataVO.setPt(lineDetail.getPt1() + "/" + lineDetail.getPt2()); + lineDetailDataVO.setCt(lineDetail.getCt1() + "/" + lineDetail.getCt2()); + lineDetailDataVO.setDealCapacity(lineDetail.getDealCapacity()); + lineDetailDataVO.setDevCapacity(lineDetail.getDevCapacity()); + lineDetailDataVO.setShortCapacity(lineDetail.getShortCapacity()); + lineDetailDataVO.setStandardCapacity(lineDetail.getStandardCapacity()); + lineDetailDataVO.setTimeInterval (lineDetail.getTimeInterval ()); + lineDetailDataVO.setOwner(lineDetail.getOwner()); + lineDetailDataVO.setOwnerDuty(lineDetail.getOwnerDuty()); + lineDetailDataVO.setOwnerTel(lineDetail.getOwnerTel()); + lineDetailDataVO.setWiringDiagram(lineDetail.getWiringDiagram()); + lineDetailDataVO.setPtPhaseType(lineDetail.getPtPhaseType()); + lineDetailDataVO.setUpdateTime(device.getUpdateTime()); + return lineDetailDataVO; } - lineDetailDataVO.setAreaName(areaFeignClient.selectIdArea(areaId).getData().getName()); - lineDetailDataVO.setScale(dicDataFeignClient.getDicDataById(voltageMapper.selectById(voId).getScale()).getData().getName()); - LineDetail lineDetail = lineDetailMapper.selectById(id); - Device device = deviceMapper.selectById(devId); - lineDetailDataVO.setManufacturer(dicDataFeignClient.getDicDataById(device.getManufacturer()).getData().getName()); - lineDetailDataVO.setComFlag(PubUtils.comFlag(device.getComFlag())); - lineDetailDataVO.setRunFlag(PubUtils.lineRunFlag(lineDetail.getRunFlag())); - lineDetailDataVO.setIp(device.getIp()); - lineDetailDataVO.setLoginTime(device.getLoginTime()); - lineDetailDataVO.setDevId(device.getId()); - lineDetailDataVO.setBusinessType(dicDataFeignClient.getDicDataById(lineDetail.getBusinessType()).getData().getName()); - lineDetailDataVO.setLoadType(dicDataFeignClient.getDicDataById(lineDetail.getLoadType()).getData().getName()); - lineDetailDataVO.setObjName(lineDetail.getObjName()); - lineDetailDataVO.setId(lineDetail.getNum()); - lineDetailDataVO.setPtType(PubUtils.ptType(lineDetail.getPtType())); - lineDetailDataVO.setPt(lineDetail.getPt1() + "/" + lineDetail.getPt2()); - lineDetailDataVO.setCt(lineDetail.getCt1() + "/" + lineDetail.getCt2()); - lineDetailDataVO.setDealCapacity(lineDetail.getDealCapacity()); - lineDetailDataVO.setDevCapacity(lineDetail.getDevCapacity()); - lineDetailDataVO.setShortCapacity(lineDetail.getShortCapacity()); - lineDetailDataVO.setStandardCapacity(lineDetail.getStandardCapacity()); - lineDetailDataVO.setTimeInterval (lineDetail.getTimeInterval ()); - lineDetailDataVO.setOwner(lineDetail.getOwner()); - lineDetailDataVO.setOwnerDuty(lineDetail.getOwnerDuty()); - lineDetailDataVO.setOwnerTel(lineDetail.getOwnerTel()); - lineDetailDataVO.setWiringDiagram(lineDetail.getWiringDiagram()); - lineDetailDataVO.setPtPhaseType(lineDetail.getPtPhaseType()); - lineDetailDataVO.setUpdateTime(device.getUpdateTime()); - return lineDetailDataVO; + } @Override