yoho-search / yoho-search-service · Commits

Go to a project

Authored by wangnan
Commit 3181cf93ee934a0d2c2e877feec6ba8fcaf022ea 1 parent 601a26cd

fix

Inline Side-by-side
Showing 1 changed file with 0 additions and 24 deletions
1 package com.yoho.search.service.scene.common; 1 package com.yoho.search.service.scene.common;
2 2
3 -<<<<<<< HEAD  
4 -import com.alibaba.fastjson.JSONArray;  
5 -=======  
6 -import java.util.ArrayList;  
7 -import java.util.HashMap;  
8 -import java.util.List;  
9 -import java.util.Map;  
10 -import java.util.concurrent.ExecutorService;  
11 -import java.util.concurrent.Executors;  
12 -  
13 -import org.elasticsearch.index.query.BoolQueryBuilder;  
14 -import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;  
15 -import org.elasticsearch.search.aggregations.Aggregation;  
16 -import org.slf4j.Logger;  
17 -import org.slf4j.LoggerFactory;  
18 -import org.springframework.beans.factory.annotation.Autowired;  
19 -import org.springframework.stereotype.Service;  
20 -  
21 ->>>>>>> 72f2270bacc8afa04b74ad355cd7b0173b5d0002  
22 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
23 import com.yoho.search.base.utils.ISearchConstants; 4 import com.yoho.search.base.utils.ISearchConstants;
24 import com.yoho.search.common.cache.SearchCacheMatchLogger; 5 import com.yoho.search.common.cache.SearchCacheMatchLogger;
@@ -30,8 +11,6 @@ import com.yoho.search.models.SearchApiResult; @@ -30,8 +11,6 @@ import com.yoho.search.models.SearchApiResult;
30 import com.yoho.search.service.aggregations.impls.AggregationFactoryService; 11 import com.yoho.search.service.aggregations.impls.AggregationFactoryService;
31 import com.yoho.search.service.base.SearchCommonService; 12 import com.yoho.search.service.base.SearchCommonService;
32 import com.yoho.search.service.helper.SearchParamHelper; 13 import com.yoho.search.service.helper.SearchParamHelper;
33 -<<<<<<< HEAD  
34 -import com.yoho.search.service.service.IAggRecommendService;  
35 import org.elasticsearch.index.query.BoolQueryBuilder; 14 import org.elasticsearch.index.query.BoolQueryBuilder;
36 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder; 15 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
37 import org.elasticsearch.search.aggregations.Aggregation; 16 import org.elasticsearch.search.aggregations.Aggregation;
@@ -44,11 +23,8 @@ import java.util.ArrayList; @@ -44,11 +23,8 @@ import java.util.ArrayList;
44 import java.util.HashMap; 23 import java.util.HashMap;
45 import java.util.List; 24 import java.util.List;
46 import java.util.Map; 25 import java.util.Map;
47 -import java.util.concurrent.CompletableFuture;  
48 import java.util.concurrent.ExecutorService; 26 import java.util.concurrent.ExecutorService;
49 import java.util.concurrent.Executors; 27 import java.util.concurrent.Executors;
50 -=======  
51 ->>>>>>> 72f2270bacc8afa04b74ad355cd7b0173b5d0002  
52 28
53 @Service 29 @Service
54 public class SceneSelectionsService extends AbstractCacheAbleService { 30 public class SceneSelectionsService extends AbstractCacheAbleService {