java/Robotaxi.git

			@@ -2,6 +2,7 @@

			import cn.hutool.core.bean.BeanUtil;
			import cn.hutool.core.collection.CollUtil;
			import cn.hutool.core.util.DesensitizedUtil;
			import cn.hutool.core.util.PhoneUtil;
			import com.alibaba.fastjson2.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			@@ -35,6 +36,7 @@
			import com.xiaopeng.common.core.exception.ServiceException;
			import com.xiaopeng.common.core.utils.poi.ExcelUtil;
			import com.xiaopeng.common.core.web.page.PageInfo;
			import com.xiaopeng.common.security.service.TokenService;
			import com.xiaopeng.common.security.utils.SecurityUtils;
			import com.xiaopeng.evi.oss.service.AliOssService;
			import lombok.extern.slf4j.Slf4j;
			@@ -48,6 +50,7 @@
			import org.springframework.util.CollectionUtils;
			import org.springframework.web.multipart.MultipartFile;

			import javax.annotation.Resource;
			import javax.servlet.http.HttpServletResponse;
			import java.io.Serializable;
			import java.io.UnsupportedEncodingException;
			@@ -94,12 +97,12 @@
			private AliOssDownloadUtil aliOssDownloadUtil;
			@Autowired
			private ISysGroupService sysGroupService;
			@Resource
			private TokenService tokenService;

			@Override
			public XpOperationsUser getById(Serializable userId){
			XpOperationsUser user = baseMapper.selectById(userId);
			//获取登录用户权限信息
			user.setPhoneNumber(sysGroupService.getPhoneDesensitization(user.getPhoneNumber()));
			return user;
			}

			@@ -110,17 +113,20 @@
			}
			List<XpOperationsUser> list = lambdaQuery().like(XpOperationsUser::getNickName, nickName).list();
			for (XpOperationsUser obj : list) {
			obj.setPhoneNumber(sysGroupService.getPhoneDesensitization(obj.getPhoneNumber()));
			obj.setPhoneNumber(DesensitizedUtil.mobilePhone(obj.getPhoneNumber()));
			}
			return list;
			}

			@Override
			public PageInfo<XpOperationsUserWithRoleVO> selectUserPageByConditions(XpOperationsUserPageQuery query) {
			LoginUser loginUser = tokenService.getLoginUser();
			PageInfo<XpOperationsUserWithRoleVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
			Page<XpOperationsUserWithRoleVO> page = baseMapper.selectUserPageByConditions(pageInfo, query);
			for (XpOperationsUserWithRoleVO record : page.getRecords()) {
			record.setPhoneNumber(sysGroupService.getPhoneDesensitization(record.getPhoneNumber()));
			if(!loginUser.getPhoneDesensitizationExempt()){
			for (XpOperationsUserWithRoleVO record : page.getRecords()) {
			record.setPhoneNumber(DesensitizedUtil.mobilePhone(record.getPhoneNumber()));
			}
			}
			pageInfo.setRecords(page.getRecords());
			return pageInfo;
			@@ -141,7 +147,6 @@

			XpOperationsUserProfileVO vo = new XpOperationsUserProfileVO();
			BeanUtils.copyProperties(user, vo);
			vo.setPhoneNumber(sysGroupService.getPhoneDesensitization(vo.getPhoneNumber()));
			vo.setAvatar(aliOssDownloadUtil.getPictureJSONObject(vo.getAvatar()));
			// 2. 查询关联的车队ID列表（一个运维人员只能关联一个车队）
			R<List<Long>> fleetIdsResult = xpFleetOperationsClient.getFleetIdsByUserId(userId);
			@@ -228,6 +233,7 @@

			@Override
			public PageInfo<XpOperationsUserVO> pageList(XpOperationsUserQuery query) {
			LoginUser loginUser = tokenService.getLoginUser();
			PageInfo<XpOperationsUserVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
			List<XpOperationsUserVO> list = this.baseMapper.pageList(pageInfo, query);

			@@ -267,7 +273,10 @@
			}

			for (XpOperationsUserVO xpOperationsUserVO : list) {
			xpOperationsUserVO.setPhoneNumber(sysGroupService.getPhoneDesensitization(xpOperationsUserVO.getPhoneNumber()));
			if(!loginUser.getPhoneDesensitizationExempt()){
			xpOperationsUserVO.setPhoneNumber(DesensitizedUtil.mobilePhone(xpOperationsUserVO.getPhoneNumber()));
			}

			String avatar = xpOperationsUserVO.getAvatar();
			// 处理空的情况
			if (avatar == null) {