From 91efa36e04782669bb6505165f1ededaec693da4 Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 24 Nov 2025 10:05:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=85=85=E7=94=B5=E6=8A=A5=E5=91=8A=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdparty/ChargeAlgorithmController.java | 2 +- .../api/uniapp/customer/OrderController.java | 23 +++++++++++++++++++ .../pile}/dto/BatteryChargeReportDTO.java | 2 +- .../mapper/ChargeAlgorithmRecordMapper.java | 2 ++ .../service/ChargeAlgorithmRecordService.java | 8 +++++++ .../ChargeAlgorithmRecordServiceImpl.java | 22 ++++++++++++++++++ 6 files changed, 57 insertions(+), 2 deletions(-) rename {jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform => jsowell-pile/src/main/java/com/jsowell/pile}/dto/BatteryChargeReportDTO.java (89%) 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 a1cc8c279..632b79522 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 @@ -4,7 +4,7 @@ import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.StringUtils; -import com.jsowell.thirdparty.platform.dto.BatteryChargeReportDTO; +import com.jsowell.pile.dto.BatteryChargeReportDTO; import com.jsowell.thirdparty.platform.service.impl.BatteryChargeReportService; import com.jsowell.thirdparty.platform.service.impl.ChargeAlgorithmService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java index 449756f25..a511a9066 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java @@ -21,6 +21,8 @@ import com.jsowell.pile.vo.uniapp.customer.OrderVO; import com.jsowell.pile.vo.uniapp.customer.ParkingOrderVO; import com.jsowell.pile.vo.uniapp.customer.UniAppOrderVO; import com.jsowell.service.OrderService; +import com.jsowell.pile.dto.BatteryChargeReportDTO; +import com.jsowell.thirdparty.platform.service.impl.BatteryChargeReportService; import com.jsowell.wxpay.dto.WechatSendMsgDTO; import com.jsowell.wxpay.service.WxAppletRemoteService; import org.springframework.beans.factory.annotation.Autowired; @@ -53,6 +55,8 @@ public class OrderController extends BaseController { @Autowired private OrderBasicInfoService orderBasicInfoService; + @Autowired + private BatteryChargeReportService batteryChargeReportService; /** * 生成订单/创建订单 @@ -459,4 +463,23 @@ public class OrderController extends BaseController { logger.info("关闭订单：{}", orderCode); return response; } + + /** + * 查询充电报告 + * @param dto + * @return + */ + @PostMapping("/getBatteryReport") + public RestApiResponse getBatteryReport(@RequestBody BatteryChargeReportDTO dto) { + RestApiResponse response = null; + try { + String url = chargeAlgorithmRecordService.getUrlByParams(dto); + response = new RestApiResponse<>(ImmutableMap.of("url", url)); + } catch (Exception e) { + logger.error("查询订单号：{} 的充电报告 error:", dto.getOrderCode(), e); + response = new RestApiResponse<>(e); + } + logger.info("查询订单号：{} 的充电报告 params:{}, result:{}", dto.getOrderCode(), JSON.toJSONString(dto), response); + return response; + } } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/dto/BatteryChargeReportDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/BatteryChargeReportDTO.java similarity index 89% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/dto/BatteryChargeReportDTO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/dto/BatteryChargeReportDTO.java index 0aaec2143..71cf5676a 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/dto/BatteryChargeReportDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/BatteryChargeReportDTO.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.platform.dto; +package com.jsowell.pile.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ChargeAlgorithmRecordMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ChargeAlgorithmRecordMapper.java index 307d9d53f..12707a678 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ChargeAlgorithmRecordMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ChargeAlgorithmRecordMapper.java @@ -3,6 +3,8 @@ package com.jsowell.pile.mapper; import java.util.List; import com.jsowell.pile.domain.ChargeAlgorithmRecord; +import com.jsowell.pile.dto.BatteryChargeReportDTO; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; import org.springframework.stereotype.Repository; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/ChargeAlgorithmRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/ChargeAlgorithmRecordService.java index 28b2b38be..36fa3c262 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/ChargeAlgorithmRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/ChargeAlgorithmRecordService.java @@ -3,6 +3,7 @@ package com.jsowell.pile.service; import java.util.List; import com.jsowell.pile.domain.ChargeAlgorithmRecord; +import com.jsowell.pile.dto.BatteryChargeReportDTO; import com.jsowell.pile.vo.uniapp.customer.ChargeAlgorithmRecordVO; /** @@ -83,4 +84,11 @@ public interface ChargeAlgorithmRecordService { * @return */ ChargeAlgorithmRecord queryRecordByTaskId(String taskId); + + /** + * 通过参数获取报告地址 + * @param dto + * @return + */ + String getUrlByParams(BatteryChargeReportDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ChargeAlgorithmRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ChargeAlgorithmRecordServiceImpl.java index e8e86cbd9..46076aa1b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ChargeAlgorithmRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ChargeAlgorithmRecordServiceImpl.java @@ -3,7 +3,10 @@ package com.jsowell.pile.service.impl; import java.util.List; import com.alibaba.fastjson2.JSON; +import com.jsowell.common.constant.Constants; import com.jsowell.common.util.DateUtils; +import com.jsowell.common.util.StringUtils; +import com.jsowell.pile.dto.BatteryChargeReportDTO; import com.jsowell.pile.service.ChargeAlgorithmRecordService; import com.jsowell.pile.vo.uniapp.customer.ChargeAlgorithmRecordVO; import org.springframework.beans.factory.annotation.Autowired; @@ -115,6 +118,25 @@ public class ChargeAlgorithmRecordServiceImpl implements ChargeAlgorithmRecordSe return chargeAlgorithmRecordMapper.queryRecordByTaskId(taskId); } + /** + * 通过参数获取报告URL + * @param dto + * @return + */ + @Override + public String getUrlByParams(BatteryChargeReportDTO dto) { + ChargeAlgorithmRecord record = queryRecordByOrderCode(dto.getOrderCode()); + String reportType = dto.getReportType(); + if (StringUtils.equals(Constants.ONE, reportType)) { + // 1-web 端 + return record.getWebUrl(); + }else if (StringUtils.equals(Constants.TWO, reportType)) { + // 2-pdf 端 + return record.getPdfUrl(); + } + return null; + } + /** * 通过订单号查询充电电池算法报告 * @param orderCode