3.4.5 20250617 bug

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -760,9 +760,9 @@ public class CreatePdfUtil {
         Optional<ExamTaskDetail> optional = examTaskDetailList.stream().filter(m -> m.getExposedExamId() != null && m.getExposedExamId().equals(tbTaskPdf.getExamId())).findFirst();
         if (optional.isPresent()) {
             ExamTaskDetail examTaskDetail = optional.get();
-            if (examTaskDetail.getExposed()) {
-                throw ExceptionResultEnum.ERROR.exception("备用卷已曝光");
-            }
+//            if (examTaskDetail.getExposed()) {
+//                throw ExceptionResultEnum.ERROR.exception("备用卷已曝光");
+//            }
             return examTaskDetail;
         } else {
             BasicPrintConfig basicPrintConfig = basicPrintConfigService.getByExamId(tbTaskPdf.getExamId());

pom.xml

@@ -54,7 +54,7 @@
         <junit.version>4.13</junit.version>
         <activiti.version>6.0.0</activiti.version>
         <activiti-modeler.version>5.22.0</activiti-modeler.version>
-        <zip4j.version>1.3.3</zip4j.version>
+        <zip4j.version>2.11.5</zip4j.version>
         <nanoid.version>2.0.0</nanoid.version>
 <!--        <jasypt.version>3.0.3</jasypt.version>-->
         <poi-tl.version>1.12.1</poi-tl.version>

teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/Zip4jUtil.java

@@ -1,12 +1,14 @@
 package com.qmth.teachcloud.common.util;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import net.lingala.zip4j.core.ZipFile;
+import net.lingala.zip4j.ZipFile;
 import net.lingala.zip4j.exception.ZipException;
 import net.lingala.zip4j.model.ZipParameters;
-import net.lingala.zip4j.util.Zip4jConstants;
+import net.lingala.zip4j.model.enums.AesKeyStrength;
+import net.lingala.zip4j.model.enums.CompressionLevel;
+import net.lingala.zip4j.model.enums.CompressionMethod;
+import net.lingala.zip4j.model.enums.EncryptionMethod;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.CollectionUtils;
@@ -136,7 +138,7 @@ public class Zip4jUtil {
             }
             ZipFile zipFile = new ZipFile(scrPath);
             if (Objects.nonNull(password) && zipFile.isEncrypted()) {
-                zipFile.setPassword(password);
+                zipFile.setPassword(password.toCharArray());
             }
             File currentFile = new File(destPath);
             if (!currentFile.exists()) {
@@ -164,41 +166,50 @@ public class Zip4jUtil {
             if (!file.exists()) {
                 file.getParentFile().mkdirs();
             }
-            // 生成的压缩文件
-            ZipFile zipFile = new ZipFile(scrPath);
-//            zipFile.setFileNameCharset("UTF-8");
             ZipParameters parameters = new ZipParameters();
+            // 压缩方法
+            parameters.setCompressionMethod(CompressionMethod.DEFLATE);
             // 压缩级别
-            parameters.setCompressionMethod(Zip4jConstants.COMP_DEFLATE);
-            // 压缩级别
-            parameters.setCompressionLevel(Zip4jConstants.DEFLATE_LEVEL_NORMAL);
+            parameters.setCompressionLevel(CompressionLevel.NORMAL);
+            // 生成的压缩文件
+            ZipFile zipFile;
             if (Objects.nonNull(password)) {
                 parameters.setEncryptFiles(true);
-                parameters.setEncryptionMethod(Zip4jConstants.ENC_METHOD_AES);
-                parameters.setAesKeyStrength(Zip4jConstants.AES_STRENGTH_256);
-                parameters.setPassword(password);
+                parameters.setEncryptionMethod(EncryptionMethod.AES);
+                parameters.setAesKeyStrength(AesKeyStrength.KEY_STRENGTH_256);
+                zipFile = new ZipFile(scrPath, password.toCharArray());
+            } else {
+                zipFile = new ZipFile(scrPath);
             }
 
-            File[] fs = null;
-            if (!CollectionUtil.isEmpty(files)) {
-                // 要打包的文件夹
-                fs = files.toArray(new File[files.size()]);
-            } else if (Objects.nonNull(destPath)) {
-                File currentFile = new File(destPath);
-                if (!currentFile.exists()) {
-                    throw ExceptionResultEnum.ERROR.exception("待压缩的路径不存在");
-                }
-                fs = currentFile.listFiles();
+            // 3. 添加文件夹到zip
+            File folderToAdd = new File(destPath);
+            if (folderToAdd.isDirectory()) {
+                zipFile.addFolder(folderToAdd, parameters);
+            } else {
+                throw new IllegalArgumentException("提供的路径不是文件夹: " + destPath);
             }
 
-            // 遍历test文件夹下所有的文件、文件夹
-            for (File f : fs) {
-                if (f.isDirectory()) {
-                    zipFile.addFolder(f.getPath(), parameters);
-                } else {
-                    zipFile.addFile(f, parameters);
-                }
-            }
+//            File[] fs = null;
+//            if (!CollectionUtil.isEmpty(files)) {
+//                // 要打包的文件夹
+//                fs = files.toArray(new File[files.size()]);
+//            } else if (Objects.nonNull(destPath)) {
+//                File currentFile = new File(destPath);
+//                if (!currentFile.exists()) {
+//                    throw ExceptionResultEnum.ERROR.exception("待压缩的路径不存在");
+//                }
+//                fs = currentFile.listFiles();
+//            }
+//
+//            // 遍历test文件夹下所有的文件、文件夹
+//            for (File f : fs) {
+//                if (f.isDirectory()) {
+//                    zipFile.addFolder(f.getPath(), parameters);
+//                } else {
+//                    zipFile.addFile(f, parameters);
+//                }
+//            }
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);
             throw ExceptionResultEnum.ERROR.exception(e.getMessage());

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkServiceImpl.java

@@ -1857,7 +1857,7 @@ public class MarkServiceImpl implements MarkService {
         if (CollectionUtils.isEmpty(markOcrStudentQuestionList)) {
             return null;
         }
-        return markOcrStudentQuestionList.stream().filter(m -> StringUtils.isNotBlank(m.getOcrContent())).map(MarkOcrStudentQuestion::getOcrContent).collect(Collectors.joining(SystemConstant.COMMA_OF_CHINESE));
+        return markOcrStudentQuestionList.stream().filter(m -> StringUtils.isNotBlank(m.getOcrContent())).map(MarkOcrStudentQuestion::getOcrContent).collect(Collectors.joining(""));
     }
 
     private void ocrStudentQuestionResult(BasicSchool basicSchool, Long studentId, Long questionId) {