From bc22a1fce8b936f61e1f799689ee5795fc2508b0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 17 一月 2024 15:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/third/SignService.java | 68 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 12 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 675bc7d..bba9890 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
@@ -91,7 +91,6 @@
* 1.ping鏈嶅姟
*/
public boolean ping(){
- initParams();
try {
Map<String, Object> params=bodyParams;
String url=SERVICE_URL+"/v2/ping";
@@ -120,7 +119,6 @@
*/
public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,File businessimg,String notifyUrl){
try {
- initParams();
Map<String, Object> params=bodyParams;
String url=SERVICE_URL+"/v2/user/organizationCreate";
params.put("name",fullname);
@@ -157,7 +155,6 @@
*/
public boolean organizationReApply(String fullname,String creditCode,String legalName,String email,File businessimg,String notifyUrl){
try {
- initParams();
Map<String, Object> params=bodyParams;
String url=SERVICE_URL+"/v2/user/organizationReapply";
params.put("name",fullname);
@@ -190,7 +187,6 @@
*/
public int organizationAuditStatus (String email){
try {
- initParams();
Map<String, Object> params=bodyParams;
String url=SERVICE_URL+"/v2/user/organizationAuditStatus";
params.put("emailOrMobile",email);
@@ -216,16 +212,15 @@
* @param email
* @param postionJson
*/
- public String applySign(String name,File file,String fullname,String creditCoe,String email,String postionJson){
+ public String applySign(String name,File file,String fullname,String creditCoe,String email,String postionJson,String singId){
try {
String url=SERVICE_URL+"/v2/sign/applySign";
- initParams();
Map<String, Object> params=bodyParams;
params.put("contractName",name); //鍚堝悓鍚嶇О
params.put("serverCa",1); //浣跨敤浜戣瘉涔�
params.put("file",file);
params.put("dealType",5); //鎸囧畾鍚堝悓鏂囦欢绛剧讲鏂瑰紡 5 涓洪儴鍒嗚嚜鍔ㄧ
- params.put("positionType",0); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
+ params.put("positionType",1); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
params.put("fileType",0);
params.put("needQifengSign",1);
JSONArray signatories=new JSONArray();
@@ -235,7 +230,9 @@
sReq.setIdentityCard(creditCoe);//钀ヤ笟鎵х収鍙�
sReq.setEmail(email); //鍦ㄥ悰瀛愮娉ㄥ唽璁よ瘉鐨勯偖绠�
// sReq.setChapteJson("[{\"page\":0,\"chaptes\":[{\"offsetX\":0.12,\"offsetY\":0.23}]},{\"page\":1,\"chaptes\":[{\"offsetX\":0.45,\"offsetY\":0.67}]}]");
- sReq.setChapteJson(postionJson);
+// sReq.setChapteJson(postionJson);
+ sReq.setSearchKey(postionJson);
+ sReq.setSignId(singId);
sReq.setNoNeedVerify(1);
signatories.add(sReq);
params.put("signatories",signatories.toJSONString());
@@ -256,14 +253,13 @@
/**
- * 鑾峰彇绛剧讲閾炬帴鍦板潃
+ * 鑾峰彇绛剧讲閾炬帴鍦板潃锛堢缃查〉闈㈠湴鍧�锛�
* @param applyNo
* @param name
* @param creditCode
*/
public String signLink(String applyNo,String name,String creditCode) {
try {
- initParams();
Map<String, Object> params = bodyParams;
String url = SERVICE_URL + "/v2/sign/link";
params.put("applyNo",applyNo); //鍙戣捣鍚堝悓绛剧讲鎺ュ彛杩斿洖鐨凙PL缂栧彿
@@ -283,13 +279,12 @@
return null;
}
/**
- * 鑾峰彇绛剧讲閾炬帴鍦板潃
+ * 鑾峰彇绛剧讲閾炬帴鍦板潃(杩斿洖鏂囦欢鍦板潃锛岀缃插悗鎵嶆槸鏂囦欢鍦板潃锛屽惁鍒欒烦杞埌绛剧讲椤甸潰)
* @param applyNo
*/
public String linkFile(String applyNo) {
try {
- initParams();
Map<String, Object> params = bodyParams;
String url = SERVICE_URL + "/v2/sign/linkFile";
//鏋勫缓璇锋眰鍙傛暟
@@ -306,5 +301,54 @@
}
return null;
}
+ /**
+ * 涓婁紶浼佷笟鑷畾涔夊嵃绔�(杩斿洖鍗扮珷ID)
+ * @param signName
+ * @param signImgFile
+ */
+ public String uploadEntSign(String signName,File signImgFile,String email ) {
+
+ try {
+ Map<String, Object> params = bodyParams;
+ String url = SERVICE_URL + "/v2/user/uploadEntSign";
+ //鏋勫缓璇锋眰鍙傛暟
+ params.put("signName",signName);
+ params.put("signImgFile",signImgFile);
+ params.put("email",email);
+ String str= HttpClientUtils.init().getPost(url,null,params,true);
+ System.out.println(str);
+ saveInterfaceLog(url,"銆愮數瀛愮銆戜笂浼犱紒涓氳嚜瀹氫箟鍗扮珷",JSONObject.toJSONString(params),str);
+ JSONObject json = JSONObject.parseObject(str);
+ if(json!=null && json.getBoolean("success")){
+ return json.getString("data");
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return null;
+ }
+ /**
+ * 鍒犻櫎浼佷笟鑷畾涔夊嵃绔�
+ * @param signId
+ */
+ public boolean deleteEntSign(String signId ) {
+
+ try {
+ Map<String, Object> params = bodyParams;
+ String url = SERVICE_URL + "/v2/user/deleteEntSign";
+ //鏋勫缓璇锋眰鍙傛暟
+ params.put("signId",signId);
+ String str= HttpClientUtils.init().getPost(url,null,params,true);
+ System.out.println(str);
+ saveInterfaceLog(url,"銆愮數瀛愮銆戝垹闄や紒涓氳嚜瀹氫箟鍗扮珷",JSONObject.toJSONString(params),str);
+ JSONObject json = JSONObject.parseObject(str);
+ if(json!=null && json.getBoolean("success")){
+ return json.getBoolean("success");
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return false;
+ }
}
--
Gitblit v1.9.3