Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/common/model/request/QueryRequest.java

@@ -17,5 +17,6 @@ public class QueryRequest {
     private String groupFieldValue;
     private List<OrderDTO> orderDTOList;
     private Integer projectId;
+    private Boolean ifHaveChild;
     private List<EsCustomFieldValueDTO> customFields;
 }

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

@@ -12,4 +12,6 @@ public class EsCountVO {
     private String valueTwo;
     //top
     private Integer topN = 10;
+    //开关
+    private Boolean ifHaveChild;
 }

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

@@ -1,10 +1,13 @@
 package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.dto.PatentDTO;
 import cn.cslg.pas.common.dto.PatentDetailDTO;
 import cn.cslg.pas.common.dto.PatentKinDTO;
 import cn.cslg.pas.common.dto.business.EsCountDTO;
+import cn.cslg.pas.common.dto.es.EsCustomFieldValueDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
+import cn.cslg.pas.common.model.request.QueryRequest;
 import cn.cslg.pas.common.model.request.StringRequest;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.vo.PatentPageMessageVO;
@@ -15,6 +18,7 @@ import cn.cslg.pas.factorys.businessFactory.Business;
 import cn.cslg.pas.factorys.businessFactory.BusinessFactory;
 import cn.cslg.pas.service.business.es.EsCountService;
 import cn.cslg.pas.service.business.es.EsPatentService;
+import cn.cslg.pas.service.business.es.EsService;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,6 +41,10 @@ public class PatentController {
     @Autowired
     private EsPatentService patentService;
 
+    @Autowired
+    private EsService esService;
+
+
     @Operation(summary = "查询专利")
     @PostMapping("/queryPatent")
     public Response queryPatent(@RequestBody StringRequest stringRequest) throws Exception {
@@ -47,8 +55,8 @@ public class PatentController {
 
     @Operation(summary = "统计专利库中专利")
     @PostMapping("/esCountSearch")
-    public Response esCountSearch(@RequestBody List<EsCountVO> countVOS) throws Exception {
-        EsCountDTO dto = esCountService.esCountSearch(countVOS);
+    public Response esCountSearch(@RequestBody List<EsCountVO> countVOS,String condition) throws Exception {
+        EsCountDTO dto = esCountService.esCountSearch(countVOS, condition);
         return Response.success(dto);
     }
 
@@ -72,4 +80,19 @@ public class PatentController {
       List<PatentPageMessageVO> patentPageMessageVOS= patentService.getPatentPageMessage(stringRequest);
         return Response.success(patentPageMessageVOS);
     }
+
+    @Operation(summary = "test")
+    @PostMapping("/test")
+    public Response test(@RequestBody List<EsCustomFieldValueDTO> customFields) throws Exception {
+        PatentDTO patentDTO = esService.esSearch(customFields);
+        return Response.success(patentDTO);
+    }
+
+    @Operation(summary = "esCount")
+    @PostMapping("/esCount")
+    public Response esCount(@RequestBody EsCountVO countVO) throws Exception {
+        EsCountDTO patentDTO = esCountService.esCount(countVO);
+        return Response.success(patentDTO);
+    }
+
 }

src/main/java/cn/cslg/pas/controller/ProjectTaskController.java

@@ -120,4 +120,12 @@ public class ProjectTaskController {
         Integer id = (Integer) projectTaskService.addReportOpenAuditTask(tortReportTaskDTO);
         return Response.success(id);
     }
+
+    @Operation(summary = "添加分配或者标引任务")
+    @PostMapping("/addMarkTask")
+    public Response addMarkTask(@RequestBody MarkTaskDTO markTaskDTO) throws Exception {
+     List<Integer> ids= projectTaskService.addMarkTask(markTaskDTO);
+        return Response.success(ids);
+    }
+
 }

src/main/java/cn/cslg/pas/factorys/EsCountBuilderFactory/ChildCountBuilder.java

@@ -15,26 +15,41 @@ public class ChildCountBuilder implements IEsCountBuilder{
     public String valueTwo = "";
     public Integer topN = 10;
     public String path = "";
+    public Boolean ifHaveChild = false;
 
     @Override
     public Aggregation createAggregation() {
-        Aggregation terms = AggregationBuilders.terms(j -> j.field(field).size(topN));
-        if (StringUtils.isNotEmpty(valueOne)) {
+        Aggregation terms;
+        if (ifHaveChild) {
+            Aggregation agg = AggregationBuilders.terms(i -> i.field("custom_field.stats_value.raw").size(topN));
+            terms = new Aggregation.Builder().terms(new TermsAggregation.Builder()
+                    .field(field).size(topN).build())
+                    .aggregations(new HashMap() {{
+                        put("filter_agg", agg);
+                    }}).build();
+        } else {
+            Aggregation agg = AggregationBuilders.terms(i -> i.field("custom_field.field_value.raw").size(topN));
+            terms = new Aggregation.Builder().terms(new TermsAggregation.Builder()
+                    .field(field).size(topN).build())
+                    .aggregations(new HashMap() {{
+                        put("filter_agg", agg);
+                    }}).build();
+        }
+        /*if (StringUtils.isNotEmpty(valueOne)) {
             String str = "*";
             String s = str.concat(valueOne).concat("*");
             Query query = QueryBuilders.wildcard(i -> i.field(field).value(s));
-//            Query query = QueryBuilders.term(j -> j.field(field).value(valueOne));
             Aggregation filter = AggregationBuilders.filter(n -> n.bool(k -> k.must(query)));
             terms = new Aggregation.Builder().terms(new TermsAggregation.Builder()
                     .field(field).size(topN).build())
                     .aggregations(new HashMap() {{
                         put("filter_agg", filter);
                     }}).build();
-        }
-        Aggregation finalTerms = terms;
+        }*/
+//        Aggregation finalTerms = terms;
         Aggregation aggregation = new Aggregation.Builder().children(new ChildrenAggregation.Builder()
                 .type("project_customfield").build()).aggregations(new HashMap() {{
-            put("child_agg", finalTerms);
+            put("child_agg", terms);
         }}).build();
         return aggregation;
     }
@@ -88,4 +103,12 @@ public class ChildCountBuilder implements IEsCountBuilder{
     public void setPath(String path) {
         this.path = path;
     }
+
+    public Boolean getIfHaveChild() {
+        return ifHaveChild;
+    }
+
+    public void setIfHaveChild(Boolean ifHaveChild) {
+        this.ifHaveChild = ifHaveChild;
+    }
 }

src/main/java/cn/cslg/pas/factorys/EsCountBuilderFactory/DateHistogramBuilder.java

@@ -18,6 +18,7 @@ public class DateHistogramBuilder implements IEsCountBuilder{
     public String valueTwo = "";
     public Integer topN = 10;
     public String path = "";
+    public Boolean ifHaveChild = false;
 
     @Override
     public Aggregation createAggregation() {
@@ -74,4 +75,12 @@ public class DateHistogramBuilder implements IEsCountBuilder{
     public void setPath(String path) {
         this.path = path;
     }
+
+    public Boolean getIfHaveChild() {
+        return ifHaveChild;
+    }
+
+    public void setIfHaveChild(Boolean ifHaveChild) {
+        this.ifHaveChild = ifHaveChild;
+    }
 }

src/main/java/cn/cslg/pas/factorys/EsCountBuilderFactory/FilterCountBuilder.java

@@ -11,6 +11,7 @@ public class FilterCountBuilder implements IEsCountBuilder{
     public String valueTwo = "";
     public Integer topN = 10;
     public String path = "";
+    public Boolean ifHaveChild = false;
 
 
     @Override
@@ -72,4 +73,14 @@ public class FilterCountBuilder implements IEsCountBuilder{
     public void setPath(String path) {
         this.path = path;
     }
+
+    @Override
+    public Boolean getIfHaveChild() {
+        return ifHaveChild;
+    }
+
+    @Override
+    public void setIfHaveChild(Boolean ifHaveChild) {
+        this.ifHaveChild = ifHaveChild;
+    }
 }

src/main/java/cn/cslg/pas/factorys/EsCountBuilderFactory/IEsCountBuilder.java

@@ -8,6 +8,7 @@ public interface IEsCountBuilder {
     public String valueTwo = "";
     public Integer topN = 10;
     public String path = "";
+    public Boolean ifHaveChild = false;
 
     public Aggregation createAggregation();
 
@@ -30,4 +31,8 @@ public interface IEsCountBuilder {
     public String getPath();
 
     public void setPath(String path);
+
+    public Boolean getIfHaveChild();
+
+    public void setIfHaveChild(Boolean ifHaveChild);
 }

src/main/java/cn/cslg/pas/factorys/EsCountBuilderFactory/NestedCountBuilder.java

@@ -16,6 +16,7 @@ public class NestedCountBuilder implements IEsCountBuilder {
     public String valueTwo = "";
     public Integer topN = 10;
     public String path = "";
+    public Boolean ifHaveChild = false;
 
     @Override
     public Aggregation createAggregation() {
@@ -90,4 +91,14 @@ public class NestedCountBuilder implements IEsCountBuilder {
     public void setPath(String path) {
         this.path = path;
     }
+
+    @Override
+    public Boolean getIfHaveChild() {
+        return ifHaveChild;
+    }
+
+    @Override
+    public void setIfHaveChild(Boolean ifHaveChild) {
+        this.ifHaveChild = ifHaveChild;
+    }
 }

src/main/java/cn/cslg/pas/factorys/EsCountBuilderFactory/RangeCountBuilder.java

@@ -10,6 +10,7 @@ public class RangeCountBuilder implements IEsCountBuilder{
     public String valueTwo = "";
     public Integer topN = 10;
     public String path = "";
+    public Boolean ifHaveChild = false;
 
     @Override
     public Aggregation createAggregation() {
@@ -55,4 +56,14 @@ public class RangeCountBuilder implements IEsCountBuilder{
     public void setPath(String path) {
         this.path = path;
     }
+
+    @Override
+    public Boolean getIfHaveChild() {
+        return ifHaveChild;
+    }
+
+    @Override
+    public void setIfHaveChild(Boolean ifHaveChild) {
+        this.ifHaveChild = ifHaveChild;
+    }
 }

src/main/java/cn/cslg/pas/factorys/EsCountBuilderFactory/TermsCountBuilder.java

@@ -18,7 +18,7 @@ public class TermsCountBuilder implements IEsCountBuilder{
     public String valueTwo = "";
     public Integer topN = 10;
     public String path = "";
-
+    public Boolean ifHaveChild = false;
     @Override
     public Aggregation createAggregation() {
         Aggregation aggregation = AggregationBuilders.terms(i -> i.field(field).size(topN));
@@ -86,4 +86,14 @@ public class TermsCountBuilder implements IEsCountBuilder{
     public void setPath(String path) {
         this.path = path;
     }
+
+    @Override
+    public Boolean getIfHaveChild() {
+        return ifHaveChild;
+    }
+
+    @Override
+    public void setIfHaveChild(Boolean ifHaveChild) {
+        this.ifHaveChild = ifHaveChild;
+    }
 }

src/main/java/cn/cslg/pas/service/business/CustomFieldService.java

@@ -32,6 +32,7 @@ import java.util.List;
 
 /**
  * 自定义栏位Service层
+ *
  * @Author xiexiang
  * @Date 2023/11/8
  */
@@ -56,7 +57,7 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
     @Override
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
         //根据专题库/报告id查询自定义栏位
-        List<String> sqls = formatQueryService.reSqls(queryRequest,"customField");
+        List<String> sqls = formatQueryService.reSqls(queryRequest, "customField");
         //根据sql查询自定义栏位信息
         List<CustomFieldVO> customFieldVOS = customFieldMapper.getCustomField(sqls.get(0), sqls.get(1), sqls.get(2));
         //查询总数
@@ -177,6 +178,7 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
 
     /**
      * 装载自定义栏位
+     *
      * @param customFieldVOS
      */
     private void loadCustomField(List<CustomFieldVO> customFieldVOS) throws IOException {
@@ -205,4 +207,8 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
             }
         }
     }
+
+
+    private void getAllPatentCustomField() {
+    }
 }

src/main/java/cn/cslg/pas/service/business/ImportTaskService.java

@@ -254,6 +254,9 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
 
     private void loadImportTask(List<ImportTaskVO> importTaskVOS) throws IOException {
         List<ImportTaskAMVO> importTaskAMVOS =schedulingTaskService.getImportTaskAMVOs();
+        if(importTaskAMVOS==null){
+            importTaskAMVOS=new ArrayList<>();
+        }
         List<String> createIds = new ArrayList<>();
         importTaskVOS.forEach(item -> {
             if (item.getCreateId() != null) {

src/main/java/cn/cslg/pas/service/business/ProjectTaskService.java

@@ -89,7 +89,8 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
 
     @Autowired
     private EsPatentService esPatentService;
-
+    @Autowired
+    private CompareLiteratureService compareLiteratureService;
     /**
      * 项目开卷审核任务
      *
@@ -858,10 +859,17 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
     }
 
 
-    private void addMarkTask(MarkTaskDTO markTaskDTO) throws Exception {
+    public List<Integer> addMarkTask(MarkTaskDTO markTaskDTO) throws Exception {
+        List<Integer> ids =new ArrayList<>();
         StringRequest stringRequest = markTaskDTO.getStringRequest();
         //获取人员专利
-        List<PersonAssignedDTO> personAssignedDTOList = new ArrayList<>();
+        List<PersonAssignedDTO> personAssignedDTOList = markTaskDTO.getPersonAssignedDTOList();
+        //获取任务类型
+        Integer taskType =markTaskDTO.getTaskType();
+        //获取任务名称
+        String taskName =markTaskDTO.getName();
+        //获得截止时间
+        Date deadLineTime =markTaskDTO.getDeadLine();
         //过滤出已经添加的专利
         List<String> patentNos = new ArrayList<>();
         List<Integer> nums = new ArrayList<>();
@@ -879,7 +887,13 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
             List<String> addPatentNos =new ArrayList<>();
             //创建任务
             ProjectTaskDTO projectTaskDTO = new ProjectTaskDTO();
+            projectTaskDTO.setType(taskType);
+            projectTaskDTO.setName(taskName);
+            projectTaskDTO.setDeadLineTime(deadLineTime);
+            projectTaskDTO.setHandler(item.getPersonId());
+            projectTaskDTO.setHandlerType(0);
            Integer taskId= this.addTask(projectTaskDTO);
+           ids.add(taskId);
             //根据检索式和已经添加的专利以及位置获得专利
             if (item.getPatentNos() == null || item.getPatentNos().size() == 0) {
                 Integer num = nums.remove(0);
@@ -896,6 +910,7 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
             //添加专利
             this.addCompareLiteratureByNos(addPatentNos,taskId);
         }
+        return ids;
     }
 
     private void addAssignTask(MarkTaskDTO markTaskDTO) {
@@ -917,7 +932,9 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
                 compareLiterature.setLiteratureNo(item);
                 compareLiterature.setName(item);
                 compareLiterature.setProjectTaskId(taskId);
+                compareLiteratures.add(compareLiterature);
             });
         }
+        compareLiteratureService.saveBatch(compareLiteratures);
     }
 }

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

@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class EsCountService {
-    private final List<String> childList = Arrays.asList("childRaw");
+    private final List<String> childList = Arrays.asList("field");
     private final List<String> nestedList = Arrays.asList("PA", "IN", "PE");
     private final List<String> dateList = Arrays.asList("PD", "AD");
 
@@ -45,36 +45,19 @@ public class EsCountService {
      * @return
      * @throws Exception
      */
-    public EsCountDTO esCountSearch(List<EsCountVO> countVOS) throws Exception {
+    public EsCountDTO esCountSearch(List<EsCountVO> countVOS,String condition) throws Exception {
         EsCountDTO esCountDTO = new EsCountDTO();
         List<EsCountDetailDTO> detailDTOS = new ArrayList<>();
         for (EsCountVO vo : countVOS) {
             String field = vo.getField();
-            String valueOne = vo.getValueOne();
-            String valueTwo = vo.getValueTwo();
             Integer topN = vo.getTopN();
 
+            //查询es返回数据
             SearchRequest.Builder builder = new SearchRequest.Builder();
-            builder.index("patent");
-            IEsCountBuilder iEsCountBuilder = null;
-            String json = CommonService.readJsonFile("esCount.json");
-            List<EsConfigVO> esConfigVOS = JSON.parseArray(json, EsConfigVO.class);
-            EsConfigVO esConfigVO = esConfigVOS.stream().filter(item -> item.getField().equals(field)).findFirst().orElse(null);
-            if (esConfigVO != null) {
-                iEsCountBuilder = esCountBuilderFactory.getClass(esConfigVO.getEsClass());
-                iEsCountBuilder.setField(esConfigVO.getEsField());
-                iEsCountBuilder.setValueOne(valueOne);
-                iEsCountBuilder.setValueTwo(valueTwo);
-                iEsCountBuilder.setTopN(topN);
-                if (iEsCountBuilder.getField().contains(".")) {
-                    String path = iEsCountBuilder.getField().substring(0, iEsCountBuilder.getField().indexOf("."));
-                    iEsCountBuilder.setPath(path);
-                }
-
-            }
-            Aggregation aggregation = iEsCountBuilder.createAggregation();
+            Aggregation aggregation = this.selectAggregation(builder,vo);
             builder.aggregations("Agg", aggregation);
             SearchResponse<Patent> response = client.search(builder.build(), Patent.class);
+
             Aggregate agg = response.aggregations().get("Agg");
             if (dateList.contains(field)) {
                 List<DateHistogramBucket> list = agg.dateHistogram().buckets().array();
@@ -93,7 +76,8 @@ public class EsCountService {
                     }
                 });
                 if (!CollectionUtils.isEmpty(esCountDetailDTOS)) {
-                    List<EsCountDetailDTO> collect = esCountDetailDTOS.stream().sorted(Comparator.comparing(EsCountDetailDTO::getName).reversed()).limit(topN).collect(Collectors.toList());
+                    List<EsCountDetailDTO> collect = esCountDetailDTOS.stream().sorted(Comparator.comparing(EsCountDetailDTO::getName).reversed())
+                            .limit(topN).collect(Collectors.toList());
                     detailDTOS.addAll(collect);
                 }
             } else if (nestedList.contains(field)) {
@@ -148,4 +132,118 @@ public class EsCountService {
         esCountDTO.setDetailDTOS(detailDTOS);
         return esCountDTO;
     }
+
+    public EsCountDTO esCount(EsCountVO countVO) throws Exception {
+        EsCountDTO esCountDTO = new EsCountDTO();
+        List<EsCountDetailDTO> detailDTOS = new ArrayList<>();
+        String valueOne = countVO.getValueOne();
+        String valueTwo = countVO.getValueTwo();
+        Integer topN = countVO.getTopN();
+        String field = countVO.getField();
+
+        //查询es返回数据
+        SearchRequest.Builder builder = new SearchRequest.Builder();
+        Aggregation aggregation = this.selectAggregation(builder,countVO);
+        builder.aggregations("Agg", aggregation);
+        SearchResponse<Patent> response = client.search(builder.build(), Patent.class);
+        Aggregate agg = response.aggregations().get("Agg");
+        if (dateList.contains(field)) {
+            List<DateHistogramBucket> list = agg.dateHistogram().buckets().array();
+            List<EsCountDetailDTO> esCountDetailDTOS = new ArrayList<>();
+            list.forEach(bucket -> {
+                EsCountDetailDTO dto = new EsCountDetailDTO();
+                dto.setField(field);
+                Aggregate aggregate = bucket.aggregations().get("filter_agg");
+                dto.setName(bucket.keyAsString());
+                dto.setNumber(bucket.docCount());
+                if (aggregate != null) {
+                    dto.setNumber(aggregate.filter().docCount());
+                }
+                if (dto.getNumber() > 0) {
+                    esCountDetailDTOS.add(dto);
+                }
+            });
+            if (!CollectionUtils.isEmpty(esCountDetailDTOS)) {
+                List<EsCountDetailDTO> collect = esCountDetailDTOS.stream().sorted(Comparator.comparing(EsCountDetailDTO::getName).reversed()).limit(topN).collect(Collectors.toList());
+                detailDTOS.addAll(collect);
+            }
+        } else if (nestedList.contains(field)) {
+            Aggregate termsAgg = agg.nested().aggregations().get("terms_agg");
+            List<StringTermsBucket> list = termsAgg.sterms().buckets().array();
+            list.forEach(bucket -> {
+                EsCountDetailDTO dto = new EsCountDetailDTO();
+                dto.setField(field);
+                Aggregate aggregate = bucket.aggregations().get("filter_agg");
+                dto.setName(bucket.key().stringValue());
+                dto.setNumber(bucket.docCount());
+                if (aggregate != null) {
+                    dto.setNumber(aggregate.filter().docCount());
+                }
+                if (dto.getNumber() > 0) {
+                    detailDTOS.add(dto);
+                }
+            });
+        } else if (childList.contains(field)) {
+            Aggregate childAgg = agg.children().aggregations().get("child_agg");
+            List<StringTermsBucket> list = childAgg.sterms().buckets().array();
+            list.forEach(bucket -> {
+                EsCountDetailDTO dto = new EsCountDetailDTO();
+                dto.setField(field);
+                Aggregate aggregate = bucket.aggregations().get("filter_agg");
+                dto.setName(bucket.key().stringValue());
+                dto.setNumber(bucket.docCount());
+                if (aggregate != null) {
+                    dto.setNumber(aggregate.filter().docCount());
+                }
+                if (dto.getNumber() > 0) {
+                    detailDTOS.add(dto);
+                }
+            });
+        } else {
+            List<StringTermsBucket> list = agg.sterms().buckets().array();
+            list.forEach(bucket -> {
+                EsCountDetailDTO dto = new EsCountDetailDTO();
+                dto.setField(field);
+                Aggregate aggregate = bucket.aggregations().get("filter_agg");
+                dto.setName(bucket.key().stringValue());
+                dto.setNumber(bucket.docCount());
+                if (aggregate != null) {
+                    dto.setNumber(aggregate.filter().docCount());
+                }
+                if (dto.getNumber() > 0) {
+                    detailDTOS.add(dto);
+                }
+            });
+        }
+        esCountDTO.setDetailDTOS(detailDTOS);
+        return esCountDTO;
+    }
+
+    public Aggregation selectAggregation(SearchRequest.Builder builder, EsCountVO vo) {
+        String valueOne = vo.getValueOne();
+        String valueTwo = vo.getValueTwo();
+        Integer topN = vo.getTopN();
+        Boolean ifHaveChild = vo.getIfHaveChild();
+        String field = vo.getField();
+
+        builder.index("patent");
+        IEsCountBuilder iEsCountBuilder = null;
+        String json = CommonService.readJsonFile("esCount.json");
+        List<EsConfigVO> esConfigVOS = JSON.parseArray(json, EsConfigVO.class);
+        EsConfigVO esConfigVO = esConfigVOS.stream().filter(item -> item.getField().equals(field)).findFirst().orElse(null);
+        if (esConfigVO != null) {
+            iEsCountBuilder = esCountBuilderFactory.getClass(esConfigVO.getEsClass());
+            iEsCountBuilder.setField(esConfigVO.getEsField());
+            iEsCountBuilder.setValueOne(valueOne);
+            iEsCountBuilder.setValueTwo(valueTwo);
+            iEsCountBuilder.setTopN(topN);
+            iEsCountBuilder.setIfHaveChild(ifHaveChild);
+            if (iEsCountBuilder.getField().contains(".")) {
+                String path = iEsCountBuilder.getField().substring(0, iEsCountBuilder.getField().indexOf("."));
+                iEsCountBuilder.setPath(path);
+            }
+        }
+        return iEsCountBuilder.createAggregation();
+    }
+
 }

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

@@ -313,8 +313,6 @@ public class EsPatentService {
      */
     public List<Patent> getPatentsWithNotNo(QueryRequest queryRequest, List<String> patentNos) throws Exception {
         List<Patent> patentList = new ArrayList<>();
-        Long current = queryRequest.getCurrent();
-        Long size = queryRequest.getSize();
         SearchRequest.Builder builder = new SearchRequest.Builder();
         //设置查询索引
         builder.index("patent");
@@ -330,40 +328,17 @@ public class EsPatentService {
         }
         //4. 返回数据
         builder.query(reQuery);
-        //排序
-        List<OrderDTO> dtoList = queryRequest.getOrderDTOList();
-        if (!CollectionUtils.isEmpty(dtoList)) {
-            for (OrderDTO orderDTO : dtoList) {
-                if (orderDTO.getOrderType().equals(IfConstant.NO)) {
-                    builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-                            .field(fieldSortBuilder -> fieldSortBuilder
-                                    .field(orderDTO.getOrderBy()).order(SortOrder.Asc)));
-                } else {
-                    builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-                            .field(fieldSortBuilder -> fieldSortBuilder
-                                    .field(orderDTO.getOrderBy()).order(SortOrder.Desc)));
-                }
-            }
-        } else {
-            builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-                    .field(fieldSortBuilder -> fieldSortBuilder
-                            .field("patent_no.keyword").order(SortOrder.Desc)));
-        }
 
         List<String> reSources = this.rePatentSource();
         builder.source(sourceOptionsBuilder -> sourceOptionsBuilder
                 .filter(fieldSourceBuilder -> fieldSourceBuilder
                         .includes(reSources)));
 
-        //分页
-        if (current > 0 && size > 0) {
-            builder.from(current.intValue()).size(size.intValue());
-        }
         SearchResponse<Patent> response = client.search(builder.build(), Patent.class);
         List<Hit<Patent>> hits = response.hits().hits();
         for (Hit<Patent> hit : hits) {
             if (hits != null && hits.size() > 0) {
-                Patent patent = hits.get(0).source();
+                Patent patent = hit.source();
                 patentList.add(patent);
             }
         }

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

@@ -271,23 +271,23 @@ public class EsService {
         builder.query(q);
         //排序
         List<OrderDTO> dtoList = queryRequest.getOrderDTOList();
-        if (!CollectionUtils.isEmpty(dtoList)) {
-            for (OrderDTO orderDTO : dtoList) {
-                if (orderDTO.getOrderType().equals(IfConstant.NO)) {
-                    builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-                            .field(fieldSortBuilder -> fieldSortBuilder
-                                    .field(orderDTO.getOrderBy()).order(SortOrder.Asc)));
-                } else {
-                    builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-                            .field(fieldSortBuilder -> fieldSortBuilder
-                                    .field(orderDTO.getOrderBy()).order(SortOrder.Desc)));
-                }
-            }
-        } else {
-            builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-                    .field(fieldSortBuilder -> fieldSortBuilder
-                            .field("patent_no.keyword").order(SortOrder.Desc)));
-        }
+//        if (!CollectionUtils.isEmpty(dtoList)) {
+//            for (OrderDTO orderDTO : dtoList) {
+//                if (orderDTO.getOrderType().equals(IfConstant.NO)) {
+//                    builder.sort(sortOptionsBuilder -> sortOptionsBuilder
+//                            .field(fieldSortBuilder -> fieldSortBuilder
+//                                    .field(orderDTO.getOrderBy()).order(SortOrder.Asc)));
+//                } else {
+//                    builder.sort(sortOptionsBuilder -> sortOptionsBuilder
+//                            .field(fieldSortBuilder -> fieldSortBuilder
+//                                    .field(orderDTO.getOrderBy()).order(SortOrder.Desc)));
+//                }
+//            }
+//        } else {
+//            builder.sort(sortOptionsBuilder -> sortOptionsBuilder
+//                    .field(fieldSortBuilder -> fieldSortBuilder
+//                            .field("patent_no.keyword").order(SortOrder.Desc)));
+//        }
 
         //分页
         if (current > 0 && size > 0) {
@@ -364,6 +364,7 @@ public class EsService {
         return builder.toString();
     }
 
+
     public void appendStr(EsCustomFieldValueDTO customField, StringBuilder builder, int m) {
         List<String> values = customField.getFieldValue();
         builder.append("field").append("=").append(customField.getFieldId());
@@ -379,13 +380,15 @@ public class EsService {
                     builder.append(s).append(")").append(")");
                 }
             }
-        } else {
+        }
+        else {
             for (String value : values) {
                 builder.append(value);
             }
         }
     }
 
+
     /**
      * @param key
      * @param page

src/main/resources/jsons/esCount.json

@@ -312,16 +312,39 @@
     "ifAsCondition": "true"
   },
   {
-    "name": "子文档统计",
+    "name": "自定义栏位id",
     "type": "String",
-    "value": "childRaw",
-    "field": "childRaw",
+    "value": "field",
+    "field": "field",
+    "esField": "custom_field.field",
+    "esClass": "childCountBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifAsCondition": "true"
+  },
+  {
+    "name": "自定义栏位统计值",
+    "type": "String",
+    "value": "statsValue",
+    "field": "statsValue",
     "esField": "custom_field.stats_value.raw",
     "esClass": "childCountBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true"
+  },
+  {
+    "name": "自定义栏位值",
+    "type": "String",
+    "value": "fieldValue",
+    "field": "fieldValue",
+    "esField": "custom_field.field_value.raw",
+    "esClass": "childCountBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifAsCondition": "true"
   }
-
 ]

src/main/resources/jsons/patent.json

@@ -538,6 +538,17 @@
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true"
+  },
+  {
+    "name": "自定义栏位统计值",
+    "type": "String",
+    "value": "statsValue",
+    "field": "statsValue",
+    "esField": "custom_field.stats_value.raw",
+    "esClass": "customChildQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifAsCondition": "true"
   }
-
 ]

src/test/java/cn/cslg/pas/service/EventServiceTests.java

@@ -244,7 +244,7 @@ public class EventServiceTests {
         vo2.setValueTwo("2023");
         countVOS.add(vo1);
 //        countVOS.add(vo2);
-        EsCountDTO esCountDTO = esCountService.esCountSearch(countVOS);
+        EsCountDTO esCountDTO = esCountService.esCountSearch(countVOS, "");
         System.out.println(esCountDTO);
 
     }
@@ -307,7 +307,7 @@ public class EventServiceTests {
         dto2.setFieldValue(Arrays.asList("a", "b"));
         customFields.add(dto1);
         customFields.add(dto2);
-        String s = esService.parseCustomField(customFields);
+        String s = esService.parseCustomField(customFields,Boolean.FALSE);
         System.out.println("结果为:" + s);
         System.out.println("-----------------------------");
         List<EsCustomFieldValueDTO> fields = new ArrayList<>();
@@ -323,4 +323,9 @@ public class EventServiceTests {
         SelectClaimDTO dto = esService.selectPatentNo(list);
         System.out.println(dto);
     }
+
+    @Test
+    void test18() {
+//        esService
+    }
 }