提交题库BUG

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

@@ -713,10 +713,13 @@ public class PaperService {
      * @return
      */
     public Paper insertQuestionToPaper(String paperId, String paperDetailId, Question question, AccessUser user) {
+    	Paper paper = paperRepo.findOne(paperId);
         question.setOrgId(user.getRootOrgId().toString());
         quesService.updateQuesWord(question);
+        question.setCourse(paper.getCourse());
+        question.setCreateTime(CommonUtils.getCurDateTime());
         question = quesRepo.save(question);
-        Paper paper = paperRepo.findOne(paperId);
+        
         PaperDetail paperDetail = paperDetailRepo.findOne(paperDetailId);
         PaperDetailUnit paperDetailUnit = new PaperDetailUnit(paper,paperDetail,question);
         long paperDetailUnitCount = paperDetailUnitRepo.countByPaperDetail(paperDetail);

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

@@ -12,6 +12,10 @@ import java.util.Set;
 import javax.servlet.http.HttpServletResponse;
 
 
+
+
+import main.java.com.UpYun;
+
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -101,6 +105,15 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
 	@Value("${upyun.zipDirectory}")
 	private String zipDirectory;
 	
+	@Value("${upyun.bucketName}")
+	protected String bucketName;
+	
+	@Value("${upyun.userName}")
+	protected String userName;
+	
+	@Value("${upyun.password}")
+	protected String password;
+	
 	@Override
 	public void saveExtractConfigAndBuildPaperFile(ExtractConfig extractConfig,Integer isbuildFile,AccessUser accessUser) throws Exception {
 		//查询试卷导出设置
@@ -186,7 +199,10 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
 		if(examFiles!=null&&examFiles.size()>0){
 			List<Paper> papers = paperRepo.findByIdIn(paperIds);
 			for(ExamFile examFile:examFiles){
-				FileDisposeUtil.saveUrlAs(downloadUrl+examFile.getFilePath(),downloadDirectory+File.separator+examFile.getFileName());
+				UpYun upyun = new UpYun(bucketName,userName,password);
+				File file = new File(downloadDirectory+File.separator+examFile.getFileName());
+				upyun.readFile(examFile.getFilePath(), file);
+				//FileDisposeUtil.saveUrlAs(downloadUrl+examFile.getFilePath(),downloadDirectory+File.separator+examFile.getFileName());
 				downloadQuestionAudio(papers,examFile);
 			}
 		}
@@ -215,7 +231,13 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
 							List<QuestionAudio> questionAudios = questionAudioService.findQuestionAudiosByQuestionId(unit.getQuestion().getId());
 							for(QuestionAudio audio:questionAudios){
 								String audioFileName = examFile.getFileName().split("\\.")[0]+"_"+audio.getFileName();
-								FileDisposeUtil.saveUrlAs(downloadUrl+audio.getFileUrl(), downloadDirectory+File.separator+audioFileName);
+								//FileDisposeUtil.saveUrlAs(audio.getFileUrl(), downloadDirectory+File.separator+audioFileName);
+								UpYun upyun = new UpYun(bucketName,userName,password);
+								File file = new File(downloadDirectory+File.separator+audioFileName);
+								upyun.readFile(audio.getFileUrl(), file);
+								/*System.out.println(downloadDirectory+File.separator+audioFileName);
+								System.out.println(audio.getFileUrl());
+								System.out.println("下载完成后返回");*/
 							}
 						}
 					}