bug修改

api-admin/src/main/java/com/glxp/sale/admin/constant/BasicProcessStatus.java

@@ -32,7 +32,7 @@ public class BasicProcessStatus {
     public static final String BASIC_THIRD_ORDER = "6";          //往来单位
     public static final String NEW_ALL_DATA = "7";
     public static final String NEW_ALL_BUS = "8";
-    public static final String NEW_ALL_ORDER = "9";
+    public static final String NEW_ALL_ORDER = "出入库扫码单据";
     public static final String NEW_ALL_UDIS = "10";
     public static final String ALL_BUS_ORDER = "11";
 

api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java

@@ -158,7 +158,7 @@ public class DlAllDataService {
         log.info("下载所有单据---");
         BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest();
         basicExportStatusRequest.setIdDatas("AutoDownloadOrder");
-        basicExportStatusRequest.setStatus(0);
+        basicExportStatusRequest.setStatus(BasicExportStatusEnum.WAIT_BUILT.getCode());
         basicExportStatusRequest.setType(BasicProcessStatus.NEW_ALL_ORDER);
         basicExportStatusRequest.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL);
         BaseResponse<List<BasicExportStatusEntity>> basicStatuss = spGetHttp.getBasicStatus(basicExportStatusRequest);
@@ -300,7 +300,6 @@ public class DlAllDataService {
     }
 
 
-
     public void dlScheduleStatus() {
 
         log.info("下载所有任务---");
@@ -335,8 +334,8 @@ public class DlAllDataService {
         log.info("下载所有国家库DI信息--");
         BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest();
         basicExportStatusRequest.setIdDatas(ConstantStatus.SYNC_DI_PRODUCTS);
-        basicExportStatusRequest.setStatus(0);
-        basicExportStatusRequest.setType(BasicProcessStatus.NEW_ALL_UDIS);
+        basicExportStatusRequest.setStatus(BasicExportStatusEnum.WAIT_BUILT.getCode());
+        basicExportStatusRequest.setType(BasicExportTypeEnum.COUNTRY_DI_DATA.getRemark());
         basicExportStatusRequest.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL);
         BaseResponse<List<BasicExportStatusEntity>> basicStatuss = spGetHttp.getBasicStatus(basicExportStatusRequest);
         if (CollUtil.isNotEmpty(basicStatuss.getData())) {
@@ -366,14 +365,14 @@ public class DlAllDataService {
                                 myEntity.setStatus(0);
                                 myEntity.setIdDatas(ConstantStatus.SYNC_DI_PRODUCTS);
                                 myEntity.setUpdateTime(new Date());
-                                myEntity.setType(BasicProcessStatus.NEW_ALL_UDIS);
+                                myEntity.setType(BasicExportTypeEnum.COUNTRY_DI_DATA.getRemark());
                                 myEntity.setStartTime(DateUtil.getDateTime());
                                 myEntity.setRemark("国家库DI信息：" + spSyncUdiResponse.getProductInfoEntityList().size() + " 条");
                                 basicExportService.insertExportStatus(myEntity);
                                 if (downstream.getParamValue().equals("1")) {
 //                                    String datas = JSON.toJSON(spSyncUdiResponse).toString();
 //                                    redisUtil.set(key, datas);
-                                    String fileName = filePath + "upload/" + BasicProcessStatus.NEW_ALL_UDIS + "-" + key + ".udi";
+                                    String fileName = filePath + "upload/" + BasicExportTypeEnum.COUNTRY_DI_DATA.getRemark() + "-" + key + ".udi";
                                     String datas = JSON.toJSON(spSyncUdiResponse).toString();
                                     FileUtils.SaveFileAs(datas, fileName);
 

api-admin/src/main/java/com/glxp/sale/admin/thread/HeartTask.java

@@ -126,9 +126,9 @@ public class HeartTask implements SchedulingConfigurer {
 
     private void dlAllData() {
 
-        logger.info("定时从上游下载全部据-----");
+
         SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("sc_udiinfo_status");
-        long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
+        long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 6 * 1000;
         long curTime = System.currentTimeMillis();
         Long lastTime = (Long) redisUtil.get("SC_UDIINFO_DOWNLOAD_STATUS");
         if (lastTime == null) {
@@ -140,6 +140,7 @@ public class HeartTask implements SchedulingConfigurer {
             redisUtil.set("SC_UDIINFO_DOWNLOAD_STATUS", lastTime);
         }
         if (curTime - lastTime > timeInterval) {
+            logger.info("定时从上游下载全部据-----");
             redisUtil.set("SC_UDIINFO_DOWNLOAD_STATUS", curTime);
             String doing = (String) redisUtil.get("is_doing_download");
             if (doing == null || doing.equals("false")) {
@@ -155,8 +156,9 @@ public class HeartTask implements SchedulingConfigurer {
                 dlAllDataService.dlAllDi();
                 redisUtil.set("is_doing_download", "false");
             }
+            logger.info("定时从上游下载全部据-----结束");
         }
-        logger.info("定时从上游下载全部据-----结束");
+
     }
 
 }