Skip to content

Commit ba5790a

Browse files
author
pedro
committed
feat:合并Reqiured和Meta注解
1 parent 41d97e2 commit ba5790a

5 files changed

Lines changed: 25 additions & 55 deletions

File tree

‎src/main/java/io/github/talelin/merak/controller/cms/AdminController.java‎

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package io.github.talelin.merak.controller.cms;
22

33
import com.baomidou.mybatisplus.core.metadata.IPage;
4-
import io.github.talelin.core.annotation.AdminRequired;
5-
import io.github.talelin.core.annotation.RouteMeta;
4+
import io.github.talelin.core.annotation.AdminMeta;
65
import io.github.talelin.merak.bo.GroupPermissionsBO;
76
import io.github.talelin.merak.common.utils.ResponseUtil;
87
import io.github.talelin.merak.model.PermissionDO;
@@ -41,16 +40,14 @@ public class AdminController {
4140
private GroupService groupService;
4241

4342
@GetMapping("/permission")
44-
@AdminRequired
45-
@RouteMeta(permission = "查询所有可分配的权限", module = "管理员")
43+
@AdminMeta(permission = "查询所有可分配的权限", module = "管理员")
4644
public Map<String, List<PermissionDO>> getAllPermissions() {
4745
return adminService.getAllStructualPermissions();
4846
}
4947

5048

5149
@GetMapping("/users")
52-
@AdminRequired
53-
@RouteMeta(permission = "查询所有用户", module = "管理员")
50+
@AdminMeta(permission = "查询所有用户", module = "管理员")
5451
public PageResponseVO getUsers(
5552
@RequestParam(name = "group_id", required = false)
5653
@Min(value = 1, message = "{group_id}") Long groupId,
@@ -67,32 +64,28 @@ public PageResponseVO getUsers(
6764
}
6865

6966
@PutMapping("/user/{id}/password")
70-
@AdminRequired
71-
@RouteMeta(permission = "修改用户密码", module = "管理员")
67+
@AdminMeta(permission = "修改用户密码", module = "管理员")
7268
public UnifyResponseVO changeUserPassword(@PathVariable @Positive(message = "{id}") Long id, @RequestBody @Validated ResetPasswordDTO validator) {
7369
adminService.changeUserPassword(id, validator);
7470
return ResponseUtil.generateUnifyResponse(2);
7571
}
7672

7773
@DeleteMapping("/user/{id}")
78-
@AdminRequired
79-
@RouteMeta(permission = "删除用户", module = "管理员")
74+
@AdminMeta(permission = "删除用户", module = "管理员")
8075
public UnifyResponseVO deleteUser(@PathVariable @Positive(message = "{id}") Long id) {
8176
adminService.deleteUser(id);
8277
return ResponseUtil.generateUnifyResponse(3);
8378
}
8479

8580
@PutMapping("/user/{id}")
86-
@AdminRequired
87-
@RouteMeta(permission = "管理员更新用户信息", module = "管理员")
81+
@AdminMeta(permission = "管理员更新用户信息", module = "管理员")
8882
public UnifyResponseVO updateUser(@PathVariable @Positive(message = "{id}") Long id, @RequestBody @Validated UpdateUserInfoDTO validator) {
8983
adminService.updateUserInfo(id, validator);
9084
return ResponseUtil.generateUnifyResponse(4);
9185
}
9286

9387
@GetMapping("/group")
94-
@AdminRequired
95-
@RouteMeta(permission = "查询所有权限组及其权限", module = "管理员")
88+
@AdminMeta(permission = "查询所有权限组及其权限", module = "管理员")
9689
public PageResponseVO getGroups(
9790
@RequestParam(name = "count", required = false, defaultValue = "10")
9891
@Min(value = 1, message = "{count}") Long count,
@@ -103,65 +96,57 @@ public PageResponseVO getGroups(
10396
}
10497

10598
@GetMapping("/group/all")
106-
@AdminRequired
107-
@RouteMeta(permission = "查询所有权限组", module = "管理员")
99+
@AdminMeta(permission = "查询所有权限组", module = "管理员")
108100
public List<GroupDO> getAllGroup() {
109101
List<GroupDO> groups = adminService.getAllGroups();
110102
return groups;
111103
}
112104

113105
@GetMapping("/group/{id}")
114-
@AdminRequired
115-
@RouteMeta(permission = "查询一个权限组及其权限", module = "管理员")
106+
@AdminMeta(permission = "查询一个权限组及其权限", module = "管理员")
116107
public GroupPermissionsBO getGroup(@PathVariable @Positive(message = "{id}") Long id) {
117108
GroupPermissionsBO groupPermissions = adminService.getGroup(id);
118109
return groupPermissions;
119110
}
120111

121112
@PostMapping("/group")
122-
@AdminRequired
123-
@RouteMeta(permission = "新建权限组", module = "管理员")
113+
@AdminMeta(permission = "新建权限组", module = "管理员")
124114
public UnifyResponseVO createGroup(@RequestBody @Validated NewGroupDTO validator) {
125115
adminService.createGroup(validator);
126116
return ResponseUtil.generateUnifyResponse(13);
127117
}
128118

129119
@PutMapping("/group/{id}")
130-
@AdminRequired
131-
@RouteMeta(permission = "更新一个权限组", module = "管理员")
120+
@AdminMeta(permission = "更新一个权限组", module = "管理员")
132121
public UnifyResponseVO updateGroup(@PathVariable @Positive(message = "{id}") Long id,
133122
@RequestBody @Validated UpdateGroupDTO validator) {
134123
adminService.updateGroup(id, validator);
135124
return ResponseUtil.generateUnifyResponse(5);
136125
}
137126

138127
@DeleteMapping("/group/{id}")
139-
@AdminRequired
140-
@RouteMeta(permission = "删除一个权限组", module = "管理员")
128+
@AdminMeta(permission = "删除一个权限组", module = "管理员")
141129
public UnifyResponseVO deleteGroup(@PathVariable @Positive(message = "{id}") Long id) {
142130
adminService.deleteGroup(id);
143131
return ResponseUtil.generateUnifyResponse(6);
144132
}
145133

146134
@PostMapping("/permission/dispatch")
147-
@AdminRequired
148-
@RouteMeta(permission = "分配单个权限", module = "管理员")
135+
@AdminMeta(permission = "分配单个权限", module = "管理员")
149136
public UnifyResponseVO dispatchPermission(@RequestBody @Validated DispatchPermissionDTO validator) {
150137
adminService.dispatchPermission(validator);
151138
return ResponseUtil.generateUnifyResponse(7);
152139
}
153140

154141
@PostMapping("/permission/dispatch/batch")
155-
@AdminRequired
156-
@RouteMeta(permission = "分配多个权限", module = "管理员")
142+
@AdminMeta(permission = "分配多个权限", module = "管理员")
157143
public UnifyResponseVO dispatchPermissions(@RequestBody @Validated DispatchPermissionsDTO validator) {
158144
adminService.dispatchPermissions(validator);
159145
return ResponseUtil.generateUnifyResponse(7);
160146
}
161147

162148
@PostMapping("/permission/remove")
163-
@AdminRequired
164-
@RouteMeta(permission = "删除多个权限", module = "管理员")
149+
@AdminMeta(permission = "删除多个权限", module = "管理员")
165150
public UnifyResponseVO removePermissions(@RequestBody @Validated RemovePermissionsDTO validator) {
166151
adminService.removePermissions(validator);
167152
return ResponseUtil.generateUnifyResponse(8);

‎src/main/java/io/github/talelin/merak/controller/cms/LogController.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package io.github.talelin.merak.controller.cms;
22

33
import com.baomidou.mybatisplus.core.metadata.IPage;
4-
import io.github.talelin.core.annotation.GroupRequired;
5-
import io.github.talelin.core.annotation.RouteMeta;
4+
import io.github.talelin.core.annotation.GroupMeta;
65
import io.github.talelin.merak.common.utils.ResponseUtil;
76
import io.github.talelin.merak.model.LogDO;
87
import io.github.talelin.merak.vo.PageResponseVO;
@@ -27,8 +26,7 @@ public class LogController {
2726
private LogService logService;
2827

2928
@GetMapping("")
30-
@RouteMeta(permission = "查询所有日志", module = "日志", mount = true)
31-
@GroupRequired
29+
@GroupMeta(permission = "查询所有日志", module = "日志", mount = true)
3230
public PageResponseVO getLogs(
3331
@RequestParam(name = "start", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date start,
3432
@RequestParam(name = "end", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date end,
@@ -42,8 +40,7 @@ public PageResponseVO getLogs(
4240
}
4341

4442
@GetMapping("/search")
45-
@RouteMeta(permission = "搜索日志", module = "日志", mount = true)
46-
@GroupRequired
43+
@GroupMeta(permission = "搜索日志", module = "日志", mount = true)
4744
public PageResponseVO searchLogs(
4845
@RequestParam(name = "start", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date start,
4946
@RequestParam(name = "end", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date end,
@@ -58,8 +55,7 @@ public PageResponseVO searchLogs(
5855
}
5956

6057
@GetMapping("/users")
61-
@RouteMeta(permission = "查询日志记录的用户", module = "日志", mount = true)
62-
@GroupRequired
58+
@GroupMeta(permission = "查询日志记录的用户", module = "日志", mount = true)
6359
public PageResponseVO getUsers(
6460
@RequestParam(name = "count", required = false, defaultValue = "10")
6561
@Min(value = 1, message = "{count}") Long count,

‎src/main/java/io/github/talelin/merak/controller/cms/TestController.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ public String index() {
2121
}
2222

2323
@RequestMapping("/json")
24-
@RouteMeta(permission = "测试日志记录", module = "信息", mount = true)
25-
@LoginRequired
24+
@LoginMeta(permission = "测试日志记录", module = "信息", mount = true)
2625
@Logger(template = "{user.nickname}又皮了一波")
2726
public Map getTestMsg() {
2827
Map res = new HashMap();
@@ -31,8 +30,6 @@ public Map getTestMsg() {
3130
}
3231

3332
@RequestMapping("/info")
34-
//@RouteMeta(permission = "查看lin的信息", module = "信息", mount = true)
35-
//@GroupRequired
3633
@GroupMeta(permission = "查看lin的信息", module = "信息", mount = true)
3734
public Map getTestInfo() {
3835
Map res = new HashMap();

‎src/main/java/io/github/talelin/merak/controller/cms/UserController.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package io.github.talelin.merak.controller.cms;
22

3-
import io.github.talelin.core.annotation.AdminRequired;
4-
import io.github.talelin.core.annotation.LoginRequired;
5-
import io.github.talelin.core.annotation.RefreshRequired;
6-
import io.github.talelin.core.annotation.RouteMeta;
3+
import io.github.talelin.core.annotation.*;
74
import io.github.talelin.merak.common.LocalUser;
85
import io.github.talelin.merak.common.utils.ResponseUtil;
96
import io.github.talelin.merak.model.GroupDO;
@@ -15,7 +12,6 @@
1512
import io.github.talelin.merak.vo.UserPermissionsVO;
1613
import io.github.talelin.merak.service.UserService;
1714
import io.github.talelin.core.token.DoubleJWT;
18-
import io.github.talelin.merak.dto.user.*;
1915
import io.github.talelin.core.token.Tokens;
2016
import io.github.talelin.autoconfigure.exception.NotFoundException;
2117
import io.github.talelin.autoconfigure.exception.ParameterException;
@@ -114,8 +110,7 @@ public Tokens getRefreshToken() {
114110
* 查询拥有权限
115111
*/
116112
@GetMapping("/permissions")
117-
@LoginRequired
118-
@RouteMeta(permission = "查询自己拥有的权限", module = "用户", mount = true)
113+
@LoginMeta(permission = "查询自己拥有的权限", module = "用户", mount = true)
119114
public UserPermissionsVO getPermissions() {
120115
UserDO user = LocalUser.getLocalUser();
121116
boolean admin = groupService.checkIsRootByUserId(user.getId());
@@ -128,8 +123,7 @@ public UserPermissionsVO getPermissions() {
128123
/**
129124
* 查询自己信息
130125
*/
131-
@LoginRequired
132-
@RouteMeta(permission = "查询自己信息", module = "用户", mount = true)
126+
@LoginMeta(permission = "查询自己信息", module = "用户", mount = true)
133127
@GetMapping("/information")
134128
public UserInfoVO getInformation() {
135129
UserDO user = LocalUser.getLocalUser();

‎src/main/java/io/github/talelin/merak/controller/v1/BookController.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package io.github.talelin.merak.controller.v1;
22

3+
import io.github.talelin.core.annotation.GroupMeta;
34
import io.github.talelin.merak.model.BookDO;
45
import io.github.talelin.merak.service.BookService;
56
import io.github.talelin.merak.dto.book.CreateOrUpdateBookDTO;
6-
import io.github.talelin.core.annotation.GroupRequired;
7-
import io.github.talelin.core.annotation.RouteMeta;
87
import io.github.talelin.merak.vo.UnifyResponseVO;
98
import io.github.talelin.autoconfigure.exception.NotFoundException;
109
import io.github.talelin.merak.common.utils.ResponseUtil;
@@ -65,8 +64,7 @@ public UnifyResponseVO updateBook(@PathVariable("id") @Positive(message = "{id}"
6564

6665

6766
@DeleteMapping("/{id}")
68-
@RouteMeta(permission = "删除图书", module = "图书", mount = true)
69-
@GroupRequired
67+
@GroupMeta(permission = "删除图书", module = "图书", mount = true)
7068
public UnifyResponseVO deleteBook(@PathVariable("id") @Positive(message = "{id}") Long id) {
7169
BookDO book = bookService.getById(id);
7270
if (book == null) {

0 commit comments

Comments
 (0)