Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
datacollector
Overview
Overview
Details
Activity
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
chenweisong
datacollector
Commits
ac8804e0
Commit
ac8804e0
authored
Apr 01, 2020
by
chenweisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新
parent
b81c8b6a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
UserController.java
...in/java/com/keymobile/rest/controller/UserController.java
+5
-5
application-test.yml
src/main/resources/application-test.yml
+6
-6
No files found.
src/main/java/com/keymobile/rest/controller/UserController.java
View file @
ac8804e0
...
...
@@ -21,7 +21,7 @@ public class UserController {
private
FeignAuthService
feignAuthService
;
@ApiOperation
(
value
=
"获取组织树"
)
@
Pos
tMapping
(
value
=
"/orgs"
)
@
Ge
tMapping
(
value
=
"/orgs"
)
public
ApiResponse
getOrgs
()
{
return
ApiResponse
.
ok
(
feignAuthService
.
getOrgs
());
}
...
...
@@ -31,7 +31,7 @@ public class UserController {
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"orgId"
,
value
=
"机构id"
,
paramType
=
"query"
,
required
=
true
,
dataType
=
"long"
)
})
@
Pos
tMapping
(
value
=
"/org/users"
)
@
Ge
tMapping
(
value
=
"/org/users"
)
public
ApiResponse
getOrgUsers
(
long
orgId
)
{
List
<
Map
>
users
=
feignAuthService
.
getUsersByOrgId
(
orgId
);
return
ApiResponse
.
ok
(
users
);
...
...
@@ -41,7 +41,7 @@ public class UserController {
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"orgId"
,
value
=
"机构id"
,
paramType
=
"query"
,
required
=
true
,
dataType
=
"long"
)
})
@
Pos
tMapping
(
value
=
"/groups"
)
@
Ge
tMapping
(
value
=
"/groups"
)
public
ApiResponse
getUserGroups
(
long
orgId
)
{
List
<
Map
>
userGroups
=
feignAuthService
.
getUserGroups
(
0
,
orgId
);
return
ApiResponse
.
ok
(
userGroups
);
...
...
@@ -51,14 +51,14 @@ public class UserController {
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"userGroupId"
,
value
=
"用户组id"
,
paramType
=
"query"
,
required
=
true
,
dataType
=
"long"
)
})
@
Pos
tMapping
(
value
=
"/group/users"
)
@
Ge
tMapping
(
value
=
"/group/users"
)
public
ApiResponse
getGroupUsers
(
long
userGroupId
)
{
List
<
Map
>
users
=
feignAuthService
.
getGroupUsers
(
0
,
userGroupId
);
return
ApiResponse
.
ok
(
users
);
}
@ApiOperation
(
value
=
"获取补录范围用户树"
)
@
Pos
tMapping
(
value
=
"/users"
)
@
Ge
tMapping
(
value
=
"/users"
)
public
ApiResponse
getUsers
()
{
Map
tree
=
(
Map
)
feignAuthService
.
getOrgs
();
List
<
Map
>
subNodes
=
(
List
<
Map
>)
tree
.
get
(
"subNodes"
);
...
...
src/main/resources/application-test.yml
View file @
ac8804e0
...
...
@@ -12,12 +12,12 @@ eureka:
hostname
:
192.168.0.48
hystrix
:
command
:
default
:
execution
:
isolation
:
thread
:
timeoutInMilliseconds
:
60000
command
:
default
:
execution
:
isolation
:
thread
:
timeoutInMilliseconds
:
60000
spring
:
application
:
...
...
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