Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 7ebf06f

Browse files
角色列表
1 parent 15ba6ac commit 7ebf06f

18 files changed

+171
-78
lines changed

‎src/main/java/com/study/controller/HomeController.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ public String usersPage(){
5252
return "user/users";
5353
}
5454

55+
@RequestMapping("/rolesPage")
56+
public String rolesPage(){
57+
return "role/roles";
58+
}
59+
5560
@RequestMapping("/resourcesPage")
5661
public String resourcesPage(){
5762
return "resources/resources";

‎src/main/java/com/study/controller/ResourcesController.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,18 @@ public Map<String,Object> getAll(Resources resources, String draw,
2828
@RequestParam(required = false, defaultValue = "1") int start,
2929
@RequestParam(required = false, defaultValue = "10") int length){
3030
Map<String,Object> map = new HashMap<>();
31-
/* PageInfo<Resources> pageInfo = resourcesService.selectByPage(resources, start, length);
31+
PageInfo<Resources> pageInfo = resourcesService.selectByPage(resources, start, length);
3232
System.out.println("pageInfo.getTotal():"+pageInfo.getTotal());
3333
map.put("draw",draw);
3434
map.put("recordsTotal",pageInfo.getTotal());
3535
map.put("recordsFiltered",pageInfo.getTotal());
36-
map.put("data", pageInfo.getList());*/
36+
map.put("data", pageInfo.getList());
3737
return map;
3838
}
3939

40-
40+
@RequestMapping("/resourcesWithSelected")
41+
public List<Resources> resourcesWithSelected(Integer rid){
42+
return resourcesService.queryResourcesListWithSelected(rid);
43+
}
4144

4245
}

‎src/main/java/com/study/controller/RoleController.java

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22

33
import com.github.pagehelper.PageInfo;
44
import com.study.model.Role;
5+
import com.study.model.RoleResources;
56
import com.study.model.User;
7+
import com.study.service.RoleResourcesService;
68
import com.study.service.RoleService;
9+
import org.springframework.util.StringUtils;
10+
import org.springframework.web.bind.annotation.PathVariable;
711
import org.springframework.web.bind.annotation.RequestMapping;
812
import org.springframework.web.bind.annotation.RequestParam;
913
import org.springframework.web.bind.annotation.RestController;
@@ -21,6 +25,8 @@
2125
public class RoleController {
2226
@Resource
2327
private RoleService roleService;
28+
@Resource
29+
private RoleResourcesService roleResourcesService;
2430

2531
@RequestMapping
2632
public Map<String,Object> getAll(Role role, String draw,
@@ -29,7 +35,6 @@ public Map<String,Object> getAll(Role role, String draw,
2935

3036
Map<String,Object> map = new HashMap<>();
3137
PageInfo<Role> pageInfo = roleService.selectByPage(role, start, length);
32-
System.out.println("pageInfo.getTotal():"+pageInfo.getTotal());
3338
map.put("draw",draw);
3439
map.put("recordsTotal",pageInfo.getTotal());
3540
map.put("recordsFiltered",pageInfo.getTotal());
@@ -42,4 +47,39 @@ public List<Role> rolesWithSelected(Integer uid){
4247
return roleService.queryRoleListWithSelected(uid);
4348
}
4449

50+
@RequestMapping("/saveRoleResources")
51+
public String saveRoleResources(RoleResources roleResources){
52+
if(StringUtils.isEmpty(roleResources.getRoleid()))
53+
return "error";
54+
try {
55+
roleResourcesService.addRoleResources(roleResources);
56+
return "success";
57+
} catch (Exception e) {
58+
e.printStackTrace();
59+
return "fail";
60+
}
61+
}
62+
63+
@RequestMapping(value = "/add")
64+
public String add(Role role) {
65+
try {
66+
roleService.save(role);
67+
return "success";
68+
} catch (Exception e) {
69+
e.printStackTrace();
70+
return "fail";
71+
}
72+
}
73+
74+
@RequestMapping(value = "/delete/{id}")
75+
public String delete(@PathVariable Integer id){
76+
try{
77+
roleService.delete(id);
78+
return "success";
79+
}catch (Exception e){
80+
e.printStackTrace();
81+
return "fail";
82+
}
83+
}
84+
4585
}

‎src/main/java/com/study/controller/UserController.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.study.service.UserRoleService;
77
import com.study.service.UserService;
88
import org.springframework.util.StringUtils;
9+
import org.springframework.web.bind.annotation.PathVariable;
910
import org.springframework.web.bind.annotation.RequestMapping;
1011
import org.springframework.web.bind.annotation.RequestParam;
1112
import org.springframework.web.bind.annotation.RestController;
@@ -73,4 +74,15 @@ public String add(User user) {
7374
}
7475
}
7576

77+
@RequestMapping(value = "/delete/{id}")
78+
public String delete(@PathVariable Integer id){
79+
try{
80+
userService.delete(id);
81+
return "success";
82+
}catch (Exception e){
83+
e.printStackTrace();
84+
return "fail";
85+
}
86+
}
87+
7688
}

‎src/main/java/com/study/mapper/ResourcesMapper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ public interface ResourcesMapper extends MyMapper<Resources> {
1111
public List<Resources> queryAll();
1212

1313
public List<Resources> loadUserResources(Map<String,Object> map);
14+
15+
public List<Resources> queryResourcesListWithSelected(Integer rid);
1416
}

‎src/main/java/com/study/model/Resources.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public class Resources {
3939
*/
4040
private Integer sort;
4141

42+
@Transient
43+
private String checked;//是否选中
4244
/**
4345
* @return id
4446
*/
@@ -161,6 +163,14 @@ public void setSort(Integer sort) {
161163
this.sort = sort;
162164
}
163165

166+
public String getChecked() {
167+
return checked;
168+
}
169+
170+
public void setChecked(String checked) {
171+
this.checked = checked;
172+
}
173+
164174
@Override
165175
public String toString() {
166176
return "Resources{" +

‎src/main/java/com/study/model/Role.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class Role {
99

1010
@Column(name = "roleDesc")
1111
private String roledesc;
12-
12+
@Transient
1313
private Integer selected;
1414
/**
1515
* @return id

‎src/main/java/com/study/model/RoleResources.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class RoleResources {
1010

1111
@Id
1212
@Column(name = "resourcesId")
13-
private Integer resourcesid;
13+
private String resourcesid;
1414

1515
/**
1616
* @return roleId
@@ -26,17 +26,11 @@ public void setRoleid(Integer roleid) {
2626
this.roleid = roleid;
2727
}
2828

29-
/**
30-
* @return resourcesId
31-
*/
32-
public Integer getResourcesid() {
29+
public String getResourcesid() {
3330
return resourcesid;
3431
}
3532

36-
/**
37-
* @param resourcesid
38-
*/
39-
public void setResourcesid(Integer resourcesid) {
33+
public void setResourcesid(String resourcesid) {
4034
this.resourcesid = resourcesid;
4135
}
4236
}

‎src/main/java/com/study/service/ResourcesService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ public interface ResourcesService extends IService<Resources> {
1616

1717
public List<Resources> loadUserResources(Map<String,Object> map);
1818

19+
public List<Resources> queryResourcesListWithSelected(Integer rid);
1920
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.study.service;
2+
3+
import com.study.model.RoleResources;
4+
5+
/**
6+
* Created by yangqj on 2017年4月26日.
7+
*/
8+
public interface RoleResourcesService extends IService<RoleResources> {
9+
public void addRoleResources(RoleResources roleResources);
10+
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /