优化范围选择专题库内专利

PAS/pas.iml

@@ -63,7 +63,6 @@
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.14" level="project" />
@@ -208,5 +207,8 @@
     <orderEntry type="library" name="Maven: e-iceblue:spire.pdf:8.7.0" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.9" level="project" />
     <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.12.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox:2.0.16" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.pdfbox:fontbox:2.0.16" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
   </component>
 </module>

PAS/src/main/java/cn/cslg/pas/controller/PatentController.java

@@ -88,7 +88,7 @@ public class PatentController {
     @PostMapping("ids")
     @Operation(summary = "根据范围获取专利ID")
     public String getPatentListIds(@RequestBody PatentVO params) {
-        return Response.success(patentService.getPatentListIds(params));
+        return Response.success(patentService.getPatentListIds2(params));
     }
 
     @checkAuth(FunId = "/workspace/folder/exportPatent")

PAS/src/main/java/cn/cslg/pas/service/PatentService.java

@@ -414,6 +414,19 @@ public class PatentService extends ServiceImpl<PatentMapper, Patent> {
         return ids.stream().skip(params.getStartNumber() - 1).limit(params.getEndNumber() - params.getStartNumber() + 1).collect(Collectors.toList());
     }
 
+
+    public Map<String,Object> getPatentListIds2(PatentVO params) {
+        this.setQueryFamilyParams(params);
+        params.setSelected(new ArrayList<>());
+        List<Patent> patents = this.getQueryPatentIds2(params);
+        List<Integer> ids = patents.stream().map(Patent::getId).collect(Collectors.toList());
+        List<String>  patentNos =patents.stream().map(Patent::getPatentNo).collect(Collectors.toList());
+        Map<String,Object> map =new HashMap<>();
+        map.put("ids", ids.stream().skip(params.getStartNumber() - 1).limit(params.getEndNumber() - params.getStartNumber() + 1).collect(Collectors.toList()));
+        map.put("patentNos",patentNos.stream().skip(params.getStartNumber() - 1).limit(params.getEndNumber() - params.getStartNumber() + 1).collect(Collectors.toList()));
+        return map;
+    }
+
     private void setQueryFamilyParams(PatentVO params) {
         switch (params.getFamily()) {
             //
@@ -908,6 +921,11 @@ public class PatentService extends ServiceImpl<PatentMapper, Patent> {
         return patentList.stream().map(Patent::getId).distinct().collect(Collectors.toList());
     }
 
+    public List<Patent> getQueryPatentIds2(PatentVO params) {
+        this.setQueryPatentParams(params);
+        List<Patent> patentList = baseMapper.getPageList(params);
+        return patentList;
+    }
     @Async
     public void exportPatent(TaskParams taskParams) {
         try {