From 3f797fdd7b71d09022f9328134c04b27018f32a2 Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: Wed, 29 Nov 2023 21:49:15 +0800
Subject: [PATCH] 优化日志
---
src/main/java/com/ard/utils/tcp/ClientHandler.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ard/utils/tcp/ClientHandler.java b/src/main/java/com/ard/utils/tcp/ClientHandler.java
index 8956726..2f62a5f 100644
--- a/src/main/java/com/ard/utils/tcp/ClientHandler.java
+++ b/src/main/java/com/ard/utils/tcp/ClientHandler.java
@@ -217,7 +217,7 @@
if (targetNum == 0) {
return;
}
- log.debug("目标总点数(转整型):" + targetNum);
+ //log.debug("目标总点数(转整型):" + targetNum);
//解析NET_TARGET_UNIT(64是NET_TARGET_HEAD的字节数)
int uintSize = (payloadSizeToDecimal - 64) / targetNum;
@@ -229,13 +229,13 @@
byte[] dwID = Arrays.copyOfRange(data, index, index + 4);
// log.info("目标ID:" + DatatypeConverter.printHexBinary(cmdId));
dwID = toLittleEndian(dwID);
- int id = ByteUtils.bytesToDecimal(dwID);
- // log.info("目标ID号：" + id);
+ int targetId = ByteUtils.bytesToDecimal(dwID);
+ // log.info("目标ID号：" + targetId);
byte[] iDistance = Arrays.copyOfRange(data, index + 8, index + 12);
iDistance = toLittleEndian(iDistance);
double Distance = ByteUtils.bytesToDecimal(iDistance);
- log.debug("目标当前直线距离(m):" + Distance);
+ //log.debug("目标当前直线距离(m):" + Distance);
//region 不需要的字段
// byte[] dwGSum = Arrays.copyOfRange(data, index + 4, index + 8);
@@ -304,18 +304,18 @@
byte[] afTy = Arrays.copyOfRange(data, index + 112, index + 116);
afTy = toLittleEndian(afTy);
float fTy = ByteUtils.bytesToFloat(afTy);
- log.debug("垂直角度:" + fTy);
+ //log.debug("垂直角度:" + fTy);
// 将角度转换为弧度
double thetaRadians = Math.toRadians(fTy + 90);
// 使用正弦函数计算对边长度
Distance = Math.sin(thetaRadians) * Distance;
- log.debug("目标投影距离(m):" + Distance);
+ //log.debug("目标投影距离(m):" + Distance);
Double[] radarXY = {radarLongitude, radarLagitude};
Double[] alarmXY = GisUtils.CalculateCoordinates(radarXY, Distance, (double) fTx);
- log.debug("报警信息：" + "【id】" + id + "【name】" + alarmPointName + "【alarmType】" + alarmType + "【alarmTime】" + alarmTime + "【distance】" + Distance + "【P】" + fTx + "【T】" + fTy + "【X】" + alarmXY[0] + "【Y】" + alarmXY[1]);
+ log.debug("报警信息：" + "【radarId】" + radarId+ "【targetId】" + targetId + "【name】" + alarmPointName + "【alarmType】" + alarmType + "【alarmTime】" + alarmTime + "【distance】" + Distance + "【P】" + fTx + "【T】" + fTy + "【X】" + alarmXY[0] + "【Y】" + alarmXY[1]);
ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
- ardAlarmRadar.setTargetId(id);
+ ardAlarmRadar.setTargetId(targetId);
ardAlarmRadar.setName(alarmPointName);
ardAlarmRadar.setLongitude(alarmXY[0]);
ardAlarmRadar.setLatitude(alarmXY[1]);
@@ -367,7 +367,7 @@
byte[] wTargetNum = Arrays.copyOfRange(data, 8, 10);
wTargetNum = toLittleEndian(wTargetNum);
targetNum = ByteUtils.bytesToDecimal(wTargetNum);
- log.debug("目标总点数(转整型):" + targetNum);
+ //log.debug("目标总点数(转整型):" + targetNum);
if (targetNum == 0) {
return;
}
@@ -379,8 +379,8 @@
byte[] dwID = Arrays.copyOfRange(data, index, index + 4);
//log.info("目标ID:" + DatatypeConverter.printHexBinary(dwID));
dwID = toLittleEndian(dwID);
- int id = ByteUtils.bytesToDecimal(dwID);
- //log.info("目标ID号：" + id);
+ int targetId = ByteUtils.bytesToDecimal(dwID);
+ //log.info("目标ID号：" + targetId);
//region 不需要的字段
byte[] iTw = Arrays.copyOfRange(data, index + 4, index + 8);
iTw = toLittleEndian(iTw);
@@ -395,16 +395,16 @@
byte[] fTx = Arrays.copyOfRange(data, index + 12, index + 16);
fTx = toLittleEndian(fTx);
float fTxAngle = ByteUtils.bytesToFloat(fTx);
- log.debug("p角度:" + fTxAngle);
+ //log.debug("p角度:" + fTxAngle);
byte[] fTy = Arrays.copyOfRange(data, index + 16, index + 20);
fTy = toLittleEndian(fTy);
float fTyAngle = ByteUtils.bytesToFloat(fTy);
- log.debug("t角度:" + fTyAngle);
+ //log.debug("t角度:" + fTyAngle);
byte[] sAreaNo = Arrays.copyOfRange(data, index + 20, index + 22);
sAreaNo = toLittleEndian(sAreaNo);
int AreaNo = ByteUtils.bytesToDecimal(sAreaNo);
- log.debug("目标归属的告警区域号:" + AreaNo);
+ //log.debug("目标归属的告警区域号:" + AreaNo);
byte[] cGrp = Arrays.copyOfRange(data, index + 22, index + 23);
cGrp = toLittleEndian(cGrp);
@@ -428,9 +428,9 @@
//log.info("所属告警区域名称:" + DatatypeConverter.printHexBinary(szName));
String alarmPointName = ByteUtils.bytesToStringZh(szName);
// log.info("所属告警区域名称:" + alarmPointName);
- log.debug("报警信息：" + "【id】" + id + "【name】" + alarmPointName + "【alarmType】" + alarmType + "【alarmTime】" + alarmTime);
+ log.debug("报警信息："+ "【radarId】" + radarId + "【targetId】" + targetId + "【name】" + alarmPointName + "【alarmType】" + alarmType + "【alarmTime】" + alarmTime);
ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
- ardAlarmRadar.setTargetId(id);
+ ardAlarmRadar.setTargetId(targetId);
ardAlarmRadar.setName(alarmPointName);
ardAlarmRadar.setAlarmType(alarmType);
radarAlarmInfos.add(ardAlarmRadar);
@@ -441,9 +441,9 @@
//抽油机状态集合中装入数据
byte[] szName = Arrays.copyOfRange(data, index + 32, index + 64);
String alarmPointName = ByteUtils.bytesToStringZh(szName);
- log.debug("抽油机状态报警信息：" + "【id】" + id + "【name】" + alarmPointName + "【alarmType】" + wellType + "【alarmTime】" + alarmTime);
+ log.debug("报警信息：" + "【radarId】" + radarId + "【targetId】" + targetId + "【name】" + alarmPointName + "【alarmType】抽油机状态报警【alarmState】" + wellType + "【alarmTime】" + alarmTime);
ArdAlarmRadar wellAlarm = new ArdAlarmRadar();
- wellAlarm.setTargetId(id);
+ wellAlarm.setTargetId(targetId);
wellAlarm.setName(alarmPointName);
wellAlarm.setAlarmType(wellType);
well.add(wellAlarm);
--
Gitblit v1.9.3