From efe869d79ba278f098c8a4a4d316b8678ce2c2b2 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 4 Sep 2024 13:48:39 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=94=B5=E5=8D=95=E8=BD=A6=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/uniapp/customer/PileController.java | 15 ++++----------- .../electricbicycles/SettlementUploadHandler.java | 5 ++++- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java index 9196d1949..3380b2549 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java @@ -119,7 +119,7 @@ public class PileController extends BaseController { */ @PostMapping("/selectConnectorListByParams") public RestApiResponse selectConnectorListByParams(HttpServletRequest request, @RequestBody QueryConnectorListDTO dto) { - logger.info("查询充电枪口列表 params:{}", JSON.toJSONString(dto)); + logger.debug("查询充电枪口列表 params:{}", JSON.toJSONString(dto)); RestApiResponse response = null; try { PageResponse pageResponse = pileConnectorInfoService.getUniAppConnectorInfoListByParams(dto); @@ -128,7 +128,7 @@ public class PileController extends BaseController { logger.error("查询充电枪口列表异常", e); response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_CONNECTOR_INFO_BY_STATION_ID_ERROR); } - logger.info("查询充电枪口列表 result:{}", response); + logger.debug("查询充电枪口列表 result:{}", response); return response; } @@ -141,15 +141,8 @@ public class PileController extends BaseController { */ @PostMapping("/selectStationConnectorList") public RestApiResponse selectStationConnectorList(HttpServletRequest request, @RequestBody QueryConnectorListDTO dto) { - logger.info("查询充电枪口列表 params:{}", JSON.toJSONString(dto)); + logger.debug("查询充电枪口列表 params:{}", JSON.toJSONString(dto)); RestApiResponse response = null; - // try { - // // 查询对接第三方平台的枪口状态 - // selectThirdPartyConnectorStatus(dto); - // } catch (Exception e) { - // logger.error("修改对接第三方平台的枪口状态 error"); - // } - try { PageResponse pageResponse = pileConnectorInfoService.selectStationConnectorList(dto); response = new RestApiResponse<>(pageResponse); @@ -157,7 +150,7 @@ public class PileController extends BaseController { logger.error("查询充电枪口列表异常", e); response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_CONNECTOR_INFO_BY_STATION_ID_ERROR); } - logger.info("查询充电枪口列表 result:{}", response); + logger.debug("查询充电枪口列表, params:{}, result:{}", JSON.toJSONString(dto), response); return response; } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java index 273835d89..80529755b 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java @@ -1,6 +1,7 @@ package com.jsowell.netty.handler.electricbicycles; import com.alibaba.fastjson2.JSON; +import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.ebike.EBikeDataProtocol; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.EBikeOperateFactory; @@ -40,7 +41,9 @@ public class SettlementUploadHandler extends AbstractEBikeHandler { saveLastTimeAndCheckChannel(message.getPhysicalId() + "", ctx); EBikeMessageCmd03.SettlementInfo settlementInfo = message.getSettlementInfo(); log.info("结算消费信息上传:{}", JSON.toJSONString(message)); - return null; + + // 返回结果 + return getResult(dataProtocol, Constants.zeroByteArray); } }