Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

问题单修复

Browse Source
This commit is contained in:
zhuxinyu
2023-04-24 14:52:48 +08:00
parent 85dc7b0152
commit 04bd5d47c4
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml
View File

@@ -72,7 +72,7 @@
line.Pids as 'pids', line.Pids as 'pids',
line.`Name` AS 'name', line.`Name` AS 'name',
line.`Level`as 'Level', line.`Level`as 'Level',
line.Update_Time AS 'updateTime', pd.Update_Time AS 'updateTime',
line.Sort as 'sort', line.Sort as 'sort',
pd.Com_Flag as 'ComFlag', pd.Com_Flag as 'ComFlag',
sdd.`Name` AS 'LineScale', sdd.`Name` AS 'LineScale',

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

@@ -101,31 +101,22 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
if (CollectionUtil.isEmpty(alarmStrategyVos)) { if (CollectionUtil.isEmpty(alarmStrategyVos)) {
throw new BusinessException(DeviceResponseEnum.QUERY_ALARMSTRATEGY_DATA_EMPTY); throw new BusinessException(DeviceResponseEnum.QUERY_ALARMSTRATEGY_DATA_EMPTY);
} }
// 遍历集合 // 遍历集合
for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) { for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
// 判断监测点索引集合状态 // 判断监测点索引集合状态
if (CollectionUtils.isEmpty(generalDeviceDTO.getLineIndexes())) { if (CollectionUtils.isEmpty(generalDeviceDTO.getLineIndexes())) {
continue; continue;
} }
// 创建实体类 // 创建实体类
TerminalOnlineRateDataVO terminalOnlineRateDataVO = new TerminalOnlineRateDataVO(); TerminalOnlineRateDataVO terminalOnlineRateDataVO = new TerminalOnlineRateDataVO();
// 通过部分终端等级信息查询终端信息 // 通过部分终端等级信息查询终端信息
List<TerminalOnlineRateDataVO> deviceList = terminalOnlineRateDataMapper.getDevice(generalDeviceDTO.getDeviceIndexes(), terminalOnlineRateDataParam.getLineGrade()); List<TerminalOnlineRateDataVO> deviceList = terminalOnlineRateDataMapper.getDevice(generalDeviceDTO.getDeviceIndexes(), terminalOnlineRateDataParam.getLineGrade());
if (CollectionUtil.isEmpty(deviceList)) { if (CollectionUtil.isEmpty(deviceList)) {
continue; continue;
} }
List<String> devIds = deviceList.stream().map(TerminalOnlineRateDataVO::getId).collect(Collectors.toList()); List<String> devIds = deviceList.stream().map(TerminalOnlineRateDataVO::getId).collect(Collectors.toList());
// 根据装置id获取装置在线率 // 根据装置id获取装置在线率
List<TerminalOnlineRateData> terminalOnlineRateList = terminalOnlineRateDataMapper.getDevOnlineByDevIds(devIds,terminalOnlineRateDataParam.getSearchBeginTime(),terminalOnlineRateDataParam.getSearchEndTime()); List<TerminalOnlineRateData> terminalOnlineRateList = terminalOnlineRateDataMapper.getDevOnlineByDevIds(devIds,terminalOnlineRateDataParam.getSearchBeginTime(),terminalOnlineRateDataParam.getSearchEndTime());
// 处理终端在线率 // 处理终端在线率
DataStatisticsUtil.getTerminalOnlineRateData(terminalOnlineRateList, deviceList); DataStatisticsUtil.getTerminalOnlineRateData(terminalOnlineRateList, deviceList);
@@ -148,7 +139,6 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
terminalOnlineRateDataVO.setId(generalDeviceDTO.getIndex()); terminalOnlineRateDataVO.setId(generalDeviceDTO.getIndex());
terminalOnlineRateDataVO.setName(generalDeviceDTO.getName()); terminalOnlineRateDataVO.setName(generalDeviceDTO.getName());
terminalOnlineRateDataVO.setLevel(0); terminalOnlineRateDataVO.setLevel(0);
if (terminalOnlineRateDataParam.getStatisticalType().getCode().equalsIgnoreCase(StatisticsEnum.POWER_NETWORK.getCode())) { if (terminalOnlineRateDataParam.getStatisticalType().getCode().equalsIgnoreCase(StatisticsEnum.POWER_NETWORK.getCode())) {
TerminalOnlineRateDataVO temp = gdList.stream() TerminalOnlineRateDataVO temp = gdList.stream()
.filter(t -> t.getAlgoDescribe() != null) .filter(t -> t.getAlgoDescribe() != null)