From 560be817c1342d4da523760ba38433c4c0f52983 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 五月 2026 10:56:09 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.1
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java
index e8c94c4..1e962b0 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java
@@ -5,12 +5,14 @@
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.hutool.core.util.DesensitizedUtil;
import cn.hutool.core.util.PhoneUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.xiaopeng.api.feignClient.account.SysGroupMenuClient;
import com.xiaopeng.api.model.account.SysUser;
import com.xiaopeng.api.model.operation.XpWhitelist;
import com.xiaopeng.api.model.operation.XpWhitelistOperlog;
+import com.xiaopeng.api.vo.account.LoginUser;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.utils.WebUtils;
@@ -90,8 +92,11 @@
@ApiOperation(value = "白名单管理详情", tags = {"管理后台-白名单管理详情"})
@GetMapping("/api/v1/whitelist/detail/{id}")
public R<XpWhitelist> detail(@PathVariable("id") Long id) {
+ LoginUser loginUser = tokenService.getLoginUser();
XpWhitelist xpWhitelist = xpWhitelistService.getById(id);
- xpWhitelist.setAccount(groupMenuClient.getPhoneDesensitization(xpWhitelist.getAccount()).getData());
+ if(!loginUser.getPhoneDesensitizationExempt()){
+ xpWhitelist.setAccount(DesensitizedUtil.mobilePhone(xpWhitelist.getAccount()));
+ }
return R.ok(xpWhitelist);
}
@@ -99,8 +104,11 @@
@ApiOperation(value = "白名单管理分页列表", response = XpWhitelist.class)
@PostMapping("/api/v1/whitelist/pageList")
public R<PageInfo<XpWhitelist>> pageList(@RequestBody WhitelistPageListQuery query) {
+ LoginUser loginUser = tokenService.getLoginUser();
PageInfo<XpWhitelist> pageList = xpWhitelistService.pageList(query);
- pageList.getRecords().forEach(s->s.setAccount(groupMenuClient.getPhoneDesensitization(s.getAccount()).getData()));
+ if(!loginUser.getPhoneDesensitizationExempt()){
+ pageList.getRecords().forEach(s->s.setAccount(DesensitizedUtil.mobilePhone(s.getAccount())));
+ }
return R.ok(pageList);
}
--
Gitblit v1.7.1