From 8456b0bbb9d1536ebb0b2dc476be736bdd5fb82c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 13 十月 2023 15:58:20 +0800
Subject: [PATCH] 1. 流媒体增加通过接口配置软硬件解码 2. 流媒体自动同步相机设备。
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
index b3c6f7e..ccd6313 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
@@ -7,12 +7,15 @@
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
+import com.ruoyi.device.hiksdk.service.IHikClientService;
import com.ruoyi.device.hiksdk.service.impl.HikClientServiceImpl;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.inspect.service.IArdVideoInspectTaskService;
+import com.ruoyi.media.service.IVtduService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -41,7 +44,7 @@
@Api(tags = "鐩告満绠＄悊鎺ュ彛")
public class ArdCamerasController extends BaseController {
@Resource
- private HikClientServiceImpl sdk;
+ private IHikClientService sdk;
@Resource
private IArdCamerasService ardCamerasService;
@Resource
@@ -90,11 +93,14 @@
@Log(title = "鐩告満璁惧", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArdCameras camera) {
- //娉ㄩ攢
- sdk.loginOut(camera.getId());
- //鐧诲綍
- sdk.login(camera);
- return toAjax(ardCamerasService.insertArdCameras(camera));
+ int i = ardCamerasService.insertArdCameras(camera);
+ if(i>0) {
+ //娉ㄩ攢
+ sdk.loginOut(camera.getId());
+ //寮傛鐧诲綍
+ sdk.asyncLogin(camera);
+ }
+ return toAjax(i);
}
/**
@@ -106,10 +112,11 @@
@PutMapping
public AjaxResult edit(@RequestBody ArdCameras camera) {
int i = ardCamerasService.updateArdCameras(camera);
- if (i > 0) {
+ if(i>0)
+ {
ArdCameras cameras = ardCamerasService.selectArdCamerasById(camera.getId());
sdk.loginOut(cameras.getId());
- sdk.login(cameras);
+ sdk.asyncLogin(cameras);
}
return toAjax(i);
}
@@ -122,7 +129,8 @@
@Log(title = "鐩告満璁惧", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
- for (String id : ids) {
+ for(String id :ids)
+ {
sdk.loginOut(id);
}
return toAjax(ardCamerasService.deleteArdCamerasByIds(ids));
--
Gitblit v1.9.3