天网码流修改

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

@@ -582,8 +582,8 @@ public class GeoHazardMonitorTokenController {
             if (!ObjectUtils.isEmpty(heartbeatLogList)) {
                 codeList = heartbeatLogList.stream().map(TerminalHeartbeatLog::getCameraCode).collect(Collectors.toList());
                 log.info("-----codeList----->" + codeList);
-            }else {
-                 terminalHeartbeatLogService.add("111", "111");
+            } else {
+                terminalHeartbeatLogService.add("111", "111");
             }
 
             //目视距离和里程位置
@@ -1117,7 +1117,7 @@ public class GeoHazardMonitorTokenController {
                 wrapper.eq(BaseCameraManagement::getRailwayCode, cameraVo.getRailwayCode());
             }
             if (!ObjectUtils.isEmpty(cameraVo.getLineDir())) {
-                wrapper.eq(BaseCameraManagement::getLineDir, cameraVo.getLineDir());
+                wrapper.eq(BaseCameraManagement::getMonitoringDirection, cameraVo.getLineDir()).or(w2 -> w2.eq(BaseCameraManagement::getMonitoringDirection, 3));
             }
             wrapper.eq(BaseCameraManagement::getEnableOrNot, 1);
             wrapper.orderByAsc(BaseCameraManagement::getInstallMile);