|
@@ -905,24 +905,26 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
@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("开启视频录制失败");
|
|
|
- }
|
|
|
+ String cameraPreviewURL = GetCameraPreviewURL.getCameraPreviewURL();
|
|
|
+ return AjaxResult.success(cameraPreviewURL);
|
|
|
+// 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}")
|