diff --git a/src/main/java/club/joylink/rtss/controller/permission2/SystemAbilityController.java b/src/main/java/club/joylink/rtss/controller/permission2/SystemAbilityController.java index 547e1b74d..f71c63a1e 100644 --- a/src/main/java/club/joylink/rtss/controller/permission2/SystemAbilityController.java +++ b/src/main/java/club/joylink/rtss/controller/permission2/SystemAbilityController.java @@ -1,5 +1,6 @@ package club.joylink.rtss.controller.permission2; +import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.permission.*; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -50,7 +51,18 @@ public class SystemAbilityController { public List deleteAbilities(@RequestBody DeleteAbilitiesReqVo req){ return null; } - - + /** + * 根据权限功能的id查询完整信息 + */ + @GetMapping("/{abilityId}") + public SystemAbilityRspVo findById(@PathVariable("abilityId") Long abilityId){ + return null; + } + /** + * 分页查询权限功能的基本信息 + */ + public PageVOfindByPage(){ + return null; + } } diff --git a/src/main/java/club/joylink/rtss/vo/paper/CreatePaperRuleReqVo.java b/src/main/java/club/joylink/rtss/vo/paper/CreatePaperRuleReqVo.java index 818770979..88c5a4073 100644 --- a/src/main/java/club/joylink/rtss/vo/paper/CreatePaperRuleReqVo.java +++ b/src/main/java/club/joylink/rtss/vo/paper/CreatePaperRuleReqVo.java @@ -16,13 +16,13 @@ public class CreatePaperRuleReqVo { @JsonSerialize(using = ToStringSerializer.class) private Long pcId; /** - * 试题类型：1-理论题，2-实训题 + * 试题类型：1-理论题，2-实训题,序列化后为数值 */ @NotNull private PaperQType.GroupType type; /** - * 规则类型：理论题(1-单选题，2-多选题，3-判断题);实训题(4-单操实训，5-场景实训) + * 规则类型：理论题(1-单选题，2-多选题，3-判断题);实训题(4-单操实训，5-场景实训)，,序列化后为数值 */ @NotNull private PaperQType.SubType subtype; diff --git a/src/main/java/club/joylink/rtss/vo/paper/FindPaperUserForClassReqVo.java b/src/main/java/club/joylink/rtss/vo/paper/FindPaperUserForClassReqVo.java index 0913499cb..54c0997cc 100644 --- a/src/main/java/club/joylink/rtss/vo/paper/FindPaperUserForClassReqVo.java +++ b/src/main/java/club/joylink/rtss/vo/paper/FindPaperUserForClassReqVo.java @@ -34,11 +34,19 @@ public class FindPaperUserForClassReqVo extends PageQueryVO { @NotNull private Long classId; /** - * 查询类型，默认所有 + * 查询类型，默认所有,序列化后为数值
+ * All(1),//所有
+ * Pass(2),//所有及格的
+ * NotPass(3),//所有不及格的
+ * NotComplete(4),//未完成考试
+ * Complete(5),//完成考试，即及格和不及格的
*/ private FindPuType findType = FindPuType.All; /** - * 以什么来排序,默认以用户试卷创建时间 + * 以什么来排序,默认以用户试卷创建时间,序列化后为数值
+ * CreateTime(1, "create_time"),//用户试卷创建时间
+ * StartTime(2, "start_time"),//用户开始答题时间
+ * Score(3, "score"),//用户最终得分
*/ private FindPuOrderByType orderBy = FindPuOrderByType.CreateTime; /** diff --git a/src/main/java/club/joylink/rtss/vo/paper/FindPaperUserForCompositionReqVo.java b/src/main/java/club/joylink/rtss/vo/paper/FindPaperUserForCompositionReqVo.java index d23b8e09f..31abf43a4 100644 --- a/src/main/java/club/joylink/rtss/vo/paper/FindPaperUserForCompositionReqVo.java +++ b/src/main/java/club/joylink/rtss/vo/paper/FindPaperUserForCompositionReqVo.java @@ -29,11 +29,19 @@ public class FindPaperUserForCompositionReqVo extends PageQueryVO { @NotNull private Long pcId; /** - * 查询类型，默认所有 + * 查询类型，默认所有,序列化后为数值
+ * All(1),//所有
+ * Pass(2),//所有及格的
+ * NotPass(3),//所有不及格的
+ * NotComplete(4),//未完成考试
+ * Complete(5),//完成考试，即及格和不及格的
*/ private FindPuType findType = FindPuType.All; /** - * 以什么来排序,默认以用户试卷创建时间 + * 以什么来排序,默认以用户试卷创建时间,序列化后为数值
+ * CreateTime(1, "create_time"),//用户试卷创建时间
+ * StartTime(2, "start_time"),//用户开始答题时间
+ * Score(3, "score"),//用户最终得分
*/ private FindPuOrderByType orderBy = FindPuOrderByType.CreateTime; /** diff --git a/src/main/java/club/joylink/rtss/vo/paper/PaperSubmitAnswerReqVo.java b/src/main/java/club/joylink/rtss/vo/paper/PaperSubmitAnswerReqVo.java index bcb5e882b..bea9245b0 100644 --- a/src/main/java/club/joylink/rtss/vo/paper/PaperSubmitAnswerReqVo.java +++ b/src/main/java/club/joylink/rtss/vo/paper/PaperSubmitAnswerReqVo.java @@ -22,12 +22,17 @@ public class PaperSubmitAnswerReqVo { @JsonSerialize(using = ToStringSerializer.class) private Long pqId; /** - * 试题类型：1-理论题，2-实训题 + * 试题类型：1-理论题，2-实训题，序列化后为数值 */ @NotNull private PaperQType.GroupType type; /** - * 试题子类型 + * 试题子类型，序列化后为数值
+ * Select(1),
+ * Multi(2),
+ * Judge(3),
+ * Single(4),
+ * Scene(5),
*/ @NotNull private PaperQType.SubType subType; diff --git a/src/main/java/club/joylink/rtss/vo/permission/FindAbilityBasicRspVo.java b/src/main/java/club/joylink/rtss/vo/permission/FindAbilityBasicRspVo.java new file mode 100644 index 000000000..dc616f542 --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/permission/FindAbilityBasicRspVo.java @@ -0,0 +1,32 @@ +package club.joylink.rtss.vo.permission; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * 更新权限功能的请求 + */ +@Data +public class FindAbilityBasicRspVo { + /** + * 权限功能id + */ + @JsonSerialize(using = ToStringSerializer.class) + @NotNull + private Long id; + /** + * 权限功能名称 + */ + private String name; + /** + * 权限功能描述 + */ + private String des; + /** + * 权限功能类型 + */ + private SystemAbilityType type; +} diff --git a/src/main/java/club/joylink/rtss/vo/permission/SystemAbilityRspVo.java b/src/main/java/club/joylink/rtss/vo/permission/SystemAbilityRspVo.java new file mode 100644 index 000000000..2b6df7163 --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/permission/SystemAbilityRspVo.java @@ -0,0 +1,53 @@ +package club.joylink.rtss.vo.permission; + +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class SystemAbilityRspVo { + /** + * 系统功能id + */ + private Long id; + + /** + * 功能的类型 + */ + private SystemAbilityType type; + + /** + * 关联的功能的id,由type决定关联表 + */ + private Long abilityId; + + /** + * 功能的名称 + */ + private String name; + + /** + * 功能的描述 + */ + private String des; + + /** + * 状态 + */ + private SystemAbilityStatus status; + + /** + * 创建者id + */ + private Long creatorId; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 跟新时间 + */ + private LocalDateTime updateTime; +}