From 2574db703fa175765394dba9d4e0d623a1bcd16a Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 29 十一月 2023 17:19:57 +0800
Subject: [PATCH] 修复bug
---
src/main/java/com/ard/utils/tcp/ClientHandler.java | 62 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ard/utils/tcp/ClientHandler.java b/src/main/java/com/ard/utils/tcp/ClientHandler.java
index 0063611..7065348 100644
--- a/src/main/java/com/ard/utils/tcp/ClientHandler.java
+++ b/src/main/java/com/ard/utils/tcp/ClientHandler.java
@@ -21,6 +21,8 @@
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+import static com.ard.utils.other.ByteUtils.toLittleEndian;
+
/**
* @Description: 瀹㈡埛绔鐞嗗櫒
* @ClassName: ClientHandler
@@ -187,27 +189,29 @@
byte[] cmdId = Arrays.copyOfRange(data, 1, 2);//鍛戒护ID
// log.info("鍛戒护ID:" + DatatypeConverter.printHexBinary(cmdId));
byte[] payloadSize = Arrays.copyOfRange(data, 2, 4);//鏈夋晥璐熻浇澶у皬
- payloadSize = ByteUtils.toLittleEndian(payloadSize);
+ payloadSize = toLittleEndian(payloadSize);
//log.info("payloadSize:" + DatatypeConverter.printHexBinary(payloadSize));
int payloadSizeToDecimal = ByteUtils.bytesToDecimal(payloadSize);
// log.info("鏈夋晥璐熻浇澶у皬(杞暣鍨�):" + payloadSizeToDecimal);
//endregion
List<ArdAlarmRadar> radarAlarmInfos = new ArrayList<>();
+ List<ArdAlarmRadar> radarFollowInfos = new ArrayList<>();
//鎶芥补鏈虹姸鎬侀浄杈炬帹閫侀泦鍚�
List<ArdAlarmRadar> well = new ArrayList<>();
String alarmTime = "";
Integer targetNum = 0;
+ //闆疯揪绉诲姩闃茬伀鎶ヨ
if (Arrays.equals(cmdId, new byte[]{0x01})) {
//region 鍛婅淇℃伅鍙嶉
byte[] dwTim = Arrays.copyOfRange(data, 4, 8);
- dwTim = ByteUtils.toLittleEndian(dwTim);
+ dwTim = toLittleEndian(dwTim);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
long l = ByteUtils.bytesToDecimal(dwTim);
alarmTime = sdf.format(l * 1000);
// log.info("鍛ㄨ鍥惧儚鐨勫嚭鐜版椂闂�(杞琩ate):" + alarmTime);
byte[] wTargetNum = Arrays.copyOfRange(data, 8, 10);
- wTargetNum = ByteUtils.toLittleEndian(wTargetNum);
+ wTargetNum = toLittleEndian(wTargetNum);
targetNum = ByteUtils.bytesToDecimal(wTargetNum);
if (targetNum == 0) {
return;
@@ -223,12 +227,12 @@
Integer index = 68 + uintSize * i;
byte[] dwID = Arrays.copyOfRange(data, index, index + 4);
// log.info("鐩爣ID:" + DatatypeConverter.printHexBinary(cmdId));
- dwID = ByteUtils.toLittleEndian(dwID);
+ dwID = toLittleEndian(dwID);
int id = ByteUtils.bytesToDecimal(dwID);
// log.info("鐩爣ID鍙凤細" + id);
byte[] iDistance = Arrays.copyOfRange(data, index + 8, index + 12);
- iDistance = ByteUtils.toLittleEndian(iDistance);
+ iDistance = toLittleEndian(iDistance);
double Distance = ByteUtils.bytesToDecimal(iDistance);
log.debug("鐩爣褰撳墠鐩寸嚎璺濈(m):" + Distance);
@@ -279,9 +283,7 @@
//endregion
String alarmType = "";
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');
- // log.info("鐩爣褰撳墠鐘舵��:" + binaryString);
+ cStat = toLittleEndian(cStat);
// 鎻愬彇绗�4浣嶈嚦绗�6浣嶇殑鍊�
int extractedValue = (cStat[0] >> 4) & 0b00001111;
// 鍒ゆ柇鎻愬彇鐨勫��
@@ -291,16 +293,15 @@
alarmType = "鐑簮妫�娴�";
}
// log.info("鎶ヨ绫诲瀷:" + alarmType);
-
byte[] szName = Arrays.copyOfRange(data, index + 64, index + 96);
String alarmPointName = ByteUtils.bytesToStringZh(szName);
// log.info("鎵�灞炲憡璀﹀尯鍩熷悕绉�:" + alarmPointName);
byte[] afTx = Arrays.copyOfRange(data, index + 96, index + 100);
- afTx = ByteUtils.toLittleEndian(afTx);
+ afTx = toLittleEndian(afTx);
float fTx = ByteUtils.bytesToFloat(afTx);
// log.info("姘村钩瑙掑害:" + fTx);
byte[] afTy = Arrays.copyOfRange(data, index + 112, index + 116);
- afTy = ByteUtils.toLittleEndian(afTy);
+ afTy = toLittleEndian(afTy);
float fTy = ByteUtils.bytesToFloat(afTy);
log.debug("鍨傜洿瑙掑害:" + fTy);
// 灏嗚搴﹁浆鎹负寮у害
@@ -319,6 +320,12 @@
ardAlarmRadar.setLatitude(alarmXY[1]);
ardAlarmRadar.setAlarmType(alarmType);
radarAlarmInfos.add(ardAlarmRadar);
+ int bit1 = (cStat[0]>>1) & 0x1;;
+ //鐩爣鐨凚1=1 閿佸畾
+ if(bit1==1) {
+ //灏嗛攣瀹氱洰鏍囨斁鍏ラ攣瀹歭ist
+ radarFollowInfos.add(ardAlarmRadar);
+ }
}
//endregion
if (StringUtils.isEmpty(alarmTime)) {
@@ -333,24 +340,30 @@
radarAlarmData.setAlarmTime(alarmTime);
radarAlarmData.setArdAlarmRadars(radarAlarmInfos);
MqttProducer.publish(2, false, "radar", JSON.toJSONString(radarAlarmData));
+ if(radarFollowInfos.size()>0) {
+ radarAlarmData.setArdFollowRadars(radarFollowInfos);
+ MqttProducer.publish(2, false, "radarFollowGuide", JSON.toJSONString(radarAlarmData));
+ }
//鎶芥补鏈虹姸鎬丮QTT闃熷垪
radarAlarmData.setArdAlarmRadars(well);
MqttProducer.publish(2, false, "radarWellData", JSON.toJSONString(radarAlarmData));
+
}
+ //鎶芥补鏈篈I鐘舵�佸弽棣�
if (Arrays.equals(cmdId, new byte[]{0x04})) {
//region鎶芥补鏈篈I鐘舵�佸弽棣�
String hexString = DatatypeConverter.printHexBinary(data);
//log.info(hexString);
byte[] dwTim = Arrays.copyOfRange(data, 4, 8);
- dwTim = ByteUtils.toLittleEndian(dwTim);
+ dwTim = toLittleEndian(dwTim);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
long l = ByteUtils.bytesToDecimal(dwTim);
alarmTime = sdf.format(l * 1000);
//log.info("鍛ㄨ鍥惧儚鐨勫嚭鐜版椂闂�(杞琩ate):" + alarmTime);
byte[] wTargetNum = Arrays.copyOfRange(data, 8, 10);
- wTargetNum = ByteUtils.toLittleEndian(wTargetNum);
+ wTargetNum = toLittleEndian(wTargetNum);
targetNum = ByteUtils.bytesToDecimal(wTargetNum);
log.debug("鐩爣鎬荤偣鏁�(杞暣鍨�):" + targetNum);
if (targetNum == 0) {
@@ -363,36 +376,36 @@
Integer index = 68 + uintSize * i;
byte[] dwID = Arrays.copyOfRange(data, index, index + 4);
//log.info("鐩爣ID:" + DatatypeConverter.printHexBinary(dwID));
- dwID = ByteUtils.toLittleEndian(dwID);
+ dwID = toLittleEndian(dwID);
int id = ByteUtils.bytesToDecimal(dwID);
//log.info("鐩爣ID鍙凤細" + id);
//region 涓嶉渶瑕佺殑瀛楁
byte[] iTw = Arrays.copyOfRange(data, index + 4, index + 8);
- iTw = ByteUtils.toLittleEndian(iTw);
+ iTw = toLittleEndian(iTw);
int Tw = ByteUtils.bytesToDecimal(iTw);
// log.info("鐩爣褰撳墠鐨勫儚绱犲搴�:" + Tw);
byte[] iTh = Arrays.copyOfRange(data, index + 8, index + 12);
- iTh = ByteUtils.toLittleEndian(iTh);
+ iTh = toLittleEndian(iTh);
int Th = ByteUtils.bytesToDecimal(iTh);
//log.info("鐩爣褰撳墠鐨勫儚绱犻珮搴�:" + Th);
byte[] fTx = Arrays.copyOfRange(data, index + 12, index + 16);
- fTx = ByteUtils.toLittleEndian(fTx);
+ fTx = toLittleEndian(fTx);
float fTxAngle = ByteUtils.bytesToFloat(fTx);
log.debug("p瑙掑害:" + fTxAngle);
byte[] fTy = Arrays.copyOfRange(data, index + 16, index + 20);
- fTy = ByteUtils.toLittleEndian(fTy);
+ fTy = toLittleEndian(fTy);
float fTyAngle = ByteUtils.bytesToFloat(fTy);
log.debug("t瑙掑害:" + fTyAngle);
byte[] sAreaNo = Arrays.copyOfRange(data, index + 20, index + 22);
- sAreaNo = ByteUtils.toLittleEndian(sAreaNo);
+ sAreaNo = toLittleEndian(sAreaNo);
int AreaNo = ByteUtils.bytesToDecimal(sAreaNo);
log.debug("鐩爣褰掑睘鐨勫憡璀﹀尯鍩熷彿:" + AreaNo);
byte[] cGrp = Arrays.copyOfRange(data, index + 22, index + 23);
- cGrp = ByteUtils.toLittleEndian(cGrp);
+ cGrp = toLittleEndian(cGrp);
int Grp = ByteUtils.bytesToDecimal(cGrp);
//log.info("鎵�灞炵粍:" + Grp);
//endregion
@@ -400,7 +413,7 @@
//鎶芥补鏈虹姸鎬佸彉閲�
String wellType;
byte[] cStat = Arrays.copyOfRange(data, index + 23, index + 24);
- cStat = ByteUtils.toLittleEndian(cStat);
+ cStat = toLittleEndian(cStat);
//String binaryString = String.format("%8s", Integer.toBinaryString(cStat[0] & 0xFF)).replace(' ', '0');
//log.info("鐩爣褰撳墠鐘舵��:" + binaryString);
// 鎻愬彇绗�0浣嶅��
@@ -450,18 +463,19 @@
radarAlarmData.setArdAlarmRadars(well);
MqttProducer.publish(2, false, "radarWellData", JSON.toJSONString(radarAlarmData));
}
+ //寮哄埗寮曞
if (Arrays.equals(cmdId, new byte[]{0x02})) {
//region 鍛婅鍓嶇鍙戦�佺殑寮哄埗寮曞淇℃伅
byte[] iDistance = Arrays.copyOfRange(data, 4, 8);
- iDistance = ByteUtils.toLittleEndian(iDistance);
+ iDistance = toLittleEndian(iDistance);
long distance = ByteUtils.bytesToDecimal(iDistance);
log.info("鐩爣褰撳墠璺濈(m):" + distance);
byte[] fTx = Arrays.copyOfRange(data, 8, 12);
- fTx = ByteUtils.toLittleEndian(fTx);
+ fTx = toLittleEndian(fTx);
float tx = ByteUtils.bytesToFloat(fTx);
log.debug("鏂逛綅:" + tx);
byte[] fTy = Arrays.copyOfRange(data, 12, 16);
- fTy = ByteUtils.toLittleEndian(fTy);
+ fTy = toLittleEndian(fTy);
float ty = ByteUtils.bytesToFloat(fTy);
if (ty < 0) {
ty += 360;
--
Gitblit v1.9.3