Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi in...

puzhibing

2026-05-12 08cc6d5cf7e93b75cfabe7dcc2aeaa9afa1117eb

 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java

@@ -14,11 +14,15 @@
import com.xiaopeng.common.core.enums.DisabledEnum;
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.utils.RSAUtil;
import com.xiaopeng.common.core.utils.SensitiveDataCryptoUtil;
import com.xiaopeng.common.core.utils.StringUtils;
import com.xiaopeng.common.core.web.controller.BaseController;
import com.xiaopeng.common.core.web.domain.AjaxResult;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.log.annotation.AdminOperationLog;
import com.xiaopeng.common.log.annotation.Log;
import com.xiaopeng.common.log.enums.AdminBusinessType;
import com.xiaopeng.common.log.enums.AdminOperationType;
import com.xiaopeng.common.log.enums.BusinessType;
import com.xiaopeng.common.redis.service.RedisService;
import com.xiaopeng.common.security.service.TokenService;
@@ -87,6 +91,7 @@
        PageInfo<SysUser> pageInfo = new PageInfo<SysUser>(sysUserListQuery.getPageNum(), sysUserListQuery.getPageSize());
        PageInfo<SysUser> page = userService.getList(pageInfo, sysUserListQuery);
        page.getRecords().forEach(user -> {
            user.setPhoneNumber(SensitiveDataCryptoUtil.decryptIfPossible(user.getPhoneNumber()));
            if(!loginUser.getPhoneDesensitizationExempt()){
                user.setPhoneNumber(DesensitizedUtil.mobilePhone(user.getPhoneNumber()));
//            user.setUserAccount(sysGroupService.getPhoneDesensitization(user.getUserAccount()));
@@ -103,6 +108,7 @@
        LoginUser loginUser = tokenService.getLoginUser();
        List<SysUser> listAll = userService.list();
        for (SysUser sysUser : listAll) {
            sysUser.setPhoneNumber(SensitiveDataCryptoUtil.decryptIfPossible(sysUser.getPhoneNumber()));
            if(!loginUser.getPhoneDesensitizationExempt()){
                sysUser.setPhoneNumber(DesensitizedUtil.mobilePhone(sysUser.getPhoneNumber()));
            }
@@ -118,6 +124,12 @@
    @Log(title = "帐号管理", businessType = BusinessType.INSERT)
    @PostMapping("/api/v1/sys-user/add")
    @ApiOperation(value = "添加帐号", tags = {"管理后台-帐号管理"})
    @AdminOperationLog(
            businessType = AdminBusinessType.ACCOUNT_MANAGEMENT,
            operationType = AdminOperationType.ADD,
            content = "添加帐号",
            appendRequestData = true
    )
    public AjaxResult add(@RequestBody SysUser user) {
        if (StringUtils.isNotEmpty(user.getPhoneNumber()) && !userService.checkPhoneUnique(user)) {
            throw new ServiceException("手机号已开通账号", I18nKeyConstant.ACCOUNT_PHONE_DUPLICATE);
@@ -214,12 +226,21 @@
    @Log(title = "帐号管理", businessType = BusinessType.UPDATE)
    @PutMapping("/api/v1/sys-user/edit")
    @ApiOperation(value = "编辑帐号", tags = {"管理后台-帐号管理"})
    @AdminOperationLog(
            businessType = AdminBusinessType.ACCOUNT_MANAGEMENT,
            operationType = AdminOperationType.EDIT,
            content = "编辑帐号",
            appendRequestData = true
    )
    public AjaxResult edit(@Validated @RequestBody SysUser user) {
        userService.checkUserAllowed(user);
        // userService.checkUserDataScope(user.getId());
        SysUser sysUser = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
                .eq(SysUser::getPhoneNumber, user.getPhoneNumber())
        SysUser sysUser = null;
        if (StringUtils.isNotEmpty(user.getPhoneNumber())) {
            sysUser = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
                    .in(SysUser::getPhoneNumber, SensitiveDataCryptoUtil.queryValues(user.getPhoneNumber()))
                .last("LIMIT 1"));
        }

        if (StringUtils.isNotEmpty(user.getPhoneNumber()) && (Objects.nonNull(sysUser) && !user.getId().equals(sysUser.getId()) )) {
            throw new ServiceException("手机号已开通账号", I18nKeyConstant.ACCOUNT_PHONE_DUPLICATE);
@@ -253,6 +274,12 @@
    @Log(title = "帐号管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/api/v1/sys-user/{userIds}")
    @ApiOperation(value = "删除账号", tags = {"管理后台-帐号管理"})
    @AdminOperationLog(
            businessType = AdminBusinessType.ACCOUNT_MANAGEMENT,
            operationType = AdminOperationType.DELETE,
            content = "删除账号",
            appendRequestData = true
    )
    public AjaxResult remove(@PathVariable Long[] userIds) {
        if (ArrayUtils.contains(userIds, tokenService.getLoginUser())) {
            throw new ServiceException("当前用户不能删除", I18nKeyConstant.ACCOUNT_CURRENT_USER_NOT_DELETE);
@@ -265,8 +292,15 @@

    @PostMapping("/api/v1/sys-user/switchStatus/{id}")
    @ApiOperation(value = "账号管理--禁用/启用", tags = {"管理后台-帐号管理"})
    @AdminOperationLog(
            businessType = AdminBusinessType.ACCOUNT_MANAGEMENT,
            operationType = AdminOperationType.SWITCH_STATUS,
            content = "账号管理--禁用/启用",
            appendRequestData = true
    )
    public AjaxResult shopUserStart(@ApiParam(name = "id", value = "帐号ID") @PathVariable("id") Long id) {
        SysUser sysUser = userService.getById(id);
        sysUser.setPhoneNumber(SensitiveDataCryptoUtil.decryptIfPossible(sysUser.getPhoneNumber()));
        if (sysUser.getStatus().equals(DisabledEnum.NO.getCode())) {
            sysUser.setStatus(DisabledEnum.YES.getCode());
        } else {
@@ -279,6 +313,7 @@
    @PostMapping("/getUserList")
    public R<List<SysUser>> getUserList(@RequestBody List<Integer> userIds) {
        List<SysUser> list = userService.list(new LambdaQueryWrapper<SysUser>().in(SysUser::getId, userIds));
        list.forEach(user -> user.setPhoneNumber(SensitiveDataCryptoUtil.decryptIfPossible(user.getPhoneNumber())));
        return R.ok(list);
    }

@@ -297,6 +332,7 @@
    public R<SysUser> getSysUser(@RequestParam("userId") Long userId) {
        try {
            SysUser sysUser = userService.selectUserById(userId);
            sysUser.setPhoneNumber(SensitiveDataCryptoUtil.decryptIfPossible(sysUser.getPhoneNumber()));
            return R.ok(sysUser);
        } catch (Exception e) {
            e.printStackTrace();
@@ -338,6 +374,12 @@
    @Log(title = "帐号管理", businessType = BusinessType.UPDATE)
    @PutMapping("/api/v1/sys-user/rePassword")
    @ApiOperation(value = "重置密码", tags = {"管理后台-帐号管理"})
    @AdminOperationLog(
            businessType = AdminBusinessType.ACCOUNT_MANAGEMENT,
            operationType = AdminOperationType.RESET_PASSWORD,
            content = "重置密码",
            appendRequestData = true
    )
    public AjaxResult resetPwd(@RequestBody UserPwdResetDTO dto) {
        SysUser user = userService.getById(dto.getUserId());
        if (Objects.isNull(user)) {
@@ -432,8 +474,13 @@
     */
    @PostMapping("/queryUserByPhoneList")
    public R<List<SysUser>> queryUserByPhoneList(@RequestBody List<String> phoneList){
        List<String> phoneQueryValues = buildPhoneQueryValues(phoneList);
        if (phoneQueryValues.isEmpty()) {
            return R.ok(java.util.Collections.emptyList());
        }
        List<SysUser> list = userService.list(Wrappers.lambdaQuery(SysUser.class)
                .in(SysUser::getPhoneNumber, phoneList));
                .in(SysUser::getPhoneNumber, phoneQueryValues));
        list.forEach(user -> user.setPhoneNumber(SensitiveDataCryptoUtil.decryptIfPossible(user.getPhoneNumber())));
        return R.ok(list);
    }

@@ -445,9 +492,15 @@
     */
    @PostMapping("/queryUserByPhone")
    public R<SysUser>  queryUserByPhone(@RequestBody String phone){
        if (StringUtils.isBlank(phone)) {
            return R.ok();
        }
        SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
                .eq(SysUser::getPhoneNumber, phone)
                .in(SysUser::getPhoneNumber, SensitiveDataCryptoUtil.queryValues(phone))
                .last("LIMIT 1"));
        if (user != null) {
            user.setPhoneNumber(SensitiveDataCryptoUtil.decryptIfPossible(user.getPhoneNumber()));
        }
        return R.ok(user);
    }

@@ -506,7 +559,11 @@
    @ResponseBody
    @PostMapping("/getSysUserById")
    public SysUser getSysUserById(@RequestParam("userId") Long userId){
        return userService.getById(userId);
        SysUser user = userService.getById(userId);
        if (user != null) {
            user.setPhoneNumber(SensitiveDataCryptoUtil.decryptIfPossible(user.getPhoneNumber()));
        }
        return user;
    }


@@ -541,7 +598,18 @@
    @PostMapping("/logan/inner/sys-user/listByIds")
    R<List<SysUser>> listByIds(@RequestBody List<Long> ids){
        List<SysUser> list = userService.list(new LambdaQueryWrapper<SysUser>().in(SysUser::getId, ids));
        list.forEach(user -> user.setPhoneNumber(SensitiveDataCryptoUtil.decryptIfPossible(user.getPhoneNumber())));
        return R.ok(list);
    }

    private List<String> buildPhoneQueryValues(List<String> phoneList) {
        if (phoneList == null || phoneList.isEmpty()) {
            return java.util.Collections.emptyList();
        }
        return phoneList.stream()
                .flatMap(phone -> SensitiveDataCryptoUtil.queryValues(phone).stream())
                .distinct()
                .collect(Collectors.toList());
    }

}