From 446d588f6983d2f9e7bb18546a961fa4c14c99a0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 19 五月 2026 03:58:31 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 7d04162..5cb6b43 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
@@ -19,7 +19,9 @@
import com.xiaopeng.api.dto.vehicleConvoy.VehicleTemperatureDto;
import com.xiaopeng.api.feignClient.maintenance.*;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
-import com.xiaopeng.api.model.account.XpOperationsUser;import com.xiaopeng.api.model.maintenance.XpTask;
+import com.xiaopeng.api.model.account.XpOperationsUser;
+import com.xiaopeng.api.model.maintenance.XpErrorType;
+import com.xiaopeng.api.model.maintenance.XpTask;
import com.xiaopeng.api.model.maintenance.XpTaskRule;
import com.xiaopeng.api.model.operation.XpGeoQueryEntity;
import com.xiaopeng.api.model.maintenance.XpVehicleModel;
@@ -50,6 +52,7 @@
import com.xiaopeng.vehicleConvoy.model.importExcel.XpVehicleImportExcel;
import com.xiaopeng.vehicleConvoy.model.query.*;
import com.xiaopeng.api.vo.vehicleConvoy.XpVehicleVO;
+import com.xiaopeng.vehicleConvoy.model.vo.VehicleListByVinVo;
import com.xiaopeng.vehicleConvoy.model.vo.VehiclePositionDto;
import com.xiaopeng.vehicleConvoy.service.IXpFleetService;
import com.xiaopeng.vehicleConvoy.service.IXpFleetVehicleService;
@@ -1081,17 +1084,6 @@
return R.ok(xpVehicleService.listByPlateNumber(plateNumber));
}
- /**
- * 车辆详情-车门解锁/后备箱解锁
- */
- @ApiOperation(value = "车辆运维-车门解锁/后备箱解锁", tags = {"运维APP-车辆管理"})
- @PostMapping("/maintenance-app/api/v1/vehicle/unlockByType")
- public R<String> unlockByType(@RequestBody UnlockByTypeDTO dto) {
-
- // TODO 车门解锁、后备箱解锁
-
- return R.ok();
- }
/**
* 业务流程-车门解锁/后备箱解锁
@@ -1361,4 +1353,17 @@
.distinct()
.collect(Collectors.toList());
}
+
+
+
+ @ApiOperation(value = "根据VIN码查询车辆信息", response = XpErrorType.class, tags = "远程代驾")
+ @GetMapping("/logan/assistance/v1/vehicle/getVehicleListByVin/{vin}")
+ public R<VehicleListByVinVo> getVehicleListByVin(@PathVariable String vin) {
+ XpVehicle vehicle = xpVehicleService.getOne(new QueryWrapper<XpVehicle>().eq("vehicle_vin", SensitiveDataCryptoUtil.encrypt(vin))
+ .eq("is_deleted", 0));
+ VehicleListByVinVo vehicleListByVinVo = new VehicleListByVinVo();
+ BeanUtil.copyProperties(vehicle, vehicleListByVinVo);
+ vehicleListByVinVo.setVin(vin);
+ return R.ok(vehicleListByVinVo);
+ }
}
--
Gitblit v1.7.1