zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化：优化新增关键词 create => add

Browse Source
This commit is contained in:
Charles7c 2023-02-26 22:26:17 +08:00
parent a79b3e0e96
commit 72e5522952
14 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java
View File

@ -117,7 +117,7 @@ public abstract class BaseController<S extends BaseService<V, D, Q, C>, V, D, Q,
@Operation(summary = "新增数据")
@ResponseBody
@PostMapping
protected R<Long> add(@Validated(BaseRequest.Create.class) @RequestBody C request) {
protected R<Long> add(@Validated(BaseRequest.Add.class) @RequestBody C request) {
Long id = baseService.add(request);
return R.ok("新增成功", id);
}

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseRequest.java
View File

@ -36,7 +36,7 @@ public class BaseRequest implements Serializable {
/**
* 分组校验-创建
*/
public interface Create extends Default {}
public interface Add extends Default {}
/**
* 分组校验-修改

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java
View File

@ -45,7 +45,7 @@ public class DeptRequest extends BaseRequest {
* 部门 ID
*/
@Schema(description = "部门 ID")
@Null(message = "新增时，ID 必须为空", groups = Create.class)
@Null(message = "新增时，ID 必须为空", groups = Add.class)
@NotNull(message = "修改时，ID 不能为空", groups = Update.class)
private Long deptId;

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java
View File

@ -44,7 +44,7 @@ public class MenuRequest extends BaseRequest {
* 菜单 ID
*/
@Schema(description = "菜单 ID")
@Null(message = "新增时，ID 必须为空", groups = Create.class)
@Null(message = "新增时，ID 必须为空", groups = Add.class)
@NotNull(message = "修改时，ID 不能为空", groups = Update.class)
private Long menuId;

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/PostRequest.java
View File

@ -45,7 +45,7 @@ public class PostRequest extends BaseRequest {
* 岗位 ID
*/
@Schema(description = "岗位 ID")
@Null(message = "新增时，ID 必须为空", groups = Create.class)
@Null(message = "新增时，ID 必须为空", groups = Add.class)
@NotNull(message = "修改时，ID 不能为空", groups = Update.class)
private Long postId;

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java
View File

@ -48,7 +48,7 @@ public class RoleRequest extends BaseRequest {
* 角色 ID
*/
@Schema(description = "角色 ID")
@Null(message = "新增时，ID 必须为空", groups = Create.class)
@Null(message = "新增时，ID 必须为空", groups = Add.class)
@NotNull(message = "修改时，ID 不能为空", groups = Update.class)
private Long roleId;

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java
View File

@ -48,7 +48,7 @@ public class UserRequest extends BaseRequest {
* 用户 ID
*/
@Schema(description = "角色 ID")
@Null(message = "新增时，ID 必须为空", groups = Create.class)
@Null(message = "新增时，ID 必须为空", groups = Add.class)
@NotNull(message = "修改时，ID 不能为空", groups = Update.class)
private Long userId;

4
continew-admin-ui/src/views/system/dept/index.vue
View File

@ -42,7 +42,7 @@
<a-row>
<a-col :span="12">
<a-space>
<a-button type="primary" @click="toCreate">
<a-button type="primary" @click="toAdd">
<template #icon><icon-plus /></template>新增
</a-button>
<a-button
@ -361,7 +361,7 @@
/**
* 打开新增对话框
*/
const toCreate = () => {
const toAdd = () => {
reset();
listDeptTree({}).then((res) => {
treeData.value = res.data;

4
continew-admin-ui/src/views/system/menu/index.vue
View File

@ -42,7 +42,7 @@
<a-row>
<a-col :span="12">
<a-space>
<a-button type="primary" @click="toCreate">
<a-button type="primary" @click="toAdd">
<template #icon><icon-plus /></template>新增
</a-button>
<a-button
@ -404,7 +404,7 @@
/**
* 打开新增对话框
*/
const toCreate = () => {
const toAdd = () => {
reset();
listMenuTree({}).then((res) => {
treeData.value = res.data;

4
continew-admin-ui/src/views/system/post/index.vue
View File

@ -42,7 +42,7 @@
<a-row>
<a-col :span="12">
<a-space>
<a-button type="primary" @click="toCreate">
<a-button type="primary" @click="toAdd">
<template #icon><icon-plus /></template>新增
</a-button>
<a-button
@ -342,7 +342,7 @@
/**
* 打开新增对话框
*/
const toCreate = () => {
const toAdd = () => {
reset();
title.value = '新增岗位';
visible.value = true;

4
continew-admin-ui/src/views/system/role/index.vue
View File

@ -42,7 +42,7 @@
<a-row>
<a-col :span="12">
<a-space>
<a-button type="primary" @click="toCreate">
<a-button type="primary" @click="toAdd">
<template #icon><icon-plus /></template>新增
</a-button>
<a-button
@ -470,7 +470,7 @@
/**
* 打开新增对话框
*/
const toCreate = () => {
const toAdd = () => {
reset();
getMenuTree();
title.value = '新增角色';

4
continew-admin-ui/src/views/system/user/index.vue
View File

@ -62,7 +62,7 @@
<a-row>
<a-col :span="12">
<a-space>
<a-button type="primary" @click="toCreate">
<a-button type="primary" @click="toAdd">
<template #icon><icon-plus /></template>新增
</a-button>
<a-button
@ -603,7 +603,7 @@
/**
* 打开新增对话框
*/
const toCreate = () => {
const toAdd = () => {
reset();
getDeptOptions();
getPostOptions();

2
continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserController.java
View File

@ -50,7 +50,7 @@ import top.charles7c.cnadmin.system.service.UserService;
public class UserController extends BaseController<UserService, UserVO, UserDetailVO, UserQuery, UserRequest> {
@Override
protected R<Long> add(@Validated(BaseRequest.Create.class) @RequestBody UserRequest request) {
protected R<Long> add(@Validated(BaseRequest.Add.class) @RequestBody UserRequest request) {
Long id = baseService.add(request);
return R.ok(String.format("新增成功，请牢记默认密码：%s", Constants.DEFAULT_PASSWORD), id);
}

10
continew-admin-webapi/src/main/resources/db/changelog/v0.0.1/continew-admin_data.sql
View File

@ -4,29 +4,29 @@
-- 初始化默认菜单
INSERT IGNORE INTO `sys_menu` VALUES (1000, '系统管理', 0, 1, 'system', NULL, NULL, 'settings', b'0', b'0', b'0', NULL, 1, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1010, '用户管理', 1000, 2, '/system/user', 'User', '/system/user/index', NULL, b'0', b'0', b'0', 'system:user:list', 1, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1011, '用户新增', 1010, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:user:create', 1, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1011, '用户新增', 1010, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:user:add', 1, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1012, '用户修改', 1010, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:user:update', 2, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1013, '用户删除', 1010, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:user:delete', 3, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1014, '用户导出', 1010, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:user:export', 4, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1015, '重置密码', 1010, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:user:password:reset', 5, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1016, '分配角色', 1010, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:user:role:update', 6, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1020, '角色管理', 1000, 2, '/system/role', 'Role', 'system/role/index', NULL, b'0', b'0', b'0', 'system:role:list', 2, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1021, '角色新增', 1020, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:role:create', 1, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1021, '角色新增', 1020, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:role:add', 1, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1022, '角色修改', 1020, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:role:update', 2, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1023, '角色删除', 1020, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:role:delete', 3, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1024, '角色导出', 1020, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:role:export', 4, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1030, '菜单管理', 1000, 2, '/system/menu', 'Menu', 'system/menu/index', NULL, b'0', b'0', b'0', 'system:menu:list', 3, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1031, '菜单新增', 1030, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:menu:create', 1, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1031, '菜单新增', 1030, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:menu:add', 1, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1032, '菜单修改', 1030, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:menu:update', 2, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1033, '菜单删除', 1030, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:menu:delete', 3, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1034, '菜单导出', 1030, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:menu:export', 4, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1040, '部门管理', 1000, 2, '/system/dept', 'Dept', 'system/dept/index', NULL, b'0', b'0', b'0', 'system:dept:list', 4, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1041, '部门新增', 1050, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:dept:create', 1, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1041, '部门新增', 1050, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:dept:add', 1, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1042, '部门修改', 1050, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:dept:update', 2, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1043, '部门删除', 1050, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:dept:delete', 3, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1044, '部门导出', 1050, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:dept:export', 4, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1050, '岗位管理', 1000, 2, '/system/post', 'Post', '/system/post/index', NULL, b'0', b'0', b'0', 'system:post:list', 5, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1051, '岗位新增', 1050, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:post:create', 1, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1051, '岗位新增', 1050, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:post:add', 1, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1052, '岗位修改', 1050, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:post:update', 2, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1053, '岗位删除', 1050, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:post:delete', 3, 1, 1, NOW(), 1, NOW());
INSERT IGNORE INTO `sys_menu` VALUES (1054, '岗位导出', 1050, 3, NULL, NULL, NULL, NULL, b'0', b'0', b'0', 'system:post:export', 4, 1, 1, NOW(), 1, NOW());