From d70903ea176f6856636ef57dffac73feaae56bac Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 04 七月 2023 17:22:23 +0800
Subject: [PATCH] 推送ptz获取相机方式更改为从redis中获取
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java
index a4d1d6c..e258fc5 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
+import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.hiksdk.common.GlobalVariable;
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;
@@ -13,6 +14,7 @@
import javax.annotation.Resource;
import java.util.Comparator;
import java.util.PriorityQueue;
+import java.util.concurrent.PriorityBlockingQueue;
/**
* @Description: 寮傛鐧诲綍鍥炶皟
@@ -25,6 +27,7 @@
public class LoginResultCallBack implements HCNetSDK.FLoginResultCallBack {
private ArdCameras camera;
+
public LoginResultCallBack(ArdCameras camera) {
this.camera = camera;
}
@@ -41,15 +44,15 @@
camera.setChannel((int) lpDeviceinfo.byChanNum);
//鍒涘缓寮曞闃熷垪
Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator();
- PriorityQueue<GuideTask> priorityQueue=new PriorityQueue<>(comparator);
- GuidePriorityQueue.cameraQueueMap.put(camera.getId(),priorityQueue);
+ PriorityBlockingQueue<GuideTask> priorityQueue = new PriorityBlockingQueue<>(1000,comparator);
+ GuidePriorityQueue.cameraQueueMap.put(camera.getId(), priorityQueue);
} else {
log.info(camera.getIp() + ":" + camera.getPort() + "鐧诲綍澶辫触");
camera.setChannel(0);
camera.setLoginId(-1);
}
- ArdCamerasMapper ardCamerasMapper = SpringUtils.getBean(ArdCamerasMapper.class);
- ardCamerasMapper.updateArdCameras(camera);
+ IArdCamerasService ardCamerasService = SpringUtils.getBean(IArdCamerasService.class);
+ ardCamerasService.updateArdCameras(camera);
return 1;
}
}
--
Gitblit v1.9.3