From 0306d5836a7a56614e01af35b9e70f0224b47cb2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 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 7797e6e..be359b1 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
@@ -71,6 +71,7 @@
// newThread.start();
//}
}
+
@Async("guideExecutor")
public void process(String cameraId) {
log.debug("CameraId:銆�" + cameraId + "銆戝紩瀵奸槦鍒楀鐞嗗櫒鍚姩鎴愬姛");
@@ -96,26 +97,32 @@
}
}
}
+
public void processTask(GuideTask guideTask) {
try {
- String url="";
+ String url = "";
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(guideTask.getCameraId());
- cmd.setChanNo(guideTask.getChanNum());
+ cmd.setChanNo(guideTask.getChanNo());
cmd.setTargetPosition(guideTask.getTargetPosition());
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");
+ 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());
ICameraSdkService cameraSdkService = SpringUtils.getBean(ICameraSdkService.class);
log.debug("寮�濮嬪紩瀵�");
boolean guideRes = false;
@@ -146,7 +153,6 @@
GuideTask firstTask = guideTasks.peek();
if (firstTask.getPriority() > guideTask.getPriority()) {
recordFlag = false;//褰曞儚鍋滄
- break;
}
}
}
@@ -162,33 +168,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;
--
Gitblit v1.9.3