Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

liujie

2026-03-13 1f9e89315641a68147eaf8e1d5e325bd6a4637c6

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

 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-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java

@@ -610,9 +610,9 @@
            }
        }

        Long userId = order.getAppUserId();
        if (order.getStatus() == 1) {
            order.setStatus(0);
            Long userId = order.getAppUserId();
            order.setAppUserId(null);
            baseMapper.updateById(order);
            // 消息推送
@@ -652,7 +652,7 @@
        String message = JSONObject.toJSONString(params);
        SendMessageDTO sendMessageDTO = new SendMessageDTO();
        sendMessageDTO.setMessage(message);
        sendMessageDTO.setAppUserId(String.valueOf(order.getAppUserId()));
        sendMessageDTO.setAppUserId(String.valueOf(userId));
        xpPushMessageClient.sendStatus(sendMessageDTO);

        //查询车辆信息
@@ -662,7 +662,7 @@
            // 组装调用车机参数
            CancelTaxiPassengerVo cancelTaxiPassengerVo = new CancelTaxiPassengerVo();
            cancelTaxiPassengerVo.setVin(xpVehicle.getVehicleVin());
            cancelTaxiPassengerVo.setUid(order.getAppUserId().toString());
            cancelTaxiPassengerVo.setUid(userId.toString());
            cancelTaxiPassengerVo.setOrderNo(order.getOrderNumber());
            cancelTaxiPassengerVo.setAppId(appid);
            BaseVehicleUserDto baseVehicleUserDto = userVehicleClient.cancelTaxiPassenger(cancelTaxiPassengerVo);
@@ -1205,12 +1205,12 @@
        content.put("orderId", order.getId().toString());
        content.put("status", OrderStatusEnum.CANCELED.getCode());
        params.put("type", PushMessageTypeEnum.ORDER_STATUS.getDesc());
        params.put("content", com.alibaba.fastjson2.JSONObject.toJSONString(content));
        params.put("content", JSONObject.toJSONString(content));
        params.put("timestamp", new Date().getTime() + "");
        String message = JSONObject.toJSONString(params);
        SendMessageDTO sendMessageDTO = new SendMessageDTO();
        sendMessageDTO.setMessage(message);
        sendMessageDTO.setAppUserId(String.valueOf(order.getAppUserId()));
        sendMessageDTO.setAppUserId(uid);
        xpPushMessageClient.sendStatus(sendMessageDTO);
        log.info("订单取消消息推送完毕");

@@ -1227,7 +1227,7 @@
                throw new ServiceException("车辆不存在", I18nKeyConstant.VEHICLE_NOT_EXISTS);
            }
            cancelTaxiPassengerVo.setVin(xpVehicle.getVehicleVin());
            cancelTaxiPassengerVo.setUid(order.getAppUserId().toString());
            cancelTaxiPassengerVo.setUid(uid);
            cancelTaxiPassengerVo.setOrderNo(order.getOrderNumber());
            cancelTaxiPassengerVo.setAppId(appid);

@@ -1262,6 +1262,7 @@
        if (order == null) {
            throw new ServiceException("订单不存在", I18nKeyConstant.ORDER_NOT_EXISTS);
        }
        Long appUserId = order.getAppUserId();
        order.setStatus(0);
        order.setAppUserId(null);
        baseMapper.updateById(order);
@@ -1275,32 +1276,30 @@

        redisService.removeByPattern(order.getQueueName(), order.getOrderNumber());


        // 消息推送
        Map<String, Object> params = new HashMap<>();
        Map<String, Object> content = new HashMap<>();
        content.put("orderId", order.getId().toString());
        content.put("status", OrderStatusEnum.CANCELED.getCode());
        params.put("type", PushMessageTypeEnum.ORDER_STATUS.getDesc());
        params.put("content", com.alibaba.fastjson2.JSONObject.toJSONString(content));
        params.put("content", JSONObject.toJSONString(content));
        params.put("timestamp", new Date().getTime() + "");
        String message = JSONObject.toJSONString(params);
        SendMessageDTO sendMessageDTO = new SendMessageDTO();
        sendMessageDTO.setMessage(message);
        sendMessageDTO.setAppUserId(String.valueOf(order.getAppUserId()));
        sendMessageDTO.setAppUserId(String.valueOf(appUserId));
        xpPushMessageClient.sendStatus(sendMessageDTO);
        log.info("订单取消消息推送完毕");

        // 移除mongo数据
        xpPricingClient.deleteXpGeoQueryEntity(order.getId().toString());
        Long uid = order.getAppUserId();
        // 设置当天的取消次数缓存
        Object cacheObject = redisService.getCacheObject("CANCEL_ORDER_" + uid);
        Object cacheObject = redisService.getCacheObject("CANCEL_ORDER_" + appUserId);
        if (cacheObject == null) {
            redisService.setCacheCancelOrder("CANCEL_ORDER_" + uid, 1);
            redisService.setCacheCancelOrder("CANCEL_ORDER_" + appUserId, 1);
        } else {
            Integer i = Integer.valueOf(cacheObject.toString());
            redisService.setCacheCancelOrder("CANCEL_ORDER_" + uid, i + 1);
            redisService.setCacheCancelOrder("CANCEL_ORDER_" + appUserId, i + 1);
        }
        return order;
    }

 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);
        }