From 3089fbc788d1dbd638d1cfd9c2f9b7f2011d0af0 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Fri, 30 Jun 2023 16:21:48 +0800
Subject: [PATCH] 优化sdk控制
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuideTask.java | 4 -
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java | 121 +++++++++++++++++++++-------------------
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java | 20 ++----
3 files changed, 71 insertions(+), 74 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java
index f6036a4..72bcc71 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java
@@ -40,17 +40,12 @@
public static void printPriorityQueue() {
for (String cameraId : GuidePriorityQueue.cameraQueueMap.keySet()) {
PriorityBlockingQueue<GuideTask> priorityQueue = GuidePriorityQueue.cameraQueueMap.get(cameraId);
-// for (GuideTask task : priorityQueue) {
-//
-// log.info("【alarmId】" + task.getAlarmId() + "【receiveTime】" + task.getReceiveTime()
-// + "【priority】" + task.getPriority() + "【num】" + task.getNum()
-// + "【chan】" + task.getChanNum() + "【recordSn】" + task.getRecordSn() + "【cameraId】" + task.getCameraId());
-// }
- while (priorityQueue.size() > 0) {
- GuideTask task = priorityQueue.poll();
+ PriorityQueue<GuideTask> queue= new PriorityQueue<>(priorityQueue);
+ while (queue.size() > 0) {
+ GuideTask task = queue.poll();
log.info("【alarmId】" + task.getAlarmId() + "【receiveTime】" + task.getReceiveTime()
+ "【priority】" + task.getPriority() + "【num】" + task.getNum()
- + "【chan】" + task.getChanNum() + "【recordSn】" + task.getRecordSn() + "【cameraId】" + task.getCameraId());;
+ + "【chan】" + task.getChanNum() + "【recordSn】" + task.getRecordSn() + "【cameraId】" + task.getCameraId());
}
}
}
@@ -67,14 +62,13 @@
priorityQueue.add(new obj(1, 4, 33));
priorityQueue.add(new obj(1, 4, 44));
priorityQueue.add(new obj(1, 4, 51));
-
- while (priorityQueue.size() > 0) {
- obj task = priorityQueue.poll();
+ PriorityQueue<obj> queue= new PriorityQueue<>(priorityQueue);
+ while (queue.size() > 0) {
+ obj task = queue.poll();
log.info("【num1】" + task.getNUM1() + "【num2】" + task.getNUM2() + "【num3】" + task.getNUM3());
}
log.info("=======================================================================");
}
-
}
@Data
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuideTask.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuideTask.java
index 2e6fade..d33976a 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuideTask.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuideTask.java
@@ -43,10 +43,6 @@
*/
String receiveTime;
/**
- * 接收时间的毫秒值
- */
- Integer receiveMillisecond;
- /**
* 报警次数
*/
Integer num;
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
index 39d07e9..b250206 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
@@ -696,66 +696,73 @@
* @修改人和其它信息 0-解锁 1-锁定
*/
@Override
+ @SdkOperate
public boolean controlLock(CameraCmd cmd) {
String cameraId = cmd.getCameraId();//申请锁的相机
ArdCameras ardCameras = ardCamerasMapper.selectArdCamerasById(cameraId);
- if (StringUtils.isNull(ardCameras)) {
- return false;//找不到相机拒绝操控
- }
- Integer expired = cmd.getExpired();//申请控制时长
- String operator = cmd.getOperator();//申请者
- String currentOperator = ardCameras.getOperatorId();//相机当前控制者
- Date currentExpired = ardCameras.getOperatorExpired();//相机当前过期时间
- if (currentExpired == null) {
- //设置当前操作用户ID
- ardCameras.setOperatorId(operator);
- //设置当前过期时间
- Date now = new Date();
- now.setTime(now.getTime() + expired * 1000);
- ardCameras.setOperatorExpired(now);
- ardCamerasMapper.updateArdCameras(ardCameras);
- } else {
- //如果过期时间有值
- //如果是本人直接修改
- if (currentOperator.equals(operator)) {
- //设置当前过期时间
- Date now = new Date();
- now.setTime(now.getTime() + expired * 1000);
- ardCameras.setOperatorExpired(now);
- ardCamerasMapper.updateArdCameras(ardCameras);
- } else {
- //如果非本人比较优先级
- Integer currentLevel = 0;//当前操作者的优先级
- if (CamPriority.priorityMap.containsKey(currentOperator)) {
- /*当前控制者为系统报警用户*/
- currentLevel = (Integer) CamPriority.priorityMap.get(currentOperator);
- } else {
- /*当前控制者为普通用户*/
- SysUser sysUser = sysUserMapper.selectUserById(currentOperator);
- currentLevel = sysUser.getCameraPriority();
- }
- Integer operatorLevel = 0;//获取申请者的优先级
- if (CamPriority.priorityMap.containsKey(operator)) {
- /*包含说明当前申请控制者为系统报警用户*/
- operatorLevel = (Integer) CamPriority.priorityMap.get(operator);
- } else {
- /*否则申请控制者为当前登录用户*/
- LoginUser loginUser = SecurityUtils.getLoginUser();
- SysUser user = loginUser.getUser();//获取登录用户的信息
- operatorLevel = user.getCameraPriority();
- }
- //判断优先级
- if (operatorLevel > currentLevel) {
- Date now = new Date();
- now.setTime(now.getTime() + expired * 60);
- ardCameras.setOperatorExpired(now);//设置当前过期时间
- ardCameras.setOperatorId(operator);//设置当前用户
- ardCamerasMapper.updateArdCameras(ardCameras);
- } else {
- return false;//优先级低无法上锁
- }
- }
- }
+ Date now = new Date();
+ now.setTime(now.getTime() + cmd.getExpired() * 60);
+ ardCameras.setOperatorExpired(now);//设置当前过期时间
+ ardCamerasMapper.updateArdCameras(ardCameras);
+// String cameraId = cmd.getCameraId();//申请锁的相机
+// ArdCameras ardCameras = ardCamerasMapper.selectArdCamerasById(cameraId);
+// if (StringUtils.isNull(ardCameras)) {
+// return false;//找不到相机拒绝操控
+// }
+// Integer expired = cmd.getExpired();//申请控制时长
+// String operator = cmd.getOperator();//申请者
+// String currentOperator = ardCameras.getOperatorId();//相机当前控制者
+// Date currentExpired = ardCameras.getOperatorExpired();//相机当前过期时间
+// if (currentExpired == null) {
+// //设置当前操作用户ID
+// ardCameras.setOperatorId(operator);
+// //设置当前过期时间
+// Date now = new Date();
+// now.setTime(now.getTime() + expired * 1000);
+// ardCameras.setOperatorExpired(now);
+// ardCamerasMapper.updateArdCameras(ardCameras);
+// } else {
+// //如果过期时间有值
+// //如果是本人直接修改
+// if (currentOperator.equals(operator)) {
+// //设置当前过期时间
+// Date now = new Date();
+// now.setTime(now.getTime() + expired * 1000);
+// ardCameras.setOperatorExpired(now);
+// ardCamerasMapper.updateArdCameras(ardCameras);
+// } else {
+// //如果非本人比较优先级
+// Integer currentLevel = 0;//当前操作者的优先级
+// if (CamPriority.priorityMap.containsKey(currentOperator)) {
+// /*当前控制者为系统报警用户*/
+// currentLevel = (Integer) CamPriority.priorityMap.get(currentOperator);
+// } else {
+// /*当前控制者为普通用户*/
+// SysUser sysUser = sysUserMapper.selectUserById(currentOperator);
+// currentLevel = sysUser.getCameraPriority();
+// }
+// Integer operatorLevel = 0;//获取申请者的优先级
+// if (CamPriority.priorityMap.containsKey(operator)) {
+// /*包含说明当前申请控制者为系统报警用户*/
+// operatorLevel = (Integer) CamPriority.priorityMap.get(operator);
+// } else {
+// /*否则申请控制者为当前登录用户*/
+// LoginUser loginUser = SecurityUtils.getLoginUser();
+// SysUser user = loginUser.getUser();//获取登录用户的信息
+// operatorLevel = user.getCameraPriority();
+// }
+// //判断优先级
+// if (operatorLevel > currentLevel) {
+// Date now = new Date();
+// now.setTime(now.getTime() + expired * 60);
+// ardCameras.setOperatorExpired(now);//设置当前过期时间
+// ardCameras.setOperatorId(operator);//设置当前用户
+// ardCamerasMapper.updateArdCameras(ardCameras);
+// } else {
+// return false;//优先级低无法上锁
+// }
+// }
+// }
return true;
}
/**
--
Gitblit v1.9.3