浦江基石，文件分享二开

mjava-luyi/src/main/java/com/malk/luyi/controller/PJJSController.java

@@ -49,10 +49,13 @@ public class PJJSController {
 
 
         String XMLX=data.get("xmLx").toString();
+        String hangye1=data.get("hangye1").toString();//行业1
+        String hangye2=data.get("hangye2").toString();//行业2
+        String zyyw=data.get("zyyw").toString();//主营业务
         if (XMLX.equals("投前项目")){
             FORMID="textField_ltjj7pre";
             UUID="FORM-6EC75348FD8241D989DACA4B272CD8EBXFQK";
-              ZD="associationFormField_lt1jaec6, textField_lt1jaecd, textField_lt1jaecc, selectField_lt1iahs9";
+            ZD="associationFormField_lt1jaec6, textField_lt1jaecd, textField_lt1jaecc, selectField_lt1iahs9, selectField_lt1iahsi, selectField_lt1iahsj, textField_ltr1vksn";
 
         }else if (XMLX.equals("投后项目")){
             FORMID="textField_ltjj7prg";
@@ -66,20 +69,20 @@ public class PJJSController {
             log.info("associations: {}", associations);
             log.info("UUID, {}", UUID);
             log.info("ZD, {}", ZD);
-             String tquid=   ydClient.operateData(YDParam.builder()
-                     .appType("APP_G951QZ32AUJNJUE4G127")
-                     .systemToken("HOA66I8176RID79L6QF3554SPPYH22VTBH1TLX6")
-                        .formUuid(UUID)
-                        .formDataJson(JSON.toJSONString(UtilMap.map(ZD, associations,data.get("xmName"),data.get("xmcLsh") , XMLX )))
-                        .build(), YDConf.FORM_OPERATION.create).toString();////
-                if (tquid!=""){
-                    ydClient.operateData(YDParam.builder()
-                            .appType("APP_G951QZ32AUJNJUE4G127")
-                            .systemToken("HOA66I8176RID79L6QF3554SPPYH22VTBH1TLX6")
-                            .formInstanceId(String.valueOf(data.get("xmcId")))
-                            .updateFormDataJson(JSON.toJSONString(UtilMap.map(FORMID,tquid )))
-                            .build(), YDConf.FORM_OPERATION.update);
-                }
+            String tquid=   ydClient.operateData(YDParam.builder()
+                    .appType("APP_G951QZ32AUJNJUE4G127")
+                    .systemToken("HOA66I8176RID79L6QF3554SPPYH22VTBH1TLX6")
+                    .formUuid(UUID)
+                    .formDataJson(JSON.toJSONString(UtilMap.map(ZD, associations,data.get("xmName"),data.get("xmcLsh") , XMLX,hangye1,hangye2,zyyw )))//这里
+                    .build(), YDConf.FORM_OPERATION.create).toString();////
+            if (tquid!=""){
+                ydClient.operateData(YDParam.builder()
+                        .appType("APP_G951QZ32AUJNJUE4G127")
+                        .systemToken("HOA66I8176RID79L6QF3554SPPYH22VTBH1TLX6")
+                        .formInstanceId(String.valueOf(data.get("xmcId")))
+                        .updateFormDataJson(JSON.toJSONString(UtilMap.map(FORMID,tquid )))
+                        .build(), YDConf.FORM_OPERATION.update);
+            }
 
 
 
@@ -170,10 +173,21 @@ public class PJJSController {
                 .build(), YDConf.FORM_QUERY.retrieve_id).getFormData();
 
         List<Map> list=(List<Map>) JSON.parse(String.valueOf(formdata.get("attachmentField_lt468w10")));
-        String ddapptonken= dd.getAccessToken("dingraobfxqulra4mp9r","KN28UwWycxxCkKkug1x61lsWWAhEaNpQbc8efrgMKyNUXayw-O2sRxDkhh9LTh8y");
-        log.info("ddapptonken, {}",ddapptonken);
-        //return McR.success(ydClient.convertTemporaryUrl(list.get(0).get("url").toString(),"APP_G951QZ32AUJNJUE4G127","HOA66I8176RID79L6QF3554SPPYH22VTBH1TLX6",ddapptonken));
-        return McR.success(list.get(0).get("previewUrl").toString());
+       //String ddapptonken= dd.getAccessToken("dingraobfxqulra4mp9r","KN28UwWycxxCkKkug1x61lsWWAhEaNpQbc8efrgMKyNUXayw-O2sRxDkhh9LTh8y");
+       // log.info("ddapptonken, {}",ddapptonken);
+       // log.info("ddapptonken, {}",list.get(0));
+       // System.out.println("list.get(0):"+list.get(0).toString());
+       // return McR.success(ydClient.convertTemporaryUrl(list.get(0).get("url").toString(),"APP_G951QZ32AUJNJUE4G127","HOA66I8176RID79L6QF3554SPPYH22VTBH1TLX6",ddapptonken));
+        //log.info("url, {}",McR.success(ydClient.convertTemporaryUrl_PJJS(list.get(0).get("url").toString() )));
+      //  System.out.println("URL："+McR.success(ydClient.convertTemporaryUrl_PJJS(list.get(0).get("url").toString() )));
+       return McR.success(ydClient.convertTemporaryUrl_PJJS(list.get(0).get("url").toString() ));
+        //previewUrl
+       // System.out.println("url:"+list.get(0) );
+       // return McR.success(list.get(0).get("previewUrl").toString());
+
+
+
+
     }
 
 

mjava/src/main/java/com/malk/service/aliwork/YDClient.java

@@ -21,7 +21,8 @@ public interface YDClient {
      * w
      * 获取宜搭附件临时免登地址
      */
-    String convertTemporaryUrl(String url, int timeout);
 
     String convertTemporaryUrl(String url);
+
+    String convertTemporaryUrl_PJJS(String url);
 }

mjava/src/main/java/com/malk/service/aliwork/impl/YDClientImpl.java

@@ -24,6 +24,8 @@ public class YDClientImpl implements YDClient {
 
     @Autowired
     private DDClient ddClient;
+    @Autowired
+    private DDClient dd;
 
     // 初始化请求参数
     Map _initBodyParam(YDParam ydParam) {
@@ -132,17 +134,24 @@ public class YDClientImpl implements YDClient {
      * 临时免登地址
      */
     @Override
-    public String convertTemporaryUrl(String url, int timeout) {
+    public String convertTemporaryUrl(String url ) {
         Map param = new HashMap();
         param.put("systemToken", ydConf.getSystemToken());
         param.put("userId", YDConf.PUB_ACCOUNT);
         param.put("fileUrl", url);          // URL在param上时, 需要编码 [UtilHttp已经做了编码] - URLEncoder.encode(url, "UTF-8")
-        param.put("timeout", timeout);      // 默认1分钟, 最大24小时 [毫秒]
+        param.put("timeout", 60000);      // 默认1分钟, 最大24小时 [毫秒]
         return (String) DDR_New.doGet("https://api.dingtalk.com/v1.0/yida/apps/temporaryUrls/" + ydConf.getAppType(), ddClient.initTokenHeader(), param).getResult();
     }
-
     @Override
-    public String convertTemporaryUrl(String url) {
-        return convertTemporaryUrl(url, 60000);
+    public String convertTemporaryUrl_PJJS(String url ) {
+      //  String ddapptonken= dd.getAccessToken("dingraobfxqulra4mp9r","KN28UwWycxxCkKkug1x61lsWWAhEaNpQbc8efrgMKyNUXayw-O2sRxDkhh9LTh8y");
+        Map param = new HashMap();
+        param.put("systemToken", "HOA66I8176RID79L6QF3554SPPYH22VTBH1TLX6");
+        param.put("userId", YDConf.PUB_ACCOUNT);
+        param.put("fileUrl", url);          // URL在param上时, 需要编码 [UtilHttp已经做了编码] - URLEncoder.encode(url, "UTF-8")
+        param.put("timeout", 60000);      // 默认1分钟, 最大24小时 [毫秒]
+        return (String) DDR_New.doGet("https://api.dingtalk.com/v1.0/yida/apps/temporaryUrls/APP_G951QZ32AUJNJUE4G127" , ddClient.initTokenHeader_PJSS(), param).getResult();
     }
+
+
 }

mjava/src/main/java/com/malk/service/dingtalk/DDClient.java

@@ -30,5 +30,7 @@ public interface DDClient {
      * 通过免登码获取用户信息
      */
     Map getUserInfoByCode(String accessToken, String code);
+
+    Map initTokenHeader_PJSS();
 }
 

mjava/src/main/java/com/malk/service/dingtalk/impl/DDImplClient.java

@@ -43,6 +43,22 @@ public class DDImplClient implements DDClient {
         return accessToken;
     }
 
+    public String getAccessToken_PJSS() {
+        //浦江基石
+        String accessToken = UtilToken.get("invalid-token-dingtalk");
+        if (StringUtils.isNotBlank(accessToken)) return accessToken;
+        Map param = new HashMap();
+        param.put("appkey", "dingraobfxqulra4mp9r");
+        param.put("appsecret", "KN28UwWycxxCkKkug1x61lsWWAhEaNpQbc8efrgMKyNUXayw-O2sRxDkhh9LTh8y");
+        DDR r = (DDR) UtilHttp.doGet("https://oapi.dingtalk.com/gettoken", param, DDR.class);
+        log.info("响应token, {}", r.getAccessToken());
+        accessToken = r.getAccessToken();
+        // token失效自动重置: DD重新调用会重置过期时间
+        UtilToken.put("invalid-token-dingtalk", accessToken, r.getExpiresIn() * 1000L);
+        return accessToken;
+    }
+
+
     @Override
     public String getAccessToken(String appKey, String appSecret) {
         Map param = UtilMap.map("appkey, appsecret", appKey, appSecret);
@@ -67,6 +83,10 @@ public class DDImplClient implements DDClient {
         return DDConf.initTokenHeader(getAccessToken());
     }
 
+    public Map initTokenHeader_PJSS() {
+        return DDConf.initTokenHeader(getAccessToken_PJSS());
+    }
+
     /**
      * 获取jsapi_ticket
      *