From d02a70e478abad888c372c366de1006dad02797e Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Mon, 8 May 2023 18:48:53 +0800
Subject: [PATCH] =?UTF-8?q?[dev=5Fsweeper=5F3.1.0]=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=B8=85=E6=89=AB=E8=BD=A6PB=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=90=84=E4=B8=AA=E6=9E=9A=E4=B8=BE=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sweeper/sweeper_big_task_status.proto     | 11 +++++-----
 .../main/proto/sweeper/sweeper_common.proto   | 22 +++++++++++--------
 .../src/main/proto/sweeper/sweeper_task.proto | 14 +++++++-----
 .../proto/sweeper/sweeper_task_confirm.proto  |  9 ++++----
 .../proto/sweeper/sweeper_task_stop.proto     | 14 +++++++-----
 .../sweeper/sweeper_task_suspend_resume.proto |  7 +++---
 6 files changed, 44 insertions(+), 33 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 a2a536ad62..618c603c1b 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
@@ -7,11 +7,12 @@ package com.zhjt.mogo.adas.data.sweeper.task.big;
 //9.1、请求信息
 // 任务状态
 enum BigTaskStatus {
-  TO_START = 0; //待开始
-  RUNNING = 1; // 运行中
-  CANCLE = 2; // 取消
-  FINISHED = 3; // 结束
-  ABNORMAL = 4; // 异常
+  DEFAULT_STATUS = 0; // 无效值
+  TO_START = 1; //待开始
+  RUNNING = 2; // 运行中
+  CANCLE = 3; // 取消
+  FINISHED = 4; // 结束
+  ABNORMAL = 5; // 异常
 }
 
 message BigTaskStatusPush {
diff --git a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_common.proto b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_common.proto
index ed034f52fe..ca6364dbec 100644
--- a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_common.proto
+++ b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_common.proto
@@ -2,16 +2,20 @@ syntax = "proto3";
 package com.zhjt.mogo.adas.data.sweeper.common;
 
 // 任务状态
-enum TaskStatus {
-  TO_START = 0; //待开始
-  RUNNING = 1; // 运行中
-  SUSPENDED = 2; // 暂停
-  FINISHED = 3; // 结束
-  ABNORMAL = 4; // *异常
+enum TaskStatus
+{
+  DEFAULT_STATUS = 0; // 无效值
+  TO_START = 1; //待开始
+  RUNNING = 2; // 运行中
+  SUSPENDED = 3; // 暂停
+  FINISHED = 4; // 结束
+  ABNORMAL = 5; // *异常
 }
 
 // 响应状态
-enum Code {
-  SUCCEED = 0; // 成功
-  FAILED = 1; // 失败
+enum Code
+{
+  DEFAULT_CODE = 0; // 无效值
+  SUCCEED = 1; // 成功
+  FAILED = 2; // 失败
 }
\ No newline at end of file
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 f5e8e1f5fd..b37eb88cfb 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
@@ -22,8 +22,9 @@ message Location
 // 任务类型枚举
 enum TaskModel
 {
-  AUTO = 0; //自动驾驶
-  MANUAL = 1; //人工驾驶
+  DEFAULT_MODEL = 0; // 无效值
+  AUTO = 1; //自动驾驶
+  MANUAL = 2; //人工驾驶
 }
 
 /**
@@ -58,10 +59,11 @@ message TaskInfo {
 //1.2、响应信息
 // 响应状态
 enum StartTaskCode {
-  MANUAL_CONFIRM = 0; // 安全员确认执行任务-pad
-  MANUAL_REFUSE = 1; // 安全员拒绝任务-pad
-  RECEIVED = 2; // 收到任务
-  OVER_TIME = 3; // 超时未确认
+  DEFAULT_CODE = 0; // 无效值
+  MANUAL_CONFIRM = 1; // 安全员确认执行任务-pad
+  MANUAL_REFUSE = 2; // 安全员拒绝任务-pad
+  RECEIVED = 3; // 收到任务
+  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 fb01378f12..ccc0b61f3c 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
@@ -17,10 +17,11 @@ message TaskConfirm {
 //2.2、响应信息
 // 响应状态
 enum TaskConfirmCode {
-  MANUAL_CONFIRM = 0; // 安全员确认执行任务-pad
-  MANUAL_REFUSE_ALL = 1; // 安全员拒绝全部任务-pad
-  MANUAL_REFUSE_SINGLE = 2; // 安全员拒绝单个子任务-pad
-  OVER_TIME = 3; // 超时未确认
+  DEFAULT_CODE = 0; // 无效值
+  MANUAL_CONFIRM = 1; // 安全员确认执行任务-pad
+  MANUAL_REFUSE_ALL = 2; // 安全员拒绝全部任务-pad
+  MANUAL_REFUSE_SINGLE = 3; // 安全员拒绝单个子任务-pad
+  OVER_TIME = 4; // 超时未确认
 }
 
 /**
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 286e42790e..bc684774dd 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
@@ -7,9 +7,10 @@ package com.zhjt.mogo.adas.data.sweeper.task.stop;
 //4.1、请求信息
 // 任务状态
 enum StopTaskType {
-  TIMEOUT = 0; //超时结束
-  ADVANCE = 1; // 提前结束
-  NORMAL = 2; // 正常结束
+  DEFAULT_TYPE = 0; // 无效值
+  TIMEOUT = 1; //超时结束
+  ADVANCE = 2; // 提前结束
+  NORMAL = 3; // 正常结束
 }
 
 
@@ -26,9 +27,10 @@ message StopTaskReq {
 //4.2、响应信息
 // 响应状态
 enum StopTaskCode {
-  MANUAL_CONFIRM = 0; // 安全员确认
-  MANUAL_REFUSE = 1; // 安全员拒绝
-  OVER_TIME = 2; // 超时未确认
+  DEFAULT_CODE = 0; // 无效值
+  MANUAL_CONFIRM = 1; // 安全员确认
+  MANUAL_REFUSE = 2; // 安全员拒绝
+  OVER_TIME = 3; // 超时未确认
 }
 
 /**
diff --git a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_suspend_resume.proto b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_suspend_resume.proto
index 2eaa58afb3..20bdb949a4 100644
--- a/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_suspend_resume.proto
+++ b/libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_suspend_resume.proto
@@ -12,8 +12,8 @@ import "sweeper/sweeper_common.proto";
 pad挂起任务请求
 pad恢复挂起的任务请求
  */
-message SuspendResumeTaskReq {
-
+message SuspendResumeTaskReq
+{
   string sn = 1;// sn
   string taskId = 2;// 大任务ID
   string subTaskId = 3;// 大任务ID
@@ -25,7 +25,8 @@ message SuspendResumeTaskReq {
 挂起任务响应
 恢复挂起的任务响应
 */
-message SuspendResumeTaskResp {
+message SuspendResumeTaskResp
+{
   string sn = 1;// sn
   string taskId = 2;// 大任务编号
   string subTaskId = 3;// 子任务ID