From 2e134d286c0126e5ef8461c7530193f2e7df067d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 28 二月 2026 16:21:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
index bd1cf6d..89b2028 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
@@ -7,8 +7,10 @@
import com.xiaopeng.api.model.maintenance.XpErrorType;
import com.xiaopeng.api.model.maintenance.XpTask;
import com.xiaopeng.api.model.maintenance.XpTaskHandleDetailRoutine;
+import com.xiaopeng.api.model.order.XpCruiseOrder;
import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
import com.xiaopeng.api.vo.account.LoginOperationUser;
+import com.xiaopeng.api.vo.automaticPilot.VehiclePosition;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.security.service.TokenService;
@@ -24,6 +26,10 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -45,6 +51,8 @@
public class XpTaskController {
@Resource
private XpTaskService xpTaskService;
+ @Resource
+ private MongoTemplate mongoTemplate;
@Resource
private TokenService tokenService;
@Resource
@@ -74,21 +82,28 @@
@ApiOperation(value = "查询车辆不分页列表", tags = "运维APP-任务中心")
@PostMapping("/api/v1/task/listVehicle")
public R<List<VehicleListVO>> listVehicle() {
+
LoginOperationUser loginOperationUser = tokenService.getLoginOperationUser();
XpOperationsUser xpOperationsUser = loginOperationUser.getXpOperationsUser();
// 查询当前人员所属车队 查询车队关联车辆
R<List<Long>> vehicleByUserId = xpFleetOperationsClient.getVehicleByUserId(xpOperationsUser.getId());
List<Long> vehicleIds = vehicleByUserId.getData();
if (vehicleIds != null && !vehicleIds.isEmpty()){
- // todo 查询车辆列表 获取经纬度
+
List<XpVehicle> data = xpVehicleClient.listByIds(vehicleIds).getData();
if (data!=null){
List<VehicleListVO> vehicleListVOS = new ArrayList<>();
for (XpVehicle xpVehicle : data) {
+
VehicleListVO vehicleListVO = new VehicleListVO();
vehicleListVO.setId(xpVehicle.getId());
-// vehicleListVO.setVehicleLon(xpVehicle.getVehicleLon());
-// vehicleListVO.setVehicleLat(xpVehicle.getVehicleLat());
+ VehiclePosition vehiclePosition = mongoTemplate.findOne(new Query(Criteria.where("vin").is(xpVehicle.getVehicleVin())), VehiclePosition.class);
+ if(vehiclePosition!=null){
+ double x = vehiclePosition.getPoint().getX();
+ double y = vehiclePosition.getPoint().getY();
+ vehicleListVO.setVehicleLon(x+"");
+ vehicleListVO.setVehicleLat(y+"");
+ }
vehicleListVO.setVehicleCode(xpVehicle.getVehicleCode());
vehicleListVO.setVehicleColor(xpVehicle.getVehicleColor());
vehicleListVO.setPlateNumber(xpVehicle.getPlateNumber());
--
Gitblit v1.7.1