|
@@ -2,6 +2,7 @@ package cn.com.qmth.stmms.admin.exam;
|
|
|
|
|
|
import java.io.File;
|
|
import java.io.File;
|
|
import java.io.FileInputStream;
|
|
import java.io.FileInputStream;
|
|
|
|
+import java.io.InputStream;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.UUID;
|
|
import java.util.UUID;
|
|
@@ -177,15 +178,20 @@ public class SubjectController extends BaseExamController {
|
|
model.addAttribute("message", "已成功导入");
|
|
model.addAttribute("message", "已成功导入");
|
|
}else {
|
|
}else {
|
|
WebUser wu = RequestUtils.getWebUser(request);
|
|
WebUser wu = RequestUtils.getWebUser(request);
|
|
- File errFile = new File(tempFile + File.separator +UUID.randomUUID().toString()+ ".txt");
|
|
|
|
|
|
+ File errFile = new File(tempFile +File.separator+ "subject-split-err"+File.separator +UUID.randomUUID().toString()+ ".txt");
|
|
|
|
+ InputStream in=null;
|
|
try {
|
|
try {
|
|
errFile.getParentFile().mkdirs();
|
|
errFile.getParentFile().mkdirs();
|
|
FileUtils.write(errFile, errMsg,"utf-8");
|
|
FileUtils.write(errFile, errMsg,"utf-8");
|
|
- fileService.uploadSubjectSplitErr(new FileInputStream(errFile), MD5Util.md5Hex(errFile), schoolId,
|
|
|
|
|
|
+ in=new FileInputStream(errFile);
|
|
|
|
+ fileService.uploadSubjectSplitErr(in, MD5Util.md5Hex(errFile), schoolId,
|
|
examId, wu.getId());
|
|
examId, wu.getId());
|
|
model.addAttribute("errmsgUrl", fileService.getFileServer()+fileService.getSubjectSplitErrUri(schoolId, examId, wu.getId()));
|
|
model.addAttribute("errmsgUrl", fileService.getFileServer()+fileService.getSubjectSplitErrUri(schoolId, examId, wu.getId()));
|
|
model.addAttribute("errmsg", "导入信息有误,请查看error.txt文件");
|
|
model.addAttribute("errmsg", "导入信息有误,请查看error.txt文件");
|
|
} finally {
|
|
} finally {
|
|
|
|
+ if(in!=null){
|
|
|
|
+ in.close();
|
|
|
|
+ }
|
|
errFile.delete();
|
|
errFile.delete();
|
|
}
|
|
}
|
|
}
|
|
}
|