Skip to content

Commit 2b49972

Browse files
ChinaLHRChinaLHR
committed
update admin-rolesModule
1 parent 28c62fc commit 2b49972

38 files changed

Lines changed: 1043 additions & 364 deletions

‎.gitignore‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
.idea/
2-
*.classpath
3-
*.project
4-
.settings
5-
.project
6-
.target
7-
.classpath
8-
**/.settings
9-
**/.classpath
10-
**/target/
11-
target/
12-
bin/
13-
*.iml
1+
/.settings
2+
/bin
3+
*/target/*
4+
/logs
5+
*/out/
6+
*.iml
7+
.project
8+
.classpath
9+
.idea
10+
.class
11+
*.class
12+
*.log

‎.idea/workspace.xml‎

Lines changed: 492 additions & 254 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎quark-admin/src/main/java/com/quark/admin/base/BaseController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ protected QuarkAdminResult restProcessor(ResultProcessor processor){
1818
try{
1919
result = processor.process();
2020
}catch (Exception e){
21-
logger.error("Sql Error Log :"+e.getMessage());
21+
logger.error("Error Log :"+e.getLocalizedMessage(),e);
2222
result = QuarkAdminResult.error(SqlErrorEnum.RUNTIMEERROR.getErrorMessage());
2323
}
2424

‎quark-admin/src/main/java/com/quark/admin/controller/AdminUserController.java‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,19 @@
1010
import org.springframework.data.domain.Page;
1111
import org.springframework.web.bind.annotation.*;
1212

13+
import java.util.Arrays;
1314
import java.util.List;
14-
import java.util.stream.Stream;
15-
16-
import static java.util.stream.Collectors.toList;
1715

1816
@RestController
19-
@RequestMapping("admins")
20-
public class AdminUserController extends BaseController{
17+
@RequestMapping("/admins")
18+
public class AdminUserController extends BaseController {
2119

2220
@Autowired
2321
private AdminUserService adminUserService;
2422

2523
/**
2624
* 翻页获取管理员
25+
*
2726
* @param adminUser
2827
* @param draw:请求次数
2928
* @param start
@@ -32,20 +31,20 @@ public class AdminUserController extends BaseController{
3231
*/
3332
@GetMapping
3433
public PageResult getAll(AdminUser adminUser, String draw,
35-
@RequestParam(required = false, defaultValue = "1") int start,
36-
@RequestParam(required = false, defaultValue = "10") int length) {
37-
int pageNo = start/length;
34+
@RequestParam(required = false, defaultValue = "1") int start,
35+
@RequestParam(required = false, defaultValue = "10") int length) {
36+
int pageNo = start / length;
3837
Page<AdminUser> page = adminUserService.findByPage(adminUser, pageNo, length);
39-
PageResult<List<AdminUser>> result = new PageResult<>();
40-
result.setDraw(draw);
41-
result.setRecordsFiltered(page.getTotalElements());
42-
result.setRecordsTotal(page.getTotalElements());
43-
result.setData(page.getContent());
38+
PageResult<List<AdminUser>> result = new PageResult<>(
39+
draw,
40+
page.getTotalElements(),
41+
page.getTotalElements(),
42+
page.getContent());
4443
return result;
4544
}
4645

4746
@PostMapping("/add")
48-
public QuarkAdminResult addAdmin(AdminUser adminUser){
47+
public QuarkAdminResult addAdmin(AdminUser adminUser) {
4948

5049
QuarkAdminResult result = restProcessor(() -> {
5150
if (adminUserService.findByUserName(adminUser.getUsername()) != null)
@@ -58,10 +57,10 @@ public QuarkAdminResult addAdmin(AdminUser adminUser){
5857
}
5958

6059
@PostMapping("/delete")
61-
public QuarkAdminResult deleteAdmin(@RequestParam(value = "id[]") AdminUser[] id){
60+
public QuarkAdminResult deleteAdmin(@RequestParam(value = "id[]") AdminUser[] id) {
6261

6362
QuarkAdminResult result = restProcessor(() -> {
64-
List<AdminUser> collect = Stream.of(id).collect(toList());
63+
List<AdminUser> collect = Arrays.asList(id);
6564
adminUserService.deleteInBatch(collect);
6665
return QuarkAdminResult.ok();
6766
});
@@ -70,7 +69,7 @@ public QuarkAdminResult deleteAdmin(@RequestParam(value = "id[]") AdminUser[] id
7069

7170

7271
@PostMapping("/saveAdminRoles")
73-
public QuarkAdminResult saveAdminRoles(Integer uid, Integer[] id){
72+
public QuarkAdminResult saveAdminRoles(Integer uid, Integer[] id) {
7473

7574
QuarkAdminResult result = restProcessor(() -> {
7675
adminUserService.saveAdminRoles(uid, id);
@@ -80,7 +79,7 @@ public QuarkAdminResult saveAdminRoles(Integer uid, Integer[] id){
8079
}
8180

8281
@PostMapping("/saveAdminEnable")
83-
public QuarkAdminResult saveAdminEnable(@RequestParam(value = "id[]") Integer[] id){
82+
public QuarkAdminResult saveAdminEnable(@RequestParam(value = "id[]") Integer[] id) {
8483
QuarkAdminResult result = restProcessor(() -> {
8584
adminUserService.saveAdminEnable(id);
8685
return QuarkAdminResult.ok();

‎quark-admin/src/main/java/com/quark/admin/controller/PageController.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public String login(HttpServletRequest request, AdminUser user, Model model) {
6060
}
6161
}
6262

63-
@RequestMapping(value = {"/initPage"})
63+
@RequestMapping("/initPage")
6464
public String InitPage(){
6565
return "init";
6666
}
@@ -70,5 +70,15 @@ public String AdminsPage(){
7070
return "admin/admins";
7171
}
7272

73+
@RequestMapping("/permissionsPage")
74+
public String PermissionPage(){
75+
return "permission/permissions";
76+
}
77+
78+
@RequestMapping("/rolesPage")
79+
public String RolesPage(){
80+
return "role/roles";
81+
}
82+
7383

7484
}

‎quark-admin/src/main/java/com/quark/admin/controller/PermissionController.java‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,41 @@
11
package com.quark.admin.controller;
22

3+
import com.quark.admin.base.BaseController;
4+
import com.quark.admin.dto.QuarkAdminResult;
35
import com.quark.admin.service.PermissionService;
46
import com.quark.common.entity.Permission;
57
import org.apache.shiro.SecurityUtils;
8+
import org.springframework.beans.factory.annotation.Autowired;
9+
import org.springframework.web.bind.annotation.PostMapping;
610
import org.springframework.web.bind.annotation.RequestMapping;
711
import org.springframework.web.bind.annotation.RestController;
812

9-
import javax.annotation.Resource;
1013
import java.util.List;
1114

1215
/**
1316
* Created by lhr on 17-8-3.
1417
*/
1518
@RestController
16-
@RequestMapping("/permission")
17-
public class PermissionController {
18-
@Resource
19+
@RequestMapping("/permissions")
20+
public class PermissionController extends BaseController{
21+
@Autowired
1922
private PermissionService permissionService;
2023

21-
@RequestMapping("/loadMenu")
24+
@PostMapping("/loadMenu")
2225
public List<Permission> loadMenu(){
2326
Integer userid = (Integer) SecurityUtils.getSubject().getSession().getAttribute("AdminSessionId");
2427
List<Permission> list = permissionService.loadUserPermissionByType(userid,1);
2528
return list;
2629
}
30+
31+
@PostMapping("/PermissionWithSelected")
32+
public QuarkAdminResult PermissionWithSelected(Integer roleId){
33+
QuarkAdminResult result = restProcessor(() -> {
34+
List<Permission> data = permissionService.findPermissionsAndSelected(roleId);
35+
return QuarkAdminResult.ok(data);
36+
});
37+
38+
return result;
39+
}
40+
2741
}

‎quark-admin/src/main/java/com/quark/admin/controller/RoleController.java‎

Lines changed: 56 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,78 @@
11
package com.quark.admin.controller;
22

3+
import com.quark.admin.base.BaseController;
4+
import com.quark.admin.dto.PageResult;
35
import com.quark.admin.dto.QuarkAdminResult;
46
import com.quark.admin.service.RoleService;
7+
import com.quark.common.entity.Permission;
8+
import com.quark.common.entity.Role;
59
import org.springframework.beans.factory.annotation.Autowired;
6-
import org.springframework.web.bind.annotation.PostMapping;
7-
import org.springframework.web.bind.annotation.RequestMapping;
8-
import org.springframework.web.bind.annotation.RestController;
10+
import org.springframework.data.domain.Page;
11+
import org.springframework.web.bind.annotation.*;
12+
13+
import java.util.Arrays;
14+
import java.util.List;
915

1016
/**
1117
* @Author LHR
1218
* Create By 2017/8/12
1319
*/
1420
@RestController
15-
@RequestMapping("roles")
16-
public class RoleController {
21+
@RequestMapping("/roles")
22+
public class RoleController extends BaseController {
1723

1824
@Autowired
1925
private RoleService roleService;
2026

27+
@GetMapping
28+
public PageResult getAll(Role role, String draw,
29+
@RequestParam(required = false, defaultValue = "1") int start,
30+
@RequestParam(required = false, defaultValue = "10") int length) {
31+
int pageNo = start / length;
32+
Page<Role> page = roleService.findByPage(role, pageNo, length);
33+
PageResult<List<Role>> result = new PageResult<>(
34+
draw,
35+
page.getTotalElements(),
36+
page.getTotalElements(),
37+
page.getContent());
38+
39+
return result;
40+
}
2141

2242
@PostMapping("/rolesWithSelected")
23-
public QuarkAdminResult rolesWithSelected(Integer uid){
43+
public QuarkAdminResult rolesWithSelected(Integer uid) {
2444
QuarkAdminResult result = roleService.findRolesAndSelected(uid);
2545
return result;
2646
}
2747

48+
@PostMapping("/add")
49+
public QuarkAdminResult add(Role role) {
50+
QuarkAdminResult result = restProcessor(() -> {
51+
roleService.save(role);
52+
return QuarkAdminResult.ok();
53+
});
54+
return result;
55+
}
56+
57+
@PostMapping("/delete")
58+
public QuarkAdminResult delete(@RequestParam(value = "id[]") Role[] id){
59+
QuarkAdminResult result = restProcessor(() -> {
60+
roleService.deleteInBatch(Arrays.asList(id));
61+
return QuarkAdminResult.ok();
62+
});
63+
64+
return result;
65+
}
66+
67+
@PostMapping("/saveRolePermission")
68+
public QuarkAdminResult saveRolePermission(Integer roleid, @RequestParam(value = "pers[]") Permission[] pers){
69+
70+
QuarkAdminResult result = restProcessor(() -> {
71+
roleService.saveRolePermission(roleid, pers);
72+
return QuarkAdminResult.ok();
73+
});
74+
75+
return result;
76+
}
77+
2878
}

‎quark-admin/src/main/java/com/quark/admin/dto/PageResult.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,12 @@ public T getData() {
5252
public void setData(T data) {
5353
this.data = data;
5454
}
55+
56+
public PageResult(String draw, Long recordsTotal, Long recordsFiltered, T data) {
57+
this.draw = draw;
58+
this.recordsTotal = recordsTotal;
59+
this.recordsFiltered = recordsFiltered;
60+
this.data = data;
61+
}
62+
5563
}

‎quark-admin/src/main/java/com/quark/admin/service/PermissionService.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,13 @@ public interface PermissionService extends BaseService<Permission>{
2424
* @return
2525
*/
2626
List<Permission> loadUserPermissionByType(Integer id,Integer type);
27-
List<Permission> findByPage(int pageNo, int pageSize);
27+
28+
/**
29+
* 根据角色ID查询用户权限
30+
* @param id
31+
* @return
32+
*/
33+
List<Permission> findPermissionsAndSelected(Integer id);
34+
35+
2836
}

‎quark-admin/src/main/java/com/quark/admin/service/RoleService.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,36 @@
22

33
import com.quark.admin.dto.QuarkAdminResult;
44
import com.quark.common.Base.BaseService;
5+
import com.quark.common.entity.Permission;
56
import com.quark.common.entity.Role;
7+
import org.springframework.data.domain.Page;
68

79
/**
810
* Created by lhr on 17-8-1.
911
*/
1012
public interface RoleService extends BaseService<Role> {
1113

14+
/**
15+
* 根据用户id查询用户的角色
16+
*
17+
* @param id
18+
* @return
19+
*/
1220
QuarkAdminResult findRolesAndSelected(Integer id);
21+
22+
/**
23+
* 翻页查询
24+
* @param role
25+
* @param pageNo
26+
* @param length
27+
* @return
28+
*/
29+
Page<Role> findByPage(Role role, int pageNo, int length);
30+
31+
/**
32+
* 保存角色的权限
33+
* @param roleid
34+
* @param pers
35+
*/
36+
void saveRolePermission(Integer roleid, Permission[] pers);
1337
}

0 commit comments

Comments
 (0)