|
@@ -1869,18 +1869,19 @@ public class ProjectImpl implements ProjectService {
|
|
|
// todo 这里进行拦截,根据关键词从elasticsearch中召回附件信息获取数据
|
|
// todo 这里进行拦截,根据关键词从elasticsearch中召回附件信息获取数据
|
|
|
List <String> searchAttachmentIds = null;
|
|
List <String> searchAttachmentIds = null;
|
|
|
log.info("==================entry to elasticsearch 的搜索环节,关键词:{}===================", projectFilterVo.getKeyWord());
|
|
log.info("==================entry to elasticsearch 的搜索环节,关键词:{}===================", projectFilterVo.getKeyWord());
|
|
|
- try {
|
|
|
|
|
- String[] res = ServiceUtil.getElasticsearchResultByWord(projectFilterVo.getKeyWord());
|
|
|
|
|
- if(res.length>0){
|
|
|
|
|
- searchAttachmentIds = Arrays.asList(res);
|
|
|
|
|
|
|
+ if(com.siwei.common.core.utils.StringUtils.isNotBlank(projectFilterVo.getKeyWord())) {
|
|
|
|
|
+ try {
|
|
|
|
|
+ String[] res = ServiceUtil.getElasticsearchResultByWord(projectFilterVo.getKeyWord());
|
|
|
|
|
+ if(res.length>0){
|
|
|
|
|
+ searchAttachmentIds = Arrays.asList(res);
|
|
|
|
|
+ }
|
|
|
|
|
+ log.info("根据关键词从 elasticsearch 中召回附件信息获取数据,关键词:{},附件id:{}", projectFilterVo.getKeyWord(), searchAttachmentIds);
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ e.printStackTrace();
|
|
|
}
|
|
}
|
|
|
- log.info("根据关键词从 elasticsearch 中召回附件信息获取数据,关键词:{},附件id:{}", projectFilterVo.getKeyWord(), searchAttachmentIds);
|
|
|
|
|
- } catch (Exception e) {
|
|
|
|
|
- e.printStackTrace();
|
|
|
|
|
}
|
|
}
|
|
|
projectFilterVo.setAttachmentInfoIdList(searchAttachmentIds);
|
|
projectFilterVo.setAttachmentInfoIdList(searchAttachmentIds);
|
|
|
|
|
|
|
|
-
|
|
|
|
|
// todo 这里后期可以进行优化,把查询出的项目id写入redis中,分页时候可以取缓存
|
|
// todo 这里后期可以进行优化,把查询出的项目id写入redis中,分页时候可以取缓存
|
|
|
List<SearchProjectAndAttachment> projects = projectMapper.getListSearch(projectFilterVo);
|
|
List<SearchProjectAndAttachment> projects = projectMapper.getListSearch(projectFilterVo);
|
|
|
Integer count = projectMapper.getSearchCount(projectFilterVo);
|
|
Integer count = projectMapper.getSearchCount(projectFilterVo);
|