Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
beyond-clouds
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
4
Issues
4
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
段启岩
beyond-clouds
Commits
bcd27ed3
Commit
bcd27ed3
authored
Feb 12, 2020
by
段启岩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
搜索服务更新
parent
55b73c24
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
src/main/java/cn/meteor/beyondclouds/modules/search/api/SearchApi.java
+2
-1
src/main/java/cn/meteor/beyondclouds/modules/search/service/impl/SearchServiceImpl.java
+6
-4
No files found.
src/main/java/cn/meteor/beyondclouds/modules/search/api/SearchApi.java
View file @
bcd27ed3
...
...
@@ -15,6 +15,7 @@ import org.springframework.util.StringUtils;
import
org.springframework.validation.BindingResult
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.validation.Valid
;
...
...
@@ -37,7 +38,7 @@ public class SearchApi {
@Anonymous
@GetMapping
(
""
)
@ApiOperation
(
"搜索"
)
public
Response
<?>
search
(
@Valid
PageForm
pageForm
,
String
keywords
,
String
itemType
,
BindingResult
bindingResult
)
{
public
Response
<?>
search
(
@Valid
PageForm
pageForm
,
String
keywords
,
@RequestParam
(
value
=
"type"
,
required
=
false
)
String
itemType
,
BindingResult
bindingResult
)
{
if
(
bindingResult
.
hasErrors
())
{
return
Response
.
fieldError
(
bindingResult
.
getFieldError
());
}
...
...
src/main/java/cn/meteor/beyondclouds/modules/search/service/impl/SearchServiceImpl.java
View file @
bcd27ed3
...
...
@@ -27,6 +27,7 @@ import cn.meteor.beyondclouds.modules.user.exception.UserServiceException;
import
cn.meteor.beyondclouds.modules.user.service.IUserService
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
lombok.extern.slf4j.Slf4j
;
import
org.elasticsearch.index.query.BoolQueryBuilder
;
import
org.elasticsearch.index.query.DisMaxQueryBuilder
;
import
org.elasticsearch.index.query.QueryBuilder
;
import
org.elasticsearch.index.query.QueryBuilders
;
...
...
@@ -102,14 +103,15 @@ public class SearchServiceImpl implements ISearchService {
disMaxQueryBuilder
.
add
(
descriptionQueryBuilder
);
disMaxQueryBuilder
.
add
(
contentQueryBuilder
);
QueryBuilder
q
ueryBuilder
BoolQueryBuilder
boolQ
ueryBuilder
=
QueryBuilders
.
boolQuery
()
.
must
(
QueryBuilders
.
constantScoreQuery
(
QueryBuilders
.
matchPhraseQuery
(
"itemType"
,
itemType
)))
.
must
(
disMaxQueryBuilder
);
return
searchRepository
.
search
(
queryBuilder
,
PageRequest
.
of
(
pageNumber
,
pageSize
));
if
(
null
!=
itemType
)
{
boolQueryBuilder
.
must
(
QueryBuilders
.
constantScoreQuery
(
QueryBuilders
.
matchPhraseQuery
(
"itemType"
,
itemType
)));
}
return
searchRepository
.
search
(
boolQueryBuilder
,
PageRequest
.
of
(
pageNumber
,
pageSize
));
}
@Override
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment