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
+11 -8
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,6 +835,15 @@ 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(StringUtils.isNotBlank(standType)){
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());
}
if (!result.isEmpty()) { if (!result.isEmpty()) {
for (int i = 0; i < seniortype.length; i++) { for (int i = 0; i < seniortype.length; i++) {
//分组后得到的数据整合 //分组后得到的数据整合
@@ -881,6 +883,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
} }
result.get(0).put("groupdata", map); result.get(0).put("groupdata", map);
} }
}
return result; return result;
} }