From 199b087e97231bc602cd5ed8668f37d6f336dff4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 03 四月 2026 16:38:56 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
index dfeca09..1244379 100644
--- a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
+++ b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
@@ -42,6 +42,7 @@
import com.xiaopeng.vehicleConvoy.service.IXpFleetVehicleService;
import com.xiaopeng.vehicleConvoy.service.IXpVehicleAnnualRecordService;
import com.xiaopeng.vehicleConvoy.service.IXpVehicleService;
+import com.xiaopeng.vehicleConvoy.util.AliOssDownloadUtil;
import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -105,6 +106,7 @@
private final TokenService tokenService;
private final XpVehicleRepairClient xpVehicleRepairClient;
private final AliOssService aliOssService;
+ private final AliOssDownloadUtil aliOssDownloadUtil;
/**
* 根据ID列表批量查询车辆信息（内部接口）
*
@@ -685,8 +687,15 @@
List<XpVehicleExportExcel> exportList = BeanUtil.copyToList(dataList, XpVehicleExportExcel.class);
for (XpVehicleExportExcel xpVehicleExportExcel : exportList) {
if (StringUtils.isNotBlank(xpVehicleExportExcel.getVehiclePictures())) {
- JSONObject jsonObject = JSONObject.parseObject(xpVehicleExportExcel.getVehiclePictures());
- xpVehicleExportExcel.setVehiclePictures(jsonObject.containsKey("url") ? jsonObject.getString("url") : "");
+
+ String pictureJSONObject = aliOssDownloadUtil.getPictureJSONObject(xpVehicleExportExcel.getVehiclePictures());
+ if (StringUtils.isNotBlank(pictureJSONObject)) {
+ JSONObject jsonObject = JSONObject.parseObject(pictureJSONObject);
+ xpVehicleExportExcel.setVehiclePictures(jsonObject.containsKey("url") ? jsonObject.getString("url") : "");
+ }
+ }
+ if (Integer.valueOf(2).equals(xpVehicleExportExcel.getStatus()) && Integer.valueOf(1).equals(xpVehicleExportExcel.getOperatingStatus())) {
+ xpVehicleExportExcel.setStatus(4);
}
}
// 3. 生成Excel
@@ -996,6 +1005,17 @@
return R.ok(hvacInnerTemp.getValue());
}
+
+
+ @ApiOperation(value = "通过订单id查询当前车辆车门状态", tags = {"小程序-业务流程"})
+ @GetMapping("/api/v1/mini-program/order/queryVehicleTrunkOpenStatus")
+ public R<VehicleTemperatureDto> queryVehicleTrunkOpenStatus(@RequestParam Long orderId, HttpServletRequest request) {
+ String uid = request.getHeader("XP-Uid");
+ VehicleTemperatureDto vehicleTemperatureDto = xpVehicleService.queryTemperatureByOrderId(orderId,uid);
+ return R.ok(vehicleTemperatureDto);
+ }
+
+
/**
* 获取车辆不分页列表
*
--
Gitblit v1.7.1