From 7a4f9541331bef779a506b38a27ed5c3373c0bec Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 15 五月 2025 13:53:22 +0800
Subject: [PATCH] 开发二级等保功能及心跳消息队列修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 122 ++++++++++++++++++++++++++++++++++------
1 files changed, 102 insertions(+), 20 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 6b2df64..3e72100 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
@@ -7,21 +7,20 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.dto.SettlementConfirmAdd;
-import com.ruoyi.order.api.model.ChargingListQuery;
-import com.ruoyi.order.api.model.TChargingOrder;
-import com.ruoyi.order.api.model.TChargingOrderRefund;
-import com.ruoyi.order.api.model.TSettlementConfirm;
+import com.ruoyi.order.api.model.*;
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.*;
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.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -83,14 +82,14 @@
* 安全检测数据
* @param securityDetection
*/
- void securityDetection(SecurityDetection securityDetection);
+ void securityDetection(SecurityDetectionVO securityDetection);
/**
* 启动充电应发
* @param message
*/
- void startChargeSuccessfully(PlatformStartChargingReplyMessage message);
+ void startChargeSuccessfully(PlatformStartChargingReplyMessageVO message);
/**
@@ -102,8 +101,17 @@
* @return
*/
AjaxResult chargingOrderStartupFailureWxRefund(String out_refund_no, String refund_id, String tradeState, String success_time);
-
-
+
+
+ /**
+ * 启动失败退款操作
+ * @param code
+ */
+ void refund(String code);
+
+
+
+ void refund1(String code, BigDecimal money);
/**
* 获取充电中的详情
@@ -119,6 +127,15 @@
* @return
*/
AjaxResult stopCharging(String id);
+
+
+ /**
+ * 停止充电应答结果处理
+ * @param platformStopChargingReply
+ */
+ void terminateSuccessfulResponse(PlatformStopChargingReplyVO platformStopChargingReply);
+
+
TCharingOrderVO chargingOrder(ChargingOrderQuery dto);
@@ -132,17 +149,17 @@
List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);
- Map<String, Object> countAll(LocalDate sixBefore);
+ Map<String, Object> countAll(List<Integer> siteIds);
- List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, Object>> getDateData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getDateData(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, Object>> getWeekData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getWeekData(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, Object>> getMonthData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getMonthData(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, Object>> getYearData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getYearData(LocalDate start,LocalDate end,List<Integer> siteIds);
ChargingOrderTimeVO chargingList(ChargingListQuery dto);
@@ -163,7 +180,14 @@
* @param code
*/
void endCharge(String code, Integer endMode);
-
+
+ /**
+ * 停止充电返回账单后计算费用
+ * @param vo
+ */
+ R endChargeBillingCharge(TransactionRecordMessageVO vo);
+
+
/**
* 异常结束充电处理逻辑
@@ -171,17 +195,18 @@
*/
void excelEndCharge(String orderCode);
- List<Map<String, Object>> getByDate(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getByDate(LocalDate start,LocalDate end, List<Integer> siteIds);
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>> 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();
@@ -196,7 +221,7 @@
Map<String, Object> countLocalCar();
- Long getAver(List<Integer> siteIds);
+ Double getAver(List<Integer> siteIds);
List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds);
@@ -214,8 +239,9 @@
PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto);
SettlementTotalVO settlementTotal(String time);
+ SettlementTotalVO settlementTotalR(String time,Long userId);
- List<Map<String, Object>> countBySource(List<Integer> siteIds);
+ List<Map<String, Object>> countBySource(List<Integer> siteIds,ChargingStatisticsQueryDto statisticsQueryDto);
List<Map<String, Object>> equipmentUserType1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
@@ -240,4 +266,60 @@
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);
+
+
+ /**
+ * 添加三方平台充电订单数据
+ * @param query
+ */
+ R addTripartitePlatformOrder(AddTripartitePlatformOrder query);
+
+
+ /**
+ * 三方平台停止充电操作
+ * @param startChargeSeq
+ * @return
+ */
+ R tripartitePlatformStopCharge(@RequestParam("startChargeSeq") String startChargeSeq);
+
+
+ /**
+ * 获取充电后没有扣除费用的数据
+ * @return
+ */
+ R getNotPaymentChargingOrder();
+
+
+ /**
+ *
+ * 手动推送订单给第三方平台
+ * @param code
+ * @return
+ */
+ R pushOrderInfo(String code);
+
+
+ R addChargingOrderSummaryData();
}
--
Gitblit v1.7.1