搜索中心
This commit is contained in:
+2
-26
@@ -388,7 +388,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
|
|||||||
String key = entry.getKey();
|
String key = entry.getKey();
|
||||||
String value = (String) entry.getValue();
|
String value = (String) entry.getValue();
|
||||||
if(StringUtils.isNotBlank(value)){
|
if(StringUtils.isNotBlank(value)){
|
||||||
if("technology_territory".equals(key) && ObjectUtils.isNotEmpty(value)){
|
if(("technology_territory".equals(key) || "standard_system".equals(key)) && ObjectUtils.isNotEmpty(value)){
|
||||||
JSONArray should = new JSONArray();
|
JSONArray should = new JSONArray();
|
||||||
|
|
||||||
List<Map<String,Object>> mapList = new ArrayList<>();
|
List<Map<String,Object>> mapList = new ArrayList<>();
|
||||||
@@ -401,31 +401,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
|
|||||||
}
|
}
|
||||||
JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, should);
|
JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, should);
|
||||||
must.add(jsonObject);
|
must.add(jsonObject);
|
||||||
}else if("standard_system".equals(key) && ObjectUtils.isNotEmpty(value)){
|
} else{
|
||||||
JSONArray should = new JSONArray();
|
|
||||||
|
|
||||||
for (String s : value.split(",")) {
|
|
||||||
Map<String,Object> map = new HashMap();
|
|
||||||
map.put("query",s);
|
|
||||||
Map<String,Object> map1 = new HashMap<>();
|
|
||||||
map1.put(key,map);
|
|
||||||
Map<String,Object> map2 = new HashMap<>();
|
|
||||||
map2.put("match",map1);
|
|
||||||
should.add(map2);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// for (String s : value.split(",")) {
|
|
||||||
// Map<String,Object> map = new HashMap();
|
|
||||||
// map.put(key,"*"+s+"*");
|
|
||||||
// Map<String,Object> map1 = new HashMap<>();
|
|
||||||
// map1.put("wildcard",map);
|
|
||||||
// should.add(map1);
|
|
||||||
// }
|
|
||||||
|
|
||||||
JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, should);
|
|
||||||
must.add(jsonObject);
|
|
||||||
}else{
|
|
||||||
Map<String, Object> map = new HashMap<>();
|
Map<String, Object> map = new HashMap<>();
|
||||||
Map<String, Object> queryMap = new HashMap<>();
|
Map<String, Object> queryMap = new HashMap<>();
|
||||||
Map<String, Object> queryMapTemp = new HashMap<>();
|
Map<String, Object> queryMapTemp = new HashMap<>();
|
||||||
|
|||||||
Reference in New Issue
Block a user