From f6a88f721b58a8f97759c0c1542608ff68b0fb5c Mon Sep 17 00:00:00 2001
From: zhangjian <zhangjianrock@163.com>
Date: 星期二, 24 十月 2023 10:56:29 +0800
Subject: [PATCH] 视频巡检任务,加入通道管理
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 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 2ffda2a..afbee07 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,6 +7,8 @@
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.camera.service.ICameraSdkService;
+import com.ruoyi.device.camera.service.impl.CameraSdkServiceImpl;
import com.ruoyi.device.dhsdk.service.IDhClientService;
import com.ruoyi.device.hiksdk.service.IHikClientService;
import com.ruoyi.device.hiksdk.service.impl.HikClientServiceImpl;
@@ -49,6 +51,8 @@
private IHikClientService hikSdk;
@Resource
private IDhClientService dhSdk;
+ @Resource
+ private ICameraSdkService cameraSdkService;
@Resource
private IArdCamerasService ardCamerasService;
@Resource
@@ -99,17 +103,8 @@
public AjaxResult add(@RequestBody ArdCameras camera) {
int i = ardCamerasService.insertArdCameras(camera);
if (i > 0) {
- if (camera.getFactory().equals("1")) {
- //娉ㄩ攢
- hikSdk.logout(camera.getId());
- //寮傛鐧诲綍
- hikSdk.asyncLogin(camera);
- }
- else if(camera.getFactory().equals("2"))
- {
- dhSdk.logout(camera.getId());
- dhSdk.login(camera);
- }
+ cameraSdkService.logout(camera.getId());
+ cameraSdkService.login(camera);
}
return toAjax(i);
}
@@ -124,15 +119,8 @@
public AjaxResult edit(@RequestBody ArdCameras camera) {
int i = ardCamerasService.updateArdCameras(camera);
if (i > 0) {
- camera= ardCamerasService.selectArdCamerasById(camera.getId());
- if(camera.getFactory().equals("1")) {
- hikSdk.logout(camera.getId());
- hikSdk.asyncLogin(camera);
- }
- else if(camera.getFactory().equals("2")) {
- dhSdk.logout(camera.getId());
- dhSdk.login(camera);
- }
+ cameraSdkService.logout(camera.getId());
+ cameraSdkService.login(camera);
}
return toAjax(i);
}
@@ -146,8 +134,7 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
for (String id : ids) {
- hikSdk.logout(id);
- dhSdk.logout(id);
+ cameraSdkService.logout(id);
}
return toAjax(ardCamerasService.deleteArdCamerasByIds(ids));
}
@@ -156,12 +143,13 @@
@ApiOperation("閫夋嫨鐩告満鏁版嵁")
public List options(ArdCameras ardCameras) {
List<ArdCameras> list = ardCamerasService.findOptions(ardCameras);
+ System.out.println("list:"+list.size());
List options = new ArrayList();
for (ArdCameras item : list) {
Map option = new HashMap();
option.put("value", item.getId());
option.put("label", item.getName());
- option.put("channel", item.getChanNo());
+ option.put("channelList", item.getChannelList());
List timeList = ardVideoInspectTaskService.getCameraIdleTimeList(item.getId());
option.put("idleTimeList", timeList);//绌洪棽鏃堕棿娈�
options.add(option);
--
Gitblit v1.9.3