From 51a551a7f8eae7654f973d45cd2fa2952774673d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 07 Aug 2026 10:56:55 +0800
Subject: [PATCH] perf(task): 优化巡查任务审核性能并添加详细日志记录
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
index 36e1344..317fdf5 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -201,20 +201,28 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean auditPatrolTask(GdPatrolTaskAuditParam auditParam) {
+ long startTime = System.currentTimeMillis();
+ log.info("auditPatrolTask 开始执行, taskId={}, auditStatus={}", auditParam.getId(), auditParam.getAuditStatus());
+
// 1. 获取巡查任务
+ long stepStart = System.currentTimeMillis();
GdPatrolTaskEntity task = getById(auditParam.getId());
+ log.info("auditPatrolTask 步骤1-获取巡查任务, 耗时={}ms", System.currentTimeMillis() - stepStart);
if (task == null) {
throw new RuntimeException("巡查任务不存在");
}
// 2. 状态权限校验
+ stepStart = System.currentTimeMillis();
PatrolTaskStatusEnum currentStatus = PatrolTaskStatusEnum.getByValue(task.getTaskStatus());
Integer auditStatus = auditParam.getAuditStatus();
if (currentStatus == null || !currentStatus.isAllowedTransition(auditStatus)) {
throw new RuntimeException("当前任务状态无法进行该操作");
}
+ log.info("auditPatrolTask 步骤2-状态权限校验, 耗时={}ms", System.currentTimeMillis() - stepStart);
// 1.同意签收、2.拒绝签收 、3.撤回任务 、4.同意审核、 5.拒绝审核、 6.验收通过、 7.验收拒绝
// 3. 确定新状态和流转名称
+ stepStart = System.currentTimeMillis();
PatrolTaskStatusEnum newStatusEnum;
switch (auditStatus) {
case 1: // 接单
@@ -243,6 +251,7 @@
}
// 4. 更新任务状态
+ stepStart = System.currentTimeMillis();
Date now = new Date();
task.setTaskStatus(newStatusEnum.getValue());
task.setUpdateUser(AuthUtil.getUserId() == null ? 0L : AuthUtil.getUserId());
@@ -252,11 +261,16 @@
if (!updateResult) {
throw new RuntimeException("更新任务状态失败");
}
+ log.info("auditPatrolTask 步骤4-更新任务状态, 耗时={}ms", System.currentTimeMillis() - stepStart);
// 5. 保存流转记录
+ stepStart = System.currentTimeMillis();
boolean b = saveWorkOrderFlow(task.getId(), newStatusEnum, auditParam.getRejectReason(), task.getAreaCode());
+ log.info("auditPatrolTask 步骤5-保存流转记录, 耗时={}ms", System.currentTimeMillis() - stepStart);
+
// 6. 判断是否审核成功，如果是，需要判断是否整个订单的子任务都审核成功了，除了被撤回和验收拒绝的
if (auditStatus == 4) {
+ stepStart = System.currentTimeMillis();
// 将审核后的任务信息推送到星图
R pushResult = pushXingtuFlyTask(auditParam.getId());
// 检查推送结果，如果失败则抛出异常回滚事务
@@ -273,11 +287,15 @@
boolean allSubTasksAudited = isAllSubTasksAudited(subTasks, task, PatrolTaskStatusEnum.PENDING_AUDIT);
if (!allSubTasksAudited) {
// 执行工单状态更新逻辑
- return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
+ boolean result = updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
+ log.info("auditPatrolTask 步骤6-同意审核-更新工单状态, 耗时={}ms", System.currentTimeMillis() - stepStart);
+ return result;
}
+ log.info("auditPatrolTask 步骤6-同意审核, 耗时={}ms", System.currentTimeMillis() - stepStart);
}
if (auditStatus == 3) {
+ stepStart = System.currentTimeMillis();
// 撤回任务操作：使用状态聚合工具类计算主任务状态
List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
.eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));
@@ -287,14 +305,19 @@
// 更新主任务状态
updateWorkOrderStatusAndFlow(task.getWorkOrderId(), newWorkOrderStatus);
+ log.info("auditPatrolTask 步骤6-撤回任务, 耗时={}ms", System.currentTimeMillis() - stepStart);
}
// 7. 验收拒绝
if (auditStatus == 7) {
- return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
+ stepStart = System.currentTimeMillis();
+ boolean result = updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
+ log.info("auditPatrolTask 步骤7-验收拒绝, 耗时={}ms", System.currentTimeMillis() - stepStart);
+ return result;
}
// 8. 验收通过
if (auditStatus == 6) {
+ stepStart = System.currentTimeMillis();
// 查询同一个工单下的所有子任务
List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
.eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));
@@ -306,10 +329,14 @@
// 1.验收通过,生成报告
asyncExportPatrolReport(task.getId());
// 2.执行工单状态更新逻辑
- return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
+ boolean result = updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED);
+ log.info("auditPatrolTask 步骤8-验收通过, 耗时={}ms", System.currentTimeMillis() - stepStart);
+ return result;
}
+ log.info("auditPatrolTask 步骤8-验收通过, 耗时={}ms", System.currentTimeMillis() - stepStart);
}
+ log.info("auditPatrolTask 执行完成, 总耗时={}ms", System.currentTimeMillis() - startTime);
return b;
}
--
Gitblit v1.9.3