xiatian 2 anos atrás
pai
commit
dfa05c2518

+ 5 - 2
src/main/java/cn/com/qmth/mps/bean/PaperDetail.java

@@ -2,11 +2,14 @@ package cn.com.qmth.mps.bean;
 
 import java.util.List;
 
-public class PaperDetail {
+import io.swagger.annotations.ApiModelProperty;
 
+public class PaperDetail {
+	@ApiModelProperty("大题名称")
 	private String name;
+	@ApiModelProperty("大题号")
 	private Integer number;
-	
+	@ApiModelProperty("小题信息")
 	private List<PaperDetailUnit> units;
 	public String getName() {
 		return name;

+ 5 - 0
src/main/java/cn/com/qmth/mps/bean/PaperDetailUnit.java

@@ -1,8 +1,13 @@
 package cn.com.qmth.mps.bean;
 
+import io.swagger.annotations.ApiModelProperty;
+
 public class PaperDetailUnit {
+	@ApiModelProperty("小题号")
 	private Integer number;
+	@ApiModelProperty("小题满分")
 	private Double score;
+	@ApiModelProperty("给分间隔")
 	private Double scoreStep;
 	public Integer getNumber() {
 		return number;

+ 4 - 1
src/main/java/cn/com/qmth/mps/bean/PaperGroup.java

@@ -2,9 +2,12 @@ package cn.com.qmth.mps.bean;
 
 import java.util.List;
 
-public class PaperGroup {
+import io.swagger.annotations.ApiModelProperty;
 
+public class PaperGroup {
+	@ApiModelProperty("分组序号")
 	private Integer number;
+	@ApiModelProperty("分组信息")
 	private List<PaperGroupUnit> groupUnit;
 	public Integer getNumber() {
 		return number;

+ 4 - 0
src/main/java/cn/com/qmth/mps/bean/PaperGroupUnit.java

@@ -1,7 +1,11 @@
 package cn.com.qmth.mps.bean;
 
+import io.swagger.annotations.ApiModelProperty;
+
 public class PaperGroupUnit {
+	@ApiModelProperty("大题号")
 	private Integer deatailNumber;
+	@ApiModelProperty("小题号")
 	private Integer unitNumber;
 	public Integer getDeatailNumber() {
 		return deatailNumber;

+ 4 - 3
src/main/java/cn/com/qmth/mps/controller/PaperController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -67,13 +68,13 @@ public class PaperController extends BaseController {
 
 	@ApiOperation(value = "试卷结构提交")
 	@RequestMapping(value = "/struct/submit ", method = RequestMethod.POST)
-	public PaperVo structSubmit(StructDomain domain) {
+	public PaperVo structSubmit(@RequestBody StructDomain domain) {
 		return null;
 	}
 	
 	@ApiOperation(value = "试卷结构暂存")
 	@RequestMapping(value = "/struct/save ", method = RequestMethod.POST)
-	public PaperVo structSave(StructDomain domain) {
+	public PaperVo structSave(@RequestBody StructDomain domain) {
 		return null;
 	}
 	
@@ -91,6 +92,6 @@ public class PaperController extends BaseController {
 	
 	@ApiOperation(value = "保存分组信息")
 	@RequestMapping(value = "/group/save", method = RequestMethod.POST)
-	public void groupInfo(PaperGroup domain) {
+	public void groupInfo(@RequestBody PaperGroup domain) {
 	}
 }

+ 3 - 3
src/main/java/cn/com/qmth/mps/entity/UserEntity.java

@@ -20,7 +20,7 @@ public class UserEntity extends AuditingEntity {
 	private Boolean enable;
 	
 	@TableField(value = "params", typeHandler = JacksonTypeHandler.class)
-	private List<Long> course;
+	private List<String> course;
 	private Role role;
 
 	public Long getSchoolId() {
@@ -71,11 +71,11 @@ public class UserEntity extends AuditingEntity {
 		this.role = role;
 	}
 
-	public List<Long> getCourse() {
+	public List<String> getCourse() {
 		return course;
 	}
 
-	public void setCourse(List<Long> course) {
+	public void setCourse(List<String> course) {
 		this.course = course;
 	}
 	

+ 4 - 0
src/main/java/cn/com/qmth/mps/vo/exam/ExamDomain.java

@@ -1,9 +1,13 @@
 package cn.com.qmth.mps.vo.exam;
 
 import cn.com.qmth.mps.enums.ExamStatus;
+import io.swagger.annotations.ApiModelProperty;
 public class ExamDomain {
+	@ApiModelProperty("id")
 	private Long id;
+	@ApiModelProperty("考试名称")
 	private String name;
+	@ApiModelProperty("考试状态")
 	private ExamStatus examStatus;
 	public String getName() {
 		return name;

+ 3 - 2
src/main/java/cn/com/qmth/mps/vo/exam/ExamQuery.java

@@ -1,11 +1,12 @@
 package cn.com.qmth.mps.vo.exam;
 
 import cn.com.qmth.mps.util.PagerQuery;
+import io.swagger.annotations.ApiModelProperty;
 
 public class ExamQuery extends PagerQuery {
-
+	@ApiModelProperty("学校id")
 	private Long schoolId;
-	
+	@ApiModelProperty("考试名称")
     private String name;
 
 	public String getName() {

+ 6 - 0
src/main/java/cn/com/qmth/mps/vo/exam/ExamVo.java

@@ -2,15 +2,21 @@ package cn.com.qmth.mps.vo.exam;
 
 import cn.com.qmth.mps.entity.base.BaseEntity;
 import cn.com.qmth.mps.enums.ExamStatus;
+import io.swagger.annotations.ApiModelProperty;
 public class ExamVo extends BaseEntity{
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = -2762342766185496673L;
+	@ApiModelProperty("考试id")
 	private Long id;
+	@ApiModelProperty("学校名称")
 	private Long schoolId;
+	@ApiModelProperty("考试名称")
 	private String name;
+	@ApiModelProperty("考试状态")
 	private ExamStatus examStatus;
+	@ApiModelProperty("科目数量")
 	private Integer paperCount;
 	public Long getSchoolId() {
 		return schoolId;

+ 5 - 0
src/main/java/cn/com/qmth/mps/vo/paper/GroupVo.java

@@ -3,11 +3,16 @@ package cn.com.qmth.mps.vo.paper;
 import java.util.List;
 
 import cn.com.qmth.mps.bean.PaperGroupUnit;
+import io.swagger.annotations.ApiModelProperty;
 
 public class GroupVo {
+	@ApiModelProperty("分组序号")
 	private Integer number;
+	@ApiModelProperty("分组信息")
 	private List<PaperGroupUnit> groupUnit;
+	@ApiModelProperty("大题号")
 	private String detailNumbers;
+	@ApiModelProperty("大题名称")
 	private String detailNames;
 	public Integer getNumber() {
 		return number;

+ 8 - 6
src/main/java/cn/com/qmth/mps/vo/paper/PaperQuery.java

@@ -1,20 +1,22 @@
 package cn.com.qmth.mps.vo.paper;
 
 import cn.com.qmth.mps.util.PagerQuery;
+import io.swagger.annotations.ApiModelProperty;
 
 public class PaperQuery extends PagerQuery {
-
+	@ApiModelProperty("学校id")
 	private Long schoolId;
-	
+	@ApiModelProperty("考试id")
 	private Long examId;
-	
+	@ApiModelProperty("分组状态")
 	private Boolean groupFinish;
-	
+	@ApiModelProperty("科目代码")
 	private String courseCode;
-	
+	@ApiModelProperty("科目名称")
     private String courseName;
-
+	@ApiModelProperty("总分起始值")
     private Double totalScoreMin;
+	@ApiModelProperty("总分截止值")
     private Double totalScoreMax;
 	public Long getSchoolId() {
 		return schoolId;

+ 14 - 0
src/main/java/cn/com/qmth/mps/vo/paper/PaperVo.java

@@ -5,24 +5,38 @@ import java.util.List;
 import cn.com.qmth.mps.bean.PaperDetail;
 import cn.com.qmth.mps.bean.PaperGroup;
 import cn.com.qmth.mps.entity.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 public class PaperVo extends BaseEntity{
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = -2271590671135347709L;
+	@ApiModelProperty("试卷结构id")
 	private Long id;
+	@ApiModelProperty("学校id")
 	private Long schoolId;
+	@ApiModelProperty("考试id")
 	private Long examId;
+	@ApiModelProperty("科目id")
 	private Long courseId;
+	@ApiModelProperty("科目代码")
 	private String courseCode;
+	@ApiModelProperty("科目名称")
     private String courseName;
+	@ApiModelProperty("试卷总分")
 	private Double totalScore;
+	@ApiModelProperty("客观总分")
 	private Double objectiveScore;
+	@ApiModelProperty("主观总分")
 	private Double subjectiveScore;
+	@ApiModelProperty("试卷结构信息")
 	private List<PaperDetail> structInfo;
+	@ApiModelProperty("分组信息")
 	private List<PaperGroup> groupInfo;
+	@ApiModelProperty("试卷类型")
 	private String paperType;
+	@ApiModelProperty("分组是否完成")
 	private Boolean groupFinish;
 	public Long getId() {
 		return id;

+ 3 - 0
src/main/java/cn/com/qmth/mps/vo/paper/StructDomain.java

@@ -3,9 +3,12 @@ package cn.com.qmth.mps.vo.paper;
 import java.util.List;
 
 import cn.com.qmth.mps.bean.PaperDetail;
+import io.swagger.annotations.ApiModelProperty;
 
 public class StructDomain {
+	@ApiModelProperty("试卷结构Id")
 	private Long paperId;
+	@ApiModelProperty("大题信息")
 	private List<PaperDetail> structInfo;
 	public Long getPaperId() {
 		return paperId;

+ 7 - 0
src/main/java/cn/com/qmth/mps/vo/school/SchollDomain.java

@@ -1,10 +1,17 @@
 package cn.com.qmth.mps.vo.school;
 
+import io.swagger.annotations.ApiModelProperty;
+
 public class SchollDomain {
+	@ApiModelProperty("学校id")
 	private Long id;
+	@ApiModelProperty("学校名称")
 	private String name;
+	@ApiModelProperty("联系方式")
 	private String telephone;
+	@ApiModelProperty("负责人")
 	private String contacts;
+	@ApiModelProperty("区域")
 	private String region;
 	
 

+ 2 - 1
src/main/java/cn/com/qmth/mps/vo/school/SchoolQuery.java

@@ -1,9 +1,10 @@
 package cn.com.qmth.mps.vo.school;
 
 import cn.com.qmth.mps.util.PagerQuery;
+import io.swagger.annotations.ApiModelProperty;
 
 public class SchoolQuery extends PagerQuery {
-
+	@ApiModelProperty("学校名称")
     private String name;
 
 	public String getName() {

+ 10 - 4
src/main/java/cn/com/qmth/mps/vo/user/UserDomain.java

@@ -3,13 +3,19 @@ package cn.com.qmth.mps.vo.user;
 import java.util.List;
 
 import cn.com.qmth.mps.enums.Role;
+import io.swagger.annotations.ApiModelProperty;
 public class UserDomain {
-
+	@ApiModelProperty("用户id")
 	private Long id;
+	@ApiModelProperty("学校id")
 	private Long schoolId;
+	@ApiModelProperty("姓名")
 	private String name;
+	@ApiModelProperty("登录名")
 	private String loginName;
-	private List<Long> course;
+	@ApiModelProperty("科目代码集合")
+	private List<String> course;
+	@ApiModelProperty("角色")
 	private Role role;
 
 	public Long getSchoolId() {
@@ -44,11 +50,11 @@ public class UserDomain {
 		this.role = role;
 	}
 
-	public List<Long> getCourse() {
+	public List<String> getCourse() {
 		return course;
 	}
 
-	public void setCourse(List<Long> course) {
+	public void setCourse(List<String> course) {
 		this.course = course;
 	}
 

+ 4 - 2
src/main/java/cn/com/qmth/mps/vo/user/UserQuery.java

@@ -2,12 +2,14 @@ package cn.com.qmth.mps.vo.user;
 
 import cn.com.qmth.mps.enums.Role;
 import cn.com.qmth.mps.util.PagerQuery;
+import io.swagger.annotations.ApiModelProperty;
 
 public class UserQuery extends PagerQuery {
-
+	@ApiModelProperty("用学校id")
 	private Long schoolId;
-	
+	@ApiModelProperty("登录名")
 	private String loginName;
+	@ApiModelProperty("角色")
 	private Role role;
 	public Long getSchoolId() {
 		return schoolId;

+ 13 - 3
src/main/java/cn/com/qmth/mps/vo/user/UserVo.java

@@ -5,20 +5,30 @@ import java.util.List;
 import cn.com.qmth.mps.entity.CourseEntity;
 import cn.com.qmth.mps.entity.base.BaseEntity;
 import cn.com.qmth.mps.enums.Role;
+import io.swagger.annotations.ApiModelProperty;
 
 public class UserVo extends BaseEntity{
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = -8438831917617025722L;
+	@ApiModelProperty("用户id")
 	private Long id;
+	@ApiModelProperty("学校id")
 	private Long schoolId;
+	@ApiModelProperty("学校名称")
 	private String schoolName;
+	@ApiModelProperty("姓名")
 	private String name;
+	@ApiModelProperty("登录名")
 	private String loginName;
+	@ApiModelProperty("启用禁用")
 	private Boolean enable;
-	private List<Long> course;
+	@ApiModelProperty("科目代码集合")
+	private List<String> course;
+	@ApiModelProperty("科目信息集合")
 	private List<CourseEntity> courseInfo;
+	@ApiModelProperty("角色")
 	private Role role;
 	public Long getId() {
 		return id;
@@ -56,10 +66,10 @@ public class UserVo extends BaseEntity{
 	public void setEnable(Boolean enable) {
 		this.enable = enable;
 	}
-	public List<Long> getCourse() {
+	public List<String> getCourse() {
 		return course;
 	}
-	public void setCourse(List<Long> course) {
+	public void setCourse(List<String> course) {
 		this.course = course;
 	}
 	public Role getRole() {