From a22fa65d1027f8500c0494e97ff2232f70e9ca93 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 十月 2024 19:27:06 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 838ddac..43beff2 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -1,5 +1,6 @@
package com.doumee.core.utils;
+import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdcardUtil;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -9,6 +10,7 @@
import com.doumee.dao.business.vo.CountCyclePriceVO;
import io.swagger.models.auth.In;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.compress.archivers.zip.Zip64Mode;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
import org.apache.commons.lang3.StringUtils;
@@ -724,7 +726,7 @@
// 鏅�氭柟娉�
public static String getName(int index) {
- for (ProjectRecord c : ProjectRecord.values()) {
+ for (MultiFile c : MultiFile.values()) {
if (c.getKey() == index) {
return c.name;
}
@@ -734,7 +736,7 @@
// 鏅�氭柟娉�
public static String getInfo(int index) {
- for (ProjectRecord c : ProjectRecord.values()) {
+ for (MultiFile c : MultiFile.values()) {
if (c.getKey() == index) {
return c.noteinfo;
}
@@ -1025,7 +1027,7 @@
public enum ApplyLogType {
UPLOAD(0, "鎻愪氦鎶曚繚","鎻愪氦鎰忚锛�${param}",0),
- PLATFORM_RETURN(1, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}",0),
+ PLATFORM_RETURN(1, "閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",0),
WAIT_SIGNATURE(2, "涓婁紶鎶曚繚鍗�","鎻愪氦鎰忚锛�${param}",0),
SIGNATURE(3, "浼佷笟绛剧珷","",0),
FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�","鎻愪氦鎰忚锛�${param}",0),
@@ -1037,14 +1039,14 @@
COMPANY_EDIT(10, "淇濆崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}",0),
PLATFORM_CHECK_PASS(11, "鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",0),
- CA_PLATFORM_CHECK_PASS_NO(12, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}",1),
+ CA_PLATFORM_CHECK_PASS_NO(12, "閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",1),
CA_PLATFORM_AGREE_BACK_APPLY(13, "鍚屾剰閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",1),
CA_PLATFORM_APPROVE(14, "鎵瑰崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}",1),
CA_PLATFORM_CHECK_SIGNATURE(15, "浼佷笟绛剧珷","",1),
CA_COMPANY_EDIT(16, "鎵瑰崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}",1),
CA_COMPANY_COMMIT(17, "鎻愪氦鎶曚繚","",1),
CA_COMPANY_BACK_APPLY(18, "鐢宠閫�鍥�","鎻愪氦鎰忚锛�${param}",1),
- CA_COMPANY_CLOSE(19, "鍏抽棴璁㈠崟","",1),
+ CA_COMPANY_CLOSE(19, "鍏抽棴鐢宠","",1),
CA_PALTFORM_REFUSE_APPLY(20, "椹冲洖閫�鍥炵敵璇�","",1),
CA_PALTFORM_EDIT_PIDAN(21, "淇敼鎵瑰崟","淇敼鍘熷洜锛�${param}",1),
CA_JIAJIAN_APPLY_SIGN(23, "鍔犲噺淇濈敵璇蜂紒涓氱绔�","",1),
@@ -2202,7 +2204,13 @@
InputStream inStream = null;
OutputStream os = null;
try {
- String tempDir = System.getProperty("java.io.tmpdir")+fileName;
+ String tempDir = "C:\\hj\\jars\\temp\\";
+ File f = new File(tempDir);
+ if(!f.exists() ){
+ f.mkdirs();
+ }
+ tempDir += fileName;
+ System.out.println(url+"================="+tempDir);
file = new File(tempDir);
//涓嬭浇
urlfile = new URL(url);
@@ -2228,26 +2236,45 @@
}
}
}catch (Exception e){
-
+ e.printStackTrace();
}
return file;
}
- public static void packFilesToZip(List<File> files, ServletOutputStream os) throws IOException {
- try (ZipArchiveOutputStream zipOutputStream = new ZipArchiveOutputStream(os)) {
+ public static void packFilesToZip(List<File> files, OutputStream os) throws IOException {
+ try {
+ ZipArchiveOutputStream zipOutputStream = new ZipArchiveOutputStream(os);
+ zipOutputStream.setUseZip64(Zip64Mode.AsNeeded);
for (File file : files) {
+ if(!file.exists()){
+ System.out.println("===鏂囦欢涓嶅瓨鍦�======="+file.getPath());
+ continue;
+ }else{
+ System.out.println("===鏂囦欢瀛樺湪======="+file.getPath());
+ }
ZipArchiveEntry entry = new ZipArchiveEntry(file.getName());
zipOutputStream.putArchiveEntry(entry);
- try (FileInputStream fileInputStream = new FileInputStream(file)) {
- byte[] buffer = new byte[1024];
- int length;
- while ((length = fileInputStream.read(buffer)) > 0) {
- zipOutputStream.write(buffer, 0, length);
- }
+ FileInputStream fileInputStream = new FileInputStream(file);
+ byte[] buffer = new byte[1024];
+ int length;
+ while ((length = fileInputStream.read(buffer)) > 0) {
+ zipOutputStream.write(buffer, 0, length);
}
zipOutputStream.closeArchiveEntry();
+ zipOutputStream.flush();
+ IoUtil.close(fileInputStream);
file.delete();
}
+ }catch (Exception e){
+ throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR.getCode(),"瀵逛笉璧凤紝涓嬭浇鍘嬬缉鏂囦欢澶辫触");
+ }finally {
+ if (os != null) {
+ try {
+ os.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
}
--
Gitblit v1.9.3