。。。。

src/main/java/cn/com/qmth/examcloud/question/core/paper/DefaultPaper.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.question.core.paper;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -9,7 +10,7 @@ import java.util.List;
  * @date 2018年8月15日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class DefaultPaper implements Paper {
+public class DefaultPaper implements Serializable {
 
 	private static final long serialVersionUID = -5979287118960427883L;
 
@@ -36,22 +37,20 @@ public class DefaultPaper implements Paper {
 		this.name = name;
 	}
 
-	@Override
-	public List<? extends QuestionGroup> getQuestionGroupList() {
-		return questionGroupList;
+	public Boolean getFullyObjective() {
+		return fullyObjective;
 	}
 
-	public void setQuestionGroupList(List<DefaultQuestionGroup> questionGroupList) {
-		this.questionGroupList = questionGroupList;
+	public void setFullyObjective(Boolean fullyObjective) {
+		this.fullyObjective = fullyObjective;
 	}
 
-	@Override
-	public Boolean isFullyObjective() {
-		return fullyObjective;
+	public List<DefaultQuestionGroup> getQuestionGroupList() {
+		return questionGroupList;
 	}
 
-	public void setFullyObjective(Boolean fullyObjective) {
-		this.fullyObjective = fullyObjective;
+	public void setQuestionGroupList(List<DefaultQuestionGroup> questionGroupList) {
+		this.questionGroupList = questionGroupList;
 	}
 
 }

src/main/java/cn/com/qmth/examcloud/question/core/paper/DefaultQuestionGroup.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.question.core.paper;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -9,7 +10,7 @@ import java.util.List;
  * @date 2018年8月15日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class DefaultQuestionGroup implements QuestionGroup {
+public class DefaultQuestionGroup implements Serializable {
 
 	private static final long serialVersionUID = 2149814711274942645L;
 
@@ -19,7 +20,8 @@ public class DefaultQuestionGroup implements QuestionGroup {
 	private String groupName;
 
 	/**
-	 * 题包装器集合
+	 * 题包装器集合<br>
+	 * 属性名首字母要改小写
 	 */
 	private List<DefaultQuestionStructureWrapper> QuestionWrapperList;
 
@@ -28,18 +30,15 @@ public class DefaultQuestionGroup implements QuestionGroup {
 	 */
 	private Float groupScore;
 
-	@Override
 	public String getGroupName() {
 		return groupName;
 	}
 
-	@Override
 	public void setGroupName(String groupName) {
 		this.groupName = groupName;
 	}
 
-	@Override
-	public List<? extends QuestionStructureWrapper> getQuestionWrapperList() {
+	public List<DefaultQuestionStructureWrapper> getQuestionWrapperList() {
 		return QuestionWrapperList;
 	}
 
@@ -47,12 +46,10 @@ public class DefaultQuestionGroup implements QuestionGroup {
 		QuestionWrapperList = questionWrapperList;
 	}
 
-	@Override
 	public Float getGroupScore() {
 		return groupScore;
 	}
 
-	@Override
 	public void setGroupScore(Float groupScore) {
 		this.groupScore = groupScore;
 	}

src/main/java/cn/com/qmth/examcloud/question/core/paper/DefaultQuestionStructureWrapper.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.question.core.paper;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -9,7 +10,7 @@ import java.util.List;
  * @date 2018年8月15日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class DefaultQuestionStructureWrapper implements QuestionStructureWrapper {
+public class DefaultQuestionStructureWrapper implements Serializable {
 
 	private static final long serialVersionUID = 8423916951155451548L;
 
@@ -48,7 +49,6 @@ public class DefaultQuestionStructureWrapper implements QuestionStructureWrapper
 	 */
 	private List<DefaultQuestionUnitWrapper> questionUnitWrapperList;
 
-	@Override
 	public String getQuestionId() {
 		return questionId;
 	}
@@ -57,26 +57,6 @@ public class DefaultQuestionStructureWrapper implements QuestionStructureWrapper
 		this.questionId = questionId;
 	}
 
-	@Override
-	public Float getQuestionScore() {
-		return questionScore;
-	}
-
-	public void setQuestionScore(Float questionScore) {
-		this.questionScore = questionScore;
-	}
-
-	@Override
-	public List<? extends QuestionUnitWrapper> getQuestionUnitWrapperList() {
-		return questionUnitWrapperList;
-	}
-
-	public void setQuestionUnitWrapperList(
-			List<DefaultQuestionUnitWrapper> questionUnitWrapperList) {
-		this.questionUnitWrapperList = questionUnitWrapperList;
-	}
-
-	@Override
 	public String getVersion() {
 		return version;
 	}
@@ -85,6 +65,14 @@ public class DefaultQuestionStructureWrapper implements QuestionStructureWrapper
 		this.version = version;
 	}
 
+	public Float getQuestionScore() {
+		return questionScore;
+	}
+
+	public void setQuestionScore(Float questionScore) {
+		this.questionScore = questionScore;
+	}
+
 	public Integer getLimitedPlayTimes() {
 		return limitedPlayTimes;
 	}
@@ -109,4 +97,13 @@ public class DefaultQuestionStructureWrapper implements QuestionStructureWrapper
 		this.timeLimit = timeLimit;
 	}
 
+	public List<DefaultQuestionUnitWrapper> getQuestionUnitWrapperList() {
+		return questionUnitWrapperList;
+	}
+
+	public void setQuestionUnitWrapperList(
+			List<DefaultQuestionUnitWrapper> questionUnitWrapperList) {
+		this.questionUnitWrapperList = questionUnitWrapperList;
+	}
+
 }

src/main/java/cn/com/qmth/examcloud/question/core/paper/DefaultQuestionUnitWrapper.java

@@ -1,5 +1,7 @@
 package cn.com.qmth.examcloud.question.core.paper;
 
+import java.io.Serializable;
+
 import cn.com.qmth.examcloud.question.core.question.QuestionType;
 
 /**
@@ -9,7 +11,7 @@ import cn.com.qmth.examcloud.question.core.question.QuestionType;
  * @date 2018年8月16日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class DefaultQuestionUnitWrapper implements QuestionUnitWrapper {
+public class DefaultQuestionUnitWrapper implements Serializable {
 
 	private static final long serialVersionUID = 7584275153456817959L;
 
@@ -28,7 +30,6 @@ public class DefaultQuestionUnitWrapper implements QuestionUnitWrapper {
 	 */
 	private QuestionType questionType;
 
-	@Override
 	public Integer[] getOptionPermutation() {
 		return optionPermutation;
 	}
@@ -37,7 +38,6 @@ public class DefaultQuestionUnitWrapper implements QuestionUnitWrapper {
 		this.optionPermutation = optionPermutation;
 	}
 
-	@Override
 	public Float getQuestionScore() {
 		return questionScore;
 	}
@@ -46,7 +46,6 @@ public class DefaultQuestionUnitWrapper implements QuestionUnitWrapper {
 		this.questionScore = questionScore;
 	}
 
-	@Override
 	public QuestionType getQuestionType() {
 		return questionType;
 	}

src/main/java/cn/com/qmth/examcloud/question/core/paper/Paper.java

@@ -1,31 +0,0 @@
-package cn.com.qmth.examcloud.question.core.paper;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 试卷结构
- *
- * @author WANGWEI
- * @date 2018年8月15日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface Paper extends Serializable {
-
-	/**
-	 * 获取题组集合
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public List<? extends QuestionGroup> getQuestionGroupList();
-
-	/**
-	 * 是否全是客观题
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public Boolean isFullyObjective();
-
-}

src/main/java/cn/com/qmth/examcloud/question/core/paper/QuestionGroup.java

@@ -1,55 +0,0 @@
-package cn.com.qmth.examcloud.question.core.paper;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 题分组集合
- *
- * @author WANGWEI
- * @date 2018年8月15日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface QuestionGroup extends Serializable {
-
-	/**
-	 * 获取组名
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public String getGroupName();
-
-	/**
-	 * 设置组名
-	 *
-	 * @author WANGWEI
-	 * @param groupName
-	 */
-	public void setGroupName(String groupName);
-
-	/**
-	 * 获取题包装器集合
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public List<? extends QuestionStructureWrapper> getQuestionWrapperList();
-
-	/**
-	 * 获取题组总分
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public Float getGroupScore();
-
-	/**
-	 * 设置题组总分
-	 *
-	 * @author WANGWEI
-	 * @param groupScore
-	 */
-	public void setGroupScore(Float groupScore);
-
-}

src/main/java/cn/com/qmth/examcloud/question/core/paper/QuestionStructureWrapper.java

@@ -1,47 +0,0 @@
-package cn.com.qmth.examcloud.question.core.paper;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 题结构包装器
- *
- * @author WANGWEI
- * @date 2018年8月15日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface QuestionStructureWrapper extends Serializable {
-
-	/**
-	 * 获取题ID
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public String getQuestionId();
-
-	/**
-	 * 获取题版本
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public String getVersion();
-
-	/**
-	 * 获取题分数
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public Float getQuestionScore();
-
-	/**
-	 * 获取题单元包装器
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public List<? extends QuestionUnitWrapper> getQuestionUnitWrapperList();
-
-}

src/main/java/cn/com/qmth/examcloud/question/core/paper/QuestionUnitWrapper.java

@@ -1,22 +0,0 @@
-package cn.com.qmth.examcloud.question.core.paper;
-
-import java.io.Serializable;
-
-import cn.com.qmth.examcloud.question.core.question.QuestionType;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年8月16日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface QuestionUnitWrapper extends Serializable {
-
-	public Integer[] getOptionPermutation();
-
-	public Float getQuestionScore();
-
-	public QuestionType getQuestionType();
-
-}

src/main/java/cn/com/qmth/examcloud/question/core/question/DefaultQuestion.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.question.core.question;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -10,7 +11,7 @@ import java.util.Map;
  * @date 2018年8月15日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class DefaultQuestion implements Question {
+public class DefaultQuestion implements Serializable {
 
 	private static final long serialVersionUID = 195811114083691548L;
 
@@ -44,12 +45,10 @@ public class DefaultQuestion implements Question {
 	 */
 	private Map<String, String> properties;
 
-	@Override
 	public String getId() {
 		return id;
 	}
 
-	@Override
 	public void setId(String id) {
 		this.id = id;
 	}
@@ -70,8 +69,7 @@ public class DefaultQuestion implements Question {
 		this.isolated = isolated;
 	}
 
-	@Override
-	public QuestionStructure getMasterVersion() {
+	public DefaultQuestionStructure getMasterVersion() {
 		return masterVersion;
 	}
 
@@ -79,8 +77,7 @@ public class DefaultQuestion implements Question {
 		this.masterVersion = masterVersion;
 	}
 
-	@Override
-	public List<? extends QuestionStructure> getBranchVersionList() {
+	public List<DefaultQuestionStructure> getBranchVersionList() {
 		return branchVersionList;
 	}
 

src/main/java/cn/com/qmth/examcloud/question/core/question/DefaultQuestionOption.java

@@ -1,5 +1,7 @@
 package cn.com.qmth.examcloud.question.core.question;
 
+import java.io.Serializable;
+
 /**
  * 选择题选项
  *
@@ -7,7 +9,7 @@ package cn.com.qmth.examcloud.question.core.question;
  * @date 2018年8月15日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class DefaultQuestionOption implements QuestionOption {
+public class DefaultQuestionOption implements Serializable {
 
 	private static final long serialVersionUID = 8258548156850194710L;
 
@@ -16,12 +18,10 @@ public class DefaultQuestionOption implements QuestionOption {
 	 */
 	private String body;
 
-	@Override
 	public String getBody() {
 		return body;
 	}
 
-	@Override
 	public void setBody(String body) {
 		this.body = body;
 	}

src/main/java/cn/com/qmth/examcloud/question/core/question/DefaultQuestionStructure.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.question.core.question;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -9,7 +10,7 @@ import java.util.List;
  * @date 2018年8月15日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class DefaultQuestionStructure implements QuestionStructure {
+public class DefaultQuestionStructure implements Serializable {
 
 	private static final long serialVersionUID = 4744728219699873386L;
 
@@ -33,35 +34,22 @@ public class DefaultQuestionStructure implements QuestionStructure {
 	 */
 	private List<DefaultQuestionUnit> questionUnitList;
 
-	@Override
 	public String getBody() {
 		return body;
 	}
 
-	@Override
 	public void setBody(String body) {
 		this.body = body;
 	}
 
-	@Override
 	public String getVersion() {
 		return version;
 	}
 
-	@Override
 	public void setVersion(String version) {
 		this.version = version;
 	}
 
-	@Override
-	public List<? extends QuestionUnit> getQuestionUnitList() {
-		return questionUnitList;
-	}
-
-	public void setQuestionUnitList(List<DefaultQuestionUnit> questionUnitList) {
-		this.questionUnitList = questionUnitList;
-	}
-
 	public boolean isHasAudios() {
 		return hasAudios;
 	}
@@ -70,4 +58,12 @@ public class DefaultQuestionStructure implements QuestionStructure {
 		this.hasAudios = hasAudios;
 	}
 
+	public List<DefaultQuestionUnit> getQuestionUnitList() {
+		return questionUnitList;
+	}
+
+	public void setQuestionUnitList(List<DefaultQuestionUnit> questionUnitList) {
+		this.questionUnitList = questionUnitList;
+	}
+
 }

src/main/java/cn/com/qmth/examcloud/question/core/question/DefaultQuestionUnit.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.question.core.question;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -9,7 +10,7 @@ import java.util.List;
  * @date 2018年8月15日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class DefaultQuestionUnit implements QuestionUnit {
+public class DefaultQuestionUnit implements Serializable {
 
 	private static final long serialVersionUID = 3092731472173574671L;
 
@@ -33,28 +34,23 @@ public class DefaultQuestionUnit implements QuestionUnit {
 	 */
 	private String[] rightAnswer;
 
-	@Override
 	public QuestionType getQuestionType() {
 		return questionType;
 	}
 
-	@Override
 	public void setQuestionType(QuestionType questionType) {
 		this.questionType = questionType;
 	}
 
-	@Override
 	public String getBody() {
 		return body;
 	}
 
-	@Override
 	public void setBody(String body) {
 		this.body = body;
 	}
 
-	@Override
-	public List<? extends QuestionOption> getQuestionOptionList() {
+	public List<DefaultQuestionOption> getQuestionOptionList() {
 		return questionOptionList;
 	}
 
@@ -62,12 +58,10 @@ public class DefaultQuestionUnit implements QuestionUnit {
 		this.questionOptionList = questionOptionList;
 	}
 
-	@Override
 	public String[] getRightAnswer() {
 		return rightAnswer;
 	}
 
-	@Override
 	public void setRightAnswer(String[] rightAnswer) {
 		this.rightAnswer = rightAnswer;
 	}

src/main/java/cn/com/qmth/examcloud/question/core/question/Question.java

@@ -1,47 +0,0 @@
-package cn.com.qmth.examcloud.question.core.question;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 题<完整题>
- *
- * @author WANGWEI
- * @date 2018年8月15日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface Question extends Serializable {
-
-	/**
-	 * 获取题ID
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public String getId();
-
-	/**
-	 * 设置题ID
-	 *
-	 * @author WANGWEI
-	 * @param id
-	 */
-	public void setId(String id);
-
-	/**
-	 * 获取主版本
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public QuestionStructure getMasterVersion();
-
-	/**
-	 * 获取分支
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public List<? extends QuestionStructure> getBranchVersionList();
-
-}

src/main/java/cn/com/qmth/examcloud/question/core/question/QuestionOption.java

@@ -1,30 +0,0 @@
-package cn.com.qmth.examcloud.question.core.question;
-
-import java.io.Serializable;
-
-/**
- * 选择题选项接口
- *
- * @author WANGWEI
- * @date 2018年8月15日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface QuestionOption extends Serializable {
-
-	/**
-	 * 获取选项体
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public String getBody();
-
-	/**
-	 * 设置选项体
-	 *
-	 * @author WANGWEI
-	 * @param body
-	 */
-	public void setBody(String body);
-
-}

src/main/java/cn/com/qmth/examcloud/question/core/question/QuestionStructure.java

@@ -1,55 +0,0 @@
-package cn.com.qmth.examcloud.question.core.question;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 题结构<完整题机构>
- *
- * @author WANGWEI
- * @date 2018年8月15日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface QuestionStructure extends Serializable {
-
-	/**
-	 * 获取结构体
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public String getBody();
-
-	/**
-	 * 设置结构体
-	 *
-	 * @author WANGWEI
-	 * @param body
-	 */
-	public void setBody(String body);
-
-	/**
-	 * 获取版本
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public String getVersion();
-
-	/**
-	 * 设置版本
-	 *
-	 * @author WANGWEI
-	 * @param version
-	 */
-	public void setVersion(String version);
-
-	/**
-	 * 获取题单元集
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public List<? extends QuestionUnit> getQuestionUnitList();
-
-}

src/main/java/cn/com/qmth/examcloud/question/core/question/QuestionUnit.java

@@ -1,71 +0,0 @@
-package cn.com.qmth.examcloud.question.core.question;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 题单元接口<最小作答单元>
- *
- * @author WANGWEI
- * @date 2018年8月15日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface QuestionUnit extends Serializable {
-
-	/**
-	 * 获取题型
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public QuestionType getQuestionType();
-
-	/**
-	 * 设置题型
-	 *
-	 * @author WANGWEI
-	 * @param questionType
-	 */
-	public void setQuestionType(QuestionType questionType);
-
-	/**
-	 * 获取题干
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public String getBody();
-
-	/**
-	 * 设置题干
-	 *
-	 * @author WANGWEI
-	 * @param body
-	 */
-	public void setBody(String body);
-
-	/**
-	 * 获取选项集
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public List<? extends QuestionOption> getQuestionOptionList();
-
-	/**
-	 * 获取正确答案
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	public String[] getRightAnswer();
-
-	/**
-	 * 设置正确答案
-	 *
-	 * @author WANGWEI
-	 * @param rightAnswer
-	 */
-	public void setRightAnswer(String[] rightAnswer);
-
-}