From 535c4f47c47cb3cd44277e90ca34277810484fb3 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 17 Aug 2021 16:18:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=81=EF=BC=81?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarLawsDetailedListServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 3d47af49..f5698ab9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -66,7 +66,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl Date: Tue, 17 Aug 2021 17:36:44 +0800 Subject: [PATCH 2/3] feat: There is no way the --- .../da/search/service/impl/StandLawsSearchServiceImpl.java | 4 +--- .../service/impl/SarStandardsInfoServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index 1980b183..b801bb84 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,9 +226,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { StringBuilder itemBuilder = new StringBuilder(); mapItems.forEach((s, s2) -> { - itemBuilder.append(s+" ").append("(模拟数据)-本标准规定了机动车的整车及主要总成、安全防护装置等有关运行安全的基本技术要求，以及消防车、救护车、" + - "工程救险车和警车及残疾人专用汽车的附加要求。本标准适用于在我国道路上行驶的所有机动车，但不适用于有轨电车及并非为在道路上行驶和使用而设计和制造、" + - "主要用于封闭道路和场所作业施工的轮式专用机械车。 注：有轨电车是指以电机驱动，架线供电，有轨道承载的道路车辆。").append("
"); + itemBuilder.append(s+" ").append(s2).append("
"); }); StringBuilder textItemContent = replaceAll(itemBuilder, "null", "--"); fullTextSearchEO.put("textItems",textItemContent.toString()); 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 ee3d2b63..cb0b7ed8 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 @@ -602,7 +602,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); if(!sarItemVOS.isEmpty()){ Map collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null) - .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName)); + .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getTermsConditions)); sarStandardsInfoEO.setMapItems(collectMap); } createStandMQService.sendStandMQ(sarStandardsInfoEO,"add"); @@ -1182,7 +1182,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); if(!sarItemVOS.isEmpty()){ Map collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null) - .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName)); + .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getTermsConditions)); sarStandardsInfoEO.setMapItems(collectMap); } createStandMQService.sendStandMQ(sarStandardsInfoEO,"update"); From 7303f11043bedd1a328a0f6b867d382f1e062f01 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 17 Aug 2021 17:51:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...SarStandardComplianceAssessResultController.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 924cafd0..67bcf14b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -85,9 +85,9 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } - if (eo.getType() != null && !eo.getType().trim().equals("")) { - queryWrapper.like("type",eo.getType().trim()); - } +// if (eo.getType() != null && !eo.getType().trim().equals("")) { +// queryWrapper.like("type",eo.getType().trim()); +// } IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -103,10 +103,9 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } - if (eo.getType() != null && !eo.getType().trim().equals("")) { - queryWrapper.like("type",eo.getType().trim()); - } - +// if (eo.getType() != null && !eo.getType().trim().equals("")) { +// queryWrapper.like("type",eo.getType().trim()); +// } IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); return Result.success(page);