From feb90b42744621db216070701bf700d9e3e278ea Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Thu, 20 Jul 2023 15:48:07 +0800
Subject: [PATCH] =?UTF-8?q?[sweeper320][adas-data]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B8=85=E6=89=AB=E8=BD=A6=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?PB=EF=BC=8C=E5=A4=A7=E3=80=81=E5=AD=90=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8=E4=B8=80=E5=A5=97=E6=9E=9A?=
 =?UTF-8?q?=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/proto/sweeper/sweeper_big_task_status.proto | 12 ++----------
 .../src/main/proto/sweeper/sweeper_common.proto      |  7 ++++---
 .../src/main/proto/sweeper/sweeper_task.proto        |  1 +
 3 files changed, 7 insertions(+), 13 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 a7074442db..369d4ee140 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
@@ -1,25 +1,17 @@
 syntax = "proto3";
 package com.zhjt.mogo.adas.data.sweeper.task.big;
 
+import "sweeper/sweeper_common.proto";
 
 /**** 9、云端下发pad大任务状态（type: 100009） ****/
 
 //9.1、请求信息
 // 任务状态
-enum BigTaskStatus {
-  DEFAULT_STATUS = 0; // 无效值
-  TO_START = 1; //待开始
-  RUNNING = 2; // 运行中
-  CANCLE = 3; // 取消（提前结束）
-  FINISHED = 4; // 正常结束
-  ABNORMAL = 5; // 异常结束
-  SUSPENDED = 6; // 暂停 (新增)
-}
 
 message BigTaskStatusPush {
   string sn = 1;// sn
   string taskId = 2;// 大任务编号
-  BigTaskStatus TaskStatus = 3;// 大任务状态
+  common.TaskStatus TaskStatus = 3;// 大任务状态
   uint64 systemTime = 4; // 时间戳
 }
 
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 ca6364dbec..cd5735edb5 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
@@ -7,9 +7,10 @@ enum TaskStatus
   DEFAULT_STATUS = 0; // 无效值
   TO_START = 1; //待开始
   RUNNING = 2; // 运行中
-  SUSPENDED = 3; // 暂停
-  FINISHED = 4; // 结束
-  ABNORMAL = 5; // *异常
+  CANCEL = 3; // 取消（提前结束）
+  FINISHED = 4; // 正常结束
+  ABNORMAL = 5; // 异常结束
+  SUSPENDED = 6; // 暂停 (新增)
 }
 
 // 响应状态
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 fcc9cf0e25..211f20fd95 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
@@ -55,6 +55,7 @@ message TaskInfo {
   uint64 currentTime = 6; //当前时间戳
   repeated SubTaskInfo subList = 7; // 子任务列表信息
   bool isPop = 8; // 是否弹窗
+  common.TaskStatus taskStatus = 9; //  大任务状态（新增）
 }
 
 //1.2、响应信息