Merge remote-tracking branch 'origin/master'

api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java

@@ -136,5 +136,5 @@ public class ConstantStatus {
     //自动下载单据数据
     public static final String SYNC_DOWNLOAD_SCAN_ORDER = "AutoDownloadOrder";
     //自动下载DI数据
-    public static final String SYNC_DOWNLOAD_DI = "AutoDownloadDI";
+    public static final String SYNC_DOWNLOAD_DI_PRODUCTS = "AutoDownloadDiProducts";
 }

api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java

@@ -286,6 +286,7 @@ public class DlBasicService {
                         basicDownloadStatusEntity.setUpdateTime(new Date());
                         basicDownloadStatusEntity.setEndTime(new Date());
                         basicDownloadStatusEntity.setRemark(remark.toString());
+                        basicDownloadStatusEntity.setStatus(1);
                         basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
                     }
                 }
@@ -391,7 +392,7 @@ public class DlBasicService {
                         basicDownloadStatusEntity.setUpdateTime(new Date());
                         basicDownloadStatusEntity.setEndTime(new Date());
                         basicDownloadStatusEntity.setRemark(remark.toString());
-
+                        basicDownloadStatusEntity.setStatus(1);
                         basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
                     }
                 }
@@ -467,6 +468,7 @@ public class DlBasicService {
                         basicDownloadStatusEntity.setUpdateTime(new Date());
                         basicDownloadStatusEntity.setEndTime(new Date());
                         basicDownloadStatusEntity.setRemark(remark.toString());
+                        basicDownloadStatusEntity.setStatus(1);
                         basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
                     }
                 }
@@ -518,7 +520,7 @@ public class DlBasicService {
                         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
                         basicDownloadStatusEntity.setId(spSyncUdiResponse.getTaskId());
                         basicDownloadStatusEntity.setStartTime(new Date());
-                        basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_DI);
+                        basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_DI_PRODUCTS);
                         basicDownloadStatusEntity.setStatus(0); //下载中
                         basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_DI);
                         basicDownloadStatusEntity.setScheduleType(1);
@@ -552,6 +554,7 @@ public class DlBasicService {
                         basicDownloadStatusEntity.setUpdateTime(new Date());
                         basicDownloadStatusEntity.setEndTime(new Date());
                         basicDownloadStatusEntity.setRemark(remark.toString());
+                        basicDownloadStatusEntity.setStatus(1);
                         basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
                     }
                 }

api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java

@@ -71,6 +71,7 @@ public class HeartService {
         BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
         basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
         basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_SCAN_ORDER);
+        spsSyncOrderResponse.setTaskId(basicExportStatusEntity1.getId());
         BaseResponse<String> baseResponse1 = spGetHttp.postAllOrder(spsSyncOrderResponse);
         if (baseResponse1.getCode() == 20000) {
             basicExportStatusEntity1.setStatus(1);
@@ -125,6 +126,7 @@ public class HeartService {
         BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
         basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
         basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_BUS_TYPE);
+        spsSyncBusResponse.setTaskId(basicExportStatusEntity2.getId());
         BaseResponse<String> baseResponse2 = spGetHttp.postAllBus(spsSyncBusResponse);
         if (baseResponse2.getCode() == 20000) {
             basicExportStatusEntity2.setStatus(1);
@@ -196,6 +198,7 @@ public class HeartService {
         BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
         basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
         basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_BASIC_DATA);
+        syncDataResponse.setTaskId(basicExportStatusEntity3.getId());
         BaseResponse<String> baseResponse = spGetHttp.postAllBaseData(syncDataResponse);
         if (baseResponse.getCode() == 20000) {
             basicExportStatusEntity3.setStatus(1);