From 56cdf1d5def9f99242229d92d5fa590b50ebd52c Mon Sep 17 00:00:00 2001 From: Lemon Date: Sat, 5 Aug 2023 14:01:33 +0800 Subject: [PATCH] update --- .../netty/handler/GroundLockDataUploadHandler.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java index 92e5e5042..40f9bec08 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java @@ -14,6 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Locale; + /** * 地锁数据上送 * @@ -56,12 +58,13 @@ public class GroundLockDataUploadHandler extends AbstractHandler{ * 0xFF：降锁到位状态 */ byte[] parkingLockStatusByteArr = BytesUtil.copyBytes(msgBody, 8, 1); - String parkingLockStatus = BytesUtil.bcd2Str(parkingLockStatusByteArr); + // String parkingLockStatus = BytesUtil.bcd2Str(parkingLockStatusByteArr); + String parkingLockStatus = BytesUtil.bin2HexStr(parkingLockStatusByteArr).toUpperCase(Locale.ROOT); // 车位状态 0x00：无车辆 0xFF：停放车辆 byte[] parkingStatusByteArr = BytesUtil.copyBytes(msgBody, 9, 1); // String parkingStatus = BytesUtil.bcd2Str(parkingStatusByteArr); - String parkingStatus = BytesUtil.bin2HexStr(parkingStatusByteArr); + String parkingStatus = BytesUtil.bin2HexStr(parkingStatusByteArr).toUpperCase(Locale.ROOT); // 地锁电量状态 百分比值0~100 byte[] groundLockElectricByteArr = BytesUtil.copyBytes(msgBody, 10, 1); @@ -70,7 +73,7 @@ public class GroundLockDataUploadHandler extends AbstractHandler{ // 报警状态 0x00：正常无报警 0xFF：待机状态摇臂破坏 0x55：摇臂升降异常(未到位) byte[] alarmStatusByteArr = BytesUtil.copyBytes(msgBody, 11, 1); // String alarmStatus = BytesUtil.bcd2Str(alarmStatusByteArr); - String alarmStatus = BytesUtil.bin2HexStr(alarmStatusByteArr); + String alarmStatus = BytesUtil.bin2HexStr(alarmStatusByteArr).toUpperCase(Locale.ROOT); // 预留位 全部置0 byte[] waitingUseByteArr = BytesUtil.copyBytes(msgBody, 12, 4);