From 898f51086809c44fea8b29d40cd155f778d1ef3a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 23 Sep 2021 15:29:02 +0800 Subject: [PATCH 01/12] feat: There is no way the searchCenter --- .../service/impl/SearchCenterServiceImpl.java | 81 +++++++++++++++++-- 1 file changed, 75 insertions(+), 6 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 f7254cc2..fc907922 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 @@ -178,6 +178,12 @@ public class SearchCenterServiceImpl implements SearchCenterService { if (StringUtils.isNotBlank(searchInfoEO.getStandType())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*")); } + if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*")); + } + if (StringUtils.isNotBlank(searchInfoEO.getTextStatus())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatus.keyword", "*"+searchInfoEO.getTextStatus()+"*")); + } boolQueryBuilder.must(boolQueryShould); }else { boolQueryBuilder.must(boolQueryShould); @@ -245,7 +251,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { } if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){ - List fieldList = Arrays.asList(searchInfoEO.getCYSD() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + 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); } @@ -287,15 +293,60 @@ public class SearchCenterServiceImpl implements SearchCenterService { } } if(!fields.isEmpty()){ - for (String str : fields) { - boolQueryBuilderMust.must(QueryBuilders.wildcardQuery(keyWordField, "*"+str+"*")); + if(fields.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + fields.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery(keyWordField, "*"+s+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilderMust.must(QueryBuilders.wildcardQuery(keyWordField, "*"+fields.get(0)+"*")); } + } } } } if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())) { boolQueryBuilder.should(boolQueryBuilderMust); + if(searchInfoEO.getQCDW() != null && StringUtils.isNotBlank(searchInfoEO.getQCDW())){ + List list = Arrays.asList(searchInfoEO.getQCDW().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + if(list.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + list.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("QCDW.keyword", "*"+s+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("QCDW.keyword", "*"+searchInfoEO.getQCDW()+"*")); + } + } + + if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){ + List list = Arrays.asList(searchInfoEO.getCYSD().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + if(list.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + list.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("CYSD.keyword", "*"+s+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("CYSD.keyword", "*"+searchInfoEO.getCYSD()+"*")); + } + } + + if(searchInfoEO.getCLLX() != null && StringUtils.isNotBlank(searchInfoEO.getCLLX())){ + List list = Arrays.asList(searchInfoEO.getCLLX().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + if(list.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + list.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("CLLX.keyword", "*"+s+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("CLLX.keyword", "*"+searchInfoEO.getCLLX()+"*")); + } + } }else { boolQueryBuilder.must(boolQueryBuilderMust); } @@ -312,7 +363,16 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*")); } if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) { - boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*")); + List list = Arrays.asList(searchInfoEO.getStandSort().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + if(list.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + list.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+s+" "+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*")); + } } if (StringUtils.isNotBlank(searchInfoEO.getStandNumber())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getStandNumber()+"*")); @@ -584,7 +644,16 @@ public class SearchCenterServiceImpl implements SearchCenterService { } if (StringUtils.isNotBlank(searchInfoEO.getTextStatusBuss())) { - boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getTextStatusBuss()+"*")); + List list = Arrays.asList(searchInfoEO.getTextStatusBuss().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + if(list.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + list.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+s+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getTextStatusBuss()+"*")); + } } if (searchInfoEO.getIssueTime() != null) { @@ -644,7 +713,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { // 循环统计各种类型数据 String[] seniortype; if("stand".equals(searchInfoEO.getSelectIndex())) { - String[] seniortypeStand = {"standSort", "statecode","CYSD","ZRLX","CLLX","CBCD"}; + String[] seniortypeStand = {"standSort", "statecode","CYSD","ZRLX","CLLX","CBCD","textStatus","textStatusName"}; seniortype = seniortypeStand.clone(); } else if("laws".equals(searchInfoEO.getSelectIndex())){ String[] seniortypeLaws = {"country","statecode","SYCLLX","ZRLX","WSSFCY"}; From 031cbf961189d54158c33ac3836dc32dd3d6e3e7 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 22 Sep 2021 17:30:37 +0800 Subject: [PATCH 02/12] feat: There is no way the --- .../com/adc/da/search/service/impl/SearchCenterServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 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 f1845e49..f7254cc2 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 @@ -312,7 +312,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { 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("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*")); } if (StringUtils.isNotBlank(searchInfoEO.getStandNumber())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getStandNumber()+"*")); From 7c961a92a2a4026d2815b1218ab63cc2864b3bbf Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 23 Sep 2021 15:29:02 +0800 Subject: [PATCH 03/12] feat: There is no way the searchCenter --- .../service/impl/SearchCenterServiceImpl.java | 81 +++++++++++++++++-- 1 file changed, 75 insertions(+), 6 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 f7254cc2..fc907922 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 @@ -178,6 +178,12 @@ public class SearchCenterServiceImpl implements SearchCenterService { if (StringUtils.isNotBlank(searchInfoEO.getStandType())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*")); } + if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*")); + } + if (StringUtils.isNotBlank(searchInfoEO.getTextStatus())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatus.keyword", "*"+searchInfoEO.getTextStatus()+"*")); + } boolQueryBuilder.must(boolQueryShould); }else { boolQueryBuilder.must(boolQueryShould); @@ -245,7 +251,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { } if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){ - List fieldList = Arrays.asList(searchInfoEO.getCYSD() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + 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); } @@ -287,15 +293,60 @@ public class SearchCenterServiceImpl implements SearchCenterService { } } if(!fields.isEmpty()){ - for (String str : fields) { - boolQueryBuilderMust.must(QueryBuilders.wildcardQuery(keyWordField, "*"+str+"*")); + if(fields.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + fields.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery(keyWordField, "*"+s+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilderMust.must(QueryBuilders.wildcardQuery(keyWordField, "*"+fields.get(0)+"*")); } + } } } } if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())) { boolQueryBuilder.should(boolQueryBuilderMust); + if(searchInfoEO.getQCDW() != null && StringUtils.isNotBlank(searchInfoEO.getQCDW())){ + List list = Arrays.asList(searchInfoEO.getQCDW().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + if(list.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + list.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("QCDW.keyword", "*"+s+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("QCDW.keyword", "*"+searchInfoEO.getQCDW()+"*")); + } + } + + if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){ + List list = Arrays.asList(searchInfoEO.getCYSD().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + if(list.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + list.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("CYSD.keyword", "*"+s+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("CYSD.keyword", "*"+searchInfoEO.getCYSD()+"*")); + } + } + + if(searchInfoEO.getCLLX() != null && StringUtils.isNotBlank(searchInfoEO.getCLLX())){ + List list = Arrays.asList(searchInfoEO.getCLLX().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + if(list.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + list.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("CLLX.keyword", "*"+s+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("CLLX.keyword", "*"+searchInfoEO.getCLLX()+"*")); + } + } }else { boolQueryBuilder.must(boolQueryBuilderMust); } @@ -312,7 +363,16 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*")); } if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) { - boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*")); + List list = Arrays.asList(searchInfoEO.getStandSort().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + if(list.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + list.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+s+" "+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*")); + } } if (StringUtils.isNotBlank(searchInfoEO.getStandNumber())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getStandNumber()+"*")); @@ -584,7 +644,16 @@ public class SearchCenterServiceImpl implements SearchCenterService { } if (StringUtils.isNotBlank(searchInfoEO.getTextStatusBuss())) { - boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getTextStatusBuss()+"*")); + List list = Arrays.asList(searchInfoEO.getTextStatusBuss().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + if(list.size() > 1){ + BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); + list.forEach(s -> { + boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+s+"*")); + }); + boolQueryBuilder.must(boolQueryBuilderShould); + }else { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getTextStatusBuss()+"*")); + } } if (searchInfoEO.getIssueTime() != null) { @@ -644,7 +713,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { // 循环统计各种类型数据 String[] seniortype; if("stand".equals(searchInfoEO.getSelectIndex())) { - String[] seniortypeStand = {"standSort", "statecode","CYSD","ZRLX","CLLX","CBCD"}; + String[] seniortypeStand = {"standSort", "statecode","CYSD","ZRLX","CLLX","CBCD","textStatus","textStatusName"}; seniortype = seniortypeStand.clone(); } else if("laws".equals(searchInfoEO.getSelectIndex())){ String[] seniortypeLaws = {"country","statecode","SYCLLX","ZRLX","WSSFCY"}; From d9d5aeb284119d5338295fa2c45fa5de75661821 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 27 Sep 2021 10:13:13 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandardsInfo/entity/SarStandardsInfo.java | 10 ++++++++++ .../java/com/adc/da/utils/util/StandExportUtil.java | 12 ++++++++---- .../sarStandardsInfo/SarStandardsInfoMapper.xml | 7 ++++++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index 291327f1..a4cf3454 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -155,6 +155,8 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private String standNatureShow; // 标准性质显示名称 @TableField(exist = false) + private String standtextStatusShow; // 标准文本状态显示名称 + @TableField(exist = false) private String sychronId; // 同步数据ID @TableField(exist = false) private List dicTypeList = new ArrayList(); // 记录标准涉及到的所有数据字典数据 @@ -607,5 +609,13 @@ public class SarStandardsInfo extends BaseEntity { public void setStandSystemName(String standSystemName) { this.standSystemName = standSystemName; } + + public String getStandtextStatusShow() { + return standtextStatusShow; + } + + public void setStandtextStatusShow(String standtextStatusShow) { + this.standtextStatusShow = standtextStatusShow; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java index 7cd978cf..9f360b81 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java @@ -101,10 +101,14 @@ public class StandExportUtil { Map attrValueMap = sarStandardsInfoEO.getAttrInfoMap(); switch (name) { case "标准性质": - value = sarStandardsInfoEO.getStandNature(); + value = sarStandardsInfoEO.getStandNatureShow(); break; case "是否纳入认证清单": - value = sarStandardsInfoEO.getIsRelateAccess(); + switch (sarStandardsInfoEO.getIsRelateAccess()){ + case "0": value="否"; break; + case "1": value="是"; break; + default:value=""; + } break; case "标准体系": value = sarStandardsInfoEO.getStandSystem(); @@ -137,8 +141,8 @@ public class StandExportUtil { case "英文名称": value = sarStandardsInfoEO.getStandEnName(); break; - case "标准状态": - value = sarStandardsInfoEO.getStandStateShow(); + case "文本状态": + value = sarStandardsInfoEO.getStandtextStatusShow(); break; case "发布日期": if (sarStandardsInfoEO.getIssueTime() != null) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 661b3184..ae2fda92 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -61,7 +61,7 @@ SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time, concat(SAR_STANDARDS_INFO.synopsis, '') as synopsis, concat(replace_stand_num, '') as replace_stand_num, replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag, SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME as countryShow, dicstandSort.DIC_TYPE_NAME as standSortShow, - dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM + dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,dicstandTextStatus.DIC_TYPE_NAME as standtextStatusShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM @@ -380,6 +380,11 @@ dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 ) + LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( + dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status + AND dicstandNature.dic_id IS NOT NULL + AND dicstandNature.valid_flag = 0 + ) left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) From 447d56231abd2cb9cc6fa9127e7154b0920ba592 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 27 Sep 2021 10:33:37 +0800 Subject: [PATCH 05/12] =?UTF-8?q?group=20by=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5dicstandNature.DIC=5FTYPE=5FNAME?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index ae2fda92..b96aa437 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -70,7 +70,7 @@ SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time, concat(SAR_STANDARDS_INFO.synopsis, ''), concat(replace_stand_num, ''), replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag, SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME, dicstandSort.DIC_TYPE_NAME, - dicstandState.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM + dicstandState.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,dicstandTextStatus.DIC_TYPE_NAME,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM From fd2d58c25f98d6e0c09aadc27de13f38d48e8f1a Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 27 Sep 2021 10:44:38 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=9F=A5=E8=AF=A2=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index b96aa437..84b3a553 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -751,6 +751,11 @@ dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 ) + LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( + dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status + AND dicstandNature.dic_id IS NOT NULL + AND dicstandNature.valid_flag = 0 + ) left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id where SAR_STANDARDS_INFO.id = #{id} From 2556ddcc0be8c51a0395ede9aaea2a9022bd2ef6 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 27 Sep 2021 13:39:43 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=9C=A8=E5=9F=BA=E7=A1=80=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=AD=E5=8E=BB=E9=99=A4=E4=BA=86=E9=80=82=E7=94=A8?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=BA=BF=E5=92=8C=E8=B4=A3=E4=BB=BB=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88=20=E5=9B=A0=E4=B8=BA=E5=9C=A8attr=E4=B8=AD?= =?UTF-8?q?=E5=B7=B2=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/utils/util/FieldConvertUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 4895a277..1625cb2f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -31,7 +31,7 @@ public class FieldConvertUtil { "文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28 public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," + - "文本状态,发布日期,文本说明,是否纳入认证清单,体系类别,标签,适用产品线,适用认证,能源类型,责任工程师," + + "文本状态,发布日期,文本说明,是否纳入认证清单,体系类别,标签,适用认证,能源类型," + "关联文件,发布稿,增补件,勘误件,草案"; // 导出基础表字段 public static String exportAttrFieldNamesInland = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," + From ce7812e704eb289872f82f34f9cfc3ebc52345db Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 27 Sep 2021 13:54:14 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=8A=8A=20standtextStatusShow=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=BA=86standTextStatusShow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarStandardsInfo/entity/SarStandardsInfo.java | 10 +++++----- .../java/com/adc/da/utils/util/StandExportUtil.java | 2 +- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index a4cf3454..ec5291e7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -155,7 +155,7 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private String standNatureShow; // 标准性质显示名称 @TableField(exist = false) - private String standtextStatusShow; // 标准文本状态显示名称 + private String standTextStatusShow; // 标准文本状态显示名称 @TableField(exist = false) private String sychronId; // 同步数据ID @TableField(exist = false) @@ -610,12 +610,12 @@ public class SarStandardsInfo extends BaseEntity { this.standSystemName = standSystemName; } - public String getStandtextStatusShow() { - return standtextStatusShow; + public String getStandTextStatusShow() { + return standTextStatusShow; } - public void setStandtextStatusShow(String standtextStatusShow) { - this.standtextStatusShow = standtextStatusShow; + public void setStandTextStatusShow(String standTextStatusShow) { + this.standTextStatusShow = standTextStatusShow; } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java index 9f360b81..47f597c1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java @@ -142,7 +142,7 @@ public class StandExportUtil { value = sarStandardsInfoEO.getStandEnName(); break; case "文本状态": - value = sarStandardsInfoEO.getStandtextStatusShow(); + value = sarStandardsInfoEO.getStandTextStatusShow(); break; case "发布日期": if (sarStandardsInfoEO.getIssueTime() != null) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 84b3a553..fe1e4849 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -61,7 +61,7 @@ SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time, concat(SAR_STANDARDS_INFO.synopsis, '') as synopsis, concat(replace_stand_num, '') as replace_stand_num, replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag, SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME as countryShow, dicstandSort.DIC_TYPE_NAME as standSortShow, - dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,dicstandTextStatus.DIC_TYPE_NAME as standtextStatusShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM + dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,dicstandTextStatus.DIC_TYPE_NAME as standTextStatusShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM From 29918060864d843d1a42b3019f7236f4005c39f7 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 27 Sep 2021 14:05:51 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E8=81=94=E8=A1=A8=E6=9F=A5=E8=AF=A2=20di?= =?UTF-8?q?cstandTextStatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index fe1e4849..c38db223 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -382,8 +382,8 @@ dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 ) LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status - AND dicstandNature.dic_id IS NOT NULL - AND dicstandNature.valid_flag = 0 + AND dicstandTextStatus.dic_id IS NOT NULL + AND dicstandTextStatus.valid_flag = 0 ) left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id @@ -753,8 +753,8 @@ dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 ) LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status - AND dicstandNature.dic_id IS NOT NULL - AND dicstandNature.valid_flag = 0 + AND dicstandTextStatus.dic_id IS NOT NULL + AND dicstandTextStatus.valid_flag = 0 ) left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id From 87337c1374a419994c9caab32160232f0655a913 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 27 Sep 2021 19:47:15 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BA=BA=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandItems/entity/SarStandItemsDto.java | 4 ++++ .../sarUser/controller/TsUserController.java | 9 +++++++++ .../com/adc/da/slrs/sarUser/entity/TsUser.java | 2 ++ .../com/adc/da/slrs/sarUser/entity/UpDTO.java | 13 +++++++++++++ .../slrs/sarUser/service/ITsUserService.java | 3 +++ .../service/impl/TsUserServiceImpl.java | 18 ++++++++++++++++++ .../SarStandItems/SarStandItemsMapper.xml | 2 +- 7 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UpDTO.java 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 c1268581..0d90b32d 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 @@ -48,4 +48,8 @@ public class SarStandItemsDto { private String zccssrq; + private String technicalRequir; + + private String changePoint; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java index fbe98449..300b63ab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java @@ -9,10 +9,12 @@ import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarUrl.dao.TsUrlDao; import com.adc.da.slrs.sarUser.dao.TsUserDao; +import com.adc.da.slrs.sarUser.entity.UpDTO; import com.adc.da.slrs.sarUser.entity.UserPositionVO; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -80,5 +82,12 @@ public class TsUserController extends BaseController { } + @ApiOperation("查询人接口悬浮窗") + @GetMapping("/selectUp") + public ResponseMessage> selectUp(@Param("uname") String uname) throws Exception { + return Result.success(tsUserService.selectByName(uname)); + } + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java index d3da5143..40166850 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java @@ -143,9 +143,11 @@ public class TsUser extends BaseEntity { private List positions; @ApiModelProperty("当前页") + @TableField(exist = false) private Integer current; @ApiModelProperty("每页条数") + @TableField(exist = false) private Integer size; public TsUser() { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UpDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UpDTO.java new file mode 100644 index 00000000..730b9910 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UpDTO.java @@ -0,0 +1,13 @@ +package com.adc.da.slrs.sarUser.entity; + +import lombok.Data; + +@Data +public class UpDTO { + + + + private String value; + + private String id; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index 7501950f..af98fb3d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -4,6 +4,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarUser.entity.TsUser; +import com.adc.da.slrs.sarUser.entity.UpDTO; import com.adc.da.slrs.sarUser.entity.UserPositionVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -74,4 +75,6 @@ public interface ITsUserService extends IService { void parseUser() throws Exception; List getSecondMenusByUserId(String userId); + + List selectByName(String name); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index 900ec013..06e78407 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -14,6 +14,7 @@ import com.adc.da.slrs.sarRole.service.ITsRoleService; import com.adc.da.slrs.sarUser.entity.SyncUser; import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.slrs.sarUser.dao.TsUserDao; +import com.adc.da.slrs.sarUser.entity.UpDTO; import com.adc.da.slrs.sarUser.entity.UserPositionVO; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.sync.service.SyncUserService; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -273,4 +275,20 @@ public class TsUserServiceImpl extends ServiceImpl implements List menuIds=tsRoleService.getMenuIdsByRoleIds(roleIds); return sarMenuService.getSecondMenuByIds(menuIds); } + + @Override + public List selectByName(String name) { + QueryWrapper tsUserQueryWrapper=new QueryWrapper<>(); + tsUserQueryWrapper.like("ACCOUNT",name); + tsUserQueryWrapper.or().like("UNAME",name); + List res= tsUserDao.selectList(tsUserQueryWrapper); + List result=new ArrayList<>(); + res.forEach(tsUser -> { + UpDTO upDTO=new UpDTO(); + upDTO.setValue(tsUser.getUname()+"("+tsUser.getAccount()+")"); + upDTO.setId(tsUser.getUserId()); + result.add(upDTO); + }); + return result; + } } 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 32a31e9c..72b72ba9 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 @@ -731,7 +731,7 @@