소스 검색

优化代码

Memory_LG 6 달 전
부모
커밋
876e236524

+ 2 - 5
src/main/java/com/sooka/sponest/lawenforcement/record/controller/LawenforcementRecordController.java

@@ -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);
     }

+ 1 - 1
src/main/java/com/sooka/sponest/lawenforcement/record/mapper/LawenforcementRecordMapper.java

@@ -165,5 +165,5 @@ public interface LawenforcementRecordMapper {
 
     void removeRecordInfoByIds(List<String> ids);
 
-    List<Map<String, Object>> getStartRecordDeviceCode();
+    List<String> getStartRecordDeviceCode();
 }

+ 1 - 1
src/main/java/com/sooka/sponest/lawenforcement/record/service/ILawenforcementRecordService.java

@@ -128,5 +128,5 @@ public interface ILawenforcementRecordService {
 
     List<LawenforcementMemorandum> getMemorandum(LawenforcementMemorandum memorandum);
 
-    List<Map<String, Object>> getStartRecordDeviceCode();
+    List<String> getStartRecordDeviceCode();
 }

+ 1 - 1
src/main/java/com/sooka/sponest/lawenforcement/record/service/impl/LawenforcementRecordServiceImpl.java

@@ -510,7 +510,7 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
     }
 
     @Override
-    public List<Map<String, Object>> getStartRecordDeviceCode() {
+    public List<String> getStartRecordDeviceCode() {
         return recordMapper.getStartRecordDeviceCode();
     }
 }