autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-13 22:40:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-05 14:19:50 +08:00
parent cc3ddce49c 56cdf1d5de
commit 593ee7d16f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java
View File

@@ -14,6 +14,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.Locale;
/** /**
* 地锁数据上送 * 地锁数据上送
* *
@@ -56,12 +58,13 @@ public class GroundLockDataUploadHandler extends AbstractHandler{
* 0xFF：降锁到位状态 * 0xFF：降锁到位状态
*/ */
byte[] parkingLockStatusByteArr = BytesUtil.copyBytes(msgBody, 8, 1); 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：停放车辆 // 车位状态 0x00：无车辆 0xFF：停放车辆
byte[] parkingStatusByteArr = BytesUtil.copyBytes(msgBody, 9, 1); byte[] parkingStatusByteArr = BytesUtil.copyBytes(msgBody, 9, 1);
// String parkingStatus = BytesUtil.bcd2Str(parkingStatusByteArr); // String parkingStatus = BytesUtil.bcd2Str(parkingStatusByteArr);
String parkingStatus = BytesUtil.bin2HexStr(parkingStatusByteArr); String parkingStatus = BytesUtil.bin2HexStr(parkingStatusByteArr).toUpperCase(Locale.ROOT);
// 地锁电量状态 百分比值0~100 // 地锁电量状态 百分比值0~100
byte[] groundLockElectricByteArr = BytesUtil.copyBytes(msgBody, 10, 1); byte[] groundLockElectricByteArr = BytesUtil.copyBytes(msgBody, 10, 1);
@@ -70,7 +73,7 @@ public class GroundLockDataUploadHandler extends AbstractHandler{
// 报警状态 0x00：正常无报警 0xFF：待机状态摇臂破坏 0x55：摇臂升降异常(未到位) // 报警状态 0x00：正常无报警 0xFF：待机状态摇臂破坏 0x55：摇臂升降异常(未到位)
byte[] alarmStatusByteArr = BytesUtil.copyBytes(msgBody, 11, 1); byte[] alarmStatusByteArr = BytesUtil.copyBytes(msgBody, 11, 1);
// String alarmStatus = BytesUtil.bcd2Str(alarmStatusByteArr); // String alarmStatus = BytesUtil.bcd2Str(alarmStatusByteArr);
String alarmStatus = BytesUtil.bin2HexStr(alarmStatusByteArr); String alarmStatus = BytesUtil.bin2HexStr(alarmStatusByteArr).toUpperCase(Locale.ROOT);
// 预留位 全部置0 // 预留位 全部置0
byte[] waitingUseByteArr = BytesUtil.copyBytes(msgBody, 12, 4); byte[] waitingUseByteArr = BytesUtil.copyBytes(msgBody, 12, 4);