diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/YKCUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/YKCUtils.java index 19536ebea..bf9c51d55 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/YKCUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/YKCUtils.java @@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -328,7 +329,8 @@ public class YKCUtils { * 解析vin */ public static String parseVin(byte[] vinCodeByteArr) { - return BytesUtil.ascii2Str(vinCodeByteArr); + // return BytesUtil.ascii2Str(vinCodeByteArr); + return new String(vinCodeByteArr, StandardCharsets.US_ASCII); } /** diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java index 721383d63..1b34b2b9c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java @@ -118,7 +118,8 @@ public class ConfirmStartChargingRequestHandler extends AbstractYkcHandler { startIndex += length; length = 17; byte[] vinCodeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); - String vinCode = BytesUtil.ascii2StrLittle(vinCodeByteArr); + // String vinCode = BytesUtil.ascii2StrLittle(vinCodeByteArr); + String vinCode = YKCUtils.parseVin(vinCodeByteArr); ConfirmStartChargingData confirmStartChargingData = ConfirmStartChargingData.builder() .pileSn(pileSn) @@ -183,7 +184,8 @@ public class ConfirmStartChargingRequestHandler extends AbstractYkcHandler { startIndex += length; length = 17; byte[] vinCodeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); - String vinCode = BytesUtil.ascii2StrLittle(vinCodeByteArr).replaceAll("\\u0000", ""); + // String vinCode = BytesUtil.ascii2StrLittle(vinCodeByteArr).replaceAll("\\u0000", ""); + String vinCode = YKCUtils.parseVin(vinCodeByteArr); ConfirmStartChargingData confirmStartChargingData = ConfirmStartChargingData.builder() .pileSn(pileSn) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/ConfirmStartChargingStrategy.java b/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/ConfirmStartChargingStrategy.java index ea61e0ecc..286124735 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/ConfirmStartChargingStrategy.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/ConfirmStartChargingStrategy.java @@ -111,7 +111,8 @@ public class ConfirmStartChargingStrategy implements AbstractYkcStrategy { startIndex += length; length = 17; byte[] vinCodeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); - String vinCode = BytesUtil.ascii2StrLittle(vinCodeByteArr); + // String vinCode = BytesUtil.ascii2StrLittle(vinCodeByteArr); + String vinCode = YKCUtils.parseVin(vinCodeByteArr); ConfirmStartChargingData confirmStartChargingData = ConfirmStartChargingData.builder() .pileSn(pileSn)