From c85d0f445d44d31ea0be35d28c2f3c1b51cd2175 Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Thu, 27 Apr 2023 10:10:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8F=8A=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E5=86=99=E5=85=A5=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sync/BasicDownloadStatusEntity.java       |  6 ++++++
 .../entity/sync/BasicExportStatusEntity.java  |  1 -
 .../glxp/api/service/sync/HeartService.java   | 20 +++++++++++++++++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java
index d91f106fa..420da974f 100644
--- a/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java
+++ b/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java
@@ -1,10 +1,14 @@
 package com.glxp.api.entity.sync;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
+@TableName("basic_download_status")
 public class BasicDownloadStatusEntity {
 
     /**
@@ -24,4 +28,6 @@ public class BasicDownloadStatusEntity {
     private Date startTime;
     private Date endTime;
     private String remark;
+    @TableField(value = "cacheFilePath")
+    private String cacheFilePath;
 }
diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
index 867f13a0d..73886ef0f 100644
--- a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
+++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
@@ -17,7 +17,6 @@ import lombok.NoArgsConstructor;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-
 public class BasicExportStatusEntity {
 
     @TableId(type = IdType.INPUT)
diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java
index e2f6c2255..410bcb3fa 100644
--- a/src/main/java/com/glxp/api/service/sync/HeartService.java
+++ b/src/main/java/com/glxp/api/service/sync/HeartService.java
@@ -49,6 +49,7 @@ import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.TransactionIsolationLevel;
 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.Propagation;
@@ -864,7 +865,7 @@ public class HeartService {
      * @return
      */
     private SpsSyncSysSettingResponse getSysSettingData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) {
-       SpsSyncSysSettingResponse dataResponse = null;
+        SpsSyncSysSettingResponse dataResponse = null;
         Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
         syncTimeMap.put("isNew", true);
         syncTimeMap.put("oldDate", syncTime);
@@ -1059,7 +1060,14 @@ public class HeartService {
                 .scheduleType(BasicProcessStatus.SCHEDULE_NORMAL)
                 .remark(baseResponse.getMessage())
                 .build();
-        applicationContext.getBean(this.getClass()).insertExportStatus(exportStatus);
+        try {
+            String fileFullPath = writeFile(filePrefix, exportType.getRemark(), JsonUtils.toJsonString(data));
+            exportStatus.setCacheFilePath(fileFullPath);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }finally {
+            applicationContext.getBean(this.getClass()).insertExportStatus(exportStatus);
+        }
         if (baseResponse.getCode() != 20000) {
             throw new RuntimeException(baseResponse.getMessage());
         }
@@ -1412,6 +1420,8 @@ public class HeartService {
     private final SupManufacturerDao supManufacturerDao;
     private final SupProductDao supProductDao;
 
+    @Value("${file_path}")
+    private String filePrefix;
 
     /**
      * 从UDI自助平台拉取 统一方法
@@ -1458,6 +1468,12 @@ public class HeartService {
                 basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); //下载完成
                 basicDownloadStatusEntity.setType(exportType.getRemark());
                 basicDownloadStatusEntity.setScheduleType(1);
+                try {
+                    String fileFullPath = writeFile(filePrefix, exportType.getRemark(), bean.getFileContent());
+                    basicDownloadStatusEntity.setCacheFilePath(fileFullPath);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
                 basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity);
                 //通知自助平台任务已完成
                 spGetHttp.finishTask(taskId);