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-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java
index 76b796e..9b102c8 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java
@@ -4,6 +4,8 @@
import cn.hutool.core.util.PhoneUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xiaopeng.api.dto.account.UcUserInfo;
import com.xiaopeng.api.feignClient.account.UserResourcesClient;
import com.xiaopeng.api.model.account.SysUser;
@@ -27,6 +29,16 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.*;
@@ -128,6 +140,7 @@
.list()
.stream()
.map(XpWhitelist::getAccount)
+ .map(SensitiveDataCryptoUtil::decryptIfPossible)
.filter(StringUtils::hasLength)
.collect(Collectors.toSet());
existsAccounts = existsStoredAccounts.stream()
@@ -502,8 +515,8 @@
}
}
- private void decryptWhitelistAccounts(Collection<XpWhitelist> list) {
- if (CollUtil.isEmpty(list)) {
+ private static void decryptWhitelistAccounts(Collection<XpWhitelist> list) {
+ if (list == null) {
return;
}
for (XpWhitelist item : list) {
--
Gitblit v1.7.1