From 39004678a36c17fcea0674b54675a76c2d3b0528 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Fri, 19 Apr 2024 16:29:39 +0800
Subject: [PATCH] 增加雷达报警和视频巡检引导类型上报
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java | 8 ++++++++
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 2 ++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
index 0c705c4..3ffd02d 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
@@ -170,6 +170,14 @@
Map<String, String> data = new HashMap<>();
data.put("cameraId", cmd.getCameraId());
data.put("wellId", guideTask.getWellId());
+ switch (guideTask.getAlarmType())
+ {
+ case "sys_radar_move":data.put("type", "雷达移动报警");break;
+ case "sys_radar_fire":data.put("type", "红外防火报警");break;
+ case "sys_radar_pump":data.put("type", "抽油机停机报警");break;
+ default:data.put("type", "雷达报警");break;
+ }
+
message.put("70000", data);
WebSocketUtils.sendMessageAll(message);
startTime1 = currentTime; // 更新上次发送数据的时间戳
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
index 50701bc..a35011c 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
@@ -463,6 +463,7 @@
Map<String, String> data = new HashMap<>();
data.put("cameraId", cmd.getCameraId());
data.put("wellId", well.getWellId());
+ data.put("type", ardVideoInspectTask.getInspectMode()+"巡检");
message.put("70000", data);
WebSocketUtils.sendMessageAll(message);
//endregion
@@ -531,6 +532,7 @@
Map<String, String> data = new HashMap<>();
data.put("cameraId", cmd.getCameraId());
data.put("wellId", well.getWellId());
+ data.put("type", ardVideoInspectTask.getInspectMode()+"巡检");
message.put("70000", data);
WebSocketUtils.sendMessageAll(message);
//endregion
--
Gitblit v1.9.3