From 3df07924e81416489b1d57a689742aa639b9ce30 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 6 Aug 2021 14:07:22 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20over=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarInterpretationNationalStandardServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java index 3b189f8b..7156a35f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java @@ -39,6 +39,8 @@ public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl Date: Fri, 6 Aug 2021 14:21:32 +0800 Subject: [PATCH 02/20] =?UTF-8?q?feat:=20=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=20=E4=B8=80=E8=88=AC=E6=A3=80=E7=B4=A2=20es=20?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StandLawsSearchServiceImpl.java | 110 +++++++++--------- 1 file changed, 58 insertions(+), 52 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 904fe5da..e6168b35 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 @@ -145,63 +145,69 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { attrInfoMap.put(key, "null"); } } -// fullTextSearchEO.put("issueTime",attrInfoMap.get("issueTime")); StringBuilder contentBuilder = new StringBuilder(); -// contentBuilder.append("区域:东亚 "); - if (!isForeign) { - contentBuilder.append("适用区域:").append(attrInfoMap.get("countryShow")).append(" "); - } - contentBuilder.append("标准状态:").append(attrInfoMap.get("standstateshow")).append(" "); -// - contentBuilder.append("纳入标准法规清单的国家/地区: ").append(attrInfoMap.get("accessCountry")).append(" "); - contentBuilder.append("标准类别: ").append(attrInfoMap.get("standSortShow")).append(" "); - contentBuilder.append("标准号: ").append(attrInfoMap.get("numbershow")).append(" "); - contentBuilder.append("标准名称: ").append(attrInfoMap.get("nameshow")).append(" "); - contentBuilder.append("标准英文名称: ").append(attrInfoMap.get("standEnName")).append(" "); -// contentBuilder.append("发布日期:"+attrInfoMap.get("issueTime")+" "); - contentBuilder.append("覆盖关系: ").append(attrInfoMap.get("FGXXSXXXShow")).append(" "); - contentBuilder.append("代替标准编号: ").append(attrInfoMap.get("DTBJH")).append(" "); - if (StringUtils.isBlank(String.valueOf(attrInfoMap.get("BDTBH")))){ - contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBH")).append(" "); - }else { - contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBZBH")).append(" "); - } - contentBuilder.append("对应其他标准: ").append(attrInfoMap.get("CBBH")).append(" "); - contentBuilder.append("引用标准: ").append(attrInfoMap.get("YYBJ")).append(" "); - contentBuilder.append("被引用标准: ").append(attrInfoMap.get("BYYBJ")).append(" "); - if (isForeign){ - contentBuilder.append("等效标准: ").append(attrInfoMap.get("DXBZ")); - } - contentBuilder.append("相关流程: ").append(attrInfoMap.get("XGLC")).append(" "); - contentBuilder.append("参会记录: ").append(attrInfoMap.get("CHJL")).append(" "); - contentBuilder.append("文本说明: ").append(attrInfoMap.get("synopsis")).append(" "); - contentBuilder.append("重要度: ").append(attrInfoMap.get("isRelateAccess")).append(" "); - if (!isForeign) { - contentBuilder.append("归口管理部门: ").append(attrInfoMap.get("GKDWShow")).append(" "); + contentBuilder.append("标准类别:").append(attrInfoMap.get("standSort")).append(" "); + contentBuilder.append("标准编号:").append(attrInfoMap.get("standNumber")).append(" "); + 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("issueTime")).append(" "); + contentBuilder.append("是否纳入认证清单:").append(attrInfoMap.get("isRelateAccess")).append(" "); + + // 区分国内、海外 + if (isForeign) { + contentBuilder.append("标准状态:").append(attrInfoMap.get("standstateshow")).append(" "); + contentBuilder.append("标签:").append(attrInfoMap.get("gxhbq")).append(" "); + }else { + contentBuilder.append("标准体系:").append(attrInfoMap.get("standSystem")).append(" "); + if (StringUtils.isBlank(String.valueOf(attrInfoMap.get("BDTBH")))){ + contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBH")).append(" "); + }else { + contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBZBH")).append(" "); + } } - if (!isForeign) { - contentBuilder.append("我司参与深度: ").append(attrInfoMap.get("CYSDShow")).append(" "); + + contentBuilder.append("实施日期(标准文本):").append(attrInfoMap.get("ssrq")).append(" "); + contentBuilder.append("新车型实施日期(标准文本):").append(attrInfoMap.get("ssrq")).append(" "); + contentBuilder.append("在产车实施日期(标准文本):").append(attrInfoMap.get("ssrq")).append(" "); + + if (isForeign) { + contentBuilder.append("体系类别:").append(attrInfoMap.get("ssrq")).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(" "); } - if (!isForeign) { - contentBuilder.append("组织标准起草的执行机构/单位: ").append(attrInfoMap.get("FBJGShow")).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("ssrq")).append(" "); + contentBuilder.append("引用标准:").append(attrInfoMap.get("ssrq")).append(" "); + contentBuilder.append("被引用标准:").append(attrInfoMap.get("ssrq")).append(" "); + if (isForeign) { + contentBuilder.append("体系类别:").append(attrInfoMap.get("ssrq")).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("ZRLXShow")).append(" "); - contentBuilder.append("适用车辆类型: ").append(attrInfoMap.get("CLLXShow")).append(" "); - contentBuilder.append("标签: ").append(attrInfoMap.get("GXHBQShow")).append(" "); - if (!isForeign) { - contentBuilder.append("工作组信息: ").append(attrInfoMap.get("GZZXXName")).append(" "); - } - contentBuilder.append("要求类型: ").append(attrInfoMap.get("YQLXShow")).append(" "); - contentBuilder.append("新车型实施日期（文本）: ").append(attrInfoMap.get("XCXSSRQ")).append(" "); - contentBuilder.append("在产车实施日期（文本）: ").append(attrInfoMap.get("ZCCSSRQ")).append(" "); - contentBuilder.append("EOP实施日期（文本）: ").append(attrInfoMap.get("EOPSSRQ")).append(" "); - contentBuilder.append("法规维护人: ").append(attrInfoMap.get("FGWHRName")).append(" "); - contentBuilder.append("责任部门: ").append(attrInfoMap.get("ZRBMShow")).append(" "); - contentBuilder.append("相关部门: ").append(attrInfoMap.get("XGBMShow")).append(" "); - contentBuilder.append("SVPPS: ").append(attrInfoMap.get("SVPPSName")).append(" "); - contentBuilder.append("FO: ").append(attrInfoMap.get("FOShow")).append(" "); - contentBuilder.append("项目评估角色: ").append(attrInfoMap.get("XMPGJSShow")).append(" "); + if (attrInfoMap.containsKey("content")){ if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){ String con = String.valueOf(attrInfoMap.get("content")); From 0649d3850a73f0ee040bd4306e67e9c14d562d77 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 6 Aug 2021 16:20:31 +0800 Subject: [PATCH 03/20] feat: --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 1499fceb..43e06dcd 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -143,7 +143,7 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg # elasticsearch 配置 # ============================================================================= elasticsearch.clustername=elasticsearch -elasticsearch.ip=127.0.0.1 +elasticsearch.ip=172.21.0.10 elasticsearch.port=9300 elasticsearch.poolSize=5 elas.flag=true From 77bc46b1bae2674ae06426faa4d3c4e876ee6120 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 6 Aug 2021 16:24:42 +0800 Subject: [PATCH 04/20] feat:eee --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 43e06dcd..5ccc3bb0 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -143,7 +143,7 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg # elasticsearch 配置 # ============================================================================= elasticsearch.clustername=elasticsearch -elasticsearch.ip=172.21.0.10 +elasticsearch.ip=172.17.0.3 elasticsearch.port=9300 elasticsearch.poolSize=5 elas.flag=true From 4f6b95a5f260639fa58460ee0e9550a8b61cca8c Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 7 Aug 2021 11:48:08 +0800 Subject: [PATCH 05/20] =?UTF-8?q?feat:=20=E5=8F=91=E7=89=88=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=20=E4=B8=8D=E7=94=A8=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application-dev.properties | 6 +++--- adc-da-main/src/main/resources/application.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 8c4e436c..ccba8463 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -44,10 +44,10 @@ spring.mail.port=587 #spring.rabbitmq.username=uat_pcms #spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true -spring.rabbitmq.host=192.168.10.248 +spring.rabbitmq.host=62.234.118.181 spring.rabbitmq.port=5672 -spring.rabbitmq.username=ca -spring.rabbitmq.password=cs986432 +spring.rabbitmq.username=admin +spring.rabbitmq.password=admin # ============================================== # 文档存储路径指向 # ============================================== diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 5ccc3bb0..8412c5be 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -143,7 +143,7 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg # elasticsearch 配置 # ============================================================================= elasticsearch.clustername=elasticsearch -elasticsearch.ip=172.17.0.3 +elasticsearch.ip=172.17.0.1 elasticsearch.port=9300 elasticsearch.poolSize=5 elas.flag=true From 32f76784271f6577e84d1bbbe3627482f1c8d535 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sun, 8 Aug 2021 10:41:26 +0800 Subject: [PATCH 06/20] =?UTF-8?q?ky=20=20=E4=B8=8A=E4=BC=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E9=99=90=E5=88=B6=EF=BC=81=EF=BC=81?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 8412c5be..27bb37f1 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -137,7 +137,7 @@ file.path=D:/uploadfile/bus # 文件下载地址参数 file.downloadUrl=http://39.98.140.126:10001/uploadPath #上传文件白名单-以,分隔 -upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg +upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt # ============================================================================= # elasticsearch 配置 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 07/20] 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 08/20] 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 09/20] 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 10/20] 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")){ From b0eeb87bd1ded7e6c40fce53fe838f93ff35bf10 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 8 Aug 2021 22:40:37 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85->?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=88=86=E8=A7=A3=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandItemsController.java | 16 +- .../sarStandItems/dao/SarStandItemsDao.java | 6 +- .../entity/FindSarItemsPageReqDTO.java | 36 ++ .../slrs/sarStandItems/entity/SarItemVO.java | 67 +++ .../impl/SarStandItemsServiceImpl.java | 5 + .../SarStandItems/SarStandItemsMapper.xml | 502 ++++++++++-------- 6 files changed, 414 insertions(+), 218 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 993de484..bcfcb637 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -5,16 +5,13 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; -import com.adc.da.slrs.sarStandItems.entity.FindStandDto; -import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; -import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; +import com.adc.da.slrs.sarStandItems.entity.*; import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; @@ -54,6 +51,17 @@ public class SarStandItemsController extends BaseController { } } + @ApiOperation(value = "分解单查询") + @GetMapping("/querySarItemAndInterpretation") + public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ + List sarItemVOS = ServiceImpl.querySarItemAndInterpretation(page); + + return Result.success("200",sarItemVOS); + } + + + + @ApiOperation(value = "分解单查询(带时间)") @GetMapping("/findAllItemsTimes") public List findAllItemsTimes(@RequestParam("type") String type,@RequestParam("ids") String ids){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 0f5aa0d4..f37ea8b3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -1,8 +1,6 @@ package com.adc.da.slrs.sarStandItems.dao; -import com.adc.da.slrs.sarStandItems.entity.SarStandItems; -import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; -import com.adc.da.slrs.sarStandItems.entity.StandsTimeDto; +import com.adc.da.slrs.sarStandItems.entity.*; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.sys.common.SelectionResult; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -24,6 +22,8 @@ import java.util.Set; @Mapper public interface SarStandItemsDao extends BaseMapper { + List querySarItemAndInterpretation(FindSarItemsPageReqDTO page); + List querySarStandItemsList(SarStandItemsEOPage page); int querySarStandItemsListCount(SarStandItemsEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java new file mode 100644 index 00000000..5ed30c32 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java @@ -0,0 +1,36 @@ +package com.adc.da.slrs.sarStandItems.entity; + +import com.adc.da.base.page.BasePage; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + + +@Data +public class FindSarItemsPageReqDTO { + + private static final long serialVersionUID = 1L; + private Integer page = 1; + private Integer pageSize = 20; + + + @ApiModelProperty(value = "标准id") + private String standId; + + @ApiModelProperty(value = "条款名称") + private String itemsName; + + @ApiModelProperty(value = "新车型实施日期") + @DateTimeFormat(pattern = "yyy-MM-dd") + private Date XCXSSRQ; + + @ApiModelProperty(value = "在产车实施日期") + @DateTimeFormat(pattern = "yyy-MM-dd") + private Date ZCCSSRQ; + + @ApiModelProperty(value = "文件类型") + private String fileType; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java new file mode 100644 index 00000000..ac471308 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java @@ -0,0 +1,67 @@ +package com.adc.da.slrs.sarStandItems.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@ApiModel(value="标准分解单显示对象", description="") +public class SarItemVO extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + + @ApiModelProperty(value = "标准ID") + private String standId; + + @ApiModelProperty(value = "条款号") + private String itemsNum; + + @ApiModelProperty(value = "条款名称") + private String itemsName; + + @ApiModelProperty(value = "条款内容") + private String itemsTitle; + + @ApiModelProperty(value = "解读内容--条款要求") + private String termsConditions; + + @ApiModelProperty(value = "新车实施日期") + @DateTimeFormat + private Date XCXSSRQ; + + @ApiModelProperty(value = "在产车实施日期") + @DateTimeFormat + private Date ZCCSSRQ; + + @ApiModelProperty(value = "适用车型") + private String applyArctic; + + + @ApiModelProperty(value = "责任部门") + private String responsibleUnit; + + + @ApiModelProperty(value = "责任工程师") + private String dutyEngineer; + + @ApiModelProperty(value = "相对于上一版本变化点") + private String comparedWithPrevious; + + @ApiModelProperty(value = "合规性分析") + private String complianceState; + + @ApiModelProperty(value = "符合性要求-符合性状态") + private String complianceRequire; + + @ApiModelProperty(value = "文件类型") + private String fileType; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index c06fe3fa..3cdddfce 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -179,4 +179,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl findAllItems(String type,String[] ids){ return dao.selectAllItemsByIds(type,ids); } + + + public List querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ + return dao.querySarItemAndInterpretation(page); + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 121a16f4..774efa4c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -2,65 +2,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id ,TS_ORG.org_name as responsibleUnitShow,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,tsFo.UNAME as foShow,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps, SAR_STAND_ITEMS.claim_type,SAR_STAND_ITEMS.bus_stand_cover,SAR_STAND_ITEMS.file_type,dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.UNAME as dutyEngineerShow,SAR_STAND_ITEMS.fo - + SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id ,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps, @@ -69,91 +86,97 @@ - left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and SAR_STANDARDS_INFO.valid_flag=0) - left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and dicClaimType.dic_id is + left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and + SAR_STANDARDS_INFO.valid_flag=0) + left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and + dicClaimType.dic_id is not null and dicClaimType.valid_flag = 0) - left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID = SAR_STAND_ITEMS.duty_engineer and tsdutyEngineer.valid_flag=0 + left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID = SAR_STAND_ITEMS.duty_engineer and + tsdutyEngineer.valid_flag=0 and tsdutyEngineer.DISABLE_FLAG=0) - left join TS_USER tsFo on (tsFo.USID = SAR_STAND_ITEMS.fo and tsFo.valid_flag=0 + left join TS_USER tsFo on (tsFo.USID = SAR_STAND_ITEMS.fo and tsFo.valid_flag=0 and tsFo.DISABLE_FLAG=0) where 1=1 - - + + and SAR_STAND_ITEMS.file_type = #{fileType} - + and SAR_STAND_ITEMS.modify_time ${modifyTimeOperator} #{modifyTime} - + and SAR_STAND_ITEMS.modify_time >= #{modifyTime1} - + and SAR_STAND_ITEMS.modify_time <= #{modifyTime2} - + and SAR_STAND_ITEMS.creation_time ${creationTimeOperator} #{creationTime} - + and SAR_STAND_ITEMS.creation_time >= #{creationTime1} - + and SAR_STAND_ITEMS.creation_time <= #{creationTime2} - + and SAR_STAND_ITEMS.creation_user ${creationUserOperator} #{creationUser} - + and SAR_STAND_ITEMS.valid_flag ${validFlagOperator} #{validFlag} - + and SAR_STAND_ITEMS.remarks ${remarksOperator} #{remarks} - + and SAR_STAND_ITEMS.responsible_unit = #{responsibleUnit} - + and SAR_STAND_ITEMS.energy_kind ${energyKindOperator} #{energyKind} - + and SAR_STAND_ITEMS.apply_arctic ${applyArcticOperator} #{applyArctic} - + and SAR_STAND_ITEMS.tack_time ${tackTimeOperator} #{tackTime} - + and SAR_STAND_ITEMS.tack_time >= #{tackTime1} - + and SAR_STAND_ITEMS.tack_time <= #{tackTime2} - + and SAR_STAND_ITEMS.parts like concat(concat('%', #{parts}),'%') - - and (SAR_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or SAR_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%')) + + and (SAR_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or + SAR_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%')) - + and SAR_STAND_ITEMS.items_name ${itemsNameOperator} #{itemsName} - + and SAR_STAND_ITEMS.items_num ${itemsNumOperator} #{itemsNum} - + and SAR_STAND_ITEMS.stand_id ${standIdOperator} #{standId} - + and ((SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER || '-' || - SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is not null) - or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like concat(concat('%',#{standNum}),'%') + SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR + is not null) + or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like + concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is null)) - + and SAR_STAND_ITEMS.id ${idOperator} #{id} - + and SAR_STAND_ITEMS.id != #{noId} - + and SAR_PRODUCT_SAR_STATE.product_id = #{productId} @@ -162,82 +185,86 @@ #{item} - + and (SAR_STAND_ITEMS.claim_type='L7N7EEDAPR' or SAR_STAND_ITEMS.claim_type='RENVECPFGT') - + - insert into SAR_STAND_ITEMS() - values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{remarks, jdbcType=VARCHAR}, #{responsibleUnit, jdbcType=VARCHAR}, #{energyKind, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, #{tackTime, jdbcType=TIMESTAMP}, #{parts, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}) + insert into SAR_STAND_ITEMS() + values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, + #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{remarks, jdbcType=VARCHAR}, + #{responsibleUnit, jdbcType=VARCHAR}, #{energyKind, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, + #{tackTime, jdbcType=TIMESTAMP}, #{parts, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, + #{itemsNum, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}) - + insert into SAR_STAND_ITEMS - - modify_time, - creation_time, - creation_user, - valid_flag, - remarks, - responsible_unit, - energy_kind, - apply_arctic, - tack_time, - parts, - items_name, - items_num, - stand_id, - id, + + modify_time, + creation_time, + creation_user, + valid_flag, + remarks, + responsible_unit, + energy_kind, + apply_arctic, + tack_time, + parts, + items_name, + items_num, + stand_id, + id, MAINPOINTS_IMPEMENTATION, TERMS_CONDITIONS, - fo, - duty_engineer, - svpps, - claim_type, + fo, + duty_engineer, + svpps, + claim_type, bus_stand_cover, file_type - - #{modifyTime, jdbcType=TIMESTAMP}, - #{creationTime, jdbcType=TIMESTAMP}, - #{creationUser, jdbcType=VARCHAR}, - #{validFlag, jdbcType=INTEGER}, - #{remarks, jdbcType=VARCHAR}, - #{responsibleUnit, jdbcType=VARCHAR}, - #{energyKind, jdbcType=VARCHAR}, - #{applyArctic, jdbcType=VARCHAR}, - #{tackTime, jdbcType=TIMESTAMP}, - #{parts, jdbcType=VARCHAR}, - #{itemsName, jdbcType=VARCHAR}, - #{itemsNum, jdbcType=VARCHAR}, - #{standId, jdbcType=VARCHAR}, - #{id, jdbcType=VARCHAR}, + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{creationUser, jdbcType=VARCHAR}, + #{validFlag, jdbcType=INTEGER}, + #{remarks, jdbcType=VARCHAR}, + #{responsibleUnit, jdbcType=VARCHAR}, + #{energyKind, jdbcType=VARCHAR}, + #{applyArctic, jdbcType=VARCHAR}, + #{tackTime, jdbcType=TIMESTAMP}, + #{parts, jdbcType=VARCHAR}, + #{itemsName, jdbcType=VARCHAR}, + #{itemsNum, jdbcType=VARCHAR}, + #{standId, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, #{mainPointImplementation,jdbcType=VARCHAR}, #{termsConditions,jdbcType=CLOB}, - #{fo, jdbcType=VARCHAR}, - #{dutyEngineer, jdbcType=VARCHAR}, - #{svpps, jdbcType=VARCHAR}, - #{claimType, jdbcType=VARCHAR}, - #{busStandCover, jdbcType=VARCHAR}, - #{fileType, jdbcType=VARCHAR} + #{fo, jdbcType=VARCHAR}, + #{dutyEngineer, jdbcType=VARCHAR}, + #{svpps, jdbcType=VARCHAR}, + #{claimType, jdbcType=VARCHAR}, + #{busStandCover, jdbcType=VARCHAR}, + #{fileType, jdbcType=VARCHAR} - + update SAR_STAND_ITEMS set modify_time = #{modifyTime}, creation_time = #{creationTime}, @@ -258,69 +285,69 @@ update SAR_STAND_ITEMS - - + + modify_time = #{modifyTime}, - + creation_time = #{creationTime}, - + creation_user = #{creationUser}, - + valid_flag = #{validFlag}, - + remarks = #{remarks}, - + responsible_unit = #{responsibleUnit}, - + energy_kind = #{energyKind}, - + apply_arctic = #{applyArctic}, - + tack_time = #{tackTime}, tack_time = null, - + parts = #{parts}, - + items_name = #{itemsName}, - + items_num = #{itemsNum}, - + stand_id = #{standId}, - + MAINPOINTS_IMPEMENTATION = #{mainPointImplementation}, - + TERMS_CONDITIONS = #{termsConditions,jdbcType=CLOB}, - + fo = #{fo}, - + duty_engineer = #{dutyEngineer}, - + svpps = #{svpps}, - + claim_type = #{claimType}, - + bus_stand_cover = #{busStandCover}, @@ -329,7 +356,8 @@ + + @@ -492,7 +569,7 @@ @@ -524,39 +601,39 @@ update SAR_STAND_ITEMS - - + + svpps = #{item.svpps}, - + fo = #{item.fo}, - + file_type = #{item.fileType}, - + modify_time = #{item.modifyTime}, - + remarks = #{item.remarks}, - + apply_arctic = #{item.applyArctic}, - + items_name = #{item.itemsName}, - + items_num = #{item.itemsNum}, - + stand_id = #{item.standId}, - + TERMS_CONDITIONS = #{item.termsConditions,jdbcType=CLOB}, - where id = #{item.id, jdbcType=VARCHAR} + where id = #{item.id, jdbcType=VARCHAR} ; @@ -595,7 +672,6 @@ - - select stand_id as label,claim_type as value from SAR_STAND_ITEMS where valid_flag = 0 and claim_type != '' @@ -627,7 +704,8 @@ - select stand_id as label,svpps as value from SAR_STAND_ITEMS where valid_flag = 0 and svpps != '' @@ -643,14 +721,16 @@ + + SELECT + count(sar_stand_project_library.id ) as total + FROM + sar_stand_project_library + LEFT JOIN ts_user tu ON project_manager = tu.USID + WHERE + ( + id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) + + + AND project_number LIKE concat(concat('%',#{qu.projectNumber}),'%') + + + AND project_name LIKE concat(concat('%',#{qu.projectName}),'%') + + + AND project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%') + + + AND project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%') + + + AND project_group LIKE concat(concat('%',#{qu.projectGroup}),'%') + + + AND project_status LIKE concat(concat('%',#{qu.projectStatus}),'%') + + + AND current_node LIKE concat(concat('%',#{qu.currentNode}),'%') + + + AND project_level LIKE concat(concat('%',#{qu.projectLevel}),'%') + + + AND project_manager LIKE concat(concat('%',#{qu.projectManager}),'%') + + + AND product_line LIKE concat(concat('%',#{qu.productLine}),'%') + + + AND project_start_date >= #{qu.projectStartDate} + + + AND project_end_date <= #{qu.projectEndDate} + + + ) + + + From 7a51e1d9b4fadd519689cdb6977fa85aef471a9b Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 9 Aug 2021 16:56:29 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85->?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=88=86=E8=A7=A3=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=20mapper=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 774efa4c..47d36212 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -384,7 +384,6 @@ sar_stand_items AS a LEFT JOIN sar_interpretation_national_standard AS b ON a.STAND_ID = b.STAND_ID --- valid_flag=0 and a.stand_id=#{standId} @@ -397,7 +396,7 @@ and a.ITEMS_NAME=#{itemsName} - + and a.XCXSSRQ=#{XCXSSRQ} From 9c325718686a45f14eaa72e6fe562e8400a4e51c Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 9 Aug 2021 17:31:32 +0800 Subject: [PATCH 15/20] feat:There is no way the --- .../service/impl/SearchCenterServiceImpl.java | 27 +++++++- .../impl/StandLawsSearchServiceImpl.java | 62 +++++++++---------- .../adc/da/mq/service/SendStandMQService.java | 9 +++ .../impl/SarStandardsInfoServiceImpl.java | 46 +++++++++++++- 4 files changed, 109 insertions(+), 35 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 c3fe3dbe..c2677851 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 @@ -3,6 +3,8 @@ package com.adc.da.search.service.impl; import com.adc.da.search.entity.*; import com.adc.da.search.service.SearchCenterService; import com.adc.da.search.util.InitStandAttrSearchUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -96,6 +98,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standNature.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("textStatus.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("content.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*")); break; case "laws": @@ -217,6 +221,23 @@ public class SearchCenterServiceImpl implements SearchCenterService { Map.Entry::getKey, Map.Entry::getValue)); + if(sarStandAttrEOStr == null){ + collectAttrMap = new TreeMap<>(); + + if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){ + List fieldList = Arrays.asList(searchInfoEO.getCYSD() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList)); + collectAttrMap.put("CYSD",array); + } + + if(searchInfoEO.getCLLX() != null && StringUtils.isNotBlank(searchInfoEO.getCLLX())){ + List fieldList = Arrays.asList(searchInfoEO.getCLLX() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList)); + collectAttrMap.put("CLLX",array); + } + + } + String fieldInfo = InitStandAttrSearchUtil.queryField; List fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); @@ -224,8 +245,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { for (String field : fieldInfoList) { // 关键字查询属性字段 String keyWordField = field + ".keyword"; + String keyWordField2 = field + "Name.keyword"; if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){ - boolQueryBuilderMust.should(QueryBuilders.wildcardQuery(keyWordField, "*"+searchInfoEO.getSelectValue()+"*")); + boolQueryBuilderMust.should(QueryBuilders.wildcardQuery(keyWordField2, "*"+searchInfoEO.getSelectValue()+"*")); }else { if(collectAttrMap.containsKey(field)){ List fields = new ArrayList<>(); @@ -1067,11 +1089,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery(); QueryBuilder multiQueryBuilder; multiQueryBuilder = QueryBuilders.multiMatchQuery(value, - "title","textContent","issue_time").minimumShouldMatch("100%").field("title",1f); + "title","textContent").minimumShouldMatch("100%").field("title",1f); boolQueryMust.must(multiQueryBuilder); boolQueryShould.should(QueryBuilders.wildcardQuery("title", "*"+searchInfoEO.getSelectValue()+"*").boost(10f)) .should(QueryBuilders.wildcardQuery("textContent", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("issue_time", "*"+searchInfoEO.getSelectValue()+"*")) .should(multiQueryBuilder); boolQueryBuilder.should(boolQueryShould); //在结果中检索 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 ad72d012..dde8aed7 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 @@ -164,48 +164,48 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { }else { contentBuilder.append("标准体系:").append(attrInfoMap.get("standSystem")).append(" "); if (StringUtils.isBlank(String.valueOf(attrInfoMap.get("BDTBH")))){ - contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBH")).append(" "); + contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBHName")).append(" "); }else { - contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBZBH")).append(" "); + contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBZBHName")).append(" "); } } - contentBuilder.append("实施日期(标准文本):").append(attrInfoMap.get("SSRQ")).append(" "); - contentBuilder.append("新车型实施日期(标准文本):").append(attrInfoMap.get("XCXSSRQ")).append(" "); - contentBuilder.append("在产车实施日期(标准文本):").append(attrInfoMap.get("ZCCSSRQ")).append(" "); + contentBuilder.append("实施日期(标准文本):").append(attrInfoMap.get("SSRQName")).append(" "); + contentBuilder.append("新车型实施日期(标准文本):").append(attrInfoMap.get("XCXSSRQName")).append(" "); + contentBuilder.append("在产车实施日期(标准文本):").append(attrInfoMap.get("ZCCSSRQName")).append(" "); if (isForeign) { - contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLB")).append(" "); + contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); }else { - 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("GKDWName")).append(" "); + contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); + contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); + contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSDName")).append(" "); + contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPMName")).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("CLLXName")).append(" "); + contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXName")).append(" "); + contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXName")).append(" "); + contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZName")).append(" "); + contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); + contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); + contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBMName")).append(" "); + contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCNName")).append(" "); + contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBMName")).append(" "); + contentBuilder.append("关联模块--卡车vpps中文名称:").append(attrInfoMap.get("KCCVPPSCNName")).append(" "); + contentBuilder.append("模块结构单元变型号:").append(attrInfoMap.get("DYBXHName")).append(" "); + contentBuilder.append("模块结构单元名称:").append(attrInfoMap.get("DYMCName")).append(" "); - contentBuilder.append("代替标准号:").append(attrInfoMap.get("DTBJH")).append(" "); - contentBuilder.append("引用标准:").append(attrInfoMap.get("YYBJ")).append(" "); - contentBuilder.append("被引用标准:").append(attrInfoMap.get("BYYBJ")).append(" "); + contentBuilder.append("代替标准号:").append(attrInfoMap.get("DTBJHName")).append(" "); + contentBuilder.append("引用标准:").append(attrInfoMap.get("YYBJName")).append(" "); + contentBuilder.append("被引用标准:").append(attrInfoMap.get("BYYBJName")).append(" "); if (isForeign) { - contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLB")).append(" "); + contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); }else { - 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(" "); + contentBuilder.append("采标编号:").append(attrInfoMap.get("CBBHName")).append(" "); + contentBuilder.append("采标程度:").append(attrInfoMap.get("CBCDName")).append(" "); + contentBuilder.append("部分代替标准号:").append(attrInfoMap.get("BFDTBZName")).append(" "); + contentBuilder.append("被部分代替标准号:").append(attrInfoMap.get("BBFDTBZName")).append(" "); } if (attrInfoMap.containsKey("content")){ 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 16cb5288..f6660306 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 @@ -9,6 +9,7 @@ import com.adc.da.utils.util.InitStandAttrUtil; import com.rabbitmq.client.Channel; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; +import org.json.JSONTokener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.amqp.rabbit.annotation.Exchange; @@ -72,6 +73,7 @@ public class SendStandMQService { SarStandardsInfo infoEO = (SarStandardsInfo) JSONObject.toBean(jsonobject,SarStandardsInfo.class); String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr(); Map attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr); + Map infoMap = infoEO.getAttrInfoMap(); // 往索引表中插入数据 String getCodeName = ""; @@ -111,6 +113,7 @@ public class SendStandMQService { } saveMap.put("issueTime",dateFormatToStr(infoEO.getIssueTime())); + saveMap.put("standNature",infoEO.getStandNature()); saveMap.put("synopsis",infoEO.getSynopsis()); saveMap.put("standType",infoEO.getStandType()); saveMap.put("textStatus",infoEO.getTextStatus()); @@ -134,6 +137,12 @@ public class SendStandMQService { // 动态存储属性字段 for (String field : fieldInfoList) { saveMap.put(field,attrInfoMap.getOrDefault(field,"")); + Object json= new JSONTokener(infoMap.get(field).toString()).nextValue(); + String fieldValue = ""; + if(!json.toString().equals("null")){ + fieldValue = infoMap.get(field).toString(); + } + saveMap.put(field+"Name",fieldValue); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index f939742f..ea59b101 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -382,6 +382,30 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId()); + if (InitStandAttrUtil.clobFieldList != null && !InitStandAttrUtil.clobFieldList.isEmpty()) { + // 遍历修改所有clob类型的值 + for (String clobField : InitStandAttrUtil.clobFieldList) { + Clob clobValue = (Clob) getAttrMap.get(clobField); + String fieldValue = FieldConvertUtil.ClobToString(clobValue); + getAttrMap.put(clobField, fieldValue); + } + } + + if (getAttrMap != null && !getAttrMap.isEmpty()) { + row.setAttrInfoCaseMap(transformUpperCase(getAttrMap)); + } + + row.setAttrInfoMap(getAttrMap); + } + } + private Map transformUpperCase(Map orgMap) { Map resultMap = new HashMap<>(); @@ -428,6 +452,25 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getAttrMap = row.getAttrInfoMap(); + if (getAttrMap != null && getAttrMap.size() > 0) { + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + String value = ""; + if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { + value = entry.getValue().toString(); + List valArr = Arrays.asList(value.split(",")); + value = dicTypeEODao.getDicNamesByCodes(valArr); + entry.setValue(value); + } + } + } + } + } + public void attrInfoShow(List sarlist) throws Exception { for (SarStandardsInfo row : sarlist) { attrInfoDetails(row); @@ -1099,7 +1142,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl bhs = new ArrayList<>(Arrays.asList(String.valueOf(map.get("DTBJH")).split(","))); for (String bh :bhs) { From aa76b93e5c30d00057c32323d749af52d948bd0c Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 9 Aug 2021 17:41:48 +0800 Subject: [PATCH 16/20] feat:111 --- .../adc/da/search/service/impl/ElasticsearchServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java index 3af95a89..8879dfb8 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java @@ -120,7 +120,7 @@ public class ElasticsearchServiceImpl implements ElasticsearchService { } /** - * 指定ID数据添加接口实现， + * 指定ID数据添加接口实现 * @param jsonObject 要增加的数据 * @param index 索引，类似数据库 * @param type 类型，类似表 (自6.0改版以后，一个索引里只允许有一种类型， From 3dd392b411f820b2990323e1cf6d227b0e892e0f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 9 Aug 2021 17:52:01 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarLawsAttrDetailedListDao.java | 2 +- .../sarStandIdea/entity/SarPublicIdea.java | 3 ++ .../controller/SarStandItemsController.java | 2 +- .../sarStandItems/entity/FindStandDto.java | 1 + .../entity/SarStandItemsDto.java | 4 +++ .../impl/SarStandItemsServiceImpl.java | 14 +++++----- ...rpretationNationalStandardServiceImpl.java | 28 +++++++++---------- .../SarStandItems/SarStandItemsMapper.xml | 2 +- .../SarLawsAttrDetailedListMapper.xml | 6 ++++ 9 files changed, 38 insertions(+), 24 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index 6dba1030..47444721 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -30,7 +30,7 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsByIdE(@Param("param1") List LawsIds); //根据标准id查出数据 - List selectLawsByIdC(@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType); + List selectLawsByIdC(@Param("start")Integer start,@Param("end")Integer end,@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType); //查询时间 List selectTimes(String standId); List selectLawsId2(String standId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java index 0e8f9a0a..37c296ba 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java @@ -60,5 +60,8 @@ public class SarPublicIdea extends BaseEntity { @TableField("stand_id") private String standId; + @TableField("stand_type") + private String standType; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 7a3136fc..dfb79043 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -70,7 +70,7 @@ public class SarStandItemsController extends BaseController { } - @ApiOperation(value = "标准查询") + @ApiOperation(value = "标准批量保存") @PostMapping("/saveBatch") public String saveBatch(@RequestBody List findStandDto){ findStandDto.forEach(sarStandItems -> sarStandItems.setId(UUIDUtils.randomUUID(32))); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java index 48409480..09d43f4b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java @@ -14,4 +14,5 @@ public class FindStandDto { private int size; private String standName; private String standType; + private String fileType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java index e6292810..c1268581 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java @@ -44,4 +44,8 @@ public class SarStandItemsDto { @ApiModelProperty(value = "覆盖关系") private String busStandCover; + private String xcxssrq; + + private String zccssrq; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 65be9704..3c58b975 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -85,8 +85,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl page1=new Page<>(); page1.setRecords(list); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java index 7156a35f..b65b6539 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java @@ -24,8 +24,8 @@ import java.util.List; @Service public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl implements ISarInterpretationNationalStandardService { - @Autowired - SarStandardComplianceProductAssessDao sarStandardComplianceProductAssessDao; +// @Autowired +// SarStandardComplianceProductAssessDao sarStandardComplianceProductAssessDao; @Override public String saveBath(List sarInterpretationNationalStandards) { @@ -34,18 +34,18 @@ public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl { QueryWrapper queryWrapper=new QueryWrapper<>(); queryWrapper.eq("stand_id",sarInterpretationNationalStandard.getStandId()); - List assessList = sarStandardComplianceProductAssessDao.selectList(queryWrapper); - if (assessList.isEmpty()){ - SarStandardComplianceProductAssess sar=new SarStandardComplianceProductAssess(); - sar.setId(UUIDUtils.randomUUID(32)); - sar.setStandId(sarInterpretationNationalStandard.getStandId()); - sar.setStandNumber(sarInterpretationNationalStandard.getStandNumber()); - sar.setStandType(sarInterpretationNationalStandard.getStandType()); - sar.setStandName(sarInterpretationNationalStandard.getStandName()); - sar.setStandType(sarInterpretationNationalStandard.getStandType()); - sar.setInterpretationTime(sarInterpretationNationalStandard.getInterpretationTime()); - sarStandardComplianceProductAssessDao.insert(sar); - } +// List assessList = sarStandardComplianceProductAssessDao.selectList(queryWrapper); +// if (assessList.isEmpty()){ +// SarStandardComplianceProductAssess sar=new SarStandardComplianceProductAssess(); +// sar.setId(UUIDUtils.randomUUID(32)); +// sar.setStandId(sarInterpretationNationalStandard.getStandId()); +// sar.setStandNumber(sarInterpretationNationalStandard.getStandNumber()); +// sar.setStandType(sarInterpretationNationalStandard.getStandType()); +// sar.setStandName(sarInterpretationNationalStandard.getStandName()); +// sar.setStandType(sarInterpretationNationalStandard.getStandType()); +// sar.setInterpretationTime(sarInterpretationNationalStandard.getInterpretationTime()); +// sarStandardComplianceProductAssessDao.insert(sar); +// } }); String res = flag ? "1":"0"; return res; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index eb3ce0d5..0de0d471 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -643,7 +643,7 @@ - select - ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as - responsibleEngineer select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq from SAR_STAND_ITEMS where FILE_TYPE=#{type} From e52f316a59a72b989d3bd0d93b523275ffd420a6 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 10 Aug 2021 14:49:44 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=80=BB=E6=95=B0?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=20=EF=BC=81=EF=BC=81=EF=BC=81=EF=BC=81?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarLawsAttrDetailedListDao.java | 1 + .../impl/SarStandItemsServiceImpl.java | 2 +- .../SarLawsAttrDetailedListMapper.xml | 30 +++++++++++++++++-- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index 47444721..2ff5fc7c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -31,6 +31,7 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsByIdE(@Param("param1") List LawsIds); //根据标准id查出数据 List selectLawsByIdC(@Param("start")Integer start,@Param("end")Integer end,@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType); + List selectLawsByIdCount(@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType); //查询时间 List selectTimes(String standId); List selectLawsId2(String standId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index a4addb97..dce6e79b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -172,7 +172,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl page1=new Page<>(); page1.setRecords(list); - page1.setTotal(dao.selectToken()); + page1.setTotal(sarLawsAttrDetailedListDao.selectLawsByIdCount(standId,findStandDto.getStandName(),findStandDto.getStandType(),findStandDto.getFileType()).size()); return page1; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 994ffcb3..70378358 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -110,6 +110,34 @@ group by a.ID limit #{start},#{end} + + +