From 98c6376623ba78048dd39f3883a05eb508303177 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Wed, 10 Apr 2024 12:12:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E6=97=A0=E9=87=8F=E4=BA=91=E8=8E=B7=E5=8F=96=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=A0=B8=E6=97=B6=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jyjz/xiaoyao/ocr/api/PrevailCloudApi.java |  6 ++++
 .../ocr/api/impl/PrevailCloudApiImpl.java     | 31 +++++++++++++++++++
 .../ocr/controller/ApiTestController.java     | 13 ++++++++
 .../mapper/oa/OcrTaskchildPictureMapper.xml   |  2 +-
 4 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/PrevailCloudApi.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/PrevailCloudApi.java
index af7f7356..9cc9d390 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/PrevailCloudApi.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/PrevailCloudApi.java
@@ -21,4 +21,10 @@ public interface PrevailCloudApi {
     ApiPage<PictureSourceResult> pullPictureSource(PictureSourceParameter pictureSourceParameter) throws Exception;
 
     void sendFlowTaskResult(String tenantId,String data) throws Exception;
+
+    /**
+     * 根据租户id 拉取对应业务主体信息
+     * @param tenantNo
+     */
+    void pullAccountInfo(long tenantNo) throws Exception;
 }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java
index 295280a5..f9412587 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java
@@ -135,4 +135,35 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
         System.out.println(responseJsonStr);
     }
 
+    @Override
+    public void pullAccountInfo(long tenantNo) throws Exception {
+        Map<String, Object> queryParam = new HashMap<>();
+        queryParam.put("tenantNo",tenantNo);
+        String json = JSONObject.toJSONString(queryParam);
+        RequestData requestData = ApiHelper.buildRequest(tenantNo+"", apiConfig.getAccessKey(), apiConfig.getAccessCode(),json);
+        String url = apiConfig.getInterfaceDomain()+tenantSourceUrl;
+        String requestBodyJson = JSONObject.toJSONString(requestData);
+        //入参
+        HttpParamers httpParamers = new HttpParamers(HttpMethod.POST);
+        httpParamers.setJsonParamer(requestBodyJson);
+        //发起请求
+        String responseJsonStr = HttpClient.doPost(url,httpParamers,null,apiConfig.getConnectTimeout(),apiConfig.getReadTimeout());
+        System.out.println(responseJsonStr);
+        ResultData<String> resultData =JSONUtil.toBean(responseJsonStr,ResultData.class);
+        if(resultData.getStatus()==100){;
+            //解析基础数据
+            String data = ApiHelper.decryptResponse(apiConfig.getAccessCode(), resultData);
+            ApiPage<String> apiPage = JSONUtil.toBean(data,ApiPage.class);
+            System.out.println(apiPage);
+            //解析数据结果为List
+//            List<PictureSourceResult> listResult = JSONUtil.toList(JSONObject.toJSONString(apiPage.getRecords()),PictureSourceResult.class);
+//            ApiPage<PictureSourceResult> resultApiPage = new ApiPage<>();
+//            resultApiPage.setPageNo(apiPage.getPageNo());
+//            resultApiPage.setPageSize(apiPage.getPageSize());
+//            resultApiPage.setTotal(apiPage.getTotal());
+//            resultApiPage.setRecords(listResult);
+//            return resultApiPage;
+        }
+    }
+
 }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java
index 5e6dec72..7b072f83 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java
@@ -76,6 +76,19 @@ public class ApiTestController {
     }
 
 
+    @GetMapping("pullAccountInfo")
+    public String pullAccountInfo(HttpServletRequest request){
+
+        try {
+           prevailCloudApi.pullAccountInfo(1714548920583360512L);
+           return "ok";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "处理失败";
+    }
+
+
     @GetMapping("psTest01")
     public String psTset01(HttpServletRequest request){
         String beginStr = request.getParameter("beginStr");
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
index 78a36e69..c0eac22f 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
@@ -513,7 +513,7 @@
                     ${iztaskrrom.likeend}
                 </if>
                 <if test="izproject != null">
-                    ${izproject.rulesOp} tcp.FROMPROJECTID ${izproject.dataOp} ${izproject.likestar}
+                    ${izproject.rulesOp} tcp.FROMPROJECTNAME ${izproject.dataOp} ${izproject.likestar}
                     <!--				#{fromuserid.value}-->
                     <if test="izproject.value instanceof java.util.List">
                         <foreach item="item" collection="izproject.value" open="" separator="," close="">