From 0f4459e4201fdc19185b7dd03215871f036acd70 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 28 五月 2025 16:45:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java
index 80316e9..11d0ca0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java
@@ -1,7 +1,9 @@
package com.ruoyi.order.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
import com.ruoyi.order.service.TChargingOrderAccountingStrategyService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.*;
@@ -9,6 +11,7 @@
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* <p>
@@ -33,9 +36,35 @@
* @return
*/
@ResponseBody
- @GetMapping("/getTotalElectricQuantity/{days}")
- public R<List<List<Map<String, Object>>>> getTotalElectricQuantity(@PathVariable Integer days){
- List<List<Map<String, Object>>> list = chargingOrderAccountingStrategyService.getTotalElectricQuantity(days);
+ @PostMapping("/getTotalElectricQuantity/{days}")
+ public R<List<List<Map<String, Object>>>> getTotalElectricQuantity(@PathVariable Integer days, @RequestParam("siteIds") Set<Integer> siteIds){
+ List<List<Map<String, Object>>> list = chargingOrderAccountingStrategyService.getTotalElectricQuantity(days, siteIds);
+ return R.ok(list);
+ }
+
+
+ /**
+ * 获取给定天数每天的充电度数
+ * @param days 天数
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getDailyChargingDegree/{days}")
+ public R<List<Double>> getDailyChargingDegree(@PathVariable Integer days, @RequestParam("siteIds") Set<Integer> siteIds){
+ List<Double> list = chargingOrderAccountingStrategyService.getDailyChargingDegree(days, siteIds);
+ return R.ok(list);
+ }
+
+
+
+ /**
+ * 根据订单id查询充电明细
+ * @param chargingOrderId
+ * @return
+ */
+ @PostMapping("/getChargingOrderAccountingStrategyByOrderId")
+ public R<List<TChargingOrderAccountingStrategy>> getChargingOrderAccountingStrategyByOrderId(@RequestParam("chargingOrderId") Long chargingOrderId){
+ List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.list(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrderId));
return R.ok(list);
}
}
--
Gitblit v1.7.1