Merge remote-tracking branch 'origin/master'

xuhy

2024-08-15 3805534a85a9f9389dce859818b75b0f1059ee44

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java

@@ -9,6 +9,7 @@
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.Set;

/**
 * <p>
@@ -34,8 +35,21 @@
    */
   @ResponseBody
   @GetMapping("/getTotalElectricQuantity/{days}")
   public R<List<List<Map<String, Object>>>> getTotalElectricQuantity(@PathVariable Integer days){
      List<List<Map<String, Object>>> list = chargingOrderAccountingStrategyService.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
   @GetMapping("/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);
   }
}