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-19 14:23:58 +08:00
parent 92aceff1e3
commit d2cf8fb905
9 changed files with 64 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,7 +331,7 @@ public class GeneralDeviceService {
deviceInfoParam));
} else {
for (DeptDTO directDeptDTO : directDeptInfos) {
//筛选上级部门pids包含该id的所有部门 直接子部门下属所有部门
//筛选pids包含该id的所有部门 直接子部门下属所有部门
List<DeptDTO> descendantDeptDTO = deptInfos.stream()
.filter(d -> d.getPids().contains(directDeptDTO.getId()))
.collect(Collectors.toList());
@@ -348,7 +348,7 @@ public class GeneralDeviceService {
//判断统计类型
if (deviceInfoParam.getStatisticalType()==null) {
if (deviceInfoParam.getStatisticalType() == null) {
deviceInfoParam.setStatisticalType(new SimpleDTO());
}
StatisticsEnum statisticsEnum = StatisticsEnum.getStatisticsEnumByCode(deviceInfoParam.getStatisticalType().getCode());
@@ -377,8 +377,7 @@ public class GeneralDeviceService {
private GeneralDeviceDTO getGeneralDeviceInfo(DeptDTO directDeptDTO,
DeviceType deviceType,
List<String> ids,
DeviceInfoParam deviceInfoParam)
{
DeviceInfoParam deviceInfoParam) {
GeneralDeviceDTO generalDeviceDTO = new GeneralDeviceDTO();
generalDeviceDTO.setIndex(directDeptDTO.getId());
// type:部门类型 0-非自定义；1-web自定义；2-App自定义；3-web测试

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

@@ -301,7 +301,7 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
List<TerminalOnlineRateDataVO> devs = subItem.getChildren();
if (CollectionUtil.isNotEmpty(devs)) {
for (TerminalOnlineRateDataVO devItem : devs) {
if (Objects.isNull(devItem.getChildren())) {
if (devItem.getChildren().size()==0) {
if (mapAlarm.containsKey(devItem.getAlgoDescribe())) {
if (devItem.getOnlineRate() != 3.14159 && devItem.getOnlineRate() > mapAlarm.get(devItem.getAlgoDescribe())) {
devItem.setValueOver(1);