Skip to content

Commit aed8668

Browse files
lmxdawnlmxdawn
committed
管理员管理界面搞定
1 parent 611e110 commit aed8668

19 files changed

+404
-61
lines changed

‎admin-api/src/main/java/com/lmxdawn/admin/controller/HelloController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.lmxdawn.admin.controller;
22

3+
import com.github.pagehelper.PageInfo;
34
import com.lmxdawn.admin.entity.auth.AuthAdmin;
45
import com.lmxdawn.admin.service.auth.AuthAdminService;
56
import com.lmxdawn.admin.utils.ResultVOUtils;
@@ -21,7 +22,7 @@ public ResultVO hello(
2122
@RequestParam(value = "offset") Integer offset
2223
, @RequestParam("offset") Integer limit
2324
) {
24-
PageSimpleVO<AuthAdmin> authAdminPageSimpleVO = authAdminService.listAdminPage(0,1, null);
25+
PageInfo<AuthAdmin> authAdminPageSimpleVO = authAdminService.listAdminPage(0,1, null);
2526
return ResultVOUtils.error(1, "ssss");
2627
// return ResultVOUtils.success(authAdminPageSimpleVO);
2728
}

‎admin-api/src/main/java/com/lmxdawn/admin/controller/admin/auth/AuthAdminController.java

Lines changed: 92 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
package com.lmxdawn.admin.controller.admin.auth;
22

3+
import com.github.pagehelper.PageInfo;
34
import com.lmxdawn.admin.entity.auth.AuthAdmin;
5+
import com.lmxdawn.admin.entity.auth.AuthRoleAdmin;
46
import com.lmxdawn.admin.enums.ResultEnum;
57
import com.lmxdawn.admin.form.admin.auth.AuthAdminForm;
68
import com.lmxdawn.admin.service.auth.AuthAdminService;
9+
import com.lmxdawn.admin.service.auth.AuthRoleAdminService;
710
import com.lmxdawn.admin.service.auth.AuthRoleService;
811
import com.lmxdawn.admin.utils.ResultVOUtils;
12+
import com.lmxdawn.admin.vo.PageSimpleVO;
913
import com.lmxdawn.admin.vo.ResultVO;
14+
import com.lmxdawn.admin.vo.admin.auth.AdminAuthAdminVo;
1015
import org.springframework.beans.BeanUtils;
1116
import org.springframework.validation.BindingResult;
1217
import org.springframework.web.bind.annotation.*;
1318

1419
import javax.annotation.Resource;
1520
import javax.validation.Valid;
16-
import java.util.Date;
17-
import java.util.HashMap;
18-
import java.util.Map;
21+
import java.util.*;
22+
import java.util.stream.Collectors;
1923

2024
/**
2125
* 管理员相关
@@ -29,6 +33,9 @@ public class AuthAdminController {
2933
@Resource
3034
private AuthRoleService authRoleService;
3135

36+
@Resource
37+
private AuthRoleAdminService authRoleAdminService;
38+
3239
/**
3340
* 获取管理员列表
3441
*/
@@ -42,9 +49,40 @@ public ResultVO index(@RequestParam(value = "page",defaultValue = "1") Integer p
4249
Map<String, Object> map = new HashMap<>();
4350
map.put("status", status);
4451
map.put("username", username);
45-
map.put("role_id", roleId);
4652

47-
return ResultVOUtils.success(authAdminService.listAdminPage(page, limit, map));
53+
if (roleId != null) {
54+
List<AuthRoleAdmin> authRoleAdmins = authRoleAdminService.listByRoleId(roleId);
55+
List<Long> ids = new ArrayList<>();
56+
if (authRoleAdmins != null && !authRoleAdmins.isEmpty()) {
57+
ids = authRoleAdmins.stream().map(AuthRoleAdmin::getAdminId).collect(Collectors.toList());
58+
}
59+
map.put("ids", ids);
60+
}
61+
62+
PageInfo<AuthAdmin> authAdminPageInfo = authAdminService.listAdminPage(page, limit, map);
63+
List<Long> adminIds = authAdminPageInfo.getList().stream().map(AuthAdmin::getId).collect(Collectors.toList());
64+
List<AuthRoleAdmin> authRoleAdminList = authRoleAdminService.listByAdminIdIn(adminIds);
65+
66+
// 视图列表
67+
List<AdminAuthAdminVo> adminAuthAdminVoList = new ArrayList<>();
68+
authAdminPageInfo.getList().forEach(v -> {
69+
AdminAuthAdminVo adminAuthAdminVo = new AdminAuthAdminVo();
70+
BeanUtils.copyProperties(v, adminAuthAdminVo);
71+
List<Long> roles = new ArrayList<>();
72+
authRoleAdminList.forEach(authRoleAdmin -> {
73+
if (v.getId().equals(authRoleAdmin.getAdminId())) {
74+
roles.add(authRoleAdmin.getRoleId());
75+
}
76+
});
77+
adminAuthAdminVo.setRoles(roles);
78+
adminAuthAdminVoList.add(adminAuthAdminVo);
79+
});
80+
81+
PageSimpleVO<AdminAuthAdminVo> authAdminPageSimpleVO = new PageSimpleVO<>();
82+
authAdminPageSimpleVO.setTotal(authAdminPageInfo.getTotal());
83+
authAdminPageSimpleVO.setList(adminAuthAdminVoList);
84+
85+
return ResultVOUtils.success(authAdminPageSimpleVO);
4886

4987
}
5088

@@ -75,11 +113,56 @@ public ResultVO save(@RequestBody @Valid AuthAdminForm authAdminForm,
75113
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
76114
}
77115

78-
AuthAdmin authAdmin = new AuthAdmin();
79-
BeanUtils.copyProperties(authAdminForm, authAdmin);
80116

81-
authAdminService.insertAuthAdmin(authAdmin);
82-
return ResultVOUtils.success(authAdmin);
117+
AuthAdmin authAdmin = authAdminService.insertAuthAdminForm(authAdminForm);
118+
119+
AdminAuthAdminVo adminAuthAdminVo = new AdminAuthAdminVo();
120+
BeanUtils.copyProperties(authAdmin, adminAuthAdminVo);
121+
adminAuthAdminVo.setRoles(authAdminForm.getRoles());
122+
123+
return ResultVOUtils.success(adminAuthAdminVo);
124+
}
125+
126+
/**
127+
* 修改
128+
* @return
129+
*/
130+
@PostMapping("/admin/auth/admin/edit")
131+
public ResultVO edit(@RequestBody @Valid AuthAdminForm authAdminForm,
132+
BindingResult bindingResult) {
133+
134+
if (bindingResult.hasErrors()) {
135+
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
136+
}
137+
138+
if (authAdminForm.getId() == null) {
139+
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！");
140+
}
141+
142+
boolean b = authAdminService.updateAuthAdminForm(authAdminForm);
143+
if (!b) {
144+
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "网络错误！");
145+
}
146+
return ResultVOUtils.success();
147+
}
148+
149+
/**
150+
* 删除
151+
* @return
152+
*/
153+
@PostMapping("/admin/auth/admin/delete")
154+
public ResultVO delete(@RequestBody AuthAdminForm authAdminForm) {
155+
156+
if (authAdminForm.getId() == null) {
157+
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！");
158+
}
159+
160+
boolean b = authAdminService.deleteById(authAdminForm.getId());
161+
if (!b) {
162+
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
163+
}
164+
165+
return ResultVOUtils.success();
83166
}
84167

85168

‎admin-api/src/main/java/com/lmxdawn/admin/dao/auth/AuthAdminDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ public interface AuthAdminDao {
5555
* @param id
5656
* @return
5757
*/
58-
boolean delete(Long id);
58+
boolean deleteById(Long id);
5959

6060
}

‎admin-api/src/main/java/com/lmxdawn/admin/dao/auth/AuthRoleAdminDao.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,32 @@ public interface AuthRoleAdminDao {
1616
*/
1717
List<AuthRoleAdmin> listByAdminId(Long adminId);
1818

19+
/**
20+
* 根据 多个 adminId 查询
21+
* @param adminIds 传入的 adminIds
22+
* @return
23+
*/
24+
List<AuthRoleAdmin> listByAdminIdIn(List<Long> adminIds);
25+
1926
/**
2027
* 根据 role_id 查询 admin_id
2128
* @param roleId 传入的 roleId
2229
* @return
2330
*/
2431
List<AuthRoleAdmin> listByRoleId(Long roleId);
2532

33+
/**
34+
* 批量插入
35+
* @param authRoleAdminList
36+
* @return
37+
*/
38+
int insertAuthRoleAdminAll(List<AuthRoleAdmin> authRoleAdminList);
39+
40+
41+
/**
42+
* 根据 adminId 删除
43+
* @param adminId
44+
* @return
45+
*/
46+
boolean deleteByAdminId(Long adminId);
2647
}

‎admin-api/src/main/java/com/lmxdawn/admin/entity/auth/AuthAdmin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ public class AuthAdmin {
2222
// 性别
2323
private Integer sex;
2424
// 最后登录ip
25-
private String last_login_ip;
25+
private String lastLoginIp;
2626
// 最后登录时间
27-
private Date last_login_time;
27+
private Date lastLoginTime;
2828
// 创建时间
29-
private Date create_time;
29+
private Date createTime;
3030
// 状态
3131
private Integer status;
3232

‎admin-api/src/main/java/com/lmxdawn/admin/entity/auth/AuthRoleAdmin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@Data
99
public class AuthRoleAdmin {
1010

11-
private long roleId;
12-
private long adminId;
11+
private Long roleId;
12+
private Long adminId;
1313

1414
}

‎admin-api/src/main/java/com/lmxdawn/admin/form/admin/auth/AuthAdminForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ public class AuthAdminForm {
2121
// 状态
2222
@NotNull(message = "请选择状态")
2323
private Integer status;
24-
24+
// 角色ids
2525
private List<Long> roles;
2626
}

‎admin-api/src/main/java/com/lmxdawn/admin/service/auth/AuthAdminService.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package com.lmxdawn.admin.service.auth;
22

33

4+
import com.github.pagehelper.PageInfo;
45
import com.lmxdawn.admin.entity.auth.AuthAdmin;
5-
import com.lmxdawn.admin.vo.PageSimpleVO;
6+
import com.lmxdawn.admin.form.admin.auth.AuthAdminForm;
67

78
import java.util.Map;
89

910
public interface AuthAdminService {
1011

11-
PageSimpleVO<AuthAdmin> listAdminPage(Integer page, Integer limit, Map<String, Object> map);
12+
PageInfo<AuthAdmin> listAdminPage(Integer page, Integer limit, Map<String, Object> map);
1213

1314
AuthAdmin findByUserName(String userName);
1415

@@ -20,6 +21,12 @@ public interface AuthAdminService {
2021

2122
boolean insertAuthAdmin(AuthAdmin authAdmin);
2223

24+
AuthAdmin insertAuthAdminForm(AuthAdminForm authAdminForm);
25+
2326
boolean updateAuthAdmin(AuthAdmin authAdmin);
2427

28+
boolean updateAuthAdminForm(AuthAdminForm authAdminForm);
29+
30+
boolean deleteById(Long id);
31+
2532
}

‎admin-api/src/main/java/com/lmxdawn/admin/service/auth/AuthRoleAdminService.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ public interface AuthRoleAdminService {
99

1010
List<AuthRoleAdmin> listByAdminId(Long adminId);
1111

12+
List<AuthRoleAdmin> listByAdminIdIn(List<Long> adminIds);
13+
1214
List<AuthRoleAdmin> listByRoleId(Long roleId);
1315

16+
int insertAuthRoleAdminAll(List<AuthRoleAdmin> authRoleAdminList);
17+
18+
int insertRolesAdminIdAll(List<Long> roles, Long adminId);
19+
20+
boolean deleteByAdminId(Long adminId);
21+
1422
}

0 commit comments

Comments
 (0)