format

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/converter/model/Constants.java

@@ -35,12 +35,4 @@ public interface Constants {
 
     String FILE_ANSWER = "answer.json";//答案内容文件
 
-    short[] paperHeaders = {1, 1};//试卷头信息
-
-    short[] paperAesHeaders = {1, 2};//试卷加密头信息
-
-    short[] answerHeaders = {2, 1};//答案头信息
-
-    short[] answerAesHeaders = {2, 2};//答案加密头信息
-
 }

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/converter/utils/NumUtil.java

@@ -8,7 +8,7 @@
 package cn.com.qmth.examcloud.core.questions.base.converter.utils;
 
 public class NumUtil {
-    public static final String[] CHAR = {"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"};
+    private static final String[] CHAR = {"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"};
 
     /**
      * 将(1-26)区间的数字转换成字母

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/question/enums/QuesStructType.java

@@ -32,10 +32,9 @@ public enum QuesStructType {
     private boolean objective;//是否是客观题
     private boolean combline;//是否是组合题
 
-    private QuesStructType(Long id, String name, boolean objective, boolean combline) {
+    QuesStructType(Long id, String name, boolean objective, boolean combline) {
         this.id = id;
         this.name = name;
-        ;
         this.objective = objective;
         this.combline = combline;
     }
@@ -55,45 +54,24 @@ public enum QuesStructType {
         return null;
     }
 
-    private QuesStructType() {
-
-    }
-
     public Long getId() {
         return id;
     }
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public String getName() {
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public boolean isObjective() {
         return objective;
     }
 
-    public void setObjective(boolean objective) {
-        this.objective = objective;
-    }
-
     public boolean isCombline() {
         return combline;
     }
 
-    public void setCombline(boolean combline) {
-        this.combline = combline;
-    }
-
     public String toString() {
         return getName();
     }
 
 }
-

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/word/DocxProcessUtil.java

@@ -3,7 +3,6 @@ package cn.com.qmth.examcloud.core.questions.base.word;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.ZipUtils;
 import cn.com.qmth.examcloud.core.questions.base.enums.QuesUnit;
-import freemarker.template.Configuration;
 import freemarker.template.Template;
 import net.sf.saxon.TransformerFactoryImpl;
 import net.sourceforge.jeuclid.LayoutContext;
@@ -76,8 +75,6 @@ public final class DocxProcessUtil {
     public static final LayoutContext IMG_LAYOUT = new StyleAttributeLayoutContext(
             LayoutContextImpl.getDefaultLayoutContext(), "2em", java.awt.Color.BLACK);
 
-    public static Configuration configuration;
-
     public static final String IMG_OUT_TYPE = "image/png";
 
     public static final String ENCODING = "utf-8";

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/converter/PrintExamPaperService.java

@@ -199,19 +199,25 @@ public class PrintExamPaperService {
             FileUtil.saveAsFile(answerDir + "/" + courseCode + "/" + Constants.FILE_ANSWER, mapper.toJson(answerList));
             //json = CommonUtils.replaceUnicodeStr(json);//todo
         }
+
         File paperZipFile = new File(tempDir + "/paper.zip");
         File answerZipFile = new File(tempDir + "/answer.zip");
         File paperDirFile = new File(paperDir);
         File answerDirFile = new File(answerDir);
         FileUtil.doZip(paperDirFile, paperZipFile);
         FileUtil.doZip(answerDirFile, answerZipFile);
+
+        short[] paperHeaders = {1, 1};//试卷头信息
+        short[] paperAesHeaders = {1, 2};//试卷加密头信息
+        short[] answerHeaders = {2, 1};//答案头信息
+        short[] answerAesHeaders = {2, 2};//答案加密头信息
         if (StringUtils.isNotBlank(password)) {
             String sign = Cryptogram.md5Key(password);
-            FileUtil.appendHeader(paperZipFile, Constants.paperAesHeaders, sign);
-            FileUtil.appendHeader(answerZipFile, Constants.answerAesHeaders, sign);
+            FileUtil.appendHeader(paperZipFile, paperAesHeaders, sign);
+            FileUtil.appendHeader(answerZipFile, answerAesHeaders, sign);
         } else {
-            FileUtil.appendHeader(paperZipFile, Constants.paperHeaders, null);
-            FileUtil.appendHeader(answerZipFile, Constants.answerHeaders, null);
+            FileUtil.appendHeader(paperZipFile, paperHeaders, null);
+            FileUtil.appendHeader(answerZipFile, answerHeaders, null);
         }
         paperZipFile.delete();
         answerZipFile.delete();