From 2cbd12e0433dd28aa7a5a88f7c4cb8728de444f9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 七月 2025 10:49:39 +0800
Subject: [PATCH] Merge branch 'hlg' of http://120.76.84.145:10101/gitblit/r/java/gy_jifenshangcheng into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java
index f9d3bd1..1bfd56d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java
@@ -9,6 +9,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -23,11 +24,14 @@
* 导入充电信息
*/
@PostMapping("/importExpress")
- public R importExpress(@RequestBody String url) {
- JSONObject jsonObject = JSONObject.parseObject(url);
- String url2 = jsonObject.getString("url");
- chargeOrderService.importExpress(url2);
- return R.ok();
+ public R importExpress(@RequestParam("file") MultipartFile file) {
+ /* JSONObject jsonObject = JSONObject.parseObject(url);
+ String url2 = jsonObject.getString("url");*/
+ if (file.isEmpty()) {
+ return R.fail("请选择要上传的文件");
+ }
+
+ return chargeOrderService.importExpress(file);
}
/**
--
Gitblit v1.7.1