相机台账 开启 关闭视频录制

business-service/src/main/java/com/ozs/entity/BaseCameraManagement.java

@@ -150,9 +150,14 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private String lineDirStr;
 
-//    /**
-//     *是否显示启用录像按钮(1显示2不显示)
-//     */
-//    @TableField(exist = false)
-//    private Integer isStartRecording;
+    /**
+     * 是否开启录像(1开启2不开启)
+     */
+    private Integer startRecording;
+
+    /**
+     * 是否显示启用录像按钮(1显示2不显示)
+     */
+    @TableField(exist = false)
+    private Integer isStartRecording;
 }

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

@@ -13,6 +13,7 @@ import com.ozs.common.utils.ChineseToPingyin;
 import com.ozs.common.utils.IdempotenceUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
+import com.ozs.common.utils.http.HttpUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.entity.*;
 import com.ozs.entity.vo.*;
@@ -687,56 +688,56 @@ public class BaseCameraManagementController extends BaseController {
         return success(cameraTree);
     }
 
-//    @ApiOperation("关闭视频录制")
-//    @GetMapping("/endRecording/{id}")
-//    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
-//    public AjaxResult endRecording(@PathVariable Long id) {
-//        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
-//        if (ObjectUtils.isEmpty(baseCameraManagement)) {
-//            return error("查不到该ID的相机台账数据!!!");
-//        }
-//        log.info("endRecording------------" + baseCameraManagement.getTaskId());
-//        String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
-//        log.info("endRecording------------" + start);
-//        if ("success".equals(start)) {
-//            baseCameraManagement.setStartRecording(2);
-//            baseCameraManagement.setTaskId("");
-//            baseCameraManagement.setUpdateBy(getUserId());
-//        } else {
-//            baseCameraManagement.setStartRecording(2);
-//            baseCameraManagement.setTaskId("");
-//            baseCameraManagement.setUpdateBy(getUserId());
-//            log.error("关闭视频录制异常日志如下:" + start);
-//        }
-//        if (baseCameraManagementService.updateById(baseCameraManagement)) {
-//            return success();
-//        }
-//        return error();
-//    }
+    @ApiOperation("关闭视频录制")
+    @GetMapping("/endRecording/{id}")
+    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    public AjaxResult endRecording(@PathVariable Long id) {
+        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
+        if (ObjectUtils.isEmpty(baseCameraManagement)) {
+            return error("查不到该ID的相机台账数据!!!");
+        }
+        log.info("endRecording------------" + baseCameraManagement.getTaskId());
+        String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
+        log.info("endRecording------------" + start);
+        if ("success".equals(start)) {
+            baseCameraManagement.setStartRecording(2);
+            baseCameraManagement.setTaskId("");
+            baseCameraManagement.setUpdateBy(getUserId());
+        } else {
+            baseCameraManagement.setStartRecording(2);
+            baseCameraManagement.setTaskId("");
+            baseCameraManagement.setUpdateBy(getUserId());
+            log.error("关闭视频录制异常日志如下:" + start);
+        }
+        if (baseCameraManagementService.updateById(baseCameraManagement)) {
+            return success();
+        }
+        return error();
+    }
 
-//    @ApiOperation("开启视频录制")
-//    @GetMapping("/startRecording/{id}")
-//    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
-//    public AjaxResult startRecording(@PathVariable Long id) {
-//        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
-//        log.info("startRecording------CameraCode------" + baseCameraManagement.getCameraCode());
-//        log.info("startRecording------Channel------" + baseCameraManagement.getChannel());
-//        String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
-//        log.info("startRecording------------" + start);
-//        if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel())) {
-//            log.info("startRecording 返回成功！！1");
-//            baseCameraManagement.setStartRecording(1);
-//            baseCameraManagement.setTaskId(start);
-//            baseCameraManagement.setUpdateBy(getUserId());
-//        } else {
-//            return success("视频录制失败:请确认流是否存在或流是否开视频启开启");
-//        }
-//        if (baseCameraManagementService.updateById(baseCameraManagement)) {
-//            return success();
-//        } else {
-//            return error("开启视频录制失败");
-//        }
-//    }
+    @ApiOperation("开启视频录制")
+    @GetMapping("/startRecording/{id}")
+    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    public AjaxResult startRecording(@PathVariable Long id) {
+        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
+        log.info("startRecording------CameraCode------" + baseCameraManagement.getCameraCode());
+        log.info("startRecording------Channel------" + baseCameraManagement.getChannel());
+        String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
+        log.info("startRecording------------" + start);
+        if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel())) {
+            log.info("startRecording 返回成功！！1");
+            baseCameraManagement.setStartRecording(1);
+            baseCameraManagement.setTaskId(start);
+            baseCameraManagement.setUpdateBy(getUserId());
+        } else {
+            return success("视频录制失败:请确认流是否存在或流是否开视频启开启");
+        }
+        if (baseCameraManagementService.updateById(baseCameraManagement)) {
+            return success();
+        } else {
+            return error("开启视频录制失败");
+        }
+    }
 
     @GetMapping(value = "/getAlarm/{cameraCode}")
     @ApiOperation("根据视频ID获取详细信息")