关闭录制修改

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -732,7 +732,7 @@ public class BaseCameraManagementController extends BaseController {
             return error("查不到该ID的相机台账数据!!!");
         }
         log.info("endRecording------------" + baseCameraManagement.getTaskId());
-        String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
+        String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getCameraCode(),baseCameraManagement.getChannel()));
         log.info("endRecording------------" + start);
         if ("success".equals(start)) {
             baseCameraManagement.setStartRecording(2);

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -179,8 +179,8 @@ public class CameraUtil {
      * @param taskId 录像接口返回的任务ID
      * @return
      */
-    public static String endRecording(String taskId) {
-        return webUrl + "/recordpro/api/stop?id=" + taskId;
+    public static String endRecording(String cameraCode,String channel) {
+        return webUrl + "/recordpro/api/stop?id=" + cameraCode+"/"+channel+"/flv";
     }
 
 
@@ -649,7 +649,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                                 lw.eq(BaseCameraManagement::getCameraCode, substring);
                                 BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
                                 log.info("closeRecording-endRecording------------" + baseCameraManagement.getTaskId());
-                                String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
+                                String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getCameraCode(),baseCameraManagement.getChannel()));
                                 log.info("closeRecording-endRecording------------" + start);
                                 if ("success".equals(start)) {
                                     baseCameraManagement.setStartRecording(2);
@@ -666,7 +666,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                             lw.eq(BaseCameraManagement::getCameraCode, substring);
                             BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
                             log.info("closeRecording-endRecording------------" + baseCameraManagement.getTaskId());
-                            String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
+                            String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getCameraCode(),baseCameraManagement.getChannel()));
                             log.info("closeRecording-endRecording------------" + start);
                             if ("success".equals(start)) {
                                 baseCameraManagement.setStartRecording(2);