搜索中心--文档库(输入框搜索)
This commit is contained in:
+37
-15
@@ -330,26 +330,48 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
|
||||
String value = (String) entry.getValue();
|
||||
if (ObjectUtils.isNotEmpty(value)) {
|
||||
for (String s : value.split(",")) {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
Map<String, Object> queryMap = new HashMap<>();
|
||||
Map<String, Object> queryMapTemp = new HashMap<>();
|
||||
|
||||
if (key.equals("serial_number")){
|
||||
s = s.toLowerCase();
|
||||
queryMap.put(key, "*" + s + "*");
|
||||
map.put("wildcard", queryMap);
|
||||
} else {
|
||||
s = s.toLowerCase();
|
||||
queryMapTemp.put("query", s);
|
||||
queryMapTemp.put("minimum_should_match", 2);
|
||||
queryMap.put(key, queryMapTemp);
|
||||
map.put("match",queryMap);
|
||||
JSONArray should = new JSONArray();
|
||||
s = s.toLowerCase();
|
||||
for (String valueTemp : s.split(" ")) {
|
||||
Map<String,Object> mapTemp = new HashMap();
|
||||
mapTemp.put(key,"*"+valueTemp+"*");
|
||||
Map<String,Object> map1 = new HashMap<>();
|
||||
map1.put("wildcard",mapTemp);
|
||||
should.add(map1);
|
||||
}
|
||||
must.add(map);
|
||||
JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, should);
|
||||
must.add(jsonObject);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//封装输入框查询条件
|
||||
// if (ObjectUtils.isNotEmpty(inputMap)) {
|
||||
// for (Map.Entry<String, Object> entry : inputMap.entrySet()) {
|
||||
// String key = entry.getKey();
|
||||
// String value = (String) entry.getValue();
|
||||
// if (ObjectUtils.isNotEmpty(value)) {
|
||||
// for (String s : value.split(",")) {
|
||||
// Map<String, Object> map = new HashMap<>();
|
||||
// Map<String, Object> queryMap = new HashMap<>();
|
||||
// Map<String, Object> queryMapTemp = new HashMap<>();
|
||||
//
|
||||
// if (key.equals("serial_number")){
|
||||
// s = s.toLowerCase();
|
||||
// queryMap.put(key, "*" + s + "*");
|
||||
// map.put("wildcard", queryMap);
|
||||
// } else {
|
||||
// s = s.toLowerCase();
|
||||
// queryMapTemp.put("query", s);
|
||||
// queryMapTemp.put("minimum_should_match", 2);
|
||||
// queryMap.put(key, queryMapTemp);
|
||||
// map.put("match",queryMap);
|
||||
// }
|
||||
// must.add(map);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//封装下拉,树形查询条件
|
||||
if (ObjectUtils.isNotEmpty(otherMap)) {
|
||||
for (Map.Entry<String, Object> entry : otherMap.entrySet()) {
|
||||
|
||||
Reference in New Issue
Block a user