소스 검색

心跳预警增加预拉相机逻辑

gao.qiang 8 달 전
부모
커밋
ee21ae0228
1개의 변경된 파일2개의 추가작업 그리고 6개의 파일을 삭제
  1. 2 6
      vehicle-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

+ 2 - 6
vehicle-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -1056,9 +1056,7 @@ public class GeoHazardMonitorTokenController {
                         base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
                         base.eq(BaseCameraManagement::getOnline, 2);
                         base.eq(BaseCameraManagement::getEnableOrNot, 1);
-                        if (respHeartbeatVo.getCameraList().get(0).getCurrentStream().equals("")) {
-                            base.last("limit 2");
-                        }
+                        base.last("limit 2");
                         List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
                         //根据相机ID找出分组并排序
                         if (!ObjectUtils.isEmpty(list1)) {
@@ -1373,9 +1371,7 @@ public class GeoHazardMonitorTokenController {
                     base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
                     base.eq(BaseCameraManagement::getOnline, 2);
                     base.eq(BaseCameraManagement::getEnableOrNot, 1);
-                    if (respHeartbeatVo.getCameraList().get(0).getCurrentStream().equals("")) {
-                        base.last("limit 2");
-                    }
+                    base.last("limit 2");
                     List<BaseCameraManagement> list = baseCameraManagementService.list(base);
                     //根据相机ID找出分组并排序
                     if (!ObjectUtils.isEmpty(list)) {