puzhibing
2026-05-13 7a95320bf0a04421c2c5cc943c62b93c86171889
修改bug
7个文件已修改
118 ■■■■■ 已修改文件
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/SysLoginService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/query/WhitelistPageListQuery.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java
@@ -612,14 +612,6 @@
        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());
    }
}
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/SysLoginService.java
@@ -203,9 +203,6 @@
            throw new ServiceException("用户/验证码必须填写");
        }
        // 查询运维用户信息
        XpOperationsUser operationsUser = operationsUserService.lambdaQuery().in(
                XpOperationsUser::getPhoneNumber, SensitiveDataCryptoUtil.queryValues(phoneNumber)
        ).last("limit 1").one();
        XpOperationsUser operationsUser = operationsUserService.lambdaQuery()
                .in(XpOperationsUser::getPhoneNumber, SensitiveDataCryptoUtil.queryValues(phoneNumber))
                .last("limit 1").one();
@@ -239,9 +236,6 @@
            throw new ServiceException("用户/验证码必须填写");
        }
        // 查询运维用户信息
        XpOperationsUser operationsUser = operationsUserService.lambdaQuery().in(
                XpOperationsUser::getPhoneNumber, SensitiveDataCryptoUtil.queryValues(phoneNumber)
        ).last("limit 1").one();
        XpOperationsUser operationsUser = operationsUserService.lambdaQuery()
                .in(XpOperationsUser::getPhoneNumber, SensitiveDataCryptoUtil.queryValues(phoneNumber))
                .last("limit 1").one();
@@ -307,16 +301,6 @@
        }
        if (StringUtils.isAnyBlank(phoneNumber, code)) {
            throw new ServiceException("用户/验证码必须填写");
        }
        // 查询运维用户信息
        XpOperationsUser operationsUser = operationsUserService.lambdaQuery()
                .in(XpOperationsUser::getPhoneNumber, SensitiveDataCryptoUtil.queryValues(phoneNumber))
                .last("limit 1").one();
        if (StringUtils.isNull(operationsUser)) {
            throw new ServiceException("验证码错误!");
        }
        if (!operationsUser.getStatus()){
            throw new ServiceException("账号已禁用!");
        }
        operationsUser.setPhoneNumber(SensitiveDataCryptoUtil.decryptIfPossible(operationsUser.getPhoneNumber()));
        String verificationCode = redisService.getCacheObject(VerificationCodeConstants.UPDATE_PASSWORD_CODE + phoneNumber);
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java
@@ -290,7 +290,7 @@
        decryptVoPhones(list);
        for (XpOperationsUserVO xpOperationsUserVO : list) {
            if(!loginUser.getPhoneDesensitizationExempt()){
            if(StringUtils.isNotEmpty(xpOperationsUserVO.getPhoneNumber())){
                xpOperationsUserVO.setPhoneNumber(DesensitizedUtil.mobilePhone(xpOperationsUserVO.getPhoneNumber()));
            }
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java
@@ -237,12 +237,6 @@
    )
    @Transactional
    @ShardingSphereTransactionType(TransactionType.BASE)
    @AdminOperationLog(
            businessType = AdminBusinessType.POINT_MANAGEMENT,
            operationType = AdminOperationType.EDIT,
            content = "编辑正式点位",
            appendRequestData = true
    )
    public R edit(@Validated @RequestBody PointUpdateDto pointAddDto) {
        XpPoint xpPoint = xpPointService.getById(pointAddDto.getId());
        if (xpPoint == null) {
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/query/WhitelistPageListQuery.java
@@ -23,10 +23,4 @@
    @ApiModelProperty(value = "白名单账号查询值,包含明文兼容值和密文值")
    private List<String> accountQueryValues;
    @ApiModelProperty(value = "白名单账号查询值,包含明文兼容值和密文值")
    private List<String> accountQueryValues;
}
xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
@@ -862,7 +862,7 @@
    @PostMapping("/logan/inner/vehicle/queryVehiclePositionByVin")
    public R<List<String>> queryVehiclePositionByVin(@RequestBody VehiclePositionByVinDto dto){
        List<XpVehicle> list = xpVehicleService.list(new LambdaQueryWrapper<XpVehicle>().eq(XpVehicle::getState, Optional.ofNullable(dto.getStatus()).orElse(0))
                .eq(XpVehicle::getOperatingStatus, 1).eq(XpVehicle::getElectronicId, dto.getFenceId()).in(XpVehicle::getVehicleVin, buildVinQueryValues(dto.getVinList()))));
                .eq(XpVehicle::getOperatingStatus, 1).eq(XpVehicle::getElectronicId, dto.getFenceId()).in(XpVehicle::getVehicleVin, buildVinQueryValues(dto.getVinList())));
        if (list.isEmpty()) {
            return R.ok(new ArrayList<>());
        } else {
xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java
@@ -1755,81 +1755,5 @@
        }
    }
    @Override
    public XpVehicle getById(Serializable id) {
        XpVehicle vehicle = super.getById(id);
        decryptVehicle(vehicle);
        return vehicle;
    }
    @Override
    public boolean save(XpVehicle entity) {
        encryptVehicle(entity);
        try {
            return super.save(entity);
        } finally {
            decryptVehicle(entity);
        }
    }
    @Override
    public boolean saveBatch(Collection<XpVehicle> entityList) {
        if (entityList != null) {
            entityList.forEach(this::encryptVehicle);
        }
        try {
            return super.saveBatch(entityList);
        } finally {
            decryptVehicles(entityList);
        }
    }
    @Override
    public boolean updateById(XpVehicle entity) {
        encryptVehicle(entity);
        try {
            return super.updateById(entity);
        } finally {
            decryptVehicle(entity);
        }
    }
    @Override
    public List<XpVehicle> list() {
        List<XpVehicle> list = super.list();
        decryptVehicles(list);
        return list;
    }
    @Override
    public List<XpVehicle> list(Wrapper<XpVehicle> queryWrapper) {
        List<XpVehicle> list = super.list(queryWrapper);
        decryptVehicles(list);
        return list;
    }
    @Override
    public XpVehicle getOne(Wrapper<XpVehicle> queryWrapper) {
        XpVehicle vehicle = super.getOne(queryWrapper);
        decryptVehicle(vehicle);
        return vehicle;
    }
    private void encryptVehicle(XpVehicle vehicle) {
        if (vehicle != null) {
            vehicle.setVehicleVin(SensitiveDataCryptoUtil.encrypt(vehicle.getVehicleVin()));
        }
    }
    private void decryptVehicle(XpVehicle vehicle) {
        if (vehicle != null) {
            vehicle.setVehicleVin(SensitiveDataCryptoUtil.decryptIfPossible(vehicle.getVehicleVin()));
        }
    }
    private void decryptVehicles(Collection<? extends XpVehicle> vehicles) {
        if (vehicles != null) {
            vehicles.forEach(this::decryptVehicle);
        }
    }
}