From 49e06535074e2046c53970f8b999b2aec46c5803 Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 9 Mar 2026 14:34:06 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=94=B5=E6=B1=A0=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/thirdparty/ChargeAlgorithmController.java | 14 ++++++++++++++ .../TransactionRecordsRequestHandler.java | 7 ++++--- .../jsowell/pile/dto/BatteryChargeReportDTO.java | 2 ++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChargeAlgorithmController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChargeAlgorithmController.java index 632b79522..23f670682 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChargeAlgorithmController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChargeAlgorithmController.java @@ -44,4 +44,18 @@ public class ChargeAlgorithmController extends BaseController { } return response; } + + @PostMapping("/getUrlByTaskId") + public RestApiResponse getUrlByTaskId(@RequestBody BatteryChargeReportDTO dto) { + RestApiResponse response = null; + try { + String url = batteryChargeReportService.getUrlByTaskId(dto.getTaskId(), dto.getReportType()); + response = new RestApiResponse<>(url); + }catch (Exception e) { + logger.error("算法应用推送订单信息 error, ", e); + response = new RestApiResponse<>(e); + } + return response; + } + } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java index 9754e52ef..1be69dc92 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java @@ -768,12 +768,13 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler { } } if (StringUtils.isBlank(taskId)) { - log.info("推送充电订单算法平台 taskId 为空"); + taskId = batteryChargeReportService.getTaskIdByOrderCode(orderCode); + // log.info("推送充电订单算法平台 taskId 为空"); } - log.info("推送充电订单算法平台 taskId:{}", taskId); + log.info("推送充电订单算法平台 orderCode:{}, taskId:{}", orderCode, taskId); // 再根据 tasKId 获取链接 String url = batteryChargeReportService.getUrlByTaskId(taskId, reportType); - log.info("推送充电订单算法平台 result:{}", url); + log.info("推送充电订单算法平台 orderCode:{}, result:{}", orderCode, url); return url; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/BatteryChargeReportDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/BatteryChargeReportDTO.java index 71cf5676a..fac3351bb 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/BatteryChargeReportDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/BatteryChargeReportDTO.java @@ -23,4 +23,6 @@ public class BatteryChargeReportDTO { * 1-web; 2-pdf */ private String reportType; + + private String taskId; }