|
@@ -42,9 +42,11 @@ import java.util.stream.Collectors;
|
|
|
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
|
|
|
public class EsCountService {
|
|
|
private final List<String> childList = Arrays.asList("field");
|
|
|
- private final List<String> nestedList = Arrays.asList("PA", "IN", "PE", "SAT", "MAT", "SRH", "MRH");
|
|
|
- private final List<String> dateList = Arrays.asList("PD", "AD", "GD");
|
|
|
- private final List<String> numberList = Arrays.asList("QPN", "QDPN", "SFN", "IFN", "PFN");
|
|
|
+ private final List<String> nestedList = Arrays.asList("applicant", "inventor", "rightHolder", "standerApplicant",
|
|
|
+ "mergeApplicant", "standerRightHolder", "mergeRightHolder");
|
|
|
+ private final List<String> dateList = Arrays.asList("publicDate", "appDate", "grantDate");
|
|
|
+ private final List<String> numberList = Arrays.asList("quotePatentNoNum", "quotedPatentNoNum", "simpleFamilyNum",
|
|
|
+ "inpadocFamilyNum", "patsnapFamilyNum");
|
|
|
|
|
|
|
|
|
private final ElasticsearchClient client;
|
|
@@ -655,7 +657,12 @@ public class EsCountService {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ /**
|
|
|
+ * 聚合统计
|
|
|
+ * @param vo
|
|
|
+ * @return
|
|
|
+ * @throws Exception
|
|
|
+ */
|
|
|
public EsCountDTO esCountAnalysis(EsAllCountVO vo) throws Exception {
|
|
|
String searchCondition = vo.getCondition();
|
|
|
List<EsCustomFieldValueDTO> customFields = vo.getCustomFields();
|