Browse Source

导出bug修改

weiwenhai 7 years ago
parent
commit
461f9cf09e

+ 7 - 5
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExportPaperServiceImpl.java

@@ -471,16 +471,17 @@ public class ExportPaperServiceImpl implements ExportPaperService{
     }
     }
 
 
 	@Override
 	@Override
-	public void exportPaperFiles(List<String> paperIds,String serviceName,String exportContentList, HttpServletResponse response,String loginName,String examType) throws Exception {
+	public  void exportPaperFiles(List<String> paperIds,String serviceName,String exportContentList, HttpServletResponse response,String loginName,String examType) throws Exception {
 		ExportPaperAbstractService exportPaperAbstractService = (ExportPaperAbstractService) SpringContextUtils.getBeanById("fjsfExportPaperService");
 		ExportPaperAbstractService exportPaperAbstractService = (ExportPaperAbstractService) SpringContextUtils.getBeanById("fjsfExportPaperService");
 		//根据试卷id查询所有试卷
 		//根据试卷id查询所有试卷
 		List<Paper> papers = CommonUtils.toList(paperRepo.findAll(paperIds));
 		List<Paper> papers = CommonUtils.toList(paperRepo.findAll(paperIds));
 		String zipFileName = loginName;
 		String zipFileName = loginName;
 		//创建压缩文件夹
 		//创建压缩文件夹
 		File directory = new File(TEMP_FILE_EXP + File.separator + zipFileName);
 		File directory = new File(TEMP_FILE_EXP + File.separator + zipFileName);
-		if(!directory.exists()){
-			directory.mkdirs();
+		if(directory.exists()){
+			deteleFolder(TEMP_FILE_EXP,zipFileName);
 		}
 		}
+		directory.mkdirs();
 		//下载试卷
 		//下载试卷
 		if(exportContentList.indexOf("PAPER")>-1){
 		if(exportContentList.indexOf("PAPER")>-1){
 			for(Paper paper:papers){
 			for(Paper paper:papers){
@@ -514,8 +515,9 @@ public class ExportPaperServiceImpl implements ExportPaperService{
 				}
 				}
 			}
 			}
 		}
 		}
-		FileDisposeUtil.fileToZip(TEMP_FILE_EXP+File.separator+zipFileName,TEMP_FILE_EXP,zipFileName);
-		FileDisposeUtil.downloadFile(CommonUtils.getCurDate() +".zip", TEMP_FILE_EXP+File.separator+zipFileName+".zip",response);
+		String nameString = System.currentTimeMillis()+"";
+		FileDisposeUtil.fileToZip(TEMP_FILE_EXP+File.separator+zipFileName,TEMP_FILE_EXP,nameString);
+		FileDisposeUtil.downloadFile(nameString +".zip", TEMP_FILE_EXP+File.separator+nameString+".zip",response);
 		deteleFolder(TEMP_FILE_EXP,zipFileName);
 		deteleFolder(TEMP_FILE_EXP,zipFileName);
 	}
 	}