提交题库公共类对象

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExtractConfigProviderServiceImpl.java

@@ -267,15 +267,15 @@ public class ExtractConfigProviderServiceImpl implements ExtractConfigProviderSe
 					DefaultQuestionUnitWrapper defaultQuestionUnitWrapper = buildQuesUnitWrapper(paperDetailUnit.getQuestion(),paperDetailUnit.getScore());
 					defaultQuestionUnitWrappers.add(defaultQuestionUnitWrapper);
 				}
-				defaultQuestionStructureWrapper.setDefaultQuestionUnitWrapperList(defaultQuestionUnitWrappers);
+				defaultQuestionStructureWrapper.setQuestionUnitWrapperList(defaultQuestionUnitWrappers);
 				questionWrapperList.add(defaultQuestionStructureWrapper);
 			}
-			defaultQuestionGroup.setDefaultQuestionStructureWrapperList(questionWrapperList);
+			defaultQuestionGroup.setQuestionWrapperList(questionWrapperList);
 			questionGroupList.add(defaultQuestionGroup);
 		}
 		DefaultPaper defaultPaper = new DefaultPaper();
 		defaultPaper.setName(basePaper.getName());
-		defaultPaper.setDefaultQuestionGroupList(questionGroupList);
+		defaultPaper.setQuestionGroupList(questionGroupList);
 		defaultPaper.setFullyObjective(fullyObjective);
 		return defaultPaper;
 	}
@@ -363,10 +363,10 @@ public class ExtractConfigProviderServiceImpl implements ExtractConfigProviderSe
 			DefaultQuestionUnit defaultQuestionUnit = buildQuestionUnit(question);
 			questionUnitList.add(defaultQuestionUnit);
 		}
-		defaultQuestionStructure.setDefaultQuestionUnitList(questionUnitList);
+		defaultQuestionStructure.setQuestionUnitList(questionUnitList);
 		DefaultQuestion defaultQuestion = new DefaultQuestion();
 		defaultQuestion.setId(questionId);
-		defaultQuestion.setDefaultQuestionStructure(defaultQuestionStructure);
+		defaultQuestion.setMasterVersion(defaultQuestionStructure);
 		long newQuesTime = System.currentTimeMillis();
 		log.debug("构建一个新的试题单元耗时："+(newQuesTime - oldQuesTime)+"ms");
 		//替换试题单元中的音频路径
@@ -400,7 +400,7 @@ public class ExtractConfigProviderServiceImpl implements ExtractConfigProviderSe
 					defaultQuestionOptions.add(defaultQuestionOption);
 				}
 			}
-			defaultQuestionUnit.setDefaultQuestionOptionList(defaultQuestionOptions);
+			defaultQuestionUnit.setQuestionOptionList(defaultQuestionOptions);
 			defaultQuestionUnit.setRightAnswer(getSelectQuestionAnswer(quesOptions));
 		}else {
 			defaultQuestionUnit.setRightAnswer(getAnswer(question));
@@ -474,16 +474,16 @@ public class ExtractConfigProviderServiceImpl implements ExtractConfigProviderSe
 			if(audioTimeConfig != null){
 				//2.1 取到题干，给a标签添加url
 				String quesBody = null;
-				if(StringUtils.isNotBlank(defaultQuestion.getDefaultQuestionStructure().getBody())){
+				if(StringUtils.isNotBlank(defaultQuestion.getMasterVersion().getBody())){
 					//套题
-					quesBody = defaultQuestion.getDefaultQuestionStructure().getBody();
-					defaultQuestion.getDefaultQuestionStructure().setBody(buildBody(quesBody, audioTimeConfig.getPlayTime()));
+					quesBody = defaultQuestion.getMasterVersion().getBody();
+					defaultQuestion.getMasterVersion().setBody(buildBody(quesBody, audioTimeConfig.getPlayTime()));
 				}else {
-					DefaultQuestionUnit defaultQuestionUnit = (DefaultQuestionUnit) defaultQuestion.getDefaultQuestionStructure().getDefaultQuestionUnitList().get(0);
+					DefaultQuestionUnit defaultQuestionUnit = (DefaultQuestionUnit) defaultQuestion.getMasterVersion().getQuestionUnitList().get(0);
 					quesBody = defaultQuestionUnit.getBody();
 					defaultQuestionUnit.setBody(buildBody(quesBody, audioTimeConfig.getPlayTime()));
 					if(defaultQuestionUnit.getQuestionType() == QuestionType.SINGLE_CHOICE || defaultQuestionUnit.getQuestionType() == QuestionType.MULTIPLE_CHOICE){
-						List<DefaultQuestionOption> questionOptionList = defaultQuestionUnit.getDefaultQuestionOptionList();
+						List<DefaultQuestionOption> questionOptionList = defaultQuestionUnit.getQuestionOptionList();
 						if(questionOptionList != null && questionOptionList.size()>0){
 							for(int i = 0;i<questionOptionList.size();i++){
 								DefaultQuestionOption defaultQuestionOption = questionOptionList.get(i);
@@ -494,16 +494,16 @@ public class ExtractConfigProviderServiceImpl implements ExtractConfigProviderSe
 				}
 			}else {
 				String quesBody = null;
-				if(StringUtils.isNotBlank(defaultQuestion.getDefaultQuestionStructure().getBody())){
+				if(StringUtils.isNotBlank(defaultQuestion.getMasterVersion().getBody())){
 					//套题
-					quesBody = defaultQuestion.getDefaultQuestionStructure().getBody();
-					defaultQuestion.getDefaultQuestionStructure().setBody(buildBody(quesBody, null));
+					quesBody = defaultQuestion.getMasterVersion().getBody();
+					defaultQuestion.getMasterVersion().setBody(buildBody(quesBody, null));
 				}else {
-					DefaultQuestionUnit defaultQuestionUnit = (DefaultQuestionUnit) defaultQuestion.getDefaultQuestionStructure().getDefaultQuestionUnitList().get(0);
+					DefaultQuestionUnit defaultQuestionUnit = (DefaultQuestionUnit) defaultQuestion.getMasterVersion().getQuestionUnitList().get(0);
 					quesBody = defaultQuestionUnit.getBody();
 					defaultQuestionUnit.setBody(buildBody(quesBody, null));
 					if(defaultQuestionUnit.getQuestionType() == QuestionType.SINGLE_CHOICE || defaultQuestionUnit.getQuestionType() == QuestionType.MULTIPLE_CHOICE){
-						List<DefaultQuestionOption> questionOptionList = defaultQuestionUnit.getDefaultQuestionOptionList();
+						List<DefaultQuestionOption> questionOptionList = defaultQuestionUnit.getQuestionOptionList();
 						if(questionOptionList != null && questionOptionList.size()>0){
 							for(int i = 0;i<questionOptionList.size();i++){
 								DefaultQuestionOption defaultQuestionOption = questionOptionList.get(i);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/QuestionProviderServiceImpl.java

@@ -71,9 +71,9 @@ public class QuestionProviderServiceImpl implements QuestionProviderService{
 		question.setIsolated(true);
 		question.setPublicity(true);
 		question.setProperties(defaultQuestion.getProperties());
-		DefaultQuestionStructure defaultQuestionStructure = (DefaultQuestionStructure) defaultQuestion.getDefaultQuestionStructure();
+		DefaultQuestionStructure defaultQuestionStructure = (DefaultQuestionStructure) defaultQuestion.getMasterVersion();
 		//判断试题单元对象
-		List<DefaultQuestionUnit> questionUnitList  = defaultQuestionStructure.getDefaultQuestionUnitList();
+		List<DefaultQuestionUnit> questionUnitList  = defaultQuestionStructure.getQuestionUnitList();
 		if(questionUnitList == null || questionUnitList.size()<1){
 			throw new StatusException("Q-012033", "试题单元对象为空");
 		}
@@ -93,7 +93,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService{
 			question.setQuestionType(type);
 			//如果是选择题，判断选项
 			if(defaultQuestionUnit.getQuestionType() == QuestionType.SINGLE_CHOICE || defaultQuestionUnit.getQuestionType() == QuestionType.MULTIPLE_CHOICE){
-				List<DefaultQuestionOption> questionOptionList = defaultQuestionUnit.getDefaultQuestionOptionList();
+				List<DefaultQuestionOption> questionOptionList = defaultQuestionUnit.getQuestionOptionList();
 				if(questionOptionList == null || questionOptionList.size()<1){
 					throw new StatusException("Q-012049", "试题单元中选项为空");
 				}
@@ -130,7 +130,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService{
 				subQues.setQuestionType(type);
 				//如果是选择题，判断选项
 				if(defaultQuestionUnit.getQuestionType() == QuestionType.SINGLE_CHOICE || defaultQuestionUnit.getQuestionType() == QuestionType.MULTIPLE_CHOICE){
-					List<DefaultQuestionOption> questionOptionList = defaultQuestionUnit.getDefaultQuestionOptionList();
+					List<DefaultQuestionOption> questionOptionList = defaultQuestionUnit.getQuestionOptionList();
 					if(questionOptionList == null || questionOptionList.size()<1){
 						throw new StatusException("Q-012049", "试题单元中选项为空");
 					}
@@ -304,13 +304,13 @@ public class QuestionProviderServiceImpl implements QuestionProviderService{
 				DefaultQuestionUnit defaultQuestionUnit = buildQuestionUnit(question);
 				questionUnitList.add(defaultQuestionUnit);
 			}
-			defaultQuestionStructure.setDefaultQuestionUnitList(questionUnitList);
+			defaultQuestionStructure.setQuestionUnitList(questionUnitList);
 			DefaultQuestion defaultQuestion = new DefaultQuestion();
 			defaultQuestion.setId(question.getId());
 			defaultQuestion.setIsolated(true);
 			defaultQuestion.setRootOrgId(Long.valueOf(question.getOrgId()));
 			defaultQuestion.setProperties(question.getProperties());
-			defaultQuestion.setDefaultQuestionStructure(defaultQuestionStructure);
+			defaultQuestion.setMasterVersion(defaultQuestionStructure);
 			return defaultQuestion;
 		}
 		return null;
@@ -337,7 +337,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService{
 					defaultQuestionOptions.add(defaultQuestionOption);
 				}
 			}
-			defaultQuestionUnit.setDefaultQuestionOptionList(defaultQuestionOptions);
+			defaultQuestionUnit.setQuestionOptionList(defaultQuestionOptions);
 			defaultQuestionUnit.setRightAnswer(getSelectQuestionAnswer(quesOptions));
 		}else {
 			defaultQuestionUnit.setRightAnswer(getAnswer(question));
@@ -447,9 +447,9 @@ public class QuestionProviderServiceImpl implements QuestionProviderService{
 				question.setIsolated(true);
 				question.setPublicity(true);
 				question.setProperties(defaultQuestion.getProperties());
-				DefaultQuestionStructure defaultQuestionStructure = (DefaultQuestionStructure) defaultQuestion.getDefaultQuestionStructure();
+				DefaultQuestionStructure defaultQuestionStructure = (DefaultQuestionStructure) defaultQuestion.getMasterVersion();
 				//判断试题单元对象
-				List<DefaultQuestionUnit> questionUnitList  = defaultQuestionStructure.getDefaultQuestionUnitList();
+				List<DefaultQuestionUnit> questionUnitList  = defaultQuestionStructure.getQuestionUnitList();
 				if(questionUnitList == null || questionUnitList.size()<1){
 					throw new StatusException("Q-012033", "试题单元对象为空");
 				}
@@ -469,7 +469,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService{
 					question.setQuestionType(type);
 					//如果是选择题，判断选项
 					if(defaultQuestionUnit.getQuestionType() == QuestionType.SINGLE_CHOICE || defaultQuestionUnit.getQuestionType() == QuestionType.MULTIPLE_CHOICE){
-						List<DefaultQuestionOption> questionOptionList = defaultQuestionUnit.getDefaultQuestionOptionList();
+						List<DefaultQuestionOption> questionOptionList = defaultQuestionUnit.getQuestionOptionList();
 						if(questionOptionList == null || questionOptionList.size()<1){
 							throw new StatusException("Q-012049", "试题单元中选项为空");
 						}
@@ -506,7 +506,7 @@ public class QuestionProviderServiceImpl implements QuestionProviderService{
 						subQues.setQuestionType(type);
 						//如果是选择题，判断选项
 						if(defaultQuestionUnit.getQuestionType() == QuestionType.SINGLE_CHOICE || defaultQuestionUnit.getQuestionType() == QuestionType.MULTIPLE_CHOICE){
-							List<DefaultQuestionOption> questionOptionList = defaultQuestionUnit.getDefaultQuestionOptionList();
+							List<DefaultQuestionOption> questionOptionList = defaultQuestionUnit.getQuestionOptionList();
 							if(questionOptionList == null || questionOptionList.size()<1){
 								throw new StatusException("Q-012049", "试题单元中选项为空");
 							}