From 9ab77cae08198c4c3d9d8fe7f41b0910fb54762e Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 17 七月 2023 09:10:26 +0800
Subject: [PATCH] 优化融云业务
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
index 4f4ce6a..48469a8 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
@@ -1,5 +1,9 @@
package com.ruoyi.alarm.globalAlarm.service.impl;
+import com.ruoyi.alarm.accessAlarm.domain.ArdAlarmAccess;
+import com.ruoyi.alarm.accessAlarm.service.IArdAlarmAccessService;
+import com.ruoyi.alarm.externalAlarm.domain.ArdAlarmExternal;
+import com.ruoyi.alarm.externalAlarm.service.IArdAlarmExternalService;
import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
import com.ruoyi.alarm.radarAlarm.domain.ArdAlarmRadar;
import com.ruoyi.alarm.radarAlarm.service.IArdAlarmRadarService;
@@ -22,7 +26,7 @@
*/
@Component
-@Slf4j
+@Slf4j(topic = "guideQueue")
public class QueueTaskExecutor {
@Resource
IHikClientService hikClientService;
@@ -30,7 +34,10 @@
IArdAlarmTubeService ardAlarmTubeService;
@Resource
IArdAlarmRadarService ardAlarmRadarService;
-
+ @Resource
+ IArdAlarmExternalService ardAlarmExternalService;
+ @Resource
+ IArdAlarmAccessService ardAlarmAccessService;
public void processTask(GuideTask guideTask) {
try {
CameraCmd cmd = new CameraCmd();
@@ -40,16 +47,19 @@
cmd.setOperator(guideTask.getAlarmType());
cmd.setExpired(30);
cmd.setRecordBucketName("record");
- cmd.setRecordObjectName("alarm");
+ cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId());
+ log.debug("寮�濮嬪紩瀵�");
boolean guideRes = hikClientService.guideTargetPosition(cmd);
if (guideRes) {
+ log.debug("寮曞鎴愬姛");
hikClientService.controlLock(cmd);//涓婇攣
- cmd.setEnable(true);//寮�濮嬪綍鍍�
- hikClientService.recordToMinio(cmd);//寮�濮嬪綍鍍�
- Thread.sleep(30000);
- cmd.setEnable(false);//鍋滄褰曞儚
- cmd.setUploadMinio(true);//涓婁紶minio
- String url = hikClientService.recordToMinio(cmd);//鍋滄褰曞儚杩斿洖url
+ hikClientService.recordStart(cmd);//寮�濮嬪綍鍍�
+ try {
+ Thread.sleep(30000);
+ } catch (InterruptedException e) {
+ log.info("褰撳墠浠诲姟ID" + guideTask.getAlarmId() + "绾跨▼琚粓姝�");
+ }
+ String url = hikClientService.recordStopToMinio(cmd);//鍋滄褰曞儚杩斿洖url
if (StringUtils.isNotEmpty(url)) {
switch (guideTask.getAlarmType()) {
case "sys_tube_leak":
@@ -59,6 +69,8 @@
ardAlarmTubeService.updateArdAlarmTube(ardAlarmTube);
break;
case "sys_radar_move":
+ case "sys_radar_fire":
+ case "sys_radar_pumpshutdown":
ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
ardAlarmRadar.setId(guideTask.getAlarmId());
if (guideTask.getRecordSn().equals(1)) {
@@ -68,21 +80,23 @@
}
ardAlarmRadarService.updateArdAlarmRadar(ardAlarmRadar);
break;
- case "sys_radar_fire":
- ardAlarmRadar = new ArdAlarmRadar();
- ardAlarmRadar.setId(guideTask.getAlarmId());
- if (guideTask.getRecordSn().equals(1)) {
- ardAlarmRadar.setRecordUrl1(url);
- } else {
- ardAlarmRadar.setRecordUrl2(url);
- }
- ardAlarmRadarService.updateArdAlarmRadar(ardAlarmRadar);
+ case "sys_external":
+ ArdAlarmExternal ardAlarmExternal = new ArdAlarmExternal();
+ ardAlarmExternal.setId(guideTask.getAlarmId());
+ ardAlarmExternal.setRecordUrl(url);
+ ardAlarmExternalService.updateArdAlarmExternal(ardAlarmExternal);
+ break;
+ case "sys_access_control":
+ ArdAlarmAccess ardAlarmAccess = new ArdAlarmAccess();
+ ardAlarmAccess.setId(guideTask.getAlarmId());
+ ardAlarmAccess.setRecordUrl(url);
+ ardAlarmAccessService.updateArdAlarmAccess(ardAlarmAccess);
break;
}
}
}
} catch (Exception ex) {
- log.info("鑷姩寮曞寮傚父:" + ex.getMessage());
+ log.info("绾跨▼浠诲姟寮傚父:" + ex.getMessage());
}
}
}
--
Gitblit v1.9.3