|
@@ -49,7 +49,10 @@ public class DataService implements IDataService {
|
|
|
}
|
|
|
|
|
|
List<Long> cameraIds = list.stream().map(TmCamera::getFdCameraId).collect(Collectors.toList());
|
|
|
- List<DataGroupVo> cameraCountList = scenePlusService.groupByCameraId(param,cameraIds);
|
|
|
+ List<DataGroupVo> cameraCountList = new ArrayList<>();
|
|
|
+ if(!cameraIds.isEmpty()){
|
|
|
+ cameraCountList = scenePlusService.groupByCameraId(param,cameraIds);
|
|
|
+ }
|
|
|
for (DataGroupVo dataGroupVo : cameraCountList) {
|
|
|
cameraIdMap.put(Long.valueOf(dataGroupVo.getGroupKey()),dataGroupVo.getDataCount());
|
|
|
}
|
|
@@ -147,7 +150,11 @@ public class DataService implements IDataService {
|
|
|
|
|
|
List<TmCamera> tmCameras = tmCameraService.getByDeptIds(getSonDeptIds());
|
|
|
List<Long> cameraIds = tmCameras.stream().map(TmCamera::getFdCameraId).collect(Collectors.toList());
|
|
|
- List<DataGroupVo> groupVoList = scenePlusService.groupByType(param,cameraIds);
|
|
|
+
|
|
|
+ List<DataGroupVo> groupVoList = new ArrayList<>();
|
|
|
+ if(!cameraIds.isEmpty()){
|
|
|
+ groupVoList = scenePlusService.groupByType(param,cameraIds);
|
|
|
+ }
|
|
|
|
|
|
TreeMap<String,Long> countMap = new TreeMap<>();
|
|
|
for (DataGroupVo dataGroupVo : groupVoList) {
|