From b44bbc53b053b236aec6ae4c7a521a8fae1c1c47 Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Thu, 11 May 2023 14:56:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=91=E5=86=85=E5=90=8C=E6=AD=A5=E5=9B=BD?=
 =?UTF-8?q?=E5=AE=B6=E5=BA=93=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/sync/SpsSyncDownloadController.java   |  5 ++++-
 .../api/service/sync/SpsSyncDownloadService.java     | 12 +++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
index fe0103d1..1482cca8 100644
--- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
+++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
@@ -151,10 +151,11 @@ public class SpsSyncDownloadController {
     @GetMapping("sps/sync/syncUdis")
     public BaseResponse getDiProducts(SpsSyncDataRequest spsSyncDataRequest) {
 
-        BaseResponse<SpSyncUdiResponse> baseResponse = spsSyncDownloadService.syncUdi(spsSyncDataRequest);
+        BaseResponse<SpSyncUdiResponse> baseResponse = ResultVOUtils.error(ResultEnum.NOT_NETWORK.getCode(),"");
         BasicExportStatusEntity basicExportStatusEntity = basicExportService.findByData(ConstantStatus.SYNC_DI_PRODUCTS, 3);
         String logs = "";
         if (basicExportStatusEntity != null) {
+            baseResponse = spsSyncDownloadService.syncUdi(spsSyncDataRequest);
 //            if (CollUtil.isNotEmpty(baseResponse.getData().getProductInfoEntityList()))
 //                logs = logs + "DI信息：" + baseResponse.getData().getProductInfoEntityList().size() + "条\n";
 //            if (CollUtil.isNotEmpty(baseResponse.getData().getUdiCompanyEntities()))
@@ -165,6 +166,8 @@ public class SpsSyncDownloadController {
             SpSyncUdiResponse spSyncUdiResponse = baseResponse.getData();
             spSyncUdiResponse.setTaskId(basicExportStatusEntity.getId());
             baseResponse.setData(spSyncUdiResponse);
+            baseResponse.setCode(20000);
+            baseResponse.setMessage("success");
         }
         return baseResponse;
     }
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 cc69ddbc..d0b8b134 100644
--- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
+++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
@@ -40,6 +40,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.File;
@@ -132,6 +133,7 @@ public class SpsSyncDownloadService {
         }
     }
 
+    @Transactional
     // 创建国家库同步任务
     public void syncDiProductsTask(Date lastUpdateTime) {
 
@@ -144,8 +146,16 @@ public class SpsSyncDownloadService {
         //首次任务or上次任务结束
         if (exportStatus == null || BasicExportStatusEnum.COMPLETED.getCode().equals(exportStatus.getStatus())) {
             SpsSyncDataRequest spsSyncDataRequest = getRequest(ConstantStatus.SYNC_DI_PRODUCTS);
-            if (lastUpdateTime != null)
+            if (lastUpdateTime != null) {
                 spsSyncDataRequest.setLastUpdateTime(DateUtil.formatDateTime(lastUpdateTime));
+
+                BasicExportStatusTimeEntity timeInfo = BasicExportStatusTimeEntity.builder()
+                        .key("AutoDownloadDiProducts")
+                        .lastUpdateTime(DateUtil.formatDateTime(lastUpdateTime))
+                        .build();
+                basicExportTimeService.replace(timeInfo);
+            }
+
             BaseResponse<SpSyncUdiResponse> baseResponse = syncUdi(spsSyncDataRequest);
             SpSyncUdiResponse spSyncUdiResponse = baseResponse.getData();
             if (CollUtil.isNotEmpty(spSyncUdiResponse.getProductInfoEntityList())