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
108fdb1b
Commit
108fdb1b
authored
May 15, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改营地相关
parent
2117728c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
CampsiteController.java
...inxincaravan/caravan/vehicle/rest/CampsiteController.java
+9
-1
No files found.
vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/rest/CampsiteController.java
View file @
108fdb1b
...
@@ -7,6 +7,7 @@ import com.xinxincaravan.caravan.vehicle.biz.CampsiteBiz;
...
@@ -7,6 +7,7 @@ import com.xinxincaravan.caravan.vehicle.biz.CampsiteBiz;
import
com.xinxincaravan.caravan.vehicle.common.BaseController
;
import
com.xinxincaravan.caravan.vehicle.common.BaseController
;
import
com.xinxincaravan.caravan.vehicle.common.RestResponse
;
import
com.xinxincaravan.caravan.vehicle.common.RestResponse
;
import
com.xinxincaravan.caravan.vehicle.constant.ResCode.ResCode
;
import
com.xinxincaravan.caravan.vehicle.constant.ResCode.ResCode
;
import
com.xinxincaravan.caravan.vehicle.entity.BranchCompany
;
import
com.xinxincaravan.caravan.vehicle.entity.Campsite
;
import
com.xinxincaravan.caravan.vehicle.entity.Campsite
;
import
com.xinxincaravan.caravan.vehicle.feign.UserFeign
;
import
com.xinxincaravan.caravan.vehicle.feign.UserFeign
;
import
com.xinxincaravan.caravan.vehicle.feign.dto.UserDTO
;
import
com.xinxincaravan.caravan.vehicle.feign.dto.UserDTO
;
...
@@ -33,7 +34,6 @@ public class CampsiteController extends BaseController<CampsiteBiz> {
...
@@ -33,7 +34,6 @@ public class CampsiteController extends BaseController<CampsiteBiz> {
@Autowired
@Autowired
private
UserAuthConfig
userAuthConfig
;
private
UserAuthConfig
userAuthConfig
;
@IgnoreUserToken
@RequestMapping
(
value
=
"/page"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/page"
,
method
=
RequestMethod
.
GET
)
public
RestResponse
<
PageDataVo
<
Campsite
>>
page
(
@RequestParam
Integer
page
,
@RequestParam
Integer
limit
,
public
RestResponse
<
PageDataVo
<
Campsite
>>
page
(
@RequestParam
Integer
page
,
@RequestParam
Integer
limit
,
@RequestParam
(
required
=
false
)
Integer
addrProvince
,
@RequestParam
(
required
=
false
)
Integer
addrCity
,
@RequestParam
(
required
=
false
)
Integer
addrProvince
,
@RequestParam
(
required
=
false
)
Integer
addrCity
,
...
@@ -42,6 +42,14 @@ public class CampsiteController extends BaseController<CampsiteBiz> {
...
@@ -42,6 +42,14 @@ public class CampsiteController extends BaseController<CampsiteBiz> {
return
RestResponse
.
data
(
baseBiz
.
getAll
(
page
,
limit
,
addrProvince
,
addrCity
,
addrTown
,
userDTO
));
return
RestResponse
.
data
(
baseBiz
.
getAll
(
page
,
limit
,
addrProvince
,
addrCity
,
addrTown
,
userDTO
));
}
}
@IgnoreUserToken
@RequestMapping
(
value
=
"/allPage"
,
method
=
RequestMethod
.
GET
)
public
RestResponse
<
PageDataVo
<
Campsite
>>
allPage
(
@RequestParam
Integer
page
,
@RequestParam
Integer
limit
,
@RequestParam
(
required
=
false
)
Integer
addrProvince
,
@RequestParam
(
required
=
false
)
Integer
addrCity
,
@RequestParam
(
required
=
false
)
Integer
addrTown
)
{
return
RestResponse
.
data
(
baseBiz
.
getAll
(
page
,
limit
,
addrProvince
,
addrCity
,
addrTown
,
null
));
}
@RequestMapping
(
value
=
""
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
""
,
method
=
RequestMethod
.
GET
)
public
RestResponse
<
List
<
Campsite
>>
getAll
()
{
public
RestResponse
<
List
<
Campsite
>>
getAll
()
{
return
RestResponse
.
data
(
baseBiz
.
getAll
());
return
RestResponse
.
data
(
baseBiz
.
getAll
());
...
...
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