diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java index b539403b8..d0126289d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java @@ -48,7 +48,7 @@ import java.util.function.Function; import java.util.stream.Collectors; /** - * + * * Description: * 接口文档访问地址:http://serverIP:port/swagger-ui.html * Date: 2022/10/13 8:56【需求编号】 @@ -108,7 +108,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl pollutionSubstationDTOList = new ArrayList<>(); List sub = generalDeviceInfoClient.getPracticalRunDeviceInfoAsSubstation(harmonicPublicParam).getData(); - + sub.forEach(item->{ PollutionSubstationDTO pollutionSubstationDTO = lineFeignClient.getSubstationInfo(item.getIndex()).getData(); @@ -335,7 +335,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl rStatPollutionOrgYPOQueryWrapper = new QueryWrapper<> (); rStatPollutionOrgYPOQueryWrapper.eq ("org_id", detpid). diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java index 4a11a849b..1cda20b07 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java @@ -320,6 +320,9 @@ public class PollutionServiceImpl implements PollutionService { if (!CollUtil.isEmpty(processDataList)){ map.put("pollutionType",dictData.getId()); map.put("value",processDataList.stream().max(Comparator.comparing(RMpPollutionDPO::getValue)).get().getValue()); + }else { + map.put("pollutionType",dictData.getId()); + map.put("value",0); } }