|
@@ -12,6 +12,10 @@ import java.util.Set;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+import main.java.com.UpYun;
|
|
|
|
+
|
|
import org.apache.commons.io.FileUtils;
|
|
import org.apache.commons.io.FileUtils;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -101,6 +105,15 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
|
|
@Value("${upyun.zipDirectory}")
|
|
@Value("${upyun.zipDirectory}")
|
|
private String zipDirectory;
|
|
private String zipDirectory;
|
|
|
|
|
|
|
|
+ @Value("${upyun.bucketName}")
|
|
|
|
+ protected String bucketName;
|
|
|
|
+
|
|
|
|
+ @Value("${upyun.userName}")
|
|
|
|
+ protected String userName;
|
|
|
|
+
|
|
|
|
+ @Value("${upyun.password}")
|
|
|
|
+ protected String password;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public void saveExtractConfigAndBuildPaperFile(ExtractConfig extractConfig,Integer isbuildFile,AccessUser accessUser) throws Exception {
|
|
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){
|
|
if(examFiles!=null&&examFiles.size()>0){
|
|
List<Paper> papers = paperRepo.findByIdIn(paperIds);
|
|
List<Paper> papers = paperRepo.findByIdIn(paperIds);
|
|
for(ExamFile examFile:examFiles){
|
|
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);
|
|
downloadQuestionAudio(papers,examFile);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -215,7 +231,13 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
|
|
List<QuestionAudio> questionAudios = questionAudioService.findQuestionAudiosByQuestionId(unit.getQuestion().getId());
|
|
List<QuestionAudio> questionAudios = questionAudioService.findQuestionAudiosByQuestionId(unit.getQuestion().getId());
|
|
for(QuestionAudio audio:questionAudios){
|
|
for(QuestionAudio audio:questionAudios){
|
|
String audioFileName = examFile.getFileName().split("\\.")[0]+"_"+audio.getFileName();
|
|
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("下载完成后返回");*/
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|