diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/decoder/MessageDecode.java b/jsowell-netty/src/main/java/com/jsowell/netty/decoder/MessageDecode.java index 2b5004a1e..6d6b39670 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/decoder/MessageDecode.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/decoder/MessageDecode.java @@ -1,6 +1,6 @@ package com.jsowell.netty.decoder; -import com.jsowell.netty.domain.ebike.AbsEBikeMessage; +import com.jsowell.pile.domain.ebike.AbsEBikeMessage; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ChargingPileHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ChargingPileHandler.java index fa90c9fbe..e78d3cd68 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ChargingPileHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ChargingPileHandler.java @@ -1,7 +1,7 @@ package com.jsowell.netty.server.electricbicycles; import com.alibaba.fastjson2.JSON; -import com.jsowell.netty.domain.ebike.AbsEBikeMessage; +import com.jsowell.pile.domain.ebike.AbsEBikeMessage; import io.netty.channel.*; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/AbsEBikeMessage.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/AbsEBikeMessage.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/AbsEBikeMessage.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/AbsEBikeMessage.java index 550c91d98..1f49c4ede 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/AbsEBikeMessage.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/AbsEBikeMessage.java @@ -1,7 +1,8 @@ -package com.jsowell.netty.domain.ebike; +package com.jsowell.pile.domain.ebike; import com.jsowell.common.util.BytesUtil; import com.jsowell.netty.domain.ebike.deviceupload.*; +import com.jsowell.pile.domain.ebike.deviceupload.*; import lombok.Getter; import lombok.Setter; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/ConfirmOrder.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/ConfirmOrder.java similarity index 94% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/ConfirmOrder.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/ConfirmOrder.java index fcb63a31c..691ee2d93 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/ConfirmOrder.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/ConfirmOrder.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.domain.ebike.deviceupload; +package com.jsowell.pile.domain.ebike.deviceupload; import com.jsowell.common.util.BytesUtil; import lombok.Data; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/CreditCardInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/CreditCardInfo.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/CreditCardInfo.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/CreditCardInfo.java index 36d050a91..896e8c6d2 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/CreditCardInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/CreditCardInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.domain.ebike.deviceupload; +package com.jsowell.pile.domain.ebike.deviceupload; import com.jsowell.common.util.BytesUtil; import lombok.Data; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/DeviceHeartbeat.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/DeviceHeartbeat.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/DeviceHeartbeat.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/DeviceHeartbeat.java index a2e7209e7..5fece44f7 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/DeviceHeartbeat.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/DeviceHeartbeat.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.domain.ebike.deviceupload; +package com.jsowell.pile.domain.ebike.deviceupload; import com.google.common.collect.Lists; import com.jsowell.common.enums.ebike.PortStatusEnum; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/DeviceRegister.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/DeviceRegister.java similarity index 96% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/DeviceRegister.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/DeviceRegister.java index 65e81e793..e661bb321 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/DeviceRegister.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/DeviceRegister.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.domain.ebike.deviceupload; +package com.jsowell.pile.domain.ebike.deviceupload; import com.jsowell.common.util.BytesUtil; import lombok.Data; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd02.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd02.java similarity index 89% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd02.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd02.java index 064003a4e..a421fc223 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd02.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd02.java @@ -1,6 +1,6 @@ -package com.jsowell.netty.domain.ebike.deviceupload; +package com.jsowell.pile.domain.ebike.deviceupload; -import com.jsowell.netty.domain.ebike.AbsEBikeMessage; +import com.jsowell.pile.domain.ebike.AbsEBikeMessage; /** * 刷卡操作（02指令） diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd03.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd03.java similarity index 85% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd03.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd03.java index 86abd1998..2ec516598 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd03.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd03.java @@ -1,6 +1,6 @@ -package com.jsowell.netty.domain.ebike.deviceupload; +package com.jsowell.pile.domain.ebike.deviceupload; -import com.jsowell.netty.domain.ebike.AbsEBikeMessage; +import com.jsowell.pile.domain.ebike.AbsEBikeMessage; public class EBikeMessageCmd03 extends AbsEBikeMessage { diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd04.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd04.java similarity index 87% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd04.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd04.java index 5a539987a..73503d9e4 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd04.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd04.java @@ -1,6 +1,6 @@ -package com.jsowell.netty.domain.ebike.deviceupload; +package com.jsowell.pile.domain.ebike.deviceupload; -import com.jsowell.netty.domain.ebike.AbsEBikeMessage; +import com.jsowell.pile.domain.ebike.AbsEBikeMessage; /** * 充电端口订单确认（04指令） diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd06.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd06.java similarity index 89% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd06.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd06.java index 3a58628d9..d4d64ba4c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd06.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd06.java @@ -1,6 +1,6 @@ -package com.jsowell.netty.domain.ebike.deviceupload; +package com.jsowell.pile.domain.ebike.deviceupload; -import com.jsowell.netty.domain.ebike.AbsEBikeMessage; +import com.jsowell.pile.domain.ebike.AbsEBikeMessage; /** * 端口充电时功率心跳包（06指令） diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd20.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd20.java similarity index 85% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd20.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd20.java index 5e90fb1fe..3f5dfc9e5 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd20.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd20.java @@ -1,6 +1,6 @@ -package com.jsowell.netty.domain.ebike.deviceupload; +package com.jsowell.pile.domain.ebike.deviceupload; -import com.jsowell.netty.domain.ebike.AbsEBikeMessage; +import com.jsowell.pile.domain.ebike.AbsEBikeMessage; /** * 设备注册包（20指令） diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd21.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd21.java similarity index 85% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd21.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd21.java index 35623a779..4be91fba9 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd21.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd21.java @@ -1,6 +1,6 @@ -package com.jsowell.netty.domain.ebike.deviceupload; +package com.jsowell.pile.domain.ebike.deviceupload; -import com.jsowell.netty.domain.ebike.AbsEBikeMessage; +import com.jsowell.pile.domain.ebike.AbsEBikeMessage; import lombok.Getter; import lombok.Setter; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd22.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd22.java similarity index 86% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd22.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd22.java index 64790a271..9a1789967 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/EBikeMessageCmd22.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd22.java @@ -1,6 +1,6 @@ -package com.jsowell.netty.domain.ebike.deviceupload; +package com.jsowell.pile.domain.ebike.deviceupload; -import com.jsowell.netty.domain.ebike.AbsEBikeMessage; +import com.jsowell.pile.domain.ebike.AbsEBikeMessage; import lombok.Getter; import lombok.Setter; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/PowerHeartbeat.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/PowerHeartbeat.java similarity index 99% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/PowerHeartbeat.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/PowerHeartbeat.java index 05f02d28c..a3f2c28a0 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/PowerHeartbeat.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/PowerHeartbeat.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.domain.ebike.deviceupload; +package com.jsowell.pile.domain.ebike.deviceupload; import com.jsowell.common.util.BytesUtil; import lombok.Getter; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/SettlementInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/SettlementInfo.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/SettlementInfo.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/SettlementInfo.java index c272f6bff..ac6cec31a 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/deviceupload/SettlementInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/SettlementInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.domain.ebike.deviceupload; +package com.jsowell.pile.domain.ebike.deviceupload; import com.jsowell.common.util.BytesUtil; import lombok.Data; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/serversend/EBikeMessageCmd81.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/serversend/EBikeMessageCmd81.java similarity index 85% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/serversend/EBikeMessageCmd81.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/serversend/EBikeMessageCmd81.java index aa153cfb9..9eb7e985e 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/serversend/EBikeMessageCmd81.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/serversend/EBikeMessageCmd81.java @@ -1,6 +1,6 @@ -package com.jsowell.netty.domain.ebike.serversend; +package com.jsowell.pile.domain.ebike.serversend; -import com.jsowell.netty.domain.ebike.AbsEBikeMessage; +import com.jsowell.pile.domain.ebike.AbsEBikeMessage; /** * 查询设备联网状态（81指令） diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/serversend/EBikeMessageCmd82.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/serversend/EBikeMessageCmd82.java similarity index 86% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/serversend/EBikeMessageCmd82.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/serversend/EBikeMessageCmd82.java index 5f495415b..0c2bd6499 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/serversend/EBikeMessageCmd82.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/serversend/EBikeMessageCmd82.java @@ -1,6 +1,6 @@ -package com.jsowell.netty.domain.ebike.serversend; +package com.jsowell.pile.domain.ebike.serversend; -import com.jsowell.netty.domain.ebike.AbsEBikeMessage; +import com.jsowell.pile.domain.ebike.AbsEBikeMessage; /** * 服务器开始、停止充电操作（82指令） diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/serversend/SpecificData.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/serversend/SpecificData.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/serversend/SpecificData.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/serversend/SpecificData.java index 678581c56..bb8445457 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/domain/ebike/serversend/SpecificData.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/serversend/SpecificData.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.domain.ebike.serversend; +package com.jsowell.pile.domain.ebike.serversend; import com.jsowell.common.util.BytesUtil; import lombok.Getter; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/EBikeSendCommandService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/EBikeSendCommandService.java new file mode 100644 index 000000000..4851b71b2 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/EBikeSendCommandService.java @@ -0,0 +1,10 @@ +package com.jsowell.pile.service; + +import com.jsowell.pile.domain.ebike.AbsEBikeMessage; + +/** + * 电单车发送命令服务 + */ +public interface EBikeSendCommandService { + void send(String pileSn, AbsEBikeMessage c); +}