文件下载调整

src/main/java/com/glxp/api/idc/service/IdcService.java

@@ -38,5 +38,5 @@ public interface IdcService {
     void downloadFile(String fileName,HttpServletResponse response) ;
     
     BaseResponse onceSync(String tableName,boolean isUpload);
-    boolean signleDownloadFile(String syncIp, String fileName);
+    boolean signleDownloadFile(String syncIp, String fileFullName);
 }

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

@@ -1163,17 +1163,76 @@ public class IdcServiceImpl implements IdcService {
         return success;
     }
 
+//    @Override
+//    public boolean signleDownloadFile(String syncIp, String fileName) {
+//        String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/";
+//        if(!FileUtils.makeDirectory(filePath + filePathSlash + imagePath))
+//            IDCUtils.createDirectory(filePath + filePathSlash + imagePath);
+//        OkHttpClient client = new OkHttpClient().newBuilder()
+//                .build();
+//        ;
+//        MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded");
+//
+//        RequestBody body = RequestBody.create(mediaType, "fileName=" + fileName);
+//
+//        Request request = new Request.Builder()
+//                .url(syncIp + "/spssync/common/downloadFile")
+//                .post(body)
+//                .addHeader("Content-Type", "application/x-www-form-urlencoded")
+//                .build();
+//        int total=0;
+//        try {
+//            Response result = client.newCall(request).execute();
+//            String msg = result!=null ? result.message().length()>200 ? result.message().substring(0,200) : result.message() : "";
+//
+//            if (result!=null&&result.isSuccessful()&&MediaType.parse("application/force-download").equals(result.body().contentType())) {
+//                try (InputStream inputStream = result.body().byteStream()) {
+//
+//
+//
+//                        FileOutputStream outputStream = new FileOutputStream(filePath + filePathSlash + imagePath+fileName);
+//
+//                        byte b[] = new byte[1024];
+//
+//                        int len = 0;
+//                        while ((len = inputStream.read(b)) != -1) {
+//                            total += len;
+//                            outputStream.write(b, 0, len);
+//
+//                        }
+//
+//                        outputStream.flush();
+//                        outputStream.close();
+//                        if(!(total>0)) {
+//                            new File(filePath + filePathSlash + imagePath+fileName).delete();
+//                            executeSql("delete from idc_file where filePath='"+fileName+"'");
+//                        }
+//
+//                } catch (Exception e) {
+//
+//
+//                }
+//            }
+//            if(!(total>0)) {
+//                String sql = "replace idc_file (filePath,createTime,msg) values ('"+fileName+"',now(),'"+msg+"')";
+//                executeSql(sql);
+//            }
+//
+//        } catch (IOException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//
+//        return (total>0);
+//    }
 @Override
-    public boolean signleDownloadFile(String syncIp, String fileName) {
+public boolean signleDownloadFile(String syncIp, String fileFullName) {
-        String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/";
-        if(!FileUtils.makeDirectory(filePath + filePathSlash + imagePath))
-            IDCUtils.createDirectory(filePath + filePathSlash + imagePath);
     OkHttpClient client = new OkHttpClient().newBuilder()
             .build();
     ;
     MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded");
 
-        RequestBody body = RequestBody.create(mediaType, "fileName=" + fileName);
+    RequestBody body = RequestBody.create(mediaType, "fileName=" + fileFullName);
 
     Request request = new Request.Builder()
             .url(syncIp + "/spssync/common/downloadFile")
@@ -1188,9 +1247,12 @@ public class IdcServiceImpl implements IdcService {
         if (result!=null&&result.isSuccessful()&&MediaType.parse("application/force-download").equals(result.body().contentType())) {
             try (InputStream inputStream = result.body().byteStream()) {
 
+                String path = fileFullName.substring(0,fileFullName.lastIndexOf("/"));
+                if(!FileUtils.makeDirectory(path))
+                    IDCUtils.createDirectory(path);
 
 
-                        FileOutputStream outputStream = new FileOutputStream(filePath + filePathSlash + imagePath+fileName);
+                FileOutputStream outputStream = new FileOutputStream(fileFullName);
 
                 byte b[] = new byte[1024];
 
@@ -1204,8 +1266,8 @@ public class IdcServiceImpl implements IdcService {
                 outputStream.flush();
                 outputStream.close();
                 if(!(total>0)) {
-                            new File(filePath + filePathSlash + imagePath+fileName).delete();
+                    new File(fileFullName).delete();
-                            executeSql("delete from idc_file where filePath='"+fileName+"'");
+                    executeSql("delete from idc_file where filePath='"+fileFullName+"'");
                 }
 
             } catch (Exception e) {
@@ -1214,7 +1276,7 @@ public class IdcServiceImpl implements IdcService {
             }
         }
         if(!(total>0)) {
-                String sql = "replace idc_file (filePath,createTime,msg) values ('"+fileName+"',now(),'"+msg+"')";
+            String sql = "replace idc_file (filePath,createTime,msg) values ('"+fileFullName+"',now(),'"+msg+"')";
             executeSql(sql);
         }
 
@@ -1222,7 +1284,6 @@ public class IdcServiceImpl implements IdcService {
         // TODO Auto-generated catch block
         e.printStackTrace();
     }
-
     return (total>0);
 }