yexuejc007/PlayEdu
1
0
Fork 0
mirror of https://github.com/PlayEdu/PlayEdu synced 2025-12-16 16:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

user代码优化

Browse Source
This commit is contained in:
none
2023-02-25 10:12:49 +08:00
parent de0279f250
commit 75fa2abb32
6 changed files with 178 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java
View File

@@ -1,26 +1,23 @@
package xyz.playedu.api.controller.backend;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import xyz.playedu.api.constant.BPermissionConstant;
import xyz.playedu.api.domain.AdminRole;
import xyz.playedu.api.domain.AdminUser;
import xyz.playedu.api.domain.AdminUserRole;
import xyz.playedu.api.exception.NotFoundException;
import xyz.playedu.api.exception.ServiceException;
import xyz.playedu.api.middleware.BackendPermissionMiddleware;
import xyz.playedu.api.request.backend.AdminUserRequest;
import xyz.playedu.api.service.AdminRoleService;
import xyz.playedu.api.service.AdminUserRoleService;
import xyz.playedu.api.service.AdminUserService;
import xyz.playedu.api.types.paginate.AdminUserPaginateFilter;
import xyz.playedu.api.types.paginate.PaginationResult;
import xyz.playedu.api.types.JsonResponse;
import xyz.playedu.api.util.HelperUtil;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -35,16 +32,13 @@ public class AdminUserController {
@Autowired
private AdminRoleService roleService;
@Autowired
private AdminUserRoleService userRoleService;
@BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_USER_INDEX)
@GetMapping("/index")
public JsonResponse Index(
@RequestParam(name = "page", defaultValue = "1") Integer page,
@RequestParam(name = "size", defaultValue = "10") Integer size,
@RequestParam(name = "name", required = false) String name
) {
public JsonResponse Index(@RequestParam HashMap<String, Object> params) {
Integer page = MapUtils.getInteger(params, "page", 1);
Integer size = MapUtils.getInteger(params, "size", 10);
String name = MapUtils.getString(params, "name");
AdminUserPaginateFilter filter = new AdminUserPaginateFilter();
if (name != null && name.length() > 0) {
filter.setName(name);
@@ -59,122 +53,50 @@ public class AdminUserController {
@GetMapping("/create")
public JsonResponse create() {
List<AdminRole> roles = roleService.list();
HashMap<String, Object> data = new HashMap<>();
data.put("roles", roles);
return JsonResponse.data(data);
}
@BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_USER_STORE)
@PostMapping("/create")
@Transactional
public JsonResponse store(@RequestBody @Validated AdminUserRequest request) {
if (request.getPassword() == null || request.getPassword().length() == 0) {
public JsonResponse store(@RequestBody @Validated AdminUserRequest req) throws ServiceException {
if (req.getPassword() == null || req.getPassword().length() == 0) {
return JsonResponse.error("请输入密码");
}
if (adminUserService.findByEmail(request.getEmail()) != null) {
return JsonResponse.error("邮箱已存在");
}
String salt = HelperUtil.randomString(6);
AdminUser adminUser = new AdminUser();
adminUser.setName(request.getName());
adminUser.setEmail(request.getEmail());
adminUser.setSalt(salt);
adminUser.setPassword(HelperUtil.MD5(request.getPassword() + salt));
adminUser.setIsBanLogin(request.getIsBanLogin());
adminUser.setCreatedAt(new Date());
adminUser.setUpdatedAt(new Date());
if (!adminUserService.save(adminUser)) {
return JsonResponse.error("添加管理员失败");
}
if (request.getRoleIds().length > 0) {
List<AdminUserRole> userRoles = new ArrayList<>();
for (int i = 0; i < request.getRoleIds().length; i++) {
AdminUserRole userRole = new AdminUserRole();
userRole.setAdminId(adminUser.getId());
userRole.setRoleId(request.getRoleIds()[i]);
userRoles.add(userRole);
}
userRoleService.saveBatch(userRoles);
}
adminUserService.createWithRoleIds(req.getName(), req.getEmail(), req.getPassword(), req.getIsBanLogin(), req.getRoleIds());
return JsonResponse.success();
}
@BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_USER_UPDATE)
@GetMapping("/{id}")
public JsonResponse edit(@PathVariable Integer id) {
AdminUser adminUser = adminUserService.findById(id);
if (adminUser == null) {
return JsonResponse.error("管理员不存在");
}
adminUser.setPassword(null);
adminUser.setSalt(null);
return JsonResponse.data(adminUser);
public JsonResponse edit(@PathVariable Integer id) throws NotFoundException {
AdminUser adminUser = adminUserService.findOrFail(id);
List<Integer> roleIds = adminUserService.getRoleIdsByUserId(adminUser.getId());
HashMap<String, Object> data = new HashMap<>();
data.put("user", adminUser);
data.put("role_ids", roleIds);
return JsonResponse.data(data);
}
@BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_USER_UPDATE)
@PutMapping("/{id}")
@Transactional
public JsonResponse update(@PathVariable Integer id, @RequestBody @Validated AdminUserRequest request) {
AdminUser adminUser = adminUserService.findById(id);
if (adminUser == null) {
return JsonResponse.error("管理员不存在");
}
AdminUser updateAdminUser = new AdminUser();
updateAdminUser.setId(adminUser.getId());
if (!adminUser.getEmail().equals(request.getEmail())) {//更换了邮箱
if (adminUserService.findByEmail(request.getEmail()) != null) {
return JsonResponse.error("邮箱已存在");
}
updateAdminUser.setEmail(request.getEmail());
}
if (request.getPassword() != null && request.getPassword().length() > 0) {//更换了密码
updateAdminUser.setPassword(HelperUtil.MD5(request.getPassword() + adminUser.getSalt()));
}
if (!request.getName().equals(adminUser.getName())) {//更换了姓名
updateAdminUser.setName(request.getName());
}
if (!adminUserService.updateById(updateAdminUser)) {
return JsonResponse.error("更新管理员资料失败");
}
// 先删除管理员与权限的已有关联关系
userRoleService.removeUserRolesByUserId(adminUser.getId());
if (request.getRoleIds().length > 0) {
// 重新绑定关联关系
List<AdminUserRole> userRoles = new ArrayList<>();
for (int i = 0; i < request.getRoleIds().length; i++) {
AdminUserRole userRole = new AdminUserRole();
userRole.setAdminId(adminUser.getId());
userRole.setRoleId(request.getRoleIds()[i]);
userRoles.add(userRole);
}
userRoleService.saveBatch(userRoles);
}
public JsonResponse update(@PathVariable Integer id, @RequestBody @Validated AdminUserRequest req) throws NotFoundException, ServiceException {
AdminUser adminUser = adminUserService.findOrFail(id);
adminUserService.updateWithRoleIds(adminUser, req.getName(), req.getEmail(), req.getPassword(), req.getIsBanLogin(), req.getRoleIds());
return JsonResponse.success();
}
@BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_USER_DESTROY)
@DeleteMapping("/{id}")
@Transactional
public JsonResponse destroy(@PathVariable Integer id) {
if (!adminUserService.removeById(id)) {
return JsonResponse.error("删除管理员失败");
}
userRoleService.removeUserRolesByUserId(id);
adminUserService.removeWithRoleIds(id);
return JsonResponse.success();
}