diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml index 935973766..15aab3a83 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml @@ -72,7 +72,7 @@ line.Pids as 'pids', line.`Name` AS 'name', line.`Level`as 'Level', - line.Update_Time AS 'updateTime', + pd.Update_Time AS 'updateTime', line.Sort as 'sort', pd.Com_Flag as 'ComFlag', sdd.`Name` AS 'LineScale', diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java index 8c91acebb..ad7bd023f 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java @@ -101,31 +101,22 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData if (CollectionUtil.isEmpty(alarmStrategyVos)) { throw new BusinessException(DeviceResponseEnum.QUERY_ALARMSTRATEGY_DATA_EMPTY); } - // 遍历集合 for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) { - // 判断监测点索引集合状态 if (CollectionUtils.isEmpty(generalDeviceDTO.getLineIndexes())) { continue; } - // 创建实体类 TerminalOnlineRateDataVO terminalOnlineRateDataVO = new TerminalOnlineRateDataVO(); - - // 通过部分终端等级信息查询终端信息 List deviceList = terminalOnlineRateDataMapper.getDevice(generalDeviceDTO.getDeviceIndexes(), terminalOnlineRateDataParam.getLineGrade()); - if (CollectionUtil.isEmpty(deviceList)) { continue; } - List devIds = deviceList.stream().map(TerminalOnlineRateDataVO::getId).collect(Collectors.toList()); - // 根据装置id获取装置在线率 List terminalOnlineRateList = terminalOnlineRateDataMapper.getDevOnlineByDevIds(devIds,terminalOnlineRateDataParam.getSearchBeginTime(),terminalOnlineRateDataParam.getSearchEndTime()); - // 处理终端在线率 DataStatisticsUtil.getTerminalOnlineRateData(terminalOnlineRateList, deviceList); @@ -148,7 +139,6 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData terminalOnlineRateDataVO.setId(generalDeviceDTO.getIndex()); terminalOnlineRateDataVO.setName(generalDeviceDTO.getName()); terminalOnlineRateDataVO.setLevel(0); - if (terminalOnlineRateDataParam.getStatisticalType().getCode().equalsIgnoreCase(StatisticsEnum.POWER_NETWORK.getCode())) { TerminalOnlineRateDataVO temp = gdList.stream() .filter(t -> t.getAlgoDescribe() != null)