问题单整改

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java

@@ -150,11 +150,14 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
                 terminalOnlineRateDataVO.setLevel(0);
 
                 if (terminalOnlineRateDataParam.getStatisticalType().getCode().equalsIgnoreCase(StatisticsEnum.POWER_NETWORK.getCode())) {
-                    TerminalOnlineRateDataVO temp = gdList.stream().filter(t -> t.getAlgoDescribe() != null).min(Comparator.comparing(TerminalOnlineRateDataVO::getAlgoDescribe)).orElseGet(TerminalOnlineRateDataVO::new);
+                    TerminalOnlineRateDataVO temp = gdList.stream()
+                            .filter(t -> t.getAlgoDescribe() != null)
+                            .min(Comparator.comparing(TerminalOnlineRateDataVO::getAlgoDescribe))
+                            .orElseGet(TerminalOnlineRateDataVO::new);
                     terminalOnlineRateDataVO.setAlgoDescribe(temp.getAlgoDescribe());
                     terminalOnlineRateDataVO.setChildren(gdList);
                 } else {
-                    //还需要额外处理省会
+                    // 还需要额外处理省会
                     dealChildrenData(proList, gdList, false);
                     terminalOnlineRateDataVO.setChildren(proList);
                 }
@@ -298,14 +301,27 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
                             List<TerminalOnlineRateDataVO> devs = subItem.getChildren();
                             if (CollectionUtil.isNotEmpty(devs)) {
                                 for (TerminalOnlineRateDataVO devItem : devs) {
-                                    if (Objects.nonNull(devItem.getAlgoDescribe())) {
+                                    if (Objects.isNull(devItem.getChildren())) {
                                         if (mapAlarm.containsKey(devItem.getAlgoDescribe())) {
-                                            if (devItem.getOnlineRate() != 3.14159 && devItem.getOnlineRate() > mapAlarm.get(devItem.getAlgoDescribe())) {
+                                            if (devItem.getOnlineRate() != 3.14159  && devItem.getOnlineRate() > mapAlarm.get(devItem.getAlgoDescribe())) {
                                                 devItem.setValueOver(1);
                                             } else {
                                                 devItem.setValueOver(0);
                                             }
                                         }
+                                    } else {
+                                        List<TerminalOnlineRateDataVO> children = devItem.getChildren();
+                                        for (TerminalOnlineRateDataVO child : children) {
+                                            if (mapAlarm.containsKey(child.getAlgoDescribe())) {
+                                                if (child.getOnlineRate() != 3.14159 && child.getOnlineRate() > mapAlarm.get(child.getAlgoDescribe())) {
+                                                    child.setValueOver(1);
+                                                } else {
+                                                    child.setValueOver(0);
+                                                }
+                                            }
+                                        }
+                                        Double devAvg = children.stream().filter(item -> item.getOnlineRate() != 3.14159).collect(Collectors.averagingDouble(TerminalOnlineRateDataVO::getOnlineRate));
+                                        devItem.setOnlineRate(devAvg);
                                     }
                                 }
                                 Double devAvg = devs.stream().filter(item -> item.getOnlineRate() != 3.14159).collect(Collectors.averagingDouble(TerminalOnlineRateDataVO::getOnlineRate));

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AnalyzeServiceImpl.java

@@ -16,6 +16,7 @@ import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.dto.OverLimitLineDTO;
 import com.njcn.device.pq.pojo.dto.PollutionParamDTO;
 import com.njcn.device.pq.pojo.dto.WarningSubstationDTO;
+import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import com.njcn.harmonic.constant.Param;
 import com.njcn.harmonic.mapper.RStatLimitRateDMapper;
 import com.njcn.harmonic.pojo.excel.area.AreaExcel;
@@ -301,7 +302,8 @@ public class AnalyzeServiceImpl implements IAnalyzeService {
             list.addAll(monMap.keySet());
             PollutionParamDTO pollutionParamDTO = new PollutionParamDTO();
             pollutionParamDTO.setLineList(list);
-//            List<AreaLineInfoVO> data = lineFeignClient.getBaseLineAreaInfo(list).getData();
+            List<AreaLineInfoVO> data = lineFeignClient.getBaseLineAreaInfo(list).getData();
+            System.out.println(data);
             List<OverLimitLineDTO> overLimitLineList = lineFeignClient.getOverLimitLineInfo(pollutionParamDTO).getData();
             List<RStatLimitRateDPO> rStatLimitRateDPOS = rateDMapper.selectList(new QueryWrapper<RStatLimitRateDPO>()
                     .in("r_stat_limit_rate_d.my_index", list)

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java

@@ -175,8 +175,8 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
     @Override
     public List<PollutionVO> getDeptSubstationRelations(HarmonicPublicParam harmonicPublicParam) {
         List<PollutionVO> list = new ArrayList<>();
-        String pollutionType = harmonicPublicParam.getStatisticalType ( ).getId ();
+        String pollutionType = harmonicPublicParam.getStatisticalType ().getId ();
-        String searchBeginTime = harmonicPublicParam.getSearchBeginTime ( ).substring (0,10);
+        String searchBeginTime = harmonicPublicParam.getSearchBeginTime ().substring (0,10);
         if (StringUtils.isBlank(RequestUtil.getDeptIndex())){
             return list;
         }