yexuejc007/PlayEdu
1
0
Fork 0
mirror of https://github.com/PlayEdu/PlayEdu synced 2025-12-21 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

代码优化

Browse Source
This commit is contained in:
none
2023-02-23 15:20:39 +08:00
parent b1022fde0a
commit e7d335eb88
12 changed files with 219 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/xyz/playedu/api/controller/backend/AdminRoleController.java
View File

@@ -106,9 +106,10 @@ public class AdminRoleController {
roleService.updateById(newRole);
// 先清空已有的权限
rolePermissionService.removeRolePermissionsByRoleId(role.getId());
if (request.getPermissionIds().length > 0) {
// 先清空已有的权限
rolePermissionService.removeRolePermissionsByRoleId(role.getId());
// 重新关联权限
List<AdminRolePermission> rolePermissions = new ArrayList<>();
for (int i = 0; i < request.getPermissionIds().length; i++) {

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

@@ -149,10 +149,10 @@ public class AdminUserController {
return JsonResponse.error("更新管理员资料失败");
}
if (request.getRoleIds().length > 0) {
// 先删除管理员与权限的已有关联关系
userRoleService.removeUserRolesByUserId(adminUser.getId());
// 先删除管理员与权限的已有关联关系
userRoleService.removeUserRolesByUserId(adminUser.getId());
if (request.getRoleIds().length > 0) {
// 重新绑定关联关系
List<AdminUserRole> userRoles = new ArrayList<>();
for (int i = 0; i < request.getRoleIds().length; i++) {

4
src/main/java/xyz/playedu/api/controller/backend/LoginController.java
View File

@@ -37,7 +37,7 @@ public class LoginController {
private JWTService jwtService;
@Autowired
private ApplicationContext applicationContext;
private ApplicationContext context;
@PostMapping("/login")
@ImageCaptchaCheckMiddleware
@@ -61,7 +61,7 @@ public class LoginController {
data.put("token", token.getToken());
data.put("expire", token.getExpire());
applicationContext.publishEvent(new AdminUserLoginEvent(this, adminUser.getId(), new Date(), token.getToken(), IpUtil.getIpAddress(), adminUser.getLoginTimes()));
context.publishEvent(new AdminUserLoginEvent(this, adminUser.getId(), new Date(), token.getToken(), IpUtil.getIpAddress(), adminUser.getLoginTimes()));
return JsonResponse.data(data);
}

53
src/main/java/xyz/playedu/api/controller/backend/UserController.java
View File

@@ -3,21 +3,26 @@ package xyz.playedu.api.controller.backend;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
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.User;
import xyz.playedu.api.domain.UserDepartment;
import xyz.playedu.api.event.UserDestroyEvent;
import xyz.playedu.api.middleware.BackendPermissionMiddleware;
import xyz.playedu.api.request.backend.UserRequest;
import xyz.playedu.api.service.UserDepartmentService;
import xyz.playedu.api.service.UserService;
import xyz.playedu.api.types.JsonResponse;
import xyz.playedu.api.types.paginate.PaginationResult;
import xyz.playedu.api.types.paginate.UserPaginateFilter;
import xyz.playedu.api.util.HelperUtil;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
/**
* @Author 杭州白书科技有限公司
@@ -32,23 +37,14 @@ public class UserController {
private UserService userService;
@Autowired
private ApplicationContext applicationContext;
private UserDepartmentService userDepartmentService;
@Autowired
private ApplicationContext context;
@BackendPermissionMiddleware(slug = BPermissionConstant.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,
@RequestParam(name = "email", required = false) String email,
@RequestParam(name = "nickname", required = false) String nickname,
@RequestParam(name = "id_card", required = false) String idCard,
@RequestParam(name = "is_active", required = false) Integer isActive,
@RequestParam(name = "is_lock", required = false) Integer isLock,
@RequestParam(name = "is_verify", required = false) Integer isVerify,
@RequestParam(name = "is_set_password", required = false) Integer isSetPassword,
@RequestParam(name = "created_at", required = false) Date[] createdAt
) {
public JsonResponse index(@RequestParam(name = "page", defaultValue = "1") Integer page, @RequestParam(name = "size", defaultValue = "10") Integer size, @RequestParam(name = "name", required = false) String name, @RequestParam(name = "email", required = false) String email, @RequestParam(name = "nickname", required = false) String nickname, @RequestParam(name = "id_card", required = false) String idCard, @RequestParam(name = "is_active", required = false) Integer isActive, @RequestParam(name = "is_lock", required = false) Integer isLock, @RequestParam(name = "is_verify", required = false) Integer isVerify, @RequestParam(name = "is_set_password", required = false) Integer isSetPassword, @RequestParam(name = "created_at", required = false) Date[] createdAt) {
UserPaginateFilter filter = new UserPaginateFilter();
if (name != null && name.length() > 0) {
filter.setName(name);
@@ -90,6 +86,7 @@ public class UserController {
@BackendPermissionMiddleware(slug = BPermissionConstant.USER_STORE)
@PostMapping("/create")
@Transactional
public JsonResponse store(@RequestBody @Validated UserRequest request) {
if (userService.emailIsExists(request.getEmail())) {
return JsonResponse.error("邮箱已存在");
@@ -120,6 +117,17 @@ public class UserController {
userService.save(user);
if (request.getDepIds() != null && request.getDepIds().length > 0) {
List<UserDepartment> userDepartments = new ArrayList<>();
for (int i = 0; i < request.getDepIds().length; i++) {
UserDepartment userDepartment = new UserDepartment();
userDepartment.setUserId(user.getId());
userDepartment.setDepId(request.getDepIds()[i]);
userDepartments.add(userDepartment);
}
userDepartmentService.saveBatch(userDepartments);
}
return JsonResponse.success();
}
@@ -139,6 +147,7 @@ public class UserController {
@BackendPermissionMiddleware(slug = BPermissionConstant.USER_UPDATE)
@PutMapping("/{id}")
@Transactional
public JsonResponse update(@PathVariable(name = "id") Integer id, @RequestBody @Validated UserRequest request) {
User user = userService.getById(id);
if (user == null) {
@@ -173,6 +182,20 @@ public class UserController {
userService.updateById(newUser);
//先删除关联关系
userDepartmentService.removeByUserId(user.getId());
if (request.getDepIds() != null && request.getDepIds().length > 0) { //重新建立关系
List<UserDepartment> userDepartments = new ArrayList<>();
for (int i = 0; i < request.getDepIds().length; i++) {
UserDepartment userDepartment = new UserDepartment();
userDepartment.setUserId(user.getId());
userDepartment.setDepId(request.getDepIds()[i]);
userDepartments.add(userDepartment);
}
userDepartmentService.saveBatch(userDepartments);
}
return JsonResponse.success();
}
@@ -185,7 +208,7 @@ public class UserController {
}
userService.removeById(user.getId());
applicationContext.publishEvent(new UserDestroyEvent(this, user.getId(), new Date()));
context.publishEvent(new UserDestroyEvent(this, user.getId(), new Date()));
return JsonResponse.success();
}