搜索中心--段落(数字模糊查询)
This commit is contained in:
+46
-8
@@ -913,13 +913,32 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
|
||||
Map<String, Object> queryMap = new HashMap<>();
|
||||
Map<String, Object> queryMapTemp = new HashMap<>();
|
||||
Map<String, Object> queryMap3 = new HashMap<>();
|
||||
queryMap3.put("query",s);
|
||||
//特殊处理编号字段
|
||||
if (key.equals("serial_number")){
|
||||
queryMapTemp.put(key, "*" + s + "*");
|
||||
queryMap.put("wildcard",queryMapTemp);
|
||||
queryMapJson.add(queryMap);
|
||||
} else {
|
||||
queryMap3.put("query",s);
|
||||
// queryMap3.put("minimum_should_match",2);
|
||||
queryMapTemp.put(key, queryMap3);
|
||||
queryMap.put("match", queryMapTemp);
|
||||
queryMapJson.add(queryMap);
|
||||
queryMapTemp.put(key, queryMap3);
|
||||
queryMap.put("match", queryMapTemp);
|
||||
queryMapJson.add(queryMap);
|
||||
}
|
||||
}
|
||||
}
|
||||
// if (ObjectUtils.isNotEmpty(value)) {
|
||||
// for (String s : value.split(",")) {
|
||||
// Map<String, Object> queryMap = new HashMap<>();
|
||||
// Map<String, Object> queryMapTemp = new HashMap<>();
|
||||
// Map<String, Object> queryMap3 = new HashMap<>();
|
||||
// queryMap3.put("query",s);
|
||||
//// queryMap3.put("minimum_should_match",2);
|
||||
// queryMapTemp.put(key, queryMap3);
|
||||
// queryMap.put("match", queryMapTemp);
|
||||
// queryMapJson.add(queryMap);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
if(CollectionUtils.isNotEmpty(queryMapJsonTemp)){
|
||||
JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJsonTemp, null, null);
|
||||
@@ -943,13 +962,32 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
|
||||
Map<String, Object> queryMap = new HashMap<>();
|
||||
Map<String, Object> queryMapTemp = new HashMap<>();
|
||||
Map<String, Object> queryMap3 = new HashMap<>();
|
||||
queryMap3.put("query",s);
|
||||
//特殊处理编号字段
|
||||
if (key.equals("serial_number")){
|
||||
queryMapTemp.put(key, "*" + s + "*");
|
||||
queryMap.put("wildcard",queryMapTemp);
|
||||
queryMapJsonTwo.add(queryMap);
|
||||
} else {
|
||||
queryMap3.put("query",s);
|
||||
// queryMap3.put("minimum_should_match",2);
|
||||
queryMapTemp.put(key, queryMap3);
|
||||
queryMap.put("match", queryMapTemp);
|
||||
queryMapJsonTwo.add(queryMap);
|
||||
queryMapTemp.put(key, queryMap3);
|
||||
queryMap.put("match", queryMapTemp);
|
||||
queryMapJsonTwo.add(queryMap);
|
||||
}
|
||||
}
|
||||
}
|
||||
// if (ObjectUtils.isNotEmpty(value)) {
|
||||
// for (String s : value.split(",")) {
|
||||
// Map<String, Object> queryMap = new HashMap<>();
|
||||
// Map<String, Object> queryMapTemp = new HashMap<>();
|
||||
// Map<String, Object> queryMap3 = new HashMap<>();
|
||||
// queryMap3.put("query",s);
|
||||
//// queryMap3.put("minimum_should_match",2);
|
||||
// queryMapTemp.put(key, queryMap3);
|
||||
// queryMap.put("match", queryMapTemp);
|
||||
// queryMapJsonTwo.add(queryMap);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
if(CollectionUtils.isNotEmpty(queryMapJsonTwo)){
|
||||
JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJsonTwo, null, null);
|
||||
|
||||
Reference in New Issue
Block a user