From d803609b8a2e43afcf5921f42f29ce7f6e68fb84 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 08 十一月 2023 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java | 71 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 19 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..fd48181 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,13 +5,17 @@
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;
import com.ruoyi.device.camera.domain.CameraCmd;
-import com.ruoyi.device.hiksdk.service.IHikClientService;
+import com.ruoyi.device.camera.service.ICameraSdkService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -29,37 +33,48 @@
@Slf4j(topic = "guideQueue")
public class QueueTaskExecutor {
@Resource
- IHikClientService hikClientService;
+ IArdAlarmRadarMoveService ardAlarmRadarMoveService;
+ @Resource
+ IArdAlarmRadarFireService ardAlarmRadarFireService;
+ @Resource
+ IArdAlarmRadarPumpService ardAlarmRadarPumpService;
+ @Resource
+ ICameraSdkService cameraSdkService;
@Resource
IArdAlarmTubeService ardAlarmTubeService;
- @Resource
- IArdAlarmRadarService ardAlarmRadarService;
+
@Resource
IArdAlarmExternalService ardAlarmExternalService;
@Resource
IArdAlarmAccessService ardAlarmAccessService;
+
public void processTask(GuideTask guideTask) {
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);
cmd.setRecordBucketName("record");
- cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId());
+ if (guideTask.getRecordSn().equals(1)) {
+ cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId() + "_1");
+ } else {
+ cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId() + "_2");
+ }
+
log.debug("寮�濮嬪紩瀵�");
- boolean guideRes = hikClientService.guideTargetPosition(cmd);
+ boolean guideRes = cameraSdkService.guideTargetPosition(cmd);
if (guideRes) {
log.debug("寮曞鎴愬姛");
- hikClientService.controlLock(cmd);//涓婇攣
- hikClientService.recordStart(cmd);//寮�濮嬪綍鍍�
+ cameraSdkService.controlLock(cmd);//涓婇攣
+ cameraSdkService.recordStart(cmd);//寮�濮嬪綍鍍�
try {
Thread.sleep(30000);
} catch (InterruptedException e) {
log.info("褰撳墠浠诲姟ID" + guideTask.getAlarmId() + "绾跨▼琚粓姝�");
}
- String url = hikClientService.recordStopToMinio(cmd);//鍋滄褰曞儚杩斿洖url
+ String url = cameraSdkService.recordStopToMinio(cmd);//鍋滄褰曞儚杩斿洖url
if (StringUtils.isNotEmpty(url)) {
switch (guideTask.getAlarmType()) {
case "sys_tube_leak":
@@ -69,16 +84,34 @@
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);
+ 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);
+ }
+ ardAlarmRadarPumpService.updateArdAlarmRadarPump(ardAlarmRadarPump);
break;
case "sys_external":
ArdAlarmExternal ardAlarmExternal = new ArdAlarmExternal();
--
Gitblit v1.9.3