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
package com.yoho.search.service.scene.common;
<<<<<<< HEAD
import com.alibaba.fastjson.JSONArray;
=======
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
import org.elasticsearch.search.aggregations.Aggregation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
>>>>>>> 72f2270bacc8afa04b74ad355cd7b0173b5d0002
import com.alibaba.fastjson.JSONObject;
import com.yoho.search.base.utils.ISearchConstants;
import com.yoho.search.common.cache.SearchCacheMatchLogger;
... ... @@ -30,8 +11,6 @@ import com.yoho.search.models.SearchApiResult;
import com.yoho.search.service.aggregations.impls.AggregationFactoryService;
import com.yoho.search.service.base.SearchCommonService;
import com.yoho.search.service.helper.SearchParamHelper;
<<<<<<< HEAD
import com.yoho.search.service.service.IAggRecommendService;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
import org.elasticsearch.search.aggregations.Aggregation;
... ... @@ -44,11 +23,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
=======
>>>>>>> 72f2270bacc8afa04b74ad355cd7b0173b5d0002
@Service
public class SceneSelectionsService extends AbstractCacheAbleService {
... ...