优化上一页下一页

RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java

@@ -661,6 +661,30 @@ public class OutInterfaceService {
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
     }
 
+    public String getConPantentsCount(PatentVO patentVO, int type) throws IOException {
+        LambdaQueryWrapper<ImportTask> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ImportTask::getReportId, patentVO.getReportId());
+        List<ImportTask> importTasks = importTaskService.list(queryWrapper);
+        List<Integer> taskIds = importTasks.stream().map(ImportTask::getId).collect(Collectors.toList());
+        Report report = reportService.getById(patentVO.getReportId());
+        if (type == 0) {
+            patentVO.setProjectId(report.getProjectId());
+            patentVO.setImportTaskId(taskIds);
+
+        }
+        String param = new Gson().toJson(patentVO);
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
+                .build();
+        Request request = new Request.Builder()
+                .url(PASUrl + "/api/v2/system/getConPantentsCount")
+                .post(requestBody)
+                .build();
+        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+    }
     /**
      * 调用分析系统根据任务id查询任务接口
      *

RMS/src/main/java/cn/cslg/report/service/business/AssoTaskPersonelService.java

@@ -94,11 +94,11 @@ public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper,
             patentNumber = reportFieldService.getPatentNo1(patentVO.getFiledOptions(), patentVO.getReportId(), patentVO.getTaskId(), patentVO.getTaskStatus());
         }
 
-        patentVO.setPatentNos(patentNumber);
-        String resNum = outInterfaceService.getConPantents(patentVO, 1);
+                patentVO.setPatentNos(patentNumber);
+        patentVO.setReportId(null);
+        String resNum = outInterfaceService.getConPantentsCount(patentVO, 1);
         JSONObject jsonObjectNum = JSONObject.parseObject(resNum);
-        List<JSONObject> jsonObjectNums = JSONArray.parseArray(jsonObjectNum.get("data").toString(), JSONObject.class);
-        Integer totalNumber = jsonObjectNums.size();
+        Integer totalNumber = Integer.parseInt(jsonObjectNum.get("data").toString());
         if (patentVO.getLocPosition() == 1) {
             patentVO.setStartNumber(patentVO.getLocPosition() - 1);
             patentVO.setEndNumber(patentVO.getLocPosition());
@@ -109,7 +109,6 @@ public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper,
             patentVO.setStartNumber(patentVO.getLocPosition() - 2);
             patentVO.setEndNumber(patentVO.getLocPosition());
         }
-        patentVO.setReportId(null);
         String res = outInterfaceService.getConPantents(patentVO, 1);
         JSONObject jsonObject = JSONObject.parseObject(res);
         List<JSONObject> jsonObjects = JSONArray.parseArray(jsonObject.get("data").toString(), JSONObject.class);