From 4f4872af1eef1c14d95f04bffe2a4f2d2f7d835d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 26 Jan 2026 16:33:43 +0800
Subject: [PATCH] 巡查任务优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java | 208 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 138 insertions(+), 70 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java
index ca222e3..45626d8 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java
@@ -16,85 +16,153 @@
@AllArgsConstructor
public enum PatrolTaskStatusEnum {
- /**
- * 待签收
- */
- PENDING_SIGNING("0", "待签收"),
+ /**
+ * 待签收
+ */
+ PENDING_SIGNING("0", "待签收","巡检任务拆分"),
- /**
- * 拒绝签收
- */
- REJECTED_SIGNING("1", "拒绝签收"),
+ /**
+ * 拒绝签收
+ */
+ REJECTED_SIGNING("1", "拒绝签收","拒绝签收"),
- /**
- * 已撤回
- */
- WITHDRAWN("2", "已撤回"),
+ /**
+ * 已撤回
+ */
+ WITHDRAWN("2", "已撤回","任务撤回"),
- /**
- * 待审核
- */
- PENDING_AUDIT("3", "待审核"),
+ /**
+ * 待审核
+ */
+ PENDING_AUDIT("3", "待审核","待签收"),
- /**
- * 审核驳回
- */
- AUDIT_REJECTED("4", "审核驳回"),
+ /**
+ * 审核驳回
+ */
+ AUDIT_REJECTED("4", "审核驳回","审核驳回"),
- /**
- * 审核通过
- */
- AUDIT_PASSED("5", "审核通过"),
+ /**
+ * 审核通过
+ */
+ AUDIT_PASSED("5", "审核通过","待审核"),
- /**
- * 待验收
- */
- PENDING_ACCEPTANCE("6", "待验收"),
+ /**
+ * 待验收
+ */
+ PENDING_ACCEPTANCE("6", "待验收","待审核"),
- /**
- * 拒绝验收
- */
- REJECTED_ACCEPTANCE("7", "拒绝验收"),
+ /**
+ * 拒绝验收
+ */
+ REJECTED_ACCEPTANCE("7", "拒绝验收","拒绝验收"),
- /**
- * 验收通过
- */
- ACCEPTANCE_PASSED("8", "验收通过");
+ /**
+ * 验收通过
+ */
+ ACCEPTANCE_PASSED("8", "验收通过","验收通过");
- /**
- * 枚举值，对应数据库存储值
- */
- @EnumValue
- private final String value;
+ /**
+ * 枚举值，对应数据库存储值
+ */
+ @EnumValue
+ private final String value;
- /**
- * 枚举描述，用于展示
- */
- @JsonValue
- private final String desc;
+ /**
+ * 枚举描述，用于展示
+ */
+ @JsonValue
+ private final String desc;
- /**
- * 根据值获取对应的枚举
- *
- * @param value 枚举值
- * @return 对应的枚举，如果未找到则返回null
- */
- public static PatrolTaskStatusEnum getByValue(String value) {
- for (PatrolTaskStatusEnum status : values()) {
- if (status.getValue().equals(value)) {
- return status;
- }
- }
- return null;
- }
+ /**
+ * 工单阶段描述
+ */
+ @JsonValue
+ private final String stageDesc;
- /**
- * 判断值是否为有效的巡查任务状态
- *
- * @param value 待验证的值
- * @return 是否有效
- */
- public static boolean isValidValue(String value) {
- return getByValue(value) != null;
- }
-}
\ No newline at end of file
+ /**
+ * 根据值获取对应的枚举
+ *
+ * @param value 枚举值
+ * @return 对应的枚举，如果未找到则返回null
+ */
+ public static PatrolTaskStatusEnum getByValue(String value) {
+ for (PatrolTaskStatusEnum status : values()) {
+ if (status.getValue().equals(value)) {
+ return status;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 检查当前状态是否允许转换到目标状态
+ *
+ * @param targetStatus 审核状态：1.同意签收、2.拒绝签收 、3.撤回任务 、4.同意审核、 5.拒绝审核、 6.验收通过、 7.验收拒绝"
+ * @return 是否允许转换
+ */
+ public boolean isAllowedTransition(Integer targetStatus) {
+ if (targetStatus == null) {
+ return false;
+ }
+ switch (this) {
+ case PENDING_SIGNING:
+ // 待签收状态允许转换到：拒绝签收、待审核
+ return targetStatus == 1 || targetStatus == 2;
+ case PENDING_AUDIT:
+ // 待审核状态允许转换到：审核通过、审核驳回
+ return targetStatus == 3 || targetStatus == 4 || targetStatus == 5;
+ case PENDING_ACCEPTANCE:
+ // 待验收状态允许转换到：验收通过、拒绝验收
+ return targetStatus == 6 || targetStatus == 7;
+ default:
+ // 其他状态不允许转换
+ return false;
+ }
+ }
+
+
+ /**
+ * 检查当前状态是否允许指定的操作类型
+ *
+ * @param operationType 操作类型：1接单，2拒接接单，3申请取消，4申请修改，5同意取消，6不同意取消，7同意修改，8不同意修改
+ * @return 是否允许操作
+ */
+ public boolean isAllowedOperation(Integer operationType) {
+ if (operationType == null) {
+ return false;
+ }
+
+ switch (this) {
+ case PENDING_SIGNING:
+ // 发布中_接单中状态允许：1接单，2拒接接单
+ return operationType == 1 || operationType == 2;
+ case REJECTED_SIGNING:
+ // 响应中_待拆分状态允许：3申请取消，4申请修改
+ return operationType == 3 || operationType == 4;
+ case WITHDRAWN:
+ // 响应中_申请取消状态允许：5同意取消，6不同意取消
+ return operationType == 5 || operationType == 6;
+ case PENDING_AUDIT:
+ // 响应中_申请修改状态允许：7同意修改，8不同意修改
+ return operationType == 7 || operationType == 8;
+ case AUDIT_REJECTED:
+ // 响应中_拒绝取消状态允许：3申请取消
+ return operationType == 3;
+ case AUDIT_PASSED:
+ // 响应中_拒绝修改状态允许：4申请修改
+ return operationType == 4;
+ case PENDING_ACCEPTANCE:
+ // 响应中_拒绝修改状态允许：4申请修改
+ return operationType == 4;
+ case REJECTED_ACCEPTANCE:
+ // 响应中_拒绝修改状态允许：4申请修改
+ return operationType == 4;
+ case ACCEPTANCE_PASSED:
+ // 响应中_拒绝修改状态允许：4申请修改
+ return operationType == 4;
+ default:
+ // 其他状态不允许操作
+ return false;
+ }
+ }
+}
--
Gitblit v1.9.3