diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java index 8a95f3e74..4e719c521 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java @@ -2,15 +2,15 @@ package com.jsowell.service; import com.google.common.collect.Lists; import com.jsowell.common.util.StringUtils; -import com.jsowell.netty.command.ykc.GetRealTimeMonitorDataCommand; -import com.jsowell.netty.command.ykc.IssueQRCodeCommand; -import com.jsowell.netty.command.ykc.ProofreadTimeCommand; -import com.jsowell.netty.command.ykc.PublishPileBillingTemplateCommand; -import com.jsowell.netty.command.ykc.RebootCommand; -import com.jsowell.netty.command.ykc.StartChargingCommand; -import com.jsowell.netty.command.ykc.StopChargingCommand; -import com.jsowell.netty.command.ykc.UpdateFirmwareCommand; -import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService; +import com.jsowell.pile.domain.ykcCommond.GetRealTimeMonitorDataCommand; +import com.jsowell.pile.domain.ykcCommond.IssueQRCodeCommand; +import com.jsowell.pile.domain.ykcCommond.ProofreadTimeCommand; +import com.jsowell.pile.domain.ykcCommond.PublishPileBillingTemplateCommand; +import com.jsowell.pile.domain.ykcCommond.RebootCommand; +import com.jsowell.pile.domain.ykcCommond.StartChargingCommand; +import com.jsowell.pile.domain.ykcCommond.StopChargingCommand; +import com.jsowell.pile.domain.ykcCommond.UpdateFirmwareCommand; +import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.domain.PileBillingRelation; import com.jsowell.pile.domain.PileBillingTemplate; import com.jsowell.pile.dto.PublishBillingTemplateDTO; diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java index 60798cdca..87d9611f4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -16,7 +16,7 @@ import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.SecurityUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.id.SnUtils; -import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService; +import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.PileBasicInfo; diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 6b040cdcd..ea5752cae 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -22,11 +22,11 @@ import com.jsowell.common.util.http.HttpUtils; import com.jsowell.common.util.id.SnUtils; import com.jsowell.common.util.id.SnowflakeIdWorker; import com.jsowell.common.util.ip.AddressUtils; -import com.jsowell.netty.command.ykc.IssueQRCodeCommand; -import com.jsowell.netty.command.ykc.ProofreadTimeCommand; +import com.jsowell.pile.domain.ykcCommond.IssueQRCodeCommand; +import com.jsowell.pile.domain.ykcCommond.ProofreadTimeCommand; import com.jsowell.netty.handler.HeartbeatRequestHandler; import com.jsowell.netty.service.yunkuaichong.YKCBusinessService; -import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService; +import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.domain.*; import com.jsowell.pile.dto.*; import com.jsowell.pile.mapper.MemberBasicInfoMapper; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java index 13b87e24e..595d0bb72 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java @@ -5,9 +5,8 @@ import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; -import com.jsowell.netty.command.ykc.IssueQRCodeCommand; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService; +import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.service.IPileBillingTemplateService; import com.jsowell.pile.vo.web.BillingTemplateVO; import io.netty.channel.Channel; @@ -15,8 +14,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.concurrent.CompletableFuture; - /** * 计费模板请求 Handler * diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java index d00bef543..902cc8b7d 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java @@ -6,10 +6,9 @@ import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; -import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService; +import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.service.IPileBillingTemplateService; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java index 448e6d4c3..3d921835e 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java @@ -12,10 +12,10 @@ import com.jsowell.common.enums.ykc.PileChannelEntity; import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.YKCUtils; -import com.jsowell.netty.command.ykc.IssueQRCodeCommand; -import com.jsowell.netty.command.ykc.ProofreadTimeCommand; +import com.jsowell.pile.domain.ykcCommond.IssueQRCodeCommand; +import com.jsowell.pile.domain.ykcCommond.ProofreadTimeCommand; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService; +import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.service.IPileBasicInfoService; import com.jsowell.pile.service.IPileMsgRecordService; import com.jsowell.pile.vo.base.PileInfoVO; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ReadRealTimeMonitorDataHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ReadRealTimeMonitorDataHandler.java index d89324807..da3bd3f83 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ReadRealTimeMonitorDataHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ReadRealTimeMonitorDataHandler.java @@ -8,7 +8,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.netty.service.yunkuaichong.impl.YKCPushCommandServiceImpl; +import com.jsowell.pile.service.impl.YKCPushCommandServiceImpl; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java index 36a4e0a6b..6bc7de1bb 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java @@ -8,7 +8,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.netty.service.yunkuaichong.impl.YKCPushCommandServiceImpl; +import com.jsowell.pile.service.impl.YKCPushCommandServiceImpl; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java index c14741ea4..15e43d6b7 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java @@ -2,7 +2,6 @@ package com.jsowell.netty.service.yunkuaichong.impl; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; -import com.jsowell.common.enums.ykc.OrderStatusEnum; import com.jsowell.common.enums.ykc.PileChannelEntity; import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum; import com.jsowell.common.util.StringUtils; @@ -10,21 +9,16 @@ import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.netty.handler.AbstractHandler; import com.jsowell.netty.service.yunkuaichong.YKCBusinessService; -import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService; -import com.jsowell.pile.domain.OrderBasicInfo; +import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IPileConnectorInfoService; import com.jsowell.pile.service.IPileMsgRecordService; -import com.jsowell.pile.vo.web.OrderListVO; import io.netty.channel.Channel; import io.netty.channel.ChannelId; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; - @Slf4j @Service public class YKCBusinessServiceImpl implements YKCBusinessService { diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/GetRealTimeMonitorDataCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/GetRealTimeMonitorDataCommand.java similarity index 87% rename from jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/GetRealTimeMonitorDataCommand.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/GetRealTimeMonitorDataCommand.java index 00e625aca..8e61a51a5 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/GetRealTimeMonitorDataCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/GetRealTimeMonitorDataCommand.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.command.ykc; +package com.jsowell.pile.domain.ykcCommond; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/IssueQRCodeCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/IssueQRCodeCommand.java similarity index 85% rename from jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/IssueQRCodeCommand.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/IssueQRCodeCommand.java index 839538e95..a839d3ee9 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/IssueQRCodeCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/IssueQRCodeCommand.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.command.ykc; +package com.jsowell.pile.domain.ykcCommond; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/PileSettingCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/PileSettingCommand.java similarity index 90% rename from jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/PileSettingCommand.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/PileSettingCommand.java index db2196ca5..185277020 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/PileSettingCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/PileSettingCommand.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.command.ykc; +package com.jsowell.pile.domain.ykcCommond; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/ProofreadTimeCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ProofreadTimeCommand.java similarity index 85% rename from jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/ProofreadTimeCommand.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ProofreadTimeCommand.java index 95508b6df..3e20544f2 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/ProofreadTimeCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ProofreadTimeCommand.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.command.ykc; +package com.jsowell.pile.domain.ykcCommond; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/PublishPileBillingTemplateCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/PublishPileBillingTemplateCommand.java similarity index 88% rename from jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/PublishPileBillingTemplateCommand.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/PublishPileBillingTemplateCommand.java index 2f0c03861..1188ec451 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/PublishPileBillingTemplateCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/PublishPileBillingTemplateCommand.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.command.ykc; +package com.jsowell.pile.domain.ykcCommond; import com.jsowell.pile.vo.web.BillingTemplateVO; import lombok.AllArgsConstructor; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/QueryWorkParamsCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/QueryWorkParamsCommand.java similarity index 95% rename from jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/QueryWorkParamsCommand.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/QueryWorkParamsCommand.java index 6218f0c99..4a60b8ac1 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/QueryWorkParamsCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/QueryWorkParamsCommand.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.command.ykc; +package com.jsowell.pile.domain.ykcCommond; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/RebootCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/RebootCommand.java similarity index 83% rename from jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/RebootCommand.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/RebootCommand.java index 17b1daa07..d13c0fc22 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/RebootCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/RebootCommand.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.command.ykc; +package com.jsowell.pile.domain.ykcCommond; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/StartChargingCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/StartChargingCommand.java similarity index 93% rename from jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/StartChargingCommand.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/StartChargingCommand.java index ce74e8788..3f54d069e 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/StartChargingCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/StartChargingCommand.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.command.ykc; +package com.jsowell.pile.domain.ykcCommond; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/StopChargingCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/StopChargingCommand.java similarity index 86% rename from jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/StopChargingCommand.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/StopChargingCommand.java index 65683aee1..c683765f8 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/StopChargingCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/StopChargingCommand.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.command.ykc; +package com.jsowell.pile.domain.ykcCommond; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/UpdateFirmwareCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java similarity index 85% rename from jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/UpdateFirmwareCommand.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java index 6effe2e0f..cac3a4255 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/command/ykc/UpdateFirmwareCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/UpdateFirmwareCommand.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.command.ykc; +package com.jsowell.pile.domain.ykcCommond; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/YKCPushCommandService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/YKCPushCommandService.java similarity index 94% rename from jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/YKCPushCommandService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/YKCPushCommandService.java index ea10106a9..fcef45f75 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/YKCPushCommandService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/YKCPushCommandService.java @@ -1,6 +1,6 @@ -package com.jsowell.netty.service.yunkuaichong; +package com.jsowell.pile.service; -import com.jsowell.netty.command.ykc.*; +import com.jsowell.pile.domain.ykcCommond.*; /** * 云快充协议，向充电桩发送命令service diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCPushCommandServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java similarity index 95% rename from jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCPushCommandServiceImpl.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java index 0aaab6fcf..4e229427b 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCPushCommandServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.service.yunkuaichong.impl; +package com.jsowell.pile.service.impl; import com.google.common.collect.Lists; import com.google.common.primitives.Bytes; @@ -14,17 +14,17 @@ import com.jsowell.common.util.Cp56Time2a.Cp56Time2aUtil; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.YKCUtils; -import com.jsowell.netty.command.ykc.GetRealTimeMonitorDataCommand; -import com.jsowell.netty.command.ykc.IssueQRCodeCommand; -import com.jsowell.netty.command.ykc.PileSettingCommand; -import com.jsowell.netty.command.ykc.ProofreadTimeCommand; -import com.jsowell.netty.command.ykc.PublishPileBillingTemplateCommand; -import com.jsowell.netty.command.ykc.QueryWorkParamsCommand; -import com.jsowell.netty.command.ykc.RebootCommand; -import com.jsowell.netty.command.ykc.StartChargingCommand; -import com.jsowell.netty.command.ykc.StopChargingCommand; -import com.jsowell.netty.command.ykc.UpdateFirmwareCommand; -import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService; +import com.jsowell.pile.domain.ykcCommond.GetRealTimeMonitorDataCommand; +import com.jsowell.pile.domain.ykcCommond.IssueQRCodeCommand; +import com.jsowell.pile.domain.ykcCommond.PileSettingCommand; +import com.jsowell.pile.domain.ykcCommond.ProofreadTimeCommand; +import com.jsowell.pile.domain.ykcCommond.PublishPileBillingTemplateCommand; +import com.jsowell.pile.domain.ykcCommond.QueryWorkParamsCommand; +import com.jsowell.pile.domain.ykcCommond.RebootCommand; +import com.jsowell.pile.domain.ykcCommond.StartChargingCommand; +import com.jsowell.pile.domain.ykcCommond.StopChargingCommand; +import com.jsowell.pile.domain.ykcCommond.UpdateFirmwareCommand; +import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.service.IPileBasicInfoService; import com.jsowell.pile.service.IPileBillingTemplateService; import com.jsowell.pile.service.IPileConnectorInfoService; diff --git a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java index 1bdf509df..cd1e07cb4 100644 --- a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java +++ b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java @@ -2,9 +2,9 @@ package com.jsowell.quartz.task; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; -import com.jsowell.netty.command.ykc.PublishPileBillingTemplateCommand; -import com.jsowell.netty.command.ykc.StartChargingCommand; -import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService; +import com.jsowell.pile.domain.ykcCommond.PublishPileBillingTemplateCommand; +import com.jsowell.pile.domain.ykcCommond.StartChargingCommand; +import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IPileBillingTemplateService; diff --git a/jsowell-thirdparty/pom.xml b/jsowell-thirdparty/pom.xml index 787b2de66..ff891a05d 100644 --- a/jsowell-thirdparty/pom.xml +++ b/jsowell-thirdparty/pom.xml @@ -22,10 +22,6 @@ org.projectlombok lombok - - com.jsowell - jsowell-netty - diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index 3f68554cb..5c0815717 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -22,10 +22,9 @@ import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.JWTUtils; import com.jsowell.common.util.PageUtils; import com.jsowell.common.util.StringUtils; -import com.jsowell.netty.command.ykc.StartChargingCommand; -import com.jsowell.netty.command.ykc.StopChargingCommand; -import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService; import com.jsowell.pile.domain.*; +import com.jsowell.pile.domain.ykcCommond.StartChargingCommand; +import com.jsowell.pile.domain.ykcCommond.StopChargingCommand; import com.jsowell.pile.dto.*; import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.ConnectorInfoVO;