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 | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 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 c3ff35d..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,6 +1,9 @@
package com.ruoyi.alarm.globalAlarm.service.impl;
-import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
+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;
@@ -31,7 +34,10 @@
IArdAlarmTubeService ardAlarmTubeService;
@Resource
IArdAlarmRadarService ardAlarmRadarService;
-
+ @Resource
+ IArdAlarmExternalService ardAlarmExternalService;
+ @Resource
+ IArdAlarmAccessService ardAlarmAccessService;
public void processTask(GuideTask guideTask) {
try {
CameraCmd cmd = new CameraCmd();
@@ -41,7 +47,7 @@
cmd.setOperator(guideTask.getAlarmType());
cmd.setExpired(30);
cmd.setRecordBucketName("record");
- cmd.setRecordObjectName("alarm_"+guideTask.getAlarmId());
+ cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId());
log.debug("寮�濮嬪紩瀵�");
boolean guideRes = hikClientService.guideTargetPosition(cmd);
if (guideRes) {
@@ -51,7 +57,7 @@
try {
Thread.sleep(30000);
} catch (InterruptedException e) {
- log.info("褰撳墠浠诲姟ID"+guideTask.getAlarmId()+"绾跨▼琚粓姝�");
+ log.info("褰撳墠浠诲姟ID" + guideTask.getAlarmId() + "绾跨▼琚粓姝�");
}
String url = hikClientService.recordStopToMinio(cmd);//鍋滄褰曞儚杩斿洖url
if (StringUtils.isNotEmpty(url)) {
@@ -63,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)) {
@@ -72,15 +80,17 @@
}
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;
}
}
--
Gitblit v1.9.3