From 0db89bd9c78302a2a72b8cc623b2dbe3b204b587 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 15 七月 2025 17:13:22 +0800
Subject: [PATCH] 硬件数据推送

---
 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingMessageController.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingMessageController.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingMessageController.java
index f3157a0..f135c54 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingMessageController.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingMessageController.java
@@ -9,12 +9,11 @@
 import com.ruoyi.jianguan.model.SupEquipChargeStatus;
 import com.ruoyi.jianguan.util.ChuanYiChongSuperviseUtil;
 import com.ruoyi.jianguan.util.TCECSuperviseUtil;
+import com.ruoyi.order.api.feignClient.ChargingOrderClient;
+import com.ruoyi.order.api.model.TChargingOrder;
 import com.ruoyi.other.api.domain.Operator;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -40,7 +39,9 @@
 	private ChargingGunClient chargingGunClient;
 	@Resource
 	private ChuanYiChongSuperviseUtil chuanYiChongSuperviseUtil;
-	
+	@Resource
+	private ChargingOrderClient chargingOrderClient;
+
 	
 	/**
 	 * 推送充电订单信息
@@ -252,4 +253,16 @@
 		}
 		return R.ok();
 	}
+
+	/**
+	 * 查询订单状态
+	 * @return
+	 */
+	@ResponseBody
+	@GetMapping("/getOrderById")
+	public R pushOrderStatus(@RequestParam Long orderId){
+		log.info("川易充通过id查询订单:{}", orderId);
+		R<TChargingOrder> tChargingOrderR = chargingOrderClient.orderDetail(orderId);
+		return R.ok(tChargingOrderR.getData());
+	}
 }

--
Gitblit v1.7.1