Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
78b36db2
authored
Mar 08, 2018
by
Huang Linyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename /adminUser/list/communeAdm as /communeAdm/list/communeAdmUser
reset access for each member
parent
854ccf5b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
24 deletions
src/main/java/com/ctrip/fun/admin/controller/market/CommuneAdmController.java
src/main/java/com/ctrip/fun/admin/controller/system/adminUserController.java
src/main/resources/config/spring-security.xml
src/main/webapp/WEB-INF/templates/market/communeAdm/list.ftl
src/main/java/com/ctrip/fun/admin/controller/market/CommuneAdmController.java
View file @
78b36db2
package
com
.
ctrip
.
fun
.
admin
.
controller
.
market
;
package
com
.
ctrip
.
fun
.
admin
.
controller
.
market
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -21,10 +22,12 @@ import org.springframework.web.bind.annotation.ResponseStatus;
...
@@ -21,10 +22,12 @@ import org.springframework.web.bind.annotation.ResponseStatus;
import
com.ctrip.fun.admin.form.PaginationForm
;
import
com.ctrip.fun.admin.form.PaginationForm
;
import
com.ctrip.fun.admin.service.market.CommuneAdmService
;
import
com.ctrip.fun.admin.service.market.CommuneAdmService
;
import
com.ctrip.fun.admin.service.market.CommuneExtService
;
import
com.ctrip.fun.admin.service.market.CommuneExtService
;
import
com.ctrip.fun.admin.service.system.UserDetailsService
;
import
com.ctrip.fun.admin.utility.SpringSecurityUtil
;
import
com.ctrip.fun.admin.utility.SpringSecurityUtil
;
import
com.ctrip.fun.common.vo.PagedResponseBean
;
import
com.ctrip.fun.common.vo.PagedResponseBean
;
import
com.ctrip.fun.common.vo.Response
;
import
com.ctrip.fun.common.vo.Response
;
import
com.ctrip.fun.common.vo.ResponseStatusEnum
;
import
com.ctrip.fun.common.vo.ResponseStatusEnum
;
import
com.ctrip.fun.common.vo.adminUser.AdminUserBean
;
import
com.ctrip.fun.common.vo.product.CourseResourcePaymentBean
;
import
com.ctrip.fun.common.vo.product.CourseResourcePaymentBean
;
import
com.ctrip.fun.common.vo.user.CommuneAdmBean
;
import
com.ctrip.fun.common.vo.user.CommuneAdmBean
;
import
com.ctrip.fun.common.vo.user.CommuneAdmQuery
;
import
com.ctrip.fun.common.vo.user.CommuneAdmQuery
;
...
@@ -39,6 +42,8 @@ public class CommuneAdmController {
...
@@ -39,6 +42,8 @@ public class CommuneAdmController {
private
CommuneAdmService
communeAdmService
;
private
CommuneAdmService
communeAdmService
;
@Autowired
@Autowired
private
CommuneExtService
communeExtService
;
private
CommuneExtService
communeExtService
;
@Autowired
private
UserDetailsService
userDetailsService
;
@RequestMapping
(
value
=
"queryList"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"queryList"
,
method
=
RequestMethod
.
GET
)
public
String
queryList
(
HttpServletRequest
request
,
@ModelAttribute
(
"dto"
)
CommuneAdmQuery
query
,
ModelMap
model
)
{
public
String
queryList
(
HttpServletRequest
request
,
@ModelAttribute
(
"dto"
)
CommuneAdmQuery
query
,
ModelMap
model
)
{
...
@@ -142,4 +147,25 @@ public class CommuneAdmController {
...
@@ -142,4 +147,25 @@ public class CommuneAdmController {
return
labelsList
;
return
labelsList
;
}
}
/**
* 获得会服人员列表
* @param request
* @return
*/
@ResponseBody
@RequestMapping
(
value
=
"/list/communeAdmUser"
,
method
=
RequestMethod
.
GET
)
public
List
<
Map
<
String
,
Object
>>
getCommuneAdmUserList
(
HttpServletRequest
request
)
{
List
<
Map
<
String
,
Object
>>
list
=
new
ArrayList
<
Map
<
String
,
Object
>>();
Response
<
List
<
AdminUserBean
>>
response
=
userDetailsService
.
getCommuneAdmUserList
(
null
);
List
<
AdminUserBean
>
admUserList
=
response
.
getBody
();
for
(
AdminUserBean
bean:
admUserList
){
Map
<
String
,
Object
>
map
=
new
HashMap
<
String
,
Object
>();
map
.
put
(
"admUserId"
,
bean
.
getId
());
map
.
put
(
"admUsername"
,
bean
.
getUserName
());
list
.
add
(
map
);
}
return
list
;
}
}
}
src/main/java/com/ctrip/fun/admin/controller/system/adminUserController.java
View file @
78b36db2
...
@@ -82,25 +82,4 @@ public class adminUserController {
...
@@ -82,25 +82,4 @@ public class adminUserController {
}
}
/**
* 获得会服人员列表
* @param request
* @return
*/
@ResponseBody
@RequestMapping
(
value
=
"/list/communeAdm"
,
method
=
RequestMethod
.
GET
)
public
List
<
Map
<
String
,
Object
>>
getCommuneAdmUserList
(
HttpServletRequest
request
)
{
List
<
Map
<
String
,
Object
>>
list
=
new
ArrayList
<
Map
<
String
,
Object
>>();
Response
<
List
<
AdminUserBean
>>
response
=
userDetailsService
.
getCommuneAdmUserList
(
null
);
List
<
AdminUserBean
>
admUserList
=
response
.
getBody
();
for
(
AdminUserBean
bean:
admUserList
){
Map
<
String
,
Object
>
map
=
new
HashMap
<
String
,
Object
>();
map
.
put
(
"admUserId"
,
bean
.
getId
());
map
.
put
(
"admUsername"
,
bean
.
getUserName
());
list
.
add
(
map
);
}
return
list
;
}
}
}
src/main/resources/config/spring-security.xml
View file @
78b36db2
...
@@ -70,8 +70,8 @@
...
@@ -70,8 +70,8 @@
<sec:intercept-url
pattern=
"/file/**"
access=
"ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_COMMUNE"
/>
<sec:intercept-url
pattern=
"/file/**"
access=
"ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_COMMUNE"
/>
<sec:intercept-url
pattern=
"/ingegral/**"
access=
"ROLE_DEV,ROLE_USERINFO_MODIFY"
/>
<sec:intercept-url
pattern=
"/ingegral/**"
access=
"ROLE_DEV,ROLE_USERINFO_MODIFY"
/>
<sec:intercept-url
pattern=
"/callcenter/sipPhone/**"
access=
"ROLE_TEL,ROLE_ASSIST,ROLE_PROMOTION"
/>
<sec:intercept-url
pattern=
"/callcenter/sipPhone/**"
access=
"ROLE_TEL,ROLE_ASSIST,ROLE_PROMOTION"
/>
<sec:intercept-url
pattern=
"/communeAdm/queryList
/**
"
access=
"ROLE_COMMUNE_SYS_ADMIN"
/>
<sec:intercept-url
pattern=
"/communeAdm/queryList"
access=
"ROLE_COMMUNE_SYS_ADMIN"
/>
<sec:intercept-url
pattern=
"/communeAdm/
myBindList/**"
access=
"ROLE_COMMUNE_SYS,ROLE_COMMUNE_SYS_ADMIN
"
/>
<sec:intercept-url
pattern=
"/communeAdm/
**"
access=
"ROLE_COMMUNE_SYS_ADMIN,ROLE_COMMUNE_SYS
"
/>
<sec:intercept-url
pattern=
"/**"
access=
"ROLE_DEV"
/>
<sec:intercept-url
pattern=
"/**"
access=
"ROLE_DEV"
/>
<sec:form-login
login-page=
"/adminUser/adminLoginGet"
authentication-failure-url=
"/adminUser/adminLoginError"
default-target-url=
"/marketing/campaign/create"
/>
<sec:form-login
login-page=
"/adminUser/adminLoginGet"
authentication-failure-url=
"/adminUser/adminLoginError"
default-target-url=
"/marketing/campaign/create"
/>
...
...
src/main/webapp/WEB-INF/templates/market/communeAdm/list.ftl
View file @
78b36db2
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
$('#bindAdmModal').on('show.bs.modal', function (e) {
$('#bindAdmModal').on('show.bs.modal', function (e) {
//模态框显示之后加载当前所有会服人员
//模态框显示之后加载当前所有会服人员
$.get("/
adminUser/list/communeAdm
",{},function(data){
$.get("/
communeAdm/list/communeAdmUser
",{},function(data){
//返回找出所有的会服
//返回找出所有的会服
var html='<option value="0">请选择</option>';
var html='<option value="0">请选择</option>';
...
...
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