FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: There is no way the, elasticsearch

Browse Source
This commit is contained in:
super_liu
2021-11-09 10:22:51 +08:00
parent f7b0296cef
commit 4f86942ea2
1 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+44 -41
View File
@@ -699,7 +699,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
// 高级搜索项，只针对标准 // 高级搜索项，只针对标准
if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) { if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getStandSort()+"*")); boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+"*"));
} }
if (StringUtils.isNotBlank(searchInfoEO.getStandCode())) { if (StringUtils.isNotBlank(searchInfoEO.getStandCode())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getStandCode()+"*")); boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getStandCode()+"*"));
@@ -823,13 +823,6 @@ public class SearchCenterServiceImpl implements SearchCenterService {
"JASO","JIS","GSO","GOST","ΓOCT","TP","SASO","UAE","CONTRAN","DENATRAN","ABNT NBR","NBR","INMETRO","CONAMA","Normative Instruction","ADR"}; "JASO","JIS","GSO","GOST","ΓOCT","TP","SASO","UAE","CONTRAN","DENATRAN","ABNT NBR","NBR","INMETRO","CONAMA","Normative Instruction","ADR"};
String[] bussStandVerify = {"Q/FT A","Q/FT B","Q/FT E","Q/FT F","Q/FT G","Q/FT M","Q/FT Q","Q/FT R","Q/FT S","Q/FT T","Q/FT V","Q/FT X","Q/FT Y","Q/FT Z","Q/QCBFC"}; String[] bussStandVerify = {"Q/FT A","Q/FT B","Q/FT E","Q/FT F","Q/FT G","Q/FT M","Q/FT Q","Q/FT R","Q/FT S","Q/FT T","Q/FT V","Q/FT X","Q/FT Y","Q/FT Z","Q/QCBFC"};
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
if(standType.equals("INLAND")){
list = Stream.of(standVerify).collect(Collectors.toList());
}else if(standType.equals("bussstand")){
list = Stream.of(bussStandVerify).collect(Collectors.toList());
}else if(standType.equals("FOREIGN")){
list = Stream.of(standEnVerify).collect(Collectors.toList());
}
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
for (int i = 0; i < seniortype.length; i++) { for (int i = 0; i < seniortype.length; i++) {
@@ -842,44 +835,54 @@ public class SearchCenterServiceImpl implements SearchCenterService {
result = SearchResponseToList(response); result = SearchResponseToList(response);
searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits().value); searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits().value);
Map<String, Aggregation> aggmap = response.getAggregations().asMap(); Map<String, Aggregation> aggmap = response.getAggregations().asMap();
if (!result.isEmpty()) {
for (int i = 0; i < seniortype.length; i++) { if(StringUtils.isNotBlank(standType)){
//分组后得到的数据整合 if(standType.equals("INLAND")){
Object results = aggmap.get("by_" + seniortype[i]); list = Stream.of(standVerify).collect(Collectors.toList());
if(results instanceof StringTerms){ }else if(standType.equals("bussstand")){
StringTerms stResult = (StringTerms) results; list = Stream.of(bussStandVerify).collect(Collectors.toList());
Map<String, Object> submap = new HashMap<>(); }else if(standType.equals("FOREIGN")){
for (StringTerms.Bucket bucket : stResult.getBuckets()) { list = Stream.of(standEnVerify).collect(Collectors.toList());
// 多选处理，当前全部允许多选 }
String keyName = bucket.getKeyAsString(); if (!result.isEmpty()) {
String[] keyNameList = keyName.split(","); for (int i = 0; i < seniortype.length; i++) {
// 对于属性允许多选，此处做出处理 //分组后得到的数据整合
if(keyNameList.length>0){ Object results = aggmap.get("by_" + seniortype[i]);
for (String itemKeyName: keyNameList){ if(results instanceof StringTerms){
// put 之前判断是否已存在该key ,如果不存在，直接放入值，如果存在，需要进行一个累加 StringTerms stResult = (StringTerms) results;
keyNameFilter(standType, list, submap, bucket, itemKeyName); Map<String, Object> submap = new HashMap<>();
for (StringTerms.Bucket bucket : stResult.getBuckets()) {
// 多选处理，当前全部允许多选
String keyName = bucket.getKeyAsString();
String[] keyNameList = keyName.split(",");
// 对于属性允许多选，此处做出处理
if(keyNameList.length>0){
for (String itemKeyName: keyNameList){
// put 之前判断是否已存在该key ,如果不存在，直接放入值，如果存在，需要进行一个累加
keyNameFilter(standType, list, submap, bucket, itemKeyName);
}
}
else {
keyNameFilter(standType, list, submap, bucket, keyName);
} }
} }
else { map.put(seniortype[i], submap);
keyNameFilter(standType, list, submap, bucket, keyName); }
} else{
Map<String, Object> submap = new HashMap<>();
map.put(seniortype[i], submap);
} }
map.put(seniortype[i], submap);
}
else{
Map<String, Object> submap = new HashMap<>();
map.put(seniortype[i], submap);
}
}
if(standType.equals("bussstand")){
map.forEach((s, o) -> {
if(s.equals("numbershow")){
map.put("standSort",o);
}
});
}
result.get(0).put("groupdata", map);
} }
if(standType.equals("bussstand")){
map.forEach((s, o) -> {
if(s.equals("numbershow")){
map.put("standSort",o);
}
});
}
result.get(0).put("groupdata", map);
} }
return result; return result;
} }