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 ES BUSS

Browse Source
This commit is contained in:
super_liu
2021-08-24 17:29:53 +08:00
parent 052222a52f
commit 02a8b6c969
10 changed files with 522 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java
+7
View File
@@ -40,6 +40,9 @@ public class SeniorSearchInfoEO extends BasePage {
@ApiModelProperty(value = "标准编号")
private String standNumber;
@ApiModelProperty(value = "企标编号")
private String standCode;
@ApiModelProperty(value = "标准年份")
private String standYear;
@@ -107,6 +110,9 @@ public class SeniorSearchInfoEO extends BasePage {
@ApiModelProperty(value = "文本状态")
private String textStatus;
@ApiModelProperty(value = "文本状态-企标")
private String textStatusBuss;
@ApiModelProperty(value = "标准体系")
private String standSystem;
@@ -223,6 +229,7 @@ public class SeniorSearchInfoEO extends BasePage {
private String advanceSearchVOStr;
private String CLLX;
private String CYSD;
private String QCDW;
private String CBCD;
private String ZRLX;
private String SYCLLX;
adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+50 -141
View File
@@ -153,44 +153,20 @@ public class SearchCenterServiceImpl implements SearchCenterService {
.should(QueryBuilders.wildcardQuery("stand_number", "*"+searchInfoEO.getSelectValue()+"*"));
break;
case "bussstand":
multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(),
numbershowSplit,nameshowSplit,numbershowStr,nameshowStr,"numberExpNull","standstateshow", "standEnName",replaceStandNumStr,
replacedStandNumStr,"countryShow","synopsis","standSortShow","ZQCBMShow","ZQCBM","stand_status",
"baseSearchContent",content,"numbershow","nameshow","standstateshow","issue_time","replaceStandNum","replacedStandNum","QBMJShow","QBSQShow","XHQBMShow","SVPPSName","XGBMName","ZYQCRShow","ZRBMShow","ZQCBMName","QTQCRShow","content","FSRQString","FZRQString","put_time","XGLC","WFSPJSName","GFXYYWJ","XGBMShow").minimumShouldMatch("100%");
boolQueryMust.must(multiQueryBuilder);
boolQueryShould.should(QueryBuilders.wildcardQuery(nameshowStr, "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery(numbershowStr, "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery(numbershowSplit, "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery(nameshowSplit, "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("ZQCBMShow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("standstateshow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("ZQCBM", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("stand_status", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("numbershow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("standEnName", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("content", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("issue_time", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("nameshow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("standstateshow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("replaceStandNum", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("replacedStandNum", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("QBMJShow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("QBSQShow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("XHQBMShow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("SVPPSName", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("XGBMName", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("ZYQCRShow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("ZRBMShow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("ZQCBMName", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("QTQCRShow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("FSRQString", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("FZRQString", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("XGLC", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("WFSPJSName", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("GFXYYWJ", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("XGBMShow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("put_time", "*"+searchInfoEO.getSelectValue()+"*"));
boolQueryShould.should(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("stand_code.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("standName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getSelectValue()+"*"));
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);
RangeQueryBuilder rangeQueryBuilder2 = QueryBuilders.rangeQuery(PUT_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryShould.should(rangeQueryBuilder2);
}
break;
default: break;
}
@@ -262,6 +238,12 @@ public class SearchCenterServiceImpl implements SearchCenterService {
if(sarStandAttrEOStr == null){
collectAttrMap = new TreeMap<>();
if(searchInfoEO.getQCDW() != null && StringUtils.isNotBlank(searchInfoEO.getQCDW())){
List<String> fieldList = Arrays.asList(searchInfoEO.getQCDW() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList));
collectAttrMap.put("QCDW",array);
}
if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){
List<String> fieldList = Arrays.asList(searchInfoEO.getCYSD() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList));
@@ -576,115 +558,42 @@ public class SearchCenterServiceImpl implements SearchCenterService {
* boolQueryBuilder :must
* */
public BoolQueryBuilder queryBussStandMsg(SeniorSearchInfoEO searchInfoEO, BoolQueryBuilder boolQueryBuilder, SearchRequestBuilder searchRequestBuilder) throws Exception{
String nameshowStr = "nameshow";
String replacedStandNumStr = "replaced_stand_num";
String replaceStandNumStr = "replace_stand_num";
// 高级搜索项，只针对标准
//分类代号
if (StringUtils.isNotBlank(searchInfoEO.getClassifyCode())) {
boolQueryBuilder.must(QueryBuilders.matchQuery("classifyCode", searchInfoEO.getClassifyCode()));
}
//编号，国内外标准，国内外法规，企业标准 有此属性
if (StringUtils.isNotBlank(searchInfoEO.getStandNumber())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber", "*"+searchInfoEO.getStandNumber()+"*"));
}
//名称，国内外标准，国内外法规，企业标准 有此属性
if (StringUtils.isNotBlank(searchInfoEO.getNameShow())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery(nameshowStr, "*"+searchInfoEO.getNameShow()+"*"));
}
//标准英文名称
if (StringUtils.isNotBlank(searchInfoEO.getStandEnName())) {
boolQueryBuilder.must(QueryBuilders.matchQuery("standEnName", searchInfoEO.getStandEnName()));
}
if (searchInfoEO.getPutYear() != null && StringUtils.isNotEmpty(searchInfoEO.getPutYear())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("putYear", "*"+searchInfoEO.getPutYear()+"*"));
}
//代替标准号
if (StringUtils.isNotBlank(searchInfoEO.getReplaceStandNum())) {
boolQueryBuilder.must(QueryBuilders.matchQuery(replaceStandNumStr, searchInfoEO.getReplaceStandNum()));
}
//主起草部门
if (StringUtils.isNotBlank(searchInfoEO.getZQCBM())) {
boolQueryBuilder.must(QueryBuilders.matchQuery("ZQCBM", searchInfoEO.getZQCBM()));
}
//被代替标准号
if (StringUtils.isNotBlank(searchInfoEO.getReplacedStandNum())) {
boolQueryBuilder.must(QueryBuilders.matchQuery(replacedStandNumStr, searchInfoEO.getReplacedStandNum()));
}
//标准状态，国内外标准，国内外法规，企业标准 有此属性
if (StringUtils.isNotBlank(searchInfoEO.getStandState())) {
// 如果等于All，相当于不限制，查询全部
if (!searchInfoEO.getStandState().equals("all") && !searchInfoEO.getStandState().equals("[]")) {
String[] arrlist = searchInfoEO.getStandState().split(",");
boolQueryBuilder.must(QueryBuilders.termsQuery("statecode.keyword", arrlist));
//boolQueryBuilder.must(QueryBuilders.matchQuery("statecode", searchInfoEO.getStandState()));
if(searchInfoEO.getSelectValue() == null || searchInfoEO.getSelectValue().equals("")){
// 高级搜索项，只针对标准
if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getStandSort()+"*"));
}
}
//发布日期
if (searchInfoEO.getIssueTime() != null) {
Long starttime = searchInfoEO.getIssueTime().getTime();
Long endtime = searchInfoEO.getIssueTime().getTime();
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryBuilder.filter(rangeQueryBuilder);
}
//实施日期，国内外标准，国内外法规，企业标准 有此属性
if (searchInfoEO.getPutTime() != null) {
Long starttime = searchInfoEO.getPutTime().getTime();
Long endtime = searchInfoEO.getPutTime().getTime();
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("put_time").format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryBuilder.filter(rangeQueryBuilder);
}
//国家，国内外标准，国内外法规有此属性
if (StringUtils.isNotBlank(searchInfoEO.getCountry())) {
// 如果等于All，相当于不限制，查询全部
if (!searchInfoEO.getCountry().equals("all") && !searchInfoEO.getCountry().equals("[]") ) {
String[] arrlist = searchInfoEO.getCountry().split(",");
boolQueryBuilder.must(QueryBuilders.termsQuery("country.keyword", arrlist));
if (StringUtils.isNotBlank(searchInfoEO.getStandCode())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standCode.keyword", "*"+searchInfoEO.getStandCode()+"*"));
}
}
//标准类别，国内外标准有此属性
if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) {
// 如果等于All，相当于不限制，查询全部
if (!searchInfoEO.getStandSort().equals("all")&& !searchInfoEO.getStandSort().equals("[]")) {
String[] arrlist = searchInfoEO.getStandSort().split(",");
boolQueryBuilder.must(QueryBuilders.termsQuery("stand_sort.keyword", arrlist));
//boolQueryBuilder.must(QueryBuilders.matchQuery("stand_sort", searchInfoEO.getStandSort()));
if (StringUtils.isNotBlank(searchInfoEO.getStandYear())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getStandYear()+"*"));
}
}
//发布时间范围
if (searchInfoEO.getIssueTimeSt() != null || searchInfoEO.getIssueTimeEd() != null) {
Long starttime = 0L;
Long endtime = 0L;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (searchInfoEO.getIssueTimeSt() != null) {
starttime = searchInfoEO.getIssueTimeSt().getTime();
} else {
starttime = sdf.parse("1970-01-01 00:00:00").getTime();
if (StringUtils.isNotBlank(searchInfoEO.getStandName())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standName.keyword", "*"+searchInfoEO.getStandName()+"*"));
}
if (searchInfoEO.getIssueTimeEd() != null) {
endtime = searchInfoEO.getIssueTimeEd().getTime();
} else {
endtime = sdf.parse("2999-01-01 00:00:00").getTime();
if (StringUtils.isNotBlank(searchInfoEO.getStandEnName())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getStandEnName()+"*"));
}
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryBuilder.filter(rangeQueryBuilder);
}
if (searchInfoEO.getPutTimeSt() != null || searchInfoEO.getPutTimeEd() != null) {
Long starttime = 0L;
Long endtime = 0L;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (searchInfoEO.getPutTimeSt() != null) {
starttime = searchInfoEO.getPutTimeSt().getTime();
} else {
starttime = sdf.parse("1970-01-01 00:00:00").getTime();
if (StringUtils.isNotBlank(searchInfoEO.getTextStatusBuss())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getTextStatusBuss()+"*"));
}
if (searchInfoEO.getPutTimeEd() != null) {
endtime = searchInfoEO.getPutTimeEd().getTime();
} else {
endtime = sdf.parse("2999-01-01 00:00:00").getTime();
if (searchInfoEO.getIssueTime() != null) {
Long starttime = searchInfoEO.getIssueTime().getTime();
Long endtime = searchInfoEO.getIssueTime().getTime();
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryBuilder.filter(rangeQueryBuilder);
}
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(PUT_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryBuilder.filter(rangeQueryBuilder);
if (searchInfoEO.getPutTime() != null) {
Long starttime = searchInfoEO.getPutTime().getTime();
Long endtime = searchInfoEO.getPutTime().getTime();
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(PUT_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryBuilder.filter(rangeQueryBuilder);
}
}
querySeniorMsg(searchInfoEO,boolQueryBuilder);
return boolQueryBuilder;
@@ -734,7 +643,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
String[] seniortypeLaws = {"country","statecode","SYCLLX","ZRLX","WSSFCY"};
seniortype = seniortypeLaws.clone();
} else if ("bussstand".equals(searchInfoEO.getSelectIndex())) {
String[] seniortypeBuss = {"statecode","ZQCBM"};
String[] seniortypeBuss = {"textStatusBuss","QCDW"};
seniortype = seniortypeBuss.clone();
} else {
String[] seniortypeMsg = {"module"};
adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
+26 -40
View File
@@ -277,7 +277,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
String con = String.valueOf(attrInfoMap.get("content"));
con = con.replace(",","");
if (StringUtils.isBlank(con)){
attrInfoMap.put("content","--");
attrInfoMap.put("content","");
}
}
}
@@ -288,7 +288,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
if (null != attrInfoMap.get("issue_time") && !"".equals(attrInfoMap.get("issue_time")) && !"null".equals(attrInfoMap.get("issue_time"))) {
fullTextSearchEO.put("issue_time", attrInfoMap.get("issue_time"));
}else {
fullTextSearchEO.put("issue_time", "--");
fullTextSearchEO.put("issue_time", "");
}
}else if ("bussstand".equals(attrInfoMap.get("type"))){
@@ -297,42 +297,28 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
attrInfoMap.put(key, "null");
}
}
fullTextSearchEO.put("title",attrInfoMap.get("standNumber")+" - 《"+attrInfoMap.get("nameshow")+"》");
fullTextSearchEO.put("title",attrInfoMap.get("stand_code"));
StringBuilder contentBuilder = new StringBuilder();
SimpleDateFormat format = new SimpleDateFormat("yyyy-M-dd HH:mm:ss");
contentBuilder.append("企标编号: ").append(String.valueOf(attrInfoMap.get("numbershow"))).append(" ");
contentBuilder.append("企标名称: ").append(String.valueOf(attrInfoMap.get("nameshow"))).append(" ");
contentBuilder.append("英文名称: ").append(attrInfoMap.get("standEnName")).append(" ");
contentBuilder.append("标准状态: ").append(String.valueOf(attrInfoMap.get("standstateshow"))).append(" ");
// contentBuilder.append("发布日期:"+String.valueOf(attrInfoMap.get("issue_time"))+" ");
contentBuilder.append("标准实施日期: ");
contentBuilder.append(String.valueOf(attrInfoMap.get("put_time")));
contentBuilder.append("代替企标编号: ").append(attrInfoMap.get("replaceStandNum"));
contentBuilder.append("被代替企标编号: ").append(attrInfoMap.get("replacedStandNum"));
contentBuilder.append("废止日期: ");
if (StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("FZRQString")).trim())) {
contentBuilder.append(String.valueOf(attrInfoMap.get("FZRQString"))).append(" ");
}else{
contentBuilder.append("--").append(" ");
}
contentBuilder.append("复审日期: ");
if (StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("FSRQString")).trim())) {
contentBuilder.append(String.valueOf(attrInfoMap.get("FSRQString"))).append(" ");
}else{
contentBuilder.append("--").append(" ");
}
contentBuilder.append("密级: ").append(String.valueOf(attrInfoMap.get("QBMJShow"))).append(" ");
contentBuilder.append("授权: ").append(String.valueOf(attrInfoMap.get("QBSQShow"))).append(" ");
contentBuilder.append("涉及会签部门: ").append(String.valueOf(attrInfoMap.get("XHQBMShow"))).append(" ");
contentBuilder.append("SVPPS: ").append(String.valueOf(attrInfoMap.get("SVPPSName"))).append(" ");
contentBuilder.append("相关部门: ").append(String.valueOf(attrInfoMap.get("XGBMShow"))).append(" ");
contentBuilder.append("主起草人: ").append(String.valueOf(attrInfoMap.get("ZYQCRShow"))).append(" ");
contentBuilder.append("起草部门: ").append(String.valueOf(attrInfoMap.get("ZRBMShow"))).append(" ");
contentBuilder.append("主起草部门: ").append(String.valueOf(attrInfoMap.get("ZQCBMName"))).append(" ");
contentBuilder.append("其他起草人: ").append(String.valueOf(attrInfoMap.get("QTQCRShow"))).append(" ");
contentBuilder.append("外发审批角色: ").append(String.valueOf(attrInfoMap.get("WFSPJSShow"))).append(" ");
contentBuilder.append("规范性引用文件: ").append(String.valueOf(attrInfoMap.get("GFXYYWJ"))).append(" ");
contentBuilder.append("相关流程: ").append(String.valueOf(attrInfoMap.get("XGLC"))).append(" ");
contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" ");
contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" ");
contentBuilder.append("企标名称:").append(attrInfoMap.get("standName")).append(" ");
contentBuilder.append("企标英文名称:").append(attrInfoMap.get("standName")).append(" ");
contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusBussName")).append(" ");
contentBuilder.append("企标实施日期:").append(attrInfoMap.get("putTime")).append(" ");
contentBuilder.append("废止日期:").append(attrInfoMap.get("FZRQBUSSName")).append(" ");
contentBuilder.append("复审日期:").append(attrInfoMap.get("FSRQBUSSName")).append(" ");
contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" ");
contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" ");
contentBuilder.append("文件上传人员:").append(attrInfoMap.get("WJSCRYBUSSName")).append(" ");
contentBuilder.append("适用车型:").append(attrInfoMap.get("SYCXCLASSName")).append(" ");
contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXCLASSName")).append(" ");
contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXCLASSName")).append(" ");
contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBBUSSName")).append(" ");
contentBuilder.append("关联模块VPPS编码:").append(attrInfoMap.get("VPPSBMBUSSName")).append(" ");
contentBuilder.append("关联模块中文名称:").append(attrInfoMap.get("VPPSCNBUSSName")).append(" ");
contentBuilder.append("代替企标编号:").append(attrInfoMap.get("DTQBBHBUSSName")).append(" ");
contentBuilder.append("被代替企标编号:").append(attrInfoMap.get("BDTQBBHBUSSName")).append(" ");
if (attrInfoMap.containsKey("content")){
if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){
String con = String.valueOf(attrInfoMap.get("content"));
@@ -347,10 +333,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
StringBuilder textContent = replaceAll(contentBuilder, "null", "--");
fullTextSearchEO.put("textContent",textContent.toString());
if (null != attrInfoMap.get("issue_time") && !"".equals(attrInfoMap.get("issue_time")) && !"null".equals(attrInfoMap.get("issue_time"))) {
fullTextSearchEO.put("issue_time", attrInfoMap.get("issue_time"));
if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) {
fullTextSearchEO.put("issue_time", attrInfoMap.get("issueTime"));
}else {
fullTextSearchEO.put("issue_time", "--");
fullTextSearchEO.put("issue_time", "");
}
}
return fullTextSearchEO;