|
@@ -128,17 +128,14 @@ public class LawenforcementRecordController extends BaseController {
|
|
|
}
|
|
|
R<List<Map<String, Object>>> listR = SpringUtils.getBean(RemoteEnforcementDeviceService.class).selectByCameraId(visuForestCloudCameraBO);
|
|
|
// 获取当前正在执行任务的设备列表
|
|
|
- List<Map<String, Object>> startCodes = lawenforcementRecordService.getStartRecordDeviceCode();
|
|
|
+ List<String> startCodes = lawenforcementRecordService.getStartRecordDeviceCode();
|
|
|
// 如果正在执法的设备列表为空,则直接返回监控中心的设备列表
|
|
|
if (CollectionUtils.isEmpty(startCodes)) {
|
|
|
return listR;
|
|
|
}
|
|
|
// 使用 Stream API 过滤掉正在执法的设备
|
|
|
List<Map<String, Object>> result = listR.getData().stream()
|
|
|
- .filter(device -> !startCodes.stream()
|
|
|
- .map(codeMap -> MapUtils.getString(codeMap, "deviceId"))
|
|
|
- .collect(Collectors.toSet())
|
|
|
- .contains(MapUtils.getString(device, "cameraCode")))
|
|
|
+ .filter(device -> !startCodes.contains(MapUtils.getString(device, "cameraCode")))
|
|
|
.collect(Collectors.toList());
|
|
|
return R.ok(result);
|
|
|
}
|