From 281b3b3d0df646328cb58b26572f8205a3271fe9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 16 一月 2024 18:17:46 +0800
Subject: [PATCH] 调整
---
server/service/src/main/java/com/doumee/dao/business/model/Solutions.java | 3 +
server/dianziqian/src/test/java/com/jzq/common/test/JzqHttpApiTest.java | 55 +++++++++++++++++++++++----
server/service/src/main/java/com/doumee/service/business/third/SignService.java | 11 +++--
3 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/server/dianziqian/src/test/java/com/jzq/common/test/JzqHttpApiTest.java b/server/dianziqian/src/test/java/com/jzq/common/test/JzqHttpApiTest.java
index e922d4c..8f997e2 100644
--- a/server/dianziqian/src/test/java/com/jzq/common/test/JzqHttpApiTest.java
+++ b/server/dianziqian/src/test/java/com/jzq/common/test/JzqHttpApiTest.java
@@ -109,15 +109,15 @@
/**
* 鍙戣捣绛剧害 (鍚涘瓙绛惧悗鍙伴厤缃ā鐗圛D鍙戣捣)
*/
- public void testApplySign(){
+ public String testApplySign(){
String url=SERVICE_URL+"/v2/sign/applySign";
initParams();
Map<String, Object> params=bodyParams;
params.put("contractName","娴嬭瘯鍚堝悓鍙戣捣"); //鍚堝悓鍚嶇О
params.put("serverCa",1); //浣跨敤浜戣瘉涔�
- params.put("file",new File("D://test.pdf"));
+ params.put("file",new File("D://test2.pdf"));
params.put("dealType",5); //鎸囧畾鍚堝悓鏂囦欢绛剧讲鏂瑰紡 5 涓洪儴鍒嗚嚜鍔ㄧ
- params.put("positionType",0); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
+ params.put("positionType",2); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
params.put("fileType",0);
params.put("needQifengSign",1);
JSONArray signatories=new JSONArray();
@@ -133,25 +133,32 @@
j.put("page","1");
j.put("page","1");
array.add(j);
- sReq.setChapteJson("[{\"page\":0,\"chaptes\":[{\"offsetX\":0.12,\"offsetY\":0.23}]},{\"page\":1,\"chaptes\":[{\"offsetX\":0.45,\"offsetY\":0.67}]}]");
+ sReq.setSearchKey("鎶曚繚浜虹瀛楋紙鐩栫珷锛夛細;鎶曚繚浜�(绛剧珷)锛�");
+// sReq.setChapteJson("[{\"page\":0,\"chaptes\":[{\"offsetX\":0.12,\"offsetY\":0.23}]},{\"page\":1,\"chaptes\":[{\"offsetX\":0.45,\"offsetY\":0.67}]}]");
sReq.setNoNeedVerify(1);
+ sReq.setSearchConvertExtend("{\"fixX\":10,\"fixY\":-50}");
// sReq.setChapteName("ebq"); //浼佷笟鐩栫珷浣嶇疆
signatories.add(sReq);
params.put("signatories",signatories.toJSONString());
System.out.println(signatories.toJSONString());
String str= HttpClientUtils.init().getPost(url,null,params,true);
System.out.println(str);
+ JSONObject json = JSONObject.parseObject(str);
+ if(json!=null && json.getBoolean("success")){
+ return json.getString("data");
+ }
+ return null;
}
/**
* 鑾峰彇绛剧讲閾炬帴鍦板潃
*/
- public void testlink() {
+ public void testlink(String no) {
initParams();
Map<String, Object> params = bodyParams;
String url = SERVICE_URL + "/v2/sign/link";
- params.put("applyNo","APL1747073129375088640"); //鍙戣捣鍚堝悓绛剧讲鎺ュ彛杩斿洖鐨凙PL缂栧彿
+ params.put("applyNo",no); //鍙戣捣鍚堝悓绛剧讲鎺ュ彛杩斿洖鐨凙PL缂栧彿
params.put("fullName","瀹夊窘璞嗙背绉戞妧鏈夐檺鍏徃"); //鍙戣捣鍚堝悓绛剧讲鎺ュ彛闇�瑕佹墜鍔ㄧ缃插璞＄殑濮撳悕
params.put("identityCard","913401000967388938"); //鍙戣捣鍚堝悓绛剧讲鎺ュ彛涓渶瑕佹墜鍔ㄧ缃插璞＄殑璇佷欢鍙�
params.put("identityType",11); //璇佷欢绫诲瀷锛屼釜浜�1 锛屼紒涓�11
@@ -162,6 +169,33 @@
}
System.out.println(str);
+ }
+
+ /**
+ * 涓婁紶浼佷笟鑷畾涔夊嵃绔�(杩斿洖鍗扮珷ID)
+ * @param signName
+ * @param signImgFile
+ */
+ public String uploadEntSign(String signName,File signImgFile,String email ) {
+
+ try {
+ initParams();
+ 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);
+ JSONObject json = JSONObject.parseObject(str);
+ if(json!=null && json.getBoolean("success")){
+ return json.getString("data");
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return null;
}
/**
* 鑾峰彇绛剧讲閾炬帴鍦板潃
@@ -185,8 +219,11 @@
public static void main(String[] args) {
// new JzqHttpApiTest().testOrganizationCreate();
// new JzqHttpApiTest().testOrganizationAuditStatus();
-// new JzqHttpApiTest().testApplySign();
-// new JzqHttpApiTest().testlink();
- new JzqHttpApiTest().testlinkFile();
+ new JzqHttpApiTest().uploadEntSign("璞嗙背绉戞妧鍏珷鏂�",new File("D://sing.png"),"jp@doumee.com");
+
+ new JzqHttpApiTest().testlink( new JzqHttpApiTest().testApplySign());
+// new JzqHttpApiTest().testlinkFile();
}
+
+
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java b/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
index 4c390bc..2049f54 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
@@ -131,6 +131,9 @@
@ApiModelProperty(value = "鐗堟湰鍙�")
@ExcelColumn(name="鐗堟湰鍙�")
private String version;
+ @ApiModelProperty(value = "绛惧瓧浣嶇疆鍏抽敭瀛楋紝澶氫釜鑻辨枃閫楀彿闅斿紑")
+ @ExcelColumn(name="绛惧瓧浣嶇疆鍏抽敭瀛楋紝澶氫釜鑻辨枃閫楀彿闅斿紑")
+ private String signKeyword;
@ApiModelProperty(value = "璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁", example = "1")
@ExcelColumn(name="璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁")
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 dee2a00..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
@@ -212,7 +212,7 @@
* @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";
Map<String, Object> params=bodyParams;
@@ -220,7 +220,7 @@
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();
@@ -230,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());
@@ -304,7 +306,7 @@
* @param signName
* @param signImgFile
*/
- public String uploadEntSign(String signName,File signImgFile ) {
+ public String uploadEntSign(String signName,File signImgFile,String email ) {
try {
Map<String, Object> params = bodyParams;
@@ -312,6 +314,7 @@
//鏋勫缓璇锋眰鍙傛暟
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);
--
Gitblit v1.9.3