es统计分析

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

@@ -118,7 +118,7 @@ public class EsCountService {
 //                                this.getFiltersCountDTO(filtersBucket, finalSearchCondition, detailDTOS);
                                 Aggregate filtersAgg = filtersBucket.aggregations().get("filters_agg");
                                 try {
-                                    this.getDateCountDTOS(filtersAgg, field, topN,format, detailDTOS,esCountDTO);
+                                    this.getDateCountDTOS(filtersAgg, field, topN, format, detailDTOS, esCountDTO);
                                 } catch (ParseException e) {
                                     e.printStackTrace();
                                 }
@@ -346,7 +346,7 @@ public class EsCountService {
                     dto.setNumber(count);
                     if (dto.getNumber() > 0) {
                         detailDTOS.add(dto);
-                        if (fieldType != 6) {
+                        if (fieldType == null || fieldType != 6) {
                             Long docCount = aggregate.sterms().sumOtherDocCount();
                             EsCountDetailDTO detail = new EsCountDetailDTO();
                             detail.setField(field);
@@ -383,7 +383,7 @@ public class EsCountService {
                 dto.setNumber(termsBucket.docCount());
                 if (dto.getNumber() > 0) {
                     detailDTOS.add(dto);
-                    if (fieldType != 6) {
+                    if (fieldType == null || fieldType != 6) {
                         Long docCount = aggregate.sterms().sumOtherDocCount();
                         EsCountDetailDTO detail = new EsCountDetailDTO();
                         detail.setField(field);

src/main/java/cn/cslg/pas/service/common/PersonFieldService.java

@@ -23,6 +23,7 @@ import cn.hutool.crypto.SecureUtil;
 import com.alibaba.fastjson.JSON;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -170,7 +171,11 @@ public class PersonFieldService {
                 List<QueryFiledVO> queryConditions = JSON.parseArray(json, QueryFiledVO.class);
                 //过滤出可查询的字段
                 List<QueryFiledVO> queryFiledVOList = queryConditions.stream().filter(i -> flag.equals(i.getIfSearch()) || flag.equals(i.getIfGroup())).collect(Collectors.toList());
-
+                if (!CollectionUtils.isEmpty(queryFiledVOList)) {
+                    queryFiledVOList.forEach(field -> {
+                        field.setGroup("nos");
+                    });
+                }
                 //当是专利的配置时
                 if (item.getTableName().trim().equals(PatentDictionary.NAME)) {
                     //根据专题库id 查询所有自定义字段
@@ -222,10 +227,6 @@ public class PersonFieldService {
                                 queryFieldsVO1.setGroup("technical");
                                 queryFieldsVO1.setType("tree");
                                 break;
-                            default:
-                                queryFieldsVO1.setGroup("nos");
-                                queryFieldsVO1.setType("String");
-                                break;
                         }
                         //装载id
                         queryFieldsVO1.setField(i.getId().toString());