Browse Source

#bug修改

zhongwei
yang_shj 2 years ago
parent
commit
5ac376ca75
  1. 4
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java
  2. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java

4
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java

@ -598,7 +598,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService {
// 查询巡检任务项目 // 查询巡检任务项目
List<TaskObjectProjectOfflineVO> taskObjectProjects = taskObjectProjectService.getObjectProjectData(taskIds); List<TaskObjectProjectOfflineVO> taskObjectProjects = taskObjectProjectService.getObjectProjectData(taskIds);
// 返回数据 // 返回数据
return taskObjectProjects.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); return taskObjectProjects.stream().map(this::convertFileOrVideo).collect(Collectors.toList());
} }
/** /**
@ -616,7 +616,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService {
in(TaskObjectProjectContentEntity::getTaskId, taskIds); in(TaskObjectProjectContentEntity::getTaskId, taskIds);
}}); }});
// 返回数据 // 返回数据
return contents.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); return contents.stream().map(this::convertFileOrVideo).collect(Collectors.toList());
} }
/** /**

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java

@ -251,7 +251,7 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl<HistoryAbno
} }
// 查询当天类型处理告警 // 查询当天类型处理告警
List<AlarmHandleEntity> handles = handleService.handles(types.stream().map(Long::parseLong).collect(Collectors.toList()),AbnormalAlarmConstant.INTELLIGENCE_ALARM); List<AlarmHandleEntity> handles = handleService.handles(types.stream().map(Long::parseLong).collect(Collectors.toList()),AbnormalAlarmConstant.SYSTEM_ALARM);
// 返回数据 // 返回数据
AlarmReustVo response = new AlarmReustVo(); AlarmReustVo response = new AlarmReustVo();

Loading…
Cancel
Save