From 4c7f08606074a675b78524f8456546426d62bc24 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Fri, 26 Aug 2022 15:20:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=9D=9E=20.keyword=20=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=87=BA=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/search/service/impl/SearchCenterServiceImpl.java | 3 ++- 1 file changed, 2 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 76383ad6..ae35a142 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 @@ -1611,7 +1611,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { // } boolQueryShould .should(QueryBuilders.wildcardQuery("sortTitle.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.termQuery("numberTitle", searchInfoEO.getSelectValue().toUpperCase()).boost(1004f)) + //非 .keyword 无法查询出结果 + .should(QueryBuilders.termQuery("numberTitle.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1004f)) .should(QueryBuilders.wildcardQuery("yearOrder.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1003f)) .should(QueryBuilders.wildcardQuery("nameTitle.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1002f)) .should(QueryBuilders.wildcardQuery("title.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f)); From 3d3a515710f187fe8b7d0a977194d1c8267bbc68 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Fri, 26 Aug 2022 21:16:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/scheduledState/server/UpdateStateStandSyncFz.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java index be8a481e..8d62b06b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java @@ -232,11 +232,11 @@ public class UpdateStateStandSyncFz implements Runnable { public void execStandDate(List infoList, String textStatusStand) throws Exception { List list = new ArrayList<>(); for (SarStandardsInfo info : infoList) { + saveUpdateLog(info,textStatusStand); info.setTextStatus(textStatusStand); standFunc(info); createStandMQService.sendStandMQ(info,"update"); - saveUpdateLog(info,textStatusStand); // 只批量更新文本字段 SarStandardsInfo newInfo = new SarStandardsInfo(); newInfo.setTextStatus(textStatusStand); From 3bff146fb400eaa664e2915d0184735483d1599d Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Mon, 29 Aug 2022 12:13:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=98=E5=8E=9Fes=E6=9F=A5=E8=AF=A2=20+?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20GB/?= =?UTF-8?q?T=20=E6=B2=A1=E6=9C=89=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/service/impl/SearchCenterServiceImpl.java | 10 +++++----- .../scheduledState/server/UpdateStateStandSyncFz.java | 2 +- 2 files changed, 6 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 ae35a142..a54807ac 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 @@ -1610,12 +1610,12 @@ public class SearchCenterServiceImpl implements SearchCenterService { // } // } boolQueryShould - .should(QueryBuilders.wildcardQuery("sortTitle.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("sortTitle.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1005f)) //非 .keyword 无法查询出结果 - .should(QueryBuilders.termQuery("numberTitle.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1004f)) - .should(QueryBuilders.wildcardQuery("yearOrder.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1003f)) - .should(QueryBuilders.wildcardQuery("nameTitle.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1002f)) - .should(QueryBuilders.wildcardQuery("title.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f)); + .should(QueryBuilders.wildcardQuery("numberTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1004f)) + .should(QueryBuilders.wildcardQuery("yearOrder.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1003f)) + .should(QueryBuilders.wildcardQuery("nameTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1002f)) + .should(QueryBuilders.wildcardQuery("title.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1000f)); // queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), // "sortTitle","numberTitle","yearOrder","nameTitle","title" // ).field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java index 8d62b06b..535df843 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java @@ -188,7 +188,7 @@ public class UpdateStateStandSyncFz implements Runnable { QueryWrapper wrapperNotGB = new QueryWrapper(); wrapperNotGB.eq("VALID_FLAG","0"); wrapperNotGB.ne("STAND_SORT","GB"); - wrapperNotGB.in("TEXT_STATUS",wrapperNotGB); + wrapperNotGB.in("TEXT_STATUS",bdtStateList); wrapperNotGB.in("trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-'," + "SAR_STANDARDS_INFO.STAND_YEAR),' ',''))",bdtList); List queryNotGBList = sarStandardsInfoDao.selectList(wrapperNotGB);