统一图片命名规则

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/assembler/ScoreAssembler.java

@@ -3,6 +3,7 @@ package cn.com.qmth.stmms.ms.admin.assembler;
 import cn.com.qmth.stmms.ms.admin.dto.ScoreCheckDTO;
 import cn.com.qmth.stmms.ms.admin.dto.ScoreItem;
 import cn.com.qmth.stmms.ms.commons.config.SystemConfig;
+import cn.com.qmth.stmms.ms.commons.utils.MD5Util;
 import cn.com.qmth.stmms.ms.core.cache.ParamCache;
 import cn.com.qmth.stmms.ms.core.domain.Paper;
 import cn.com.qmth.stmms.ms.core.domain.Student;
@@ -40,7 +41,8 @@ public class ScoreAssembler {
                 String fileName = p.getExamNumber();
                 //0：随机码 1：考号
                 if(ParamCache.paramMap.get(p.getWorkId()).getNameRule() == 1){
-                    fileName = DigestUtils.md5Hex(p.getSubject().name() + fileName);
+//                    fileName = DigestUtils.md5Hex(p.getSubject().name() + fileName);
+                    fileName = MD5Util.getImageRuleMd5(p.getWorkId(), p.getSubject().ordinal(), student.getAreaCode(), student.getExamNumber(), student.getId());
                 }
                 String imgSrc = systemConfig.getImageUrl(p.getWorkId(), p.getSubject().toString(), p.getAreaCode(), fileName);
                 String thumbSrc = systemConfig.getThumbUrl(p.getWorkId(), p.getSubject().toString(), p.getAreaCode(), fileName);

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/service/DataUploadService.java

@@ -489,7 +489,8 @@ public class DataUploadService {
         String fileName = student.getExamNumber();
         //0：随机码 1：考号
         if(ParamCache.paramMap.get(student.getWorkId()).getNameRule() == 1){
-            fileName = DigestUtils.md5Hex(subject.name() + fileName);
+//            fileName = DigestUtils.md5Hex(subject.name() + fileName);
+            fileName = MD5Util.getImageRuleMd5(student.getWorkId(), subject.ordinal(), student.getAreaCode(), student.getExamNumber(), student.getId());
         }
         //图片是否加密
         Integer imageEnc = Optional.ofNullable(ParamCache.paramMap.get(student.getWorkId()).getImageEncrypt()).orElse(0);

stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/api/CollectApi.java

@@ -521,7 +521,8 @@ public class CollectApi {
         String fileName = student.getExamNumber();
         //0：随机码 1：考号
         if(ParamCache.paramMap.get(student.getWorkId()).getNameRule() == 1){
-            fileName = DigestUtils.md5Hex(subject.name() + fileName);
+//            fileName = DigestUtils.md5Hex(subject.name() + fileName);
+            fileName = MD5Util.getImageRuleMd5(workId, subject.ordinal(), student.getAreaCode(), student.getExamNumber(), student.getId());
         }
         File outSheetFile = new File(saveSheetPath + File.separator + fileName + ".jpg");
         File outImageFile = new File(savePath + File.separator + fileName + ".jpg");
@@ -577,7 +578,8 @@ public class CollectApi {
         String fileName = student.getExamNumber();
         //0：随机码 1：考号
         if(ParamCache.paramMap.get(student.getWorkId()).getNameRule() == 1){
-            fileName = DigestUtils.md5Hex(subject.name() + fileName);
+//            fileName = DigestUtils.md5Hex(subject.name() + fileName);
+            fileName = MD5Util.getImageRuleMd5(student.getWorkId(), subject.ordinal(), student.getAreaCode(), student.getExamNumber(), student.getId());
         }
         File outFile = new File(savePath + File.separator + fileName + ".jpg");
         FileCopyUtils.copy(inputStream, new FileOutputStream(outFile));

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/assembler/ChangeLevelAssembler.java

@@ -3,6 +3,7 @@ package cn.com.qmth.stmms.ms.marking.assembler;
 import cn.com.qmth.stmms.ms.commons.config.ImageConfig;
 import cn.com.qmth.stmms.ms.commons.config.SystemConfig;
 import cn.com.qmth.stmms.ms.commons.constant.SystemConstant;
+import cn.com.qmth.stmms.ms.commons.utils.MD5Util;
 import cn.com.qmth.stmms.ms.core.cache.ParamCache;
 import cn.com.qmth.stmms.ms.core.domain.ChangeLevel;
 import cn.com.qmth.stmms.ms.core.domain.Paper;
@@ -54,12 +55,13 @@ public class ChangeLevelAssembler {
             String areaCode = paper.getAreaCode();
             Subject subject = paper.getSubject();
             String fileName = paper.getExamNumber();
+            Student student = studentRepo.findByWorkIdAndExamNumberAndTest(workId, examNumber, String.valueOf(TrialEnum.DEFAULT.getId()));
             //0：随机码 1：考号
             if(ParamCache.paramMap.get(paper.getWorkId()).getNameRule() == 1){
-                fileName = DigestUtils.md5Hex(paper.getSubject().name() + fileName);
+//                fileName = DigestUtils.md5Hex(paper.getSubject().name() + fileName);
+                fileName = MD5Util.getImageRuleMd5(workId, subject.ordinal(), student.getAreaCode(), student.getExamNumber(), student.getId());
             }
             if (ParamCache.paramMap.get(workId).getImageEncrypt() == 1) {
-                Student student = studentRepo.findByWorkIdAndExamNumberAndTest(workId, examNumber, String.valueOf(TrialEnum.DEFAULT.getId()));
                 imgSrc = systemConfig.getImageUrl(workId, subject.ordinal(), student.getId(), SystemConstant.IMAGE);
                 thumbSrc = systemConfig.getThumbUrl(workId, subject.ordinal(), student.getId(), SystemConstant.THUMB);
             } else {

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/assembler/MarkTaskAssembler.java

@@ -3,6 +3,7 @@ package cn.com.qmth.stmms.ms.marking.assembler;
 import cn.com.qmth.stmms.ms.commons.config.ImageConfig;
 import cn.com.qmth.stmms.ms.commons.config.SystemConfig;
 import cn.com.qmth.stmms.ms.commons.constant.SystemConstant;
+import cn.com.qmth.stmms.ms.commons.utils.MD5Util;
 import cn.com.qmth.stmms.ms.core.cache.ParamCache;
 import cn.com.qmth.stmms.ms.core.domain.MarkStage;
 import cn.com.qmth.stmms.ms.core.domain.Paper;
@@ -55,12 +56,13 @@ public class MarkTaskAssembler {
             String imgSrc = null;
             String thumbSrc = null;
             String fileName = paper.getExamNumber();
+            Student student = studentRepo.findByWorkIdAndExamNumberAndTest(paper.getWorkId(), paper.getExamNumber(), String.valueOf(TrialEnum.DEFAULT.getId()));
             //0：随机码 1：考号
             if(ParamCache.paramMap.get(paper.getWorkId()).getNameRule() == 1){
-                fileName = DigestUtils.md5Hex(paper.getSubject().name() + fileName);
+//                fileName = DigestUtils.md5Hex(paper.getSubject().name() + fileName);
+                fileName = MD5Util.getImageRuleMd5(paper.getWorkId(), paper.getSubject().ordinal(), student.getAreaCode(), student.getExamNumber(), student.getId());
             }
             if (ParamCache.paramMap.get(paper.getWorkId()).getImageEncrypt() == 1) {
-                Student student = studentRepo.findByWorkIdAndExamNumberAndTest(paper.getWorkId(), paper.getExamNumber(), String.valueOf(TrialEnum.DEFAULT.getId()));
                 imgSrc = systemConfig.getImageUrl(paper.getWorkId(), paper.getSubject().ordinal(), student.getId(), SystemConstant.IMAGE);
                 thumbSrc = systemConfig.getThumbUrl(paper.getWorkId(), paper.getSubject().ordinal(), student.getId(), SystemConstant.THUMB);
             } else {
@@ -108,12 +110,13 @@ public class MarkTaskAssembler {
             String imgSrc = null;
             String thumbSrc = null;
             String fileName = paper.getExamNumber();
+            Student student = studentRepo.findByWorkIdAndExamNumberAndTest(paper.getWorkId(), paper.getExamNumber(), String.valueOf(TrialEnum.DEFAULT.getId()));
             //0：随机码 1：考号
             if(ParamCache.paramMap.get(paper.getWorkId()).getNameRule() == 1){
-                fileName = DigestUtils.md5Hex(paper.getSubject().name() + fileName);
+//                fileName = DigestUtils.md5Hex(paper.getSubject().name() + fileName);
+                fileName = MD5Util.getImageRuleMd5(paper.getWorkId(), paper.getSubject().ordinal(), student.getAreaCode(), student.getExamNumber(), student.getId());
             }
             if (ParamCache.paramMap.get(paper.getWorkId()).getImageEncrypt() == 1) {
-                Student student = studentRepo.findByWorkIdAndExamNumberAndTest(paper.getWorkId(), paper.getExamNumber(), String.valueOf(TrialEnum.DEFAULT.getId()));
                 imgSrc = systemConfig.getImageUrl(paper.getWorkId(), paper.getSubject().ordinal(), student.getId(), SystemConstant.IMAGE);
                 thumbSrc = systemConfig.getThumbUrl(paper.getWorkId(), paper.getSubject().ordinal(), student.getId(), SystemConstant.THUMB);
             } else {
@@ -162,12 +165,13 @@ public class MarkTaskAssembler {
             String imgSrc = null;
             String thumbSrc = null;
             String fileName = paper.getExamNumber();
+            Student student = studentRepo.findByWorkIdAndExamNumberAndTest(paper.getWorkId(), paper.getExamNumber(), String.valueOf(TrialEnum.DEFAULT.getId()));
             //0：随机码 1：考号
             if(ParamCache.paramMap.get(paper.getWorkId()).getNameRule() == 1){
-                fileName = DigestUtils.md5Hex(paper.getSubject().name() + fileName);
+//                fileName = DigestUtils.md5Hex(paper.getSubject().name() + fileName);
+                fileName = MD5Util.getImageRuleMd5(paper.getWorkId(), paper.getSubject().ordinal(), student.getAreaCode(), student.getExamNumber(), student.getId());
             }
             if (ParamCache.paramMap.get(paper.getWorkId()).getImageEncrypt() == 1) {
-                Student student = studentRepo.findByWorkIdAndExamNumberAndTest(paper.getWorkId(), paper.getExamNumber(), String.valueOf(TrialEnum.DEFAULT.getId()));
                 imgSrc = systemConfig.getImageUrl(paper.getWorkId(), paper.getSubject().ordinal(), student.getId(), SystemConstant.IMAGE);
                 thumbSrc = systemConfig.getThumbUrl(paper.getWorkId(), paper.getSubject().ordinal(), student.getId(), SystemConstant.THUMB);
             } else {

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/assembler/PaperAssembler.java

@@ -3,6 +3,7 @@ package cn.com.qmth.stmms.ms.marking.assembler;
 import cn.com.qmth.stmms.ms.commons.config.ImageConfig;
 import cn.com.qmth.stmms.ms.commons.config.SystemConfig;
 import cn.com.qmth.stmms.ms.commons.constant.SystemConstant;
+import cn.com.qmth.stmms.ms.commons.utils.MD5Util;
 import cn.com.qmth.stmms.ms.core.cache.ParamCache;
 import cn.com.qmth.stmms.ms.core.domain.MarkSubject;
 import cn.com.qmth.stmms.ms.core.domain.Paper;
@@ -47,12 +48,13 @@ public class PaperAssembler {
         String imgSrc = null;
         String thumbSrc = null;
         String fileName = paper.getExamNumber();
+        Student student = studentRepo.findByWorkIdAndExamNumberAndTest(paper.getWorkId(), paper.getExamNumber(), String.valueOf(TrialEnum.DEFAULT.getId()));
         //0：随机码 1：考号
         if(ParamCache.paramMap.get(paper.getWorkId()).getNameRule() == 1){
-            fileName = DigestUtils.md5Hex(paper.getSubject().name() + fileName);
+//            fileName = DigestUtils.md5Hex(paper.getSubject().name() + fileName);
+            fileName = MD5Util.getImageRuleMd5(paper.getWorkId(),paper.getSubject().ordinal(), student.getAreaCode(), student.getExamNumber(), student.getId());
         }
         if (ParamCache.paramMap.get(paper.getWorkId()).getImageEncrypt() == 1) {
-            Student student = studentRepo.findByWorkIdAndExamNumberAndTest(paper.getWorkId(), paper.getExamNumber(), String.valueOf(TrialEnum.DEFAULT.getId()));
             imgSrc = systemConfig.getImageUrl(paper.getWorkId(), paper.getSubject().ordinal(), student.getId(), SystemConstant.IMAGE);
             thumbSrc = systemConfig.getThumbUrl(paper.getWorkId(), paper.getSubject().ordinal(), student.getId(), SystemConstant.THUMB);
         } else {
@@ -105,12 +107,13 @@ public class PaperAssembler {
         String thumbSrc = null;
         String sheetSrc = null;
         String fileName = paper.getExamNumber();
+        Student student = studentRepo.findByWorkIdAndExamNumberAndTest(paper.getWorkId(), paper.getExamNumber(), String.valueOf(TrialEnum.DEFAULT.getId()));
         //0：随机码 1：考号
         if(ParamCache.paramMap.get(paper.getWorkId()).getNameRule() == 1){
-            fileName = DigestUtils.md5Hex(paper.getSubject().name() + fileName);
+//            fileName = DigestUtils.md5Hex(paper.getSubject().name() + fileName);
+            fileName = MD5Util.getImageRuleMd5(paper.getWorkId(), paper.getSubject().ordinal(), student.getAreaCode(), student.getExamNumber(), student.getId());
         }
         if (ParamCache.paramMap.get(paper.getWorkId()).getImageEncrypt() == 1) {
-            Student student = studentRepo.findByWorkIdAndExamNumberAndTest(paper.getWorkId(), paper.getExamNumber(), String.valueOf(TrialEnum.DEFAULT.getId()));
             imgSrc = systemConfig.getImageUrl(paper.getWorkId(), paper.getSubject().ordinal(), student.getId(), SystemConstant.IMAGE);
             thumbSrc = systemConfig.getThumbUrl(paper.getWorkId(), paper.getSubject().ordinal(), student.getId(), SystemConstant.THUMB);
             sheetSrc = systemConfig.getSheetUrl(paper.getWorkId(), paper.getSubject().ordinal(), student.getId(), SystemConstant.SHEET);