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

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2021-08-08 17:37:33 +08:00
parent 79113cd47a 7a1494484d
commit 313251dbbd
3 changed files with 48 additions and 37 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
+15 -8
View File
@@ -92,7 +92,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
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("standName.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()+"*"))
@@ -258,23 +258,26 @@ public class SearchCenterServiceImpl implements SearchCenterService {
if(searchInfoEO.getSelectValue() == null || searchInfoEO.getSelectValue().equals("")){
// 高级搜索项，只针对标准
if (StringUtils.isNotBlank(searchInfoEO.getStandType())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", searchInfoEO.getStandType()));
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standSort.keyword", searchInfoEO.getStandSort()));
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getStandSort()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getStandNumber())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getStandNumber()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getStandYear())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standYear.keyword", searchInfoEO.getStandYear()));
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getStandYear()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getStandName())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standName.keyword", searchInfoEO.getStandName()));
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standName.keyword", "*"+searchInfoEO.getStandName()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getStandEnName())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getStandEnName()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getTextStatus())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatus.keyword", searchInfoEO.getTextStatus()));
boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatus.keyword", "*"+searchInfoEO.getTextStatus()+"*"));
}
if (searchInfoEO.getIssueTime() != null) {
@@ -285,11 +288,15 @@ public class SearchCenterServiceImpl implements SearchCenterService {
}
if (StringUtils.isNotBlank(searchInfoEO.getIsRelateAccess())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("isRelateAccess.keyword", searchInfoEO.getIsRelateAccess()));
boolQueryBuilder.must(QueryBuilders.wildcardQuery("isRelateAccess.keyword", "*"+searchInfoEO.getIsRelateAccess()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getStandNature())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNature.keyword", "*"+searchInfoEO.getStandNature()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getStandSystem())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standSystem.keyword", searchInfoEO.getStandSystem()));
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getStandSystem()+"*"));
}
}
adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
+29 -29
View File
@@ -170,42 +170,42 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
}
}
contentBuilder.append("实施日期(标准文本):").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("新车型实施日期(标准文本):").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("在产车实施日期(标准文本):").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("实施日期(标准文本):").append(attrInfoMap.get("SSRQ")).append(" ");
contentBuilder.append("新车型实施日期(标准文本):").append(attrInfoMap.get("XCXSSRQ")).append(" ");
contentBuilder.append("在产车实施日期(标准文本):").append(attrInfoMap.get("ZCCSSRQ")).append(" ");
if (isForeign) {
contentBuilder.append("体系类别:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLB")).append(" ");
}else {
contentBuilder.append("归口管理部门:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("起草单位:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("我司署名人:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("我司参与深度:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDW")).append(" ");
contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJG")).append(" ");
contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMR")).append(" ");
contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSD")).append(" ");
contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPM")).append(" ");
}
contentBuilder.append("适用车型:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("能源类型:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("适用产品线:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("适用认证:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("责任部门:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("责任工程师:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("关联模块--卡车vpps中文名称:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("模块结构单元变型号:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("模块结构单元名称:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("适用车型:").append(attrInfoMap.get("CLLX")).append(" ");
contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLX")).append(" ");
contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPX")).append(" ");
contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZ")).append(" ");
contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBM")).append(" ");
contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCS")).append(" ");
contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBM")).append(" ");
contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCN")).append(" ");
contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBM")).append(" ");
contentBuilder.append("关联模块--卡车vpps中文名称:").append(attrInfoMap.get("KCCVPPSCN")).append(" ");
contentBuilder.append("模块结构单元变型号:").append(attrInfoMap.get("DYBXH")).append(" ");
contentBuilder.append("模块结构单元名称:").append(attrInfoMap.get("DYMC")).append(" ");
contentBuilder.append("代替标准号:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("引用标准:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("被引用标准:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("代替标准号:").append(attrInfoMap.get("DTBJH")).append(" ");
contentBuilder.append("引用标准:").append(attrInfoMap.get("YYBJ")).append(" ");
contentBuilder.append("被引用标准:").append(attrInfoMap.get("BYYBJ")).append(" ");
if (isForeign) {
contentBuilder.append("体系类别:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLB")).append(" ");
}else {
contentBuilder.append("采标编号:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("采标程度:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("部分代替标准号:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("被部分代替标准号:").append(attrInfoMap.get("ssrq")).append(" ");
contentBuilder.append("采标编号:").append(attrInfoMap.get("CBBH")).append(" ");
contentBuilder.append("采标程度:").append(attrInfoMap.get("CBCD")).append(" ");
contentBuilder.append("部分代替标准号:").append(attrInfoMap.get("BFDTBZ")).append(" ");
contentBuilder.append("被部分代替标准号:").append(attrInfoMap.get("BBFDTBZ")).append(" ");
}
if (attrInfoMap.containsKey("content")){
adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java
+4
View File
@@ -101,6 +101,7 @@ public class SendStandMQService {
saveMap.put("stand_year",infoEO.getStandYear());
saveMap.put("nameshow",infoEO.getStandName());
saveMap.put("stand_name",infoEO.getStandName());
saveMap.put("standName",infoEO.getStandName());
saveMap.put("standEnName",infoEO.getStandEnName());
saveMap.put("stand_en_name",infoEO.getStandEnName());
@@ -112,6 +113,9 @@ public class SendStandMQService {
saveMap.put("synopsis",infoEO.getSynopsis());
saveMap.put("standType",infoEO.getStandType());
saveMap.put("textStatus",infoEO.getTextStatus());
saveMap.put("isRelateAccess",infoEO.getIsRelateAccess());
saveMap.put("standSystem",infoEO.getStandSystem());
// 自定义属性字段
if (attrInfoMap != null && !attrInfoMap.isEmpty()) {