From 540eb57d564b6ff4f73fc06f4e9101bf4c89c905 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 06 十月 2023 16:54:49 +0800
Subject: [PATCH] 抽油机状态
---
src/main/java/com/ard/utils/tcp/ClientHandler.java | 15 +++++++--------
1 files changed, 7 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..dd35018 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,11 @@
wellType = "鍋滄満";
} else {
wellType = "杩愯";
-// continue;
}
- //鏂扮殑闆嗗悎涓鍏ユ暟鎹�
+ //鎶芥补鏈虹姸鎬侀泦鍚堜腑瑁呭叆鏁版嵁
byte[] szName = Arrays.copyOfRange(data, index + 32, index + 64);
String alarmPointName = ByteUtils.bytesToStringZh(szName);
- //log.info("鎶ヨ绫诲瀷:" + alarmType);
+ log.debug("鎶芥补鏈虹姸鎬佹姤璀︿俊鎭細" + "銆恑d銆�" + id + "銆恘ame銆�" + alarmPointName + "銆恆larmType銆�" + wellType + "銆恆larmTime銆�" + alarmTime);
ArdAlarmRadar wellAlarm = new ArdAlarmRadar();
wellAlarm.setTargetId(id);
wellAlarm.setName(alarmPointName);
@@ -434,9 +433,9 @@
radarAlarmData.setAlarmTime(alarmTime);
radarAlarmData.setArdAlarmRadars(radarAlarmInfos);
MqttConsumer.publish(2, false, "radar", JSON.toJSONString(radarAlarmData));
- //鏂扮殑MQTT闃熷垪
+ //鎶芥补鏈虹姸鎬丮QTT闃熷垪
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