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
2d130ad8
Commit
2d130ad8
authored
Nov 19, 2020
by
wuwz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加首页标签和距离
parent
c4645c26
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
AppHomeController.java
...in/java/com/xxfc/platform/app/rest/AppHomeController.java
+5
-2
CampsiteFeign.java
.../java/com/xxfc/platform/campsite/feign/CampsiteFeign.java
+7
-1
No files found.
xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppHomeController.java
View file @
2d130ad8
...
...
@@ -44,13 +44,16 @@ public class AppHomeController extends BaseController<CofigBiz,Cofig> {
public
ObjectRestResponse
<
List
<
GoodDataVO
>>
goodList
(
@RequestParam
(
value
=
"page"
,
defaultValue
=
"1"
)
Integer
page
,
@RequestParam
(
value
=
"limit"
,
defaultValue
=
"4"
)
Integer
limit
,
@RequestParam
(
value
=
"type"
,
defaultValue
=
"1"
)
Integer
type
@RequestParam
(
value
=
"type"
,
defaultValue
=
"1"
)
Integer
type
,
@RequestParam
(
value
=
"longitude"
,
required
=
false
)
Double
longitude
,
@RequestParam
(
value
=
"latitude"
,
required
=
false
)
Double
latitude
){
List
<
GoodDataVO
>
list
=
new
ArrayList
<>();
if
(
type
==
2
){
list
=
tourFeign
.
goodList
(
page
,
limit
);
}
else
if
(
type
==
3
){
list
=
campsiteFeign
.
goodList
(
page
,
limit
);
//list=campsiteFeign.goodList(page,limit);
list
=
campsiteFeign
.
goodList
(
page
,
limit
,
longitude
,
latitude
);
}
else
if
(
type
==
4
){
return
vehicleFeign
.
goodList
(
page
,
limit
);
}
...
...
xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/feign/CampsiteFeign.java
View file @
2d130ad8
...
...
@@ -25,10 +25,16 @@ import java.util.List;
@FeignClient
(
name
=
"xx-campsite"
,
path
=
"/campsiteShop"
)
public
interface
CampsiteFeign
{
/*@ApiOperation("首页营地列表")
@GetMapping(value = "/app/shopList")
List<GoodDataVO> goodList(@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "limit", defaultValue = "4") Integer limit);*/
@ApiOperation
(
"首页营地列表"
)
@GetMapping
(
value
=
"/app/shopList"
)
List
<
GoodDataVO
>
goodList
(
@RequestParam
(
value
=
"page"
,
defaultValue
=
"1"
)
Integer
page
,
@RequestParam
(
value
=
"limit"
,
defaultValue
=
"4"
)
Integer
limit
);
@RequestParam
(
value
=
"limit"
,
defaultValue
=
"4"
)
Integer
limit
,
@RequestParam
(
value
=
"longitude"
,
required
=
false
)
Double
longitude
,
@RequestParam
(
value
=
"latitude"
,
required
=
false
)
Double
latitude
);
@GetMapping
(
value
=
"/app/unauth/findRandomVehicle"
)
ObjectRestResponse
findRandomVehicle
(
@RequestParam
(
value
=
"number"
)
Integer
number
);
...
...
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