Authored by hugufei

删除SearchCacheService中无用的方法

... ... @@ -91,39 +91,6 @@ public class SearchCacheService {
return redisKeyBuilder;
}
private RedisKeyBuilder genSearchParamString(String indexName, List<SearchParam> searchParams) {
//1、拼装内容
StringBuilder redisKeyValue = new StringBuilder();
// 拼装索引名称
redisKeyValue.append("indexName:").append(indexName).append(';');
for (SearchParam searchParam : searchParams) {
// 拼装搜索类型
redisKeyValue.append("searchType:").append(searchParam.getSearchType() == null ? "" : searchParam.getSearchType().name()).append(';');
// 拼装报文
SearchSourceBuilder searchSourceBuilder = SearchParamUtils.genSearchSourceBuilderFromSearchParam(searchParam);
redisKeyValue.append("searchSource:").append(searchSourceBuilder).append(';');
}
//2、构建RedisKeyBuilder
RedisKeyBuilder redisKeyBuilder = RedisKeyBuilder.newInstance();
redisKeyBuilder.appendFixed("YOHOSEARCH:");
redisKeyBuilder.appendFixed("DEFAULT2:");
redisKeyBuilder.appendVar(MD5Util.string2MD5(redisKeyValue.toString()));
return redisKeyBuilder;
}
public void addJSONObjectToCache(SearchCache searchCache, RedisKeyBuilder redisKeyBuilder, JSONObject jsonObject) {
this.addObjectToCache(redisKeyBuilder, jsonObject, searchCache);
}
public JSONObject getJSONObjectFromCache(SearchCache searchCache, RedisKeyBuilder redisKeyBuilder) {
CacheObject cacheObject = this.getCacheObjectFromCache(redisKeyBuilder, searchCache);
if (cacheObject == null) {
return null;
}
return cacheObject.toJSONObject();
}
public void addJSONObjectToCache(SearchCache searchCache, String indexName, SearchParam searchParam, JSONObject jsonObject) {
RedisKeyBuilder key = this.genSearchParamString(indexName, searchParam);
this.addObjectToCache(key, jsonObject, searchCache);
... ... @@ -138,35 +105,6 @@ public class SearchCacheService {
return cacheObject.toJSONObject();
}
public void addJSONObjectToCache(SearchCache searchCache, String indexName, List<SearchParam> searchParams, JSONObject jsonObject) {
RedisKeyBuilder key = this.genSearchParamString(indexName, searchParams);
this.addObjectToCache(key, jsonObject, searchCache);
}
public JSONObject getJSONObjectFromCache(SearchCache searchCache, String indexName, List<SearchParam> searchParams) {
RedisKeyBuilder key = this.genSearchParamString(indexName, searchParams);
CacheObject cacheObject = this.getCacheObjectFromCache(key, searchCache);
if (cacheObject == null) {
return null;
}
return cacheObject.toJSONObject();
}
/*********************************** JSONArray *****************************************/
public void addJSONArrayToCache(SearchCache searchCache, String indexName, SearchParam searchParam, JSONArray jsonObject) {
RedisKeyBuilder key = this.genSearchParamString(indexName, searchParam);
this.addObjectToCache(key, jsonObject, searchCache);
}
public JSONArray getJSONArrayFromCache(SearchCache searchCache, String indexName, SearchParam searchParam) {
RedisKeyBuilder key = this.genSearchParamString(indexName, searchParam);
CacheObject cacheObject = this.getCacheObjectFromCache(key, searchCache);
if (cacheObject == null) {
return null;
}
return cacheObject.toJSONArray();
}
/*********************************** SearchApiResult *****************************************/
@SuppressWarnings("unchecked")
public <T extends Serializable> T getSerializableObjectFromCache(SearchCache searchCache, RedisKeyBuilder redisKeyBuilder, Class<T> clazz, boolean useJsonSerializable) {
... ...
... ... @@ -3,17 +3,16 @@ package com.yoho.search.service.scene.others.hongren;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.yoho.search.cache.beans.SearchCacheService;
import com.yoho.search.common.BaseSceneService;
import com.yoho.search.common.SearchRequestParams;
import com.yoho.search.common.utils.SearchApiResultUtils;
import com.yoho.search.core.es.agg.IAggregation;
import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.models.SearchApiResult;
import com.yoho.search.service.aggregations.AggregationsService;
import com.yoho.search.service.aggregations.impls.AggregationFactory;
import com.yoho.search.service.helper.SearchCommonHelper;
import com.yoho.search.service.helper.SearchKeyWordHelper;
import com.yoho.search.service.aggregations.AggregationsService;
import com.yoho.search.common.BaseSceneService;
import com.yoho.search.service.recall.models.common.ParamQueryFilter;
import com.yoho.search.service.scene.pages.entrance.ProductListSwitchService;
import org.apache.commons.collections.CollectionUtils;
... ... @@ -35,8 +34,6 @@ public class SearchHongRenService extends BaseSceneService {
private static final Logger logger = LoggerFactory.getLogger(SearchHongRenService.class);
@Autowired
protected SearchCacheService searchCacheService;
@Autowired
private ProductListSwitchService productListSwitchService;
@Autowired
private SearchCommonHelper searchCommonHelper;
... ...