From 294c8f3a4472c2499e42b16faa98fae678dc5e10 Mon Sep 17 00:00:00 2001 From: thesai <1021828630@qq.com> Date: Mon, 5 Feb 2024 14:05:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E6=8E=A5=E5=8F=A3=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9A=84proto=E6=96=87=E4=BB=B6=20v0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/modify_info.proto | 14 ++++++++++ src/common/page_query.proto | 10 +++++++ src/race/race_module.proto | 45 ++++++++++++++++++++++++++++++++ src/race/race_paper.proto | 27 +++++++++++++++++++ src/race/race_scene.proto | 43 ++++++++++++++++++++++++++++++ src/race/race_scoring_rule.proto | 34 ++++++++++++++++++++++++ src/race/race_season.proto | 35 +++++++++++++++++++++++++ src/race/race_task.proto | 17 ++++++++++++ src/scene.proto | 17 ------------ src/scoring_rule.proto | 13 --------- src/task_setting.proto | 29 -------------------- 11 files changed, 225 insertions(+), 59 deletions(-) create mode 100644 src/common/modify_info.proto create mode 100644 src/common/page_query.proto create mode 100644 src/race/race_module.proto create mode 100644 src/race/race_paper.proto create mode 100644 src/race/race_scene.proto create mode 100644 src/race/race_scoring_rule.proto create mode 100644 src/race/race_season.proto create mode 100644 src/race/race_task.proto delete mode 100644 src/scene.proto delete mode 100644 src/scoring_rule.proto delete mode 100644 src/task_setting.proto diff --git a/src/common/modify_info.proto b/src/common/modify_info.proto new file mode 100644 index 0000000..360c013 --- /dev/null +++ b/src/common/modify_info.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; +package common; + +option java_package = "club.joylink.rtss.vo.common"; + +//数据的变动信息。数据的创建者、创建时间、更新者、更新时间 +message ModifyInfoVO { + int64 creatorId = 1; + string createTime = 2; + int64 updaterId = 3; + string updateTime = 4; + string creatorName = 5; + string updaterName = 6; +} \ No newline at end of file diff --git a/src/common/page_query.proto b/src/common/page_query.proto new file mode 100644 index 0000000..0d139ca --- /dev/null +++ b/src/common/page_query.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; +package common; + +option java_package = "club.joylink.rtss.vo.common"; + +//分页查询的公共参数 +message PageQueryVO { + int32 page = 1; + int32 size = 2; +} \ No newline at end of file diff --git a/src/race/race_module.proto b/src/race/race_module.proto new file mode 100644 index 0000000..8307bdf --- /dev/null +++ b/src/race/race_module.proto @@ -0,0 +1,45 @@ +syntax = "proto3"; +package race; +import "modify_info.proto"; +import "page_query.proto"; +import "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; + TaskSetting taskSetting = 6; + int64 duration = 7; //考试总时间（min） + common.ModifyInfoVO modifyInfo = 8; +} + +message RaceModuleCreateVO { + string name = 1; + string code = 2; + string desc = 3;//非必填 + int64 paperId = 4; +} + +message RaceModuleQueryVO { + common.PageQueryVO page = 1; + string name = 2; + string code = 3; + string desc = 4; + int64 paperId = 5; +} + +//模块中包含的任务及相关设定 +message TaskSetting { + repeated int64 taskIds = 1; //此模块包含的任务的ID + repeated Group group = 2; //任务分组（此分组目前看仅为称呼） + //分组 + message Group{ + repeated int64 taskIds = 1; //此分组中包含的任务的ID（子分组中的任务ID不算） + repeated Group group = 2;//此分组的子分组 + string name = 3; //分组名称 + } +} \ No newline at end of file diff --git a/src/race/race_paper.proto b/src/race/race_paper.proto new file mode 100644 index 0000000..704b55b --- /dev/null +++ b/src/race/race_paper.proto @@ -0,0 +1,27 @@ +syntax = "proto3"; +package race; +import "modify_info.proto"; +import "page_query.proto"; +import "race_season.proto"; + +option java_package = "club.joylink.rtss.vo.race"; + +message RacePaperVO { + int64 id = 1; + string name = 2; + string desc = 3; + RaceSeason season = 4; + common.ModifyInfoVO modifyInfo = 5; +} + +message RacePaperCreateVO { + string name = 1; + string desc = 2; //非必填 + int64 seasonId = 3; +} + +message RacePaperQueryVO { + common.PageQueryVO page = 1; + string name = 2; +} + diff --git a/src/race/race_scene.proto b/src/race/race_scene.proto new file mode 100644 index 0000000..98cb20b --- /dev/null +++ b/src/race/race_scene.proto @@ -0,0 +1,43 @@ +syntax = "proto3"; +package race; +import "modify_info.proto"; +import "page_query.proto"; + +option java_package = "club.joylink.rtss.vo.race"; + +message RaceSceneVO { + int64 id = 1; + string name = 2; + RaceScene.Type type = 3; + Scene scene = 4; + common.ModifyInfoVO modifyInfo = 5; +} + +message RaceSceneCreateVO { + string name = 1; + RaceScene.Type type = 2; +} + +message RaceSceneQueryVO { + common.PageQueryVO page = 1; + string name = 2; + RaceScene.Type type = 3; +} + +message Scene { + string url = 1; + StorageSimulation storageSimulation = 2; +} + +//此消息与之前的实训数据相同，待填充 +message StorageSimulation { + +} + +message RaceScene { + enum Type { + Unknown = 0; + Local = 1; + Link = 2; + } +} \ No newline at end of file diff --git a/src/race/race_scoring_rule.proto b/src/race/race_scoring_rule.proto new file mode 100644 index 0000000..a4b930f --- /dev/null +++ b/src/race/race_scoring_rule.proto @@ -0,0 +1,34 @@ +syntax = "proto3"; +package race; +import "modify_info.proto"; +import "page_query.proto"; + +option java_package = "club.joylink.rtss.vo.race"; + +message RaceScoringRuleVO { + int64 id = 1; + string name = 2; + Rule rule = 3; + common.ModifyInfoVO modifyInfo = 4; +} + +message RaceScoringRuleCreateVO { + string name = 1; + Rule rule = 2; //非必填 +} + +message RaceScoringRuleQueryVO { + common.PageQueryVO page = 1; + string name = 2; +} + +message Rule { + repeated Unit units = 1; + + //最小评分单元 + message Unit { + string text = 1; //文字描述 + uint32 sceneStepId = 2; //场景步骤ID + uint32 score = 3; //分值 + } +} \ No newline at end of file diff --git a/src/race/race_season.proto b/src/race/race_season.proto new file mode 100644 index 0000000..2beccec --- /dev/null +++ b/src/race/race_season.proto @@ -0,0 +1,35 @@ +syntax = "proto3"; +package race; +import "modify_info.proto"; +import "page_query.proto"; + +option java_package = "club.joylink.rtss.vo.race"; + +message RaceSeasonVO { + int64 id = 1; + string code = 2;//编号 + RaceSeason.Group group = 3;//组别 + string term = 4;//年度（根据实际划分方式，不一定就是年份） + common.ModifyInfoVO modifyInfo = 5; +} + +message RaceSeasonCreateVO { + string code = 1; + RaceSeason.Group group = 2; + string term = 3; //非必填 +} + +message RaceSeasonQueryVO { + common.PageQueryVO page = 1; + string code = 2; + RaceSeason.Group group = 3; + string term = 4; +} + +message RaceSeason{ + enum Group { + Unknown = 0; + ZZ = 1; //中职 + GZ = 2; //高职 + } +} \ No newline at end of file diff --git a/src/race/race_task.proto b/src/race/race_task.proto new file mode 100644 index 0000000..d92406f --- /dev/null +++ b/src/race/race_task.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; +package race; +import "modify_info.proto"; +import "race_scene.proto"; + +option java_package = "club.joylink.rtss.vo.race"; + +message RaceTaskVO { + int64 id = 1; + string name = 2; + string desc = 3; //基础描述 + string content = 4; //考核内容 + string standards = 5; //评价标准 + RaceSceneVO scene = 6; //场景 + int64 parentId = 7; //父任务的ID + common.ModifyInfoVO modifyInfo = 8; +} \ No newline at end of file diff --git a/src/scene.proto b/src/scene.proto deleted file mode 100644 index 91ce455..0000000 --- a/src/scene.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; -package task; - -message Scene { - string url = 1; - StorageSimulation storageSimulation = 2; - enum Type { - Unknown = 0; - Local = 1; - Link = 2; - } -} - -message StorageSimulation { - -} - diff --git a/src/scoring_rule.proto b/src/scoring_rule.proto deleted file mode 100644 index e79a212..0000000 --- a/src/scoring_rule.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; -package task; - -message Rule { - repeated Unit units = 1; -} - -//最小评分单元 -message Unit { - string text = 1; //文字描述 - uint32 sceneStepId = 2; //场景步骤ID - uint32 score = 3; //扣分分值 -} \ No newline at end of file diff --git a/src/task_setting.proto b/src/task_setting.proto deleted file mode 100644 index f8936c5..0000000 --- a/src/task_setting.proto +++ /dev/null @@ -1,29 +0,0 @@ -syntax = "proto3"; -package task; - -message TaskSetting { - // repeated RandomItem randoms = 1; - repeated TimeItem timeItems = 1; - repeated GroupItem groupItems = 2; -} - -//任务随机抽取设置项 -message RandomItem { - string name = 1; //设置项名称 - repeated uint64 taskIds = 2; //任务列表 - uint32 number = 3; //抽取题数 -} - -//任务时间设置项 -message TimeItem { - repeated uint64 taskIds = 1; //任务列表 - repeated RandomItem randomItems = 2; //随机抽题设置项 - uint32 time = 3; //时间（分钟） -} - -//任务分组设置项（仅是打包称呼而已） -message GroupItem { - repeated uint64 taskIds = 1; //任务列表 - string name = 2; //名称 -} -