From 07d671975b0954e4ad0f70e39cf18be575941d23 Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Mon, 8 May 2023 17:51:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=90=8C=E6=AD=A5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/service/sync/SpsSyncDownloadService.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
index 17549878..9bc74118 100644
--- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
+++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
@@ -187,21 +187,21 @@ public class SpsSyncDownloadService {
         switch (exportType) {
             case BASIC_DATA:
                 if (needExec(info.getBasicProducts(), info.getBasicCorp(), info.getSupCert())) {
-                    basicExportInfoCreate(exportType, now
+                    basicExportInfoCreate(exportType, syncTime, now
                             , x -> x.generateBasicDataFile(info, now, false, syncTime)
                             , x -> x.generateBasicDataFile(info, now, true, syncTime));
                 }
                 break;
             case OTHER_DATA:
                 if (needExec(info.getUdiCodeLost(), info.getUdiCodeRel())) {
-                    basicExportInfoCreate(exportType, now
+                    basicExportInfoCreate(exportType, syncTime, now
                             , x -> x.generateOtherDataFile(info, now, false, syncTime)
                             , x -> x.generateOtherDataFile(info, now, true, syncTime));
                 }
                 break;
             case DOCUMENT_TYPE_DATA:
 //                if (needExec(info.getTypeBus(), info.getTypeScan(), info.getTypeThird())) {
-//                    basicExportInfoCreate(exportType, now
+//                    basicExportInfoCreate(exportType, syncTime, now
 //                            , x -> x.generateDocumentTypeDataFile(info, now, false, syncTime)
 //                            , x -> x.generateDocumentTypeDataFile(info, now, true, syncTime));
 //                }
@@ -230,7 +230,7 @@ public class SpsSyncDownloadService {
      * @param hasDataMethod    判断时候有无数据方法
      * @param createFileMethod 执行文件生成方法
      */
-    private void basicExportInfoCreate(BasicExportTypeEnum exportEnum, Date now, Function<SpsSyncDownloadService, Boolean> hasDataMethod, Function<SpsSyncDownloadService, Boolean> createFileMethod) {
+    private void basicExportInfoCreate(BasicExportTypeEnum exportEnum, Date syncTime, Date now, Function<SpsSyncDownloadService, Boolean> hasDataMethod, Function<SpsSyncDownloadService, Boolean> createFileMethod) {
         //防止出现同时调用问题
         String redisKey = String.format("spsm-sync-create:%s", exportEnum.getKey());
         boolean result = redisUtil.setIfAbsent(redisKey, 1, 10);
@@ -256,13 +256,14 @@ public class SpsSyncDownloadService {
             }
             exportStatus = BasicExportStatusEntity.builder()
                     .id(CustomUtil.getId())
-                    .status(BasicExportStatusEnum.WAIT_TRIGGERED.getCode())
+                    .status(syncTime == null ? BasicExportStatusEnum.WAIT_TRIGGERED.getCode() : BasicExportStatusEnum.WAIT_BUILT.getCode())
                     .idDatas(exportEnum.getKey())
                     .type(exportEnum.getRemark())
                     .scheduleType(0)
                     .updateTime(cn.hutool.core.date.DateUtil.date())
                     .startTime(now)
                     .build();
+            createFileMethod.apply(applicationContext.getBean(this.getClass()));
             basicExportService.save(exportStatus);
         } else if (exportStatus.getStatus().equals(BasicExportStatusEnum.WAIT_BUILT.getCode())) {//文件待生成
             createFileMethod.apply(applicationContext.getBean(this.getClass()));