From 5aa69b379b0671e17add4b47b4d4e8a53b34636b Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 3 Sep 2024 12:13:12 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=94=B5=E5=8D=95=E8=BD=A6=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebike/serversend/EBikeMessageCmd82.java   |  3 +-
 .../service/impl/EBikeSendCommandService.java | 34 -------------------
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/impl/EBikeSendCommandService.java

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/serversend/EBikeMessageCmd82.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/serversend/EBikeMessageCmd82.java
index 62f30e9ab..3482c5fec 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/serversend/EBikeMessageCmd82.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/serversend/EBikeMessageCmd82.java
@@ -152,7 +152,8 @@ public class EBikeMessageCmd82 extends AbsEBikeMessage {
             // 充电时长/电量
             byte[] chargeDurationOrPowerBytes = BytesUtil.stringToHexBytes(chargeDurationOrPower, 2);
             // 订单编号
-            byte[] orderNumberBytes = BytesUtil.stringToHexBytes(orderNumber, 16);
+            // byte[] orderNumberBytes = BytesUtil.stringToHexBytes(orderNumber, 16);
+            byte[] orderNumberBytes = BytesUtil.str2Bcd(orderNumber);
             // 最大充电时长
             byte[] maxChargeDurationBytes = BytesUtil.stringToHexBytes(maxChargeDuration, 2);
             // 过载功率
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/EBikeSendCommandService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/EBikeSendCommandService.java
deleted file mode 100644
index d89f84da0..000000000
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/EBikeSendCommandService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.jsowell.pile.service.impl;
-
-import com.jsowell.common.enums.ykc.PileChannelEntity;
-import com.jsowell.pile.domain.ebike.AbsEBikeMessage;
-import io.netty.channel.ChannelHandlerContext;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 电单车发送指令service
- */
-@Slf4j
-@Service
-public class EBikeSendCommandService {
-
-    /**
-     * 公共方法发送指令
-     * @param pileSn 装编号
-     * @param msg 消息
-     * @param timeout 超时时间
-     * @param unit 时间单位
-     */
-    private void sendCommand(String pileSn, Class<? extends AbsEBikeMessage> msg, long timeout, TimeUnit unit) {
-        // 通过桩编号获取channel
-        ChannelHandlerContext ctx = PileChannelEntity.getChannelByPileSn(pileSn);
-        if (Objects.isNull(ctx)) {
-            log.error("push命令[{}]失败, 桩号:{}无法获取到长连接, 请检查充电桩连接状态!", "value", pileSn);
-            throw new NullPointerException("channel");
-        }
-    }
-}