From ad2e3579912b7d89e3ab550df64e064c12ce9f23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 28 二月 2026 16:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
index 394cd0b..f9f6768 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
@@ -1,6 +1,7 @@
package com.xiaopeng.maintenance.service.impl;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -176,13 +177,16 @@
XpTaskRule taskRule = xpTaskRuleService.lambdaQuery().last("limit 1").one();
XpTaskRuleRole taskRuleRole = xpTaskRuleRoleService.lambdaQuery().eq(XpTaskRuleRole::getRuleType, 9).last("limit 1").one();
if (Objects.isNull(taskRuleRole) || Objects.isNull(taskRule)) {
- throw new ServiceException("未配置车辆事故任务分配规则", I18nKeyConstant.TASK_RULE_NOT_CONFIG);
+ throw new ServiceException("未配置车辆事故任务分配规则");
}
R<List<XpOperationsRole>> xpOperationsRoleResult = xpOperationUserClient.getXpOperationsRoleByRoleId(taskRuleRole.getRoleId());
if (CollUtil.isNotEmpty(xpOperationsRoleResult.getData())) {
List<Long> userIds = xpOperationsRoleResult.getData().stream().map(XpOperationsRole::getOperationsUserId).collect(Collectors.toList());
xpTask.setHandleUserId(StringUtils.join(userIds, ","));
}
+ //查询事故处理限时配置
+ LocalDateTime endTime = LocalDateTime.now().plusMinutes(taskRule.getProcessingTimeLimit());
+ xpTask.setEndTime(endTime);
this.save(xpTask);
//发送消息通知
@@ -232,7 +236,7 @@
.body(JSONObject.toJSONString(param))
.account(account).title("车辆事故警示")
.pushType(AliPushTypeConstant.NOTICE)
- .deviceType(data.get(0).getDeviceType())
+ .deviceType(data.get(0).getDeviceType())
.build());
}
--
Gitblit v1.7.1