From fdd02ce546bc7e312e469e62d3473d9517a8a961 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 28 Jan 2026 17:22:15 +0800
Subject: [PATCH] 同步获取吉安机巢无人机设备
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/WorkOrderStatusEnum.java | 67 +++++++++++++++++++++++++++++----
1 files changed, 59 insertions(+), 8 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/WorkOrderStatusEnum.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/WorkOrderStatusEnum.java
index a40414f..6c4ce21 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/WorkOrderStatusEnum.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/WorkOrderStatusEnum.java
@@ -52,7 +52,7 @@
/**
* 发布中_拒绝接单
*/
- PUBLISHING_REJECTING("11", "发布中_拒绝接单", "工单发布"),
+ PUBLISHING_REJECTING("11", "发布中_拒绝接单", "拒绝接单"),
/**
* 响应中_待拆分
@@ -62,17 +62,27 @@
/**
* 响应中_申请取消
*/
- RESPONDING_APPLY_CANCEL("21", "响应中_申请取消", "接单响应"),
+ RESPONDING_APPLY_CANCEL("21", "响应中_申请取消", "申请取消"),
/**
* 响应中_申请修改
*/
- RESPONDING_APPLY_MODIFY("22", "响应中_申请修改", "接单响应"),
+ RESPONDING_APPLY_MODIFY("22", "响应中_申请修改", "申请修改"),
/**
* 响应中_已取消
*/
- RESPONDING_CANCELED("23", "响应中_已取消", "接单响应"),
+ RESPONDING_CANCELED("23", "响应中_已取消", "已取消"),
+
+ /**
+ * 响应中_拒绝取消
+ */
+ RESPONDING_REJECT_CANCEL("24", "响应中_拒绝取消", "拒绝取消"),
+
+ /**
+ * 响应中_拒绝修改
+ */
+ RESPONDING_REJECT_MODIFY("25", "响应中_拒绝修改", "拒绝修改"),
/**
* 执行中_待全部完成
@@ -169,12 +179,12 @@
* @param code 状态码
* @return 枚举对象
*/
- public static WorkOrderStatusEnum getByCode(Byte code) {
+ public static WorkOrderStatusEnum getByCode(String code) {
if (code == null) {
return null;
}
for (WorkOrderStatusEnum status : values()) {
- if (status.getCode().equals(code)) {
+ if (code.equals(status.getCode())) {
return status;
}
}
@@ -186,7 +196,7 @@
* @param code 状态码
* @return 状态描述
*/
- public static String getDescByCode(Byte code) {
+ public static String getDescByCode(String code) {
WorkOrderStatusEnum status = getByCode(code);
return status != null ? status.getDesc() : null;
}
@@ -196,7 +206,48 @@
* @param code 状态码
* @return 是否有效
*/
- public static boolean isValid(Byte code) {
+ public static boolean isValid(String code) {
return getByCode(code) != null;
}
+
+ /**
+ * 检查当前状态是否允许指定的操作类型
+ * @param operationType 操作类型：1接单，2拒接接单，3申请取消，4申请修改， 5同意取消 6不同意取消 7.同意修改 8.不同意修改 9.协商修改 10.同意修改 11.结算
+ * @return 是否允许操作
+ */
+ public boolean isAllowedOperation(Integer operationType) {
+ if (operationType == null) {
+ return false;
+ }
+
+ switch (this) {
+ case PUBLISHING_ACCEPTING:
+ // 发布中_接单中状态允许：1接单，2拒接接单
+ return operationType == 1 || operationType == 2;
+ case RESPONDING_TO_BE_SPLIT:
+ // 响应中_待拆分状态允许：3申请取消，4申请修改
+ return operationType == 3 || operationType == 4 ;
+ case RESPONDING_APPLY_CANCEL:
+ // 响应中_申请取消状态允许：5同意取消，6不同意取消
+ return operationType == 5 || operationType == 6;
+ case RESPONDING_APPLY_MODIFY:
+ // 响应中_申请修改状态允许：7同意修改，8不同意修改
+ return operationType ==7 || operationType == 8 ;
+ case RESPONDING_REJECT_CANCEL:
+ // 响应中_拒绝取消状态允许：3申请取消
+ return operationType == 3;
+ case RESPONDING_REJECT_MODIFY:
+ // 响应中_拒绝修改状态允许：4申请修改
+ return operationType == 4 || operationType == 3;
+ case ACCEPTED_TO_BE_SETTLED:
+ // 验收通过_待结算状态允许：11结算完成
+ return operationType == 11;
+ case EXECUTING_TO_BE_COMPLETED:
+ // 执行中_待全部完成状态允许：9.协商修改
+ return operationType == 9;
+ default:
+ // 其他状态不允许操作
+ return false;
+ }
+ }
}
--
Gitblit v1.9.3