From 174efa72541acf1a3953c986ca1f64e32a5f886a Mon Sep 17 00:00:00 2001
From: tiger_zhou <Shmily123@WJ>
Date: Sun, 18 Feb 2024 15:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20protobuf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 proto/race/race_module.proto       | 17 ++++++++++-------
 proto/race/race_paper.proto        |  6 +++---
 proto/race/race_scene.proto        |  9 +++++----
 proto/race/race_scoring_rule.proto |  9 +++++----
 proto/race/race_season.proto       | 11 ++++++-----
 proto/race/race_task.proto         | 25 +++++++++++++++++++++++--
 6 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/proto/race/race_module.proto b/proto/race/race_module.proto
index 8307bdf..05a3217 100644
--- a/proto/race/race_module.proto
+++ b/proto/race/race_module.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
 package race;
-import "modify_info.proto";
-import "page_query.proto";
-import "race_paper.proto";
+import "common/modify_info.proto";
+import "common/page_query.proto";
+import "race/race_paper.proto";
 
 option java_package = "club.joylink.rtss.vo.race";
 
@@ -18,10 +18,13 @@ message RaceModuleVO {
 }
 
 message RaceModuleCreateVO {
-  string name = 1;
-  string code = 2;
-  string desc = 3;//非必填
-  int64 paperId = 4;
+  int64 id = 1;
+  string name = 2; //名称
+  string code = 3;
+  string desc = 4;
+  int64 paperId = 5;
+  TaskSetting taskSetting = 6;
+  int64 duration = 7; //考试总时间（min）
 }
 
 message RaceModuleQueryVO {
diff --git a/proto/race/race_paper.proto b/proto/race/race_paper.proto
index 704b55b..b456087 100644
--- a/proto/race/race_paper.proto
+++ b/proto/race/race_paper.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
 package race;
-import "modify_info.proto";
-import "page_query.proto";
-import "race_season.proto";
+import "common/modify_info.proto";
+import "common/page_query.proto";
+import "race/race_season.proto";
 
 option java_package = "club.joylink.rtss.vo.race";
 
diff --git a/proto/race/race_scene.proto b/proto/race/race_scene.proto
index 98cb20b..233e0ee 100644
--- a/proto/race/race_scene.proto
+++ b/proto/race/race_scene.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package race;
-import "modify_info.proto";
-import "page_query.proto";
+import "common/modify_info.proto";
+import "common/page_query.proto";
 
 option java_package = "club.joylink.rtss.vo.race";
 
@@ -14,8 +14,9 @@ message RaceSceneVO {
 }
 
 message RaceSceneCreateVO {
-  string name = 1;
-  RaceScene.Type type = 2;
+  int64 id = 1;
+  string name = 2;
+  RaceScene.Type type = 3;
 }
 
 message RaceSceneQueryVO {
diff --git a/proto/race/race_scoring_rule.proto b/proto/race/race_scoring_rule.proto
index a4b930f..ce69e24 100644
--- a/proto/race/race_scoring_rule.proto
+++ b/proto/race/race_scoring_rule.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package race;
-import "modify_info.proto";
-import "page_query.proto";
+import "common/modify_info.proto";
+import "common/page_query.proto";
 
 option java_package = "club.joylink.rtss.vo.race";
 
@@ -13,8 +13,9 @@ message RaceScoringRuleVO {
 }
 
 message RaceScoringRuleCreateVO {
-  string name = 1;
-  Rule rule = 2; //非必填
+  int64 id = 1;
+  string name = 2;
+  Rule rule = 3; //非必填
 }
 
 message RaceScoringRuleQueryVO {
diff --git a/proto/race/race_season.proto b/proto/race/race_season.proto
index 2beccec..4a2f685 100644
--- a/proto/race/race_season.proto
+++ b/proto/race/race_season.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package race;
-import "modify_info.proto";
-import "page_query.proto";
+import "common/modify_info.proto";
+import "common/page_query.proto";
 
 option java_package = "club.joylink.rtss.vo.race";
 
@@ -14,9 +14,10 @@ message RaceSeasonVO {
 }
 
 message RaceSeasonCreateVO {
-  string code = 1;
-  RaceSeason.Group group = 2;
-  string term = 3; //非必填
+  int64 id = 1;
+  string code = 2;
+  RaceSeason.Group group = 3;
+  string term = 4; //非必填
 }
 
 message RaceSeasonQueryVO {
diff --git a/proto/race/race_task.proto b/proto/race/race_task.proto
index d92406f..e9f9348 100644
--- a/proto/race/race_task.proto
+++ b/proto/race/race_task.proto
@@ -1,7 +1,8 @@
 syntax = "proto3";
 package race;
-import "modify_info.proto";
-import "race_scene.proto";
+import "common/modify_info.proto";
+import "common/page_query.proto";
+import "race/race_scene.proto";
 
 option java_package = "club.joylink.rtss.vo.race";
 
@@ -14,4 +15,24 @@ message RaceTaskVO {
   RaceSceneVO scene = 6; //场景
   int64 parentId = 7; //父任务的ID
   common.ModifyInfoVO modifyInfo = 8;
+}
+message RaceTaskCreateVO{
+  int64 id = 1;
+  string name = 2;
+  string desc = 3;
+  string content = 4;
+  int64 parentId = 5;
+}
+message RaceTaskBind{
+  enum TaskBindType{
+    rule = 0;
+    scene = 1;
+  }
+  int64 taskId = 1;
+  TaskBindType bindType = 2;
+  int32 status = 3; //0=解绑 ；1=绑定
+}
+
+message RaceTaskQuery{
+  common.PageQueryVO page = 1;
 }
\ No newline at end of file