From 710cbfabd6bd731ebd908b2e5fec0fa66cfce3dd Mon Sep 17 00:00:00 2001 From: Guoqs Date: Fri, 12 Apr 2024 11:28:47 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../netty/handler/TransactionRecordsRequestHandler.java | 9 ++++----- .../pile/service/impl/YKCPushCommandServiceImpl.java | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java index 7d32cfaa9..77acae438 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java @@ -28,7 +28,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.math.BigDecimal; import java.util.Date; import java.util.Objects; import java.util.concurrent.CompletableFuture; @@ -70,7 +69,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { private CommonService commonService; - public static void main(String[] args) { + /*public static void main(String[] args) { BigDecimal totalElectricity = new BigDecimal("23.73"); if (totalElectricity.compareTo(BigDecimal.TEN) > 0) { // 充电度数大于10度 @@ -232,13 +231,13 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { byte[] vinCodeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); String vinCode = BytesUtil.ascii2Str(vinCodeByteArr); - /** + *//** * 交易标识 * 0x01: app 启动 * 0x02:卡启动 * 0x04:离线卡启动 * 0x05: vin 码启动充电 - */ + *//* startIndex += length; length = 1; byte[] transactionIdentifierByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); @@ -314,7 +313,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { boolean flag = !StringUtils.equals("0000000000000000", "a511101970000000"); System.out.println(flag); - } + }*/ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java index a611c1d22..78be6b4ff 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java @@ -230,6 +230,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { } else { PileStationVO pileStationVO = pileStationInfoService.getStationInfoByPileSn(pileSn); if (StringUtils.isNotBlank(pileStationVO.getQrcodePrefix())) { + // 如果有配置二维码前缀,使用配置里的。(例如希晓) qrCodePrefix = pileStationVO.getQrcodePrefix(); } else { // 为空则给平台二维码前缀