|
@@ -25,8 +25,12 @@ public class RotateTask implements Runnable {
|
|
private PaperRepo paperRepo;
|
|
private PaperRepo paperRepo;
|
|
private SystemConfig systemConfig;
|
|
private SystemConfig systemConfig;
|
|
private HashSet<String> papers;
|
|
private HashSet<String> papers;
|
|
|
|
+ File thumbTempFile = null;
|
|
|
|
+ File imageTempFile = null;
|
|
|
|
|
|
- public RotateTask(Paper paper, int degree, PaperRepo paperRepo, SystemConfig systemConfig, HashSet<String> papers, ImageConfig imageConfig, StudentRepo studentRepo) {
|
|
|
|
|
|
+ public RotateTask(Paper paper, int degree, PaperRepo paperRepo, SystemConfig systemConfig, HashSet<String> papers, ImageConfig imageConfig, StudentRepo studentRepo
|
|
|
|
+// ,File thumbTempFile,File imageTempFile
|
|
|
|
+ ) {
|
|
this.paper = paper;
|
|
this.paper = paper;
|
|
this.degree = degree;
|
|
this.degree = degree;
|
|
this.paperRepo = paperRepo;
|
|
this.paperRepo = paperRepo;
|
|
@@ -34,6 +38,8 @@ public class RotateTask implements Runnable {
|
|
this.papers = papers;
|
|
this.papers = papers;
|
|
this.imageConfig = imageConfig;
|
|
this.imageConfig = imageConfig;
|
|
this.studentRepo = studentRepo;
|
|
this.studentRepo = studentRepo;
|
|
|
|
+// this.thumbTempFile = thumbTempFile;
|
|
|
|
+// this.imageTempFile = imageTempFile;
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -49,8 +55,6 @@ public class RotateTask implements Runnable {
|
|
if (imageConfig.isImageEnc()) {
|
|
if (imageConfig.isImageEnc()) {
|
|
InputStream is = null;
|
|
InputStream is = null;
|
|
OutputStream outputStream = null;
|
|
OutputStream outputStream = null;
|
|
- File thumbTempFile = null;
|
|
|
|
- File imageTempFile = null;
|
|
|
|
try {
|
|
try {
|
|
Student student = studentRepo.findByWorkIdAndExamNumber(paper.getWorkId(), paper.getExamNumber());
|
|
Student student = studentRepo.findByWorkIdAndExamNumber(paper.getWorkId(), paper.getExamNumber());
|
|
String imageMd5 = MD5Util.getImageRuleMd5(paper.getWorkId(), paper.getSubject().ordinal(), paper.getAreaCode(), paper.getExamNumber(), student.getId());
|
|
String imageMd5 = MD5Util.getImageRuleMd5(paper.getWorkId(), paper.getSubject().ordinal(), paper.getAreaCode(), paper.getExamNumber(), student.getId());
|
|
@@ -158,6 +162,12 @@ public class RotateTask implements Runnable {
|
|
ioe.printStackTrace();
|
|
ioe.printStackTrace();
|
|
} finally {
|
|
} finally {
|
|
papers.remove(paper.getExamNumber());
|
|
papers.remove(paper.getExamNumber());
|
|
|
|
+ if (Objects.nonNull(thumbTempFile) && thumbTempFile.exists()) {
|
|
|
|
+ thumbTempFile.delete();
|
|
|
|
+ }
|
|
|
|
+ if (Objects.nonNull(imageTempFile) && imageTempFile.exists()) {
|
|
|
|
+ imageTempFile.delete();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|