yudao-team/yudao_master
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

跨域搜索

Browse Source
This commit is contained in:
XaoLi717 2024-08-19 14:54:28 +08:00
parent 460fbec052
commit fa07fcc227
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/elasticsearch/EsearchUtils.java
View File

@ -102,12 +102,12 @@ public class EsearchUtils {
MatchPhraseQueryBuilder matchPhraseQueryBuilder = QueryBuilders.matchPhraseQuery(kmsSearchDto.getSearchKey(), kmsSearchDto.getSearchValue());
// 4.添加查询条件到boolQueryBuilder中
boolQueryBuilder.must(matchPhraseQueryBuilder);
// if("1".equals(kmsSearchDto.getSearchBy())) {
// boolQueryBuilder.should(QueryBuilders.termsQuery(kmsSearchDto.getSearchKey(), kmsSearchDto.getSearchValue()));
// }
// else if("2".equals(kmsSearchDto.getSearchBy())) {
// boolQueryBuilder.should(QueryBuilders.wildcardQuery(kmsSearchDto.getSearchKey(), "*" + kmsSearchDto.getSearchValue() + "*"));
// }
if("1".equals(kmsSearchDto.getSearchBy())) {
boolQueryBuilder.should(QueryBuilders.termsQuery(kmsSearchDto.getSearchKey(), kmsSearchDto.getSearchValue()));
}
else if("2".equals(kmsSearchDto.getSearchBy())) {
boolQueryBuilder.should(QueryBuilders.wildcardQuery(kmsSearchDto.getSearchKey(), "*" + kmsSearchDto.getSearchValue() + "*"));
}
// 查询条件--->生成DSL查询语句
searchSourceBuilder.query(boolQueryBuilder);
Integer pageNum = 1;

2
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/knows/KnowledgeController.java
View File

@ -110,10 +110,8 @@ public class KnowledgeController {
@GetMapping("/listForEs")
@Operation(summary = "获得查询分页")
public CommonResult<List<KnowledgeRespVO>> getKnowsList(@Valid KmsSearchDto kmsSearchDto) {
System.out.println("获得查询分页获得查询分页获得查询分页获得查询分页"+kmsSearchDto);
//PageResult<KnowledgeDO> pageResult = knowledgeService.getKnowledgePage(pageReqVO);
List<KnowledgeDO> list = knowledgeService.getKnowsList(kmsSearchDto);
System.out.println("获得查询分页获得查询分页获得查询分页获得查询分页"+list);
return success(BeanUtils.toBean(list, KnowledgeRespVO.class));
}
@GetMapping("/page-user")

1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeServiceImpl.java
View File

@ -123,7 +123,6 @@ public class KnowledgeServiceImpl implements KnowledgeService {
}
public List<KnowledgeDO> getKnowsList(KmsSearchDto kmsSearchDto) {
System.out.println("getKnowsListgetKnowsListgetKnowsList"+kmsSearchDto);
// return knowledgeMapper.selectPage(userId, pageReqVO);
KnowledgeDO knowledgeDo = new KnowledgeDO();
return EsearchUtils.selectForEs(kmsSearchDto,knowledgeDo,indexName,KnowledgeDO.class);