Merge remote-tracking branch 'origin/master'

puzhibing

2026-03-13 ed5815919da68696db018cbeefb6d3766cd0ff0e

Merge remote-tracking branch 'origin/master'

 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/constant/I18nKeyConstant.java

@@ -32,6 +32,7 @@
    //手机号格式错误
    String ACCOUNT_FORMAT_ERROR = "account.format.error";
    String ACCOUNT_IMPORT_ERROR = "account.import.error";
    String ACCOUNT_EXIST = "account.exist";

    //========== 角色相关 ==========
    String ROLE_NAME_EXISTS = "role.name.exists";

 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java

@@ -366,6 +366,12 @@
            if (!isPhone) {
                throw new ServiceException("以下帐号格式不正确：", I18nKeyConstant.ACCOUNT_FORMAT_ERROR,new Object[]{exportOperationsUserVo.getPhoneNumber()});
            }
            // 判断账号是否已存在
            long count = this.count(Wrappers.lambdaQuery(XpOperationsUser.class)
                    .eq(XpOperationsUser::getPhoneNumber, exportOperationsUserVo.getPhoneNumber()));
            if (count > 0) {
                throw new ServiceException("以下帐号已存在：", I18nKeyConstant.ACCOUNT_EXIST,new Object[]{exportOperationsUserVo.getPhoneNumber()});
            }
            xpOperationsUser.setPhoneNumber(exportOperationsUserVo.getPhoneNumber());
            xpOperationsUser.setPassword(SecurityUtils.encryptPassword("a123456"));
            xpOperationsUser.setRemarks(exportOperationsUserVo.getRemarks());

 xp-robotaxi-account-boot/src/main/resources/i18n/messages.properties

@@ -34,4 +34,5 @@
sms.push.failed=短信发送失败，请稍后重试！
sys.group.delete.fail=删除失败，该权限组已关联角色
account.format.error=以下帐号格式不正确：{0}
account.exist=以下帐号已存在：{0}
account.import.error=导入运维人员数据异常

 xp-robotaxi-account-boot/src/main/resources/i18n/messages_en_US.properties

@@ -34,4 +34,5 @@
sms.push.failed=SMS sending failed. Please try again later！
sys.group.delete.fail=Deletion failed. This permission group has been associated with a role
account.format.error=The following account format is incorrect: {0}
account.exist=The following account already exists：{0}
account.import.error=Importing operation and maintenance personnel data anomaly

 xp-robotaxi-account-boot/src/main/resources/i18n/messages_zh_CN.properties

@@ -34,4 +34,5 @@
sms.push.failed=短信发送失败，请稍后重试！
sys.group.delete.fail=删除失败，该权限组已关联角色
account.format.error=以下帐号格式不正确：{0}
account.exist=以下帐号已存在：{0}
account.import.error=导入运维人员数据异常

 xp-robotaxi-maintenance-boot/src/main/resources/mapper/maintenance/XpVehicleRepairMapper.xml

@@ -10,7 +10,7 @@
    </sql>

    <select id="operationRecords" resultType="com.xiaopeng.maintenance.model.vo.OperationRecordsVO">
        SELECT xvr.id, xvr.vehicle_id,xvr.send_user_id AS operationsUserId, xvr.start_time AS operationTime
        SELECT xvr.id, xvr.vehicle_id,xvr.send_user_id AS operationsUserId, xvr.create_time AS operationTime
        FROM xp_vehicle_repair xvr
        WHERE xvr.is_deleted = 0
        AND xvr.vehicle_id = #{query.vehicleId}

 xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpPolicyApplicationServiceImpl.java

@@ -261,6 +261,7 @@
                }
            }
            queryPolicyInfoVO.setStatus(xpPolicyApplication.getAuditStatus());
            queryPolicyInfoVO.setXpPolicyApplicationVO(xpPolicyApplicationVO);
        } else {
            queryPolicyInfoVO.setStatus(0);
        }