From 5364bdbb33dafcf616693ca8d73f07155cdcacf3 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 14 十月 2022 14:06:24 +0800
Subject: [PATCH] #feat 修改
---
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
index e961726..2d9ddf1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
@@ -251,6 +251,13 @@
WriteSheet writeSheet = EasyExcel.writerSheet( "导出").build();
excelWriter.write(excelVOS, writeSheet);
excelWriter.finish();
+
+ FileUtil.compressToZip(sourceFile,zipFile,"防疫登记信息.zip");
+ String currentDateString = String.valueOf(System.currentTimeMillis());
+ String zipName = "防疫登记信息_"+ currentDateString+".zip";
+ inputStream=new FileInputStream(zipFile+"防疫登记信息.zip");
+ sftp.uploadMore(ftpUrl, zipName , inputStream);
+ sftp.logout();
} finally {
// 千万别忘记finish 会帮忙关闭流
if (inputStream != null) {
@@ -261,14 +268,8 @@
}
}
}
- FileUtil.compressToZip(sourceFile,zipFile,"防疫登记信息.zip");
- String currentDateString = String.valueOf(System.currentTimeMillis());
- String zipName = "防疫登记信息_"+ currentDateString+".zip";
- InputStream input=new FileInputStream(zipFile+"防疫登记信息.zip");
- sftp.uploadMore(ftpUrl, zipName , input);
- sftp.logout();
- input.close();
- return R.ok(excelUrl + zipName);
+
+ return R.ok(excelUrl + name);
} catch (Exception e) {
e.printStackTrace();
log.error("文件传输失败【{}】", e.getMessage());
@@ -360,6 +361,13 @@
WriteSheet writeSheet = EasyExcel.writerSheet( "导出").build();
excelWriter.write(excelVOS, writeSheet);
excelWriter.finish();
+
+ FileUtil.compressToZip(sourceFile,zipFile,"防疫登记信息.zip");
+ String currentDateString = String.valueOf(System.currentTimeMillis());
+ String zipName = "防疫登记信息_"+ currentDateString+".zip";
+ inputStream=new FileInputStream(zipFile+"防疫登记信息.zip");
+ sftp.uploadMore(ftpUrl, zipName , inputStream);
+ sftp.logout();
} finally {
// 千万别忘记finish 会帮忙关闭流
if (inputStream != null) {
@@ -370,14 +378,8 @@
}
}
}
- FileUtil.compressToZip(sourceFile,zipFile,"防疫登记信息.zip");
- String currentDateString = String.valueOf(System.currentTimeMillis());
- String zipName = "防疫登记信息_"+ currentDateString+".zip";
- InputStream input=new FileInputStream(zipFile+"防疫登记信息.zip");
- sftp.uploadMore(ftpUrl, zipName , input);
- sftp.logout();
- input.close();
- return R.ok(excelUrl + zipName);
+
+ return R.ok(excelUrl + name);
} catch (Exception e) {
e.printStackTrace();
log.error("文件传输失败【{}】", e.getMessage());
--
Gitblit v1.7.1