From a244194128df25b5d94cd1ee61e5e0a5e0c8ffd9 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 30 六月 2023 15:31:54 +0800
Subject: [PATCH] 增加ptz解锁接口
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuideTask.java | 16 ++
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 145 ++++++++++------------------
ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java | 10 +
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java | 25 +++++
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java | 9 +
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java | 7 +
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java | 55 +++++++++-
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java | 3
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml | 2
9 files changed, 166 insertions(+), 106 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 1ba629f..f6036a4 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
@@ -1,11 +1,12 @@
package com.ruoyi.alarm.globalAlarm.domain;
+import lombok.AllArgsConstructor;
+import lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.PriorityQueue;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
import java.util.concurrent.PriorityBlockingQueue;
/**
@@ -28,8 +29,8 @@
public static Comparator<GuideTask> getComparator() {
Comparator<GuideTask> PriorityDescCom = Comparator.comparingInt(GuideTask::getPriority).reversed();
Comparator<GuideTask> NumDescCom = Comparator.comparingInt(GuideTask::getNum).reversed();
- Comparator<GuideTask> alarmTimeAscCom = Comparator.comparing(GuideTask::getAlarmTime);
- Comparator<GuideTask> Comparator = PriorityDescCom.thenComparing(NumDescCom).thenComparing(alarmTimeAscCom);
+ Comparator<GuideTask> receiveTimeAscCom = Comparator.comparing(GuideTask::getReceiveTime);
+ Comparator<GuideTask> Comparator = PriorityDescCom.thenComparing(NumDescCom).thenComparing(receiveTimeAscCom);
return Comparator;
}
@@ -39,9 +40,47 @@
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() + " alarmTime:" + task.getAlarmTime() + " priority:" + task.getPriority() + " num:" + task.getNum() + " cameraId:" + task.getCameraId());
+// for (GuideTask task : priorityQueue) {
+//
+// log.info("銆恆larmId銆�" + task.getAlarmId() + "銆恟eceiveTime銆�" + task.getReceiveTime()
+// + "銆恜riority銆�" + task.getPriority() + "銆恘um銆�" + task.getNum()
+// + "銆恈han銆�" + task.getChanNum() + "銆恟ecordSn銆�" + task.getRecordSn() + "銆恈ameraId銆�" + task.getCameraId());
+// }
+ while (priorityQueue.size() > 0) {
+ GuideTask task = priorityQueue.poll();
+ log.info("銆恆larmId銆�" + task.getAlarmId() + "銆恟eceiveTime銆�" + task.getReceiveTime()
+ + "銆恜riority銆�" + task.getPriority() + "銆恘um銆�" + task.getNum()
+ + "銆恈han銆�" + task.getChanNum() + "銆恟ecordSn銆�" + task.getRecordSn() + "銆恈ameraId銆�" + task.getCameraId());;
}
}
}
+
+
+ public static void main(String[] args) {
+ Comparator<obj> com1 = Comparator.comparingInt(obj::getNUM1).reversed();
+ Comparator<obj> com2 = Comparator.comparingInt(obj::getNUM2).reversed();
+ Comparator<obj> com3 = Comparator.comparingInt(obj::getNUM3).reversed();
+ Comparator<obj> objComparator = com1.thenComparing(com2).thenComparing(com3);
+ PriorityQueue<obj> priorityQueue = new PriorityQueue<>(objComparator);
+ priorityQueue.add(new obj(1, 1, 65));
+ priorityQueue.add(new obj(1, 4, 21));
+ 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();
+ log.info("銆恘um1銆�" + task.getNUM1() + "銆恘um2銆�" + task.getNUM2() + "銆恘um3銆�" + task.getNUM3());
+ }
+ log.info("=======================================================================");
+ }
+
}
+
+@Data
+@AllArgsConstructor
+class obj {
+ Integer NUM1;
+ Integer NUM2;
+ Integer NUM3;
+}
\ No newline at end of file
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 25f1db5..2e6fade 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
@@ -4,6 +4,8 @@
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.util.Date;
+
/**
* @Description: 寮曞浠诲姟
* @ClassName: GuideTask
@@ -37,16 +39,24 @@
*/
Integer priority;
/**
- * 鎶ヨ鏃堕棿
+ * 鎺ユ敹鏃堕棿
*/
- String alarmTime;
+ String receiveTime;
+ /**
+ * 鎺ユ敹鏃堕棿鐨勬绉掑��
+ */
+ Integer receiveMillisecond;
/**
* 鎶ヨ娆℃暟
*/
Integer num;
/**
- * 褰曞儚瀛樺偍浣嶇疆
+ * 褰曞儚瀛樺偍浣嶇疆-杩欓噷鏈夌殑鎶ヨ闇�瑕佸紩瀵�2涓浉鏈猴紝鏁呴渶瑕佹寚瀹氬摢涓浉鏈哄綍鍍忓洖鍐欏埌鍝釜瀛楁
*/
Integer recordSn;
+ /**
+ * 寮曞鐩爣缁忕含搴�
+ */
+ double[] targetPosition;
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
index b90f567..6097259 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
@@ -48,8 +48,8 @@
/**
+ * @Description: 鍏ㄥ眬鎶ヨ涓氬姟
* @ClassName: globalAlarmServiceImpl
- * @Description:
* @Author: Administrator
* @Date: 2023骞�03鏈�10鏃� 11:03
* @Version: 1.0
@@ -332,6 +332,7 @@
ardAlarmTube.setColor(ardTubes.getColor());
ardAlarmTube.setPipeDiameter(ardTubes.getPipeDiameter());
ardAlarmTube.setTubeType(ardTubes.getType());
+ ardAlarmTube.setCreateTime(new Date());
GeoPoint geoPoint = TubeTools.CalculateCoordinates(ardTubesDetails, ardAlarmTube.getPosition());
if (StringUtils.isNotNull(geoPoint)) {
ardAlarmTube.setLongitude(geoPoint.getLongitude());
@@ -342,9 +343,10 @@
int aat = ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
if (aat > 0) {
log.debug("tube鍏ュ簱鎴愬姛锛�" + ardAlarmTube);
- String nearbyCamera = getNearbyCamera(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude()});
- if (StringUtils.isNotEmpty(nearbyCamera)) {
- messagesEnqueued(nearbyCamera, ardAlarmTube.getId(), "sys_tube_leak", ardAlarmTube.getAlarmTime(), 1,1);
+ double[] coordinate=new double[]{ardAlarmTube.getLongitude(),ardAlarmTube.getLatitude()};
+ String nearbyCameraId = getNearbyCamera(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude()});
+ if (StringUtils.isNotEmpty(nearbyCameraId)) {
+ messagesEnqueued(nearbyCameraId, ardAlarmTube.getId(), "sys_tube_leak",ardAlarmTube.getCreateTime(), 1,1,coordinate);
}
}
//endregion
@@ -366,11 +368,12 @@
List<ArdAlarmRadar> ardAlarmRadars = radarAlarmData.getArdAlarmRadars();
for (ArdAlarmRadar ardAlarmRadar : ardAlarmRadars) {
String uuid = IdUtils.simpleUUID();
- ardAlarmRadar.setId(uuid);
- ardAlarmRadar.setAlarmTime(radarAlarmData.getAlarmTime());
- String name = ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")";
- ardAlarmRadar.setName(name);
- ardAlarmRadar.setCreateTime(new Date());
+ ardAlarmRadar.setId(uuid);//鎶ヨID
+ ardAlarmRadar.setAlarmTime(radarAlarmData.getAlarmTime());//鎶ヨ鏃堕棿
+ String alarmpointName = ardAlarmRadar.getName();//鍏磋叮鐐瑰悕绉�
+ ardAlarmRadar.setName(ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")");//鎶ヨ鐐瑰悕绉�
+ ardAlarmRadar.setCreateTime(new Date());//鎺ユ敹鏃堕棿
+ double[] coordinate=new double[]{ardAlarmRadar.getLongitude(),ardAlarmRadar.getLatitude()};//鎶ヨ鍧愭爣
String alarmType = "";
switch (ardAlarmRadar.getAlarmType()) {
case "杩愬姩鐩爣妫�娴�":
@@ -389,8 +392,19 @@
//鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarAlarmData.getRadarId());
if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
- //鍏ラ槦鍒楀緟寮曞
- messagesEnqueued(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getAlarmTime(), 1,1);
+ log.info("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:"+cameraIdWithTower);
+ //濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
+ messagesEnqueued(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getCreateTime(),1,1,coordinate);
+ }
+ //鑾峰彇鎶ヨ鐐瑰叧鑱旂殑澶у厜鐢�
+ ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
+ if(StringUtils.isNotNull(ardAlarmpointsWell) && StringUtils.isNotEmpty(ardAlarmpointsWell.getCameraId()))
+ {
+
+ String cameraId = ardAlarmpointsWell.getCameraId();
+ log.info("鑾峰彇鍒版姤璀︾偣鍏宠仈鐨勫厜鐢�:"+cameraId);
+ //濡傛灉鎶ヨ鐐瑰叧鑱斾簡鍏夌數
+ messagesEnqueued(cameraId, uuid, alarmType,ardAlarmRadar.getCreateTime(), 1,2,coordinate);
}
} else {
//5鍒嗛挓鍐呮湁寮曞
@@ -404,16 +418,18 @@
//鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarAlarmData.getRadarId());
if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
+ log.info("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:"+cameraIdWithTower);
//濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
- messagesEnqueued(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getAlarmTime(), count,1);
+ messagesEnqueued(cameraIdWithTower, uuid, alarmType,ardAlarmRadar.getCreateTime(), count,1,coordinate);
}
//鑾峰彇鎶ヨ鐐瑰叧鑱旂殑澶у厜鐢�
- ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(ardAlarmRadar.getName());
+ ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
if(StringUtils.isNotNull(ardAlarmpointsWell) && StringUtils.isNotEmpty(ardAlarmpointsWell.getCameraId()))
{
String cameraId = ardAlarmpointsWell.getCameraId();
+ log.info("鑾峰彇鍒版姤璀︾偣鍏宠仈鐨勫厜鐢�:"+cameraId);
//濡傛灉鎶ヨ鐐瑰叧鑱斾簡鍏夌數
- messagesEnqueued(cameraId, uuid, alarmType, ardAlarmRadar.getAlarmTime(), count,1);
+ messagesEnqueued(cameraId, uuid, alarmType,ardAlarmRadar.getCreateTime(), count,2,coordinate);
}
} else {
//鏈紩瀵兼湭瓒呰繃3娆★紝鐩存帴鍏ュ簱
@@ -430,39 +446,46 @@
}
}
-
/**
* 娑堟伅鍏ラ槦
+ *
+ * cameraId 鐩告満ID
+ * alarmId 鎶ヨID
+ * alarmType 鎶ヨ绫诲瀷
+ * num 鎶ヨ娆℃暟
+ * recordSn 褰曞儚瀛樺偍浣嶇疆 1-recordUrl1 2-recordUrl2
+ * targetPosition 鎶ヨ鐐逛綅缃潗鏍�
*/
- private void messagesEnqueued(String cameraId, String alarmId, String alarmType, Date alarmTime, Integer num, Integer recordSn) {
-
+ private void messagesEnqueued(String cameraId, String alarmId, String alarmType,Date receiveTime, Integer num, Integer recordSn,double[] targetPosition) {
+ SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
GuideTask guideTask = new GuideTask();
- /*閰嶇疆鐩告満ID*/
+ //鐩告満ID
guideTask.setCameraId(cameraId);
- /*鏍规嵁閰嶇疆鏃堕棿閰嶇疆閫氶亾*/
+ //鎶ヨ绫诲瀷
+ guideTask.setAlarmType(alarmType);
+ //閫氶亾(閫氳繃鏃ュ鏃堕棿鐮斿垽)
String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
Integer channel = ArdTool.getChannelBydayNightTime(dayNightTime);
guideTask.setChanNum(channel);
- /*閰嶇疆鎶ヨID*/
+ //鎶ヨID
guideTask.setAlarmId(alarmId);
- /*閰嶇疆鎶ヨ鏃堕棿*/
- SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- guideTask.setAlarmTime(fmt.format(alarmTime));
- /*閰嶇疆鎶ヨ浼樺厛绾�*/
+ //鎺ユ敹鏃堕棿
+ guideTask.setReceiveTime(fmt.format(receiveTime));
+ //鎶ヨ浼樺厛绾�(閫氳繃浼樺厛绾у瓧鍏�)
Integer priority = CamPriority.priorityMap.get(alarmType);
guideTask.setPriority(priority);
- /*閰嶇疆鎶ヨ娆℃暟*/
+ //鎶ヨ娆℃暟
guideTask.setNum(num);
- /*閰嶇疆褰曞儚瀛樺偍浣嶇疆*/
+ //褰曞儚瀛樺偍浣嶇疆
guideTask.setRecordSn(recordSn);
- /*娑堟伅鍏ラ槦*/
+ //鐩爣缁忕含搴�
+ guideTask.setTargetPosition(targetPosition);
+ //娑堟伅鍏ラ槦
queueManager.addTaskToQueue(cameraId, guideTask);
-// PriorityBlockingQueue<GuideTask> priorityBlockingQueue = GuidePriorityQueue.cameraQueueMap.get(guideTask.getCameraId());
-// priorityBlockingQueue.add(guideTask);
}
/**
- * 鏌ユ壘闄勮繎寮�鍚姤璀﹀紩瀵煎姛鑳藉厜鐢�
+ * 鑾峰彇闄勮繎寮�鍚姤璀﹀紩瀵煎姛鑳藉厜鐢�
*/
private String getNearbyCamera(double[] targetPosition) {
String minDistanceCameraId = "";
@@ -493,68 +516,6 @@
}
}
return minDistanceCameraId;
- }
-
- /**
- * @鎻忚堪 寮曞鏈�杩戠殑澶у厜鐢垫寚鍚戠洰鏍�
- * @鍙傛暟 [cmd]
- * @杩斿洖鍊� boolean
- * @鍒涘缓浜� 鍒樿嫃涔�
- * @鍒涘缓鏃堕棿 2023/6/28 16:34
- * @淇敼浜哄拰鍏跺畠淇℃伅
- */
- private boolean guideCamera(CameraCmd cmd) {
- try {
- String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
- String nearbyCamera = getNearbyCamera(cmd.getTargetPosition());
- if (StringUtils.isNotEmpty(nearbyCamera)) {
- //寮曞鍏夌數
- cmd.setCameraId(nearbyCamera);
- cmd.setChannelNum(ArdTool.getChannelBydayNightTime(dayNightTime));
- boolean guideRes = hikClientService.guideTargetPosition(cmd);
- return guideRes;
- } else {
- log.debug("鏈煡鎵惧埌鏈�杩戝厜鐢�");
- return false;
- }
- } catch (
- Exception ex) {
- log.error("寮曞寮傚父:" + ex.getMessage());
- return false;
- }
-
- }
-
- /**
- * @鎻忚堪 鎶ヨ褰曞儚
- * @鍙傛暟 [cmd]
- * @杩斿洖鍊� java.lang.String
- * @鍒涘缓浜� 鍒樿嫃涔�
- * @鍒涘缓鏃堕棿 2023/6/28 16:33
- * @淇敼浜哄拰鍏跺畠淇℃伅
- */
- private String alarmToRecord(CameraCmd cmd) {
- String url = "";
- try {
- log.debug("寮曞鎴愬姛锛屽皾璇曞綍鍍�");
- String cameraId = cmd.getCameraId();
- hikClientService.controlLock(cmd);//涓婇攣
- cmd.setEnable(true);//寮�濮嬪綍鍍�
- hikClientService.recordToMinio(cmd);//寮�濮嬪綍鍍�
- GlobalVariable.threadMap.put(cameraId, Thread.currentThread().getName());//灏嗙浉鏈篿d涓庡綋鍓嶅鐞嗙嚎绋嬪悕绉扮粦瀹�
- Thread.sleep(cmd.getExpired() * 1000);//褰曞儚鏃堕暱
- String thread = GlobalVariable.threadMap.get(cameraId);
- String currentThread = Thread.currentThread().getName();
- //鍒ゆ柇鐩告満缁戝畾绾跨▼鏄惁鏄綋鍓嶇嚎绋嬶紝濡傛灉鏄紝鍋滄褰曞儚锛屽鏋滀笉鏄紝璇存槑鐩告満琚叾浠栫嚎绋嬫姠鍗狅紝涓嶅仠姝㈠綍鍍�
- if (thread.equals(currentThread)) {
- cmd.setEnable(false);//鍋滄褰曞儚
- cmd.setUploadMinio(true);//涓婁紶minio
- url = hikClientService.recordToMinio(cmd);//鍋滄褰曞儚杩斿洖url
- }
- } catch (Exception ex) {
- log.error("褰曞儚寮傚父:" + ex.getMessage());
- }
- return url;
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java
index f9b3861..aef3545 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java
@@ -2,6 +2,8 @@
import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
+import com.ruoyi.common.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
import org.apache.tomcat.util.threads.TaskThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -10,6 +12,8 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.PriorityBlockingQueue;
+
+import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
/**
* @ClassName QueueManager
@@ -20,6 +24,7 @@
*/
@Component
+@Slf4j
public class QueueManager {
@Autowired
@@ -57,6 +62,10 @@
public void addTaskToQueue(String cameraId, GuideTask task) {
/*閫氳繃鐩告満ID鑾峰彇寮曞闃熷垪锛屽苟灏嗗紩瀵间换鍔″姞鍏ラ槦鍒�*/
PriorityBlockingQueue<GuideTask> guideTaskQueue = GuidePriorityQueue.cameraQueueMap.get(cameraId);
+ if(StringUtils.isNull(guideTaskQueue))
+ {
+ log.info("鐩告満鏈垵濮嬪寲鎴愬姛锛屾病鏈夐槦鍒�");
+ }
guideTaskQueue.add(task);
/*鑾峰彇璇ョ浉鏈虹殑褰撳墠鎵ц绾跨▼*/
TaskThread currentTaskThread = threadMap.get(cameraId);
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
index 3f43366..4f4ce6a 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
@@ -35,7 +35,12 @@
try {
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(guideTask.getCameraId());
- cmd.setChannelNum(guideTask.getNum());
+ cmd.setChannelNum(guideTask.getChanNum());
+ cmd.setTargetPosition(guideTask.getTargetPosition());
+ cmd.setOperator(guideTask.getAlarmType());
+ cmd.setExpired(30);
+ cmd.setRecordBucketName("record");
+ cmd.setRecordObjectName("alarm");
boolean guideRes = hikClientService.guideTargetPosition(cmd);
if (guideRes) {
hikClientService.controlLock(cmd);//涓婇攣
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java
index 22e153f..aedce0f 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java
@@ -192,7 +192,15 @@
cmd.setOperator(SecurityUtils.getUserId());
return toAjax(sdk.controlLock(cmd));
}
-
+ @ApiOperation("璁剧疆瑙ｉ攣")
+ @PostMapping("/setPTZUnLock")
+ @ApiOperationSupport(includeParameters = {"cmd.cameraId"})
+ @Log(title = "璁剧疆瑙ｉ攣", businessType = BusinessType.CONTROL)
+ public @ResponseBody
+ AjaxResult setPTZUnLock(@RequestBody CameraCmd cmd) {
+ cmd.setOperator(SecurityUtils.getUserId());
+ return AjaxResult.success(sdk.controlUnLock(cmd));
+ }
@ApiOperation("鑾峰彇浜戝彴閿佸畾淇℃伅")
@PostMapping("/getPTZLockInfo")
@ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum"})
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java
index 59ddfb1..6ef6268 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java
@@ -64,7 +64,8 @@
//閰嶇疆閿佸畾
boolean controlLock(CameraCmd cmd);
-
+ //閰嶇疆瑙ｉ攣
+ boolean controlUnLock(CameraCmd cmd);
//鑾峰彇浜戝彴閿佸畾淇℃伅
int getPTZLockInfo(CameraCmd cmd);
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 9a5e8ed..39d07e9 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
@@ -758,6 +758,31 @@
}
return true;
}
+ /**
+ * @鎻忚堪 鎿嶆帶瑙ｉ攣
+ * @鍙傛暟 [userId, channelNum]
+ * @杩斿洖鍊� boolean
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/6/30 15:36
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
+ @Override
+ public boolean controlUnLock(CameraCmd cmd) {
+ String cameraId = cmd.getCameraId();//鐢宠瑙ｉ攣鐨勭浉鏈�
+ String operator = cmd.getOperator();//鐢宠鑰�
+ ArdCameras ardCameras = ardCamerasMapper.selectArdCamerasById(cameraId);
+ if(ardCameras.getOperatorId().equals(operator))
+ {
+ //濡傛灉瑙ｉ攣鐩告満鐨勫綋鍓嶇敤鎴锋槸鐢宠鑰咃紝鍒欐竻绌鸿鐩告満鐨勮繃鏈熸椂闂�
+ ardCameras.setOperatorExpired(null);
+ int i = ardCamerasMapper.updateArdCameras(ardCameras);
+ if(i>0)
+ {
+ log.debug(cameraId+"--瑙ｉ攣鎴愬姛");
+ }
+ }
+ return true;
+ }
/**
* @鎻忚堪 鑾峰彇ptz閿佸畾淇℃伅
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
index 3068afe..09d5dff 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
@@ -96,6 +96,8 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
+ <if test="recordUrl1 != null">record_url1 = #{recordUrl1},</if>
+ <if test="recordUrl2 != null">record_url2 = #{recordUrl2},</if>
<if test="guideFlag != null">guide_flag = #{guideFlag},</if>
</trim>
where id = #{id}
--
Gitblit v1.9.3