From 881a619d168a864b1aa76599bd4eb1bb44fc257c Mon Sep 17 00:00:00 2001 From: Lemon Date: Sat, 14 Oct 2023 09:27:24 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E8=8E=B7=E5=8F=96=E5=9C=B0?= =?UTF-8?q?=E9=94=81=E5=88=97=E8=A1=A8=E5=85=88=E5=88=A4=E6=96=AD=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=98=AF=E5=90=A6=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/api/uniapp/JumpController.java | 13 +++++++++++-- .../nanrui/service/impl/NRServiceImpl.java | 6 ++++++ 2 files changed, 17 insertions(+), 2 deletions(-) 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 8609a8be3..ec332ca7c 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 @@ -7,6 +7,7 @@ import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; +import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.file.AliyunOssUploadUtils; import com.jsowell.common.util.file.FileUtils; import com.jsowell.pile.service.IPileBasicInfoService; @@ -107,13 +108,21 @@ public class JumpController extends BaseController { * @return */ @GetMapping("/getGroundLockInfo/{stationId}") - public RestApiResponse getGroundLockInfo(@PathVariable("stationId") String stationId) { + public RestApiResponse getGroundLockInfo(@PathVariable("stationId") String stationId, HttpServletRequest request) { logger.info("获取地锁列表信息 params:{}", stationId); RestApiResponse response = null; try { + String memberId = getMemberIdByAuthorization(request); + if (StringUtils.isBlank(memberId)) { + throw new BusinessException(ReturnCodeEnum.CODE_TOKEN_ERROR); + } List list = pileBasicInfoService.getGroundLockInfo(stationId); response = new RestApiResponse<>(list); - } catch (Exception e) { + }catch (BusinessException e) { + logger.error("获取地锁列表信息 error,", e); + response = new RestApiResponse<>(e.getCode(), e.getMessage()); + } + catch (Exception e) { logger.error("获取地锁列表信息 error, ", e); response = new RestApiResponse<>(e); } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java index 33dd990af..1460560b5 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java @@ -516,6 +516,12 @@ public class NRServiceImpl implements NRService { return result; } + /** + * 查询充电电量信息 + * 此接口用于批量查询时间区段内交易记录 + * @param dto + * @return + */ @Override public List query_order_info(NRQueryOrderDTO dto) { List resultList = new ArrayList<>();