diff --git a/jsowell-admin/src/main/java/com/jsowell/web/core/config/SwaggerConfig.java b/jsowell-admin/src/main/java/com/jsowell/web/core/config/SwaggerConfig.java index 97aa8f8f8..ce607c61f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/core/config/SwaggerConfig.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/core/config/SwaggerConfig.java @@ -110,7 +110,7 @@ public class SwaggerConfig { // 用ApiInfoBuilder进行定制 return new ApiInfoBuilder() // 设置标题 - .title("标题：万车充后台管理系统_接口文档") + .title("标题：万车充运营管理平台_接口文档") // 描述 // .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") // 作者信息 diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 0d62d99ad..f5e788914 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -1,14 +1,8 @@ import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.TypeReference; -import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; -import com.alipay.api.AlipayApiException; -import com.alipay.api.internal.util.AlipayEncrypt; -import com.alipay.easysdk.base.oauth.models.AlipaySystemOauthTokenResponse; import com.alipay.easysdk.factory.Factory; -import com.aliyun.tea.TeaUnretryableException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; @@ -48,8 +42,8 @@ import com.jsowell.common.util.http.HttpUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.common.util.id.SnowflakeIdWorker; import com.jsowell.common.util.ip.AddressUtils; -import com.jsowell.netty.handler.HeartbeatRequestHandler; -import com.jsowell.netty.handler.TransactionRecordsRequestHandler; +import com.jsowell.netty.handler.yunkuaichong.HeartbeatRequestHandler; +import com.jsowell.netty.handler.yunkuaichong.TransactionRecordsRequestHandler; import com.jsowell.netty.service.camera.impl.CameraBusinessServiceImpl; import com.jsowell.netty.service.yunkuaichong.YKCBusinessService; import com.jsowell.pile.domain.*; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/factory/YKCOperateFactory.java b/jsowell-netty/src/main/java/com/jsowell/netty/factory/YKCOperateFactory.java index a0edbfcdf..f45f3e2d5 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/factory/YKCOperateFactory.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/factory/YKCOperateFactory.java @@ -2,7 +2,7 @@ package com.jsowell.netty.factory; import com.google.common.collect.Maps; import com.jsowell.common.util.StringUtils; -import com.jsowell.netty.handler.AbstractHandler; +import com.jsowell.netty.handler.yunkuaichong.AbstractHandler; import java.util.Map; import java.util.Objects; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/AbstractHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/diandanche/AbstractHandler.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/AbstractHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/diandanche/AbstractHandler.java index 3e560ea9a..200a5ac28 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/AbstractHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/diandanche/AbstractHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.diandanche; import com.google.common.primitives.Bytes; import com.jsowell.common.constant.CacheConstants; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java new file mode 100644 index 000000000..dad0f9121 --- /dev/null +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java @@ -0,0 +1,92 @@ +package com.jsowell.netty.handler.yunkuaichong; + +import com.google.common.primitives.Bytes; +import com.jsowell.common.constant.CacheConstants; +import com.jsowell.common.core.domain.ykc.YKCDataProtocol; +import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; +import com.jsowell.common.core.redis.RedisCache; +import com.jsowell.common.enums.ykc.PileChannelEntity; +import com.jsowell.common.util.BytesUtil; +import com.jsowell.common.util.CRC16Util; +import com.jsowell.common.util.DateUtils; +import io.netty.channel.Channel; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * 模板方法模式 + */ +public abstract class AbstractHandler implements InitializingBean { + + @Autowired + private RedisCache redisCache; + + /** + * 执行逻辑 + * 有应答 + */ + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + throw new UnsupportedOperationException(); + } + + /** + * 执行逻辑 + * 不需要应答 + */ + // public void pushProcess() { + // throw new UnsupportedOperationException(); + // } + + /** + * 组装应答的结果 + * @param ykcDataProtocol 请求数据 + * @param messageBody 消息体 + * @return 应答结果 + */ + protected byte[] getResult(YKCDataProtocol ykcDataProtocol, byte[] messageBody) { + // 起始标志 + byte[] head = ykcDataProtocol.getHead(); + // 序列号域 + byte[] serialNumber = ykcDataProtocol.getSerialNumber(); + // 加密标志 + byte[] encryptFlag = ykcDataProtocol.getEncryptFlag(); + // 请求帧类型 + byte[] requestFrameType = ykcDataProtocol.getFrameType(); + // 应答帧类型 + byte[] responseFrameType = YKCFrameTypeCode.ResponseRelation.getResponseFrameTypeBytes(requestFrameType); + + // 数据域 值为“序列号域+加密标志+帧类型标志+消息体”字节数之和 + byte[] dataFields = Bytes.concat(serialNumber, encryptFlag, responseFrameType, messageBody); + // 计算crc： 从序列号域到数据域的 CRC 校验 + int crc16 = CRC16Util.calcCrc16(dataFields); + return Bytes.concat(head, BytesUtil.intToBytes(dataFields.length, 1), dataFields, BytesUtil.intToBytes(crc16)); + } + + /** + * 保存桩最后链接到平台的时间 + * @param pileSn 桩编号 + */ + protected void saveLastTimeAndCheckChannel(String pileSn, Channel channel) { + String redisKey = CacheConstants.PILE_LAST_CONNECTION + pileSn; + redisCache.setCacheObject(redisKey, DateUtils.getDateTime(), CacheConstants.cache_expire_time_1d); + + // 保存桩号和channel的关系 + PileChannelEntity.checkChannel(pileSn, channel); + } + + /** + * 阻止重复帧 + * @return true 重复 + */ + protected boolean verifyTheDuplicateRequest(YKCDataProtocol ykcDataProtocol, Channel channel) { + // 获取序列号域 + int serialNumber = BytesUtil.bytesToIntLittle(ykcDataProtocol.getSerialNumber()); + // 获取channelId + String channelId = channel.id().asShortText(); + String redisKey = "Request_" + channelId + "_" + serialNumber; + Boolean result = redisCache.setnx(redisKey, ykcDataProtocol.getHEXString(), 30); + // result返回false说明没有设置成功，就是说已经有相同请求了，所以返回true重复 + return !result; + } + +} \ No newline at end of file diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSAbortDuringChargingPhaseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSAbortDuringChargingPhaseHandler.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSAbortDuringChargingPhaseHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSAbortDuringChargingPhaseHandler.java index bfd3472de..8f52fc771 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSAbortDuringChargingPhaseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSAbortDuringChargingPhaseHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSDemandAndChargerOutputHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSDemandAndChargerOutputHandler.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSDemandAndChargerOutputHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSDemandAndChargerOutputHandler.java index 1dc3f5e1e..0d82fbf28 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSDemandAndChargerOutputHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSDemandAndChargerOutputHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSInformationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSInformationHandler.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSInformationHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSInformationHandler.java index efe908a48..96074b005 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSInformationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSInformationHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateRequestHandler.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateRequestHandler.java index 0b3796b27..8acb5bb1f 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateRequestHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateResponseHandler.java similarity index 96% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateResponseHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateResponseHandler.java index 77a484fce..d2b46d928 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateResponseHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateSettingHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateSettingHandler.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateSettingHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateSettingHandler.java index 0ea118eba..05b322e7d 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateSettingHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateSettingHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateValidateRequestHandler.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateValidateRequestHandler.java index e81b4949c..9230fe7a1 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateValidateRequestHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.google.common.primitives.Bytes; import com.jsowell.common.constant.Constants; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargeEndHandler.java similarity index 99% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargeEndHandler.java index 50ca92a3f..f19117db6 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargeEndHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargerAbortedDuringChargingPhaseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargerAbortedDuringChargingPhaseHandler.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargerAbortedDuringChargingPhaseHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargerAbortedDuringChargingPhaseHandler.java index 05a0897f4..9db4000ee 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargerAbortedDuringChargingPhaseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargerAbortedDuringChargingPhaseHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargingHandshakeHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargingHandshakeHandler.java similarity index 99% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargingHandshakeHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargingHandshakeHandler.java index 426332eca..581fa17e2 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargingHandshakeHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargingHandshakeHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java similarity index 99% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java index a50d6f724..79eb51179 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.alibaba.fastjson2.JSON; import com.google.common.primitives.Bytes; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ErrorMessageHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ErrorMessageHandler.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/ErrorMessageHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ErrorMessageHandler.java index 148c4f1ad..632e31866 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ErrorMessageHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ErrorMessageHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/GroundLockDataUploadHandler.java similarity index 99% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/GroundLockDataUploadHandler.java index e95ded2e6..423024bf1 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/GroundLockDataUploadHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.alibaba.fastjson2.JSON; import com.jsowell.common.constant.CacheConstants; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/HeartbeatRequestHandler.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/HeartbeatRequestHandler.java index dc6e86489..cbd5f7b8d 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/HeartbeatRequestHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.google.common.primitives.Bytes; import com.jsowell.common.constant.Constants; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java similarity index 99% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java index 2c492c02b..cd5908247 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.alibaba.fastjson2.JSON; import com.google.common.collect.Lists; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningHandler.java similarity index 96% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningHandler.java index 14ade9324..5dff7296c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningResponseHandler.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningResponseHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningResponseHandler.java index 01abe7d03..6bce8a7dc 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningResponseHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryHandler.java similarity index 96% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryHandler.java index 4bf451ab7..ed2e88815 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryResponseHandler.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryResponseHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryResponseHandler.java index 8f6289eb7..05648b774 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryResponseHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationHandler.java similarity index 96% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationHandler.java index b90519e95..83f79c05b 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationResponseHandler.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationResponseHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationResponseHandler.java index 2fdbe9c8e..5ae46a420 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationResponseHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java similarity index 99% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java index 2c887cbc6..1e8dee24b 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingHandler.java similarity index 96% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingHandler.java index 4656d8614..5b2d5956e 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingResponseHandler.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingResponseHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingResponseHandler.java index 0f7f2d199..0a798ff90 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingResponseHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/QueryPileWorkParamsHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/QueryPileWorkParamsHandler.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/QueryPileWorkParamsHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/QueryPileWorkParamsHandler.java index 68cc065c1..ce9b4c44d 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/QueryPileWorkParamsHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/QueryPileWorkParamsHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ReadRealTimeMonitorDataHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReadRealTimeMonitorDataHandler.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/ReadRealTimeMonitorDataHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReadRealTimeMonitorDataHandler.java index 642fb25ac..029b8347e 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ReadRealTimeMonitorDataHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReadRealTimeMonitorDataHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.google.common.primitives.Bytes; import com.jsowell.common.constant.Constants; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteAccountBalanceUpdateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteAccountBalanceUpdateRequestHandler.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteAccountBalanceUpdateRequestHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteAccountBalanceUpdateRequestHandler.java index 2fc7a69fd..a10b2f09c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteAccountBalanceUpdateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteAccountBalanceUpdateRequestHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockHandler.java similarity index 96% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockHandler.java index b4492df99..96bce9448 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockResponseHandler.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockResponseHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockResponseHandler.java index 3146078af..d0ac9e25c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockResponseHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeHandler.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeHandler.java index 61a4367ff..356445c0c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.google.common.primitives.Bytes; import com.jsowell.common.constant.Constants; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeResponseHandler.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeResponseHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeResponseHandler.java index e9f560fb6..15f99825a 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeResponseHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartHandler.java similarity index 96% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartHandler.java index 1dcb4f746..640b9058d 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartResponseHandler.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartResponseHandler.java index bf976bd70..979d32dec 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartResponseHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.alibaba.fastjson2.JSON; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java similarity index 99% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java index 2f799d0f6..0b0ffdf8d 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStopChargingRequestHandler.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStopChargingRequestHandler.java index 71634b9bc..fdb8aebca 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStopChargingRequestHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateHandler.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateHandler.java index 334500369..3e2e1c7e7 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateResponseHandler.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateResponseHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateResponseHandler.java index 49434ab67..d82100b88 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateResponseHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ReserveChargingHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReserveChargingHandler.java similarity index 93% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/ReserveChargingHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReserveChargingHandler.java index fe8506383..b77bcb6df 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ReserveChargingHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReserveChargingHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ReserveChargingResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReserveChargingResponseHandler.java similarity index 92% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/ReserveChargingResponseHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReserveChargingResponseHandler.java index 0e71efd30..65d2600c2 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ReserveChargingResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReserveChargingResponseHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/SettingPileWorkParamsHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/SettingPileWorkParamsHandler.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/SettingPileWorkParamsHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/SettingPileWorkParamsHandler.java index f045374ed..51e265d3c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/SettingPileWorkParamsHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/SettingPileWorkParamsHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingHandler.java similarity index 96% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingHandler.java index f9d3e7997..838495498 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingResponseHandler.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingResponseHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingResponseHandler.java index 2b7b53282..9103dbd09 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingResponseHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java similarity index 99% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java index 473a46cf2..0d8a08e72 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.alibaba.fastjson2.JSON; import com.google.common.primitives.Bytes; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java similarity index 99% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java index a823a579b..20fa50903 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java @@ -1,4 +1,4 @@ -package com.jsowell.netty.handler; +package com.jsowell.netty.handler.yunkuaichong; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.core.domain.ykc.RealTimeMonitorData; @@ -17,8 +17,6 @@ import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.service.PileBasicInfoService; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.thirdparty.common.CommonService; -import com.jsowell.thirdparty.common.NotificationDTO; -import com.jsowell.thirdparty.common.NotificationService; 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 6885155be..f20aa0c10 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 @@ -7,7 +7,7 @@ import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.netty.handler.AbstractHandler; +import com.jsowell.netty.handler.yunkuaichong.AbstractHandler; import com.jsowell.netty.service.yunkuaichong.YKCBusinessService; import com.jsowell.pile.service.PileConnectorInfoService; import com.jsowell.pile.service.PileMsgRecordService; diff --git a/jsowell-ui/.env.development b/jsowell-ui/.env.development index e2d243ea0..18654a1eb 100644 --- a/jsowell-ui/.env.development +++ b/jsowell-ui/.env.development @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 万车充后台管理系统 +VUE_APP_TITLE = 万车充运营管理平台 # 开发环境配置 ENV = 'development' -# 万车充后台管理系统/开发环境 +# 万车充运营管理平台/开发环境 VUE_APP_BASE_API = '/dev-api' # 路由懒加载 diff --git a/jsowell-ui/.env.production b/jsowell-ui/.env.production index 482dd1eac..6ee239ce9 100644 --- a/jsowell-ui/.env.production +++ b/jsowell-ui/.env.production @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 万车充后台管理系统 +VUE_APP_TITLE = 万车充运营管理平台 # 生产环境配置 ENV = 'production' -# 万车充后台管理系统/生产环境 +# 万车充运营管理平台/生产环境 VUE_APP_BASE_API = '/prod-api' diff --git a/jsowell-ui/.env.staging b/jsowell-ui/.env.staging index f7b83c5ab..189957570 100644 --- a/jsowell-ui/.env.staging +++ b/jsowell-ui/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 万车充后台管理系统 +VUE_APP_TITLE = 万车充运营管理平台 # 测试环境配置 ENV = 'staging' -# 万车充后台管理系统/测试环境 +# 万车充运营管理平台/测试环境 VUE_APP_BASE_API = '/dev-api' # 开发环境配置 diff --git a/jsowell-ui/src/layout/components/Sidebar/Logo.vue b/jsowell-ui/src/layout/components/Sidebar/Logo.vue index c48b2d0cd..59d1c68b0 100644 --- a/jsowell-ui/src/layout/components/Sidebar/Logo.vue +++ b/jsowell-ui/src/layout/components/Sidebar/Logo.vue @@ -36,7 +36,7 @@ export default { }, data() { return { - title: '万车充后台管理系统', + title: '万车充运营管理平台', // logo: logoImg } } diff --git a/jsowell-ui/src/views/login.vue b/jsowell-ui/src/views/login.vue index be4582c87..038989038 100644 --- a/jsowell-ui/src/views/login.vue +++ b/jsowell-ui/src/views/login.vue @@ -1,7 +1,7 @@