From e083a5f327fc9873f4f9359faf3791f2e9c929e0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 09 十月 2024 11:50:10 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java |   84 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
index d62aa72..790dc57 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
@@ -80,6 +80,20 @@
 	
 	
 	/**
+	 * 安全检测数据
+	 * @param securityDetection
+	 */
+	void securityDetection(SecurityDetection securityDetection);
+	
+	
+	/**
+	 * 启动充电应发
+	 * @param message
+	 */
+	void startChargeSuccessfully(PlatformStartChargingReplyMessage message);
+	
+	
+	/**
 	 * 充电启动失败后的退款回调处理
 	 * @param out_refund_no
 	 * @param refund_id
@@ -118,17 +132,17 @@
 
 	List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);
 
-	Map<String, BigDecimal> countAll(LocalDate sixBefore);
+	Map<String, Object> countAll(LocalDate sixBefore);
 
-    List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds);
+    List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds);
 
-	List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds);
+	List<Map<String, Object>> getDateData(List<Long> chargingOrderIds);
 
-	List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds);
+	List<Map<String, Object>> getWeekData(List<Long> chargingOrderIds);
 
-	List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds);
+	List<Map<String, Object>> getMonthData(List<Long> chargingOrderIds);
 
-	List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds);
+	List<Map<String, Object>> getYearData(List<Long> chargingOrderIds);
 
     ChargingOrderTimeVO chargingList(ChargingListQuery dto);
 
@@ -157,6 +171,36 @@
 	 */
 	void excelEndCharge(String orderCode);
 
+	List<Map<String, Object>> getByDate(List<Long> chargingOrderIds);
+
+	List<Map<String, Object>> queryPower(List<Integer> siteIds);
+
+	Map<String, Object> qureryPowerLevel(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+	List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds);
+
+	List<Map<String, Object>> usersDay();
+	List<Map<String, Object>> usersDay1();
+
+	List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto);
+
+
+	List<Map<String, Object>> getUserTagCount();
+
+    List<Map<String, Object>> getVipCount();
+
+    List<Map<String, Object>> unitConsumption(ChargingStatisticsQueryDto statisticsQueryDto);
+
+	List<Map<String, Object>> carUserMethod();
+
+	List<Map<String, Object>> carUserBrand();
+
+	Map<String, Object> countLocalCar();
+
+    Long getAver(List<Integer> siteIds);
+
+	List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds);
+
 
 	/**
 	 * 根据车牌号和开始时间查询充电数据
@@ -171,4 +215,32 @@
 	PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto);
 
     SettlementTotalVO settlementTotal(String time);
+
+	List<Map<String, Object>> countBySource(List<Integer> siteIds);
+
+	List<Map<String, Object>> equipmentUserType1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+	List<Map<String, Object>> equipmentUserType2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+	List<Map<String, Object>> equipmentMapbroke1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+	List<Map<String, Object>> equipmentMapbroke2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+	List<Map<String, Object>> equipmentMapOut1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+	List<Map<String, Object>> equipmentMapOut2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+	List<Map<String, Object>> needElec(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+	List<Map<String, Object>> getHourType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);
+
+	List<Map<String, Object>> getDateType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);
+
+	List<Map<String, Object>> getMonthType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);
+
+	List<Map<String, Object>> getchargingCapacity(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);
+
+	List<Map<String, Object>> countAllUserData();
+
+	List<Map<String, Object>> needElec1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
 }

--
Gitblit v1.7.1