feat: 无量云数据拉取、相似度列表查询

1.无量云数据拉取增加访问部门、修复项目名称字段放错问题
2.修复相似度列表查询 分页不生效问题

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java

@@ -154,6 +154,10 @@ public class PictureSourceResult {
      */
     Map<String,Object>  productName;
 
+    /**
+     * 拜访部门
+     */
+    String  companyDepartment;
     /**
      * 生产基地
      */

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java

@@ -80,11 +80,14 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
         //加密请求参数
         String tenantNo = pictureSourceParameter.getTenantNo().toString();
         String json = JSONObject.toJSONString(queryParam);
+        System.out.println(json);
         RequestData requestData = ApiHelper.buildRequest(tenantNo, apiConfig.getAccessKey(), apiConfig.getAccessCode(),json);
 
         //组装请求参数
         String url = apiConfig.getInterfaceDomain()+pictureSourceUrl;
         String requestBodyJson = JSONObject.toJSONString(requestData);
+        //入参
+        System.out.println("入参数据:"+requestBodyJson);
         HttpParamers httpParamers = new HttpParamers(HttpMethod.POST);
         httpParamers.setJsonParamer(requestBodyJson);
         //发起请求

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java

@@ -131,7 +131,14 @@ public class OcrTaskchildPictureController extends BaseController {
                                                                                HttpServletResponse response,
                                                                                @PathVariable("packageid") String packageid,
                                                                                @PathVariable("taskchildpictureid") String taskchildpictureid) throws IOException {
-
+        //获取页码、当前页
+        String pageNoStr = request.getParameter("pageNo");
+        String pageSizeStr = request.getParameter("pageSize");
+        if(StringUtils.isEmpty(pageNoStr)|| StringUtils.isEmpty(pageSizeStr)){
+          return ResultVoUtil.error("页码和条数必传！");
+        }
+        paramterPage.setStart(Integer.parseInt(pageNoStr));
+        paramterPage.setPagesize(Integer.parseInt(pageSizeStr));
         //租户主键，由前端页面传送
         String tenantId = request.getHeader("X-Tenant-Id");
         if (StringUtils.isBlank(tenantId)) {
@@ -148,6 +155,8 @@ public class OcrTaskchildPictureController extends BaseController {
         OcrTaskchildPicture ocrtaskchildpicture = new OcrTaskchildPicture();
         QueryWrapper<OcrTaskchildPicture> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery, ocrtaskchildpicture);
 
+        //
+
         //queryWrapper.eq("TENANTID",tenantId);
         //queryWrapper.eq("PACKAGEID",packageid);
 
@@ -156,6 +165,7 @@ public class OcrTaskchildPictureController extends BaseController {
             JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(p));
             jsonObject.put("id", jsonObject.getOrDefault("id", null).toString());
             jsonObject.put("tenantid", jsonObject.getOrDefault("tenantid", null).toString());
+            jsonObject.put("pictureid", jsonObject.getOrDefault("pictureid", null).toString());
             jsonObject.put("packageid", jsonObject.getOrDefault("packageid", null).toString());
             return jsonObject;
         }).collect(Collectors.toList());

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java

@@ -162,6 +162,8 @@ public class PictureDisposeTask implements Runnable{
                         picture.setField9(pictureSourceResult.getProductName().get("name").toString());
                     }
                 }
+                //拜访科室
+                picture.setField7(pictureSourceResult.getCompanyDepartment());
                 //生产基地
                 picture.setField5(pictureSourceResult.getManufacturer());
                 //拜访小结