FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2021-08-17 17:51:44 +08:00
parent 7303f11043 f7231deef7
commit f353328bce
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
+1 -3
View File
@@ -226,9 +226,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
StringBuilder itemBuilder = new StringBuilder(); StringBuilder itemBuilder = new StringBuilder();
mapItems.forEach((s, s2) -> { mapItems.forEach((s, s2) -> {
itemBuilder.append(s+" ").append("(模拟数据)-本标准规定了机动车的整车及主要总成、安全防护装置等有关运行安全的基本技术要求，以及消防车、救护车、" + itemBuilder.append(s+" ").append(s2).append("</br>");
"工程救险车和警车及残疾人专用汽车的附加要求。本标准适用于在我国道路上行驶的所有机动车，但不适用于有轨电车及并非为在道路上行驶和使用而设计和制造、" +
"主要用于封闭道路和场所作业施工的轮式专用机械车。 注：有轨电车是指以电机驱动，架线供电，有轨道承载的道路车辆。").append("</br>");
}); });
StringBuilder textItemContent = replaceAll(itemBuilder, "null", "--"); StringBuilder textItemContent = replaceAll(itemBuilder, "null", "--");
fullTextSearchEO.put("textItems",textItemContent.toString()); fullTextSearchEO.put("textItems",textItemContent.toString());
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+2 -2
View File
@@ -602,7 +602,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
if(!sarItemVOS.isEmpty()){ if(!sarItemVOS.isEmpty()){
Map<String,String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null) Map<String,String> 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); sarStandardsInfoEO.setMapItems(collectMap);
} }
createStandMQService.sendStandMQ(sarStandardsInfoEO,"add"); createStandMQService.sendStandMQ(sarStandardsInfoEO,"add");
@@ -1182,7 +1182,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
if(!sarItemVOS.isEmpty()){ if(!sarItemVOS.isEmpty()){
Map<String,String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null) Map<String,String> 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); sarStandardsInfoEO.setMapItems(collectMap);
} }
createStandMQService.sendStandMQ(sarStandardsInfoEO,"update"); createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");