From 94bdecc902b8077de86c24b216348ed92b7749c6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 17 一月 2025 20:31:51 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 140 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 127 insertions(+), 13 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 00a91aa..097546f 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
@@ -14,16 +14,12 @@
import com.ruoyi.order.api.query.ChargingOrderQuery;
import com.ruoyi.order.api.query.SettlementListQuery;
import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery;
-import com.ruoyi.order.api.vo.ChargingOrderTimeVO;
-import com.ruoyi.order.api.vo.ChargingOrderVO;
-import com.ruoyi.order.api.vo.GetChargingOrderByLicensePlate;
-import com.ruoyi.order.api.vo.TCharingOrderVO;
+import com.ruoyi.order.api.vo.*;
import com.ruoyi.order.dto.*;
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
+import com.ruoyi.order.vo.EndOfChargePageInfo;
import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -83,6 +79,20 @@
/**
+ * 安全检测数据
+ * @param securityDetection
+ */
+ void securityDetection(SecurityDetectionVO securityDetection);
+
+
+ /**
+ * 启动充电应发
+ * @param message
+ */
+ void startChargeSuccessfully(PlatformStartChargingReplyMessageVO message);
+
+
+ /**
* 充电启动失败后的退款回调处理
* @param out_refund_no
* @param refund_id
@@ -108,6 +118,15 @@
* @return
*/
AjaxResult stopCharging(String id);
+
+
+ /**
+ * 停止充电应答结果处理
+ * @param platformStopChargingReply
+ */
+ void terminateSuccessfulResponse(PlatformStopChargingReplyVO platformStopChargingReply);
+
+
TCharingOrderVO chargingOrder(ChargingOrderQuery dto);
@@ -121,17 +140,17 @@
List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);
- Map<String, BigDecimal> countAll(LocalDate sixBefore);
+ Map<String, Object> countAll(LocalDate sixBefore,List<Integer> siteIds);
- 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);
@@ -152,13 +171,57 @@
* @param code
*/
void endCharge(String code, Integer endMode);
-
+
+ /**
+ * 停止充电返回账单后计算费用
+ * @param vo
+ */
+ void endChargeBillingCharge(TransactionRecordMessageVO vo);
+
+// /**
+// * 停止充电返回账单后计算费用
+// * @param vo
+// */
+// void endChargeBillingCharge1(TransactionRecordMessageVO vo);
+
+
/**
* 异常结束充电处理逻辑
* @param orderCode
*/
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(ChargingStatisticsQueryDto statisticsQueryDto);
+ List<Map<String, Object>> usersDay1();
+
+ List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto);
+ List<Map<String, Object>> usersByQuery1(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();
+
+ Double getAver(List<Integer> siteIds);
+
+ List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds);
/**
@@ -172,4 +235,55 @@
TSettlementConfirm settlementAdd(SettlementConfirmAdd dto);
PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto);
+
+ SettlementTotalVO settlementTotal(String time);
+ SettlementTotalVO settlementTotalR(String time,Long userId);
+
+ List<Map<String, Object>> countBySource(List<Integer> siteIds,ChargingStatisticsQueryDto statisticsQueryDto);
+
+ 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);
+
+
+ /**
+ * 获取充电结束页面详情
+ * @param id
+ * @return
+ */
+ EndOfChargePageInfo getEndOfChargePageInfo(String id);
+
+ Long countNoTag();
+
+
+ /**
+ * 获取订单数据
+ * @param order
+ * @return
+ */
+ List<TChargingOrder> getChargingOrder(TChargingOrderVo order);
+
+ Long countCar(List<String> brands);
}
--
Gitblit v1.7.1