暂存异步

ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java

@@ -13,6 +13,8 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.system.domain.loan.LoanApplicationFj;
 import com.ruoyi.system.domain.loan.ShareholderFj;
+import com.ruoyi.system.mapper.ShareholderFjMapper;
+import com.ruoyi.system.service.loan.ILoanApplicationFjService;
 import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -145,7 +147,7 @@ public class AsyncFactory
      * @param loanApplicationFjListA 分附件大类集合
      * @return
      */
-    public static List<LoanApplicationFj> createPdfFromImages(List<LoanApplicationFj> loanApplicationFjList, List<LoanApplicationFj> loanApplicationFjListA,String loanApplicationNumber,String bigType){
+    public static void createPdfFromImages(List<LoanApplicationFj> loanApplicationFjList, List<LoanApplicationFj> loanApplicationFjListA,String loanApplicationNumber,String bigType){
         if (loanApplicationFjListA != null && loanApplicationFjListA.size() > 0){
             Map<String, List<LoanApplicationFj>> typeMap = loanApplicationFjListA.stream().collect(Collectors.groupingBy(LoanApplicationFj::getType));
             for (String type : typeMap.keySet()) {
@@ -163,7 +165,6 @@ public class AsyncFactory
                 }
             }
         }
-        return loanApplicationFjList;
     }
 
     /**
@@ -172,13 +173,14 @@ public class AsyncFactory
      * @param originalFilename      pdf文件名称
      * @param type                  文件类型
      */
-    public static List<LoanApplicationFj> createPdfFromImages(List<LoanApplicationFj> loanApplicationFjList, List<String> imagePaths, String loanApplicationNumber, String originalFilename, String type,String bigType) {
+    public static void createPdfFromImages(List<LoanApplicationFj> loanApplicationFjList, List<String> imagePaths, String loanApplicationNumber, String originalFilename, String type,String bigType) {
         // 上传文件路径 = 根+申请编号
         String filePath = StringUtils.format("{}/{}/{}.{}", RuoYiConfig.getUploadPath(), loanApplicationNumber,
                 FilenameUtils.getBaseName(originalFilename), "pdf");
         //pdf保存位置
         File outPutPdf = new File(filePath);
         try {
+            List list = new ArrayList();
             FileUploadUtils.createPdfFromImages(imagePaths, outPutPdf);
             //往附件信息中插入对应PDF数据
             LoanApplicationFj applicationFj = new LoanApplicationFj();
@@ -191,11 +193,12 @@ public class AsyncFactory
             applicationFj.setType(type);
             //给前端判断是否是系统生成的pdf
             applicationFj.setRemark(ONE);
-            loanApplicationFjList.add(applicationFj);
+            list.add(applicationFj);
+            // 插入数据
+            SpringUtils.getBean(ILoanApplicationFjService.class).insertLoanApplicationFj(list);
         } catch (IOException e) {
             e.printStackTrace();
         }
-        return loanApplicationFjList;
     }
 
 
@@ -247,6 +250,8 @@ public class AsyncFactory
                                 FilenameUtils.getBaseName(substring), "pdf"));
                     }
                 }
+                // 插入数据
+                SpringUtils.getBean(ShareholderFjMapper.class).batchShareholderFj(shareholderFjList);
             }
         };
     }

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/LoanApplicationServiceImpl.java

@@ -199,7 +199,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 shareholderFj.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
             }
             AsyncManager.me().execute(AsyncFactory.createPdfFromImagesShareholder(shareholderFjList,loanApplication.getLoanApplicationNumber()));
-            shareholderFjMapper.batchShareholderFj(shareholderFjList);
+            //shareholderFjMapper.batchShareholderFj(shareholderFjList);
         }
 
         //往业务进度表 loan_schedule 插入数据
@@ -250,7 +250,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 shareholderFj.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
             }
             AsyncManager.me().execute(AsyncFactory.createPdfFromImagesShareholder(shareholderFjList,loanApplication.getLoanApplicationNumber()));
-            shareholderFjMapper.batchShareholderFj(shareholderFjList);
+           // shareholderFjMapper.batchShareholderFj(shareholderFjList);
         }
         return loanApplicationMapper.updateLoanApplication(loanApplication);
     }
@@ -288,7 +288,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 }
                 AsyncManager.me().execute(AsyncFactory.createPdfFromImagesShareholder(shareholderFjList,loanApplication.getLoanApplicationNumber()));
 
-                shareholderFjMapper.batchShareholderFj(shareholderFjList);
+                //shareholderFjMapper.batchShareholderFj(shareholderFjList);
             }
             int rows = loanApplicationMapper.updateLoanApplication(loanApplication);
             return rows>0?AjaxResult.success() : AjaxResult.error();
@@ -324,7 +324,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 shareholderFj.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
             }
             AsyncManager.me().execute(AsyncFactory.createPdfFromImagesShareholder(shareholderFjList,loanApplication.getLoanApplicationNumber()));
-            shareholderFjMapper.batchShareholderFj(shareholderFjList);
+            //shareholderFjMapper.batchShareholderFj(shareholderFjList);
         }
         return rows>0?AjaxResult.success() : AjaxResult.error();
     }