教育培训登记簿代码提交

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteFileFallbackFactory.java

@@ -1,5 +1,6 @@
 package com.xunmei.system.api.factory;
 
+import com.alibaba.fastjson2.JSON;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.system.api.RemoteFileService;
 import com.xunmei.system.api.domain.SysFile;
@@ -21,8 +22,7 @@ public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileServ
     private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class);
 
     @Override
-    public RemoteFileService create(Throwable throwable)
-    {
+    public RemoteFileService create(Throwable throwable) {
         log.error("文件服务调用失败:{}", throwable.getMessage());
         return new RemoteFileService() {
             @Override
@@ -32,6 +32,7 @@ public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileServ
 
             @Override
             public R<String> generateEduTrainingPdf(Map<String, Object> data) {
+                log.error("生成教育培训登记簿失败:{},参数:{}", throwable.getMessage(), JSON.toJSONString(data));
                 return null;
             }
         };

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -53,6 +53,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.NumberFormat;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 
@@ -330,11 +331,13 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         String fileName = orgName + "_" + ExportPdfType.EDUCATION_TRAINING.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
         Map<String, Object> data = this.getFtlEdu(task);
         data.put("fileName", fileName);
-
-        R<String> r = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.generateEduTrainingPdf(data), ErrorMsgConstants.GENERATE_PDF_ERROR);
-        if (ObjectUtil.hasEmpty(r, r.getData())) {
-            throw new SystemException(ErrorMsgConstants.GENERATE_PDF_ERROR);
-        }
+        data.put("id", id);
+        CompletableFuture.runAsync(() -> {
+            R<String> r = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.generateEduTrainingPdf(data), ErrorMsgConstants.GENERATE_PDF_ERROR);
+            if (ObjectUtil.hasEmpty(r, r.getData())) {
+                throw new SystemException(ErrorMsgConstants.GENERATE_PDF_ERROR);
+            }
+        });
 
        /* //新方式生成pdf
         try {
@@ -353,7 +356,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         } catch (Exception e) {
             throw new RuntimeException(e);
         }*/
-        return r.getData();
+        return null;
     }
 
     private Map<String, Object> getFtlEdu(CoreEduTrainingTaskDetailVo task) {