修改搜索中心添加并查询资源类型、能源类型

adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java

@@ -1495,14 +1495,16 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS()) || StringUtils.isNotBlank(searchInfoEO.getCLLX())){
             if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS())){
                 queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getNYLXCLASS(),
-                        "textContent"
+                        "NYLXName"
-                ).minimumShouldMatch("100%").field("title",10f));
+                ).minimumShouldMatch("100%"));
+//                        .field("title",10f));
             }
 
             if(StringUtils.isNotBlank(searchInfoEO.getCLLX())){
                 queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getCLLX(),
-                        "textContent"
+                        "CLLXName"
-                ).minimumShouldMatch("100%").field("title",10f));
+                ).minimumShouldMatch("100%"));
+//                        .field("title",10f));
             }
 
             boolQueryBuilder.must(queryBuilder);

adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java

@@ -466,6 +466,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
         }
         String title = String.valueOf(fullTextSearchEO.getOrDefault("title",""));
         fullTextSearchEO.put("titleBig",title.toUpperCase());
+        fullTextSearchEO.put("CLLXName",attrInfoMap.get("CLLXName"));
+        fullTextSearchEO.put("NYLXName",attrInfoMap.get("NYLXName"));
+        fullTextSearchEO.put("CLLX",attrInfoMap.get("CLLX"));
+        fullTextSearchEO.put("NYLX",attrInfoMap.get("NYLX"));
         return fullTextSearchEO;
     }