From f3647d62dc1858fa03ff2d350e449dd629721212 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 29 Apr 2022 18:35:57 +0800 Subject: [PATCH 01/18] feat: There is no way the, --- .../server/ResetSearchCenterService.java | 50 ++++++++++++++++--- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java index 2f76d925..ecf99e16 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java @@ -69,19 +69,39 @@ public class ResetSearchCenterService { @Async public ResponseMessage resetALLSearchCenter(SearchCenter searchCenter) throws Exception{ Boolean getFulltextserchIndex = elasticsearchService.isIndexExist("fulltextserch"); - - ResponseMessage stand = resetStandSearchCenter(new SarStandardsInfoEOPage(),searchCenter); + SearchCenter standSearch = new SearchCenter(); + QueryWrapper qw = new QueryWrapper(); + qw.eq("VALID_FLAG","0"); + int count = iSarStandardsInfoService.count(qw); + standSearch.setExecType(searchCenter.getExecType()); + standSearch.setCountStand(count); + SarStandardsInfoEOPage page = new SarStandardsInfoEOPage(); + ResponseMessage stand = resetStandSearchCenter(page,standSearch); List r = new ArrayList<>(); if(stand.isOk() && StringUtils.isNotBlank(stand.getData().toString())){ r.add(stand.getData().toString()); } - ResponseMessage laws = resetLawsSearchCenter(new SarLawsStandInfoPage(),searchCenter); + SearchCenter lawsSearch = new SearchCenter(); + QueryWrapper qw2 = new QueryWrapper(); + qw2.eq("VALID_FLAG","0"); + int count2 = iSarLawsStandInfoService.count(qw2); + lawsSearch.setExecType(searchCenter.getExecType()); + lawsSearch.setCountStand(count2); + SarLawsStandInfoPage lawsPage = new SarLawsStandInfoPage(); + ResponseMessage laws = resetLawsSearchCenter(lawsPage,lawsSearch); if(laws.isOk() && StringUtils.isNotBlank(laws.getData().toString())){ r.add(laws.getData().toString()); } - ResponseMessage buss = resetBussStandSearchCenter(new SarBussionessStandEOPage(),searchCenter); + SearchCenter bussSearch = new SearchCenter(); + QueryWrapper qw3 = new QueryWrapper(); + qw3.eq("VALID_FLAG","0"); + int count3 = iSarBussionessStandService.count(qw3); + bussSearch.setExecType(searchCenter.getExecType()); + bussSearch.setCountStand(count3); + SarBussionessStandEOPage bussPage = new SarBussionessStandEOPage(); + ResponseMessage buss = resetBussStandSearchCenter(bussPage,bussSearch); if(buss.isOk() && StringUtils.isNotBlank(buss.getData().toString())){ r.add(buss.getData().toString()); } @@ -192,7 +212,12 @@ public class ResetSearchCenterService { // 差集 (list2 - list1) 删除 List delDataList = esIdList.stream().filter(num -> !standIdList.contains(num)) .collect(Collectors.toList()); - delList.addAll(delDataList); + // 可以更新IDLIST 删除 ES + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && "DEL".equals(searchCenter.getExecType().toUpperCase())){ + delList.addAll(searchCenter.getIdList()); + }else{ + delList.addAll(delDataList); + } }else { // 新增 @@ -273,7 +298,12 @@ public class ResetSearchCenterService { // 差集 (list2 - list1) 删除 List delDataList = esIdList.stream().filter(num -> !standIdList.contains(num)) .collect(Collectors.toList()); - delList.addAll(delDataList); + // 可以更新IDLIST 删除 ES + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && "DEL".equals(searchCenter.getExecType().toUpperCase())){ + delList.addAll(searchCenter.getIdList()); + }else{ + delList.addAll(delDataList); + } }else { // 新增 @@ -367,8 +397,12 @@ public class ResetSearchCenterService { // 差集 (list2 - list1) 删除 List delDataList = esIdList.stream().filter(num -> !standIdList.contains(num)) .collect(Collectors.toList()); - delList.addAll(delDataList); - + // 可以更新IDLIST 删除 ES + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && "DEL".equals(searchCenter.getExecType().toUpperCase())){ + delList.addAll(searchCenter.getIdList()); + }else{ + delList.addAll(delDataList); + } }else { // 新增 insList.addAll(rowsStand); From 848ec7efe65fc15da3fde3a1b211a191f9f0df83 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 29 Apr 2022 21:24:33 +0800 Subject: [PATCH 02/18] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES=20=E5=AD=98=E5=82=A8=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=203=E4=B8=AA=E6=96=87=E6=9C=AC=E6=9F=A5=E8=AF=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StandLawsSearchServiceImpl.java | 10 ++++++++++ .../src/main/java/com/adc/da/mq/SendBussMQService.java | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) 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 5cf509fd..c6aa555f 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 @@ -226,6 +226,9 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); fullTextSearchEO.put("textContent",textContent.toString()); fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear"))); + fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort"))); + fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber"))); + fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("standName"))); // 全文检索 加入 发布稿 分解单条款内容逻辑 StringBuilder itemBuilder = new StringBuilder(); @@ -300,6 +303,9 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); fullTextSearchEO.put("textContent",textContent.toString()); fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("lawsYearName"))); + fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("lawsTypeName"))); + fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("lawsNumber"))); + fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("lawsName"))); if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) { fullTextSearchEO.put("issue_time", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime")))); @@ -355,6 +361,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); fullTextSearchEO.put("textContent",textContent.toString()); fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear"))); + fullTextSearchEO.put("sortTitle", String.valueOf(attrInfoMap.get("standSort"))); + fullTextSearchEO.put("numberTitle", String.valueOf(attrInfoMap.get("standNumber"))); + fullTextSearchEO.put("nameTitle", String.valueOf(attrInfoMap.get("stand_name"))); + if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) { fullTextSearchEO.put("issue_time", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime")))); fullTextSearchEO.put("issue_time_order", dateFormatToStr(String.valueOf(attrInfoMap.get("issueTime"))).replace("-","")); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index 8c6da677..f89e3e59 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -131,7 +131,7 @@ public class SendBussMQService { } saveMap.put("standYear",infoEO.getStandYear()); saveMap.put("stand_year",infoEO.getStandYear()); - saveMap.put("standNumber",infoEO.getStandCode()); + saveMap.put("standNumber",infoEO.getStandNumber()); saveMap.put("stand_code",infoEO.getStandCode()); saveMap = dealNumberMsg(saveMap,infoEO,infoEO.getStandSort()); saveMap.put("nameshow",infoEO.getStandName()); From 1c2100b80cc2482307b19ef3b3f7c9f28791a285 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 29 Apr 2022 22:10:46 +0800 Subject: [PATCH 03/18] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES=20=E6=9D=83=E9=87=8D=20=E5=85=A8=E6=96=87?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=20=E5=B7=B2=E4=BF=AE=E6=94=B9=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98=20=E5=BE=85=E7=A1=AE=E8=AE=A4=20?= =?UTF-8?q?=E6=9D=83=E9=87=8D=E5=AD=97=E6=AE=B5=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SearchCenterServiceImpl.java | 123 +++++++++++------- 1 file changed, 73 insertions(+), 50 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 c4069ccf..975e7ab9 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 @@ -1306,7 +1306,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { String select = ""; if (-1 != num) { value = searchInfoEO.getSelectValue().substring(0, num).trim().toUpperCase(); - if (dicMap.containsKey(value) && dicMap.get(value) != null && !"".equals(dicMap.get(value))){ + if (dicMap.containsKey(value.toUpperCase()) && dicMap.get(value.toUpperCase()) != null && !"".equals(dicMap.get(value.toUpperCase()))){ select = searchInfoEO.getSelectValue().substring(num + 1).trim(); real = value + " " + select; }else { @@ -1315,60 +1315,83 @@ public class SearchCenterServiceImpl implements SearchCenterService { } }else{ String reg = ".*[0-9].*"; - if("-".contains(real)){ + if(real.contains("-")){ String content = real.split("-")[0]; value = content.replaceAll("[^(A-Za-z\\/)]", ""); - String[] valArr = value.split("\\/"); - if (valArr.length > 2) { - value = valArr[0] + "/" + valArr[1]; - select = content.replaceAll("[^(0-9a-zA-Z\\.\\(\\（\\）\\)\\s\\/\\-\\:)]", "").replace(value,""); - // 如果类别小写 转 大写 - Pattern pattern = Pattern.compile("^[a-zA-Z\\/]+$"); - if (pattern.matcher(value).matches()) { - value = value.toUpperCase(); + if (dicMap.containsKey(value.toUpperCase()) && dicMap.get(value.toUpperCase()) != null && !"".equals(dicMap.get(value.toUpperCase()))) { + String[] valArr = value.split("\\/"); + if (valArr.length > 2) { + value = valArr[0] + "/" + valArr[1]; + if (dicMap.containsKey(value.toUpperCase()) && dicMap.get(value.toUpperCase()) != null && !"".equals(dicMap.get(value.toUpperCase()))) { + select = content.replaceAll("[^(0-9a-zA-Z\\.\\(\\（\\）\\)\\s\\/\\-\\:)]", "").replace(value,""); + }else { + select = content.replaceAll("[^(0-9a-zA-Z\\.\\(\\（\\）\\)\\s\\/\\-\\:)]", ""); + } + // 如果类别小写 转 大写 + Pattern pattern = Pattern.compile("^[a-zA-Z\\/]+$"); + if (pattern.matcher(value).matches()) { + value = value.toUpperCase(); + } + }else{ + value = valArr[0]; + if (dicMap.containsKey(value.toUpperCase()) && dicMap.get(value.toUpperCase()) != null && !"".equals(dicMap.get(value.toUpperCase()))) { + select = real.replaceAll("[^(0-9a-zA-Z\\.\\(\\（\\）\\)\\s\\/\\-\\:)]", "").replace(value,""); + }else { + select = real.replaceAll("[^(0-9a-zA-Z\\.\\(\\（\\）\\)\\s\\/\\-\\:)]", ""); + } + // 如果类别小写 转 大写 + Pattern pattern = Pattern.compile("^[a-zA-Z\\/]+$"); + if (pattern.matcher(value).matches()) { + value = value.toUpperCase(); + } } - }else{ - value = valArr[0]; - select = real.replaceAll("[^(0-9a-zA-Z\\.\\(\\（\\）\\)\\s\\/\\-\\:)]", "").replace(value,""); - // 如果类别小写 转 大写 - Pattern pattern = Pattern.compile("^[a-zA-Z\\/]+$"); - if (pattern.matcher(value).matches()) { - value = value.toUpperCase(); + if (dicMap.containsKey(value.toUpperCase()) && dicMap.get(value.toUpperCase()) != null && !"".equals(dicMap.get(value.toUpperCase()))){ + real = value + " " + select; + }else { + select = real; + value = null; } - } - if (dicMap.containsKey(value) && dicMap.get(value) != null && !"".equals(dicMap.get(value))){ - real = value + " " + select; }else { - select = null; - value = real; + select = real; + value = null; } }else if(real.matches(reg)){ value = real.replaceAll("[^(A-Za-z\\/)]", ""); - String[] valArr = value.split("\\/"); - if (valArr.length > 2) { - value = valArr[0] + "/" + valArr[1]; - String[] str = real.split(value); - String sel = str[1].replaceAll("[^(0-9\\.\\(\\（\\）\\)\\s\\/\\-\\:)]", ""); - String[] valArr2 = sel.split("\\/"); - if(valArr2.length > 2){ - select = valArr2[0] + '/' + valArr[3] + valArr2[1]; - }else { - select = sel; - } - }else{ - select = real.replaceAll("[^(0-9a-zA-Z\\.\\(\\（\\）\\)\\s\\/\\-\\:)]", "").replace(value,""); + System.out.println(dicMap.containsKey(value.toUpperCase())); + if (dicMap.containsKey(value.toUpperCase()) && dicMap.get(value.toUpperCase()) != null && !"".equals(dicMap.get(value.toUpperCase()))) { + String[] valArr = value.split("\\/"); + if (valArr.length > 2) { + value = valArr[0] + "/" + valArr[1]; + String[] str = real.split(value); + String sel = str[1].replaceAll("[^(0-9\\.\\(\\（\\）\\)\\s\\/\\-\\:)]", ""); + String[] valArr2 = sel.split("\\/"); + if(valArr2.length > 2){ + select = valArr2[0] + '/' + valArr[3] + valArr2[1]; + }else { + select = sel; + } + }else{ + if (dicMap.containsKey(value.toUpperCase()) && dicMap.get(value.toUpperCase()) != null && !"".equals(dicMap.get(value.toUpperCase()))) { + select = real.replaceAll("[^(0-9a-zA-Z\\.\\(\\（\\）\\)\\s\\/\\-\\:)]", "").replace(value,""); + }else { + select = real.replaceAll("[^(0-9a-zA-Z\\.\\(\\（\\）\\)\\s\\/\\-\\:)]", ""); + } - // 如果类别小写 转 大写 - Pattern pattern = Pattern.compile("^[a-zA-Z\\/]+$"); - if (pattern.matcher(value).matches()) { - value = value.toUpperCase(); + // 如果类别小写 转 大写 + Pattern pattern = Pattern.compile("^[a-zA-Z\\/]+$"); + if (pattern.matcher(value).matches()) { + value = value.toUpperCase(); + } + } + if (dicMap.containsKey(value.toUpperCase()) && dicMap.get(value.toUpperCase()) != null && !"".equals(dicMap.get(value.toUpperCase()))){ + real = value + " " + select; + }else { + select = real; + value = null; } - } - if (dicMap.containsKey(value) && dicMap.get(value) != null && !"".equals(dicMap.get(value))){ - real = value + " " + select; }else { - select = null; - value = real; + select = real; + value = null; } }else { value = real; @@ -1424,9 +1447,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { if(null != value || null != selects){ if (null != value && selects == null) { boolSelectValue - .should(QueryBuilders.wildcardQuery("title.keyword", "*" + value + "*").boost(1000f)) - .should(QueryBuilders.wildcardQuery("textContent.keyword", "*" + value + "*").boost(0.0000000000000000000000000000000001f)) - .should(QueryBuilders.wildcardQuery("issue_time", "*" + value + "*")); + .should(QueryBuilders.wildcardQuery("title.keyword", "*" + value.toUpperCase() + "*").boost(1000f)) + .should(QueryBuilders.wildcardQuery("textContent.keyword", "*" + value.toUpperCase() + "*").boost(0.0000000000000000000000000000000001f)) + .should(QueryBuilders.wildcardQuery("issue_time", "*" + value.toUpperCase() + "*")); // multiQueryBuilder = QueryBuilders.multiMatchQuery("*"+value+"*", // "title.keyword", "textContent", "issue_time").minimumShouldMatch("100%").field("title.keyword", 1000f).field("textContent.keyword", 0.0000000000000000000000000000000001f); //// boolQueryMust.must(multiQueryBuilder); @@ -1435,9 +1458,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { // searchInfoEO.setSelectValue(searchInfoEO.getSelectValue().replace("-","\\-")); if (null != selects) { boolSelectValue - .should(QueryBuilders.wildcardQuery("title.keyword", "*" + real + "*").boost(1000f)) - .should(QueryBuilders.wildcardQuery("textContent.keyword", "*" + real + "*").boost(0.0000000000000000000000000000000001f)) - .should(QueryBuilders.wildcardQuery("issue_time", "*" + real + "*")); + .should(QueryBuilders.wildcardQuery("title.keyword", "*" + real.toUpperCase() + "*").boost(1000f)) + .should(QueryBuilders.wildcardQuery("textContent.keyword", "*" + real.toUpperCase() + "*").boost(0.0000000000000000000000000000000001f)) + .should(QueryBuilders.wildcardQuery("issue_time", "*" + real.toUpperCase() + "*")); // for (String se : selects) { // if (StringUtils.isNotBlank(se)) { // boolSelectValue From 14e6ff7ac454c52745abb5cee84a8c64fe63d273 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 30 Apr 2022 07:55:08 +0800 Subject: [PATCH 04/18] feat: There is no way the, --- .../com/adc/da/search/server/ResetSearchCenterService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java index ecf99e16..c5edfa67 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java @@ -244,7 +244,7 @@ public class ResetSearchCenterService { } } - if(!delList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "DEL".equals(searchCenter.getExecType().toUpperCase()))){ + if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()))){ elasticsearchService.deleteBatchId(delList,"stand"); elasticsearchService.deleteBatchId(delList,"fulltextserch"); } @@ -330,7 +330,7 @@ public class ResetSearchCenterService { } } - if(!delList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "DEL".equals(searchCenter.getExecType().toUpperCase()))){ + if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()))){ elasticsearchService.deleteBatchId(delList,"laws"); elasticsearchService.deleteBatchId(delList,"fulltextserch"); } @@ -428,7 +428,7 @@ public class ResetSearchCenterService { } } - if(!delList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "DEL".equals(searchCenter.getExecType().toUpperCase()))){ + if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()))){ elasticsearchService.deleteBatchId(delList,"bussstand"); elasticsearchService.deleteBatchId(delList,"fulltextserch"); } From 8ac506cf450a3cac6543a6f95466c7b3ed0adc1e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 30 Apr 2022 07:57:48 +0800 Subject: [PATCH 05/18] feat: There is no way the, --- .../src/main/java/com/adc/da/search/bean/SearchCenter.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java b/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java index 7becaa3e..bcfece35 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java @@ -15,12 +15,11 @@ import java.util.List; @Data public class SearchCenter { - @NotNull - @ApiModelProperty(value = "分页查询总数") + @ApiModelProperty(value = "分页查询总数 可不填 自动带入总数") private Integer countStand; @NotNull - @ApiModelProperty(value = "执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准, DEL 只删除不存在标准库的数据") + @ApiModelProperty(value = "执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准, DEL 只删除不存在标准库的数据（删除只能用DEL 减少自动错删）") private String execType; @NotNull From 2d0cbedf0d51584893e343fa10a4aa7a8f0a0067 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 30 Apr 2022 10:43:13 +0800 Subject: [PATCH 06/18] feat: There is no way the, --- adc-da-main/src/main/resources/logback-spring.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/logback-spring.xml b/adc-da-main/src/main/resources/logback-spring.xml index b1319cf0..39f90eab 100644 --- a/adc-da-main/src/main/resources/logback-spring.xml +++ b/adc-da-main/src/main/resources/logback-spring.xml @@ -8,7 +8,7 @@ - + From 35aa1adf9b4949e6d32c4a1b43501fd8168e88bc Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 30 Apr 2022 11:59:38 +0800 Subject: [PATCH 07/18] feat: There is no way the, log --- .../da/search/server/ResetSearchCenterService.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java index c5edfa67..a4d51bbc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java @@ -247,6 +247,7 @@ public class ResetSearchCenterService { if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()))){ elasticsearchService.deleteBatchId(delList,"stand"); elasticsearchService.deleteBatchId(delList,"fulltextserch"); + logger.info("重置国内外标准：删除-共"+delList.size()+"条数据"); } logger.info("重置国内外标准：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外标准共："+0+"条）删除-共"+delList.size()+"条数据"); return Result.success("重置国内外标准：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外标准共："+0+"条）删除-共"+delList.size()+"条数据"); @@ -333,10 +334,11 @@ public class ResetSearchCenterService { if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()))){ elasticsearchService.deleteBatchId(delList,"laws"); elasticsearchService.deleteBatchId(delList,"fulltextserch"); + logger.info("重置国内外政策：删除-共"+delList.size()+"条数据"); } - logger.info("重置国内外政策：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外政策共："+rowsStand.size()+"条）删除-共"+delList.size()+"条数据"); - return Result.success("重置国内外政策：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外政策共："+rowsStand.size()+"条）删除-共"+delList.size()+"条数据"); + logger.info("重置国内外政策：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外政策共："+rowsStand.size()+"条）数据"); + return Result.success(""); } private void idListFunc(SarLawsStandInfoPage sarLawsInfoEOPage, SearchCenter searchCenter) { @@ -431,9 +433,10 @@ public class ResetSearchCenterService { if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()))){ elasticsearchService.deleteBatchId(delList,"bussstand"); elasticsearchService.deleteBatchId(delList,"fulltextserch"); + logger.info("重置企标：删除-共"+delList.size()+"条数据"); } - logger.info("重置企标：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（企标共："+rowsStand.size()+"条）删除-共"+delList.size()+"条数据"); - return Result.success("重置企标：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（企标共："+rowsStand.size()+"条）删除-共"+delList.size()+"条数据"); + logger.info("重置企标：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（企标共："+rowsStand.size()+"条）数据"); + return Result.success(""); } /** From bfc902b32f3666171d810a56bb416d736f7ab080 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 30 Apr 2022 12:19:19 +0800 Subject: [PATCH 08/18] feat: There is no way the, XXX --- .../java/com/adc/da/search/ResetSearchCenterController.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java b/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java index 73b8b274..0635b408 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java @@ -44,9 +44,6 @@ public class ResetSearchCenterController extends BaseController Date: Sat, 30 Apr 2022 18:45:45 +0800 Subject: [PATCH 09/18] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SearchCenterServiceImpl.java | 63 +++++++++++-------- .../server/ResetSearchCenterService.java | 58 ++++++++++++++--- 2 files changed, 87 insertions(+), 34 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 975e7ab9..826f0598 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 @@ -1413,30 +1413,30 @@ public class SearchCenterServiceImpl implements SearchCenterService { BoolQueryBuilder boolSelectValue = new BoolQueryBuilder(); QueryBuilder multiQueryBuilder; String[] selects = null; - if (StringUtils.isNotBlank(select)) { - //判断标准号是否企标SMTC ，标准列别 （），/,字母 - Pattern pattern = Pattern.compile("^[a-zA-Z\\/\\(\\)\\（\\）]+$"); - if (pattern.matcher(value).matches()) { - Pattern patternbianhao = Pattern.compile("^[0-9a-zA-Z\\.\\(\\（\\）\\)\\-\\s]+$"); - if (patternbianhao.matcher(select).matches()) { - //符合标准编号 - selects = select.replace(" ","-").split("-"); - } else { - //不符合标准编号 使用wildcard查询 编号 - selects = select.replace(" ","-").split("-"); - } - } else { - //不符合标准类别，wildcard 查询整体 real 6/23 解决搜索DRE的问题 - selects = null; - value = real; -// isReal = true; - } - }else{ - //没有空格，存在问题，使用wildcard查询 real - selects = null; - value = real; -// isReal = true; - } +// if (StringUtils.isNotBlank(select)) { +// //判断标准号是否企标SMTC ，标准列别 （），/,字母 +// Pattern pattern = Pattern.compile("^[a-zA-Z\\/\\(\\)\\（\\）]+$"); +// if (pattern.matcher(value).matches()) { +// Pattern patternbianhao = Pattern.compile("^[0-9a-zA-Z\\.\\(\\（\\）\\)\\-\\s]+$"); +// if (patternbianhao.matcher(select).matches()) { +// //符合标准编号 +// selects = select.replace(" ","-").split("-"); +// } else { +// //不符合标准编号 使用wildcard查询 编号 +// selects = select.replace(" ","-").split("-"); +// } +// } else { +// //不符合标准类别，wildcard 查询整体 real 6/23 解决搜索DRE的问题 +// selects = null; +// value = real; +//// isReal = true; +// } +// }else{ +// //没有空格，存在问题，使用wildcard查询 real +// selects = null; +// value = real; +//// isReal = true; +// } if (isReal){ //查询real @@ -1444,9 +1444,13 @@ public class SearchCenterServiceImpl implements SearchCenterService { selects = null; } - if(null != value || null != selects){ - if (null != value && selects == null) { + if(null != value || null != select){ + if (null != value && select == null) { boolSelectValue + .should(QueryBuilders.wildcardQuery("sortTitle.keyword", "*" + value.toUpperCase() + "*").boost(1005f)) + .should(QueryBuilders.wildcardQuery("numberTitle.keyword", "*" + value.toUpperCase() + "*").boost(1003f)) + .should(QueryBuilders.wildcardQuery("yearOrder.keyword", "*" + value.toUpperCase() + "*").boost(1002f)) + .should(QueryBuilders.wildcardQuery("nameTitle.keyword", "*" + value.toUpperCase() + "*").boost(1001f)) .should(QueryBuilders.wildcardQuery("title.keyword", "*" + value.toUpperCase() + "*").boost(1000f)) .should(QueryBuilders.wildcardQuery("textContent.keyword", "*" + value.toUpperCase() + "*").boost(0.0000000000000000000000000000000001f)) .should(QueryBuilders.wildcardQuery("issue_time", "*" + value.toUpperCase() + "*")); @@ -1456,8 +1460,12 @@ public class SearchCenterServiceImpl implements SearchCenterService { // boolQueryShould.should(multiQueryBuilder); } // searchInfoEO.setSelectValue(searchInfoEO.getSelectValue().replace("-","\\-")); - if (null != selects) { + if (null != select) { boolSelectValue + .should(QueryBuilders.wildcardQuery("sortTitle.keyword", "*" + real.toUpperCase() + "*").boost(1005f)) + .should(QueryBuilders.wildcardQuery("numberTitle.keyword", "*" + real.toUpperCase() + "*").boost(1003f)) + .should(QueryBuilders.wildcardQuery("yearOrder.keyword", "*" + real.toUpperCase() + "*").boost(1002f)) + .should(QueryBuilders.wildcardQuery("nameTitle.keyword", "*" + real.toUpperCase() + "*").boost(1001f)) .should(QueryBuilders.wildcardQuery("title.keyword", "*" + real.toUpperCase() + "*").boost(1000f)) .should(QueryBuilders.wildcardQuery("textContent.keyword", "*" + real.toUpperCase() + "*").boost(0.0000000000000000000000000000000001f)) .should(QueryBuilders.wildcardQuery("issue_time", "*" + real.toUpperCase() + "*")); @@ -1511,6 +1519,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { searchRequestBuilder = client.prepareSearch("fulltextserch") .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .highlighter(hiBuilder) + .addSort("issue_time_order",SortOrder.DESC) .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize()) .setSize(searchInfoEO.getPageSize()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java index a4d51bbc..b48f4b7f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java @@ -75,6 +75,9 @@ public class ResetSearchCenterService { int count = iSarStandardsInfoService.count(qw); standSearch.setExecType(searchCenter.getExecType()); standSearch.setCountStand(count); + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty()){ + standSearch.setIdList(searchCenter.getIdList()); + } SarStandardsInfoEOPage page = new SarStandardsInfoEOPage(); ResponseMessage stand = resetStandSearchCenter(page,standSearch); List r = new ArrayList<>(); @@ -88,6 +91,9 @@ public class ResetSearchCenterService { int count2 = iSarLawsStandInfoService.count(qw2); lawsSearch.setExecType(searchCenter.getExecType()); lawsSearch.setCountStand(count2); + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty()){ + lawsSearch.setIdList(searchCenter.getIdList()); + } SarLawsStandInfoPage lawsPage = new SarLawsStandInfoPage(); ResponseMessage laws = resetLawsSearchCenter(lawsPage,lawsSearch); if(laws.isOk() && StringUtils.isNotBlank(laws.getData().toString())){ @@ -100,6 +106,9 @@ public class ResetSearchCenterService { int count3 = iSarBussionessStandService.count(qw3); bussSearch.setExecType(searchCenter.getExecType()); bussSearch.setCountStand(count3); + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty()){ + bussSearch.setIdList(searchCenter.getIdList()); + } SarBussionessStandEOPage bussPage = new SarBussionessStandEOPage(); ResponseMessage buss = resetBussStandSearchCenter(bussPage,bussSearch); if(buss.isOk() && StringUtils.isNotBlank(buss.getData().toString())){ @@ -200,14 +209,26 @@ public class ResetSearchCenterService { .filter(item -> !new ArrayList<>(esIdList) .contains(item.getId())) .collect(Collectors.toList()); - insList.addAll(distinctByUniqueList); + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !distinctByUniqueList.isEmpty()){ + List collect = distinctByUniqueList.stream() + .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); + insList.addAll(collect); + }else{ + insList.addAll(distinctByUniqueList); + } // 交集 更新 List intersection = rowsStand.stream() .filter(item -> new ArrayList<>(esIdList) .contains(item.getId())) .collect(Collectors.toList()); - updList.addAll(intersection); + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !intersection.isEmpty()){ + List collect = intersection.stream() + .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); + updList.addAll(collect); + }else{ + updList.addAll(intersection); + } // 差集 (list2 - list1) 删除 List delDataList = esIdList.stream().filter(num -> !standIdList.contains(num)) @@ -287,14 +308,25 @@ public class ResetSearchCenterService { .filter(item -> !new ArrayList<>(esIdList) .contains(item.getId())) .collect(Collectors.toList()); - insList.addAll(distinctByUniqueList); - + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !distinctByUniqueList.isEmpty()){ + List collect = distinctByUniqueList.stream() + .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); + insList.addAll(collect); + }else{ + insList.addAll(distinctByUniqueList); + } // 交集 更新 List intersection = rowsStand.stream() .filter(item -> new ArrayList<>(esIdList) .contains(item.getId())) .collect(Collectors.toList()); - updList.addAll(intersection); + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !intersection.isEmpty()){ + List collect = intersection.stream() + .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); + updList.addAll(collect); + }else{ + updList.addAll(intersection); + } // 差集 (list2 - list1) 删除 List delDataList = esIdList.stream().filter(num -> !standIdList.contains(num)) @@ -387,14 +419,26 @@ public class ResetSearchCenterService { .filter(item -> !new ArrayList<>(esIdList) .contains(item.getId())) .collect(Collectors.toList()); - insList.addAll(distinctByUniqueList); + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !distinctByUniqueList.isEmpty()){ + List collect = distinctByUniqueList.stream() + .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); + insList.addAll(collect); + }else{ + insList.addAll(distinctByUniqueList); + } // 交集 更新 List intersection = rowsStand.stream() .filter(item -> new ArrayList<>(esIdList) .contains(item.getId())) .collect(Collectors.toList()); - updList.addAll(intersection); + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !intersection.isEmpty()){ + List collect = intersection.stream() + .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); + updList.addAll(collect); + }else{ + updList.addAll(intersection); + } // 差集 (list2 - list1) 删除 List delDataList = esIdList.stream().filter(num -> !standIdList.contains(num)) From 5c08e3d1f6e4bac6a2929b3a378e196ce43ce974 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 30 Apr 2022 23:35:01 +0800 Subject: [PATCH 10/18] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/search/bean/SearchCenter.java | 4 +- .../server/ResetSearchCenterService.java | 453 +++++++++--------- 2 files changed, 229 insertions(+), 228 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java b/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java index bcfece35..b9c68e96 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java @@ -15,8 +15,8 @@ import java.util.List; @Data public class SearchCenter { - @ApiModelProperty(value = "分页查询总数 可不填 自动带入总数") - private Integer countStand; +// @ApiModelProperty(value = "分页查询总数 可不填 自动带入总数") +// private Integer countStand; @NotNull @ApiModelProperty(value = "执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准, DEL 只删除不存在标准库的数据（删除只能用DEL 减少自动错删）") diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java index b48f4b7f..6f9138d5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java @@ -70,11 +70,7 @@ public class ResetSearchCenterService { public ResponseMessage resetALLSearchCenter(SearchCenter searchCenter) throws Exception{ Boolean getFulltextserchIndex = elasticsearchService.isIndexExist("fulltextserch"); SearchCenter standSearch = new SearchCenter(); - QueryWrapper qw = new QueryWrapper(); - qw.eq("VALID_FLAG","0"); - int count = iSarStandardsInfoService.count(qw); standSearch.setExecType(searchCenter.getExecType()); - standSearch.setCountStand(count); if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty()){ standSearch.setIdList(searchCenter.getIdList()); } @@ -86,11 +82,7 @@ public class ResetSearchCenterService { } SearchCenter lawsSearch = new SearchCenter(); - QueryWrapper qw2 = new QueryWrapper(); - qw2.eq("VALID_FLAG","0"); - int count2 = iSarLawsStandInfoService.count(qw2); lawsSearch.setExecType(searchCenter.getExecType()); - lawsSearch.setCountStand(count2); if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty()){ lawsSearch.setIdList(searchCenter.getIdList()); } @@ -101,11 +93,7 @@ public class ResetSearchCenterService { } SearchCenter bussSearch = new SearchCenter(); - QueryWrapper qw3 = new QueryWrapper(); - qw3.eq("VALID_FLAG","0"); - int count3 = iSarBussionessStandService.count(qw3); bussSearch.setExecType(searchCenter.getExecType()); - bussSearch.setCountStand(count3); if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty()){ bussSearch.setIdList(searchCenter.getIdList()); } @@ -125,11 +113,7 @@ public class ResetSearchCenterService { public ResponseMessage syncResetALLSearchCenter(SearchCenter searchCenter) throws Exception{ Boolean getFulltextserchIndex = elasticsearchService.isIndexExist("fulltextserch"); SearchCenter standSearch = new SearchCenter(); - QueryWrapper qw = new QueryWrapper(); - qw.eq("VALID_FLAG","0"); - int count = iSarStandardsInfoService.count(qw); standSearch.setExecType(searchCenter.getExecType()); - standSearch.setCountStand(count); SarStandardsInfoEOPage page = new SarStandardsInfoEOPage(); page.setSyncParam("sync"); ResponseMessage stand = resetStandSearchCenter(page,standSearch); @@ -139,11 +123,7 @@ public class ResetSearchCenterService { } SearchCenter lawsSearch = new SearchCenter(); - QueryWrapper qw2 = new QueryWrapper(); - qw2.eq("VALID_FLAG","0"); - int count2 = iSarLawsStandInfoService.count(qw2); lawsSearch.setExecType(searchCenter.getExecType()); - lawsSearch.setCountStand(count2); SarLawsStandInfoPage lawsPage = new SarLawsStandInfoPage(); page.setSyncParam("sync"); ResponseMessage laws = resetLawsSearchCenter(lawsPage,lawsSearch); @@ -152,11 +132,7 @@ public class ResetSearchCenterService { } SearchCenter bussSearch = new SearchCenter(); - QueryWrapper qw3 = new QueryWrapper(); - qw3.eq("VALID_FLAG","0"); - int count3 = iSarBussionessStandService.count(qw3); bussSearch.setExecType(searchCenter.getExecType()); - bussSearch.setCountStand(count3); SarBussionessStandEOPage bussPage = new SarBussionessStandEOPage(); page.setSyncParam("sync"); ResponseMessage buss = resetBussStandSearchCenter(bussPage,bussSearch); @@ -193,85 +169,92 @@ public class ResetSearchCenterService { String[] result = searchCenter.getIdList().toArray(new String[0]); page.setIdlist(result); } + QueryWrapper qw = new QueryWrapper(); + qw.eq("VALID_FLAG","0"); + int count = iSarStandardsInfoService.count(qw); + if(count > 0){ + page.setPageSize(count); + page.setMenuId("nomenu"); + page.setStandType("ALL"); + List rowsStand = iSarStandardsInfoService.getSarStandardsInfoPage(page); + List insList = new ArrayList<>(); + List updList = new ArrayList<>(); + List delList = new ArrayList<>(); + List standIdList = rowsStand.stream().map(SarStandardsInfo::getId).collect(Collectors.toList()); + if(!esIdList.isEmpty()){ - page.setPageSize(searchCenter.getCountStand()); - page.setMenuId("nomenu"); - page.setStandType("ALL"); - List rowsStand = iSarStandardsInfoService.getSarStandardsInfoPage(page); - List insList = new ArrayList<>(); - List updList = new ArrayList<>(); - List delList = new ArrayList<>(); - List standIdList = rowsStand.stream().map(SarStandardsInfo::getId).collect(Collectors.toList()); - if(!esIdList.isEmpty()){ + // 差集 (list1 - list2) 新增 + List distinctByUniqueList = rowsStand.stream() + .filter(item -> !new ArrayList<>(esIdList) + .contains(item.getId())) + .collect(Collectors.toList()); + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !distinctByUniqueList.isEmpty()){ + List collect = distinctByUniqueList.stream() + .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); + insList.addAll(collect); + }else{ + insList.addAll(distinctByUniqueList); + } - // 差集 (list1 - list2) 新增 - List distinctByUniqueList = rowsStand.stream() - .filter(item -> !new ArrayList<>(esIdList) - .contains(item.getId())) - .collect(Collectors.toList()); - if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !distinctByUniqueList.isEmpty()){ - List collect = distinctByUniqueList.stream() - .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); - insList.addAll(collect); - }else{ - insList.addAll(distinctByUniqueList); + // 交集 更新 + List intersection = rowsStand.stream() + .filter(item -> new ArrayList<>(esIdList) + .contains(item.getId())) + .collect(Collectors.toList()); + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !intersection.isEmpty()){ + List collect = intersection.stream() + .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); + updList.addAll(collect); + }else{ + updList.addAll(intersection); + } + + // 差集 (list2 - list1) 删除 + List delDataList = esIdList.stream().filter(num -> !standIdList.contains(num)) + .collect(Collectors.toList()); + // 可以更新IDLIST 删除 ES + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && "DEL".equals(searchCenter.getExecType().toUpperCase())){ + delList.addAll(searchCenter.getIdList()); + }else{ + delList.addAll(delDataList); + } + + }else { + // 新增 + insList.addAll(rowsStand); } - // 交集 更新 - List intersection = rowsStand.stream() - .filter(item -> new ArrayList<>(esIdList) - .contains(item.getId())) - .collect(Collectors.toList()); - if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !intersection.isEmpty()){ - List collect = intersection.stream() - .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); - updList.addAll(collect); - }else{ - updList.addAll(intersection); + if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()))){ + for(SarStandardsInfo sarStandardsInfoEO : updList){ + countUpdateSuccess++; + if (sarStandardsInfoEO.getAttrInfoMap() != null) { + sarStandardsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarStandardsInfoEO.getAttrInfoMap())); + } + createStandMQService.sendStandMQ(sarStandardsInfoEO,"update"); + } } - // 差集 (list2 - list1) 删除 - List delDataList = esIdList.stream().filter(num -> !standIdList.contains(num)) - .collect(Collectors.toList()); - // 可以更新IDLIST 删除 ES - if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && "DEL".equals(searchCenter.getExecType().toUpperCase())){ - delList.addAll(searchCenter.getIdList()); - }else{ - delList.addAll(delDataList); + if(!insList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "ADD".equals(searchCenter.getExecType().toUpperCase()))){ + for(SarStandardsInfo sarStandardsInfoEO : insList){ + countAddSuccess++; + if (sarStandardsInfoEO.getAttrInfoMap() != null) { + sarStandardsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarStandardsInfoEO.getAttrInfoMap())); + } + createStandMQService.sendStandMQ(sarStandardsInfoEO,"add"); + } } + if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()))){ + elasticsearchService.deleteBatchId(delList,"stand"); + elasticsearchService.deleteBatchId(delList,"fulltextserch"); + logger.info("重置国内外标准：删除-共"+delList.size()+"条数据"); + } + logger.info("重置国内外标准：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外标准共："+0+"条）删除-共"+delList.size()+"条数据"); + return Result.success("重置国内外标准：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外标准共："+0+"条）删除-共"+delList.size()+"条数据"); }else { - // 新增 - insList.addAll(rowsStand); + return Result.error("未查询到标准数据"); } - if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()))){ - for(SarStandardsInfo sarStandardsInfoEO : updList){ - countUpdateSuccess++; - if (sarStandardsInfoEO.getAttrInfoMap() != null) { - sarStandardsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarStandardsInfoEO.getAttrInfoMap())); - } - createStandMQService.sendStandMQ(sarStandardsInfoEO,"update"); - } - } - - if(!insList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "ADD".equals(searchCenter.getExecType().toUpperCase()))){ - for(SarStandardsInfo sarStandardsInfoEO : insList){ - countAddSuccess++; - if (sarStandardsInfoEO.getAttrInfoMap() != null) { - sarStandardsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarStandardsInfoEO.getAttrInfoMap())); - } - createStandMQService.sendStandMQ(sarStandardsInfoEO,"add"); - } - } - - if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()))){ - elasticsearchService.deleteBatchId(delList,"stand"); - elasticsearchService.deleteBatchId(delList,"fulltextserch"); - logger.info("重置国内外标准：删除-共"+delList.size()+"条数据"); - } - logger.info("重置国内外标准：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外标准共："+0+"条）删除-共"+delList.size()+"条数据"); - return Result.success("重置国内外标准：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外标准共："+0+"条）删除-共"+delList.size()+"条数据"); } @Async @@ -294,83 +277,91 @@ public class ResetSearchCenterService { int countUpdateSuccess = 0; int countAddSuccess = 0; - sarLawsInfoEOPage.setPageSize(searchCenter.getCountStand()); - List rowsStand = iSarLawsStandInfoService.getSarStandardsInfoPage(sarLawsInfoEOPage); - List insList = new ArrayList<>(); - List updList = new ArrayList<>(); - List delList = new ArrayList<>(); - List standIdList = rowsStand.stream().map(SarLawsStandInfo::getId).collect(Collectors.toList()); + QueryWrapper qw2 = new QueryWrapper(); + qw2.eq("VALID_FLAG","0"); + int count2 = iSarLawsStandInfoService.count(qw2); + if(count2 > 0){ + sarLawsInfoEOPage.setPageSize(count2); + List rowsStand = iSarLawsStandInfoService.getSarStandardsInfoPage(sarLawsInfoEOPage); + List insList = new ArrayList<>(); + List updList = new ArrayList<>(); + List delList = new ArrayList<>(); + List standIdList = rowsStand.stream().map(SarLawsStandInfo::getId).collect(Collectors.toList()); - if(!esIdList.isEmpty()){ + if(!esIdList.isEmpty()){ - // 差集 (list1 - list2) 新增 - List distinctByUniqueList = rowsStand.stream() - .filter(item -> !new ArrayList<>(esIdList) - .contains(item.getId())) - .collect(Collectors.toList()); - if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !distinctByUniqueList.isEmpty()){ - List collect = distinctByUniqueList.stream() - .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); - insList.addAll(collect); - }else{ - insList.addAll(distinctByUniqueList); - } - // 交集 更新 - List intersection = rowsStand.stream() - .filter(item -> new ArrayList<>(esIdList) - .contains(item.getId())) - .collect(Collectors.toList()); - if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !intersection.isEmpty()){ - List collect = intersection.stream() - .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); - updList.addAll(collect); - }else{ - updList.addAll(intersection); + // 差集 (list1 - list2) 新增 + List distinctByUniqueList = rowsStand.stream() + .filter(item -> !new ArrayList<>(esIdList) + .contains(item.getId())) + .collect(Collectors.toList()); + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !distinctByUniqueList.isEmpty()){ + List collect = distinctByUniqueList.stream() + .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); + insList.addAll(collect); + }else{ + insList.addAll(distinctByUniqueList); + } + // 交集 更新 + List intersection = rowsStand.stream() + .filter(item -> new ArrayList<>(esIdList) + .contains(item.getId())) + .collect(Collectors.toList()); + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !intersection.isEmpty()){ + List collect = intersection.stream() + .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); + updList.addAll(collect); + }else{ + updList.addAll(intersection); + } + + // 差集 (list2 - list1) 删除 + List delDataList = esIdList.stream().filter(num -> !standIdList.contains(num)) + .collect(Collectors.toList()); + // 可以更新IDLIST 删除 ES + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && "DEL".equals(searchCenter.getExecType().toUpperCase())){ + delList.addAll(searchCenter.getIdList()); + }else{ + delList.addAll(delDataList); + } + + }else { + // 新增 + insList.addAll(rowsStand); } - // 差集 (list2 - list1) 删除 - List delDataList = esIdList.stream().filter(num -> !standIdList.contains(num)) - .collect(Collectors.toList()); - // 可以更新IDLIST 删除 ES - if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && "DEL".equals(searchCenter.getExecType().toUpperCase())){ - delList.addAll(searchCenter.getIdList()); - }else{ - delList.addAll(delDataList); + if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()))){ + for(SarLawsStandInfo sarLawsInfoEO : updList){ + countUpdateSuccess++; + if (sarLawsInfoEO.getAttrInfoMap() != null) { + sarLawsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarLawsInfoEO.getAttrInfoMap())); + } + createStandMQService.sendLawsMQ(sarLawsInfoEO,"update"); + } } + if(!insList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "ADD".equals(searchCenter.getExecType().toUpperCase()))){ + for(SarLawsStandInfo sarLawsInfoEO : insList){ + countAddSuccess++; + if (sarLawsInfoEO.getAttrInfoMap() != null) { + sarLawsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarLawsInfoEO.getAttrInfoMap())); + } + createStandMQService.sendLawsMQ(sarLawsInfoEO,"add"); + } + } + + if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()))){ + elasticsearchService.deleteBatchId(delList,"laws"); + elasticsearchService.deleteBatchId(delList,"fulltextserch"); + logger.info("重置国内外政策：删除-共"+delList.size()+"条数据"); + } + + logger.info("重置国内外政策：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外政策共："+rowsStand.size()+"条）数据"); + return Result.success(""); }else { - // 新增 - insList.addAll(rowsStand); + return Result.error("未查询到国内外政策数据"); } - if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()))){ - for(SarLawsStandInfo sarLawsInfoEO : updList){ - countUpdateSuccess++; - if (sarLawsInfoEO.getAttrInfoMap() != null) { - sarLawsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarLawsInfoEO.getAttrInfoMap())); - } - createStandMQService.sendLawsMQ(sarLawsInfoEO,"update"); - } - } - - if(!insList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "ADD".equals(searchCenter.getExecType().toUpperCase()))){ - for(SarLawsStandInfo sarLawsInfoEO : insList){ - countAddSuccess++; - if (sarLawsInfoEO.getAttrInfoMap() != null) { - sarLawsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarLawsInfoEO.getAttrInfoMap())); - } - createStandMQService.sendLawsMQ(sarLawsInfoEO,"add"); - } - } - - if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()))){ - elasticsearchService.deleteBatchId(delList,"laws"); - elasticsearchService.deleteBatchId(delList,"fulltextserch"); - logger.info("重置国内外政策：删除-共"+delList.size()+"条数据"); - } - - logger.info("重置国内外政策：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外政策共："+rowsStand.size()+"条）数据"); - return Result.success(""); } private void idListFunc(SarLawsStandInfoPage sarLawsInfoEOPage, SearchCenter searchCenter) { @@ -404,83 +395,93 @@ public class ResetSearchCenterService { int countUpdateSuccess = 0; int countAddSuccess = 0; sarBussionessStandEOPage.setMenuId("0"); - sarBussionessStandEOPage.setPageSize(searchCenter.getCountStand()); - List rowsStand = iSarBussionessStandService.getSarBussionStandPage(sarBussionessStandEOPage); - List insList = new ArrayList<>(); - List updList = new ArrayList<>(); - List delList = new ArrayList<>(); - List standIdList = rowsStand.stream().map(SarBussionessStand::getId).collect(Collectors.toList()); + QueryWrapper qw3 = new QueryWrapper(); + qw3.eq("VALID_FLAG","0"); + int count3 = iSarBussionessStandService.count(qw3); - if(!esIdList.isEmpty()){ + if(count3 > 0){ + sarBussionessStandEOPage.setPageSize(count3); - // 差集 (list1 - list2) 新增 - List distinctByUniqueList = rowsStand.stream() - .filter(item -> !new ArrayList<>(esIdList) - .contains(item.getId())) - .collect(Collectors.toList()); - if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !distinctByUniqueList.isEmpty()){ - List collect = distinctByUniqueList.stream() - .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); - insList.addAll(collect); - }else{ - insList.addAll(distinctByUniqueList); + List rowsStand = iSarBussionessStandService.getSarBussionStandPage(sarBussionessStandEOPage); + List insList = new ArrayList<>(); + List updList = new ArrayList<>(); + List delList = new ArrayList<>(); + List standIdList = rowsStand.stream().map(SarBussionessStand::getId).collect(Collectors.toList()); + + if(!esIdList.isEmpty()){ + + // 差集 (list1 - list2) 新增 + List distinctByUniqueList = rowsStand.stream() + .filter(item -> !new ArrayList<>(esIdList) + .contains(item.getId())) + .collect(Collectors.toList()); + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !distinctByUniqueList.isEmpty()){ + List collect = distinctByUniqueList.stream() + .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); + insList.addAll(collect); + }else{ + insList.addAll(distinctByUniqueList); + } + + // 交集 更新 + List intersection = rowsStand.stream() + .filter(item -> new ArrayList<>(esIdList) + .contains(item.getId())) + .collect(Collectors.toList()); + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !intersection.isEmpty()){ + List collect = intersection.stream() + .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); + updList.addAll(collect); + }else{ + updList.addAll(intersection); + } + + // 差集 (list2 - list1) 删除 + List delDataList = esIdList.stream().filter(num -> !standIdList.contains(num)) + .collect(Collectors.toList()); + // 可以更新IDLIST 删除 ES + if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && "DEL".equals(searchCenter.getExecType().toUpperCase())){ + delList.addAll(searchCenter.getIdList()); + }else{ + delList.addAll(delDataList); + } + }else { + // 新增 + insList.addAll(rowsStand); } - // 交集 更新 - List intersection = rowsStand.stream() - .filter(item -> new ArrayList<>(esIdList) - .contains(item.getId())) - .collect(Collectors.toList()); - if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && !intersection.isEmpty()){ - List collect = intersection.stream() - .filter(item -> searchCenter.getIdList().contains(item.getId())).collect(Collectors.toList()); - updList.addAll(collect); - }else{ - updList.addAll(intersection); + if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()))){ + for(SarBussionessStand sarBussionessStandEO : updList){ + countUpdateSuccess++; + if (sarBussionessStandEO.getAttrInfoMap() != null) { + sarBussionessStandEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarBussionessStandEO.getAttrInfoMap())); + } + createStandMQService.sendBussStandMQ(sarBussionessStandEO,"update"); + } } - // 差集 (list2 - list1) 删除 - List delDataList = esIdList.stream().filter(num -> !standIdList.contains(num)) - .collect(Collectors.toList()); - // 可以更新IDLIST 删除 ES - if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && "DEL".equals(searchCenter.getExecType().toUpperCase())){ - delList.addAll(searchCenter.getIdList()); - }else{ - delList.addAll(delDataList); + if(!insList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "ADD".equals(searchCenter.getExecType().toUpperCase()))){ + for(SarBussionessStand sarBussionessStandEO : insList){ + countAddSuccess++; + if (sarBussionessStandEO.getAttrInfoMap() != null) { + sarBussionessStandEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarBussionessStandEO.getAttrInfoMap())); + } + createStandMQService.sendBussStandMQ(sarBussionessStandEO,"add"); + } } + + if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()))){ + elasticsearchService.deleteBatchId(delList,"bussstand"); + elasticsearchService.deleteBatchId(delList,"fulltextserch"); + logger.info("重置企标：删除-共"+delList.size()+"条数据"); + } + logger.info("重置企标：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（企标共："+rowsStand.size()+"条）数据"); + return Result.success(""); }else { - // 新增 - insList.addAll(rowsStand); + return Result.error("未查询到企标数据"); } - if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()))){ - for(SarBussionessStand sarBussionessStandEO : updList){ - countUpdateSuccess++; - if (sarBussionessStandEO.getAttrInfoMap() != null) { - sarBussionessStandEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarBussionessStandEO.getAttrInfoMap())); - } - createStandMQService.sendBussStandMQ(sarBussionessStandEO,"update"); - } - } - - if(!insList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "ADD".equals(searchCenter.getExecType().toUpperCase()))){ - for(SarBussionessStand sarBussionessStandEO : insList){ - countAddSuccess++; - if (sarBussionessStandEO.getAttrInfoMap() != null) { - sarBussionessStandEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarBussionessStandEO.getAttrInfoMap())); - } - createStandMQService.sendBussStandMQ(sarBussionessStandEO,"add"); - } - } - - if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()))){ - elasticsearchService.deleteBatchId(delList,"bussstand"); - elasticsearchService.deleteBatchId(delList,"fulltextserch"); - logger.info("重置企标：删除-共"+delList.size()+"条数据"); - } - logger.info("重置企标：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（企标共："+rowsStand.size()+"条）数据"); - return Result.success(""); } /** From 74366a29c302436c165c6d8899be17cd78aa17ff Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 1 May 2022 00:05:11 +0800 Subject: [PATCH 11/18] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/mq/SendBussMQService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index f89e3e59..5ca1d5ef 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -131,7 +131,12 @@ public class SendBussMQService { } saveMap.put("standYear",infoEO.getStandYear()); saveMap.put("stand_year",infoEO.getStandYear()); - saveMap.put("standNumber",infoEO.getStandNumber()); + if(jsonobject.get("standNumber") != null){ + saveMap.put("standNumber",jsonobject.get("standNumber")); + }else { + saveMap.put("standNumber",""); + } + saveMap.put("stand_code",infoEO.getStandCode()); saveMap = dealNumberMsg(saveMap,infoEO,infoEO.getStandSort()); saveMap.put("nameshow",infoEO.getStandName()); From e5e1a5aab8316a06a20b7507116838803dca4503 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 1 May 2022 00:15:39 +0800 Subject: [PATCH 12/18] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/search/server/ResetSearchCenterService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java index 6f9138d5..b60c00a5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java @@ -252,6 +252,7 @@ public class ResetSearchCenterService { logger.info("重置国内外标准：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外标准共："+0+"条）删除-共"+delList.size()+"条数据"); return Result.success("重置国内外标准：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外标准共："+0+"条）删除-共"+delList.size()+"条数据"); }else { + logger.info("未查询到标准数据"); return Result.error("未查询到标准数据"); } @@ -359,6 +360,7 @@ public class ResetSearchCenterService { logger.info("重置国内外政策：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（国内外政策共："+rowsStand.size()+"条）数据"); return Result.success(""); }else { + logger.info("未查询到国内外政策数据"); return Result.error("未查询到国内外政策数据"); } @@ -479,6 +481,7 @@ public class ResetSearchCenterService { logger.info("重置企标：新增-"+ countAddSuccess + "条 更新-"+countUpdateSuccess+"条（企标共："+rowsStand.size()+"条）数据"); return Result.success(""); }else { + logger.info("未查询到企标数据"); return Result.error("未查询到企标数据"); } From 1be6fa65799ba7ed42c200e53865185d9f53ee67 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 1 May 2022 02:24:31 +0800 Subject: [PATCH 13/18] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES=20=E5=9D=91aaaaa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/ResetSearchCenterService.java | 262 +++++++++++++++++- .../impl/SarBussionessStandServiceImpl.java | 4 +- .../impl/SarStandardsInfoServiceImpl.java | 14 +- 3 files changed, 269 insertions(+), 11 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java index b60c00a5..92863c62 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java @@ -1,27 +1,42 @@ package com.adc.da.search.server; +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.service.IAttFileEOService; import com.adc.da.mq.CreateStandMQService; +import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.search.bean.SearchCenter; import com.adc.da.search.service.ElasticsearchService; +import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarLawsAttrInfo.dao.SarLawsAttrInfoDao; import com.adc.da.slrs.sarLawsInfo.entity.SarLawsInfo; import com.adc.da.slrs.sarLawsInfo.page.SarLawsInfoEOPage; +import com.adc.da.slrs.sarLawsItems.dao.SarLawsItemsDao; +import com.adc.da.slrs.sarLawsItems.entity.SarLawsItems; import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo; import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage; import com.adc.da.slrs.sarLawsStandInfo.service.ISarLawsStandInfoService; +import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; +import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; +import com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO; +import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; +import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; import com.adc.da.utils.util.DateUtil; +import com.adc.da.utils.util.FieldConvertUtil; +import com.adc.da.utils.util.InitStandAttrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.gson.JsonObject; import org.apache.commons.lang3.StringUtils; import org.elasticsearch.client.transport.TransportClient; +import org.json.JSONTokener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -31,6 +46,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.PostConstruct; +import java.sql.Clob; import java.util.*; import java.util.stream.Collectors; @@ -48,6 +64,21 @@ public class ResetSearchCenterService { @Autowired private TransportClient client; + @Autowired + private DicTypeEODao dicTypeEODao; + + @Autowired + private SarStandItemsDao standItemsDao; + + @Autowired + private SarLawsItemsDao sarLawsItemsDao; + + @Autowired + private IAttFileEOService attFileEOService; + + @Autowired + private SarLawsAttrInfoDao sarLawsAttrInfoDao; + @Autowired private ISarStandardsInfoService iSarStandardsInfoService; @@ -60,6 +91,15 @@ public class ResetSearchCenterService { @Autowired private CreateStandMQService createStandMQService; + @Autowired + private IPersonCollectEOService personCollectEOService; + + @Autowired + private SarStandAttrInfoDao sarStandAttrInfoEODao; + + @Autowired + private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao; + @PostConstruct public void init() { @@ -227,9 +267,7 @@ public class ResetSearchCenterService { if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()))){ for(SarStandardsInfo sarStandardsInfoEO : updList){ countUpdateSuccess++; - if (sarStandardsInfoEO.getAttrInfoMap() != null) { - sarStandardsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarStandardsInfoEO.getAttrInfoMap())); - } + standFunc(sarStandardsInfoEO); createStandMQService.sendStandMQ(sarStandardsInfoEO,"update"); } } @@ -237,6 +275,7 @@ public class ResetSearchCenterService { if(!insList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "ADD".equals(searchCenter.getExecType().toUpperCase()))){ for(SarStandardsInfo sarStandardsInfoEO : insList){ countAddSuccess++; + standFunc(sarStandardsInfoEO); if (sarStandardsInfoEO.getAttrInfoMap() != null) { sarStandardsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarStandardsInfoEO.getAttrInfoMap())); } @@ -258,6 +297,75 @@ public class ResetSearchCenterService { } + private void standFunc(SarStandardsInfo sarStandardsInfoEO) throws Exception { + attrInfoSearchDetails(sarStandardsInfoEO); + FindSarItemsPageReqDTO pageInfo = new FindSarItemsPageReqDTO(); + pageInfo.setStandId(sarStandardsInfoEO.getId()); + pageInfo.setFileType("FBGBJBD"); + + /** + * SarItemVO换为sarItemVOS + * List sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); + * .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName)); + */ + + List sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); + if (!sarItemVOS.isEmpty()) { + Map collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null) + .collect(Collectors.toMap(SarStandItems::getItemsNum, SarStandItems::getTermsConditions)); + sarStandardsInfoEO.setMapItems(collectMap); + } + if (sarStandardsInfoEO.getAttrInfoMap() != null) { + sarStandardsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarStandardsInfoEO.getAttrInfoMap())); + } + } + + public void attrInfoSearchDetails(SarStandardsInfo row) throws Exception { + if (row != null) { + String fieldInfo = InitStandAttrUtil.queryField; + String collectId = personCollectEOService.queryCollectByUserAndId(row.getId()); + row.setCollectId(collectId); + // 查询属性表数据 + if (StringUtils.isNotBlank(fieldInfo)) { + Map 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); + } + } + + row.setAttrInfoMap(getAttrMap); + } + + Map getAttrMap = row.getAttrInfoMap(); + if (getAttrMap != null && getAttrMap.size() > 0) { + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + String value = ""; + List valArr = new ArrayList<>(); + if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { + if (StringUtils.isNotBlank(entry.getValue().toString())) { + Object json = new JSONTokener(entry.getValue().toString()).nextValue(); + if (json instanceof org.json.JSONArray) { + valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(), String.class); + } else { + value = entry.getValue().toString(); + valArr = Arrays.asList(value.split(",")); + } + if (!valArr.isEmpty()) { + value = dicTypeEODao.getDicNamesByCodes(valArr, ""); + } + } + entry.setValue(value); + } + } + } + } + } + @Async public ResponseMessage resetLawsSearchCenter(SarLawsStandInfoPage sarLawsInfoEOPage,SearchCenter searchCenter) throws Exception{ Boolean getLawsIndex = elasticsearchService.isIndexExist("laws"); @@ -334,9 +442,7 @@ public class ResetSearchCenterService { if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()))){ for(SarLawsStandInfo sarLawsInfoEO : updList){ countUpdateSuccess++; - if (sarLawsInfoEO.getAttrInfoMap() != null) { - sarLawsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarLawsInfoEO.getAttrInfoMap())); - } + lawsAttrInfoShowSearchDetails(sarLawsInfoEO); createStandMQService.sendLawsMQ(sarLawsInfoEO,"update"); } } @@ -344,6 +450,26 @@ public class ResetSearchCenterService { if(!insList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "ADD".equals(searchCenter.getExecType().toUpperCase()))){ for(SarLawsStandInfo sarLawsInfoEO : insList){ countAddSuccess++; + lawsAttrInfoShowSearchDetails(sarLawsInfoEO); + FindSarItemsPageReqDTO pageInfo = new FindSarItemsPageReqDTO(); + pageInfo.setStandId(sarLawsInfoEO.getId()); + pageInfo.setFileType("FBGBJBD"); + + /** + * SarItemVO换为sarItemVOS + * List sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); + * .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName)); + */ + + List sarItemVOS = sarLawsItemsDao.querySarItemAndInterpretation(pageInfo); + if(!sarItemVOS.isEmpty()){ + Map collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null) + .collect(Collectors.toMap(SarLawsItems::getItemsNum, SarLawsItems::getTermsConditions)); + sarLawsInfoEO.setMapItems(collectMap); + } + if (sarLawsInfoEO.getAttrInfoMap() != null) { + sarLawsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarLawsInfoEO.getAttrInfoMap())); + } if (sarLawsInfoEO.getAttrInfoMap() != null) { sarLawsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarLawsInfoEO.getAttrInfoMap())); } @@ -366,6 +492,79 @@ public class ResetSearchCenterService { } + public void lawsAttrInfoSearchDetails(SarLawsStandInfo row) throws Exception { + String fieldInfo = InitStandAttrUtil.queryFieldLaws; + String collectId = personCollectEOService.queryCollectByUserAndId(row.getId()); + row.setCollectId(collectId); + // 查询属性表数据 + if (org.apache.commons.lang.StringUtils.isNotBlank(fieldInfo)) { + Map getAttrMap = sarLawsAttrInfoDao.selectLawsFieldAndData(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<>(); + + for (Map.Entry entry : orgMap.entrySet()) { + String newKey = entry.getKey().toLowerCase(); + resultMap.put(newKey, orgMap.get(entry.getKey())); + if (entry.getValue() != null && InitStandAttrUtil.fileFieldListLaws != null && !InitStandAttrUtil.fileFieldListLaws.isEmpty() && InitStandAttrUtil.fileFieldListLaws.contains(entry.getKey())) { + String value = entry.getValue().toString(); + if (org.apache.commons.lang.StringUtils.isNotBlank(value)) { + List fileObj = attFileEOService.getMultiFileInfos(value); + if(!fileObj.isEmpty()){ + resultMap.put(newKey + "Name", fileObj.get(0).getOldFileName()); + } + } + } + } + + return resultMap; + } + + public void lawsAttrInfoShowSearchDetails(SarLawsStandInfo row) throws Exception { + if (row != null) { + lawsAttrInfoSearchDetails(row); + Map getAttrMap = row.getAttrInfoCaseMap(); + if (getAttrMap != null && getAttrMap.size() > 0) { + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey().toUpperCase(); + String value = ""; + List valArr = new ArrayList<>(); + if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListLaws != null && InitStandAttrUtil.selectionFieldListLaws.size() > 0 && InitStandAttrUtil.selectionFieldListLaws.contains(name)) { + if(org.apache.commons.lang.StringUtils.isNotBlank(entry.getValue().toString())){ + Object json= new JSONTokener(entry.getValue().toString()).nextValue(); + if(json instanceof org.json.JSONArray){ + valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(),String.class); + }else { + value = entry.getValue().toString(); + valArr = Arrays.asList(value.split(",")); + } + if(!valArr.isEmpty()){ + value = dicTypeEODao.getDicNamesByCodes(valArr,""); + } + } + entry.setValue(value); + } + } + } + } + } + private void idListFunc(SarLawsStandInfoPage sarLawsInfoEOPage, SearchCenter searchCenter) { if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty()){ String[] result = searchCenter.getIdList().toArray(new String[0]); @@ -456,6 +655,7 @@ public class ResetSearchCenterService { if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()))){ for(SarBussionessStand sarBussionessStandEO : updList){ countUpdateSuccess++; + bussAttrInfoShowSearchDetails(sarBussionessStandEO); if (sarBussionessStandEO.getAttrInfoMap() != null) { sarBussionessStandEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarBussionessStandEO.getAttrInfoMap())); } @@ -466,6 +666,7 @@ public class ResetSearchCenterService { if(!insList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "ADD".equals(searchCenter.getExecType().toUpperCase()))){ for(SarBussionessStand sarBussionessStandEO : insList){ countAddSuccess++; + bussAttrInfoShowSearchDetails(sarBussionessStandEO); if (sarBussionessStandEO.getAttrInfoMap() != null) { sarBussionessStandEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarBussionessStandEO.getAttrInfoMap())); } @@ -487,6 +688,55 @@ public class ResetSearchCenterService { } + public void bussAttrInfoShowSearchDetails(SarBussionessStand row) throws Exception { + if (row != null) { + bussAttrInfoSearchDetails(row); + Map getAttrMap = row.getAttrInfoCaseMap(); + if (getAttrMap != null && getAttrMap.size() > 0) { + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey().toUpperCase(); + String value = ""; + List valArr = new ArrayList<>(); + if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { + if(org.apache.commons.lang.StringUtils.isNotBlank(entry.getValue().toString())){ + Object json= new JSONTokener(entry.getValue().toString()).nextValue(); + if(json instanceof org.json.JSONArray){ + valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(),String.class); + }else { + value = entry.getValue().toString(); + valArr = Arrays.asList(value.split(",")); + } + if(!valArr.isEmpty()){ + value = dicTypeEODao.getDicNamesByCodes(valArr,""); + } + } + entry.setValue(value); + } + } + } + } + } + + public void bussAttrInfoSearchDetails(SarBussionessStand row) throws Exception { + String fieldInfo = InitStandAttrUtil.queryFieldBuss; + String collectId = personCollectEOService.queryCollectByUserAndId(row.getId()); + row.setCollectId(collectId); + // 查询属性表数据 + if (org.apache.commons.lang.StringUtils.isNotBlank(fieldInfo)) { + Map getAttrMap = sarBussStandAttrInfoEODao.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); + } + } + + row.setAttrInfoMap(getAttrMap); + } + } + /** * 同步添加标准搜索中心数据内容 * @param standId diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 204645aa..63a74ddf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -1404,7 +1404,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Sun, 1 May 2022 13:01:42 +0800 Subject: [PATCH 14/18] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES=20=E5=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandardsInfoServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) 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 4d1de039..97a63b41 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 @@ -2979,16 +2979,19 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Sun, 1 May 2022 13:07:57 +0800 Subject: [PATCH 15/18] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES=20=20k?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandardsInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 97a63b41..53abe44f 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 @@ -2986,6 +2986,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Sun, 1 May 2022 13:17:17 +0800 Subject: [PATCH 16/18] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES=20kkkkkkk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandardsInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 53abe44f..82585ee2 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 @@ -3004,8 +3004,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Sun, 1 May 2022 13:30:54 +0800 Subject: [PATCH 17/18] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES=20kkkkkkkkkkk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandardsInfoServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 82585ee2..246e15bd 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 @@ -111,6 +111,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.sql.Clob; @@ -2973,20 +2974,20 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Sun, 1 May 2022 14:16:35 +0800 Subject: [PATCH 18/18] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES=20=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B4=A2=E5=BC=95=E7=9A=84max=5Fresult=5Fwin?= =?UTF-8?q?dow=E5=8F=82=E6=95=B0=20=E4=BF=AE=E6=94=B9=20ES=20=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=8E=9F=E7=94=9F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/search/service/impl/SearchCenterServiceImpl.java | 5 +++-- 1 file changed, 3 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 826f0598..3469ce58 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 @@ -1221,7 +1221,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { hiBuilder.field(highlightDate); hiBuilder.preTags(""); hiBuilder.postTags(""); - updateIndex("fulltextserch",99999999,2); + updateIndex("fulltextserch",(searchInfoEO.getPage()-1)*searchInfoEO.getPageSize(),searchInfoEO.getPageSize()); searchRequestBuilder = client.prepareSearch("fulltextserch") .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .highlighter(hiBuilder) @@ -1515,7 +1515,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { hiBuilder.preTags(""); hiBuilder.postTags(""); - updateIndex("fulltextserch",99999999,2); + updateIndex("fulltextserch",(searchInfoEO.getPage()-1)*searchInfoEO.getPageSize(),searchInfoEO.getPageSize()); searchRequestBuilder = client.prepareSearch("fulltextserch") .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .highlighter(hiBuilder) @@ -1586,6 +1586,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { AcknowledgedResponse indexResponse = client.admin().indices() .prepareUpdateSettings(indices) .setSettings(Settings.builder() + .put("index.max_result_window", records) .put("highlight.max_analyzed_offset", records) .build() ).get();