Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
bb3b7b2c
Commit
bb3b7b2c
authored
Jun 18, 2019
by
libin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
标签
parent
07a596d0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
9 deletions
+12
-9
PlatformExceptionHandler.java
...oqi/security/common/handler/PlatformExceptionHandler.java
+1
-1
TourTagBiz.java
.../src/main/java/com/xxfc/platform/tour/biz/TourTagBiz.java
+11
-8
No files found.
ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/PlatformExceptionHandler.java
View file @
bb3b7b2c
...
@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
...
@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
@RestControllerAdvice
(
"com.xxfc.platform"
)
@RestControllerAdvice
(
"com.xxfc.platform"
)
public
class
PlatformExceptionHandler
{
public
class
PlatformExceptionHandler
{
@ExceptionHandler
(
value
=
{
BaseException
.
class
,
Exception
.
class
})
@ExceptionHandler
(
value
=
{
BaseException
.
class
})
public
BaseResponse
baseExceptionHandler
(
Exception
e
)
{
public
BaseResponse
baseExceptionHandler
(
Exception
e
)
{
if
(
e
instanceof
BaseException
){
if
(
e
instanceof
BaseException
){
BaseException
be
=
(
BaseException
)
e
;
BaseException
be
=
(
BaseException
)
e
;
...
...
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourTagBiz.java
View file @
bb3b7b2c
...
@@ -91,15 +91,18 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
...
@@ -91,15 +91,18 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
List
<
Integer
>
tagIds
=
tourTags
.
stream
().
map
(
TourTag:
:
getId
).
collect
(
Collectors
.
toList
());
List
<
Integer
>
tagIds
=
tourTags
.
stream
().
map
(
TourTag:
:
getId
).
collect
(
Collectors
.
toList
());
Map
<
Integer
,
List
<
TourTagBannerDTO
>>
tourTagBannerMap
=
tourTagBannerBiz
.
findTourTagBannersByTagIds
(
tagIds
);
Map
<
Integer
,
List
<
TourTagBannerDTO
>>
tourTagBannerMap
=
tourTagBannerBiz
.
findTourTagBannersByTagIds
(
tagIds
);
tourTags
.
forEach
(
tourTag
->
{
tourTags
.
forEach
(
tourTag
->
{
});
for
(
TourTag
tourTag:
tourTags
){
//vo转换
//vo转换
TourTagDTO
tourTagDTO
=
new
TourTagDTO
();
TourTagDTO
tourTagDTO
=
new
TourTagDTO
();
BeanUtils
.
copyProperties
(
tourTag
,
tourTagDTO
);
BeanUtils
.
copyProperties
(
tourTag
,
tourTagDTO
);
//根据旅游标签id查询出标签banner相关信息
//根据旅游标签id查询出标签banner相关信息
List
<
TourTagBannerDTO
>
tagBannerDTOS
=
tourTagBannerMap
.
get
(
tourTag
.
getId
());
List
<
TourTagBannerDTO
>
tagBannerDTOS
=
tourTagBannerMap
.
get
(
tourTag
.
getId
());
//banner 数量
//banner 数量
tourTagDTO
.
setBannerNums
(
tagBannerDTOS
.
size
());
tourTagDTO
.
setBannerNums
(
tagBannerDTOS
==
null
?
0
:
tagBannerDTOS
.
size
());
tourTagAndBannerDTOS
.
add
(
TourTagAndBannerDTO
.
builder
().
tourTagDTO
(
tourTagDTO
).
tourTagBannerDTOS
(
tagBannerDTOS
).
build
());
tourTagAndBannerDTOS
.
add
(
TourTagAndBannerDTO
.
builder
().
tourTagDTO
(
tourTagDTO
).
tourTagBannerDTOS
(
tagBannerDTOS
).
build
());
});
}
//组装数据
//组装数据
tourTagAndBannerDTOPageDataVO
.
setData
(
tourTagAndBannerDTOS
);
tourTagAndBannerDTOPageDataVO
.
setData
(
tourTagAndBannerDTOS
);
tourTagAndBannerDTOPageDataVO
.
setPageNum
(
pageDataVO
.
getPageNum
());
tourTagAndBannerDTOPageDataVO
.
setPageNum
(
pageDataVO
.
getPageNum
());
...
...
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