From 1bfec53e4e3a196a3ca53e06e9bec88139cbb689 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 24 一月 2024 18:06:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 7 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 d80f3b3..2c7f422 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
@@ -7,7 +7,11 @@
import org.apache.commons.lang3.StringUtils;
import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.math.BigDecimal;
+import java.net.URL;
import java.net.URLDecoder;
import java.util.*;
import java.util.Date;
@@ -72,6 +76,7 @@
public static final String TAXES_FILE = "TAXES_FILE";
public static final String APPLY_FILE ="APPLY_FILE" ;
public static final String SETTLE_FILE ="SETTLE_FILE" ;
+ public static final String SIGN_DONE_NOTIFY_URL = "SIGN_DONE_NOTIFY_URL";
/**
* 浼佷笟鏁版嵁鏉ユ簮 0骞冲彴娉ㄥ唽 1鍚庡彴瀵煎叆
@@ -844,8 +849,9 @@
public enum SettleClaimsStatus {
WAIT_ACCEPTANCE(0, "寰呭彈鐞�"),
RETURN_ACCEPTANCE(1, "閫�鍥炲彈鐞�"),
- CONFIRM_INFORMATION(2, "纭璧勬枡"),
- FINISH_ACCEPTANCE(3, "瀹屾垚鍙楃悊"),
+ DEAL_ING(2, "鍙楃悊涓�"),
+ CONFIRM_INFORMATION(3, "纭璧勬枡"),
+ FINISH_ACCEPTANCE(4, "瀹屾垚鍙楃悊"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -888,15 +894,15 @@
public enum SettleClaimsLogType {
UPLOAD(0, "鎻愪氦鎶ユ","鎻愪氦鎰忚锛�${param}"),
PLATFORM_RETURN(1, "骞冲彴閫�鍥�","鎻愪氦鎰忚锛�${param}"),
- CONFIRM_INFORMATION(2, "骞冲彴纭璧勬枡","鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_CONFIRM_INFORMATION(2, "骞冲彴纭璧勬枡",""),
PLATFORM_FINISH(3, "骞冲彴瀹屾垚鍙楃悊","鎻愪氦鎰忚锛�${param}"),
UPDATE_DATA(4, "淇敼淇℃伅","鎻愪氦鎰忚锛�${param}"),
SUPPLEMENT(5, "琛ュ厖璇存槑","鎻愪氦鎰忚锛�${param}"),
- COMPANY_APPLY_RETURN(6, "骞冲彴鐞嗚禂澶勭悊","鎻愪氦鎰忚锛�${param}"),
- COMPANY_APPLY_CLOSE(7, "骞冲彴澶囨敞鏍囩",""),
- PLATFORM_AGREE_BACK(8, "骞冲彴娣诲姞鎶ユ鍙�",""),
+ PLATFORM_LP_DEAL(6, "骞冲彴鐞嗚禂澶勭悊","鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_REMARK(7, "骞冲彴澶囨敞鏍囩",""),
+ PLATFORM_ADDCODE(8, "骞冲彴娣诲姞鎶ユ鍙�",""),
PLATFORM_UN_AGREE_BACK(9, "浼佷笟涓嬭浇璧勬枡",""),
- COMPANY_EDIT(10, "骞冲彴涓嬭浇璧勬枡",""),
+ PLATFORM_DOWNLOAD(10, "骞冲彴涓嬭浇璧勬枡",""),
PLATFORM_CHECK_PASS(11, "骞冲彴涓婁紶璧勬枡",""),
;
// 鎴愬憳鍙橀噺
@@ -1208,4 +1214,43 @@
this.des = des;
}
}
+
+ public static File getFileByNetFile(String url,String fileName) {
+ //瀵规湰鍦版枃浠跺懡鍚�
+ File file = null;
+ try {
+ URL urlfile;
+ InputStream inStream = null;
+ OutputStream os = null;
+ try {
+ file = File.createTempFile("", fileName);
+ //涓嬭浇
+ urlfile = new URL(url);
+ inStream = urlfile.openStream();
+ os = new FileOutputStream(file);
+ int bytesRead = 0;
+ byte[] buffer = new byte[8192];
+ while ((bytesRead = inStream.read(buffer, 0, 8192)) != -1) {
+ os.write(buffer, 0, bytesRead);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ if (null != os) {
+ os.close();
+ }
+ if (null != inStream) {
+ inStream.close();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }catch (Exception e){
+
+ }
+
+ return file;
+ }
}
--
Gitblit v1.9.3