From 77e54aec65693683bc2b9ac50e08df6a06c53493 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期三, 22 四月 2026 17:03:38 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/common/web/AuthController.java | 74 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 103fb78..6302db4 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -1,8 +1,8 @@
package com.zy.common.web;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
@@ -18,7 +18,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
/**
@@ -59,9 +59,9 @@
res.put("token", Cools.enToken(System.currentTimeMillis() + username, superPwd));
return R.ok(res);
}
- EntityWrapper<User> userWrapper = new EntityWrapper<>();
+ QueryWrapper<User> userWrapper = new QueryWrapper<>();
userWrapper.eq("username", username);
- User user = userService.selectOne(userWrapper);
+ User user = userService.getOne(userWrapper);
if (Cools.isEmpty(user)){
return R.parse(CodeRes.USER_10001);
}
@@ -72,12 +72,12 @@
return R.parse(CodeRes.USER_10003);
}
String token = Cools.enToken(System.currentTimeMillis() + username, user.getPassword());
- userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()));
+ userLoginService.remove(new QueryWrapper<UserLogin>().eq("user_id", user.getId()));
UserLogin userLogin = new UserLogin();
userLogin.setUserId(user.getId());
userLogin.setToken(token);
userLogin.setCreateTime(new Date());
- userLoginService.insert(userLogin);
+ userLoginService.save(userLogin);
Map<String, Object> res = new HashMap<>();
res.put("username", user.getUsername());
res.put("token", token);
@@ -114,7 +114,7 @@
@RequestMapping("/user/detail/auth")
@ManagerAuth
public R userDetail(){
- return R.ok(userService.selectById(getUserId()));
+ return R.ok(userService.getById(getUserId()));
}
// @RequestMapping("/menu/auth")
@@ -125,25 +125,25 @@
// User user = null;
// Wrapper<Resource> resourceWrapper;
// if (getUserId() == 9527) {
-// oneLevel = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).orderBy("sort"));
-// resourceWrapper = new EntityWrapper<Resource>().eq("level", 2).eq("status", 1).orderBy("sort");
+// oneLevel = resourceService.list(new QueryWrapper<Resource>().eq("level", 1).orderBy("sort"));
+// resourceWrapper = new QueryWrapper<Resource>().eq("level", 2).eq("status", 1).orderBy("sort");
// } else {
// // 婵�娲荤爜楠岃瘉
// if (!SystemProperties.SYSTEM_ACTIVATION) {
// return R.ok();
// }
-// oneLevel = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
+// oneLevel = resourceService.list(new QueryWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
// // 鑾峰彇褰撳墠鐢ㄦ埛鐨勬墍鏈変簩绾ц彍鍗�
-// user = userService.selectById(getUserId());
-// List<RoleResource> roleResources = roleResourceService.selectList(new EntityWrapper<RoleResource>().eq("role_id", user.getRoleId()));
+// user = userService.getById(getUserId());
+// List<RoleResource> roleResources = roleResourceService.list(new QueryWrapper<RoleResource>().eq("role_id", user.getRoleId()));
// List<Long> resourceIds = new ArrayList<>();
// roleResources.forEach(roleResource -> resourceIds.add(roleResource.getResourceId()));
// if (resourceIds.isEmpty()){
// return R.ok();
// }
-// resourceWrapper = new EntityWrapper<Resource>().in("id", resourceIds).eq("level", 2).eq("status", 1).orderBy("sort");
+// resourceWrapper = new QueryWrapper<Resource>().in("id", resourceIds).eq("level", 2).eq("status", 1).orderBy("sort");
// }
-// List<Resource> twoLevel = resourceService.selectList(resourceWrapper);
+// List<Resource> twoLevel = resourceService.list(resourceWrapper);
// List<Map<String, Object>> result = new ArrayList<>();
// for (Resource menu : oneLevel) {
// Map<String, Object> map = new HashMap<>();
@@ -155,12 +155,12 @@
//
// // 鏄惁鎷ユ湁鏌ョ湅鏉冮檺
// if (getUserId() != 9527) {
-// Resource view = resourceService.selectOne(new EntityWrapper<Resource>().eq("resource_id", resource.getId()).like("code", "#view"));
+// Resource view = resourceService.getOne(new QueryWrapper<Resource>().eq("resource_id", resource.getId()).like("code", "#view"));
// if (!Cools.isEmpty(view)){
// RoleResource param = new RoleResource();
// param.setResourceId(view.getId());
// param.setRoleId(user.getRoleId());
-// if (null == roleResourceService.selectOne(new EntityWrapper<>(param))){
+// if (null == roleResourceService.getOne(new QueryWrapper<>(param))){
// continue;
// }
// }
@@ -186,7 +186,7 @@
@RequestMapping("/power/list/auth")
@ManagerAuth
public R powerList(){
- List<Resource> oneLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
+ List<Resource> oneLevels = resourceService.list(new QueryWrapper<Resource>().eq("level", 1).eq("status", 1).orderByAsc("sort"));
List<Map> result = new ArrayList<>();
// 涓�绾�
for (Resource oneLevel : oneLevels){
@@ -196,7 +196,7 @@
oneLevelMap.put("id", oneLevel.getId());
oneLevelMap.put("spread", true);
oneLevelMap.put("children", twoLevelsList);
- List<Resource> twoLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("resource_id", oneLevel.getId()).eq("level", 2).eq("status", 1).orderBy("sort"));
+ List<Resource> twoLevels = resourceService.list(new QueryWrapper<Resource>().eq("resource_id", oneLevel.getId()).eq("level", 2).eq("status", 1).orderByAsc("sort"));
// 浜岀骇
for (Resource twoLevel : twoLevels){
Map<String, Object> twoLevelMap = new HashMap<>();
@@ -207,7 +207,7 @@
List<Map> threeLevelsList = new ArrayList<>();
twoLevelMap.put("children", threeLevelsList);
// 涓夌骇
- List<Resource> threeLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("resource_id", twoLevel.getId()).eq("level", 3).eq("status", 1).orderBy("sort"));
+ List<Resource> threeLevels = resourceService.list(new QueryWrapper<Resource>().eq("resource_id", twoLevel.getId()).eq("level", 3).eq("status", 1).orderByAsc("sort"));
for (Resource threeLevel : threeLevels){
Map<String, Object> threeLevelMap = new HashMap<>();
threeLevelMap.put("title", threeLevel.getName());
@@ -228,7 +228,7 @@
functions.put("spread", true);
List<Map> funcs = new ArrayList<>();
functions.put("children", funcs);
- List<Permission> permissions = permissionService.selectList(new EntityWrapper<Permission>().eq("status", 1));
+ List<Permission> permissions = permissionService.list(new QueryWrapper<Permission>().eq("status", 1));
for (Permission permission : permissions) {
Map<String, Object> func = new HashMap<>();
func.put("title", permission.getName());
@@ -246,9 +246,9 @@
public R get(@PathVariable("roleId") Long roleId) {
List<Object> result = new ArrayList<>();
// 鑿滃崟
- List<RoleResource> roleResources = roleResourceService.selectList(new EntityWrapper<RoleResource>().eq("role_id", roleId));
+ List<RoleResource> roleResources = roleResourceService.list(new QueryWrapper<RoleResource>().eq("role_id", roleId));
for (RoleResource roleResource : roleResources){
- Resource resource = resourceService.selectById(roleResource.getResourceId());
+ Resource resource = resourceService.getById(roleResource.getResourceId());
if (!Cools.isEmpty(resource)){
if (resource.getLevel() == 3){
result.add(resource.getId());
@@ -256,9 +256,9 @@
}
}
// 鍔熻兘
- List<RolePermission> rolePermissions = rolePermissionService.selectList(new EntityWrapper<RolePermission>().eq("role_id", roleId));
+ List<RolePermission> rolePermissions = rolePermissionService.list(new QueryWrapper<RolePermission>().eq("role_id", roleId));
for (RolePermission rolePermission : rolePermissions){
- Permission permission = permissionService.selectById(rolePermission.getPermissionId());
+ Permission permission = permissionService.getById(rolePermission.getPermissionId());
if (!Cools.isEmpty(permission)){
result.add(permission.getAction());
}
@@ -270,18 +270,18 @@
@ManagerAuth(memo = "鎺堟潈")
@Transactional
public R power(Long roleId, String powers){
- Role role = roleService.selectById(roleId);
+ Role role = roleService.getById(roleId);
Long leaderId = role.getLeader();
- roleResourceService.delete(new EntityWrapper<RoleResource>().eq("role_id", roleId));
- rolePermissionService.delete(new EntityWrapper<RolePermission>().eq("role_id", roleId));
+ roleResourceService.remove(new QueryWrapper<RoleResource>().eq("role_id", roleId));
+ rolePermissionService.remove(new QueryWrapper<RolePermission>().eq("role_id", roleId));
if (!Cools.isEmpty(powers)){
List<PowerDto> dtos = JSON.parseArray(powers, PowerDto.class);
for (PowerDto dto : dtos) {
- Resource resource = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2));
+ Resource resource = resourceService.getOne(new QueryWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2));
if (!Cools.isEmpty(resource)) {
// 鏍￠獙涓婄骇鏉冮檺
if (leaderId != null) {
- RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource.getId()));
+ RoleResource roleResource = roleResourceService.getOne(new QueryWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource.getId()));
if (null == roleResource) {
throw new CoolException(resource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
}
@@ -289,22 +289,22 @@
RoleResource roleResource = new RoleResource();
roleResource.setRoleId(roleId);
roleResource.setResourceId(resource.getId());
- roleResourceService.insert(roleResource);
+ roleResourceService.save(roleResource);
} else {
- Permission permission = permissionService.selectOne(new EntityWrapper<Permission>().eq("action", dto.getTwo()));
+ Permission permission = permissionService.getOne(new QueryWrapper<Permission>().eq("action", dto.getTwo()));
if (!Cools.isEmpty(permission)){
RolePermission rolePermission = new RolePermission();
rolePermission.setRoleId(roleId);
rolePermission.setPermissionId(permission.getId());
- rolePermissionService.insert(rolePermission);
+ rolePermissionService.save(rolePermission);
}
}
for (String three : dto.getThree()){
- Resource resource1 = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", three).eq("level", 3));
+ Resource resource1 = resourceService.getOne(new QueryWrapper<Resource>().eq("id", three).eq("level", 3));
if (!Cools.isEmpty(resource1)) {
// 鏍￠獙涓婄骇鏉冮檺
if (leaderId != null) {
- RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource1.getId()));
+ RoleResource roleResource = roleResourceService.getOne(new QueryWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource1.getId()));
if (null == roleResource) {
throw new CoolException(resource.getName().concat("鐨�").concat(resource1.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName())));
}
@@ -312,7 +312,7 @@
RoleResource roleResource = new RoleResource();
roleResource.setRoleId(roleId);
roleResource.setResourceId(resource1.getId());
- roleResourceService.insert(roleResource);
+ roleResourceService.save(roleResource);
}
}
}
@@ -325,7 +325,7 @@
public R buttonResource(@PathVariable("resourceId") Long resourceId) {
List<Resource> resources;
if (getUserId() == 9527) {
- resources = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 3).eq("resource_id", resourceId));
+ resources = resourceService.list(new QueryWrapper<Resource>().eq("level", 3).eq("resource_id", resourceId));
} else {
resources = roleResourceService.getMenuButtomResource(resourceId, getUserId());
}
--
Gitblit v1.9.1