From 842c0755fdf8501b85f02ecacd71ee4e2b6b9327 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 13 五月 2026 13:32:55 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 a72e04b..150dd5f 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
@@ -71,6 +71,12 @@
import javax.validation.Valid;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import com.xiaopeng.common.log.annotation.AdminOperationLog;
+import com.xiaopeng.common.log.enums.AdminBusinessType;
+import com.xiaopeng.common.log.enums.AdminOperationType;
import java.net.URLEncoder;
import java.util.*;
import java.util.function.Function;
@@ -395,7 +401,7 @@
int time = 10*60*1000;
Long oneMinuteAgo = System.currentTimeMillis() - time;
query.addCriteria(Criteria.where("updateTime").gte(oneMinuteAgo));
-
+
List<XpOperationsUserPositionDTO> vehiclePositions = mongoTemplate.find(query, XpOperationsUserPositionDTO.class);
if(CollUtil.isEmpty(vehiclePositions)){
throw new ServiceException("未查询到运维人员");
@@ -439,7 +445,7 @@
// 将查询结果转换为 Map，key 为 userId，value 为 XpFleetOperations 对象
Map<Long, XpFleetOperations> fleetOperationsMap = findListByUserIdsR.getData().stream()
.collect(Collectors.toMap(XpFleetOperations::getOperationsUserId, Function.identity()));
-
+
for (XpOperationsUserWithRoleVO record : ret.getRecords()) {
if(fleetOperationsMap.containsKey(record.getId())){
record.setFleetName(fleetOperationsMap.get(record.getId()).getFleetName());
--
Gitblit v1.7.1