更新的proto文件

proto/race/race_module.proto

@@ -1,39 +1,28 @@
 syntax = "proto3";
 package race;
 import "common/modify_info.proto";
-import "common/page_query.proto";
+//import "common/page_query.proto";
-import "race/race_paper.proto";
+//import "race/race_paper.proto";
 
 option java_package = "club.joylink.rtss.vo.race";
 
 message RaceModuleVO {
   int64 id = 1;
-  string name = 2; //名称
   string code = 3;
   string desc = 4;
-  RacePaperVO paper = 5;
+  int64 paperId = 5;
   TaskSetting taskSetting = 6;
-  int64 duration = 7; //考试总时间（min）
+  int32 duration = 7; //考试总时间（min）
   common.ModifyInfoVO modifyInfo = 8;
 }
 
 message RaceModuleCreateVO {
-  int64 id = 1;
+  string code = 1;
-  string name = 2; //名称
+  string desc = 2;
-  string code = 3;
+  int64 paperId = 3;
-  string desc = 4;
+  int32 duration = 4; //考试总时间（min）
-  int64 paperId = 5;
-  TaskSetting taskSetting = 6;
-  int64 duration = 7; //考试总时间（min）
 }
 
-message RaceModuleQueryVO {
-  common.PageQueryVO page = 1;
-  string name = 2;
-  string code = 3;
-  string desc = 4;
-  int64 paperId = 5;
-}
 
 //模块中包含的任务及相关设定
 message TaskSetting {

proto/race/race_paper.proto

@@ -1,27 +1,30 @@
 syntax = "proto3";
 package race;
 import "common/modify_info.proto";
-import "common/page_query.proto";
+//import "common/page_query.proto";
 import "race/race_season.proto";
 
 option java_package = "club.joylink.rtss.vo.race";
 
-message RacePaperVO {
+/*message RacePaperVO {
   int64 id = 1;
   string name = 2;
   string desc = 3;
   RaceSeason season = 4;
   common.ModifyInfoVO modifyInfo = 5;
+}*/
+message RacePaperVO{
+  int64 id = 1;
+  string name = 2;
+  string desc = 3;
+  //  RaceSeason season = 4;
+  int64 seasonId = 5;
+  string seasonName = 6;
+  common.ModifyInfoVO modifyInfo = 7;
 }
-
 message RacePaperCreateVO {
   string name = 1;
   string desc = 2; //非必填
   int64 seasonId = 3;
 }
 
-message RacePaperQueryVO {
-  common.PageQueryVO page = 1;
-  string name = 2;
-}
-

proto/race/race_scene.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package race;
 import "common/modify_info.proto";
-import "common/page_query.proto";
+//import "common/page_query.proto";
 
 option java_package = "club.joylink.rtss.vo.race";
 
@@ -9,22 +9,29 @@ message RaceSceneVO {
   int64 id = 1;
   string name = 2;
   RaceScene.Type type = 3;
-  Scene scene = 4;
+  int64 functionId = 4;
-  common.ModifyInfoVO modifyInfo = 5;
+  Scene scene = 5;
+  common.ModifyInfoVO modifyInfo = 6;
+  int64 mapId = 7;
 }
 
-message RaceSceneCreateVO {
+
+//场景列表对象
+message RaceSceneListVO{
   int64 id = 1;
   string name = 2;
   RaceScene.Type type = 3;
+  int64 mapId = 4;
+  common.ModifyInfoVO modifyInfo = 6;
 }
 
-message RaceSceneQueryVO {
+message RaceScenePublishVO{
-  common.PageQueryVO page = 1;
+  int64 traningPublishId = 1; //实训id
+  //  int64 mapId = 2;
   string name = 2;
-  RaceScene.Type type = 3;
 }
 
+
 message Scene {
   string url = 1;
   StorageSimulation storageSimulation = 2;
@@ -32,6 +39,10 @@ message Scene {
 
 //此消息与之前的实训数据相同，待填充
 message StorageSimulation {
+  string bgSceneJson = 1;
+  string stepJson = 2;
+  string memberJson = 3;
+  repeated string playerIds = 4;
 
 }
 

proto/race/race_scoring_rule.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package race;
 import "common/modify_info.proto";
-import "common/page_query.proto";
+//import "common/page_query.proto";
 
 option java_package = "club.joylink.rtss.vo.race";
 
@@ -11,17 +11,12 @@ message RaceScoringRuleVO {
   Rule rule = 3;
   common.ModifyInfoVO modifyInfo = 4;
 }
-
+message RaceScoringRuleListVO{
-message RaceScoringRuleCreateVO {
   int64 id = 1;
   string name = 2;
-  Rule rule = 3; //非必填
+  common.ModifyInfoVO modifyInfo = 3;
 }
 
-message RaceScoringRuleQueryVO {
-  common.PageQueryVO page = 1;
-  string name = 2;
-}
 
 message Rule {
   repeated Unit units = 1;
@@ -31,5 +26,7 @@ message Rule {
     string text = 1; //文字描述
     uint32 sceneStepId = 2; //场景步骤ID
     uint32 score = 3; //分值
+    string worker = 4;//作业程序
+    string criteria = 5;//评分标准
   }
 }

proto/race/race_season.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package race;
 import "common/modify_info.proto";
-import "common/page_query.proto";
+//import "common/page_query.proto";
 
 option java_package = "club.joylink.rtss.vo.race";
 
@@ -14,18 +14,17 @@ message RaceSeasonVO {
 }
 
 message RaceSeasonCreateVO {
-  int64 id = 1;
+  string code = 1;
-  string code = 2;
+  RaceSeason.Group group = 2;
-  RaceSeason.Group group = 3;
+  string term = 3; //非必填
-  string term = 4; //非必填
 }
 
-message RaceSeasonQueryVO {
+/*message RaceSeasonQueryVO {
   common.PageQueryVO page = 1;
   string code = 2;
   RaceSeason.Group group = 3;
   string term = 4;
-}
+}*/
 
 message RaceSeason{
   enum Group {

proto/race/race_task.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package race;
 import "common/modify_info.proto";
-import "common/page_query.proto";
+//import "common/page_query.proto";
 import "race/race_scene.proto";
 
 option java_package = "club.joylink.rtss.vo.race";
@@ -16,12 +16,24 @@ message RaceTaskVO {
   int64 parentId = 7; //父任务的ID
   common.ModifyInfoVO modifyInfo = 8;
 }
-message RaceTaskCreateVO{
+message RaceTaskDetailVO {
   int64 id = 1;
   string name = 2;
-  string desc = 3;
+  string desc = 3; //基础描述
-  string content = 4;
+  string content = 4; //考核内容
-  int64 parentId = 5;
+  string standards = 5; //评价标准
+  int64 sceneId = 6;
+  int64 sceneName = 7;
+  int64 parentId = 8; //父任务的ID
+  common.ModifyInfoVO modifyInfo = 9;
+}
+message RaceTaskCreateVO{
+  string name = 1;
+  string desc = 2;
+  string content = 3;
+  string standards = 4;
+  int64 sceneId = 5;
+  int64 parentId = 6;
 }
 message RaceTaskBind{
   enum TaskBindType{
@@ -29,10 +41,12 @@ message RaceTaskBind{
     scene = 1;
   }
   int64 taskId = 1;
-  TaskBindType bindType = 2;
+  int64 bindId = 2;
-  int32 status = 3; //0=解绑 ；1=绑定
+  TaskBindType bindType = 3;
-}
+  int32 status = 4; //0=解绑 ；1=绑定
 
+}
+/*
 message RaceTaskQuery{
   common.PageQueryVO page = 1;
-}
+}*/