wangliang hace 4 años
padre
commit
390ba0e553

+ 12 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/importData/AsyncImportTaskTemplete.java

@@ -22,6 +22,7 @@ import org.springframework.scheduling.annotation.Async;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Map;
 import java.util.Objects;
@@ -91,6 +92,17 @@ public abstract class AsyncImportTaskTemplete {
         InputStream inputStream = null;
         try {
             JSONObject jsonObject = JSONObject.parseObject(tbTask.getImportFilePath());
+            if (Objects.isNull(jsonObject)) {
+                LocalDateTime nowTime = LocalDateTime.now();
+                StringJoiner stringJoiner = new StringJoiner("");
+                stringJoiner.add(UploadFileEnum.FILE.getTitle()).add(File.separator);
+                stringJoiner.add(String.valueOf(nowTime.getYear())).add(File.separator)
+                        .add(String.format("%02d", nowTime.getMonthValue())).add(File.separator)
+                        .add(String.format("%02d", nowTime.getDayOfMonth()))
+                        .add(File.separator).add(SystemConstant.getUuid()).add(TXT_PREFIX);
+                jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
+                jsonObject.put(SystemConstant.PATH, stringJoiner.toString());
+            }
             String path = (String) jsonObject.get(SystemConstant.PATH);
             String type = (String) jsonObject.get(SystemConstant.TYPE);
 

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

@@ -155,7 +155,8 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     JSONArray jsonArrayOrdinary = JSONArray.parseArray(examPrintPlan.getOrdinaryContent());
                     for (int i = 0; i < jsonArrayOrdinary.size(); i++) {
                         JSONObject jsonObjectOrdinary = jsonArrayOrdinary.getJSONObject(i);
-                        Long attachmentId = (Long) jsonObjectOrdinary.get("attachmentId");
+//                        Long attachmentId = (Long) jsonObjectOrdinary.get("attachmentId");
+                        Long attachmentId = null;
                         BasicAttachment basicAttachment = basicAttachmentService.getById(attachmentId);
                         createPdfUtil.createCheckIn(basicAttachment, ordinaryPdfList, (Integer) jsonObjectOrdinary.get("backupCount"));
                     }