update 将ykcCommond移动到pile模块中

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.pile.domain.ykcCommond.GetRealTimeMonitorDataCommand;
-import com.jsowell.netty.command.ykc.IssueQRCodeCommand;
+import com.jsowell.pile.domain.ykcCommond.IssueQRCodeCommand;
-import com.jsowell.netty.command.ykc.ProofreadTimeCommand;
+import com.jsowell.pile.domain.ykcCommond.ProofreadTimeCommand;
-import com.jsowell.netty.command.ykc.PublishPileBillingTemplateCommand;
+import com.jsowell.pile.domain.ykcCommond.PublishPileBillingTemplateCommand;
-import com.jsowell.netty.command.ykc.RebootCommand;
+import com.jsowell.pile.domain.ykcCommond.RebootCommand;
-import com.jsowell.netty.command.ykc.StartChargingCommand;
+import com.jsowell.pile.domain.ykcCommond.StartChargingCommand;
-import com.jsowell.netty.command.ykc.StopChargingCommand;
+import com.jsowell.pile.domain.ykcCommond.StopChargingCommand;
-import com.jsowell.netty.command.ykc.UpdateFirmwareCommand;
+import com.jsowell.pile.domain.ykcCommond.UpdateFirmwareCommand;
-import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService;
+import com.jsowell.pile.service.YKCPushCommandService;
 import com.jsowell.pile.domain.PileBillingRelation;
 import com.jsowell.pile.domain.PileBillingTemplate;
 import com.jsowell.pile.dto.PublishBillingTemplateDTO;

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;

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.pile.domain.ykcCommond.IssueQRCodeCommand;
-import com.jsowell.netty.command.ykc.ProofreadTimeCommand;
+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;

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
  *

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;

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.pile.domain.ykcCommond.IssueQRCodeCommand;
-import com.jsowell.netty.command.ykc.ProofreadTimeCommand;
+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;

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;

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;

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.service.YKCPushCommandService;
-import com.jsowell.pile.domain.OrderBasicInfo;
 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 {

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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

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.pile.domain.ykcCommond.GetRealTimeMonitorDataCommand;
-import com.jsowell.netty.command.ykc.IssueQRCodeCommand;
+import com.jsowell.pile.domain.ykcCommond.IssueQRCodeCommand;
-import com.jsowell.netty.command.ykc.PileSettingCommand;
+import com.jsowell.pile.domain.ykcCommond.PileSettingCommand;
-import com.jsowell.netty.command.ykc.ProofreadTimeCommand;
+import com.jsowell.pile.domain.ykcCommond.ProofreadTimeCommand;
-import com.jsowell.netty.command.ykc.PublishPileBillingTemplateCommand;
+import com.jsowell.pile.domain.ykcCommond.PublishPileBillingTemplateCommand;
-import com.jsowell.netty.command.ykc.QueryWorkParamsCommand;
+import com.jsowell.pile.domain.ykcCommond.QueryWorkParamsCommand;
-import com.jsowell.netty.command.ykc.RebootCommand;
+import com.jsowell.pile.domain.ykcCommond.RebootCommand;
-import com.jsowell.netty.command.ykc.StartChargingCommand;
+import com.jsowell.pile.domain.ykcCommond.StartChargingCommand;
-import com.jsowell.netty.command.ykc.StopChargingCommand;
+import com.jsowell.pile.domain.ykcCommond.StopChargingCommand;
-import com.jsowell.netty.command.ykc.UpdateFirmwareCommand;
+import com.jsowell.pile.domain.ykcCommond.UpdateFirmwareCommand;
-import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService;
+import com.jsowell.pile.service.YKCPushCommandService;
 import com.jsowell.pile.service.IPileBasicInfoService;
 import com.jsowell.pile.service.IPileBillingTemplateService;
 import com.jsowell.pile.service.IPileConnectorInfoService;

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.pile.domain.ykcCommond.PublishPileBillingTemplateCommand;
-import com.jsowell.netty.command.ykc.StartChargingCommand;
+import com.jsowell.pile.domain.ykcCommond.StartChargingCommand;
-import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService;
+import com.jsowell.pile.service.YKCPushCommandService;
 import com.jsowell.pile.domain.OrderBasicInfo;
 import com.jsowell.pile.service.IOrderBasicInfoService;
 import com.jsowell.pile.service.IPileBillingTemplateService;

jsowell-thirdparty/pom.xml

@@ -22,10 +22,6 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.jsowell</groupId>
-            <artifactId>jsowell-netty</artifactId>
-        </dependency>
 
     </dependencies>
 

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;