修改文件下载

api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java

@@ -17,26 +17,36 @@ public interface IdcService {
                          String content, MultipartFile[] files);
 
     BaseResponse receiveJson(HttpServletRequest request, Map<String, Object> params);
+
     BaseResponse uploadFile(HttpServletRequest request,
                             String content, MultipartFile[] files);
+
     BaseResponse send(Map<String, Object> params);
+
     BaseResponse send(String messageType, String tableName, Map<String, Object> params);
 
     BaseResponse taskList(HttpServletRequest request, Map<String, Object> params);
 
     BaseResponse download(HttpServletRequest request, Map<String, Object> params);
+
     BaseResponse uploadStatus(HttpServletRequest request, Map<String, Object> params);
+
     BaseResponse downloadStatus(HttpServletRequest request, Map<String, Object> params);
+
     public void asyncFetchTask();
+
     public void asyncFetchUdiTask();
 
     BaseResponse downlaodSuccess(HttpServletRequest request, Map<String, Object> params);
 
     void asyncUdiTask();
+
     void asyncSpsTask();
 
     void downloadFile(String fileName, HttpServletResponse response);
 
+    boolean batchDownloadFile(String syncIp, String[] files);
+
     BaseResponse onceSync(String tableName, boolean isUpload);
     boolean signleDownloadFile(String syncIp, String fileName);
 }

api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java

@@ -86,6 +86,7 @@ public class IdcServiceImpl implements IdcService {
     private ScheduledDao scheduledDao;
 
     private String imagePath = "register/file/image2/";
+
     /*获取拉取任务列表*/
     @Override
     public BaseResponse taskList(HttpServletRequest request, Map<String, Object> params) {
@@ -1145,7 +1146,7 @@ public class IdcServiceImpl implements IdcService {
     }
 
     /*下载文件*/
-    private boolean batchDownloadFile(String syncIp, String[] files) {
+    public boolean batchDownloadFile(String syncIp, String[] files) {
         boolean success = true;
         for (String fileName : files) {
             if (!StringUtils.isEmpty(fileName)) {
@@ -1188,7 +1189,6 @@ public class IdcServiceImpl implements IdcService {
                 try (InputStream inputStream = result.body().byteStream()) {
 
 
-    
                     FileOutputStream outputStream = new FileOutputStream(filePath + filePathSlash + imagePath + fileName);
 
                     byte b[] = new byte[1024];

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

@@ -2,6 +2,7 @@ package com.glxp.sale.admin.thread;
 
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.glxp.sale.admin.constant.BasicProcessStatus;
 import com.glxp.sale.admin.constant.ConstantStatus;
@@ -11,6 +12,7 @@ import com.glxp.sale.admin.entity.sync.BasicExportStatusEntity;
 import com.glxp.sale.admin.entity.sync.ProductInfoEntity;
 import com.glxp.sale.admin.entity.sync.UdiCompanyEntity;
 import com.glxp.sale.admin.http.SpGetHttp;
+import com.glxp.sale.admin.idc.service.IdcService;
 import com.glxp.sale.admin.req.sync.BasicExportStatusRequest;
 import com.glxp.sale.admin.req.sync.SpsSyncDataRequest;
 import com.glxp.sale.admin.res.sync.*;
@@ -45,7 +47,8 @@ public class DlAllDataService {
     GennerOrderUtils gennerOrderUtils;
     @Value("${file_path}")
     private String filePath;
-
+    @Resource
+    IdcService idcService;
 
     public void dllNewAllData() {
         log.info("下载所有基础信息---");
@@ -178,17 +181,21 @@ public class DlAllDataService {
                             BasicExportStatusEntity myEntity = new BasicExportStatusEntity();
                             myEntity.setId(key);
                             String taskId = syncOrderResponse.getString("taskId");
+                            JSONArray fileJson = syncOrderResponse.getJSONArray("files");
+                            List<String> syncFiles = fileJson.toJavaList(String.class);
+                            if (CollUtil.isNotEmpty(syncFiles)) {
+                                idcService.batchDownloadFile(spGetHttp.getSpmsUrl(), syncFiles.toArray(new String[syncFiles.size()]));
+                            }
+
                             myEntity.setTaskId(taskId);
                             myEntity.setStatus(0);
                             myEntity.setUpdateTime(new Date());
                             myEntity.setStartTime(DateUtil.getDateTime());
                             myEntity.setIdDatas(ConstantStatus.SYNC_SCAN_ORDER);
                             myEntity.setType(BasicProcessStatus.NEW_ALL_ORDER);
-//                            myEntity.setRemark(syncOrderResponse.toString());
                             basicExportService.insertExportStatus(myEntity);
                             myEntity.setStatus(Constant.SYNC_STATUS_WAIT);
                             if (downstream.getParamValue().equals("1")) {
-//                                redisUtil.set(key, baseResponse.getData());
                                 FileUtils.makeDirectory(filePath + "upload/");
                                 String fileName = filePath + "upload/" + BasicProcessStatus.NEW_ALL_ORDER + "-" + key + ".udi";
                                 FileUtils.SaveFileAs(baseResponse.getData(), fileName);