diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java index a16b753d6..d81610a89 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java @@ -43,6 +43,8 @@ public class JumpController extends BaseController { logger.info("User-Agent:{}", request.getHeader("user-agent")); RestApiResponse response = null; try { + // 进入充电桩详情做一下鉴权 + getMemberIdByAuthorization(request); PileConnectorVO vo = pileService.getPileDetailByPileSn(pileSn); response = new RestApiResponse<>(vo); } catch (BusinessException e) { @@ -66,6 +68,8 @@ public class JumpController extends BaseController { logger.info("User-Agent:{}", request.getHeader("user-agent")); RestApiResponse response = null; try { + // 进入充电桩详情做一下鉴权 + getMemberIdByAuthorization(request); PileConnectorVO vo = pileService.getConnectorDetail(pileConnectorCode); response = new RestApiResponse<>(vo); } catch (BusinessException e) { diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java index 7aaea0d84..43522e00d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java @@ -81,6 +81,7 @@ public class PileConnectorInfoController extends BaseController { @Log(title = "充电桩枪口信息", businessType = BusinessType.UPDATE) @PostMapping("/updateParkNo") public RestApiResponse updateParkNo(@RequestBody UpdateConnectorParkNoDTO dto) { + logger.info("修改车位号 param:{}", JSONObject.toJSONString(dto)); RestApiResponse response = null; try { int i = pileConnectorInfoService.updateConnectorParkNo(dto); diff --git a/jsowell-admin/src/main/resources/application.yml b/jsowell-admin/src/main/resources/application.yml index 2929630f5..de9bc248c 100644 --- a/jsowell-admin/src/main/resources/application.yml +++ b/jsowell-admin/src/main/resources/application.yml @@ -36,10 +36,10 @@ token: header: Authorization # 令牌密钥 secret: cdnflglzjoxjovuusklsqjtuup - # 令牌有效期（默认300分钟） - expireTime: 360 - # 接口令牌有效期 一个月 - serviceExpireTime: 43200 + # 令牌有效期一天（分钟） + expireTime: 1440 + # 接口令牌有效期 六个月 （分钟） + serviceExpireTime: 259200 # 用户配置 user: diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java index 687169a99..008fbda90 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java @@ -98,7 +98,9 @@ public class CacheConstants { */ public static final String GET_ORDER_INFO_BY_ORDER_CODE = "get_order_info_by_order_code:"; - // 通过交易流水号查询订单信息 + /** + * 通过交易流水号查询订单信息 + */ public static final String GET_ORDER_INFO_BY_TRANSACTION_CODE = "get_order_info_by_transaction_code:"; /** @@ -106,6 +108,9 @@ public class CacheConstants { */ public static final String PILE_REAL_TIME_MONITOR_DATA = "pile_real_time_monitor_data:"; + /** + * 充电桩充电状态 + */ public static final String PILE_IS_CHARGING = "pile_is_charging:"; /** diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSAbortDuringChargingPhaseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSAbortDuringChargingPhaseHandler.java index 71a2dfd8a..f4ff3ad4c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSAbortDuringChargingPhaseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSAbortDuringChargingPhaseHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -29,7 +28,7 @@ public class BMSAbortDuringChargingPhaseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===充电阶段 BMS 中止===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电阶段 BMS 中止===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSDemandAndChargerOutputHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSDemandAndChargerOutputHandler.java index 9ce2e1b3e..d8e722d5c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSDemandAndChargerOutputHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSDemandAndChargerOutputHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -29,7 +28,7 @@ public class BMSDemandAndChargerOutputHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===充电过程 BMS 需求与充电机输出===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电过程 BMS 需求与充电机输出===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSInformationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSInformationHandler.java index 6182d838f..a15085221 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSInformationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSInformationHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -29,7 +28,7 @@ public class BMSInformationHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===充电过程 BMS 信息===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电过程 BMS 信息===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); 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 595d0bb72..21ba48cef 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 @@ -1,13 +1,12 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; 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.factory.YKCOperateFactory; -import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.service.IPileBillingTemplateService; +import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.vo.web.BillingTemplateVO; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; @@ -39,7 +38,7 @@ public class BillingTemplateRequestHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===执行计费模板请求逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===执行计费模板请求逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体（此请求消息体只有桩编码） byte[] pileSnByte = ykcDataProtocol.getMsgBody(); String pileSn = BytesUtil.binary(pileSnByte, 16); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateResponseHandler.java index ab3094c70..b590ad306 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateResponseHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -28,7 +27,7 @@ public class BillingTemplateResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===执行计费模型设置应答逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===执行计费模型设置应答逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateSettingHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateSettingHandler.java index b83c0d9a5..539c6cdc0 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateSettingHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateSettingHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; @@ -29,7 +28,7 @@ public class BillingTemplateSettingHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===执行计费模型设置逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===执行计费模型设置逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 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 902cc8b7d..a3eadedd4 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 @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.google.common.primitives.Bytes; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; @@ -8,8 +7,8 @@ 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.pile.service.YKCPushCommandService; import com.jsowell.pile.service.IPileBillingTemplateService; +import com.jsowell.pile.service.YKCPushCommandService; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -40,8 +39,7 @@ public class BillingTemplateValidateRequestHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - - log.info("[===执行计费模板验证请求逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===执行计费模板验证请求逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java index fcb28f701..4d4cc826c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; @@ -12,8 +11,8 @@ import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.ThirdPartyStationRelation; import com.jsowell.pile.service.IOrderBasicInfoService; -import com.jsowell.pile.service.IThirdPartyStationRelationService; import com.jsowell.pile.service.IThirdPartySettingInfoService; +import com.jsowell.pile.service.IThirdPartyStationRelationService; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.thirdparty.yongchengboche.service.YCBCService; @@ -59,7 +58,7 @@ public class ChargeEndHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===执行充电结束逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===执行充电结束逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargerAbortedDuringChargingPhaseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargerAbortedDuringChargingPhaseHandler.java index 4e8218ed4..12b263f55 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargerAbortedDuringChargingPhaseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargerAbortedDuringChargingPhaseHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -29,7 +28,7 @@ public class ChargerAbortedDuringChargingPhaseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===充电阶段充电机中止===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电阶段充电机中止===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargingHandshakeHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargingHandshakeHandler.java index f989baa33..630b71e90 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargingHandshakeHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargingHandshakeHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -29,7 +28,7 @@ public class ChargingHandshakeHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===执行充电握手逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===执行充电握手逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java index 4184ee8c2..1ed6bffd2 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java @@ -59,7 +59,7 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===充电桩主动申请启动充电===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电桩主动申请启动充电===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ErrorMessageHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ErrorMessageHandler.java index 97e038d20..353b98c63 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ErrorMessageHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ErrorMessageHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -29,7 +28,7 @@ public class ErrorMessageHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===错误报文===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===错误报文===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java index e90904253..6c8ce9e90 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java @@ -1,7 +1,6 @@ package com.jsowell.netty.handler; import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.core.domain.ykc.GroundLockData; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; @@ -50,7 +49,7 @@ public class GroundLockDataUploadHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===地锁数据上送===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===地锁数据上送===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); 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 c2a35c8e4..7e5eb0e6b 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 @@ -112,7 +112,7 @@ public class LoginRequestHandler extends AbstractHandler { @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===执行登录逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===执行登录逻辑===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningHandler.java index 7e27da875..8239b8ac6 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; @@ -29,7 +28,7 @@ public class OfflineCardDataCleaningHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===离线卡数据清除===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===离线卡数据清除===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningResponseHandler.java index 597e31ba6..3dc257a0c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningResponseHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -28,7 +27,7 @@ public class OfflineCardDataCleaningResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===离线卡数据清除应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===离线卡数据清除应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryHandler.java index 0b8a1bc56..61195d759 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; @@ -30,7 +29,7 @@ public class OfflineCardDataQueryHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===离线卡数据查询===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===离线卡数据查询===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编码 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryResponseHandler.java index 81d7d1972..e4c705abd 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryResponseHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -28,7 +27,7 @@ public class OfflineCardDataQueryResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===离线卡数据查询应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===离线卡数据查询应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationHandler.java index 6acb5846b..3ef6747d8 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; @@ -30,7 +29,7 @@ public class OfflineCardDataSynchronizationHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===离线卡数据同步===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===离线卡数据同步===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationResponseHandler.java index 1e7384c08..113c01491 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationResponseHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -28,7 +27,7 @@ public class OfflineCardDataSynchronizationResponseHandler extends AbstractHandl @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===离线卡数据同步应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===离线卡数据同步应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); //消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java index 6301e6606..d1fe81c1d 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -37,7 +36,7 @@ public class ParameterConfigurationHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===参数配置===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===参数配置===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingHandler.java index ca4cb328e..c4bd88856 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; @@ -29,7 +28,7 @@ public class PileWorkingParameterSettingHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===充电桩工作参数设置===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电桩工作参数设置===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingResponseHandler.java index f063fe40b..3e727d140 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingResponseHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -28,7 +27,7 @@ public class PileWorkingParameterSettingResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===充电桩工作参数设置应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电桩工作参数设置应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/QueryPileWorkParamsHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/QueryPileWorkParamsHandler.java index 67d7c1989..2b6c19526 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/QueryPileWorkParamsHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/QueryPileWorkParamsHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -28,7 +27,7 @@ public class QueryPileWorkParamsHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[====充电桩査询工作参数回复====] param:{}", JSONObject.toJSONString(ykcDataProtocol)); + // log.info("[====充电桩査询工作参数回复====] param:{}", JSONObject.toJSONString(ykcDataProtocol)); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); 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 da3bd3f83..80fac4acf 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 @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.google.common.primitives.Bytes; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; @@ -37,7 +36,7 @@ public class ReadRealTimeMonitorDataHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===读取实时监测数据===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===读取实时监测数据===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 byte[] pileSnByteArr = new byte[]{}; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteAccountBalanceUpdateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteAccountBalanceUpdateRequestHandler.java index d2b129295..a1b308817 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteAccountBalanceUpdateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteAccountBalanceUpdateRequestHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -28,7 +27,7 @@ public class RemoteAccountBalanceUpdateRequestHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===余额更新应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===余额更新应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockHandler.java index b618cd743..b22a617cc 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; @@ -29,7 +28,7 @@ public class RemoteControlGroundLockHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===遥控地锁升锁与降锁命令===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===遥控地锁升锁与降锁命令===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编码 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockResponseHandler.java index bc3fb6ec2..93055c28e 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockResponseHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -36,7 +35,7 @@ public class RemoteControlGroundLockResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===充电桩返回遥控地锁升锁与降锁数据（上行）===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===充电桩返回遥控地锁升锁与降锁数据（上行）===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); 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 7e25a9fb1..53c5133d5 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 @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.google.common.primitives.Bytes; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; @@ -35,7 +34,7 @@ public class RemoteIssuedQrCodeHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===后台远程下发二维码前缀指令===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===后台远程下发二维码前缀指令===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编码 String pileSn = "88000000000001"; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeResponseHandler.java index efffd4b54..8cdb2920d 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeResponseHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -28,7 +27,7 @@ public class RemoteIssuedQrCodeResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===桩应答远程下发二维码前缀指令===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===桩应答远程下发二维码前缀指令===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartHandler.java index 33f952924..abe35be93 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; @@ -30,7 +29,7 @@ public class RemoteRestartHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===远程重启===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===远程重启===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java index 8d24061b1..81fc03db9 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java @@ -33,7 +33,7 @@ public class RemoteRestartResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===远程重启应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===远程重启应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java index fc9711da7..5de467ca0 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; @@ -36,7 +35,7 @@ public class RemoteStartChargingRequestHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===远程启动充电命令回复===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===远程启动充电命令回复===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java index b389437f8..32e377ae9 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.enums.ykc.OrderStatusEnum; @@ -39,7 +38,7 @@ public class RemoteStopChargingRequestHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===远程停机命令回复===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===远程停机命令回复===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateHandler.java index 04c797261..36800fcf0 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; @@ -30,7 +29,7 @@ public class RemoteUpdateHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===远程更新===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===远程更新===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateResponseHandler.java index 2291d071f..1846fd2cc 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateResponseHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -28,7 +27,7 @@ public class RemoteUpdateResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[====远程更新应答====] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[====远程更新应答====] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/SettingPileWorkParamsHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/SettingPileWorkParamsHandler.java index 72d061901..6d8600ee1 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/SettingPileWorkParamsHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/SettingPileWorkParamsHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -28,7 +27,7 @@ public class SettingPileWorkParamsHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[====平台设置工作参数回复====] param:{}", JSONObject.toJSONString(ykcDataProtocol)); + // log.info("[====平台设置工作参数回复====] param:{}", JSONObject.toJSONString(ykcDataProtocol)); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingHandler.java index 803b44b72..48a11dbe9 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; @@ -29,7 +28,7 @@ public class TimeCheckSettingHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===对时设置===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===对时设置===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingResponseHandler.java index 75e5c53af..efbaae11d 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingResponseHandler.java @@ -1,6 +1,5 @@ package com.jsowell.netty.handler; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; @@ -28,7 +27,7 @@ public class TimeCheckSettingResponseHandler extends AbstractHandler{ @Override public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { - log.info("[===对时设置应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); + // log.info("[===对时设置应答===] param:{}, channel:{}", JSONObject.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java index 6a22ecdef..19f461472 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java @@ -1,6 +1,7 @@ package com.jsowell.netty.server.yunkuaichong; import com.google.common.collect.Lists; +import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.enums.ykc.PileChannelEntity; import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.StringUtils; @@ -84,8 +85,9 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter { // 心跳包0x03日志太多，造成日志文件过大，改为不打印 if (!CollectionUtils.containsAny(notPrintFrameTypeList, frameType)) { - log.info("【<<<<<平台收到消息<<<<<】channel:{}, 帧类型:{}, 序列号域:{}, 报文:{}, new报文:{}, msg:{}", - ctx.channel().id(), frameType, serialNumber, BytesUtil.binary(arr, 16), hexString, Arrays.toString(arr)); + log.info("【<<<<<平台收到消息<<<<<】channel:{}, 帧类型:{}, 帧名称:{}, 序列号域:{}, 报文:{}, new报文:{}, msg:{}", + ctx.channel().id(), frameType, YKCFrameTypeCode.getFrameTypeStr(frameType), serialNumber, + BytesUtil.binary(arr, 16), hexString, Arrays.toString(arr)); } // 处理数据 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index 95bb80c67..7ece3a392 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -125,22 +125,28 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { } /** - * 公共方法 根据桩编号删除redis缓存 + * 公共方法 根据桩编号或者枪口号删除redis缓存 */ - private void deleteRedisByPileSn(String pileSn) { + private void deleteRedisByPileSnOrPileConnectorCode(String pileSn, String pileConnectorCode) { List keys = Lists.newArrayList(); - // 删除枪口信息缓存 - keys.add(CacheConstants.SELECT_PILE_CONNECTOR_INFO_LIST + pileSn); - // 删除充电桩详情缓存 - keys.add(CacheConstants.PILE_DETAIL_KEY + pileSn); - // 删除充电桩枪口状态缓存 - Set scan = redisCache.scan(CacheConstants.PILE_CONNECTOR_STATUS_KEY + pileSn + "*"); - if (CollectionUtils.isNotEmpty(scan)) { - keys.addAll(scan); + if (StringUtils.isNotBlank(pileSn)) { + // 删除枪口信息缓存 + keys.add(CacheConstants.SELECT_PILE_CONNECTOR_INFO_LIST + pileSn); + + // 删除充电桩详情缓存 + keys.add(CacheConstants.PILE_DETAIL_KEY + pileSn); } + + if (StringUtils.isNotBlank(pileConnectorCode)) { + // 删除充电桩枪口状态缓存 + keys.add(CacheConstants.PILE_CONNECTOR_STATUS_KEY + pileConnectorCode); + } + // 批量删除 - // log.debug("批量删除缓存 pileSn:{}, keys:{}", pileSn, keys); - redisCache.deleteObject(keys); + if (CollectionUtils.isNotEmpty(keys)) { + redisCache.deleteObject(keys); + } + log.info("批量删除缓存 pileSn:{}, pileConnectorCode:{}, keys:{}", pileSn, pileConnectorCode, keys); } /** @@ -572,12 +578,13 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { } String redisKey = CacheConstants.PILE_CONNECTOR_STATUS_KEY + pileConnectorCode; String redisStatus = redisCache.getCacheObject(redisKey); - log.info("更新枪口状态-枪口编号:{}, 缓存状态：{}, 传来的状态：{}, 状态描述:{}", pileConnectorCode, redisStatus, status, PileConnectorDataBaseStatusEnum.getStatusDescription(status)); + log.info("更新枪口状态-枪口编号:{}, redisKey:{}, 缓存状态：{}, 传来的状态：{}, 状态描述:{}", pileConnectorCode, redisKey, + redisStatus, status, PileConnectorDataBaseStatusEnum.getStatusDescription(status)); if (!StringUtils.equals(redisStatus, status)) { String pileSn = pileConnectorCode.substring(0, pileConnectorCode.length() - 2); // 只修改一个枪口的状态 num = pileConnectorInfoMapper.updateConnectorStatus(pileConnectorCode, status); - deleteRedisByPileSn(pileSn); + deleteRedisByPileSnOrPileConnectorCode(pileSn, pileConnectorCode); redisCache.setCacheObject(redisKey, status, CacheConstants.cache_expire_time_3m); // 异步放缓存 @@ -744,7 +751,7 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { int i = pileConnectorInfoMapper.updatePileConnectorInfo(info); // 删除缓存 String pileSn = dto.getPileSn(); - deleteRedisByPileSn(pileSn); + deleteRedisByPileSnOrPileConnectorCode(pileSn, null); return i; }