From 3414e42ae766b0457a03fb97995abf07e2d074c2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 18 一月 2024 10:38:46 +0800
Subject: [PATCH] 调整
---
server/service/src/main/java/com/doumee/service/business/third/SignService.java | 65 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 10 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/third/SignService.java b/server/service/src/main/java/com/doumee/service/business/third/SignService.java
index bba9890..e89cce8 100644
--- a/server/service/src/main/java/com/doumee/service/business/third/SignService.java
+++ b/server/service/src/main/java/com/doumee/service/business/third/SignService.java
@@ -19,9 +19,15 @@
import javax.annotation.PostConstruct;
import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URL;
import java.util.Date;
import java.util.IdentityHashMap;
import java.util.Map;
+import java.util.UUID;
/**
* <ul>
@@ -113,12 +119,16 @@
* @param creditCode
* @param legalName
* @param email
- * @param businessimg
+ * @param businessimgPath
* @param notifyUrl
* @return
*/
- public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,File businessimg,String notifyUrl){
+ public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,String businessimgPath, String notifyUrl){
try {
+ File businessimg =netFileToLoclFile(businessimgPath);
+ if(businessimg == null || !businessimg.isFile() || !businessimg.exists()){
+ return false;
+ }
Map<String, Object> params=bodyParams;
String url=SERVICE_URL+"/v2/user/organizationCreate";
params.put("name",fullname);
@@ -131,6 +141,7 @@
params.put("legalName",legalName);
params.put("emailOrMobile",email);
String str= HttpClientUtils.init().getPost(url,null,params,true);
+ businessimg.delete();
saveInterfaceLog(url,"銆愮數瀛愮銆戝彂璧蜂紒涓氳璇佺敵璇�",JSONObject.toJSONString(params),str);
JSONObject json = JSONObject.parseObject(str);
if(json!=null && json.getBoolean("success")){
@@ -149,12 +160,16 @@
* @param creditCode
* @param legalName
* @param email
- * @param businessimg
+ * @param businessimgPath
* @param notifyUrl
* @return
*/
- public boolean organizationReApply(String fullname,String creditCode,String legalName,String email,File businessimg,String notifyUrl){
+ public boolean organizationReApply(String fullname,String creditCode,String legalName,String email,String businessimgPath,String notifyUrl){
try {
+ File businessimg = new File(new URI(businessimgPath));
+ if(businessimg == null|| !businessimg.isFile() || !businessimg.exists()){
+ return false ;
+ }
Map<String, Object> params=bodyParams;
String url=SERVICE_URL+"/v2/user/organizationReapply";
params.put("name",fullname);
@@ -167,6 +182,7 @@
params.put("legalName",legalName);
params.put("emailOrMobile",email);
String str= HttpClientUtils.init().getPost(url,null,params,true);
+ businessimg.delete();
saveInterfaceLog(url,"銆愮數瀛愮銆戦噸鏂板彂璧蜂紒涓氳璇佺敵璇�",JSONObject.toJSONString(params),str);
JSONObject json = JSONObject.parseObject(str);
if(json!=null && json.getBoolean("success")){
@@ -180,6 +196,33 @@
}
+ /**
+ * 缃戠粶鏂囦欢杞湰鍦颁复鏃舵枃浠�
+ * @param fileUrl
+ * @return
+ */
+ public static File netFileToLoclFile(String fileUrl) {
+
+ try {
+ URL url = new URL(fileUrl);
+ InputStream inputStream = url.openConnection().getInputStream();
+
+ File file = File.createTempFile( "temp",""+UUID.randomUUID().toString()+fileUrl.substring(fileUrl.lastIndexOf("."))); // 鎸囧畾淇濆瓨鍒版湰鍦扮殑鏂囦欢鍚嶅強璺緞
+ OutputStream outputStream = new FileOutputStream(file);
+ byte[] buffer = new byte[1024];
+ int bytesRead;
+ while ((bytesRead = inputStream.read(buffer)) != -1) {
+ outputStream.write(buffer, 0, bytesRead);
+ }
+
+ outputStream.close();
+ inputStream.close();
+ return file;
+ }catch (Exception e){
+
+ }
+ return null;
+ }
/**
* 鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃壒鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
* @param email
@@ -206,22 +249,23 @@
/**
* 鍙戣捣绛剧害
* @param name
- * @param file
+ * @param fileUrl
* @param fullname
* @param creditCoe
* @param email
* @param postionJson
*/
- public String applySign(String name,File file,String fullname,String creditCoe,String email,String postionJson,String singId){
+ public String applySign(String name,String fileUrl,String fullname,String creditCoe,String email,String postionJson,String singId){
try {
String url=SERVICE_URL+"/v2/sign/applySign";
Map<String, Object> params=bodyParams;
params.put("contractName",name); //鍚堝悓鍚嶇О
params.put("serverCa",1); //浣跨敤浜戣瘉涔�
- params.put("file",file);
+// params.put("file",file);
+ params.put("url",fileUrl);
params.put("dealType",5); //鎸囧畾鍚堝悓鏂囦欢绛剧讲鏂瑰紡 5 涓洪儴鍒嗚嚜鍔ㄧ
params.put("positionType",1); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
- params.put("fileType",0);
+ params.put("fileType",1);
params.put("needQifengSign",1);
JSONArray signatories=new JSONArray();
SignatoryReq sReq=new SignatoryReq();
@@ -304,11 +348,12 @@
/**
* 涓婁紶浼佷笟鑷畾涔夊嵃绔�(杩斿洖鍗扮珷ID)
* @param signName
- * @param signImgFile
+ * @param path
*/
- public String uploadEntSign(String signName,File signImgFile,String email ) {
+ public String uploadEntSign(String signName,String path,String email ) {
try {
+ File signImgFile = new File(new URI(path));
Map<String, Object> params = bodyParams;
String url = SERVICE_URL + "/v2/user/uploadEntSign";
//鏋勫缓璇锋眰鍙傛暟
--
Gitblit v1.9.3