From 5f5cf5b1b4683a56fd0c85a0d89d14a4c0268cde Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 07 七月 2023 17:08:49 +0800
Subject: [PATCH] 增加外联报警数据接收入库和引导就近光电 增加外联报警业务功能
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 ecae683..2dc815f 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,7 @@
package com.ruoyi.alarm.globalAlarm.service.impl;
+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;
@@ -10,6 +12,7 @@
import com.ruoyi.device.hiksdk.service.IHikClientService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
+
import javax.annotation.Resource;
/**
@@ -29,6 +32,8 @@
IArdAlarmTubeService ardAlarmTubeService;
@Resource
IArdAlarmRadarService ardAlarmRadarService;
+ @Resource
+ IArdAlarmExternalService ardAlarmExternalService;
public void processTask(GuideTask guideTask) {
try {
@@ -39,7 +44,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) {
@@ -49,7 +54,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)) {
@@ -72,6 +77,12 @@
}
ardAlarmRadarService.updateArdAlarmRadar(ardAlarmRadar);
break;
+ case "sys_external":
+ ArdAlarmExternal ardAlarmExternal = new ArdAlarmExternal();
+ ardAlarmExternal.setId(guideTask.getAlarmId());
+ ardAlarmExternal.setRecordUrl(url);
+ ardAlarmExternalService.updateArdAlarmExternal(ardAlarmExternal);
+ break;
}
}
}
--
Gitblit v1.9.3