提交音频试题代码

cqb-paper/src/main/java/com/qmth/cqb/paper/model/Paper.java

@@ -61,7 +61,7 @@ public class Paper implements Serializable {
     /**
      * 是否包含音频题
      */
-    private boolean hasAudioQuestion;
+    private Boolean hasAudioQuestion;
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -215,11 +215,11 @@ public class Paper implements Serializable {
 		this.level = level;
 	}
 
-	public boolean isHasAudioQuestion() {
+	public Boolean getHasAudioQuestion() {
 		return hasAudioQuestion;
 	}
 
-	public void setHasAudioQuestion(boolean hasAudioQuestion) {
+	public void setHasAudioQuestion(Boolean hasAudioQuestion) {
 		this.hasAudioQuestion = hasAudioQuestion;
 	}
 	

cqb-paper/src/main/java/com/qmth/cqb/paper/service/PaperService.java

@@ -1057,13 +1057,3 @@ public class PaperService {
     	}
     }
 }
-
-
-
-
-
-
-
-
-
-

cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/ExtractConfigFileServiceImpl.java

@@ -183,14 +183,11 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
 			if(extractConfig==null){
 				throw new RuntimeException("该考试下的课程“"+condition.getCourseName()+"”没有制定调卷规则,不能批量导出,请保存调卷规则生成文件");
 			}
-			
-			Map<String,String> finishedPaperIdMap = extractConfig.getFinishedPaperIdMap();
-			if(extractConfig.getIfFinish()==0){
+			if(extractConfig.getIfFinish()==null||extractConfig.getIfFinish()==0){
 				throw new RuntimeException("该考试下的课程“"+extractConfig.getCourseName()+"”考试文件没有生成,不能批量导出,请保存调卷规则生成文件");
 			}
-			
 			checkExamFileExists(examId,examCourseDto);
-			
+			Map<String,String> finishedPaperIdMap = extractConfig.getFinishedPaperIdMap();
 			Set<Entry<String,String>> entry = finishedPaperIdMap.entrySet();
 			Iterator<Entry<String,String>> iterator = entry.iterator();
 			while(iterator.hasNext()){

cqb-paper/src/main/java/com/qmth/cqb/paper/web/PaperController.java

@@ -582,16 +582,8 @@ public class PaperController {
     	try {
 			paperService.uploadRadio(files, paperId, null);
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
     	return null;
     }
 }
-
-
-
-
-
-
-

cqb-question-resource/pom.xml

@@ -16,7 +16,7 @@
     </properties>
 
     <dependencies>
-            <dependency>
+        <dependency>
             <groupId>com.qmth.cqb</groupId>
             <artifactId>cqb-comm-utils</artifactId>
             <version>${project.version}</version>

cqb-question-resource/src/main/java/com/qmth/cqb/question/dao/QuestionAudioRepo.java

@@ -16,6 +16,8 @@ import com.qmth.cqb.question.model.QuestionAudio;
 public interface QuestionAudioRepo extends MongoRepository<QuestionAudio, String>, QueryByExampleExecutor<QuestionAudio> {
 	
 	public List<QuestionAudio> findByQuestionId(String questionId);
+
+	public QuestionAudio findByQuestionIdAndFileName(String questionId,String fileName);
 	
 }
 

cqb-question-resource/src/main/java/com/qmth/cqb/question/model/Question.java

@@ -65,7 +65,7 @@ public class Question implements Serializable {
     /**
      * 是否包含音频
      */
-    private boolean hasAudio;
+    private Boolean hasAudio;
 
     private List<QuestionAudio> questionAudios;
     
@@ -254,11 +254,11 @@ public class Question implements Serializable {
         this.courseMajor = courseMajor;
     }
 
-	public boolean isHasAudio() {
+	public Boolean getHasAudio() {
 		return hasAudio;
 	}
 
-	public void setHasAudio(boolean hasAudio) {
+	public void setHasAudio(Boolean hasAudio) {
 		this.hasAudio = hasAudio;
 	}
 

cqb-question-resource/src/main/java/com/qmth/cqb/question/model/QuestionAudio.java

@@ -25,6 +25,7 @@ public class QuestionAudio implements Serializable{
 	/**
 	 * 题干OR选项
 	private AudioPositionType audioPositionType;
+	
 	*/
 	/**
 	 * 文件名称

cqb-question-resource/src/main/java/com/qmth/cqb/question/web/QuestionAudioController.java

@@ -10,10 +10,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.common.uac.annotation.Uac;
-import cn.com.qmth.examcloud.common.uac.enums.RoleMeta;
-import cn.com.qmth.examcloud.common.uac.enums.UacPolicy;
-
 import com.qmth.cqb.question.model.QuestionAudio;
 import com.qmth.cqb.question.service.QuestionAudioService;
 
@@ -30,7 +26,7 @@ public class QuestionAudioController {
 	@Autowired
 	private QuestionAudioService questionAudioService;
 	
-	@ApiOperation(value = "获取试题音频文件", notes = "获取试题音频文件")
+	@ApiOperation(value = "通过questionId和fileName获取试题音频文件", notes = "通过questionId和fileName获取试题音频文件")
     @GetMapping(value = "/questionAudio/{fileName}/{questionId}")
 	public ResponseEntity findQuestionAudio(@PathVariable String fileName,@PathVariable String questionId){
 		QuestionAudio questionAudio = questionAudioService.findByQuestionIdAndFileName(questionId, fileName);