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 | 64 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ard/utils/tcp/ClientHandler.java b/src/main/java/com/ard/utils/tcp/ClientHandler.java
index b7ebb4d..dd35018 100644
--- a/src/main/java/com/ard/utils/tcp/ClientHandler.java
+++ b/src/main/java/com/ard/utils/tcp/ClientHandler.java
@@ -1,4 +1,5 @@
package com.ard.utils.tcp;
+
import com.alibaba.fastjson2.JSON;
import com.ard.alarm.radar.domain.ArdAlarmRadar;
import com.ard.alarm.radar.domain.ArdEquipRadar;
@@ -21,6 +22,7 @@
import java.util.List;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+
/**
* @Description: 瀹㈡埛绔鐞嗗櫒
* @ClassName: ClientHandler
@@ -143,7 +145,7 @@
byte[] heart = ByteUtils.appendArrays(header, payload, payloadCrc32, footer);
// byte[] heart = {0x01, 0x02, 0x01, 0x10, 0x00, 0x00, 0x00, (byte) 0x83, (byte) 0x88, 0x5d, 0x71, 0x01, 0x02, 0x00};
String hexString = DatatypeConverter.printHexBinary(heart);
- log.debug("鍙戦�佸績璺�:" + hexString);
+ // log.debug("鍙戦�佸績璺�:" + hexString);
message.writeBytes(heart);
context.writeAndFlush(message);
@@ -169,6 +171,7 @@
String radarName = ardEquipRadarbyte.getName();
Double radarLongitude = ardEquipRadarbyte.getLongitude();
Double radarLagitude = ardEquipRadarbyte.getLatitude();
+ Double radarAltitude = ardEquipRadarbyte.getAltitude();
//region crc鏍￠獙-鐩墠浠呯敤浜庢樉绀烘牎楠岀粨鏋�
Boolean crc32Check = MessageParsing.CRC32Check(data);
if (!crc32Check) {
@@ -191,6 +194,8 @@
// log.info("鏈夋晥璐熻浇澶у皬(杞暣鍨�):" + payloadSizeToDecimal);
//endregion
List<ArdAlarmRadar> radarAlarmInfos = new ArrayList<>();
+ //鎶芥补鏈虹姸鎬侀浄杈炬帹閫侀泦鍚�
+ List<ArdAlarmRadar> well = new ArrayList<>();
String alarmTime = "";
Integer targetNum = 0;
if (Arrays.equals(cmdId, new byte[]{0x01})) {
@@ -221,13 +226,13 @@
// log.info("鐩爣ID:" + DatatypeConverter.printHexBinary(cmdId));
dwID = ByteUtils.toLittleEndian(dwID);
int id = ByteUtils.bytesToDecimal(dwID);
-
// log.info("鐩爣ID鍙凤細" + id);
byte[] iDistance = Arrays.copyOfRange(data, index + 8, index + 12);
iDistance = ByteUtils.toLittleEndian(iDistance);
- Double Distance = ByteUtils.bytesToDouble(iDistance);
- // log.info("鐩爣褰撳墠璺濈(m):" + Distance);
+ double Distance = ByteUtils.bytesToDecimal(iDistance);
+ log.debug("鐩爣褰撳墠鐩寸嚎璺濈(m):" + Distance);
+
//region 涓嶉渶瑕佺殑瀛楁
// byte[] dwGSum = Arrays.copyOfRange(data, index + 4, index + 8);
// dwGSum = toLittleEndian(dwGSum);
@@ -298,10 +303,16 @@
byte[] afTy = Arrays.copyOfRange(data, index + 112, index + 116);
afTy = ByteUtils.toLittleEndian(afTy);
float fTy = ByteUtils.bytesToFloat(afTy);
- // log.info("鍨傜洿瑙掑害:" + fTy);
+ log.debug("鍨傜洿瑙掑害:" + fTy);
+ // 灏嗚搴﹁浆鎹负寮у害
+ double thetaRadians = Math.toRadians(fTy+90);
+ // 浣跨敤姝ｅ鸡鍑芥暟璁＄畻瀵硅竟闀垮害
+ Distance = Math.sin(thetaRadians) * Distance;
+ log.debug("鐩爣鎶曞奖璺濈(m):" + Distance);
+
Double[] radarXY = {radarLongitude, radarLagitude};
Double[] alarmXY = GisUtils.CalculateCoordinates(radarXY, Distance, (double) fTx);
- // log.info("鎶ヨ淇℃伅锛�" + "銆恑d銆�" + id + "銆恘ame銆�" + alarmPointName + "銆恆larmType銆�" + alarmType + "銆恆larmTime銆�" + alarmTime + "銆恉istance銆�" + Distance + "銆怭銆�" + fTx + "銆怲銆�" + fTy + "銆怷銆�" + alarmXY[0] + "銆怸銆�" + alarmXY[1]);
+ log.debug("鎶ヨ淇℃伅锛�" + "銆恑d銆�" + id + "銆恘ame銆�" + alarmPointName + "銆恆larmType銆�" + alarmType + "銆恆larmTime銆�" + alarmTime + "銆恉istance銆�" + Distance + "銆怭銆�" + fTx + "銆怲銆�" + fTy + "銆怷銆�" + alarmXY[0] + "銆怸銆�" + alarmXY[1]);
ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
ardAlarmRadar.setTargetId(id);
ardAlarmRadar.setName(alarmPointName);
@@ -355,16 +366,16 @@
byte[] fTx = Arrays.copyOfRange(data, index + 12, index + 16);
fTx = ByteUtils.toLittleEndian(fTx);
float fTxAngle = ByteUtils.bytesToFloat(fTx);
- //log.info("p瑙掑害:" + fTxAngle);
+ log.debug("p瑙掑害:" + fTxAngle);
byte[] fTy = Arrays.copyOfRange(data, index + 16, index + 20);
fTy = ByteUtils.toLittleEndian(fTy);
float fTyAngle = ByteUtils.bytesToFloat(fTy);
- //log.info("t瑙掑害:" + fTyAngle);
+ log.debug("t瑙掑害:" + fTyAngle);
byte[] sAreaNo = Arrays.copyOfRange(data, index + 20, index + 22);
sAreaNo = ByteUtils.toLittleEndian(sAreaNo);
int AreaNo = ByteUtils.bytesToDecimal(sAreaNo);
- //log.info("鐩爣褰掑睘鐨勫憡璀﹀尯鍩熷彿:" + AreaNo);
+ log.debug("鐩爣褰掑睘鐨勫憡璀﹀尯鍩熷彿:" + AreaNo);
byte[] cGrp = Arrays.copyOfRange(data, index + 22, index + 23);
cGrp = ByteUtils.toLittleEndian(cGrp);
@@ -372,6 +383,8 @@
//log.info("鎵�灞炵粍:" + Grp);
//endregion
String alarmType;
+ //鎶芥补鏈虹姸鎬佸彉閲�
+ 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');
@@ -382,21 +395,29 @@
// 鍒ゆ柇鎻愬彇鐨勫��
if (isB0) {
alarmType = "闆疯揪鎶芥补鏈哄仠鏈�";
+ byte[] szName = Arrays.copyOfRange(data, index + 32, index + 64);
+ //log.info("鎵�灞炲憡璀﹀尯鍩熷悕绉�:" + DatatypeConverter.printHexBinary(szName));
+ String alarmPointName = ByteUtils.bytesToStringZh(szName);
+ // log.info("鎵�灞炲憡璀﹀尯鍩熷悕绉�:" + alarmPointName);
+ log.debug("鎶ヨ淇℃伅锛�" + "銆恑d銆�" + id + "銆恘ame銆�" + alarmPointName + "銆恆larmType銆�" + alarmType + "銆恆larmTime銆�" + alarmTime);
+ ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
+ ardAlarmRadar.setTargetId(id);
+ ardAlarmRadar.setName(alarmPointName);
+ ardAlarmRadar.setAlarmType(alarmType);
+ radarAlarmInfos.add(ardAlarmRadar);
+ wellType = "鍋滄満";
} else {
- continue;
+ wellType = "杩愯";
}
- //log.info("鎶ヨ绫诲瀷:" + alarmType);
-
+ //鎶芥补鏈虹姸鎬侀泦鍚堜腑瑁呭叆鏁版嵁
byte[] szName = Arrays.copyOfRange(data, index + 32, index + 64);
- //log.info("鎵�灞炲憡璀﹀尯鍩熷悕绉�:" + DatatypeConverter.printHexBinary(szName));
String alarmPointName = ByteUtils.bytesToStringZh(szName);
- // log.info("鎵�灞炲憡璀﹀尯鍩熷悕绉�:" + alarmPointName);
- //log.info("鎶ヨ淇℃伅锛�" + "銆恑d銆�" + id + "銆恘ame銆�" + alarmPointName + "銆恆larmType銆�" + alarmType + "銆恆larmTime銆�" + alarmTime);
- ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
- ardAlarmRadar.setTargetId(id);
- ardAlarmRadar.setName(alarmPointName);
- ardAlarmRadar.setAlarmType(alarmType);
- radarAlarmInfos.add(ardAlarmRadar);
+ log.debug("鎶芥补鏈虹姸鎬佹姤璀︿俊鎭細" + "銆恑d銆�" + id + "銆恘ame銆�" + alarmPointName + "銆恆larmType銆�" + wellType + "銆恆larmTime銆�" + alarmTime);
+ ArdAlarmRadar wellAlarm = new ArdAlarmRadar();
+ wellAlarm.setTargetId(id);
+ wellAlarm.setName(alarmPointName);
+ wellAlarm.setAlarmType(wellType);
+ well.add(wellAlarm);
}
//endregion
}
@@ -412,6 +433,9 @@
radarAlarmData.setAlarmTime(alarmTime);
radarAlarmData.setArdAlarmRadars(radarAlarmInfos);
MqttConsumer.publish(2, false, "radar", JSON.toJSONString(radarAlarmData));
+ //鎶芥补鏈虹姸鎬丮QTT闃熷垪
+ radarAlarmData.setArdAlarmRadars(well);
+ MqttConsumer.publish(2, false, "radarWellData", JSON.toJSONString(radarAlarmData));
} catch (Exception ex) {
log.error("闆疯揪鎶ユ枃瑙ｆ瀽寮傚父:" + ex.getMessage());
}
--
Gitblit v1.9.3