From 71c72f125bc10a5bd39317e51b7ee5a41035ee92 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期六, 21 三月 2026 19:38:50 +0800
Subject: [PATCH] fix:运营后台工单、点位、围栏问题修改
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
index 9da4fb3..8a2abfc 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
import com.xiaopeng.api.dto.pushMessage.AliPushMessageDTO;
import com.xiaopeng.api.feignClient.account.SysUserClient;
import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
@@ -14,6 +15,7 @@
import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetOperationsClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetVehicleClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
+import com.xiaopeng.api.model.account.SysUser;
import com.xiaopeng.api.model.account.XpOperationsRole;
import com.xiaopeng.api.model.account.XpOperationsUser;
import com.xiaopeng.api.model.account.XpOperationsUserNotification;
@@ -1576,6 +1578,7 @@
task.setReportTime(LocalDateTime.now());
task.setExpiredNoticeSent(0);
task.setWillTimeoutNoticeSent(0);
+ task.setTaskSource(2);
saveTask.add(task);
}
this.saveBatch(saveTask);
@@ -1989,12 +1992,22 @@
res.setReportUserPhone("111111");
res.setReportUserAvatar("[]");
}else{
- XpOperationsUser data = xpOperationUserClient.queryById(task.getReportUserId()).getData();
- if (data != null ) {
- res.setReportUserId(data.getId());
- res.setReportUserName(data.getNickName());
- res.setReportUserPhone(data.getPhoneNumber());
- res.setReportUserAvatar(data.getAvatar());
+ if (Objects.nonNull(task.getTaskSource()) && task.getTaskSource().equals(2)) {
+ List<SysUser> list = sysUserClient.listByIds(Lists.newArrayList(task.getReportUserId())).getData();
+ if (CollUtil.isNotEmpty(list)) {
+ SysUser sysUser = list.get(0);
+ res.setReportUserId(sysUser.getId());
+ res.setReportUserName(sysUser.getNickName());
+ res.setReportUserPhone(sysUser.getPhoneNumber());
+ }
+ }else{
+ XpOperationsUser data = xpOperationUserClient.queryById(task.getReportUserId()).getData();
+ if (data != null ) {
+ res.setReportUserId(data.getId());
+ res.setReportUserName(data.getNickName());
+ res.setReportUserPhone(data.getPhoneNumber());
+ res.setReportUserAvatar(data.getAvatar());
+ }
}
}
--
Gitblit v1.7.1