diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index dc15c3fb..93fb2b23 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -591,9 +591,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { // 关键字查询属性字段 String keyWordField = field + ".keyword"; String keyWordField2 = field + "Name.keyword"; - if(field.equals("NYLX")){ - field = field+"CLASS"; - } +// if(field.equals("NYLX")){ +// field = field+"CLASS"; +// } if(collectAttrMap.containsKey(field)){ List fields = new ArrayList<>(); Object json= new JSONTokener(collectAttrMap.get(field).toString()).nextValue(); @@ -1647,6 +1647,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { // "title" // ).minimumShouldMatch("100%").field("title",1000f); + // 手机端搜索,不要搜不来企标 if ("2".equals(searchInfoEO.getClientType())) { boolQueryBuilder.mustNot(QueryBuilders.termQuery("standTypeOrder", "3")); } @@ -1658,14 +1659,20 @@ 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(), + "NYLXName" + ).minimumShouldMatch("100%")); + /* queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getNYLXCLASS(), "textContent" - ).minimumShouldMatch("100%").field("title",1000f)); + ).minimumShouldMatch("100%").field("title",1000f));*/ } if(StringUtils.isNotBlank(searchInfoEO.getCLLX())){ queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getCLLX(), + "CLLXName" + ).minimumShouldMatch("100%")); + /* queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getCLLX(), "textContent" - ).minimumShouldMatch("100%").field("title",1000f)); + ).minimumShouldMatch("100%").field("title",1000f));*/ } boolQueryBuilder.must(queryBuilder);