From c3ec70d2bd1ebd2421d2fa3e85c1ac43e2322ea6 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 22 七月 2024 14:44:52 +0800
Subject: [PATCH] 电子围栏加入类型提交
---
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/lib/LoginResultCallBack.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/lib/LoginResultCallBack.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/lib/LoginResultCallBack.java
index 232d665..b1ecad8 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/lib/LoginResultCallBack.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/lib/LoginResultCallBack.java
@@ -9,12 +9,11 @@
import com.ruoyi.device.channel.domain.ArdChannel;
import com.ruoyi.device.channel.service.IArdChannelService;
import com.ruoyi.utils.sdk.common.GlobalVariable;
-import com.ruoyi.utils.sdk.hiksdk.service.IHikClientService;
import com.ruoyi.media.domain.Vtdu;
import com.ruoyi.media.service.IVtduService;
+import com.ruoyi.utils.sdk.hiksdk.service.impl.HikvisionSDK;
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;
-
import java.util.Comparator;
import java.util.List;
import java.util.concurrent.PriorityBlockingQueue;
@@ -39,7 +38,7 @@
public int invoke(int lUserID, int dwResult, HCNetSDK.NET_DVR_DEVICEINFO_V30 lpDeviceinfo, Pointer pUser) {
IVtduService vtduService = SpringUtils.getBean(IVtduService.class);
IArdChannelService ardChannelService = SpringUtils.getBean(IArdChannelService.class);
- IHikClientService hikClientService = SpringUtils.getBean(IHikClientService.class);
+ HikvisionSDK hikClientService = SpringUtils.getBean(HikvisionSDK.class);
IArdCamerasService ardCamerasService = SpringUtils.getBean(IArdCamerasService.class);
if (GlobalVariable.loginMap.containsKey(camera.getId())) {
GlobalVariable.loginMap.remove(camera.getId());
@@ -49,13 +48,14 @@
if (dwResult == 1) {
GlobalVariable.loginMap.put(camera.getId(), lUserID);
log.debug(camera.getIp() + ":" + camera.getPort() + "鐧诲綍鎴愬姛");
- camera.setLoginId(lUserID);
+ camera.setLoginId((long)lUserID);
camera.setState("1");
camera.setChanNum((int) lpDeviceinfo.byChanNum);
- camera.setStartDChan((int) lpDeviceinfo.byStartDChan);
+ camera.setStartChan((int) lpDeviceinfo.byStartDChan);
//鑾峰彇鏈�鏂伴�氶亾
- List<ArdChannel> cameraChannelList = hikClientService.getCameraChannelList(camera);
+ List<ArdChannel> cameraChannelList = hikClientService.getChannels(camera);
if (cameraChannelList.size() > 0) {
+ camera.setChanNum(cameraChannelList.size());
//娣诲姞閫氶亾
for (ArdChannel channel : cameraChannelList) {
channel.setId(IdUtils.simpleUUID());
@@ -89,7 +89,7 @@
} else {
log.debug(camera.getIp() + ":" + camera.getPort() + "鐧诲綍澶辫触");
camera.setChanNum(0);
- camera.setLoginId(-1);
+ camera.setLoginId(-1l);
camera.setState("0");
}
ardCamerasService.updateArdCameras(camera);
--
Gitblit v1.9.3