From ed0fb1e88b2851234052b503c2390750044645dd Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 12 十月 2023 09:28:50 +0800
Subject: [PATCH] mq测试
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java
index e3f965c..b4b12e0 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java
@@ -5,8 +5,12 @@
import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
import com.ruoyi.alarm.external.service.IArdAlarmExternalService;
import com.ruoyi.alarm.global.domain.GuideTask;
-import com.ruoyi.alarm.radar.domain.ArdAlarmRadar;
-import com.ruoyi.alarm.radar.service.IArdAlarmRadarService;
+import com.ruoyi.alarm.radar.domain.ArdAlarmRadarFire;
+import com.ruoyi.alarm.radar.domain.ArdAlarmRadarMove;
+import com.ruoyi.alarm.radar.domain.ArdAlarmRadarPump;
+import com.ruoyi.alarm.radar.service.IArdAlarmRadarFireService;
+import com.ruoyi.alarm.radar.service.IArdAlarmRadarMoveService;
+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.utils.StringUtils;
@@ -29,11 +33,16 @@
@Slf4j(topic = "guideQueue")
public class QueueTaskExecutor {
@Resource
+ IArdAlarmRadarMoveService ardAlarmRadarMoveService;
+ @Resource
+ IArdAlarmRadarFireService ardAlarmRadarFireService;
+ @Resource
+ IArdAlarmRadarPumpService ardAlarmRadarPumpService;
+ @Resource
IHikClientService hikClientService;
@Resource
IArdAlarmTubeService ardAlarmTubeService;
- @Resource
- IArdAlarmRadarService ardAlarmRadarService;
+
@Resource
IArdAlarmExternalService ardAlarmExternalService;
@Resource
@@ -42,7 +51,7 @@
try {
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(guideTask.getCameraId());
- cmd.setChannelNum(guideTask.getChanNum());
+ cmd.setChanNo(guideTask.getChanNum());
cmd.setTargetPosition(guideTask.getTargetPosition());
cmd.setOperator(guideTask.getAlarmType());
cmd.setExpired(30);
@@ -69,16 +78,33 @@
ardAlarmTubeService.updateArdAlarmTube(ardAlarmTube);
break;
case "sys_radar_move":
- case "sys_radar_fire":
- case "sys_radar_pumpshutdown":
- ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
- ardAlarmRadar.setId(guideTask.getAlarmId());
+ ArdAlarmRadarMove ardAlarmRadarMove = new ArdAlarmRadarMove();
+ ardAlarmRadarMove.setId(guideTask.getAlarmId());
if (guideTask.getRecordSn().equals(1)) {
- ardAlarmRadar.setRecordUrl1(url);
+ ardAlarmRadarMove.setRecordUrl1(url);
} else {
- ardAlarmRadar.setRecordUrl2(url);
+ ardAlarmRadarMove.setRecordUrl2(url);
}
- ardAlarmRadarService.updateArdAlarmRadar(ardAlarmRadar);
+ 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);
+ }
+ ardAlarmRadarFireService.updateArdAlarmRadarFire(ardAlarmRadarFire);
+ case "sys_radar_pump":
+ ArdAlarmRadarPump ardAlarmRadarPump = new ArdAlarmRadarPump();
+ ardAlarmRadarPump.setId(guideTask.getAlarmId());
+ if (guideTask.getRecordSn().equals(1)) {
+ ardAlarmRadarPump.setRecordUrl1(url);
+ } else {
+ ardAlarmRadarPump.setRecordUrl2(url);
+ }
+ ardAlarmRadarPumpService.updateArdAlarmRadarPump(ardAlarmRadarPump);
break;
case "sys_external":
ArdAlarmExternal ardAlarmExternal = new ArdAlarmExternal();
--
Gitblit v1.9.3