Browse Source

关闭录像

gao.qiang 3 days ago
parent
commit
6a9d8a4e7a

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

@@ -1011,30 +1011,18 @@ public class BaseCameraManagementController extends BaseController {
         }
     }
 
-    /**
-     * 视频服务页面,报警信息列表点击查看 报警记录回放视频
-     *
-     * @param alarmId
-     * @return
-     */
-    @GetMapping("/api/getAlarmRecord")
-    @Log(title = "报警记录回放视频", businessType = BusinessType.OTHER)
-    public AjaxResult getAlarmRecord(@RequestParam("alarmId") String alarmId) {
-
-        LambdaQueryWrapper<MsgAlarm> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(MsgAlarm::getAlarmId, alarmId);
-        MsgAlarm msgAlarm = msgAlarmService.getOne(wrapper);
-        // 获取报警时间
-        Date alarmTime = msgAlarm.getAlarmTime();
-        // 获取报警前5分钟的时间
-        Date startTime = DateUtils.addMinutes(alarmTime, -5);
-        // 获取报警后5分钟的时间
-        Date endTime = DateUtils.addMinutes(alarmTime, 5);
-        String recordUrl = CameraUtil.getRecordUrl(msgAlarm.getCameraCode(), msgAlarm.getCameraCode(), startTime, endTime);
-        if (recordUrl.contains("当前相机暂无回放视频")) {
-            return AjaxResult.error(recordUrl);
+/**
+ * 关闭录像
+ */
+    @GetMapping("/closestream")
+    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    public AjaxResult closestream(@RequestParam("path") String path) {
+        String start = HttpUtils.sendGet(CameraUtil.closestream(path));
+        log.info("endRecording------------" + start);
+        if ("success".equals(start)) {
+            return AjaxResult.success("");
         } else {
-            return AjaxResult.success("ok", recordUrl);
+            return AjaxResult.success("ok");
         }
     }
 

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

@@ -547,6 +547,12 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         return "当前相机暂无回放视频";
     }
 
+
+    public static String closestream(String path) {
+        //http://10.161.12.50:9080/api/closestream?streamPath=34020000001320427017/34020000001320427017/1748835314-1748835556
+        return bakUrl + "/api/closestream?streamPath=" + path;
+    }
+
     /**
      * 调用流媒体获取流列表信息
      *