yoho-search / yohomars-search-service · Commits

Go to a project

Authored by wangnan
Commit 0381a201fe9e2d5ba72dcfc3d71cc6c765fcf3e5 1 parent 5cf49c59

修改方法名

Inline Side-by-side
Showing 1 changed file with 20 additions and 20 deletions
... ... @@ -154,27 +154,27 @@ public class SearchServiceHelper {
//添加过滤请求
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_ID);
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_CITYID);
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_ISTOP);
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_ISRECOMMEND);
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_SORT);
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_BIZID);
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_ORDERBY);
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_SCORE);
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_ASSESSMENTNUM);
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_TAGS);
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_CONSUMPTION);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_ID);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_CITYID);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_ISTOP);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_ISRECOMMEND);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_SORT);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_BIZID);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_ORDERBY);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_SCORE);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_ASSESSMENTNUM);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_TAGS);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_CONSUMPTION);
//boolFilter = BoolQueryBuilder(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_LATITUDE);
//boolFilter = BoolQueryBuilder(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_LONGITUDE);
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_PUBLISHTIME);
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_USERTYPE);
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_USERAUTH);
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_ISDELETED);
boolFilter = BoolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_UID);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_PUBLISHTIME);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_USERTYPE);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_USERAUTH);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_ISDELETED);
boolFilter = boolQueryBuilderWithMutiValue(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_UID);
boolFilter = BoolQueryBuilderGte(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_STORENUM);
boolFilter = boolQueryBuilderGte(paramMap, boolFilter, ISearchConstans.PARAM_SEARCH_STORENUM);
// 通用的过滤请求
for (String key : paramMap.keySet()) {
... ... @@ -283,7 +283,7 @@ public class SearchServiceHelper {
* @param fieldName
* @return
*/
private BoolQueryBuilder BoolQueryBuilderWithMutiValue(Map<String, String> paramMap, BoolQueryBuilder boolFilter, String fieldName) {
private BoolQueryBuilder boolQueryBuilderWithMutiValue(Map<String, String> paramMap, BoolQueryBuilder boolFilter, String fieldName) {
if (paramMap.containsKey(fieldName) && StringUtils.isNotBlank(paramMap.get(fieldName))) {
int[] values = ConvertUtils.stringToIntArray(paramMap.get(fieldName), ",");
boolFilter.must(QueryBuilders.termsQuery(fieldName, values));
... ... @@ -300,7 +300,7 @@ public class SearchServiceHelper {
* @param fieldName
* @return
*/
private BoolQueryBuilder BoolQueryBuilder(Map<String, String> paramMap, BoolQueryBuilder boolFilter, String fieldName) {
private BoolQueryBuilder boolQueryBuilder(Map<String, String> paramMap, BoolQueryBuilder boolFilter, String fieldName) {
if (paramMap.containsKey(fieldName) && StringUtils.isNotBlank(paramMap.get(fieldName))) {
boolFilter.must(QueryBuilders.termsQuery(fieldName, paramMap.get(fieldName)));
}
... ... @@ -315,7 +315,7 @@ public class SearchServiceHelper {
* @param fieldName
* @return
*/
private BoolQueryBuilder BoolQueryBuilderGte(Map<String, String> paramMap, BoolQueryBuilder boolFilter, String fieldName) {
private BoolQueryBuilder boolQueryBuilderGte(Map<String, String> paramMap, BoolQueryBuilder boolFilter, String fieldName) {
if (paramMap.containsKey(fieldName) && StringUtils.isNotBlank(paramMap.get(fieldName))) {
int begin = Integer.parseInt(paramMap.get(fieldName));
if (begin == 0) {
... ...