yoho-search / yoho-search-service · Commits

Go to a project

Authored by hugufei
Commit 948c56e90529da373a9134da083c5f5f0cae3439 1 parent c7bb195d

添加ProductListHelper解决重复代码

Inline Side-by-side
Showing 4 changed files with 95 additions and 105 deletions
package com.yoho.search.restapi.tools;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.yoho.search.common.utils.LogUtils;
import com.yoho.search.models.KeyWordWithCount;
import com.yoho.search.models.SearchApiResult;
import com.yoho.search.service.base.SearchDynamicConfigService;
import com.yoho.search.service.helper.SearchKeyWordHelper;
import com.yoho.search.service.scorer.personal.PersonalVectorFeatureSearch;
import com.yoho.search.service.service.IProductListService;
import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse.AnalyzeToken;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
... ... @@ -13,13 +15,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yoho.search.common.utils.LogUtils;
import com.yoho.search.models.KeyWordWithCount;
import com.yoho.search.models.SearchApiResult;
import com.yoho.search.service.base.SearchDynamicConfigService;
import com.yoho.search.service.helper.SearchKeyWordHelper;
import com.yoho.search.service.scorer.personal.PersonalVectorFeatureSearch;
import com.yoho.search.service.service.IProductListService;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Controller
@RequestMapping(value = "/tools")
... ... @@ -171,19 +170,6 @@ public class ToolsController {
return rtnMap;
}
@SuppressWarnings("unchecked")
@RequestMapping(method = RequestMethod.GET, value = "/calVectorFeature")
@ResponseBody
public SearchApiResult calVectorFeature(@RequestParam String uid, @RequestParam String skns, @RequestParam String version) throws Exception {
SearchApiResult productListResult = productListService.productListBySknList(skns);
if (productListResult.getCode() != 200) {
return productListResult;
}
Map<String, String> productVectorFeatureMap = (Map<String, String>) productListResult.getData();
return new SearchApiResult().setData(personalVectorFeatureSearch.calVectorFeature(uid, version, productVectorFeatureMap));
}
/**
* 用于动态地变更日记级别。
* @param loggerName 日志名称，有三类：
... ...
package com.yoho.search.service.helper;
import com.alibaba.fastjson.JSONObject;
import com.yoho.search.base.utils.ProductIndexEsField;
import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.core.es.model.SearchResult;
import com.yoho.search.service.base.ProductListSortService;
import com.yoho.search.service.base.index.ProductIndexBaseService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
@Component
public class ProductListHelper {
@Autowired
private ProductIndexBaseService productIndexBaseService;
@Autowired
private ProductListSortService productListSortService;
@Autowired
private SearchParamHelper searchParamHelper;
@Autowired
private SearchSortHelper searchSortHelper;
public SearchParam buildProductListSearchParam(Map<String, String> paramMap, boolean containPhrase) throws Exception {
// 1）验证查询条数
int pageSize = StringUtils.isBlank(paramMap.get("viewNum")) ? 10 : Integer.parseInt(paramMap.get("viewNum"));
int page = StringUtils.isBlank(paramMap.get("page")) ? 1 : Integer.parseInt(paramMap.get("page"));
if (page < 1 || pageSize < 0) {
throw new IllegalArgumentException("分页参数不合法");
}
if (pageSize > 100) {
pageSize = 100;
}
// 2)构建基本查询参数
SearchParam searchParam = searchParamHelper.buildWithPersional(paramMap, true);
searchParam.setAggregationBuilders(null);
searchParam.setSize(pageSize);
searchParam.setOffset((page - 1) * pageSize);
// 3）设置排序字段
searchParam.setSortBuilders(searchSortHelper.buildSortList(paramMap));
// 4)设置返回的结果
List<String> includeFields = productIndexBaseService.getProductIndexIncludeFields();
if (containPhrase) {
includeFields.add(ProductIndexEsField.phrase);
}
searchParam.setIncludeFields(includeFields);
return searchParam;
}
/**
* 构建常见的列表返回对象
* @param searchResult
* @param pageSize
* @param needReSort
* @return
*/
public JSONObject buildProductListResult(SearchResult searchResult,int pageSize,boolean needReSort){
JSONObject productListResult = new JSONObject();
productListResult.put("total", searchResult.getTotal());
productListResult.put("page", searchResult.getPage());
productListResult.put("page_size", pageSize);
productListResult.put("page_total", searchResult.getTotalPage());
List<Map<String, Object>> productList = searchResult.getResultList();
productList = productIndexBaseService.getProductListWithPricePlan(productList);
if(needReSort){
productList = productListSortService.sortProductList(productList);
}
productListResult.put("product_list", productList);
return productListResult;
}
}
... ...
package com.yoho.search.service.service;
import java.util.Map;
import com.yoho.search.models.SearchApiResult;
public interface IProductListService {
import java.util.Map;
/**
* 根据指定的SKN列表搜索[测试使用，不使用缓存]
*
* @param skns
* SKN列表，多个SKN之间用逗号分隔
* @return
*/
SearchApiResult productListBySknList(String skns);
public interface IProductListService {
/**
* 打印获取商品列表的ES语句
... ...
... ... @@ -10,22 +10,19 @@ import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.core.es.model.SearchResult;
import com.yoho.search.core.es.utils.SearchParamUtils;
import com.yoho.search.models.SearchApiResult;
import com.yoho.search.service.base.ProductListSortService;
import com.yoho.search.service.base.SearchCommonService;
import com.yoho.search.service.base.index.ProductIndexBaseService;
import com.yoho.search.service.helper.ProductListHelper;
import com.yoho.search.service.helper.SearchParamHelper;
import com.yoho.search.service.helper.SearchSortHelper;
import com.yoho.search.service.service.IProductListService;
import org.apache.commons.lang.StringUtils;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
... ... @@ -35,39 +32,15 @@ public class ProductListServiceImpl implements IProductListService {
private static final Logger logger = LoggerFactory.getLogger(ProductListServiceImpl.class);
@Autowired
private SearchParamHelper searchParamHelper;
@Autowired
private SearchSortHelper searchSortHelper;
@Autowired
private SearchCommonService searchCommonService;
@Autowired
private ProductIndexBaseService productIndexBaseService;
@Autowired
private ProductListSortService productListSortService;
@Override
public SearchApiResult productListBySknList(String skns) {
List<String> sknList = Arrays.asList(skns.split(","));
SearchParam searchParam = new SearchParam();
searchParam.setSize(sknList.size());
searchParam.setQuery(QueryBuilders.termsQuery("productSkn.productSkn_ansj", sknList));
SearchResult searchResult = searchCommonService.doSearch(ISearchConstants.INDEX_NAME_PRODUCT_INDEX, searchParam);
if (searchResult == null) {
return new SearchApiResult().setCode(500).setMessage("execption");
}
Map<String, String> productVectorFeatureMap = new HashMap<>(sknList.size());
searchResult.getResultList().forEach(data -> {
productVectorFeatureMap.put("" + data.get("productSkn"), "" + data.get("productFeatureFactor"));
});
return new SearchApiResult().setData(productVectorFeatureMap);
}
private ProductListHelper productListHelper;
@Override
public SearchApiResult getESDsl(Map<String, String> paramMap) {
logger.info("[func=getESDsl][param={}]", paramMap);
try {
SearchParam searchParam = buildProductListSearchParam(paramMap, false);
SearchParam searchParam = productListHelper.buildProductListSearchParam(paramMap, false);
SearchSourceBuilder searchSourceBuilder = SearchParamUtils.genSearchSourceBuilderFromSearchParam(searchParam);
SearchApiResult searchApiResult = new SearchApiResult();
String results = searchSourceBuilder.toString();
... ... @@ -79,41 +52,12 @@ public class ProductListServiceImpl implements IProductListService {
}
}
private SearchParam buildProductListSearchParam(Map<String, String> paramMap, boolean containPhrase) throws Exception {
// 1）验证查询条数
int pageSize = StringUtils.isBlank(paramMap.get("viewNum")) ? 10 : Integer.parseInt(paramMap.get("viewNum"));
int page = StringUtils.isBlank(paramMap.get("page")) ? 1 : Integer.parseInt(paramMap.get("page"));
if (page < 1 || pageSize < 0) {
throw new IllegalArgumentException("分页参数不合法");
}
if (pageSize > 100) {
pageSize = 100;
}
// 2)构建基本查询参数
SearchParam searchParam = searchParamHelper.buildWithPersional(paramMap, true);
searchParam.setAggregationBuilders(null);
searchParam.setSize(pageSize);
searchParam.setOffset((page - 1) * pageSize);
// 3）设置排序字段
searchParam.setSortBuilders(searchSortHelper.buildSortList(paramMap));
// 4)设置返回的结果
List<String> includeFields = productIndexBaseService.getProductIndexIncludeFields();
if (containPhrase) {
includeFields.add(ProductIndexEsField.phrase);
}
searchParam.setIncludeFields(includeFields);
return searchParam;
}
@Override
@SearchCacheAble(cacheInMinute = 10, cacheName = "PRODUCT_LIST_WITH_PHRASE")
public SearchApiResult productListWithPhrase(Map<String, String> paramMap) {
try {
long begin = System.currentTimeMillis();
logger.info("[func=productListWithPhrase][param={}][begin={}]", paramMap, begin);
// 1)构造搜索参数
SearchParam searchParam = this.buildProductListSearchParam(paramMap, true);
SearchParam searchParam = productListHelper.buildProductListSearchParam(paramMap, true);
// 2)查询ES
SearchResult searchResult = searchCommonService.doSearch(ISearchConstants.INDEX_NAME_PRODUCT_INDEX, searchParam);
... ... @@ -121,14 +65,8 @@ public class ProductListServiceImpl implements IProductListService {
return new SearchApiResult().setCode(500).setMessage("execption");
}
// 3)构造返回结果
JSONObject dataMap = new JSONObject();
dataMap.put("total", searchResult.getTotal());
dataMap.put("page", searchResult.getPage());
dataMap.put("page_size", searchParam.getSize());
dataMap.put("page_total", searchResult.getTotalPage());
List<Map<String, Object>> product_list = productIndexBaseService.getProductListWithPricePlan(searchResult.getResultList());
dataMap.put("product_list", product_list);
return new SearchApiResult().setData(dataMap);
JSONObject productListResult = productListHelper.buildProductListResult(searchResult,searchParam.getSize(),false);
return new SearchApiResult().setData(productListResult);
} catch (Exception e) {
logger.error("[func=productListWithPhrase][params=" + paramMap + "]", e);
return SearchApiResultUtils.errorSearchApiResult("productListWithPhrase", paramMap, e);
... ...