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 16:36:15 +08:00
parent 29f67c694c
commit 943933d447
2 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/TerminalOnlineRateDataParam.java
View File

@@ -17,10 +17,6 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class TerminalOnlineRateDataParam extends DeviceInfoParam.BusinessParam{
/**
* 调用模块分类
*/

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

@@ -95,12 +95,16 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
// 创建集合返回数据
List<TerminalOnlineRateDataVO> pro = new ArrayList<>();
List<AlarmStrategyVO> alarmStrategyVos = new ArrayList<>();
if (terminalOnlineRateDataParam.getServerName().equals("deviceBoot")) {
// 获取告警策略列表
List<AlarmStrategyVO> alarmStrategyVos = alarmClient.getAlarmStrategyData().getData();
alarmStrategyVos = alarmClient.getAlarmStrategyData().getData();
// 判断告警策略数据状态
if (CollectionUtil.isEmpty(alarmStrategyVos)) {
throw new BusinessException(DeviceResponseEnum.QUERY_ALARMSTRATEGY_DATA_EMPTY);
}
}
// 遍历集合
for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
// 判断监测点索引集合状态
@@ -154,7 +158,7 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
pro.add(terminalOnlineRateDataVO);
}
getAreaOnlineRateData(pro, alarmStrategyVos, terminalOnlineRateDataParam.getLineGrade());
getAreaOnlineRateData(pro, alarmStrategyVos, terminalOnlineRateDataParam.getLineGrade(),terminalOnlineRateDataParam.getServerName());
return pro;
} else {
return new ArrayList<>();
@@ -254,12 +258,14 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
* 获取区域终端在线率
*
* @param terminalOnlineRateData
* @param serverName
*/
public void getAreaOnlineRateData(List<TerminalOnlineRateDataVO> terminalOnlineRateData, List<AlarmStrategyVO> alarmStrategyVos, String lineGrade) {
public void getAreaOnlineRateData(List<TerminalOnlineRateDataVO> terminalOnlineRateData, List<AlarmStrategyVO> alarmStrategyVos, String lineGrade, String serverName) {
Map<Integer, Integer> mapAlarm = new HashMap<>();
Map<String, AlarmStrategyVO> map = alarmStrategyVos.stream().collect(Collectors.toMap(AlarmStrategyVO::getId, Function.identity()));
if (serverName.equals("deviceBoot")) {
if (StrUtil.isNotBlank(lineGrade)) {
// 根据入参终端等级查字典表
DictData dictData = dicDataFeignClient.getDicDataById(lineGrade).getData();
@@ -279,6 +285,11 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
}
});
}
} else {
mapAlarm.put(0,0);
}
for (TerminalOnlineRateDataVO proItem : terminalOnlineRateData) {
List<TerminalOnlineRateDataVO> gds = proItem.getChildren();