Browse Source

美术阅卷10月新增需求-新增图片加密配置

wangliang 5 years ago
parent
commit
aaebe260d8

+ 13 - 3
stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/util/RotateTask.java

@@ -25,8 +25,12 @@ public class RotateTask implements Runnable {
     private PaperRepo paperRepo;
     private SystemConfig systemConfig;
     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.degree = degree;
         this.paperRepo = paperRepo;
@@ -34,6 +38,8 @@ public class RotateTask implements Runnable {
         this.papers = papers;
         this.imageConfig = imageConfig;
         this.studentRepo = studentRepo;
+//        this.thumbTempFile = thumbTempFile;
+//        this.imageTempFile = imageTempFile;
     }
 
     @Override
@@ -49,8 +55,6 @@ public class RotateTask implements Runnable {
             if (imageConfig.isImageEnc()) {
                 InputStream is = null;
                 OutputStream outputStream = null;
-                File thumbTempFile = null;
-                File imageTempFile = null;
                 try {
                     Student student = studentRepo.findByWorkIdAndExamNumber(paper.getWorkId(), paper.getExamNumber());
                     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();
         } finally {
             papers.remove(paper.getExamNumber());
+            if (Objects.nonNull(thumbTempFile) && thumbTempFile.exists()) {
+                thumbTempFile.delete();
+            }
+            if (Objects.nonNull(imageTempFile) && imageTempFile.exists()) {
+                imageTempFile.delete();
+            }
         }
     }
 }