项目迁移

src/main/java/com/muzhi/meidiai/service/impl/DingOaServiceImpl.java

@@ -48,6 +48,117 @@ public class DingOaServiceImpl implements DingOaService {
     //获取宜搭审批实例详情（项目预算档案-根据项目负责人id判断）
     @Override
     public List getXiangMuXX(String userid){
+//        System.out.println("连接器传参过来的项目负责人id：" + userid);
+//
+//        //list集合装载最终的集合
+//        List list = new ArrayList();
+//
+//        JSONObject jsonObject = null;
+//
+//        int size = 100;
+//        int page = 1;
+//
+//        do {
+//            try {
+//                com.aliyun.dingtalkyida_1_0.Client client = createClient();
+//                com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders searchFormDatasHeaders = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders();
+//                searchFormDatasHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
+//                com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest searchFormDatasRequest = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest()
+//                        //宜搭应用秘钥
+//                        .setSystemToken("ETA66681XCH5NWT9CNL9V88ZGIB12I8RTWBALZZE")
+//                        //每页查询数量
+//                        .setPageSize(size)
+//                        //当前分页
+//                        .setCurrentPage(page)
+//                        //宜搭表单ID
+//                        .setFormUuid("FORM-CP766081DPN573HYBQCWJADYI6SB232G0RKALL")
+//                        //TODO 系统管理员id
+//                        .setUserId("yida_pub_account")
+//                        //宜搭应用编码
+//                        .setAppType("APP_UTWSE5WCXGWTUOEJ9E1D");
+//
+//                SearchFormDatasResponse searchFormDatasResponse = client.searchFormDatasWithOptions(searchFormDatasRequest, searchFormDatasHeaders, new RuntimeOptions());
+//                System.out.println(JSON.toJSONString(searchFormDatasResponse.getBody()));
+//                String s = JSON.toJSONString(searchFormDatasResponse.getBody());
+//                jsonObject = JSON.parseObject(s);
+//                System.out.println("审批详情接口object对象：" + jsonObject);
+//            } catch (TeaException err) {
+//                if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+//                    // err 中含有 code 和 message 属性，可帮助开发定位问题
+//                }
+//
+//            } catch (Exception _err) {
+//                TeaException err = new TeaException(_err.getMessage(), _err);
+//                if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+//                    // err 中含有 code 和 message 属性，可帮助开发定位问题
+//                }
+//
+//            }
+//
+//            JSONArray data = jsonObject.getJSONArray("data");
+//            for (int i = 0; data.size()>i; i++){
+//
+//                Map map = new HashMap();
+//
+//                JSONObject formData = data.getJSONObject(i).getJSONObject("formData");
+//
+//                String xmbh = formData.getString("textField_lakr1jwy");
+//                System.out.println("项目编号：" + xmbh);
+//
+//                String xmmc = formData.getString("textField_lajb96s9");
+//                System.out.println("项目名称：" + xmmc);
+//
+//                String xmfzrid = formData.getString("textField_lbf3y926");
+//                System.out.println("项目负责人id：" + xmfzrid);
+//
+//                String xmfzrmc = formData.getString("textField_lbf3y925");
+//                System.out.println("项目负责人名称：" + xmfzrmc);
+////
+//                String jsdzt = formData.getString("selectField_lbf3y920");
+//                System.out.println("结算单状态：" + jsdzt);
+//
+////            if (jsdzt.equals("已结算")){
+////                System.out.println("项目已结算，不加载！");
+////            }else {
+//                map.put("xmbh", xmbh + " " + xmmc);
+//                map.put("xmmc", xmmc );
+//                map.put("xmfzrid", xmfzrid);
+//                map.put("xmfzrmc", xmfzrmc);
+//                System.out.println("根据表单发起人id创建的map集合：" + map);
+//                list.add(map);
+////            }
+//
+////            int result = xmfzrid.indexOf(userid);
+////            if (result == -1){//xmfzrid.equals(userid)
+////                System.out.println("项目人员id控件不包含当前人员userid：" + "-1代表不包含" + result);
+////            }else {
+////                map.put("xmbh", xmbh);
+////                map.put("xmmc", xmmc);
+//////                map.put("xmfzrid", xmfzrid);
+//////                map.put("xmfzrmc", xmfzrmc);
+////                System.out.println("根据表单发起人id创建的map集合：" + map);
+////                list.add(map);
+////            }
+//            }
+//
+//            if (data.size() == 100){
+//                page = page + 1;
+//            }
+//
+////            float aa = jsonObject.getFloat("totalCount") / 100;
+////            int bb = jsonObject.getInteger("currentPage");
+////            log.info("aa" + aa + "---bb" + bb);
+//        }while (jsonObject.getFloat("totalCount") / 100 > jsonObject.getInteger("currentPage"));
+//
+//
+//        System.out.println("list集合：" + list);
+//
+//        return list;
+
+
+
+
+        /*通过高级查询条件获取表单实例数据（不包括子表单组件数据）*/
         System.out.println("连接器传参过来的项目负责人id：" + userid);
 
         //list集合装载最终的集合
@@ -59,29 +170,73 @@ public class DingOaServiceImpl implements DingOaService {
         int page = 1;
 
         do {
+//            try {
+//                com.aliyun.dingtalkyida_1_0.Client client = createClient();
+//                com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders searchFormDatasHeaders = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders();
+//                searchFormDatasHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
+//                com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest searchFormDatasRequest = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest()
+//                        //宜搭应用秘钥
+//                        .setSystemToken("ETA66681XCH5NWT9CNL9V88ZGIB12I8RTWBALZZE")
+//                        //每页查询数量
+//                        .setPageSize(size)
+//                        //当前分页
+//                        .setCurrentPage(page)
+//                        //宜搭表单ID
+//                        .setFormUuid("FORM-CP766081DPN573HYBQCWJADYI6SB232G0RKALL")
+//                        //TODO 系统管理员id
+//                        .setUserId("yida_pub_account")
+//                        //宜搭应用编码
+//                        .setAppType("APP_UTWSE5WCXGWTUOEJ9E1D");
+//
+//                SearchFormDatasResponse searchFormDatasResponse = client.searchFormDatasWithOptions(searchFormDatasRequest, searchFormDatasHeaders, new RuntimeOptions());
+//                System.out.println(JSON.toJSONString(searchFormDatasResponse.getBody()));
+//                String s = JSON.toJSONString(searchFormDatasResponse.getBody());
+//                jsonObject = JSON.parseObject(s);
+//                System.out.println("审批详情接口object对象：" + jsonObject);
+//            } catch (TeaException err) {
+//                if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+//                    // err 中含有 code 和 message 属性，可帮助开发定位问题
+//                }
+//
+//            } catch (Exception _err) {
+//                TeaException err = new TeaException(_err.getMessage(), _err);
+//                if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+//                    // err 中含有 code 和 message 属性，可帮助开发定位问题
+//                }
+//
+//            }
+
             try {
                 com.aliyun.dingtalkyida_1_0.Client client = createClient();
-                com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders searchFormDatasHeaders = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders();
-                searchFormDatasHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
-                com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest searchFormDatasRequest = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest()
-                        //宜搭应用秘钥
-                        .setSystemToken("ETA66681XCH5NWT9CNL9V88ZGIB12I8RTWBALZZE")
+                com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldHeaders searchFormDataSecondGenerationNoTableFieldHeaders = new com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldHeaders();
+                searchFormDataSecondGenerationNoTableFieldHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
+                com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldRequest searchFormDataSecondGenerationNoTableFieldRequest = new com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldRequest()
+                        //当前分页
+                        .setPageNumber(page)
                         //每页查询数量
                         .setPageSize(size)
-                        //当前分页
-                        .setCurrentPage(page)
                         //宜搭表单ID
                         .setFormUuid("FORM-CP766081DPN573HYBQCWJADYI6SB232G0RKALL")
+                        //TODO 查询条件内容
+                        .setSearchCondition("[{\n" +
+                                " \"key\": \"selectField_lbf3y920\",\n" +
+                                " \"value\": \"未结算\",\n" +
+                                " \"type\": \"TEXT\",\n" +
+                                " \"operator\": \"eq\",\n" +
+                                " \"componentName\": \"selectField\"\n" +
+                                "}]")
+//                        //宜搭应用编码
+                        .setAppType("APP_UTWSE5WCXGWTUOEJ9E1D")
+                        //宜搭应用秘钥
+                        .setSystemToken("ETA66681XCH5NWT9CNL9V88ZGIB12I8RTWBALZZE")
                         //TODO 系统管理员id
-                        .setUserId("yida_pub_account")
-                        //宜搭应用编码
-                        .setAppType("APP_UTWSE5WCXGWTUOEJ9E1D");
+                        .setUserId("yida_pub_account");
 
-                SearchFormDatasResponse searchFormDatasResponse = client.searchFormDatasWithOptions(searchFormDatasRequest, searchFormDatasHeaders, new RuntimeOptions());
-                System.out.println(JSON.toJSONString(searchFormDatasResponse.getBody()));
-                String s = JSON.toJSONString(searchFormDatasResponse.getBody());
+                SearchFormDataSecondGenerationNoTableFieldResponse searchFormDataSecondGenerationNoTableFieldResponse = client.searchFormDataSecondGenerationNoTableFieldWithOptions(searchFormDataSecondGenerationNoTableFieldRequest, searchFormDataSecondGenerationNoTableFieldHeaders, new RuntimeOptions());
+                System.out.println(JSON.toJSONString(searchFormDataSecondGenerationNoTableFieldResponse.getBody()));
+                String s = JSON.toJSONString(searchFormDataSecondGenerationNoTableFieldResponse.getBody());
                 jsonObject = JSON.parseObject(s);
-                System.out.println("审批详情接口object对象：" + jsonObject);
+                System.out.println("项目预算档案高级条件查询接口object对象：" + jsonObject);
             } catch (TeaException err) {
                 if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
                     // err 中含有 code 和 message 属性，可帮助开发定位问题
@@ -113,46 +268,25 @@ public class DingOaServiceImpl implements DingOaService {
 
                 String xmfzrmc = formData.getString("textField_lbf3y925");
                 System.out.println("项目负责人名称：" + xmfzrmc);
-//
+
                 String jsdzt = formData.getString("selectField_lbf3y920");
                 System.out.println("结算单状态：" + jsdzt);
 
-//            if (jsdzt.equals("已结算")){
-//                System.out.println("项目已结算，不加载！");
-//            }else {
+
                 map.put("xmbh", xmbh);
                 map.put("xmmc", xmmc);
                 map.put("xmfzrid", xmfzrid);
                 map.put("xmfzrmc", xmfzrmc);
                 System.out.println("根据表单发起人id创建的map集合：" + map);
                 list.add(map);
-//            }
-
-//            int result = xmfzrid.indexOf(userid);
-//            if (result == -1){//xmfzrid.equals(userid)
-//                System.out.println("项目人员id控件不包含当前人员userid：" + "-1代表不包含" + result);
-//            }else {
-//                map.put("xmbh", xmbh);
-//                map.put("xmmc", xmmc);
-////                map.put("xmfzrid", xmfzrid);
-////                map.put("xmfzrmc", xmfzrmc);
-//                System.out.println("根据表单发起人id创建的map集合：" + map);
-//                list.add(map);
-//            }
             }
 
             if (data.size() == 100){
                 page = page + 1;
             }
-
-//            float aa = jsonObject.getFloat("totalCount") / 100;
-//            int bb = jsonObject.getInteger("currentPage");
-//            log.info("aa" + aa + "---bb" + bb);
-        }while (jsonObject.getFloat("totalCount") / 100 > jsonObject.getInteger("currentPage"));
-
+        }while (jsonObject.getFloat("totalCount") / 100 > jsonObject.getInteger("pageNumber"));
 
         System.out.println("list集合：" + list);
-
         return list;
     }
 
@@ -161,6 +295,21 @@ public class DingOaServiceImpl implements DingOaService {
     public String getXiangMuID(String xmid){
         System.out.println("连接器传参过来的项目id：" + xmid);
 
+        //封装根据项目id作为查询条件
+        Map mapAll = new HashMap();
+        //查询字段编号
+        mapAll.put("key","textField_lakr1jwy");
+        //查询项目id
+        mapAll.put("value",xmid);
+        //查询字段类型
+        mapAll.put("type","TEXT");
+        //查询匹配方式：like（匹配）、eq（等于）
+        mapAll.put("operator","eq");
+        //查询字段标识
+        mapAll.put("componentName","textField");
+        String mapAllStr = JSON.toJSONString(mapAll);
+        System.out.println("封装修改的字段参数：" + mapAllStr);
+
         //list集合装载最终的集合
         List list = new ArrayList();
 
@@ -169,30 +318,68 @@ public class DingOaServiceImpl implements DingOaService {
         int size = 100;
         int page = 1;
 
-        do {
+//        do {
+//            try {
+//                com.aliyun.dingtalkyida_1_0.Client client = createClient();
+//                com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders searchFormDatasHeaders = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders();
+//                searchFormDatasHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
+//                com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest searchFormDatasRequest = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest()
+//                        //宜搭应用秘钥
+//                        .setSystemToken("ETA66681XCH5NWT9CNL9V88ZGIB12I8RTWBALZZE")
+//                        //每页查询数量
+//                        .setPageSize(size)
+//                        //当前分页
+//                        .setCurrentPage(page)
+//                        //宜搭表单ID
+//                        .setFormUuid("FORM-CP766081DPN573HYBQCWJADYI6SB232G0RKALL")
+//                        //TODO 系统管理员id
+//                        .setUserId("yida_pub_account")
+//                        //宜搭应用编码
+//                        .setAppType("APP_UTWSE5WCXGWTUOEJ9E1D");
+//
+//                SearchFormDatasResponse searchFormDatasResponse = client.searchFormDatasWithOptions(searchFormDatasRequest, searchFormDatasHeaders, new RuntimeOptions());
+//                System.out.println(JSON.toJSONString(searchFormDatasResponse.getBody()));
+//                String s = JSON.toJSONString(searchFormDatasResponse.getBody());
+//                jsonObject = JSON.parseObject(s);
+//                System.out.println("审批详情接口object对象：" + jsonObject);
+//            } catch (TeaException err) {
+//                if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+//                    // err 中含有 code 和 message 属性，可帮助开发定位问题
+//                }
+//
+//            } catch (Exception _err) {
+//                TeaException err = new TeaException(_err.getMessage(), _err);
+//                if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+//                    // err 中含有 code 和 message 属性，可帮助开发定位问题
+//                }
+//
+//            }
+
             try {
                 com.aliyun.dingtalkyida_1_0.Client client = createClient();
-                com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders searchFormDatasHeaders = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders();
-                searchFormDatasHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
-                com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest searchFormDatasRequest = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest()
-                        //宜搭应用秘钥
-                        .setSystemToken("ETA66681XCH5NWT9CNL9V88ZGIB12I8RTWBALZZE")
+                com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldHeaders searchFormDataSecondGenerationNoTableFieldHeaders = new com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldHeaders();
+                searchFormDataSecondGenerationNoTableFieldHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
+                com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldRequest searchFormDataSecondGenerationNoTableFieldRequest = new com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldRequest()
+                        //当前分页
+                        .setPageNumber(page)
                         //每页查询数量
                         .setPageSize(size)
-                        //当前分页
-                        .setCurrentPage(page)
                         //宜搭表单ID
                         .setFormUuid("FORM-CP766081DPN573HYBQCWJADYI6SB232G0RKALL")
+                        //TODO 查询条件内容
+                        .setSearchCondition(mapAllStr)
+//                        //宜搭应用编码
+                        .setAppType("APP_UTWSE5WCXGWTUOEJ9E1D")
+                        //宜搭应用秘钥
+                        .setSystemToken("ETA66681XCH5NWT9CNL9V88ZGIB12I8RTWBALZZE")
                         //TODO 系统管理员id
-                        .setUserId("yida_pub_account")
-                        //宜搭应用编码
-                        .setAppType("APP_UTWSE5WCXGWTUOEJ9E1D");
+                        .setUserId("yida_pub_account");
 
-                SearchFormDatasResponse searchFormDatasResponse = client.searchFormDatasWithOptions(searchFormDatasRequest, searchFormDatasHeaders, new RuntimeOptions());
-                System.out.println(JSON.toJSONString(searchFormDatasResponse.getBody()));
-                String s = JSON.toJSONString(searchFormDatasResponse.getBody());
+                SearchFormDataSecondGenerationNoTableFieldResponse searchFormDataSecondGenerationNoTableFieldResponse = client.searchFormDataSecondGenerationNoTableFieldWithOptions(searchFormDataSecondGenerationNoTableFieldRequest, searchFormDataSecondGenerationNoTableFieldHeaders, new RuntimeOptions());
+                System.out.println(JSON.toJSONString(searchFormDataSecondGenerationNoTableFieldResponse.getBody()));
+                String s = JSON.toJSONString(searchFormDataSecondGenerationNoTableFieldResponse.getBody());
                 jsonObject = JSON.parseObject(s);
-                System.out.println("审批详情接口object对象：" + jsonObject);
+                System.out.println("项目预算档案高级条件查询【项目编号/信息】接口object对象：" + jsonObject);
             } catch (TeaException err) {
                 if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
                     // err 中含有 code 和 message 属性，可帮助开发定位问题
@@ -207,11 +394,11 @@ public class DingOaServiceImpl implements DingOaService {
             }
 
             JSONArray data = jsonObject.getJSONArray("data");
-            for (int i = 0; data.size()>i; i++){
+//            for (int i = 0; data.size()>i; i++){
 
                 Map map = new HashMap();
 
-                JSONObject formData = data.getJSONObject(i).getJSONObject("formData");
+                JSONObject formData = data.getJSONObject(0).getJSONObject("formData");
 
                 String xmbh = formData.getString("textField_lakr1jwy");
                 System.out.println("项目编号：" + xmbh);
@@ -228,7 +415,7 @@ public class DingOaServiceImpl implements DingOaService {
 //            String jsdzt = formData.getString("selectField_lbf3y920");
 //            System.out.println("结算单状态：" + jsdzt);
 
-                if (xmbh.equals(xmid)){
+//                if (xmbh.equals(xmid)){
                     map.put("xmbh", xmbh);
                     map.put("xmmc", xmmc);
                     map.put("xmfzrid", xmfzrid);
@@ -241,13 +428,13 @@ public class DingOaServiceImpl implements DingOaService {
                     }
                     System.out.println("根据表单选择项目列表的项目id创建的map集合：" + map);
                     list.add(map);
-                }
-            }
+//                }
+//            }
 
-            if (data.size() == 100){
-                page = page + 1;
-            }
-        }while (jsonObject.getFloat("totalCount") / 100 > jsonObject.getInteger("currentPage"));
+//            if (data.size() == 100){
+//                page = page + 1;
+//            }
+//        }while (jsonObject.getFloat("totalCount") / 100 > jsonObject.getInteger("pageNumber"));
 
         String s = JSON.toJSONString(list);
         System.out.println("list集合（转字符型）：" + s);