From 76b4dd97417bd6e611b3889a0772c100a06d59ab Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 23 二月 2024 14:13:12 +0800
Subject: [PATCH] app
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java | 108 +++++++++++++++++++++++------------------------------
1 files changed, 47 insertions(+), 61 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
index b883dc7..9d5fe47 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
@@ -14,14 +14,20 @@
import com.ruoyi.alarm.radar.service.IArdAlarmRadarPumpService;
import com.ruoyi.alarm.tube.domain.ArdAlarmTube;
import com.ruoyi.alarm.tube.service.IArdAlarmTubeService;
+import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.ICameraSdkService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.time.Duration;
import java.time.Instant;
import java.util.HashMap;
@@ -37,6 +43,9 @@
@Slf4j(topic = "guideQueue")
@Component
public class QueueHandler {
+ @Resource
+ private RedisCache redisCache;
+
/**
* 寮曞浠诲姟鍏ラ槦
* 鍒樿嫃涔�
@@ -46,34 +55,16 @@
/*閫氳繃鐩告満ID鑾峰彇寮曞闃熷垪锛屽苟灏嗗紩瀵间换鍔″姞鍏ラ槦鍒�*/
PriorityBlockingQueue<GuideTask> guideTaskQueue = GuidePriorityQueue.cameraQueueMap.get(cameraId);
if (StringUtils.isNull(guideTaskQueue)) {
- log.info("鐩告満鏈櫥褰�,娌℃湁闃熷垪,鏃犳硶鍏ラ槦寮曞");
+ log.debug("鐩告満鏈櫥褰�,娌℃湁闃熷垪,鏃犳硶鍏ラ槦寮曞");
return;
}
log.debug("鏂颁换鍔″叆闃�:" + task.getAlarmId());
guideTaskQueue.add(task);
- /*鑾峰彇璇ョ浉鏈虹殑褰撳墠鎵ц绾跨▼-----寮冪敤*/
- //TaskThread currentTaskThread = threadMap.get(cameraId);
- ////濡傛灉闃熷垪褰撳墠绾跨▼姝ｅ湪杩愯锛岃嫢鍏ラ槦浠诲姟浼樺厛绾уぇ浜庡綋鍓嶄换鍔′紭鍏堢骇锛屽垯缁堟褰撳墠绾跨▼
- //if (currentTaskThread != null){
- // if (task.getPriority() > currentTaskThread.getCurrentTask().getPriority()) {
- // currentTaskThread.getThread().interrupt();
- // }
- // if (!currentTaskThread.getThread().isAlive()) {
- // Thread newThread = createThread(cameraId, guideTaskQueue);
- // threadMap.put(cameraId, new TaskThread(newThread, task));
- // newThread.start();
- // }
- //}
- ////濡傛灉闃熷垪褰撳墠娌℃湁绾跨▼姝ｅ湪杩愯锛屽垯鍚姩鏂扮嚎绋�
- //else {
- // Thread newThread = createThread(cameraId, guideTaskQueue);
- // threadMap.put(cameraId, new TaskThread(newThread, task));
- // newThread.start();
- //}
}
- @Async
+
+ @Async("guideExecutor")
public void process(String cameraId) {
- log.debug("CameraId:銆�" + cameraId + "銆戦槦鍒楀鐞嗗櫒鍚姩");
+ log.debug("CameraId:銆�" + cameraId + "銆戝紩瀵奸槦鍒楀鐞嗗櫒鍚姩鎴愬姛");
PriorityBlockingQueue<GuideTask> guideTasks = GuidePriorityQueue.cameraQueueMap.get(cameraId);
while (true) {
if (guideTasks.size() > 0) {
@@ -86,7 +77,7 @@
}
log.debug("鎵ц鏂颁换鍔�:銆�" + newTask.getAlarmId() + "銆�");
log.debug("鍓╀綑浠诲姟鏁�:銆�" + guideTasks.size() + "銆�");
- // 寮傛澶勭悊浠诲姟锛屽苟鑾峰彇Future
+ // 澶勭悊浠诲姟
processTask(newTask);
}
try {
@@ -96,36 +87,25 @@
}
}
}
+ //寮傛澶勭悊浠诲姟
public void processTask(GuideTask guideTask) {
try {
- String url="";
+ if (!IsEnableGuide(guideTask.getCameraId())) {
+ return;
+ }
+ String url = "";
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(guideTask.getCameraId());
- cmd.setChanNo(guideTask.getChanNum());
- cmd.setTargetPosition(guideTask.getTargetPosition());
+ cmd.setChanNo(guideTask.getChanNo());
cmd.setOperator(guideTask.getAlarmType());
cmd.setExpired(30);
cmd.setRecordBucketName("record");
- Map<String, Double> ptzMap = new HashMap<>();
- ptzMap.put("p", guideTask.getGuidePTZ().getP());
- ptzMap.put("t", guideTask.getGuidePTZ().getT());
- ptzMap.put("z", guideTask.getGuidePTZ().getZ());
- cmd.setPtzMap(ptzMap);
- if (guideTask.getRecordSn().equals(1)) {
- cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId() + "_1");
- } else {
- cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId() + "_2");
- }
+ cmd.setTargetPosition(guideTask.getTargetPosition());
+ cmd.setRecordObjectName("alarmGuide/"+ DateUtils.getDateYYYYMMDD()+"/"+guideTask.getAlarmType()+"/"+guideTask.getAlarmId());
ICameraSdkService cameraSdkService = SpringUtils.getBean(ICameraSdkService.class);
log.debug("寮�濮嬪紩瀵�");
- boolean guideRes = false;
boolean recordFlag = false;
- if (cmd.getPtzMap().get("p") != null) {
- //p鍊煎瓨鍦� 浼樺厛寮曞ptz
- guideRes = cameraSdkService.setPtz(cmd);
- } else {
- guideRes = cameraSdkService.guideTargetPosition(cmd);
- }
+ boolean guideRes = cameraSdkService.guideTargetPosition(cmd);
if (guideRes) {
log.debug("寮曞鎴愬姛");
cameraSdkService.controlLock(cmd);//涓婇攣
@@ -137,8 +117,11 @@
Instant currentTime = Instant.now();
long elapsedSeconds = Duration.between(startTime, currentTime).getSeconds();
if (elapsedSeconds >= 30) {
- recordFlag = false;
+ recordFlag = false;//杈惧埌30绉掑綍鍍忓仠姝�
url = cameraSdkService.recordStopToMinio(cmd);//鍋滄褰曞儚杩斿洖url
+ }
+ if (!IsEnableGuide(guideTask.getCameraId())) {
+ recordFlag = false;//鐩告満鍏抽棴寮曞褰曞儚鍋滄
}
//鍒ゆ柇闃熷垪涓涓�鏉℃暟鎹殑浼樺厛绾ф槸鍚﹀ぇ浜庡綋鍓嶆暟鎹殑浼樺厛绾�
PriorityBlockingQueue<GuideTask> guideTasks = GuidePriorityQueue.cameraQueueMap.get(guideTask.getCameraId());
@@ -146,7 +129,6 @@
GuideTask firstTask = guideTasks.peek();
if (firstTask.getPriority() > guideTask.getPriority()) {
recordFlag = false;//褰曞儚鍋滄
- break;
}
}
}
@@ -162,33 +144,21 @@
case "sys_radar_move":
ArdAlarmRadarMove ardAlarmRadarMove = new ArdAlarmRadarMove();
ardAlarmRadarMove.setId(guideTask.getAlarmId());
- if (guideTask.getRecordSn().equals(1)) {
- ardAlarmRadarMove.setRecordUrl1(url);
- } else {
- ardAlarmRadarMove.setRecordUrl2(url);
- }
+ ardAlarmRadarMove.setRecordUrl(url);
IArdAlarmRadarMoveService ardAlarmRadarMoveService = SpringUtils.getBean(IArdAlarmRadarMoveService.class);
ardAlarmRadarMoveService.updateArdAlarmRadarMove(ardAlarmRadarMove);
break;
case "sys_radar_fire":
ArdAlarmRadarFire ardAlarmRadarFire = new ArdAlarmRadarFire();
ardAlarmRadarFire.setId(guideTask.getAlarmId());
- if (guideTask.getRecordSn().equals(1)) {
- ardAlarmRadarFire.setRecordUrl1(url);
- } else {
- ardAlarmRadarFire.setRecordUrl2(url);
- }
+ ardAlarmRadarFire.setRecordUrl(url);
IArdAlarmRadarFireService ardAlarmRadarFireService = SpringUtils.getBean(IArdAlarmRadarFireService.class);
ardAlarmRadarFireService.updateArdAlarmRadarFire(ardAlarmRadarFire);
break;
case "sys_radar_pump":
ArdAlarmRadarPump ardAlarmRadarPump = new ArdAlarmRadarPump();
ardAlarmRadarPump.setId(guideTask.getAlarmId());
- if (guideTask.getRecordSn().equals(1)) {
- ardAlarmRadarPump.setRecordUrl1(url);
- } else {
- ardAlarmRadarPump.setRecordUrl2(url);
- }
+ ardAlarmRadarPump.setRecordUrl(url);
IArdAlarmRadarPumpService ardAlarmRadarPumpService = SpringUtils.getBean(IArdAlarmRadarPumpService.class);
ardAlarmRadarPumpService.updateArdAlarmRadarPump(ardAlarmRadarPump);
break;
@@ -213,4 +183,20 @@
log.info("绾跨▼浠诲姟寮傚父:" + ex.getMessage());
}
}
-}
\ No newline at end of file
+
+ /**
+ * 鍏夌數鏄惁寮�鍚姤璀﹀紩瀵煎姛鑳�
+ * 鍒樿嫃涔�
+ * 2023/7/7 14:03
+ */
+ private Boolean IsEnableGuide(String cameraId) {
+ boolean enabled = false;
+ ArdCameras ardCameras = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
+ if (ardCameras != null) {
+ if (ardCameras.getCamAlarmGuideEnable().equals(1)) {
+ enabled = true;
+ }
+ }
+ return enabled;
+ }
+}
--
Gitblit v1.9.3