Browse Source

提交题库BUG

chenken 7 years ago
parent
commit
43041d6075

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

@@ -177,11 +177,12 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
 		List<ExamFile> examFiles = examFileService.findExamFileListByExportPaperInfoModel(exportModel);
 		if(examFiles!=null&&examFiles.size()>0){
 			List<Paper> papers = paperRepo.findByIdIn(paperIds);
-			for(ExamFile examFile:examFiles){
+			for(int i = 0;i<examFiles.size();i++){
+				ExamFile examFile = examFiles.get(i);
 				UpYun upyun = new UpYun(bucketName,userName,password);
 				File file = new File(downloadDirectory+File.separator+examFile.getFileName());
 				upyun.readFile(examFile.getFilePath(), file);
-				downloadAudio(papers,examFile);
+				downloadAudio(papers.get(i),examFile);
 			}
 		}
 		//创建压缩文件名称
@@ -198,23 +199,21 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
 	/**
 	 * 下载试卷音频文件
 	 */
-	private void downloadAudio(List<Paper> papers,ExamFile examFile){
+	private void downloadAudio(Paper paper,ExamFile examFile){
 		if(examFile.getExamFileType()==ExamFileType.PAPER){
-			for(Paper paper:papers){
-				if(paper.getOrgId().equals(examFile.getOrgId())
-						&&paper.getCourse().getCode().equals(examFile.getCourseId())){
-					List<PaperDetailUnit> paperDetailUnits = paperDetailUnitRepo.findByPaperOrderByNumber(paper);
-					for(PaperDetailUnit unit:paperDetailUnits){
-						if(unit.getQuestion().getHasAudio()!=null&&unit.getQuestion().getHasAudio()){
-							List<QuestionAudio> questionAudios = questionAudioService.findQuestionAudiosByQuestionId(unit.getQuestion().getId());
-							for(QuestionAudio audio:questionAudios){
-								String fileName = getAudioFileName(audio,unit);
-								String audioFileName = examFile.getFileName().split("\\.")[0]+"_"+fileName;
-								UpYun upyun = new UpYun(bucketName,userName,password);
-								File file = new File(downloadDirectory+File.separator+audioFileName);
-								upyun.readFile(audio.getFileUrl(), file);
-								logger.info(audioFileName+"音频下载完成后返回");
-							}
+			if(paper.getOrgId().equals(examFile.getOrgId())
+					&&paper.getCourse().getCode().equals(examFile.getCourseId())){
+				List<PaperDetailUnit> paperDetailUnits = paperDetailUnitRepo.findByPaperOrderByNumber(paper);
+				for(PaperDetailUnit unit:paperDetailUnits){
+					if(unit.getQuestion().getHasAudio()!=null&&unit.getQuestion().getHasAudio()){
+						List<QuestionAudio> questionAudios = questionAudioService.findQuestionAudiosByQuestionId(unit.getQuestion().getId());
+						for(QuestionAudio audio:questionAudios){
+							String fileName = getAudioFileName(audio,unit);
+							String audioFileName = examFile.getFileName().split("\\.")[0]+"_"+fileName;
+							UpYun upyun = new UpYun(bucketName,userName,password);
+							File file = new File(downloadDirectory+File.separator+audioFileName);
+							upyun.readFile(audio.getFileUrl(), file);
+							logger.info(audioFileName+"音频下载完成后返回");
 						}
 					}
 				}