From 00ff1a5f0146987b38e9584d64ff719c4ec0a623 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: Fri, 06 Oct 2023 16:10:56 +0800
Subject: [PATCH] 雷达
---
src/main/java/com/ard/utils/tcp/ClientHandler.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ard/utils/tcp/ClientHandler.java b/src/main/java/com/ard/utils/tcp/ClientHandler.java
index e4c4479..856cc9b 100644
--- a/src/main/java/com/ard/utils/tcp/ClientHandler.java
+++ b/src/main/java/com/ard/utils/tcp/ClientHandler.java
@@ -194,7 +194,7 @@
// log.info("有效负载大小(转整型):" + payloadSizeToDecimal);
//endregion
List<ArdAlarmRadar> radarAlarmInfos = new ArrayList<>();
- //抽油机新推送集合
+ //抽油机状态雷达推送集合
List<ArdAlarmRadar> well = new ArrayList<>();
String alarmTime = "";
Integer targetNum = 0;
@@ -383,8 +383,8 @@
//log.info("所属组:" + Grp);
//endregion
String alarmType;
- //新集合中运行变量
- String wellType = "运行";
+ //抽油机状态变量
+ String wellType;
byte[] cStat = Arrays.copyOfRange(data, index + 23, index + 24);
cStat = ByteUtils.toLittleEndian(cStat);
//String binaryString = String.format("%8s", Integer.toBinaryString(cStat[0] & 0xFF)).replace(' ', '0');
@@ -408,12 +408,10 @@
wellType = "停机";
} else {
wellType = "运行";
-// continue;
}
- //新的集合中装入数据
+ //抽油机状态集合中装入数据
byte[] szName = Arrays.copyOfRange(data, index + 32, index + 64);
String alarmPointName = ByteUtils.bytesToStringZh(szName);
- //log.info("报警类型:" + alarmType);
ArdAlarmRadar wellAlarm = new ArdAlarmRadar();
wellAlarm.setTargetId(id);
wellAlarm.setName(alarmPointName);
@@ -434,9 +432,9 @@
radarAlarmData.setAlarmTime(alarmTime);
radarAlarmData.setArdAlarmRadars(radarAlarmInfos);
MqttConsumer.publish(2, false, "radar", JSON.toJSONString(radarAlarmData));
- //新的MQTT队列
+ //抽油机状态MQTT队列
radarAlarmData.setArdAlarmRadars(well);
- MqttConsumer.publish(2, false, "well", JSON.toJSONString(radarAlarmData));
+ MqttConsumer.publish(2, false, "radarWellData", JSON.toJSONString(radarAlarmData));
} catch (Exception ex) {
log.error("雷达报文解析异常:" + ex.getMessage());
}
--
Gitblit v1.9.3