chenken 8 жил өмнө
parent
commit
84b282a442

+ 18 - 0
cqb-comm-utils/src/main/java/com/qmth/cqb/utils/enums/AudioPositionType.java

@@ -0,0 +1,18 @@
+package com.qmth.cqb.utils.enums;
+/**
+ * @author  	chenken
+ * @date    	2017年8月2日 下午1:53:30
+ * @company 	QMTH
+ * @description AudioPositionType.java
+ */
+public enum AudioPositionType {
+	/**
+	 * 题干
+	 */
+	QUESTION_BODY,
+	/**
+	 * 选项
+	 */
+	QUESTION_OPTION
+}
+

+ 0 - 15
cqb-paper/src/main/java/com/qmth/cqb/paper/web/PaperDetailController.java

@@ -1,11 +1,9 @@
 package com.qmth.cqb.paper.web;
 
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -15,13 +13,9 @@ import org.springframework.web.bind.annotation.PathVariable;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import com.qmth.cqb.paper.dao.PaperDetailRepo;
-import com.qmth.cqb.paper.dao.PaperRepo;
 import com.qmth.cqb.paper.model.PaperDetail;
 import com.qmth.cqb.paper.model.PaperDetailUnit;
 import com.qmth.cqb.paper.service.PaperDetailService;
@@ -134,13 +128,4 @@ public class PaperDetailController {
         return new ResponseEntity(paperService.findPaperDetailsById(paperId), HttpStatus.OK);
     }
     
-    
-    @ApiOperation(value = "上传音频文件", notes = "上传音频文件")
-    @PostMapping(value = "/uploadRadio")
-    public ResponseEntity uploadRadio(List<MultipartFile> files,HttpServletRequest request){
-    	for(MultipartFile file:files){
-    		System.out.println("名称:"+file.getOriginalFilename()+",大小:"+file.getSize());
-    	}
-    	return null;
-    }
 }

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

@@ -17,5 +17,6 @@ public interface QuestionAudioRepo extends MongoRepository<QuestionAudio, String
 	
 	public List<QuestionAudio> findByQuestionId(String questionId);
 	
+	public QuestionAudio findByQuestionIdAndFileName(String questionId,String fileName);
 }
 

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

@@ -3,6 +3,8 @@ package com.qmth.cqb.question.model;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.qmth.cqb.utils.enums.AudioPositionType;
+
 /**
  * @author  	chenken
  * @date    	2017年8月1日 上午10:56:23
@@ -20,6 +22,10 @@ public class QuestionAudio implements Serializable{
 	 * 试题ID
 	 */
 	private String questionId;
+	/**
+	 * 题干OR选项
+	private AudioPositionType audioPositionType;
+	*/
 	/**
 	 * 文件名称
 	 */

+ 7 - 0
cqb-question-resource/src/main/java/com/qmth/cqb/question/service/QuestionAudioService.java

@@ -23,5 +23,12 @@ public interface QuestionAudioService {
 	  * @return
 	  */
 	public List<QuestionAudio> findQuestionAudiosByQuestionId(String questionId);
+	/**
+	 * 根据questionId和文件名称查询对象
+	 * @param questionId
+	 * @param fileName
+	 * @return
+	 */
+	public QuestionAudio findByQuestionIdAndFileName(String questionId,String fileName);
 }
 

+ 5 - 0
cqb-question-resource/src/main/java/com/qmth/cqb/question/service/impl/QuestionAudioServiceImpl.java

@@ -38,5 +38,10 @@ public class QuestionAudioServiceImpl implements QuestionAudioService{
 		return questionAudioRepo.findByQuestionId(questionId);
 	}
 
+	@Override
+	public QuestionAudio findByQuestionIdAndFileName(String questionId,String fileName) {
+		return questionAudioRepo.findByQuestionIdAndFileName(questionId,fileName);
+	}
+
 }
 

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

@@ -0,0 +1,40 @@
+package com.qmth.cqb.question.web;
+
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+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;
+
+/**
+ * @author  	chenken
+ * @date    	2017年8月2日 下午1:49:04
+ * @company 	QMTH
+ * @description QuestionAudioController.java
+ */
+@RestController
+@RequestMapping("${api_cqb}/")
+public class QuestionAudioController {
+	
+	@Autowired
+	private QuestionAudioService questionAudioService;
+	
+	@ApiOperation(value = "获取试题音频文件", notes = "获取试题音频文件")
+    @GetMapping(value = "/questionAudio/{fileName}/{questionId}")
+	public ResponseEntity findQuestionAudio(@PathVariable String fileName,@PathVariable String questionId){
+		QuestionAudio questionAudio = questionAudioService.findByQuestionIdAndFileName(questionId, fileName);
+		return new ResponseEntity(questionAudio, HttpStatus.OK);
+	}
+}
+