Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/common/vo/business/PatentKinDetailVO.java

@@ -4,6 +4,10 @@ import lombok.Data;
 
 @Data
 public class PatentKinDetailVO {
+    //页码
+    private Integer pageNum;
+    //页的大小
+    private Integer pageSize;
     //申请号
     private String appNo;
     //公开号

src/main/java/cn/cslg/pas/service/business/es/EsCustomFieldService.java

@@ -280,7 +280,7 @@ public class EsCustomFieldService {
         List<String> isDel = vo.getIsDelete();
         List<String> ids = new ArrayList<>();
         List<EsCustomFieldDTO> fieldDTOS = vo.getEsCustomFieldDTOS();
-        if (!CollectionUtils.isEmpty(isAdd) && startNum < 1 && endNum < 1) {
+        if (!CollectionUtils.isEmpty(isAdd) && startNum <= 1 && endNum < 1) {
             isAdd.removeAll(isDel);
             for (String patentNo : isAdd) {
                 for (EsCustomFieldDTO fieldDTO : fieldDTOS) {
@@ -290,7 +290,7 @@ public class EsCustomFieldService {
                 }
 
             }
-        } else if (startNum > 0 && endNum > 0){
+        } else if (startNum > 1 && endNum > 0){
             List<String> patentNos = this.getPatentNos(vo);
             for (String patentNo : patentNos) {
                 for (EsCustomFieldDTO fieldDTO : fieldDTOS) {

src/main/java/cn/cslg/pas/service/business/es/EsPatentService.java

@@ -152,6 +152,8 @@ public class EsPatentService {
             if (!CollectionUtils.isEmpty(patentList)) {
                 for (FamilyPatent familyPatent : patentList) {
                     PatentKinDetailVO kinDetailVO = new PatentKinDetailVO();
+                    kinDetailVO.setPageNum(vo.getPageNum());
+                    kinDetailVO.setPageSize(vo.getPageSize());
                     kinDetailVO.setAppNo(familyPatent.getAppNo());
                     kinDetailVO.setPublicNo(familyPatent.getPublicNo());
                     kinDetailVO.setGrantNo(familyPatent.getGrantNo());
@@ -168,6 +170,8 @@ public class EsPatentService {
     }
 
     public List<PatentKinDTO> selectPatentKindDetail(PatentKinDetailVO vo, String patentNo) throws IOException {
+        Integer pageNum = vo.getPageNum();
+        Integer pageSize = vo.getPageSize();
         List<PatentKinDTO> list = new ArrayList<>();
         SearchRequest.Builder builder = new SearchRequest.Builder();
         //设置查询索引
@@ -188,6 +192,10 @@ public class EsPatentService {
             bool = QueryBuilders.bool(i -> i.should(q1, q2));
         }
         builder.query(bool);
+        //分页
+        if (pageNum > 0 && pageSize > 0) {
+            builder.from((pageNum - 1) * pageSize).size(pageSize);
+        }
         SearchResponse<Patent> response = client.search(builder.build(), Patent.class);
         List<Hit<Patent>> hits = response.hits().hits();
         for (Hit<Patent> hit : hits) {