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

1.调整终端周期检测功能

Browse Source
This commit is contained in:
chendaofei
2026-07-10 12:07:57 +08:00
parent def4c066fe
commit 4a04c8f764
11 changed files with 78 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/ComAssessServiceImpl.java
View File

@@ -68,8 +68,6 @@ public class ComAssessServiceImpl extends ServiceImpl<RStatComassesDMapper, RSta
String systemType = commTerminalGeneralClient.isPqOrPms().getData();
if (systemType.equals("pq")) {
List<UserLedgerVO> userLedgerVOList = userLedgerFeignClient.selectUserList(new UserReportParam()).getData();
Map<String, UserLedgerVO> userLedgerVOMap = userLedgerVOList.stream().collect(Collectors.toMap(UserLedgerVO::getId, Function.identity()));
@@ -158,8 +156,8 @@ public class ComAssessServiceImpl extends ServiceImpl<RStatComassesDMapper, RSta
comAssessVOList.add(comAssessVO);
}
}
List<ComAssessVO> list = comAssessVOList.stream().sorted(Comparator.comparing(ComAssessVO::getData).reversed()).collect(Collectors.toList());
return list;
// List<ComAssessVO> list = comAssessVOList.stream().sorted(Comparator.comparing(ComAssessVO::getData).reversed()).collect(Collectors.toList());
return comAssessVOList;
} else {
DictData dictData = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.RUN.getCode(), DicDataTypeEnum.LINE_STATE.getCode()).getData();
PmsDeviceInfoParam param = new PmsDeviceInfoParam();

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

@@ -340,11 +340,11 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
list.add(pollutionVO);
}
}
if (!CollectionUtils.isEmpty(list)) {
/* if (!CollectionUtils.isEmpty(list)) {
List<PollutionVO> listSort = list.stream().filter(x -> x.getData() != 3.14159).sorted(Comparator.comparing(PollutionVO::getData).reversed().thenComparing(PollutionVO::getName)).collect(Collectors.toList());
listSort.addAll(list.stream().filter(x -> x.getData() == 3.14159).collect(Collectors.toList()));
return listSort;
}
}*/
return list;
}