bug修改

src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java

@@ -15,7 +15,7 @@ public enum BasicExportTypeEnum {
     /**
      * 国家库DI数据
      */
-    COUNTRY_DI_DATA("country_di_data", "国家库DI数据"),
+//    COUNTRY_DI_DATA("country_di_data", "国家库DI数据"),
 
     /**
      * 单据类型

src/main/java/com/glxp/api/constant/BasicProcessStatus.java

@@ -28,6 +28,8 @@ public class BasicProcessStatus {
     public static final String NEW_ALL_DATA = "7";       //所有最新数据
     public static final String NEW_ALL_BUS = "8";
     public static final String NEW_ALL_ORDER = "出入库扫码单据";
+
+
     /**
      * 基础数据
      */
@@ -37,7 +39,7 @@ public class BasicProcessStatus {
      */
     public static final String OTHER_DATA = "22";
     public static final String ALL_BUS_ORDER = "业务单据";
-    public static final String NEW_ALL_DI = "10";
+    public static final String NEW_ALL_UDIS = "国家库数据";
     public static final String NEW_ALL_THR_DATA = "12"; //所有第三方基础数据
     public static final String NEW_ALL_THR_PRODUCTS = "13"; //所有第三方产品数据
     public static final String NEW_ALL_SYS_SETTING = "14"; //所有系统设置数据

src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java

@@ -168,8 +168,6 @@ public class FileServiceImpl implements FileService {
         boolean isRelay = false;
         String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/";
         String host = "";
-
-
         try {
             Map<String, Object> config = dbDao.get("select paramValue from system_param_config where paramKey='upper_server_ip'");
             if (config != null && config.get("paramValue") != null) {
@@ -178,10 +176,9 @@ public class FileServiceImpl implements FileService {
             }
 
         } catch (Exception ex) {
-
+            ex.printStackTrace();
         }
         ArrayList<String> saveFiles = new ArrayList<>();
-        Date startTime = new Date();
         if (files != null) {
             if (!FileUtils.makeDirectory(filePath + filePathSlash + imagePath))
                 IDCUtils.createDirectory(filePath + filePathSlash + imagePath);

src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java

@@ -8,7 +8,7 @@ import java.util.List;
 public class BaseSyncResponse {
 
     private String taskId;
-    private List<String> files;
+    private List<String> syncFiles;
     private List<String> uploadFiles;
     private String updateTime;
     private String type;

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -28,6 +28,7 @@ import com.glxp.api.entity.sync.BasicExportStatusTimeEntity;
 import com.glxp.api.entity.system.*;
 import com.glxp.api.entity.thrsys.*;
 import com.glxp.api.http.sync.SpGetHttpClient;
+import com.glxp.api.idc.service.FileService;
 import com.glxp.api.req.sync.SpsSyncDataRequest;
 import com.glxp.api.res.sync.*;
 import com.glxp.api.service.auth.*;
@@ -63,6 +64,7 @@ import java.util.*;
 import java.util.function.Function;
 
 import static com.glxp.api.constant.BasicProcessStatus.NEW_ALL_ORDER;
+import static com.glxp.api.constant.BasicProcessStatus.NEW_ALL_UDIS;
 
 @Slf4j
 @Service
@@ -1042,8 +1044,6 @@ public class HeartService {
         }
 
 
-
-
         return dataResponse;
     }
 
@@ -1085,7 +1085,7 @@ public class HeartService {
             exportStatus.setCacheFilePath(fileFullPath);
         } catch (IOException e) {
             throw new RuntimeException(e);
-        }finally {
+        } finally {
             applicationContext.getBean(this.getClass()).insertExportStatus(exportStatus);
         }
         if (baseResponse.getCode() != 20000) {
@@ -1365,7 +1365,7 @@ public class HeartService {
     //    下载最近更新国家库数据-上级服务
     @Transactional(propagation = Propagation.NESTED)
     public void dlAllDiProducts() {
-        BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(BasicExportTypeEnum.COUNTRY_DI_DATA.getRemark() + "");
+        BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(NEW_ALL_UDIS);
         List<BasicExportStatusEntity> pageSimpleResponse = baseResponse.getData();
         if (pageSimpleResponse != null) {
             List<BasicExportStatusEntity> basicExportStatusEntities = pageSimpleResponse;
@@ -1373,7 +1373,7 @@ public class HeartService {
                 for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) {
                     long curTime = System.currentTimeMillis();
 //                    log.info("--------等待时间------" + curTime);
-                    String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_DI);
+                    String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_UDIS);
 //                    logger.info("--------等待时间1------" + (System.currentTimeMillis() - curTime) / 1000);
                     long curTime2 = System.currentTimeMillis();
                     BaseResponse<SpSyncUdiResponse> response = JSONObject.parseObject(datas, new TypeReference<BaseResponse<SpSyncUdiResponse>>() {
@@ -1387,7 +1387,7 @@ public class HeartService {
                         basicDownloadStatusEntity.setStartTime(new Date());
                         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_DI_PRODUCTS);
                         basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); //下载中
-                        basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_DI);
+                        basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_UDIS);
                         basicDownloadStatusEntity.setScheduleType(1);
 
                         basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity);
@@ -1472,8 +1472,6 @@ public class HeartService {
                 case DOCUMENT_TYPE_DATA:
                     this.insertDocumentTypeData(bean.getFileContent());
                     break;
-                case COUNTRY_DI_DATA:
-                    break;
             }
             String taskId = bean.getTaskId();
             if (StrUtil.isNotBlank(taskId)) {
@@ -1521,6 +1519,8 @@ public class HeartService {
         List<SupManufacturerEntity> supManufacturerList = JSONUtil.toList(jsonObject.getJSONArray(SupManufacturerEntity.class.getSimpleName()), SupManufacturerEntity.class);
         List<SupProductEntity> supProductList = JSONUtil.toList(jsonObject.getJSONArray(SupProductEntity.class.getSimpleName()), SupProductEntity.class);
 
+        List<String> syncFiles = JSONUtil.toList(jsonObject.getJSONArray("syncFiles"), String.class);
+
         if (CollectionUtil.isNotEmpty(hospTypeList)) {
             basicHospTypeDao.insertOrUpdateBatch(hospTypeList);
         }
@@ -1551,8 +1551,14 @@ public class HeartService {
         if (CollectionUtil.isNotEmpty(supProductList)) {
             supProductDao.insertOrUpdateBatch(supProductList);
         }
+        if (CollUtil.isNotEmpty(syncFiles)) {
+            fileService.download(syncFiles);
+
+        }
     }
 
+    @Resource
+    FileService fileService;
 
     private final IoCodeLostMapper ioCodeLostMapper;
     private final IoCodeRelMapper ioCodeRelMapper;