From e8cdafc14b0b37ac97faa9a3ceffb0d105ef9473 Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Thu, 4 May 2023 20:29:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=BB=E5=8A=A1=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/service/sync/HeartService.java   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

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 aa86141f8..35dac948b 100644
--- a/src/main/java/com/glxp/api/service/sync/HeartService.java
+++ b/src/main/java/com/glxp/api/service/sync/HeartService.java
@@ -1127,6 +1127,7 @@ public class HeartService {
 
     @Transactional(rollbackFor = Exception.class)
     public void uploadData(BasicExportTypeEnum exportType, String taskId, Function<HeartService, Object> dataMethod) {
+        Date startTime = new Date();
         Integer status = StatusEnum.SUCCESS.getCode();
         Object data = dataMethod.apply(this);
         if (data == null) {
@@ -1144,7 +1145,7 @@ public class HeartService {
                 .status(status)
                 .idDatas(exportType.getKey())
                 .type(exportType.getRemark())
-                .startTime(new Date())
+                .startTime(startTime)
                 .endTime(new Date())
                 .updateTime(new Date())
                 .receiveStatus(String.valueOf(status))
@@ -1217,6 +1218,7 @@ public class HeartService {
 
     //上传最近更新单据类型
     public BaseResponse uploadAllBus(String syncTime) {
+        Date startTime = new Date();
         SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest();
         if (syncTime == null) {
             BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_BUS_TYPE);
@@ -1238,7 +1240,7 @@ public class HeartService {
             busTypetatusEntity.setId(CustomUtil.getId());
             busTypetatusEntity.setIdDatas(ConstantStatus.SYNC_BUS_TYPE);
             busTypetatusEntity.setType(BasicProcessStatus.NEW_ALL_BUS);
-            busTypetatusEntity.setUpdateTime(new Date());
+            busTypetatusEntity.setUpdateTime(startTime);
             busTypetatusEntity.setStartTime(new Date());
             busTypetatusEntity.setStatus(0);
             busTypetatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL);
@@ -1355,6 +1357,7 @@ public class HeartService {
     //下载最近更新扫码单据--上级服务
     @Transactional(propagation = Propagation.NESTED)
     public void dlAllOrder() {
+        Date startTime = new Date();
         BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(NEW_ALL_ORDER + "", "3");
         List<BasicExportStatusEntity> pageSimpleResponse = baseResponse != null ? baseResponse.getData() : new ArrayList<>();
         if (pageSimpleResponse != null) {
@@ -1371,7 +1374,7 @@ public class HeartService {
                         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
                         basicDownloadStatusEntity.setId(CustomUtil.getId());
                         basicDownloadStatusEntity.setTaskId(syncDataResponse.getTaskId());
-                        basicDownloadStatusEntity.setStartTime(new Date());
+                        basicDownloadStatusEntity.setStartTime(startTime);
                         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_SCAN_ORDER);
                         basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); //下载中
                         basicDownloadStatusEntity.setType(NEW_ALL_ORDER);
@@ -1423,6 +1426,7 @@ public class HeartService {
     //    下载最近更新国家库数据-上级服务
     @Transactional(propagation = Propagation.NESTED)
     public void dlAllDiProducts() {
+        Date startTime = new Date();
         BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(NEW_ALL_UDIS, "3");
         List<BasicExportStatusEntity> pageSimpleResponse = baseResponse.getData();
         if (pageSimpleResponse != null) {
@@ -1442,7 +1446,7 @@ public class HeartService {
                         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
                         basicDownloadStatusEntity.setId(CustomUtil.getId());
                         basicDownloadStatusEntity.setTaskId(spSyncUdiResponse.getTaskId());
-                        basicDownloadStatusEntity.setStartTime(new Date());
+                        basicDownloadStatusEntity.setStartTime(startTime);
                         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_DI_PRODUCTS);
                         basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); //下载中
                         basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_UDIS);
@@ -1514,6 +1518,7 @@ public class HeartService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void pullData(BasicExportTypeEnum exportType) {
+        Date startTime = new Date();
 
         String data = spGetHttp.pullData(exportType);
         cn.hutool.json.JSONObject obj = JSONUtil.parseObj(data);
@@ -1545,7 +1550,7 @@ public class HeartService {
                 BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
                 basicDownloadStatusEntity.setId(CustomUtil.getId());
                 basicDownloadStatusEntity.setTaskId(taskId);
-                basicDownloadStatusEntity.setStartTime(new Date());
+                basicDownloadStatusEntity.setStartTime(startTime);
                 basicDownloadStatusEntity.setUpdateTime(new Date());
                 basicDownloadStatusEntity.setEndTime(new Date());
                 basicDownloadStatusEntity.setIdDatas(exportType.getKey());