更新facet

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/search/ActionPost.java

@@ -104,7 +104,7 @@ class ActionPost extends BaseAction {
             final int facetMaxGroups = Config.query().index().getFacetMaxGroups();
             final int searchMaxHits = Config.query().index().getSearchMaxHits();
             TopScoreDocCollector topScoreDocCollector = TopScoreDocCollector.create(searchMaxHits, Integer.MAX_VALUE);
-            List<Pair<String, FirstPassGroupingCollector<BytesRef>>> firstPassGroupingCollectorPairs = this
+            List<Pair<String, FirstPassGroupingCollector<BytesRef>>> firstPassGroupingCollectorPairs = Indexs
                     .adjustFacetField(
                             wi.getFilterList().stream().map(Filter::getField).collect(Collectors.toList()))
                     .stream()

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/search/BaseAction.java

@@ -34,11 +34,6 @@ abstract class BaseAction extends StandardJaxrsAction {
             .<String>of(Indexs.FIELD_INDEXTIME, Indexs.FIELD_CREATETIME, Indexs.FIELD_UPDATETIME)
             .collect(Collectors.toUnmodifiableList());
 
-    protected static final List<String> FACET_FIELDS = Stream.<String>of(Indexs.FIELD_CATEGORY,
-            Indexs.FIELD_CREATETIMEMONTH, Indexs.FIELD_UPDATETIMEMONTH, Indexs.FIELD_APPLICATIONNAME,
-            Indexs.FIELD_PROCESSNAME, Indexs.FIELD_APPNAME, Indexs.FIELD_CATEGORYNAME,
-            Indexs.FIELD_CREATORPERSON, Indexs.FIELD_CREATORUNIT).collect(Collectors.toUnmodifiableList());
-
     protected Optional<Query> searchQuery(String query, Analyzer analyzer) throws Exception {
         query = Indexs.alignQuery(query);
         if (StringUtils.isBlank(query)) {
@@ -70,26 +65,4 @@ abstract class BaseAction extends StandardJaxrsAction {
         return Optional.of(builder.build());
     }
 
-    protected List<String> adjustFacetField(List<String> filters) {
-        List<String> list = FACET_FIELDS.stream().filter(o -> (!filters.contains(o))).collect(Collectors.toList());
-        if (list.contains(Indexs.FIELD_PROCESSNAME)) {
-            list.removeAll(Arrays.asList(Indexs.FIELD_APPLICATIONNAME, Indexs.FIELD_PROCESSNAME,
-                    Indexs.FIELD_APPNAME, Indexs.FIELD_CATEGORYNAME));
-        }
-        if (list.contains(Indexs.FIELD_APPLICATIONNAME)) {
-            list.removeAll(Arrays.asList(Indexs.FIELD_APPLICATIONNAME, Indexs.FIELD_APPNAME,
-                    Indexs.FIELD_CATEGORYNAME));
-        }
-        if (list.contains(Indexs.FIELD_CATEGORYNAME)) {
-            list.removeAll(Arrays.asList(Indexs.FIELD_APPNAME, Indexs.FIELD_CATEGORYNAME,
-                    Indexs.FIELD_APPLICATIONNAME, Indexs.FIELD_PROCESSNAME));
-        }
-        if (list.contains(Indexs.FIELD_APPNAME)) {
-            list.removeAll(Arrays.asList(Indexs.FIELD_APPNAME, Indexs.FIELD_APPLICATIONNAME,
-                    Indexs.FIELD_PROCESSNAME));
-        }
-        list.remove(Indexs.FIELD_COMPLETED);
-        return list;
-    }
-
 }
\ No newline at end of file

o2server/x_query_core_express/src/main/java/com/x/query/core/express/index/Indexs.java

@@ -107,7 +107,7 @@ public class Indexs {
     public static final String BOOLEAN_TRUE_STRING_VALUE = "true";
     public static final String BOOLEAN_FALSE_STRING_VALUE = "false";
 
-    private static final List<String> FACET_FIELDS = Stream.<String>of(FIELD_CATEGORY,
+    public static final List<String> FACET_FIELDS = Stream.<String>of(FIELD_CATEGORY,
             FIELD_CREATETIMEMONTH, FIELD_UPDATETIMEMONTH, FIELD_APPLICATIONNAME,
             FIELD_PROCESSNAME, FIELD_APPNAME, FIELD_CATEGORYNAME,
             FIELD_CREATORPERSON, FIELD_CREATORUNIT, FIELD_COMPLETED)