feat:There is no way the
This commit is contained in:
+35
-2
@@ -33,6 +33,8 @@ import org.springframework.stereotype.Component;
|
||||
import javax.annotation.PostConstruct;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Component
|
||||
@@ -91,13 +93,20 @@ public class SearchCenterServiceImpl implements SearchCenterService {
|
||||
QueryBuilder multiQueryBuilder;
|
||||
switch (searchInfoEO.getSelectIndex()){
|
||||
case "stand":
|
||||
if (isRqFormat(searchInfoEO.getSelectValue())) {
|
||||
Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();
|
||||
Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();
|
||||
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
|
||||
boolQueryShould.should(rangeQueryBuilder);
|
||||
}
|
||||
boolQueryShould.should(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
|
||||
.should(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
|
||||
.should(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
|
||||
.should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
|
||||
.should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
|
||||
.should(QueryBuilders.wildcardQuery("standNature.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
|
||||
.should(QueryBuilders.wildcardQuery("textStatus.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
|
||||
.should(QueryBuilders.wildcardQuery("standNatureName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
|
||||
.should(QueryBuilders.wildcardQuery("textStatusName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
|
||||
.should(QueryBuilders.wildcardQuery("isRelateAccessName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
|
||||
.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
|
||||
.should(QueryBuilders.wildcardQuery("content.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
|
||||
.should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*"));
|
||||
@@ -205,6 +214,30 @@ public class SearchCenterServiceImpl implements SearchCenterService {
|
||||
return result;
|
||||
}
|
||||
|
||||
private Date dateFormatToStr(String dateStr){
|
||||
Date date = new Date();
|
||||
try {
|
||||
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
||||
date = dateFormat.parse(dateStr.trim().substring(0,10));
|
||||
}catch (Exception e){
|
||||
e.getMessage();
|
||||
}
|
||||
return date;
|
||||
}
|
||||
|
||||
public static boolean isRqFormat(String mes){
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||
try {
|
||||
if (mes.equals(sdf.format(sdf.parse(mes)))) {
|
||||
return true;
|
||||
}
|
||||
}catch (Exception e){
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 自动匹配动态字段条件查询 ES
|
||||
* @param searchInfoEO
|
||||
|
||||
+3
-3
@@ -152,10 +152,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
|
||||
contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" ");
|
||||
contentBuilder.append("标准名称:").append(attrInfoMap.get("standName")).append(" ");
|
||||
contentBuilder.append("标准英文名称:").append(attrInfoMap.get("standEnName")).append(" ");
|
||||
contentBuilder.append("标准性质:").append(attrInfoMap.get("standNature")).append(" ");
|
||||
contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatus")).append(" ");
|
||||
contentBuilder.append("标准性质:").append(attrInfoMap.get("standNatureName")).append(" ");
|
||||
contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusName")).append(" ");
|
||||
contentBuilder.append("标准发布日期:").append(attrInfoMap.get("issueTime")).append(" ");
|
||||
contentBuilder.append("是否纳入认证清单:").append(attrInfoMap.get("isRelateAccess")).append(" ");
|
||||
contentBuilder.append("是否纳入认证清单:").append(attrInfoMap.get("isRelateAccessName")).append(" ");
|
||||
|
||||
// 区分国内、海外
|
||||
if (isForeign) {
|
||||
|
||||
Reference in New Issue
Block a user