From c8be57b6de00472cc5f6c4f9a8b15c9af7740fe8 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 03 七月 2023 16:33:11 +0800
Subject: [PATCH] 增加雷达1007抽油机停机报警
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java | 23 +++++------------------
1 files changed, 5 insertions(+), 18 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 659afcc..ecae683 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,5 @@
package com.ruoyi.alarm.globalAlarm.service.impl;
-import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
import com.ruoyi.alarm.radarAlarm.domain.ArdAlarmRadar;
import com.ruoyi.alarm.radarAlarm.service.IArdAlarmRadarService;
@@ -11,7 +10,6 @@
import com.ruoyi.device.hiksdk.service.IHikClientService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
-
import javax.annotation.Resource;
/**
@@ -41,22 +39,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);//寮�濮嬪綍鍍�
+ hikClientService.recordStart(cmd);//寮�濮嬪綍鍍�
try {
Thread.sleep(30000);
} catch (InterruptedException e) {
log.info("褰撳墠浠诲姟ID"+guideTask.getAlarmId()+"绾跨▼琚粓姝�");
}
- cmd.setEnable(false);//鍋滄褰曞儚
- cmd.setUploadMinio(true);//涓婁紶minio
- String url = hikClientService.recordToMinio(cmd);//鍋滄褰曞儚杩斿洖url
+ String url = hikClientService.recordStopToMinio(cmd);//鍋滄褰曞儚杩斿洖url
if (StringUtils.isNotEmpty(url)) {
switch (guideTask.getAlarmType()) {
case "sys_tube_leak":
@@ -66,17 +61,9 @@
ardAlarmTubeService.updateArdAlarmTube(ardAlarmTube);
break;
case "sys_radar_move":
- ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
- ardAlarmRadar.setId(guideTask.getAlarmId());
- if (guideTask.getRecordSn().equals(1)) {
- ardAlarmRadar.setRecordUrl1(url);
- } else {
- ardAlarmRadar.setRecordUrl2(url);
- }
- ardAlarmRadarService.updateArdAlarmRadar(ardAlarmRadar);
- break;
case "sys_radar_fire":
- ardAlarmRadar = new ArdAlarmRadar();
+ case "sys_radar_pumpshutdown":
+ ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
ardAlarmRadar.setId(guideTask.getAlarmId());
if (guideTask.getRecordSn().equals(1)) {
ardAlarmRadar.setRecordUrl1(url);
--
Gitblit v1.9.3