From 2134c13b7b2815983281fdc819e3138ffde1bc48 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 05 八月 2025 21:10:42 +0800
Subject: [PATCH] 所有代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java | 22 +++++++++++++++++-----
1 files changed, 17 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..99b3d35 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
@@ -2,6 +2,8 @@
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.ChargingOrderGroup;
+import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.dto.GetImportOrderDTO;
import com.ruoyi.order.model.ChargeOrder;
@@ -9,8 +11,10 @@
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;
+import java.util.List;
@Api(tags = "充电订单")
@RestController
@@ -18,16 +22,24 @@
public class ChargeOrderController {
@Resource
private ChargeOrderService chargeOrderService;
+ @PostMapping(value = "/getBySiteIdAndTime")
+ public R<List<ChargingOrderGroup>> getBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto) {
+ List<ChargingOrderGroup> groups = chargeOrderService.chargingOrderGroup(chargingPercentProvinceDto);
+ return R.ok(groups);
+ }
/**
* 导入充电信息
*/
@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