Commit 51b6934a by 阳浪

门户搜素接口

parent 5ff0c145
...@@ -221,9 +221,9 @@ public class PortalApiController { ...@@ -221,9 +221,9 @@ public class PortalApiController {
List<Long> classNameList = informationVoList.stream().map(InformationVo::getTypeOne).collect(Collectors.toList()); List<Long> classNameList = informationVoList.stream().map(InformationVo::getTypeOne).collect(Collectors.toList());
vo.setClassificationVOList(classificationVOList.stream().filter(c->classNameList.contains(c.getId())).collect(Collectors.toList())); vo.setClassificationVOList(classificationVOList.stream().filter(c->classNameList.contains(c.getId())).collect(Collectors.toList()));
vo.getClassificationVOList().stream().forEach(classificationVO -> { vo.getClassificationVOList().stream().forEach(classificationVO -> {
classificationVO.getData().forEach(typeTwo->{ //classificationVO.getData().forEach(typeTwo->{
typeTwo.setInformationVoList(informationVoList.stream().filter(informationVo -> Objects.equals(informationVo.getTypeTwo(),typeTwo.getId())).collect(Collectors.toList())); classificationVO.setInformationVoList(informationVoList.stream().filter(informationVo -> Objects.equals(informationVo.getTypeOne(),classificationVO.getId())).collect(Collectors.toList()));
}); //});
}); });
classificationVOList = classificationVOList.stream().filter(c->!classNameList.contains(c.getId())).collect(Collectors.toList()); classificationVOList = classificationVOList.stream().filter(c->!classNameList.contains(c.getId())).collect(Collectors.toList());
} }
...@@ -231,8 +231,8 @@ public class PortalApiController { ...@@ -231,8 +231,8 @@ public class PortalApiController {
List<ClassificationVO> classificationVONewList = Lists.newArrayList(); List<ClassificationVO> classificationVONewList = Lists.newArrayList();
if(CollectionUtil.isNotEmpty(classificationVOList)){ if(CollectionUtil.isNotEmpty(classificationVOList)){
classificationVOList.stream().forEach(classificationVO -> { classificationVOList.stream().forEach(classificationVO -> {
classificationVO.getData().forEach(typeTwo->{ //classificationVO.getData().forEach(typeTwo->{
if(typeTwo.getName().indexOf(searchName)>=0){ if(classificationVO.getName().indexOf(searchName)>=0){
InfomationParamReleaseVO releaseVO =new InfomationParamReleaseVO(); InfomationParamReleaseVO releaseVO =new InfomationParamReleaseVO();
releaseVO.setCompanyCode(context.getCompanyCode()); releaseVO.setCompanyCode(context.getCompanyCode());
releaseVO.setCompanyId(context.getCompanyId()); releaseVO.setCompanyId(context.getCompanyId());
...@@ -244,9 +244,9 @@ public class PortalApiController { ...@@ -244,9 +244,9 @@ public class PortalApiController {
releaseVO.setOrgIds(context.getOrgIds()); releaseVO.setOrgIds(context.getOrgIds());
releaseVO.setOrgName(context.getOrgName()); releaseVO.setOrgName(context.getOrgName());
releaseVO.setTypeId(classificationVO.getId()); releaseVO.setTypeId(classificationVO.getId());
releaseVO.setTypeTwoId(typeTwo.getId()); releaseVO.setTypeTwoId(classificationVO.getId());
Page<InformationVo> page = informationManageFeignClients.releaseList(releaseVO); Page<InformationVo> page = informationManageFeignClients.releaseList(releaseVO);
typeTwo.setInformationVoList(page!=null?page.getRecords():Lists.newArrayList()); classificationVO.setInformationVoList(page!=null?page.getRecords():Lists.newArrayList());
ClassificationVO classification = new ClassificationVO(); ClassificationVO classification = new ClassificationVO();
BeanUtil.copyProperties(classificationVO,classification); BeanUtil.copyProperties(classificationVO,classification);
...@@ -261,7 +261,7 @@ public class PortalApiController { ...@@ -261,7 +261,7 @@ public class PortalApiController {
} }
} }
} }
}); //});
}); });
} }
dictionaryFeignClients.insertBySearchName(searchName); dictionaryFeignClients.insertBySearchName(searchName);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment