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-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java | 127 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 121 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
index 02f977b..fc03e1f 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
@@ -5,7 +5,9 @@
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.order.api.dto.ChargingStatisticeDTO;
import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory;
+import com.ruoyi.order.api.model.AddTripartitePlatformOrder;
import com.ruoyi.order.api.model.ChargingListQuery;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TSettlementConfirm;
@@ -31,7 +33,7 @@
R<String> queryOrderByGunId(@PathVariable("id") String id);
@PostMapping(value = "/t-charging-order/useOrderCount")
R<Long> useOrderCount(@RequestParam("userId") Long userId);
- @PostMapping(value = "/t-charging-order/chargingBillListR")
+ @PostMapping(value = "/chargingBill/chargingBillListR")
R<ChargingBillVO> chargingBillListR(@RequestBody ChargingListQuery dto);
@PostMapping(value = "/t-charging-order/detail")
R<TChargingOrder> orderDetail(@RequestParam("orderId") Long orderId);
@@ -42,6 +44,15 @@
@PostMapping(value = "/t-charging-order/getBySiteIdAndTime")
R<List<ChargingOrderGroup>> getBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto);
+
+
+ /**
+ * 根据站点id和时间区间查询订单数据
+ * @param chargingPercentProvinceDto
+ * @return
+ */
+ @PostMapping(value = "/t-charging-order/getOrderBySiteIdAndTime")
+ R<List<TChargingOrder>> getOrderBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto);
@@ -120,8 +131,8 @@
@GetMapping(value = "/financial/settlement/downloadSettlement/{uid}")
public R<TSettlementConfirm> downloadSettlement(@PathVariable("uid") String uid);
- @GetMapping(value = "/financial/settlement/settlementTotalR")
- public R<SettlementTotalVO> settlementTotalR(String time);
+ @GetMapping(value = "/financial/settlement/settlementTotalR/{time}/{userId}")
+ public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time,@PathVariable("userId")Long userId);
/**
* 修改充电订单
@@ -153,6 +164,17 @@
/**
+ * 充电支付成功回调通知
+ * @param out_trade_no
+ * @param transaction_id
+ * @param attach
+ */
+ @PostMapping("/t-charging-order/chargingOrderALICallback")
+ void chargingOrderALICallback(@RequestParam("out_trade_no") String out_trade_no,
+ @RequestParam("transaction_id") String transaction_id,
+ @RequestParam("attach") String attach);
+
+ /**
* 远程启动失败后退款回调
* @param out_refund_no
* @param refund_id
@@ -177,13 +199,12 @@
@RequestParam("out_trade_no") String tradeState,
@RequestParam("out_trade_no") String success_time);
- //todo 待监听完成后调用此方法
/**
* 修改安全检测数据
* @param securityDetection
*/
@PostMapping("/t-charging-order/securityDetection")
- void securityDetection(@RequestBody SecurityDetection securityDetection);
+ void securityDetection(@RequestBody SecurityDetectionVO securityDetection);
/**
@@ -191,5 +212,99 @@
* @param message
*/
@PostMapping("/t-charging-order/startChargeSuccessfully")
- void startChargeSuccessfully(PlatformStartChargingReplyMessage message);
+ void startChargeSuccessfully(PlatformStartChargingReplyMessageVO message);
+
+
+ /**
+ * 停止充电应答处理
+ * @param platformStopChargingReply
+ */
+ @PostMapping("/t-charging-order/terminateSuccessfulResponse")
+ void terminateSuccessfulResponse(@RequestBody PlatformStopChargingReplyVO platformStopChargingReply);
+
+ /**
+ * 停止充电返回账单后计算费用
+ * @param vo
+ */
+ @PostMapping("/t-charging-order/endChargeBillingCharge")
+ R endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
+
+ /**
+ * 获取充电订单数据
+ * @param order
+ * @return
+ */
+ @PostMapping("/t-charging-order/getChargingOrder")
+ R<List<TChargingOrder>> getChargingOrder(@RequestBody TChargingOrderVo order);
+ /**
+ * 获取充电订单数据
+ * @param
+ * @return
+ */
+ @PostMapping(value = "/t-charging-order/getChargingStatistics")
+ public R<List<TChargingOrder>> getChargingStatistics(@RequestBody ChargingStatisticeDTO dto);
+
+
+ /**
+ * 根据车辆id获取指定时间范围内的数据
+ * @param carId
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ @PostMapping("/t-charging-order/getCarChargingOrder")
+ R<List<TChargingOrder>> getCarChargingOrder(@RequestParam("carId") Long carId, @RequestParam("startTime") String startTime,
+ @RequestParam("endTime") String endTime);
+
+
+ /**
+ * 根据车牌号查询指定时间范围内的数据
+ * @param plateNum
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ @PostMapping("/t-charging-order/getCarChargingOrderByPlateNum")
+ R<List<TChargingOrder>> getCarChargingOrderByPlateNum(@RequestParam("plateNum") String plateNum, @RequestParam("startTime") String startTime,
+ @RequestParam("endTime") String endTime);
+
+
+
+
+ /**
+ * 添加三方平台充电订单数据
+ * @return
+ */
+ @PostMapping("/t-charging-order/addTripartitePlatformOrder")
+ R addTripartitePlatformOrder(@RequestBody AddTripartitePlatformOrder query);
+
+
+ /**
+ * 根据三方平台订单id获取充电数据
+ * @param startChargeSeq
+ * @return
+ */
+ @PostMapping("/t-charging-order/getChargingOrderByStartChargeSeq")
+ R<TChargingOrder> getChargingOrderByStartChargeSeq(@RequestParam("startChargeSeq") String startChargeSeq);
+
+
+
+ /**
+ * 根据三方平台订单ids获取充电数据
+ * @param startChargeSeqs
+ * @return
+ */
+ @PostMapping("/t-charging-order/getChargingOrderByStartChargeSeqs")
+ R<List<TChargingOrder>> getChargingOrderByStartChargeSeqs(@RequestParam("startChargeSeqs") List<String> startChargeSeqs);
+
+
+
+
+ /**
+ * 三方平台请求停止充电
+ * @param startChargeSeq
+ * @return
+ */
+ @PostMapping("/t-charging-order/tripartitePlatformStopCharge")
+ R tripartitePlatformStopCharge(@RequestParam("startChargeSeq") String startChargeSeq);
}
--
Gitblit v1.7.1