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
e0627c2c
Commit
e0627c2c
authored
Jun 10, 2019
by
youjj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改返回对象
parent
fb07a5c0
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
12 deletions
+14
-12
TourBannerController.java
...ava/com/xxfc/platform/tour/rest/TourBannerController.java
+2
-2
TourTagBannerController.java
.../com/xxfc/platform/tour/rest/TourTagBannerController.java
+4
-3
TourTagController.java
...n/java/com/xxfc/platform/tour/rest/TourTagController.java
+4
-4
TourUserController.java
.../java/com/xxfc/platform/tour/rest/TourUserController.java
+3
-2
bootstrap.yml
xx-tour/xx-tour-server/src/main/resources/bootstrap.yml
+1
-1
No files found.
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourBannerController.java
View file @
e0627c2c
...
...
@@ -27,12 +27,12 @@ public class TourBannerController extends BaseController<TourBannerBiz,TourBanne
* @return
*/
@GetMapping
(
"/app/unauth/findBannerlist"
)
public
Lis
tRestResponse
findBannerlist
(){
public
Objec
tRestResponse
findBannerlist
(){
List
<
TourBanner
>
bannerList
=
bannerBiz
.
findBannerList
();
return
new
ListRestResponse
().
result
(
bannerList
).
count
(
bannerList
.
size
()
);
return
ObjectRestResponse
.
succ
(
bannerList
);
}
...
...
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourTagBannerController.java
View file @
e0627c2c
package
com
.
xxfc
.
platform
.
tour
.
rest
;
import
com.github.wxiaoqi.security.common.msg.ListRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.rest.BaseController
;
import
com.xxfc.platform.tour.biz.TourTagBannerBiz
;
import
com.xxfc.platform.tour.entity.TourTagBanner
;
...
...
@@ -19,10 +20,10 @@ public class TourTagBannerController extends BaseController<TourTagBannerBiz,Tou
private
TourTagBannerBiz
tagBannerBiz
;
@GetMapping
(
"/app/unauth/findById/{tid}"
)
public
ListRestResponse
findById
(
@PathVariable
long
tid
)
{
public
ObjectRestResponse
findById
(
@PathVariable
long
tid
)
{
List
<
TourTagBanner
>
tourTagBanners
=
tagBannerBiz
.
findById
(
tid
);
return
new
ListRestResponse
().
result
(
tourTagBanners
).
count
(
tourTagBanners
.
size
()
);
return
ObjectRestResponse
.
succ
(
tourTagBanners
);
}
...
...
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourTagController.java
View file @
e0627c2c
...
...
@@ -23,10 +23,10 @@ public class TourTagController extends BaseController<TourTagBiz,TourTag> {
private
TourTagBiz
tagBiz
;
@GetMapping
(
"/app/unauth/getTagList"
)
public
Lis
tRestResponse
getTagList
(
pageDTO
dto
){
public
Objec
tRestResponse
getTagList
(
pageDTO
dto
){
if
(
dto
==
null
)
{
new
ListRestResponse
<>().
result
(
"错误"
);
return
ObjectRestResponse
.
createDefaultFail
(
);
}
Integer
hot
=
dto
.
getHot
();
...
...
@@ -35,13 +35,13 @@ public class TourTagController extends BaseController<TourTagBiz,TourTag> {
if
(
hot
==
1
){
List
<
TourTag
>
hotTag
=
tagBiz
.
getHotTag
();
return
new
ListRestResponse
().
result
(
hotTag
).
count
(
hotTag
.
size
()
);
return
ObjectRestResponse
.
succ
(
hotTag
);
}
PageDataVO
<
TourTag
>
all
=
tagBiz
.
findAll
(
BeanUtil
.
beanToMap
(
dto
));
return
new
ListRestResponse
().
result
(
all
).
count
(
all
.
getData
().
size
()
);
return
ObjectRestResponse
.
succ
(
all
);
}
...
...
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourUserController.java
View file @
e0627c2c
...
...
@@ -2,6 +2,7 @@ package com.xxfc.platform.tour.rest;
import
com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO
;
import
com.github.wxiaoqi.security.common.msg.ListRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.xxfc.platform.tour.biz.TourUserBiz
;
import
com.xxfc.platform.tour.common.TourBaseController
;
import
com.xxfc.platform.tour.entity.TourUser
;
...
...
@@ -18,12 +19,12 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
@GetMapping
(
"/app/unauth/getTourUser/{isChild}"
)
public
Lis
tRestResponse
getTourUser
(
@PathVariable
int
isChild
){
public
Objec
tRestResponse
getTourUser
(
@PathVariable
int
isChild
){
AppUserDTO
userInfo
=
getUserInfo
();
Integer
id
=
userInfo
.
getId
();
List
<
TourUser
>
tourUsers
=
baseBiz
.
getTourUser
(
id
,
isChild
);
return
new
ListRestResponse
().
result
(
tourUsers
).
count
(
tourUsers
.
size
()
);
return
ObjectRestResponse
.
succ
(
tourUsers
);
}
...
...
xx-tour/xx-tour-server/src/main/resources/bootstrap.yml
View file @
e0627c2c
...
...
@@ -23,7 +23,7 @@ spring:
cloud
:
nacos
:
config
:
server-addr
:
1
0.1.37.192
:8848
server-addr
:
1
27.0.0.1
:8848
---
spring
:
...
...
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