心跳接口修改

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

@@ -1179,13 +1179,13 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                 if (null != process) {
                     map.put(code, process);
                 }
-                try {
-                    TimeUnit.SECONDS.sleep(204 * Integer.parseInt(alarmPlayTimeValue));
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                log.info("------videoCompression----->>>>:");
-                videoCompression(code);
+//                try {
+//                    TimeUnit.SECONDS.sleep(204 * Integer.parseInt(alarmPlayTimeValue));
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//                log.info("------videoCompression----->>>>:");
+//                videoCompression(code);
             }
         }
     }

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

@@ -636,6 +636,7 @@ public class GeoHazardMonitorTokenController {
                         queryWrapper2.in(MsgAlarm::getAlarmId, collect);
                     }
                     List<MsgAlarm> list = msgAlarmService.list(queryWrapper2);
+                    log.info("--------List<MsgAlarm>--------"+list);
                     //有报警信息的时候
                     LambdaQueryWrapper<BaseCameraManagement> camera = new LambdaQueryWrapper<BaseCameraManagement>();
                     if (!ObjectUtils.isEmpty(list)) {
@@ -656,13 +657,15 @@ public class GeoHazardMonitorTokenController {
                         camera.eq(BaseCameraManagement::getOnline, 2);
                         camera.eq(BaseCameraManagement::getEnableOrNot, 1);
                         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
+                        log.info("-------baseCameraManagementList123111--------"+baseCameraManagementList);
                         List<AlarmListVo> listVos = new ArrayList<>();
                         if (baseCameraManagementList.size() > 0) {
-                            String playFlv = null;
-                            playFlv = cameraUtil.heartbeatgetPlayFlv(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel(), type);
-                            if (StringUtils.isEmpty(playFlv)) {
-                                playFlv = cameraUtil.heartbeatgetUrl(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel(), type);
+                            String playFlv1 = null;
+                            playFlv1 = cameraUtil.heartbeatgetPlayFlv(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel(), type);
+                            if (StringUtils.isEmpty(playFlv1)) {
+                                playFlv1 = cameraUtil.heartbeatgetUrl(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel(), type);
                             }
+                            log.info("-------playFlv--------"+playFlv1);
 //                            //判断心跳相机日志表后两条数据是否包含该相机编码
 //                            if (!ObjectUtils.isEmpty(codeList)) {
 //                                if (!codeList.contains(baseCameraManagementList.get(0).getCameraCode())) {
@@ -711,10 +714,10 @@ public class GeoHazardMonitorTokenController {
                                 }
                             }
 
-                            respHeartbeatVo.setCurrentStream(playFlv);
+                            respHeartbeatVo.setCurrentStream(playFlv1);
                             respHeartbeatVo.setIsAlarm(1);
                             respHeartbeatVo.setCameraCode(baseCameraManagementList.get(0).getCameraCode());
-                            twoMap.put("currentStream", playFlv);
+                            twoMap.put("currentStream", playFlv1);
                             twoMap.put("cameraCode", baseCameraManagementList.get(0).getCameraCode());
                             //alarmInfo对象
                             AlarmInfoVo alarmInfoVo = new AlarmInfoVo();