Merge pull request #49 from mindskip/alvis

优化
This commit is contained in:
alvis 2021-01-21 09:33:17 +08:00 committed by GitHub
commit af0c1b82b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 908 additions and 48 deletions

View File

@ -1,12 +1,34 @@
package com.mindskip.xzs.viewmodel.student.dashboard;
import lombok.Data;
import java.util.List;
@Data
public class IndexVM {
private List<PaperInfo> fixedPaper;
private List<PaperInfoVM> timeLimitPaper;
private List<PaperInfo> pushPaper;
public List<PaperInfo> getFixedPaper() {
return fixedPaper;
}
public void setFixedPaper(List<PaperInfo> fixedPaper) {
this.fixedPaper = fixedPaper;
}
public List<PaperInfoVM> getTimeLimitPaper() {
return timeLimitPaper;
}
public void setTimeLimitPaper(List<PaperInfoVM> timeLimitPaper) {
this.timeLimitPaper = timeLimitPaper;
}
public List<PaperInfo> getPushPaper() {
return pushPaper;
}
public void setPushPaper(List<PaperInfo> pushPaper) {
this.pushPaper = pushPaper;
}
}

View File

@ -1,13 +1,43 @@
package com.mindskip.xzs.viewmodel.student.dashboard;
import lombok.Data;
import java.util.Date;
@Data
public class PaperFilter {
private Integer userId;
private Date dateTime;
private Integer examPaperType;
private Integer gradeLevel;
public Integer getUserId() {
return userId;
}
public void setUserId(Integer userId) {
this.userId = userId;
}
public Date getDateTime() {
return dateTime;
}
public void setDateTime(Date dateTime) {
this.dateTime = dateTime;
}
public Integer getExamPaperType() {
return examPaperType;
}
public void setExamPaperType(Integer examPaperType) {
this.examPaperType = examPaperType;
}
public Integer getGradeLevel() {
return gradeLevel;
}
public void setGradeLevel(Integer gradeLevel) {
this.gradeLevel = gradeLevel;
}
}

View File

@ -1,13 +1,43 @@
package com.mindskip.xzs.viewmodel.student.dashboard;
import lombok.Data;
import java.util.Date;
@Data
public class PaperInfo {
private Integer id;
private String name;
private Date limitStartTime;
private Date limitEndTime;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Date getLimitStartTime() {
return limitStartTime;
}
public void setLimitStartTime(Date limitStartTime) {
this.limitStartTime = limitStartTime;
}
public Date getLimitEndTime() {
return limitEndTime;
}
public void setLimitEndTime(Date limitEndTime) {
this.limitEndTime = limitEndTime;
}
}

View File

@ -1,9 +1,23 @@
package com.mindskip.xzs.viewmodel.student.dashboard;
import lombok.Data;
@Data
public class PaperInfoVM extends PaperInfo {
private String startTime;
private String endTime;
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
}

View File

@ -1,11 +1,41 @@
package com.mindskip.xzs.viewmodel.student.dashboard;
import lombok.Data;
@Data
public class TaskItemPaperVm {
private Integer examPaperId;
private String examPaperName;
private Integer examPaperAnswerId;
private Integer status;
public Integer getExamPaperId() {
return examPaperId;
}
public void setExamPaperId(Integer examPaperId) {
this.examPaperId = examPaperId;
}
public String getExamPaperName() {
return examPaperName;
}
public void setExamPaperName(String examPaperName) {
this.examPaperName = examPaperName;
}
public Integer getExamPaperAnswerId() {
return examPaperAnswerId;
}
public void setExamPaperAnswerId(Integer examPaperAnswerId) {
this.examPaperAnswerId = examPaperAnswerId;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
}

View File

@ -1,12 +1,34 @@
package com.mindskip.xzs.viewmodel.student.dashboard;
import lombok.Data;
import java.util.List;
@Data
public class TaskItemVm {
private Integer id;
private String title;
private List<TaskItemPaperVm> paperItems;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public List<TaskItemPaperVm> getPaperItems() {
return paperItems;
}
public void setPaperItems(List<TaskItemPaperVm> paperItems) {
this.paperItems = paperItems;
}
}

View File

@ -1,12 +1,10 @@
package com.mindskip.xzs.viewmodel.student.education;
import com.mindskip.xzs.viewmodel.BaseVM;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Data
public class SubjectEditRequestVM extends BaseVM {
private Integer id;
@ -20,4 +18,35 @@ public class SubjectEditRequestVM extends BaseVM {
@NotBlank
private String levelName;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Integer getLevel() {
return level;
}
public void setLevel(Integer level) {
this.level = level;
}
public String getLevelName() {
return levelName;
}
public void setLevelName(String levelName) {
this.levelName = levelName;
}
}

View File

@ -1,10 +1,24 @@
package com.mindskip.xzs.viewmodel.student.education;
import lombok.Data;
@Data
public class SubjectVM {
private String id;
private String name;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}

View File

@ -1,8 +1,6 @@
package com.mindskip.xzs.viewmodel.student.exam;
import lombok.Data;
@Data
public class ExamPaperPageResponseVM {
private Integer id;
@ -23,4 +21,84 @@ public class ExamPaperPageResponseVM {
private Integer paperType;
private Integer frameTextContentId;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Integer getQuestionCount() {
return questionCount;
}
public void setQuestionCount(Integer questionCount) {
this.questionCount = questionCount;
}
public Integer getScore() {
return score;
}
public void setScore(Integer score) {
this.score = score;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public Integer getCreateUser() {
return createUser;
}
public void setCreateUser(Integer createUser) {
this.createUser = createUser;
}
public Integer getSubjectId() {
return subjectId;
}
public void setSubjectId(Integer subjectId) {
this.subjectId = subjectId;
}
public String getSubjectName() {
return subjectName;
}
public void setSubjectName(String subjectName) {
this.subjectName = subjectName;
}
public Integer getPaperType() {
return paperType;
}
public void setPaperType(Integer paperType) {
this.paperType = paperType;
}
public Integer getFrameTextContentId() {
return frameTextContentId;
}
public void setFrameTextContentId(Integer frameTextContentId) {
this.frameTextContentId = frameTextContentId;
}
}

View File

@ -1,14 +1,36 @@
package com.mindskip.xzs.viewmodel.student.exam;
import com.mindskip.xzs.base.BasePage;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class ExamPaperPageVM extends BasePage {
@NotNull
private Integer paperType;
private Integer subjectId;
private Integer levelId;
public Integer getPaperType() {
return paperType;
}
public void setPaperType(Integer paperType) {
this.paperType = paperType;
}
public Integer getSubjectId() {
return subjectId;
}
public void setSubjectId(Integer subjectId) {
this.subjectId = subjectId;
}
public Integer getLevelId() {
return levelId;
}
public void setLevelId(Integer levelId) {
this.levelId = levelId;
}
}

View File

@ -1,10 +1,24 @@
package com.mindskip.xzs.viewmodel.student.exam;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM;
import lombok.Data;
@Data
public class ExamPaperReadVM {
private ExamPaperEditRequestVM paper;
private ExamPaperSubmitVM answer;
public ExamPaperEditRequestVM getPaper() {
return paper;
}
public void setPaper(ExamPaperEditRequestVM paper) {
this.paper = paper;
}
public ExamPaperSubmitVM getAnswer() {
return answer;
}
public void setAnswer(ExamPaperSubmitVM answer) {
this.answer = answer;
}
}

View File

@ -1,11 +1,9 @@
package com.mindskip.xzs.viewmodel.student.exam;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
public class ExamPaperSubmitItemVM {
private Integer id;
@NotNull
@ -22,4 +20,68 @@ public class ExamPaperSubmitItemVM {
private String score;
private String questionScore;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getQuestionId() {
return questionId;
}
public void setQuestionId(Integer questionId) {
this.questionId = questionId;
}
public Boolean getDoRight() {
return doRight;
}
public void setDoRight(Boolean doRight) {
this.doRight = doRight;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public Integer getItemOrder() {
return itemOrder;
}
public void setItemOrder(Integer itemOrder) {
this.itemOrder = itemOrder;
}
public List<String> getContentArray() {
return contentArray;
}
public void setContentArray(List<String> contentArray) {
this.contentArray = contentArray;
}
public String getScore() {
return score;
}
public void setScore(String score) {
this.score = score;
}
public String getQuestionScore() {
return questionScore;
}
public void setQuestionScore(String questionScore) {
this.questionScore = questionScore;
}
}

View File

@ -1,13 +1,11 @@
package com.mindskip.xzs.viewmodel.student.exam;
import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
public class ExamPaperSubmitVM {
@NotNull
@ -21,4 +19,36 @@ public class ExamPaperSubmitVM {
@NotNull
@Valid
private List<ExamPaperSubmitItemVM> answerItems;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getDoTime() {
return doTime;
}
public void setDoTime(Integer doTime) {
this.doTime = doTime;
}
public String getScore() {
return score;
}
public void setScore(String score) {
this.score = score;
}
public List<ExamPaperSubmitItemVM> getAnswerItems() {
return answerItems;
}
public void setAnswerItems(List<ExamPaperSubmitItemVM> answerItems) {
this.answerItems = answerItems;
}
}

View File

@ -1,8 +1,6 @@
package com.mindskip.xzs.viewmodel.student.exampaper;
import lombok.Data;
@Data
public class ExamPaperAnswerPageResponseVM {
private Integer id;
@ -29,4 +27,108 @@ public class ExamPaperAnswerPageResponseVM {
private Integer status;
private String paperName;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getUserScore() {
return userScore;
}
public void setUserScore(String userScore) {
this.userScore = userScore;
}
public String getSubjectName() {
return subjectName;
}
public void setSubjectName(String subjectName) {
this.subjectName = subjectName;
}
public Integer getSubjectId() {
return subjectId;
}
public void setSubjectId(Integer subjectId) {
this.subjectId = subjectId;
}
public Integer getQuestionCount() {
return questionCount;
}
public void setQuestionCount(Integer questionCount) {
this.questionCount = questionCount;
}
public Integer getQuestionCorrect() {
return questionCorrect;
}
public void setQuestionCorrect(Integer questionCorrect) {
this.questionCorrect = questionCorrect;
}
public String getPaperScore() {
return paperScore;
}
public void setPaperScore(String paperScore) {
this.paperScore = paperScore;
}
public String getDoTime() {
return doTime;
}
public void setDoTime(String doTime) {
this.doTime = doTime;
}
public Integer getPaperType() {
return paperType;
}
public void setPaperType(Integer paperType) {
this.paperType = paperType;
}
public String getSystemScore() {
return systemScore;
}
public void setSystemScore(String systemScore) {
this.systemScore = systemScore;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public String getPaperName() {
return paperName;
}
public void setPaperName(String paperName) {
this.paperName = paperName;
}
}

View File

@ -1,13 +1,26 @@
package com.mindskip.xzs.viewmodel.student.exampaper;
import com.mindskip.xzs.base.BasePage;
import lombok.Data;
@Data
public class ExamPaperAnswerPageVM extends BasePage {
private Integer subjectId;
private Integer createUser;
public Integer getSubjectId() {
return subjectId;
}
public void setSubjectId(Integer subjectId) {
this.subjectId = subjectId;
}
public Integer getCreateUser() {
return createUser;
}
public void setCreateUser(Integer createUser) {
this.createUser = createUser;
}
}

View File

@ -2,10 +2,24 @@ package com.mindskip.xzs.viewmodel.student.question.answer;
import com.mindskip.xzs.viewmodel.admin.question.QuestionEditRequestVM;
import com.mindskip.xzs.viewmodel.student.exam.ExamPaperSubmitItemVM;
import lombok.Data;
@Data
public class QuestionAnswerVM {
private QuestionEditRequestVM questionVM;
private ExamPaperSubmitItemVM questionAnswerVM;
public QuestionEditRequestVM getQuestionVM() {
return questionVM;
}
public void setQuestionVM(QuestionEditRequestVM questionVM) {
this.questionVM = questionVM;
}
public ExamPaperSubmitItemVM getQuestionAnswerVM() {
return questionAnswerVM;
}
public void setQuestionAnswerVM(ExamPaperSubmitItemVM questionAnswerVM) {
this.questionAnswerVM = questionAnswerVM;
}
}

View File

@ -1,9 +1,15 @@
package com.mindskip.xzs.viewmodel.student.question.answer;
import com.mindskip.xzs.base.BasePage;
import lombok.Data;
@Data
public class QuestionPageStudentRequestVM extends BasePage {
private Integer createUser;
public Integer getCreateUser() {
return createUser;
}
public void setCreateUser(Integer createUser) {
this.createUser = createUser;
}
}

View File

@ -1,8 +1,6 @@
package com.mindskip.xzs.viewmodel.student.question.answer;
import lombok.Data;
@Data
public class QuestionPageStudentResponseVM {
private Integer id;
@ -13,4 +11,44 @@ public class QuestionPageStudentResponseVM {
private String subjectName;
private String shortTitle;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getQuestionType() {
return questionType;
}
public void setQuestionType(Integer questionType) {
this.questionType = questionType;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getSubjectName() {
return subjectName;
}
public void setSubjectName(String subjectName) {
this.subjectName = subjectName;
}
public String getShortTitle() {
return shortTitle;
}
public void setShortTitle(String shortTitle) {
this.shortTitle = shortTitle;
}
}

View File

@ -1,11 +1,16 @@
package com.mindskip.xzs.viewmodel.student.user;
import com.mindskip.xzs.base.BasePage;
import lombok.Data;
@Data
public class MessageRequestVM extends BasePage {
private Integer receiveUserId;
public Integer getReceiveUserId() {
return receiveUserId;
}
public void setReceiveUserId(Integer receiveUserId) {
this.receiveUserId = receiveUserId;
}
}

View File

@ -1,8 +1,6 @@
package com.mindskip.xzs.viewmodel.student.user;
import lombok.Data;
@Data
public class MessageResponseVM {
private Integer id;
@ -17,4 +15,60 @@ public class MessageResponseVM {
private String createTime;
private String sendUserName;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public Integer getMessageId() {
return messageId;
}
public void setMessageId(Integer messageId) {
this.messageId = messageId;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public Boolean getReaded() {
return readed;
}
public void setReaded(Boolean readed) {
this.readed = readed;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getSendUserName() {
return sendUserName;
}
public void setSendUserName(String sendUserName) {
this.sendUserName = sendUserName;
}
}

View File

@ -1,10 +1,8 @@
package com.mindskip.xzs.viewmodel.student.user;
import lombok.Data;
import java.util.Date;
@Data
public class UserEventLogVM {
private Integer id;
@ -19,4 +17,51 @@ public class UserEventLogVM {
private String createTime;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getUserId() {
return userId;
}
public void setUserId(Integer userId) {
this.userId = userId;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getRealName() {
return realName;
}
public void setRealName(String realName) {
this.realName = realName;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
}

View File

@ -1,11 +1,9 @@
package com.mindskip.xzs.viewmodel.student.user;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Data
public class UserRegisterVM {
@NotBlank
@ -16,4 +14,28 @@ public class UserRegisterVM {
@NotNull
private Integer userLevel;
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public Integer getUserLevel() {
return userLevel;
}
public void setUserLevel(Integer userLevel) {
this.userLevel = userLevel;
}
}

View File

@ -3,13 +3,11 @@ package com.mindskip.xzs.viewmodel.student.user;
import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.utility.DateTimeUtil;
import com.mindskip.xzs.viewmodel.BaseVM;
import lombok.Data;
/**
* @author 武汉思维跳跃科技有限公司
*/
@Data
public class UserResponseVM extends BaseVM {
private Integer id;
@ -50,4 +48,124 @@ public class UserResponseVM extends BaseVM {
vm.setModifyTime(DateTimeUtil.dateFormat(user.getModifyTime()));
return vm;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getUserUuid() {
return userUuid;
}
public void setUserUuid(String userUuid) {
this.userUuid = userUuid;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getRealName() {
return realName;
}
public void setRealName(String realName) {
this.realName = realName;
}
public Integer getAge() {
return age;
}
public void setAge(Integer age) {
this.age = age;
}
public Integer getRole() {
return role;
}
public void setRole(Integer role) {
this.role = role;
}
public Integer getSex() {
return sex;
}
public void setSex(Integer sex) {
this.sex = sex;
}
public String getBirthDay() {
return birthDay;
}
public void setBirthDay(String birthDay) {
this.birthDay = birthDay;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getLastActiveTime() {
return lastActiveTime;
}
public void setLastActiveTime(String lastActiveTime) {
this.lastActiveTime = lastActiveTime;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getModifyTime() {
return modifyTime;
}
public void setModifyTime(String modifyTime) {
this.modifyTime = modifyTime;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Integer getUserLevel() {
return userLevel;
}
public void setUserLevel(Integer userLevel) {
this.userLevel = userLevel;
}
public String getImagePath() {
return imagePath;
}
public void setImagePath(String imagePath) {
this.imagePath = imagePath;
}
}

View File

@ -1,11 +1,9 @@
package com.mindskip.xzs.viewmodel.student.user;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Data
public class UserUpdateVM {
@NotBlank
@ -21,4 +19,52 @@ public class UserUpdateVM {
@NotNull
private Integer userLevel;
public String getRealName() {
return realName;
}
public void setRealName(String realName) {
this.realName = realName;
}
public String getAge() {
return age;
}
public void setAge(String age) {
this.age = age;
}
public Integer getSex() {
return sex;
}
public void setSex(Integer sex) {
this.sex = sex;
}
public String getBirthDay() {
return birthDay;
}
public void setBirthDay(String birthDay) {
this.birthDay = birthDay;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public Integer getUserLevel() {
return userLevel;
}
public void setUserLevel(Integer userLevel) {
this.userLevel = userLevel;
}
}