Browse Source

定时任务开发

gao.qiang 1 year ago
parent
commit
eab4ecb871

+ 5 - 1
business-service/src/main/java/com/ozs/utils/CameraUtil.java

@@ -1234,10 +1234,14 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                 if (subValue.equals("1") && pathValue.contains("h264_720")) {
                 if (subValue.equals("1") && pathValue.contains("h264_720")) {
                     if (!ObjectUtils.isEmpty(heartbeat)) {
                     if (!ObjectUtils.isEmpty(heartbeat)) {
                         if (!heartbeat.contains(pathValue)) {
                         if (!heartbeat.contains(pathValue)) {
-                            log.info("执行stopStream------------------>");
+                            log.info("执行stopStream---111--------------->");
                             String[] parts = pathValue.split("/");
                             String[] parts = pathValue.split("/");
                             stopStream(parts[0], parts[1]);
                             stopStream(parts[0], parts[1]);
                         }
                         }
+                    }else {
+                        log.info("执行stopStream--------2222---------->");
+                        String[] parts = pathValue.split("/");
+                        stopStream(parts[0], parts[1]);   
                     }
                     }
                 }
                 }
             }
             }

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

@@ -1745,7 +1745,6 @@ public class GeoHazardMonitorTokenController {
                         camera.orderByDesc(BaseCameraManagement::getInstallMile);
                         camera.orderByDesc(BaseCameraManagement::getInstallMile);
                         camera.eq(BaseCameraManagement::getEnableOrNot, 1);
                         camera.eq(BaseCameraManagement::getEnableOrNot, 1);
                     }
                     }
-                    camera.eq(BaseCameraManagement::getOnline, 2);
                     List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
                     List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
                     if (baseCameraManagementList.size() > 0) {
                     if (baseCameraManagementList.size() > 0) {
                         BaseCameraManagement baseCameraManagement = baseCameraManagementList.get(0);
                         BaseCameraManagement baseCameraManagement = baseCameraManagementList.get(0);