From 92dc5972adbd94d47c0e6501ce4a7b51af09e3c3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 26 Jun 2026 22:37:57 +0800
Subject: [PATCH] refactor(workorder): 重构工单状态聚合逻辑-只处理撤回任务状态
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/utils/WorkOrderStatusAggregator.java | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 69 insertions(+), 0 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/utils/WorkOrderStatusAggregator.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/utils/WorkOrderStatusAggregator.java
new file mode 100644
index 0000000..f1898ca
--- /dev/null
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/utils/WorkOrderStatusAggregator.java
@@ -0,0 +1,69 @@
+package org.sxkj.gd.workorder.utils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
+import org.sxkj.gd.workorder.enums.PatrolTaskStatusEnum;
+import org.sxkj.gd.workorder.enums.WorkOrderStatusEnum;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * 工单状态聚合工具类
+ * 用于根据子任务状态计算主任务状态
+ *
+ * @author lw
+ * @since 2026-06-26
+ */
+@Slf4j
+public class WorkOrderStatusAggregator {
+
+ /**
+ * 根据子任务列表聚合计算主任务状态
+ *
+ * @param subTasks 子任务列表
+ * @return 主任务状态，如果没有有效子任务则返回"接单响应_已取消"
+ */
+ public static WorkOrderStatusEnum aggregateWorkOrderStatus(List<GdPatrolTaskEntity> subTasks) {
+ // 1. 参数校验：防止空指针
+ if (subTasks == null || subTasks.isEmpty()) {
+ log.warn("子任务列表为空，返回默认状态：接单响应_已取消");
+ return WorkOrderStatusEnum.RESPONDING_CANCELED;
+ }
+
+ // 2. 过滤有效子任务（排除忽略状态）
+ List<GdPatrolTaskEntity> validSubTasks = subTasks.stream()
+ .filter(task -> task != null && task.getTaskStatus() != null)
+ .filter(task -> {
+ PatrolTaskStatusEnum statusEnum = PatrolTaskStatusEnum.getByValue(task.getTaskStatus());
+ return statusEnum != null && !statusEnum.isShouldIgnore();
+ })
+ .collect(Collectors.toList());
+
+ // 3. 如果没有有效子任务，返回"接单响应_已取消"
+ if (validSubTasks.isEmpty()) {
+ log.info("所有子任务都被撤回或拒绝，主任务状态：接单响应_已取消");
+ return WorkOrderStatusEnum.RESPONDING_CANCELED;
+ }
+
+ // 4. 找到权重最小的有效子任务状态（进度最慢）
+ Optional<PatrolTaskStatusEnum> minWeightStatus = validSubTasks.stream()
+ .map(task -> PatrolTaskStatusEnum.getByValue(task.getTaskStatus()))
+ .filter(Objects::nonNull)
+ .min((s1, s2) -> Integer.compare(s1.getWeight(), s2.getWeight()));
+
+ // 5. 如果找到最小权重状态，返回对应的主任务状态
+ if (minWeightStatus.isPresent()) {
+ WorkOrderStatusEnum workOrderStatus = minWeightStatus.get().getWorkOrderStatusMapping();
+ log.info("最小进度子任务状态：{}，对应主任务状态：{}",
+ minWeightStatus.get().getDesc(), workOrderStatus.getDesc());
+ return workOrderStatus;
+ }
+
+ // 6. 兜底逻辑：返回默认状态
+ log.warn("无法找到有效的主任务状态映射，返回默认状态：接单响应_已取消");
+ return WorkOrderStatusEnum.RESPONDING_CANCELED;
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3