开启视频录制修改

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

@@ -12,6 +12,7 @@ import com.ozs.common.enums.BusinessType;
 import com.ozs.common.exception.base.BaseException;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.ChineseToPingyin;
+import com.ozs.common.utils.HttpClientUtil;
 import com.ozs.common.utils.IdempotenceUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
@@ -732,7 +733,7 @@ public class BaseCameraManagementController extends BaseController {
             return error("查不到该ID的相机台账数据!!!");
         }
         log.info("endRecording------------" + baseCameraManagement.getTaskId());
-        String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getCameraCode(),baseCameraManagement.getChannel()));
+        String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
         log.info("endRecording------------" + start);
         if ("success".equals(start)) {
             baseCameraManagement.setStartRecording(2);
@@ -754,19 +755,23 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("开启视频录制")
     @GetMapping("/startRecording/{id}")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
-    public AjaxResult startRecording(@PathVariable Long id) {
+    public AjaxResult startRecording(@PathVariable Long id) throws Exception {
         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()));
+        String start = HttpClientUtil.gets(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("开启视频录制失败:请确认流是否存在或流是否开启");
+        } else if (start.startsWith("recorder")) {
+            baseCameraManagement.setStartRecording(1);
+            baseCameraManagement.setTaskId(baseCameraManagement.getCameraCode()+"/"+baseCameraManagement.getChannel()+"/flv");
+            return error("开启视频录制失败:流已开启");
+        } else if (start.startsWith("Stream")) {
+            return error("开启视频录制失败:流不存在");
         }
         if (baseCameraManagementService.updateById(baseCameraManagement)) {
             return success();