From 20897d03423cc3c42210c1d35ba1df42e7ca7446 Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Tue, 18 Jul 2023 15:23:04 +0800
Subject: [PATCH] =?UTF-8?q?[sweeper3.2.0][mogo-adas]=E6=B8=85=E6=89=AB?=
 =?UTF-8?q?=E8=BD=A6=E4=BA=91=E6=8E=A7=E8=80=81=E6=8E=A5=E5=8F=A3=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/proto/sweeper/sweeper_big_task_status.proto   |  7 ++++---
 .../src/main/proto/sweeper/sweeper_task.proto          |  6 +++---
 .../src/main/proto/sweeper/sweeper_task_confirm.proto  |  9 +++++----
 .../src/main/proto/sweeper/sweeper_task_stop.proto     | 10 ++++++----
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_big_task_status.proto b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_big_task_status.proto
index 618c603c1b..a7074442db 100644
--- a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_big_task_status.proto
+++ b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_big_task_status.proto
@@ -10,9 +10,10 @@ enum BigTaskStatus {
   DEFAULT_STATUS = 0; // 无效值
   TO_START = 1; //待开始
   RUNNING = 2; // 运行中
-  CANCLE = 3; // 取消
-  FINISHED = 4; // 结束
-  ABNORMAL = 5; // 异常
+  CANCLE = 3; // 取消（提前结束）
+  FINISHED = 4; // 正常结束
+  ABNORMAL = 5; // 异常结束
+  SUSPENDED = 6; // 暂停 (新增)
 }
 
 message BigTaskStatusPush {
diff --git a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task.proto b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task.proto
index 03dcc8330c..fcc9cf0e25 100644
--- a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task.proto
+++ b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task.proto
@@ -61,10 +61,10 @@ message TaskInfo {
 // 响应状态
 enum StartTaskCode {
   DEFAULT_CODE = 0; // 无效值
-  MANUAL_CONFIRM = 1; // 安全员确认执行任务-pad
-  MANUAL_REFUSE = 2; // 安全员拒绝任务-pad
+  MANUAL_CONFIRM = 1; // 安全员确认执行任务-pad（无效值）
+  MANUAL_REFUSE = 2; // 安全员拒绝任务-pad（无效值）
   RECEIVED = 3; // 收到任务
-  OVER_TIME = 4; // 超时未确认
+  OVER_TIME = 4; // 超时未确认（无效值）
 }
 
 /**
diff --git a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_confirm.proto b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_confirm.proto
index 5a2e34e50f..c1ac0ec756 100644
--- a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_confirm.proto
+++ b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_confirm.proto
@@ -19,10 +19,11 @@ message TaskConfirm {
 // 响应状态
 enum TaskConfirmCode {
   DEFAULT_CODE = 0; // 无效值
-  MANUAL_CONFIRM = 1; // 安全员确认执行任务-pad
-  MANUAL_REFUSE_ALL = 2; // 安全员拒绝全部任务-pad
-  MANUAL_REFUSE_SINGLE = 3; // 安全员拒绝单个子任务-pad
-  OVER_TIME = 4; // 超时未确认
+  MANUAL_CONFIRM = 1; // 安全员确认执行任务-pad（无效值）
+  MANUAL_REFUSE_ALL = 2; // 安全员拒绝全部任务-pad（无效值）
+  MANUAL_REFUSE_SINGLE = 3; // 安全员拒绝单个子任务-pad（无效值）
+  OVER_TIME = 4; // 超时未确认（无效值）
+  RECEIVED = 5; // 收到子任务（新增）
 }
 
 /**
diff --git a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_stop.proto b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_stop.proto
index 72af952f09..e243390210 100644
--- a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_stop.proto
+++ b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_stop.proto
@@ -8,9 +8,10 @@ package com.zhjt.mogo.adas.data.sweeper.task.stop;
 // 任务状态
 enum StopTaskType {
   DEFAULT_TYPE = 0; // 无效值
-  TIMEOUT = 1; //超时结束
+  TIMEOUT = 1; //超时结束（无效值）
   ADVANCE = 2; // 提前结束
   NORMAL = 3; // 正常结束
+  EXCEPTION = 4; // 异常结束（新增）
 }
 
 
@@ -29,9 +30,10 @@ message StopTaskReq {
 // 响应状态
 enum StopTaskCode {
   DEFAULT_CODE = 0; // 无效值
-  MANUAL_CONFIRM = 1; // 安全员确认
-  MANUAL_REFUSE = 2; // 安全员拒绝
-  OVER_TIME = 3; // 超时未确认
+  MANUAL_CONFIRM = 1; // 安全员确认（无效值）
+  MANUAL_REFUSE = 2; // 安全员拒绝（无效值）
+  OVER_TIME = 3; // 超时未确认（无效值）
+  RECEIVED = 4; // 收到结束指令（新增）
 }
 
 /**