华高

mjava-huagao/src/main/java/com/malk/huagao/service/impl/EqbServiceImpl.java

@@ -65,6 +65,9 @@ public class EqbServiceImpl implements EqbService {
     @Value(value = "${eqb.signatoryPsnId}")
     private String signatoryPsnId;
 
+    @Value(value = "${dingtalk.atUserId}")
+    private String atUserId;
+
 
 
     @Async
@@ -164,6 +167,13 @@ public class EqbServiceImpl implements EqbService {
 
         String fileId = UtilMap.getString(result,"fileId");
 
+        //文档转换pdf需时间
+        try {
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+
         //3、基于文件发起签署
         JSONObject reqBodyObj2 = new JSONObject();
         //设置待签署文件信息
@@ -180,13 +190,19 @@ public class EqbServiceImpl implements EqbService {
 
         //签署方信息
         Map signer = new HashMap();
-        signer.put("signerType",0);//签署方类型，0 - 个人，1 - 企业/机构，2 - 法定代表人，3 - 经办人
-            /*Map orgSignerInfo = new HashMap();
-            orgSignerInfo.put("orgId","a5ec8fb7d8cc4276bd486824df0ec640");
-            signer.put("orgSignerInfo",orgSignerInfo);*/
-        Map psnSignerInfo = new HashMap();
+        signer.put("signerType",1);//签署方类型，0 - 个人，1 - 企业/机构，2 - 法定代表人，3 - 经办人
+
+        Map orgSignerInfo = new HashMap();
+        orgSignerInfo.put("orgId","a5ec8fb7d8cc4276bd486824df0ec640");//华高机构id
+        //企业/机构经办人信息
+        Map transactorInfo = new HashMap();
+        transactorInfo.put("psnId",signatoryPsnId);//陈伟东
+        orgSignerInfo.put("transactorInfo",transactorInfo);
+        signer.put("orgSignerInfo",orgSignerInfo);
+
+        /*Map psnSignerInfo = new HashMap();
         psnSignerInfo.put("psnId",signatoryPsnId);//陈伟东
-        signer.put("psnSignerInfo",psnSignerInfo);
+        signer.put("psnSignerInfo",psnSignerInfo);*/
 
         Map signField = new HashMap();
         signField.put("fileId",fileId);
@@ -211,7 +227,7 @@ public class EqbServiceImpl implements EqbService {
         //4、回写签署地址
         JSONObject reqBodyObj3 = new JSONObject();
         Map operator = new HashMap();
-        operator.put("psnId", "0fd3eb8b0c424b4e827bb3bf1fba62f3");
+        operator.put("psnId", signatoryPsnId);
         reqBodyObj3.put("operator", operator);
         Map result3 = eqbPost("/v3/sign-flow/" + signFlowId + "/sign-url", reqBodyObj3);
 
@@ -220,8 +236,8 @@ public class EqbServiceImpl implements EqbService {
         ydClient.operateData(YDParam.builder()
                 .formInstanceId(formInstId)
                 .content("签署地址："+shortUrl)
-                .userId("344749020127590108")
-                .atUserId("344749020127590108")
+                .userId("yida_pub_account")
+                .atUserId(atUserId)//陈伟东
                 .build(), YDConf.FORM_OPERATION.remarks);
 
 
@@ -582,9 +598,9 @@ public class EqbServiceImpl implements EqbService {
             String mxbz = UtilMap.getString(cgmx.get(i), "textField_mizdd3r0");//备注
 
             if (i == 0){
-                cghtmx.add(getRowMap(false,i+1,wlbm,wlmc,null,ggxh,cgdw,cgsl,hsdj,jshj,jhrqStr,mxbz));
+                cghtmx.add(getRowMap(false,i+1,wlbm,wlmc,null,ggxh,cgsl,cgdw,hsdj,jshj,jhrqStr,mxbz));
             }else {
-                cghtmx.add(getRowMap(true,i+1,wlbm,wlmc,null,ggxh,cgdw,cgsl,hsdj,jshj,jhrqStr,mxbz));
+                cghtmx.add(getRowMap(true,i+1,wlbm,wlmc,null,ggxh,cgsl,cgdw,hsdj,jshj,jhrqStr,mxbz));
             }
         }
         Map component7 = new HashMap();

mjava-huagao/src/main/resources/application-dev.yml

@@ -39,6 +39,7 @@ dingtalk:
   aesKey:
   token:
   operator:
+  atUserId: 15959870735792794 #陈伟东
 
 # aliwork
 aliwork:

mjava-huagao/src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@ server:
   port: 7708
   servlet:
     context-path: /huagao
-  host: https://mes.huagaochina.com:8022
+  host: https://mes.huagaochina.com:7708
 
 enable:
   scheduling: true
@@ -39,6 +39,7 @@ dingtalk:
   aesKey:
   token:
   operator:
+  atUserId: 15959870735792794 #陈伟东
 
 # aliwork
 aliwork:

mjava-huagao/src/main/resources/application-prod2.yml

@@ -3,7 +3,7 @@ server:
   port: 7708
   servlet:
     context-path: /huagao
-    host: https://mes.huagaochina.com:8022
+    host: https://mes.huagaochina.com:7708
 
 enable:
   scheduling: true
@@ -40,6 +40,7 @@ dingtalk:
   aesKey:
   token:
   operator:
+  atUserId: 15959870735792794 #陈伟东
 
 # aliwork
 aliwork:

mjava-huagao/src/test/java/com/malk/huagao/YqbTest.java

@@ -13,7 +13,7 @@ import com.malk.huagao.utils.HTTPHelper;
 import org.apache.commons.codec.binary.Base64;
 import com.alibaba.fastjson.JSONObject;
 
-public class YqbTest {
+public class EqbTest {
 
     public static void main(String[] args) {
         // 应用ID
@@ -38,7 +38,7 @@ public class YqbTest {
         //1.2上传文件流 postman
 
         //步骤2：查看文件上传状态及详情
-//        getFileInfo(appId,appKey,host,"e5f64e2ba6694a8daebcb13249ded314");
+//        getFileInfo(appId,appKey,host,"1c2ede25c6454ad4af8bcba3dd9beb35");
 
         //步骤3：获取制作合同模板页面链接
 //        getDocCreateUrl(appId,appKey,host,"418d535ab69f4c1fbe01931b8b74f82f");
@@ -48,7 +48,7 @@ public class YqbTest {
         //正式环境模板id 采购订单模板： a0827f8946994ebfbed7f44e6b8a6ed8
 
         //步骤4：制作含动态表格控件的HTML模板 访问【获取制作合同模板页面】接口返回的创建文件模板页面链接（docTemplateCreateUrl参数值），并在页面中拖动【动态表格】控件来制作模板，若链接失效，调用【获取编辑合同模板页面】接口
-//        getDocTemplateEditUrl(appId,appKey,host,"6a23f76742d74b858cdc2259a5d5c32f");
+//        getDocTemplateEditUrl(appId,appKey,host,"a0827f8946994ebfbed7f44e6b8a6ed8");
 
 
         //步骤5：获取 HTML 模板中控件ID和控件Key
@@ -62,7 +62,7 @@ public class YqbTest {
 
 
         //基于文件发起签署
-//        createByFile(appId,appKey,host,"28e65af0dd3a4f989da68d14bcd06373");
+        createByFile(appId,appKey,host,"1c2ede25c6454ad4af8bcba3dd9beb35");
 
         //查询签署流程详情
 //        getSignFlowDetail(appId,appKey,host,"62dc01292d684653bae341adb014b4d0");
@@ -75,7 +75,7 @@ public class YqbTest {
 
 //        getOrgUserInfo(appId,appKey,host,"00739a62731c498a8ecf477bf79efc54");
 
-        getOrgMember(appId,appKey,host,"a5ec8fb7d8cc4276bd486824df0ec640");
+//        getOrgMember(appId,appKey,host,"a5ec8fb7d8cc4276bd486824df0ec640");
 
 
         //获取签署地址
@@ -591,13 +591,19 @@ public class YqbTest {
 
             //签署方信息
             Map signer = new HashMap();
-            signer.put("signerType",0);//签署方类型，0 - 个人，1 - 企业/机构，2 - 法定代表人，3 - 经办人
-            /*Map orgSignerInfo = new HashMap();
+            signer.put("signerType",1);//签署方类型，0 - 个人，1 - 企业/机构，2 - 法定代表人，3 - 经办人
+
+            Map orgSignerInfo = new HashMap();
             orgSignerInfo.put("orgId","a5ec8fb7d8cc4276bd486824df0ec640");
-            signer.put("orgSignerInfo",orgSignerInfo);*/
-            Map psnSignerInfo = new HashMap();
+            //企业/机构经办人信息
+            Map transactorInfo = new HashMap();
+            transactorInfo.put("psnId","0fd3eb8b0c424b4e827bb3bf1fba62f3");//wzy
+            orgSignerInfo.put("transactorInfo",transactorInfo);
+            signer.put("orgSignerInfo",orgSignerInfo);
+
+            /*Map psnSignerInfo = new HashMap();
             psnSignerInfo.put("psnId","0fd3eb8b0c424b4e827bb3bf1fba62f3");//wzy
-            signer.put("psnSignerInfo",psnSignerInfo);
+            signer.put("psnSignerInfo",psnSignerInfo);*/
 
             Map signField = new HashMap();
             signField.put("fileId",fileId);