本地部署生成pdf调整

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/DataSyncServiceImpl.java

@@ -16,6 +16,7 @@ import com.qmth.teachcloud.common.bean.dto.stmms.GroupDetailDTO;
 import com.qmth.teachcloud.common.bean.dto.stmms.PicConfig;
 import com.qmth.teachcloud.common.bean.dto.stmms.QuestionBaseDTO;
 import com.qmth.teachcloud.common.bean.dto.stmms.QuestionDTO;
+import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicAttachment;
 import com.qmth.teachcloud.common.entity.SysOrg;
@@ -86,6 +87,9 @@ public class DataSyncServiceImpl implements DataSyncService {
 
     ExecutorService executorService = Executors.newFixedThreadPool(5);
 
+    @Resource
+    DictionaryConfig dictionaryConfig;
+
     /**
      * 定时任务批量同步
      */
@@ -207,8 +211,8 @@ public class DataSyncServiceImpl implements DataSyncService {
             String objectiveStructure = examPaperStructure.getObjectiveStructure();
             if (StringUtils.isNotBlank(objectiveStructure)) {
                 List<JSONObject> objectiveJsons = JSONObject.parseArray(objectiveStructure, JSONObject.class);
-                long count = objectiveJsons.stream().filter(m->m.containsKey("answer")).count();
-                if(objectiveJsons.size() == 0 || count == 0) {
+                long count = objectiveJsons.stream().filter(m -> m.containsKey("answer")).count();
+                if (objectiveJsons.size() == 0 || count == 0) {
                     List<QuestionDTO> syncObjectiveStructureDatas = new ArrayList<>();
                     cloudMarkingTaskUtils.syncPaperStructure(schoolId, examId, subjectCode, true, null, syncObjectiveStructureDatas);
                 }
@@ -514,8 +518,10 @@ public class DataSyncServiceImpl implements DataSyncService {
                     } catch (Exception e) {
                         throw ExceptionResultEnum.ERROR.exception(e.getMessage());
                     } finally {
-                        if (file != null && file.exists()) {
-                            file.delete();
+                        if (Objects.nonNull(dictionaryConfig.sysDomain()) && dictionaryConfig.sysDomain().isOss()) {
+                            if (file != null && file.exists()) {
+                                file.delete();
+                            }
                         }
                     }
                 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TSyncExamStudentScoreServiceImpl.java

@@ -14,7 +14,6 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.UploadFileEnum;
-import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.*;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.IOUtils;
@@ -256,8 +255,10 @@ public class TSyncExamStudentScoreServiceImpl extends ServiceImpl<TSyncExamStude
                 File[] files = tSyncExamStudentScore.getTrajectoryFileList().get(0).getParentFile().listFiles();
                 List<File> fileList = new ArrayList<>(Arrays.asList(files));
                 fileList.removeAll(tSyncExamStudentScore.getTrajectoryFileList());
-                for (File file : fileList) {
-                    file.delete();
+                if (Objects.nonNull(dictionaryConfig.sysDomain()) && dictionaryConfig.sysDomain().isOss()) {
+                    for (File file : fileList) {
+                        file.delete();
+                    }
                 }
                 FileUtil.doZip(zipFile, Arrays.asList(tSyncExamStudentScore.getTrajectoryFileList().get(0).getParentFile()));
                 HttpServletResponse response = ServletUtil.getResponse();

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -601,9 +601,9 @@ public class TaskLogicServiceImpl implements TaskLogicService {
 //            createPdfUtil.deleteAttachment(attachmentIds, ftlList);
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);
-            if (Objects.nonNull(dictionaryConfig.sysDomain()) && dictionaryConfig.sysDomain().isOss()) {
-                basicAttachmentService.batchDeleteAttachment(basicAttachmentList);
-            }
+//            if (Objects.nonNull(dictionaryConfig.sysDomain()) && dictionaryConfig.sysDomain().isOss()) {
+            basicAttachmentService.batchDeleteAttachment(basicAttachmentList);
+//            }
             if (e instanceof ApiException) {
                 ResultUtil.error((ApiException) e, e.getMessage());
             } else {
@@ -928,10 +928,12 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
                     jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE);
                     tbTask.setResultFilePath(jsonObject.toJSONString());
-                    for (File file : sourceFiles) {
-                        file.delete();
+                    if (Objects.nonNull(dictionaryConfig.sysDomain()) && dictionaryConfig.sysDomain().isOss()) {
+                        for (File file : sourceFiles) {
+                            file.delete();
+                        }
+                        zipFile.delete();
                     }
-                    zipFile.delete();
                 }
                 map.computeIfAbsent(SystemConstant.SIZE, v -> attachmentIds.size());
             }
@@ -1590,8 +1592,10 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                             File[] files = t.getTrajectoryFileList().get(0).getParentFile().listFiles();
                             List<File> fileList = new ArrayList<>(Arrays.asList(files));
                             fileList.removeAll(t.getTrajectoryFileList());
-                            for (File file : fileList) {
-                                file.delete();
+                            if (Objects.nonNull(dictionaryConfig.sysDomain()) && dictionaryConfig.sysDomain().isOss()) {
+                                for (File file : fileList) {
+                                    file.delete();
+                                }
                             }
                             sourceFiles.add(t.getTrajectoryFileList().get(0).getParentFile());
                         } else {

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

@@ -837,13 +837,13 @@ public class CreatePdfUtil {
             localA4PdfFile.delete();
         }
         //删除题卡临时文件
-        if (oss) {
-            for (PdfDto pdfDto : mergePdfDeleteList) {
-                if (Objects.nonNull(pdfDto)) {
-                    new File(pdfDto.getPath()).delete();
-                }
+//        if (oss) {
+        for (PdfDto pdfDto : mergePdfDeleteList) {
+            if (Objects.nonNull(pdfDto)) {
+                new File(pdfDto.getPath()).delete();
             }
         }
+//        }
 //        for (PdfDto pdfDto : mergePdfA3List) {
 //            if (Objects.nonNull(pdfDto)) {
 //                new File(pdfDto.getPath()).delete();
@@ -870,9 +870,11 @@ public class CreatePdfUtil {
             basicAttachmentService.batchDeleteAttachment(basicAttachmentService.list(basicAttachmentQueryWrapper));
             basicAttachmentService.removeByIds(attachmentIds);
         }
-        if (Objects.nonNull(ftlList) && ftlList.size() > 0) {
-            for (File file : ftlList) {
-                file.delete();
+        if (Objects.nonNull(dictionaryConfig.sysDomain()) && dictionaryConfig.sysDomain().isOss()) {
+            if (Objects.nonNull(ftlList) && ftlList.size() > 0) {
+                for (File file : ftlList) {
+                    file.delete();
+                }
             }
         }
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -11,7 +11,6 @@ import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.entity.ExamPrintPlan;
 import com.qmth.distributed.print.business.entity.TBSyncTask;
 import com.qmth.distributed.print.business.entity.TeachClazz;
-import com.qmth.distributed.print.business.entity.TeachCourse;
 import com.qmth.distributed.print.business.enums.DictionaryEnum;
 import com.qmth.distributed.print.business.enums.LoginTypeEnum;
 import com.qmth.distributed.print.business.service.*;
@@ -476,10 +475,10 @@ public class SysController {
                 ResultUtil.error(e.getMessage());
             }
         } finally {
-            if (Objects.nonNull(localTempFile)) {
+            if (Objects.nonNull(localTempFile) && Objects.nonNull(dictionaryConfig.sysDomain()) && dictionaryConfig.sysDomain().isOss()) {
                 FileUtil.deleteFile(localTempFile);
             }
-            if (Objects.nonNull(pdfOriginalFile)) {
+            if (Objects.nonNull(pdfOriginalFile) && Objects.nonNull(dictionaryConfig.sysDomain()) && dictionaryConfig.sysDomain().isOss()) {
                 FileUtil.deleteFile(pdfOriginalFile);
             }
         }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicAttachmentServiceImpl.java

@@ -251,11 +251,13 @@ public class BasicAttachmentServiceImpl extends ServiceImpl<BasicAttachmentMappe
 //                    ossUtil.ossDelete(jsonObject.get(SystemConstant.PDF_PATH).toString());
 //                }
             } else {//删除服务器附件
-                File file = new File(jsonObject.get(SystemConstant.PATH).toString());
-                file.delete();
-                if (Objects.nonNull(jsonObject.get(SystemConstant.PDF_PATH))) {
-                    file = new File(jsonObject.get(SystemConstant.PDF_PATH).toString());
+                if (Objects.nonNull(dictionaryConfig.sysDomain()) && dictionaryConfig.sysDomain().isOss()) {
+                    File file = new File(jsonObject.get(SystemConstant.PATH).toString());
                     file.delete();
+                    if (Objects.nonNull(jsonObject.get(SystemConstant.PDF_PATH))) {
+                        file = new File(jsonObject.get(SystemConstant.PDF_PATH).toString());
+                        file.delete();
+                    }
                 }
             }
         }