diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java index 4111c67..ab20910 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java @@ -29,6 +29,8 @@ import com.njcn.csharmonic.pojo.po.PqSensitiveUser; import com.njcn.oss.constant.OssPath; import com.njcn.oss.utils.FileStorageUtil; import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.api.DictTreeFeignClient; +import com.njcn.system.enums.DicDataEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.UserFeignClient; import com.njcn.user.pojo.constant.UserType; @@ -70,7 +72,7 @@ public class CsLinePOServiceImpl extends ServiceImpl i private final UserFeignClient userFeignClient; private final CsEquipmentDeliveryMapper csEquipmentDeliveryMapper; private final CsDeviceUserPOMapper csDeviceUserPOMapper; - + private final DictTreeFeignClient dictTreeFeignClient; @Override @@ -415,14 +417,21 @@ public class CsLinePOServiceImpl extends ServiceImpl i return new LineDetailDataVO(); } else { CsLinePO csLinePO = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(CsLinePO::getLineId,id)); + //获取设备信息 + CsEquipmentDeliveryPO csEquipmentDelivery = csEquipmentDeliveryMapper.selectById(csLinePO.getDeviceId()); + String code = dictTreeFeignClient.queryById(csEquipmentDelivery.getDevType()).getData().getCode(); CsLedger csLedger = csLedgerMapper.selectById(csLinePO.getLineId()); - LineDetailDataVO lineDetailDataVO = new LineDetailDataVO(); lineDetailDataVO.setScale(csLinePO.getVolGrade()+"kV"); - lineDetailDataVO.setAreaName(csLedgerMapper.selectById(csLedger.getPids().split(StrUtil.COMMA)[LineBaseEnum.ENGINEERING_LEVEL.getCode()+1]).getName()); - lineDetailDataVO.setBdName(csLedgerMapper.selectById(csLedger.getPids().split(StrUtil.COMMA)[LineBaseEnum.PROJECT_LEVEL.getCode()+1]).getName()); + if (Objects.equals(DicDataEnum.PORTABLE.getCode(),code)) { + lineDetailDataVO.setAreaName("便携式工程"); + lineDetailDataVO.setBdName("便携式项目"); + } else { + lineDetailDataVO.setAreaName(csLedgerMapper.selectById(csLedger.getPids().split(StrUtil.COMMA)[LineBaseEnum.ENGINEERING_LEVEL.getCode()+1]).getName()); + lineDetailDataVO.setBdName(csLedgerMapper.selectById(csLedger.getPids().split(StrUtil.COMMA)[LineBaseEnum.PROJECT_LEVEL.getCode()+1]).getName()); + } lineDetailDataVO.setLineName(csLinePO.getName()); //Device device = deviceMapper.selectById(devId); //lineDetailDataVO.setComFlag(PubUtils.comFlag(device.getComFlag())); @@ -435,12 +444,12 @@ public class CsLinePOServiceImpl extends ServiceImpl i lineDetailDataVO.setObjName(csLinePO.getMonitorUser()); lineDetailDataVO.setLineId(csLinePO.getLineId()); lineDetailDataVO.setPtType(PubUtils.ptType(csLinePO.getConType())); - lineDetailDataVO.setPt(csLinePO.getPtRatio() + "/" + csLinePO.getPt2Ratio()); - lineDetailDataVO.setCt(csLinePO.getCtRatio() + "/" + csLinePO.getCt2Ratio()); - lineDetailDataVO.setDealCapacity(csLinePO.getProtocolCapacity().floatValue()); - lineDetailDataVO.setDevCapacity(csLinePO.getDevCapacity().floatValue()); - lineDetailDataVO.setShortCapacity(csLinePO.getShortCircuitCapacity().floatValue()); - lineDetailDataVO.setStandardCapacity(csLinePO.getBasicCapacity().floatValue()); + lineDetailDataVO.setPt(csLinePO.getPtRatio() + "/" + (Objects.isNull(csLinePO.getPt2Ratio())?1.0:csLinePO.getPt2Ratio())); + lineDetailDataVO.setCt(csLinePO.getCtRatio() + "/" + (Objects.isNull(csLinePO.getCt2Ratio())?1.0:csLinePO.getCt2Ratio())); + lineDetailDataVO.setDealCapacity(Objects.isNull(csLinePO.getProtocolCapacity())?0.0f:csLinePO.getProtocolCapacity().floatValue()); + lineDetailDataVO.setDevCapacity(Objects.isNull(csLinePO.getDevCapacity())?0.0f:csLinePO.getDevCapacity().floatValue()); + lineDetailDataVO.setShortCapacity(Objects.isNull(csLinePO.getShortCircuitCapacity())?0.0f:csLinePO.getShortCircuitCapacity().floatValue()); + lineDetailDataVO.setStandardCapacity(Objects.isNull(csLinePO.getBasicCapacity())?0.0f:csLinePO.getBasicCapacity().floatValue()); lineDetailDataVO.setTimeInterval(csLinePO.getLineInterval()); return lineDetailDataVO;