From 5ffd87f283b57e722349ca9e20433a3baaab4004 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Tue, 9 May 2023 11:00:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/admin/idc/service/IdcService.java | 2 +- .../idc/service/impl/IdcServiceImpl.java | 164 +++++++++--------- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java index 9bd8c85..b697bab 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java @@ -48,5 +48,5 @@ public interface IdcService { boolean batchDownloadFile(String syncIp, String[] files); BaseResponse onceSync(String tableName, boolean isUpload); - boolean signleDownloadFile(String syncIp, String fileFullName); + boolean signleDownloadFile(String syncIp, String fileName); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java index 00c300e..267c5f6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java @@ -629,8 +629,8 @@ public class IdcServiceImpl implements IdcService { public void downloadFile(String fileName, HttpServletResponse response) { OutputStream os; String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : fileName.substring(0, 1).equals("/") ? "" : "/"; -// String sourceFileName = filePath + filePathSlash + imagePath + fileName; - String sourceFileName = fileName; + String sourceFileName = filePath + filePathSlash + imagePath + fileName; +// String sourceFileName = fileName; try { if (FileUtils.isFileExist(sourceFileName)) { byte[] bytes = FileUtils.readFileByBytes(sourceFileName); @@ -1163,76 +1163,17 @@ 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()) { -// fileName = fileName.substring(fileName.lastIndexOf('/') + 1); -// -// 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) { -// e.printStackTrace(); -// log.error("", 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 fileFullName) { + 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=" + fileFullName); + RequestBody body = RequestBody.create(mediaType, "fileName=" + fileName); Request request = new Request.Builder() .url(syncIp + "/spssync/common/downloadFile") @@ -1242,17 +1183,13 @@ public class IdcServiceImpl implements IdcService { 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() : ""; + 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())) { + if (result != null && result.isSuccessful() && MediaType.parse("application/force-download").equals(result.body().contentType())) { try (InputStream inputStream = result.body().byteStream()) { + fileName = fileName.substring(fileName.lastIndexOf('/') + 1); - String path = fileFullName.substring(0,fileFullName.lastIndexOf("/")); - if(!FileUtils.makeDirectory(path)) - IDCUtils.createDirectory(path); - - - FileOutputStream outputStream = new FileOutputStream(fileFullName); + FileOutputStream outputStream = new FileOutputStream(filePath + filePathSlash + imagePath + fileName); byte b[] = new byte[1024]; @@ -1265,18 +1202,18 @@ public class IdcServiceImpl implements IdcService { outputStream.flush(); outputStream.close(); - if(!(total>0)) { - new File(fileFullName).delete(); - executeSql("delete from idc_file where filePath='"+fileFullName+"'"); + if (!(total > 0)) { + new File(filePath + filePathSlash + imagePath + fileName).delete(); + executeSql("delete from idc_file where filePath='" + fileName + "'"); } } catch (Exception e) { - - + e.printStackTrace(); + log.error("", e); } } - if(!(total>0)) { - String sql = "replace idc_file (filePath,createTime,msg) values ('"+fileFullName+"',now(),'"+msg+"')"; + if (!(total > 0)) { + String sql = "replace idc_file (filePath,createTime,msg) values ('" + fileName + "',now(),'" + msg + "')"; executeSql(sql); } @@ -1284,9 +1221,72 @@ public class IdcServiceImpl implements IdcService { // TODO Auto-generated catch block e.printStackTrace(); } - return (total>0); + + return (total > 0); } +// @Override +// public boolean signleDownloadFile(String syncIp, String fileFullName) { +// OkHttpClient client = new OkHttpClient().newBuilder() +// .build(); +// ; +// MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded"); +// +// RequestBody body = RequestBody.create(mediaType, "fileName=" + fileFullName); +// +// 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()) { +// +// String path = fileFullName.substring(0,fileFullName.lastIndexOf("/")); +// if(!FileUtils.makeDirectory(path)) +// IDCUtils.createDirectory(path); +// +// +// FileOutputStream outputStream = new FileOutputStream(fileFullName); +// +// 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(fileFullName).delete(); +// executeSql("delete from idc_file where filePath='"+fileFullName+"'"); +// } +// +// } catch (Exception e) { +// +// +// } +// } +// if(!(total>0)) { +// String sql = "replace idc_file (filePath,createTime,msg) values ('"+fileFullName+"',now(),'"+msg+"')"; +// executeSql(sql); +// } +// +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } +// return (total>0); +// } + /*获取转发服务地址，当前值允许单向，只使用参数upper_server_ip*/ private String getNextHost() { SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("upper_server_ip");