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
fc96357a
Commit
fc96357a
authored
Sep 18, 2020
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优惠券,权限相关
parent
b8d855d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
1 deletion
+20
-1
PageParam.java
...java/com/github/wxiaoqi/security/common/vo/PageParam.java
+4
-1
GroupController.java
...m/github/wxiaoqi/security/admin/rest/GroupController.java
+16
-0
No files found.
ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/PageParam.java
View file @
fc96357a
package
com
.
github
.
wxiaoqi
.
security
.
common
.
vo
;
import
com.github.wxiaoqi.security.common.util.Query
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
...
...
@@ -10,5 +11,7 @@ public class PageParam {
@ApiModelProperty
(
"每页限制"
)
Integer
limit
;
public
Query
initQuery
()
{
return
new
Query
(
this
);
}
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/GroupController.java
View file @
fc96357a
...
...
@@ -10,7 +10,10 @@ import com.github.wxiaoqi.security.admin.vo.GroupUsers;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.rest.BaseController
;
import
com.github.wxiaoqi.security.common.util.TreeUtil
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageParam
;
import
io.swagger.annotations.Api
;
import
lombok.Data
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -50,6 +53,13 @@ public class GroupController extends BaseController<GroupBiz, Group> {
return
baseBiz
.
selectByExample
(
example
);
}
@RequestMapping
(
value
=
"/listPage"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
public
ObjectRestResponse
<
PageDataVO
<
Group
>>
listPage
(
ListPageDTO
dto
)
{
ObjectRestResponse
.
succ
(
PageDataVO
.
pageInfo
(
dto
.
initQuery
(),
()
->
list
(
dto
.
getName
(),
dto
.
getGroupType
())));
}
@GetMapping
(
value
=
"/list_all"
)
@ResponseBody
public
List
<
Group
>
listAll
()
{
...
...
@@ -158,4 +168,10 @@ public class GroupController extends BaseController<GroupBiz, Group> {
}
return
TreeUtil
.
bulid
(
trees
,
root
)
;
}
@Data
static
public
class
ListPageDTO
extends
PageParam
{
String
name
;
String
groupType
;
}
}
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