From d6c0f2ed698d6cdf86a0a3a8893b4d9717f3b7b1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 08 五月 2026 14:51:54 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpFleetServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpFleetServiceImpl.java b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpFleetServiceImpl.java
index 0ccdc03..e996089 100644
--- a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpFleetServiceImpl.java
+++ b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpFleetServiceImpl.java
@@ -1,6 +1,7 @@
package com.xiaopeng.vehicleConvoy.service.impl;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.DesensitizedUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,11 +19,13 @@
import com.xiaopeng.api.model.vehicleConvoy.XpFleetOperations;
import com.xiaopeng.api.model.vehicleConvoy.XpFleetVehicle;
import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
+import com.xiaopeng.api.vo.account.LoginUser;
import com.xiaopeng.api.vo.account.XpOperationsUserWithRoleVO;
import com.xiaopeng.api.vo.operation.ElectronicFenceDetailVo;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.web.page.PageInfo;
+import com.xiaopeng.common.security.service.TokenService;
import com.xiaopeng.vehicleConvoy.constant.I18nKeyConstant;
import com.xiaopeng.vehicleConvoy.mapper.XpFleetMapper;
import com.xiaopeng.vehicleConvoy.model.dto.FleetAddDTO;
@@ -77,6 +80,9 @@
private final XpCheckLocationClient xpCheckLocationClient;
@Resource
private SysGroupMenuClient sysGroupMenuClient;
+
+ @Resource
+ private TokenService tokenService;
@Override
public List<XpFleet> listByIds(List<Long> ids) {
@@ -237,6 +243,7 @@
@Override
public R<FleetDetailVO> queryById(Long id) {
+ LoginUser loginUser = tokenService.getLoginUser();
// 1. 查询车队主表
XpFleet fleet = this.getById(id);
if (fleet == null) {
@@ -300,7 +307,10 @@
R<XpOperationsUser> userResult = xpOperationUserClient.queryById(fleet.getOperationsUserId());
if (userResult.getData() != null) {
vo.setOperationsUserName(userResult.getData().getNickName());
- vo.setPhoneNumber(sysGroupMenuClient.getPhoneDesensitization(userResult.getData().getPhoneNumber()).getData());
+ if(!loginUser.getPhoneDesensitization()){
+ vo.setPhoneNumber(DesensitizedUtil.mobilePhone(userResult.getData().getPhoneNumber()));
+ }
+
}
}
@@ -317,6 +327,7 @@
@Override
public R<PageInfo<FleetPageVO>> pageList(FleetPageQuery query) {
+ LoginUser loginUser = tokenService.getLoginUser();
// 1. 构建查询条件
List<Long> operationUserIds = Collections.emptyList();
if (StringUtils.isNotBlank(query.getPhoneNumber())) {
@@ -402,7 +413,10 @@
XpOperationsUser user = userMap.get(fleet.getOperationsUserId());
if (user != null) {
vo.setOperationsUserName(user.getNickName());
- vo.setPhoneNumber(sysGroupMenuClient.getPhoneDesensitization(user.getPhoneNumber()).getData());
+ if(!loginUser.getPhoneDesensitization()){
+ vo.setPhoneNumber(DesensitizedUtil.mobilePhone(user.getPhoneNumber()));
+ }
+
}
}
@@ -485,6 +499,7 @@
@Override
public R<PageInfo<FleetUserVO>> queryUserPageList(FleetUserPageQuery query) {
+ LoginUser loginUser = tokenService.getLoginUser();
// 1. 先根据条件查询符合条件的运维用户
List<Long> filteredUserIds = new ArrayList<>();
if (StringUtils.isNotBlank(query.getNickName()) ||
@@ -540,7 +555,10 @@
FleetUserVO vo = new FleetUserVO();
vo.setUserId(user.getId());
vo.setNickName(user.getNickName());
- vo.setPhoneNumber(sysGroupMenuClient.getPhoneDesensitization(user.getPhoneNumber()).getData());
+ if(!loginUser.getPhoneDesensitization()){
+ vo.setPhoneNumber(DesensitizedUtil.mobilePhone(user.getPhoneNumber()));
+ }
+
vo.setJobNumber(user.getUniqueNumber());
vo.setRoleName(user.getRoles().stream().map(SysRole::getRoleName).collect(Collectors.joining(",")));
records.add(vo);
--
Gitblit v1.7.1