yoho-search / yoho-search-service · Commits

Go to a project

Authored by unknown
Commit 1062325672f52be8031773f3a05ebb18257302a3 1 parent a749ffaf

代码优化

Inline Side-by-side
Showing 18 changed files with 9 additions and 42 deletions
@@ -61,9 +61,6 @@ public class AggregationService implements ApplicationEventPublisherAware { @@ -61,9 +61,6 @@ public class AggregationService implements ApplicationEventPublisherAware {
61 61
62 private SearchResult doSearchForAggregation(IAggregation aggregation, SearchParam searchParam) { 62 private SearchResult doSearchForAggregation(IAggregation aggregation, SearchParam searchParam) {
63 SearchParam searchParamClone = searchParam.clone(); 63 SearchParam searchParamClone = searchParam.clone();
64 - searchParamClone.setPage(1);  
65 - searchParamClone.setOffset(1);  
66 - searchParamClone.setSize(0);  
67 return searchCommonService.doSearch(AggregationServiceIndex, searchParamClone); 64 return searchCommonService.doSearch(AggregationServiceIndex, searchParamClone);
68 } 65 }
69 66
@@ -106,9 +103,7 @@ public class AggregationService implements ApplicationEventPublisherAware { @@ -106,9 +103,7 @@ public class AggregationService implements ApplicationEventPublisherAware {
106 private SearchParam genSearchParamForAgg(IAggregation aggregation, Map<String, String> paramMap, String filterParamName, int cacheSize) throws Exception { 103 private SearchParam genSearchParamForAgg(IAggregation aggregation, Map<String, String> paramMap, String filterParamName, int cacheSize) throws Exception {
107 SearchParam searchParam = searchParamHelper.buildWithFilterParam(paramMap,filterParamName); 104 SearchParam searchParam = searchParamHelper.buildWithFilterParam(paramMap,filterParamName);
108 searchParam.setAggregationBuilders(Arrays.asList(aggregation.getBuilder())); 105 searchParam.setAggregationBuilders(Arrays.asList(aggregation.getBuilder()));
109 - searchParam.setPage(0);  
110 searchParam.setOffset(cacheSize);// 只是用来做缓存的 106 searchParam.setOffset(cacheSize);// 只是用来做缓存的
111 - searchParam.setSize(0);  
112 return searchParam; 107 return searchParam;
113 } 108 }
114 109
@@ -100,8 +100,6 @@ public class SearchLikeHelper { @@ -100,8 +100,6 @@ public class SearchLikeHelper {
100 boolFilter.must(QueryBuilders.termsQuery("productSkn", productSkn)); 100 boolFilter.must(QueryBuilders.termsQuery("productSkn", productSkn));
101 searchParam.setFiter(boolFilter); 101 searchParam.setFiter(boolFilter);
102 searchParam.setAggregationBuilders(null); 102 searchParam.setAggregationBuilders(null);
103 - searchParam.setPage(0);  
104 - searchParam.setOffset(0);  
105 searchParam.setSize(1); 103 searchParam.setSize(1);
106 104
107 String productIndexName = ISearchConstants.INDEX_NAME_PRODUCT_INDEX; 105 String productIndexName = ISearchConstants.INDEX_NAME_PRODUCT_INDEX;
@@ -88,7 +88,6 @@ public class HelperServiceImpl extends BaseService implements IHelperService, Ap @@ -88,7 +88,6 @@ public class HelperServiceImpl extends BaseService implements IHelperService, Ap
88 if (pageSize > 500) { 88 if (pageSize > 500) {
89 pageSize = 500; 89 pageSize = 500;
90 } 90 }
91 - searchParam.setPage(page);  
92 searchParam.setOffset((page - 1) * pageSize); 91 searchParam.setOffset((page - 1) * pageSize);
93 searchParam.setSize(pageSize); 92 searchParam.setSize(pageSize);
94 93
@@ -56,9 +56,6 @@ public class ProductCountServiceImpl implements IProductCountService { @@ -56,9 +56,6 @@ public class ProductCountServiceImpl implements IProductCountService {
56 private long queryProductCount(SearchParam searchParam) { 56 private long queryProductCount(SearchParam searchParam) {
57 // 1）为searchParam设置默认值 57 // 1）为searchParam设置默认值
58 searchParam.setAggregationBuilders(null); 58 searchParam.setAggregationBuilders(null);
59 - searchParam.setPage(0);  
60 - searchParam.setOffset(0);  
61 - searchParam.setSize(0);  
62 searchParam.setSearchType(SearchType.QUERY_THEN_FETCH); 59 searchParam.setSearchType(SearchType.QUERY_THEN_FETCH);
63 60
64 final String indexName = ISearchConstants.INDEX_NAME_PRODUCT_INDEX; 61 final String indexName = ISearchConstants.INDEX_NAME_PRODUCT_INDEX;
@@ -268,7 +268,6 @@ public class ProductListServiceImpl implements IProductListService { @@ -268,7 +268,6 @@ public class ProductListServiceImpl implements IProductListService {
268 SearchParam searchParam = searchParamHelper.buildWithPersional(paramMap, true); 268 SearchParam searchParam = searchParamHelper.buildWithPersional(paramMap, true);
269 setHighlight(paramMap, searchParam); 269 setHighlight(paramMap, searchParam);
270 searchParam.setAggregationBuilders(null); 270 searchParam.setAggregationBuilders(null);
271 - searchParam.setPage(page);  
272 searchParam.setSize(pageSize); 271 searchParam.setSize(pageSize);
273 searchParam.setOffset((page - 1) * pageSize); 272 searchParam.setOffset((page - 1) * pageSize);
274 // 3）设置排序字段 273 // 3）设置排序字段
@@ -231,7 +231,6 @@ public class ProductListWithSupplyServiceImpl implements IProductListWithSupplyS @@ -231,7 +231,6 @@ public class ProductListWithSupplyServiceImpl implements IProductListWithSupplyS
231 SearchParam searchParam = searchParamHelper.buildDefault(paramMap); 231 SearchParam searchParam = searchParamHelper.buildDefault(paramMap);
232 setHighlight(paramMap, searchParam); 232 setHighlight(paramMap, searchParam);
233 searchParam.setAggregationBuilders(null); 233 searchParam.setAggregationBuilders(null);
234 - searchParam.setPage(page);  
235 searchParam.setOffset((page - 1) * pageSize); 234 searchParam.setOffset((page - 1) * pageSize);
236 searchParam.setSize(pageSize); 235 searchParam.setSize(pageSize);
237 // 3）设置排序字段 236 // 3）设置排序字段
@@ -103,7 +103,6 @@ public class RobotQuestionServiceImpl extends BaseService implements IRobotQuest @@ -103,7 +103,6 @@ public class RobotQuestionServiceImpl extends BaseService implements IRobotQuest
103 if (pageSize > 500) { 103 if (pageSize > 500) {
104 pageSize = 500; 104 pageSize = 500;
105 } 105 }
106 - searchParam.setPage(page);  
107 searchParam.setOffset((page - 1) * pageSize); 106 searchParam.setOffset((page - 1) * pageSize);
108 searchParam.setSize(pageSize); 107 searchParam.setSize(pageSize);
109 108
@@ -257,7 +257,7 @@ public class SearchRecommendServiceImpl implements ISearchRecommendService { @@ -257,7 +257,7 @@ public class SearchRecommendServiceImpl implements ISearchRecommendService {
257 257
258 QueryBuilder queryBuilder = isLimitKeywords ? buildQueryBuilderByLimit(terms) : buildQueryBuilder(keywordsToSearch, termSet); 258 QueryBuilder queryBuilder = isLimitKeywords ? buildQueryBuilderByLimit(terms) : buildQueryBuilder(keywordsToSearch, termSet);
259 searchParam.setQuery(queryBuilder); 259 searchParam.setQuery(queryBuilder);
260 - searchParam.setPage(1); 260 + searchParam.setOffset(0);
261 searchParam.setSize(SMART_SUGGESTION_TERM_COUNT); 261 searchParam.setSize(SMART_SUGGESTION_TERM_COUNT);
262 262
263 // 3.5) 设置过滤条件 263 // 3.5) 设置过滤条件
@@ -461,7 +461,7 @@ public class SearchRecommendServiceImpl implements ISearchRecommendService { @@ -461,7 +461,7 @@ public class SearchRecommendServiceImpl implements ISearchRecommendService {
461 // 2) 根据terms搜索构造搜索请求 要求完全匹配source 461 // 2) 根据terms搜索构造搜索请求 要求完全匹配source
462 SearchParam searchParam = new SearchParam(); 462 SearchParam searchParam = new SearchParam();
463 searchParam.setQuery(QueryBuilders.termQuery("source.source_keyword", queryWord.trim().toLowerCase())); 463 searchParam.setQuery(QueryBuilders.termQuery("source.source_keyword", queryWord.trim().toLowerCase()));
464 - searchParam.setPage(1); 464 + searchParam.setOffset(0);
465 searchParam.setSize(1); 465 searchParam.setSize(1);
466 searchParam.setFiter(QueryBuilders.termQuery("status", 1)); 466 searchParam.setFiter(QueryBuilders.termQuery("status", 1));
467 467
@@ -519,7 +519,6 @@ public class SearchRecommendServiceImpl implements ISearchRecommendService { @@ -519,7 +519,6 @@ public class SearchRecommendServiceImpl implements ISearchRecommendService {
519 SearchParam searchParam = new SearchParam(); 519 SearchParam searchParam = new SearchParam();
520 QueryBuilder queryBuilder = StringUtils.isNotEmpty(queryWord) ? QueryBuilders.matchQuery("source", queryWord) : QueryBuilders.matchAllQuery(); 520 QueryBuilder queryBuilder = StringUtils.isNotEmpty(queryWord) ? QueryBuilders.matchQuery("source", queryWord) : QueryBuilders.matchAllQuery();
521 searchParam.setQuery(queryBuilder); 521 searchParam.setQuery(queryBuilder);
522 - searchParam.setPage(page);  
523 searchParam.setOffset((page - 1) * 10); 522 searchParam.setOffset((page - 1) * 10);
524 searchParam.setSize(10); 523 searchParam.setSize(10);
525 if (updateTime > 0) { 524 if (updateTime > 0) {
@@ -116,8 +116,7 @@ public class SearchSortGroupService implements ISearchSortGroupService, Applicat @@ -116,8 +116,7 @@ public class SearchSortGroupService implements ISearchSortGroupService, Applicat
116 searchParam.setAggregationBuilders(sortGroupBuilders); 116 searchParam.setAggregationBuilders(sortGroupBuilders);
117 117
118 // 设置查询结果 118 // 设置查询结果
119 - searchParam.setPage(1);  
120 - searchParam.setOffset(1); 119 + searchParam.setOffset(1);//just for cache
121 searchParam.setSize(0); 120 searchParam.setSize(0);
122 121
123 // 构造返回结果 122 // 构造返回结果
@@ -75,8 +75,7 @@ public class SelectionForAppImpl implements ISelectionsForApp { @@ -75,8 +75,7 @@ public class SelectionForAppImpl implements ISelectionsForApp {
75 searchParam.setAggregationBuilders(this.getAllAggregationBuilders(paramMap)); 75 searchParam.setAggregationBuilders(this.getAllAggregationBuilders(paramMap));
76 // 构造其他参数 76 // 构造其他参数
77 final String productIndexName = ISearchConstants.INDEX_NAME_PRODUCT_INDEX; 77 final String productIndexName = ISearchConstants.INDEX_NAME_PRODUCT_INDEX;
78 - searchParam.setPage(1);  
79 - searchParam.setOffset(1); 78 + searchParam.setOffset(2);//just for cache
80 searchParam.setSize(0); 79 searchParam.setSize(0);
81 80
82 // 先从缓存里取，取到则处理下缓存结果并直接返回 81 // 先从缓存里取，取到则处理下缓存结果并直接返回
@@ -92,8 +92,7 @@ public class SelectionsForPcImpl implements ISelectionsForPc { @@ -92,8 +92,7 @@ public class SelectionsForPcImpl implements ISelectionsForPc {
92 public SearchApiResult getSelectionsForPc(Map<String, String> paramMap, BoolQueryBuilder mustFilter) throws Exception { 92 public SearchApiResult getSelectionsForPc(Map<String, String> paramMap, BoolQueryBuilder mustFilter) throws Exception {
93 // 1)构造SearchParam 93 // 1)构造SearchParam
94 SearchParam searchParam = searchParamHelper.buildWithMustFilter(paramMap, mustFilter); 94 SearchParam searchParam = searchParamHelper.buildWithMustFilter(paramMap, mustFilter);
95 - searchParam.setPage(1);  
96 - searchParam.setOffset(1); 95 + searchParam.setOffset(3);// just for cache
97 searchParam.setSize(0); 96 searchParam.setSize(0);
98 97
99 SearchParam searchParamClone = searchParam.clone();// 用来缓存 98 SearchParam searchParamClone = searchParam.clone();// 用来缓存
@@ -126,9 +126,8 @@ public class SimilarProductServiceImpl extends BaseService implements ISimilarPr @@ -126,9 +126,8 @@ public class SimilarProductServiceImpl extends BaseService implements ISimilarPr
126 aggregationBuilders.add(brandIdAgg); 126 aggregationBuilders.add(brandIdAgg);
127 searchParam.setAggregationBuilders(aggregationBuilders); 127 searchParam.setAggregationBuilders(aggregationBuilders);
128 // 3、设置分页 128 // 3、设置分页
129 - searchParam.setPage(0);  
130 - searchParam.setSize(0);  
131 searchParam.setOffset(0); 129 searchParam.setOffset(0);
  130 + searchParam.setSize(0);
132 // 4、先从缓存中获取,如果能取到，则直接返回 131 // 4、先从缓存中获取,如果能取到，则直接返回
133 JSONObject sortAndBrandJSONObject = searchCacheService.getJSONObjectFromCache(searchLikeSearchCache,ISearchConstants.INDEX_NAME_PRODUCT_INDEX, searchParam); 132 JSONObject sortAndBrandJSONObject = searchCacheService.getJSONObjectFromCache(searchLikeSearchCache,ISearchConstants.INDEX_NAME_PRODUCT_INDEX, searchParam);
134 if (sortAndBrandJSONObject != null) { 133 if (sortAndBrandJSONObject != null) {
@@ -190,9 +189,8 @@ public class SimilarProductServiceImpl extends BaseService implements ISimilarPr @@ -190,9 +189,8 @@ public class SimilarProductServiceImpl extends BaseService implements ISimilarPr
190 searchParam.setAggregationBuilders(Arrays.asList(smallSortAndBrandAgg)); 189 searchParam.setAggregationBuilders(Arrays.asList(smallSortAndBrandAgg));
191 190
192 // 5、设置分页 191 // 5、设置分页
193 - searchParam.setPage(0);  
194 - searchParam.setSize(0);  
195 searchParam.setOffset(0); 192 searchParam.setOffset(0);
  193 + searchParam.setSize(0);
196 194
197 // 6、先从缓存中获取,如果能取到，则直接返回 195 // 6、先从缓存中获取,如果能取到，则直接返回
198 JSONArray recommendedSknJSONArray = searchCacheService.getJSONArrayFromCache(searchLikeSearchCache,ISearchConstants.INDEX_NAME_PRODUCT_INDEX, searchParam); 196 JSONArray recommendedSknJSONArray = searchCacheService.getJSONArrayFromCache(searchLikeSearchCache,ISearchConstants.INDEX_NAME_PRODUCT_INDEX, searchParam);
@@ -228,7 +226,6 @@ public class SimilarProductServiceImpl extends BaseService implements ISimilarPr @@ -228,7 +226,6 @@ public class SimilarProductServiceImpl extends BaseService implements ISimilarPr
228 searchParam.setFiter(this.getDefaultBoolQueryBuilder()); 226 searchParam.setFiter(this.getDefaultBoolQueryBuilder());
229 searchParam.setQuery(this.builderProductQueryBuilder(paramMap, recommendSknList)); 227 searchParam.setQuery(this.builderProductQueryBuilder(paramMap, recommendSknList));
230 searchParam.setAggregationBuilders(null); 228 searchParam.setAggregationBuilders(null);
231 - searchParam.setPage(page);  
232 searchParam.setOffset((page - 1) * pageSize); 229 searchParam.setOffset((page - 1) * pageSize);
233 searchParam.setSize(pageSize); 230 searchParam.setSize(pageSize);
234 List<SortBuilder> sortBuilders = new ArrayList<>(); 231 List<SortBuilder> sortBuilders = new ArrayList<>();
@@ -148,8 +148,8 @@ public class SuggestServiceImpl implements ISuggestService, ApplicationEventPubl @@ -148,8 +148,8 @@ public class SuggestServiceImpl implements ISuggestService, ApplicationEventPubl
148 QueryBuilder query = QueryBuilders.boolQuery().should(QueryBuilders.prefixQuery("keyword", keyword)).should(QueryBuilders.prefixQuery("keyword.keyword_pinyin", keyword)) 148 QueryBuilder query = QueryBuilders.boolQuery().should(QueryBuilders.prefixQuery("keyword", keyword)).should(QueryBuilders.prefixQuery("keyword.keyword_pinyin", keyword))
149 .should(QueryBuilders.prefixQuery("keyword.keyword_jianpin", keyword)); 149 .should(QueryBuilders.prefixQuery("keyword.keyword_jianpin", keyword));
150 searchParam.setQuery(query); 150 searchParam.setQuery(query);
151 - searchParam.setPage(1);  
152 searchParam.setSize(size); 151 searchParam.setSize(size);
  152 + searchParam.setOffset(0);
153 153
154 // count数量要>=2 154 // count数量要>=2
155 final String countEsField = getCountField(paramMap); 155 final String countEsField = getCountField(paramMap);
@@ -285,7 +285,6 @@ public class SuggestServiceImpl implements ISuggestService, ApplicationEventPubl @@ -285,7 +285,6 @@ public class SuggestServiceImpl implements ISuggestService, ApplicationEventPubl
285 } 285 }
286 286
287 searchParam.setQuery(queryBuilder); 287 searchParam.setQuery(queryBuilder);
288 - searchParam.setPage(page);  
289 searchParam.setOffset((page - 1) * 10); 288 searchParam.setOffset((page - 1) * 10);
290 searchParam.setSize(10); 289 searchParam.setSize(10);
291 290
@@ -332,7 +331,6 @@ public class SuggestServiceImpl implements ISuggestService, ApplicationEventPubl @@ -332,7 +331,6 @@ public class SuggestServiceImpl implements ISuggestService, ApplicationEventPubl
332 List<SortBuilder> sortBuilders = new ArrayList<SortBuilder>(); 331 List<SortBuilder> sortBuilders = new ArrayList<SortBuilder>();
333 sortBuilders.add(SortBuilders.fieldSort(countEsField).order(SortOrder.DESC)); 332 sortBuilders.add(SortBuilders.fieldSort(countEsField).order(SortOrder.DESC));
334 searchParam.setSortBuilders(sortBuilders); 333 searchParam.setSortBuilders(sortBuilders);
335 - searchParam.setPage(page);  
336 searchParam.setOffset((page - 1) * pageSize); 334 searchParam.setOffset((page - 1) * pageSize);
337 searchParam.setSize(pageSize); 335 searchParam.setSize(pageSize);
338 // 2) 调用ES查询 336 // 2) 调用ES查询
@@ -125,7 +125,6 @@ public class GoodProductSceneService { @@ -125,7 +125,6 @@ public class GoodProductSceneService {
125 searchParam.setFiter(boolFilter); 125 searchParam.setFiter(boolFilter);
126 searchParam.setQuery(this.builderGoodProductQueryBuilder(paramMap, boolFilter, recommondSkns)); 126 searchParam.setQuery(this.builderGoodProductQueryBuilder(paramMap, boolFilter, recommondSkns));
127 searchParam.setAggregationBuilders(null); 127 searchParam.setAggregationBuilders(null);
128 - searchParam.setPage(page);  
129 searchParam.setOffset((page - 1) * pageSize); 128 searchParam.setOffset((page - 1) * pageSize);
130 searchParam.setSize(pageSize); 129 searchParam.setSize(pageSize);
131 //设置不返回字段 130 //设置不返回字段
@@ -184,7 +183,6 @@ public class GoodProductSceneService { @@ -184,7 +183,6 @@ public class GoodProductSceneService {
184 aggregationBuilders.add(brandIdAgg); 183 aggregationBuilders.add(brandIdAgg);
185 searchParam.setAggregationBuilders(aggregationBuilders); 184 searchParam.setAggregationBuilders(aggregationBuilders);
186 // 3、设置分页 185 // 3、设置分页
187 - searchParam.setPage(0);  
188 searchParam.setSize(0); 186 searchParam.setSize(0);
189 searchParam.setOffset(0); 187 searchParam.setOffset(0);
190 188
@@ -283,7 +281,6 @@ public class GoodProductSceneService { @@ -283,7 +281,6 @@ public class GoodProductSceneService {
283 searchParam.setAggregationBuilders(list); 281 searchParam.setAggregationBuilders(list);
284 282
285 // 5、设置分页 283 // 5、设置分页
286 - searchParam.setPage(0);  
287 searchParam.setSize(0); 284 searchParam.setSize(0);
288 searchParam.setOffset(0); 285 searchParam.setOffset(0);
289 286
@@ -227,7 +227,6 @@ public class PromotionSceneService { @@ -227,7 +227,6 @@ public class PromotionSceneService {
227 if (pageSize > 500) { 227 if (pageSize > 500) {
228 pageSize = 500; 228 pageSize = 500;
229 } 229 }
230 - searchParam.setPage(page);  
231 searchParam.setOffset((page - 1) * pageSize); 230 searchParam.setOffset((page - 1) * pageSize);
232 searchParam.setSize(pageSize); 231 searchParam.setSize(pageSize);
233 // 5）设置排序字段 232 // 5）设置排序字段
@@ -277,9 +276,8 @@ public class PromotionSceneService { @@ -277,9 +276,8 @@ public class PromotionSceneService {
277 aggregationBuilders.add(sortGroupAggregation.getBuilder()); 276 aggregationBuilders.add(sortGroupAggregation.getBuilder());
278 277
279 // 4、设置分页参数 278 // 4、设置分页参数
280 - searchParam.setPage(1);  
281 searchParam.setOffset(0); 279 searchParam.setOffset(0);
282 - searchParam.setSize(1); 280 + searchParam.setSize(0);
283 281
284 final String productIndexName = ISearchConstants.INDEX_NAME_PRODUCT_INDEX; 282 final String productIndexName = ISearchConstants.INDEX_NAME_PRODUCT_INDEX;
285 283
@@ -143,7 +143,6 @@ public class SearchLikeSceneService { @@ -143,7 +143,6 @@ public class SearchLikeSceneService {
143 sortBuilders.add(SortBuilders.fieldSort("_score").order(SortOrder.DESC)); 143 sortBuilders.add(SortBuilders.fieldSort("_score").order(SortOrder.DESC));
144 searchParam.setSortBuilders(sortBuilders); 144 searchParam.setSortBuilders(sortBuilders);
145 // 4、设置分页参数 145 // 4、设置分页参数
146 - searchParam.setPage(1);  
147 searchParam.setOffset(0); 146 searchParam.setOffset(0);
148 searchParam.setSize(limit); 147 searchParam.setSize(limit);
149 148
@@ -196,7 +195,6 @@ public class SearchLikeSceneService { @@ -196,7 +195,6 @@ public class SearchLikeSceneService {
196 searchParam.setAggregationBuilders(list); 195 searchParam.setAggregationBuilders(list);
197 196
198 // 4、设置分页参数 197 // 4、设置分页参数
199 - searchParam.setPage(0);  
200 searchParam.setOffset(0); 198 searchParam.setOffset(0);
201 searchParam.setSize(0); 199 searchParam.setSize(0);
202 200
@@ -370,7 +368,6 @@ public class SearchLikeSceneService { @@ -370,7 +368,6 @@ public class SearchLikeSceneService {
370 sortBuilders.add(SortBuilders.fieldSort("_score").order(SortOrder.DESC)); 368 sortBuilders.add(SortBuilders.fieldSort("_score").order(SortOrder.DESC));
371 searchParam.setSortBuilders(sortBuilders); 369 searchParam.setSortBuilders(sortBuilders);
372 // 4、设置分页参数 370 // 4、设置分页参数
373 - searchParam.setPage(1);  
374 searchParam.setOffset(0); 371 searchParam.setOffset(0);
375 searchParam.setSize(pageSize); 372 searchParam.setSize(pageSize);
376 return searchParam; 373 return searchParam;
@@ -108,7 +108,6 @@ public class SceneProductListService extends BaseService { @@ -108,7 +108,6 @@ public class SceneProductListService extends BaseService {
108 SearchParam searchParam = searchParamHelper.buildWithPersional(paramMap, true); 108 SearchParam searchParam = searchParamHelper.buildWithPersional(paramMap, true);
109 setHighlight(paramMap, searchParam); 109 setHighlight(paramMap, searchParam);
110 searchParam.setAggregationBuilders(null); 110 searchParam.setAggregationBuilders(null);
111 - searchParam.setPage(page);  
112 searchParam.setOffset((page - 1) * pageSize); 111 searchParam.setOffset((page - 1) * pageSize);
113 searchParam.setSize(pageSize); 112 searchParam.setSize(pageSize);
114 // 3）设置排序字段 113 // 3）设置排序字段
@@ -197,7 +197,6 @@ public class SceneSelectionsService extends BaseService { @@ -197,7 +197,6 @@ public class SceneSelectionsService extends BaseService {
197 searchParam.setAggregationBuilders(this.getAggregationBuilders(aggregations)); 197 searchParam.setAggregationBuilders(this.getAggregationBuilders(aggregations));
198 // 2)构造其他参数 198 // 2)构造其他参数
199 final String productIndexName = ISearchConstants.INDEX_NAME_PRODUCT_INDEX; 199 final String productIndexName = ISearchConstants.INDEX_NAME_PRODUCT_INDEX;
200 - searchParam.setPage(0);  
201 searchParam.setOffset(100);// just for cache 200 searchParam.setOffset(100);// just for cache
202 searchParam.setSize(0); 201 searchParam.setSize(0);
203 202