From 487ebcc3b2db366ad7bfb6f34bd11f4ffec9e11e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 三月 2026 20:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/vehicleConvoy/VehicleControlClient.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/vehicleConvoy/VehicleControlClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/vehicleConvoy/VehicleControlClient.java
index 8b2b28b..39f3ee8 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/vehicleConvoy/VehicleControlClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/vehicleConvoy/VehicleControlClient.java
@@ -1,15 +1,14 @@
package com.xiaopeng.api.feignClient.vehicleConvoy;
-import com.alibaba.fastjson.JSONObject;
import com.xiaopeng.api.dto.vehicleConvoy.BaseImOpenDto;
import com.xiaopeng.api.factory.vehicleConvoy.VehicleControlClientFallbackFactory;
-import com.xiaopeng.api.vo.vehicleConvoy.VehicleTemperatureVo;
import com.xiaopeng.api.vo.vehicleConvoy.VehiclesCommandVo;
import com.xiaopeng.common.core.dto.ServiceNameConstantsEnum;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Set;
/**
* 小鹏内部车控服务接口
@@ -21,19 +20,35 @@
/**
* 车内温度查询
+ *
* @return
*/
@GetMapping("/logan/api/v1/vehicles/state")
- BaseImOpenDto queryVehicleTemperature(VehicleTemperatureVo vo, @RequestHeader("uid") Long uid);
+ BaseImOpenDto queryVehicleTemperature(
+ @RequestParam("appId") String appId,
+ @RequestParam("nonce") String nonce,
+ @RequestParam(value = "accessToken", required = false) String accessToken,
+ @RequestParam("sign") String sign,
+ @RequestParam("openId") String openId,
+ @RequestParam("vin") String vin,
+ @RequestParam("stateList") Set<String> stateList,
+ @RequestHeader("uid") String uid);
/**
* 车辆控制
+ *
* @param vo
* @param uid
* @return
*/
- @GetMapping("/logan/api/v1/vehicles/command")
- BaseImOpenDto vehiclesCommand(VehiclesCommandVo vo, @RequestHeader("uid") Long uid);
+ @PostMapping("/logan/api/v1/vehicles/command")
+ BaseImOpenDto vehiclesCommand(
+ @RequestParam("appId") String appId,
+ @RequestParam("nonce") String nonce,
+ @RequestParam(value = "accessToken", required = false) String accessToken,
+ @RequestParam("sign") String sign,
+ @RequestParam("openId") String openId,
+ @RequestBody VehiclesCommandVo vo, @RequestHeader("uid") Long uid);
}
--
Gitblit v1.7.1