From 7931656b17def59e738843eebb13411051e29a39 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 26 一月 2024 15:13:43 +0800
Subject: [PATCH] 单兵端查看已通过的申请提交
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java | 53 ++++++++---------------------------------------------
1 files changed, 8 insertions(+), 45 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 1ca7cc7..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
@@ -15,7 +15,9 @@
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;
@@ -58,25 +60,6 @@
}
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("guideExecutor")
@@ -94,7 +77,7 @@
}
log.debug("鎵ц鏂颁换鍔�:銆�" + newTask.getAlarmId() + "銆�");
log.debug("鍓╀綑浠诲姟鏁�:銆�" + guideTasks.size() + "銆�");
- // 寮傛澶勭悊浠诲姟锛屽苟鑾峰彇Future
+ // 澶勭悊浠诲姟
processTask(newTask);
}
try {
@@ -104,7 +87,7 @@
}
}
}
-
+ //寮傛澶勭悊浠诲姟
public void processTask(GuideTask guideTask) {
try {
if (!IsEnableGuide(guideTask.getCameraId())) {
@@ -114,35 +97,15 @@
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(guideTask.getCameraId());
cmd.setChanNo(guideTask.getChanNo());
- cmd.setTargetPosition(guideTask.getTargetPosition());
cmd.setOperator(guideTask.getAlarmType());
cmd.setExpired(30);
cmd.setRecordBucketName("record");
- Map<String, Double> ptzMap = new HashMap<>();
- switch (guideTask.getChanNo()) {
- case 1:
- ptzMap.put("p", guideTask.getGuidePTZ().getP1());
- ptzMap.put("t", guideTask.getGuidePTZ().getT1());
- ptzMap.put("z", guideTask.getGuidePTZ().getZ1());
- break;
- case 2:
- ptzMap.put("p", guideTask.getGuidePTZ().getP2());
- ptzMap.put("t", guideTask.getGuidePTZ().getT2());
- ptzMap.put("z", guideTask.getGuidePTZ().getZ2());
- break;
- }
- cmd.setPtzMap(ptzMap);
- cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId());
+ 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);//涓婇攣
@@ -236,4 +199,4 @@
}
return enabled;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3