From ea90e4c15edd83d0f035d2f1bb0bb1a345700982 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 8 Aug 2021 12:54:32 +0800 Subject: [PATCH 1/4] feat: There is no way the --- .../adc/da/search/service/impl/SearchCenterServiceImpl.java | 6 +++++- .../main/java/com/adc/da/mq/service/SendStandMQService.java | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 90c9de5d..84159d4a 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -270,7 +270,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { 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("stand_name.keyword", searchInfoEO.getStandName())); } if (StringUtils.isNotBlank(searchInfoEO.getTextStatus())) { @@ -288,6 +288,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { 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())); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java index 0ec72890..8a33bf1b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java @@ -112,6 +112,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()) { From c61eb36afb973b47685133c50f451a97e9df9f88 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 8 Aug 2021 13:13:06 +0800 Subject: [PATCH 2/4] feat: There is no way the --- .../da/search/service/impl/SearchCenterServiceImpl.java | 7 +++++-- .../java/com/adc/da/mq/service/SendStandMQService.java | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 84159d4a..addaba1a 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -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()+"*")) @@ -270,7 +270,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standYear.keyword", searchInfoEO.getStandYear())); } if (StringUtils.isNotBlank(searchInfoEO.getStandName())) { - boolQueryBuilder.must(QueryBuilders.wildcardQuery("stand_name.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())) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java index 8a33bf1b..16cb5288 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java @@ -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()); From 20cc364aa232410271bd4935d11813fc50ac130a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 8 Aug 2021 14:18:50 +0800 Subject: [PATCH 3/4] feat:There is no way the --- .../service/impl/SearchCenterServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index addaba1a..51136ac1 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -258,26 +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())); + 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) { @@ -288,15 +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())); + 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()+"*")); } } From 7a1494484d52a6d79be15c6b2809ec2ae5646510 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 8 Aug 2021 16:50:09 +0800 Subject: [PATCH 4/4] feat:There is no way the --- .../impl/StandLawsSearchServiceImpl.java | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index e6168b35..ad72d012 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -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")){