From 76f04dd38f90aad6abf82d2dccba031d4d9108cf Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 5 Jul 2023 22:07:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=80=BB=E8=AE=B0=E5=BD=95=E6=95=B0=E6=95=B0=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../top/charles7c/cnadmin/common/model/vo/PageDataVO.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java index 68898c2d..5c26bbdf 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java @@ -55,7 +55,7 @@ public class PageDataVO implements Serializable { * 总记录数 */ @Schema(description = "总记录数") - private Long total; + private int total; /** * 基于 MyBatis Plus 分页数据构建分页信息，并将源数据转换为指定类型数据 @@ -76,7 +76,7 @@ public class PageDataVO implements Serializable { } PageDataVO pageDataVO = new PageDataVO<>(); pageDataVO.setList(BeanUtil.copyToList(page.getRecords(), targetClass)); - pageDataVO.setTotal(page.getTotal()); + pageDataVO.setTotal((int) page.getTotal()); return pageDataVO; } @@ -95,7 +95,7 @@ public class PageDataVO implements Serializable { } PageDataVO pageDataVO = new PageDataVO<>(); pageDataVO.setList(page.getRecords()); - pageDataVO.setTotal(page.getTotal()); + pageDataVO.setTotal((int) page.getTotal()); return pageDataVO; } @@ -118,7 +118,7 @@ public class PageDataVO implements Serializable { return pageDataVO; } - pageDataVO.setTotal((long)list.size()); + pageDataVO.setTotal(list.size()); // 对列表数据进行分页 int fromIndex = (page - 1) * size; int toIndex = page * size + size; From 104f69e8a09ce36163f6f9680b2d8d61bb45f11a Mon Sep 17 00:00:00 2001 From: bisheng Date: Thu, 6 Jul 2023 14:17:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E8=8E=B7=E5=8F=96=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- continew-admin-ui/src/store/modules/dict/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/continew-admin-ui/src/store/modules/dict/index.ts b/continew-admin-ui/src/store/modules/dict/index.ts index 908c4378..2aed7faf 100644 --- a/continew-admin-ui/src/store/modules/dict/index.ts +++ b/continew-admin-ui/src/store/modules/dict/index.ts @@ -6,7 +6,7 @@ const useDictStore = defineStore('dict', { actions: { // 获取字典 getDict(_name: string) { - if (_name === null && _name === '') { + if (_name == null || _name === '') { return null; } try { From b0b1127b5bd39e9bc431e9fa9c86201bbc18e891 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 19 Jul 2023 23:05:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=20BaseControlle?= =?UTF-8?q?r=20=E4=B8=AD=E9=83=A8=E5=88=86=E6=9D=83=E9=99=90=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cnadmin/common/base/BaseController.java | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java index 08de753c..22c504f9 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.common.base; +import static top.charles7c.cnadmin.common.annotation.CrudRequestMapping.Api; + import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -76,7 +78,7 @@ public abstract class BaseController, V, D, Q, @ResponseBody @GetMapping public R> page(@Validated Q query, @Validated PageQuery pageQuery) { - this.checkPermission("list"); + this.checkPermission(Api.LIST); PageDataVO pageDataVO = baseService.page(query, pageQuery); return R.ok(pageDataVO); } @@ -94,7 +96,7 @@ public abstract class BaseController, V, D, Q, @ResponseBody @GetMapping("/tree") public R>> tree(@Validated Q query, @Validated SortQuery sortQuery) { - this.checkPermission("list"); + this.checkPermission(Api.LIST); List> list = baseService.tree(query, sortQuery, false); return R.ok(list); } @@ -112,7 +114,7 @@ public abstract class BaseController, V, D, Q, @ResponseBody @GetMapping("/list") public R> list(@Validated Q query, @Validated SortQuery sortQuery) { - this.checkPermission("list"); + this.checkPermission(Api.LIST); List list = baseService.list(query, sortQuery); return R.ok(list); } @@ -129,7 +131,7 @@ public abstract class BaseController, V, D, Q, @ResponseBody @GetMapping("/{id}") public R get(@PathVariable Long id) { - this.checkPermission("list"); + this.checkPermission(Api.LIST); D detail = baseService.get(id); return R.ok(detail); } @@ -145,7 +147,7 @@ public abstract class BaseController, V, D, Q, @ResponseBody @PostMapping public R add(@Validated(BaseRequest.Add.class) @RequestBody C request) { - this.checkPermission("add"); + this.checkPermission(Api.ADD); Long id = baseService.add(request); return R.ok("新增成功", id); } @@ -163,7 +165,7 @@ public abstract class BaseController, V, D, Q, @ResponseBody @PutMapping("/{id}") public R update(@Validated(BaseRequest.Update.class) @RequestBody C request, @PathVariable Long id) { - this.checkPermission("update"); + this.checkPermission(Api.UPDATE); baseService.update(request, id); return R.ok("修改成功"); } @@ -180,7 +182,7 @@ public abstract class BaseController, V, D, Q, @ResponseBody @DeleteMapping("/{ids}") public R delete(@PathVariable List ids) { - this.checkPermission("delete"); + this.checkPermission(Api.DELETE); baseService.delete(ids); return R.ok("删除成功"); } @@ -198,20 +200,20 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "导出数据") @GetMapping("/export") public void export(@Validated Q query, @Validated SortQuery sortQuery, HttpServletResponse response) { - this.checkPermission("export"); + this.checkPermission(Api.EXPORT); baseService.export(query, sortQuery, response); } /** - * 权限认证 + * 根据 API 类型进行权限验证 * - * @param subPermission - * 部分权限码 + * @param api + * API 类型 */ - private void checkPermission(String subPermission) { + private void checkPermission(Api api) { CrudRequestMapping crudRequestMapping = this.getClass().getDeclaredAnnotation(CrudRequestMapping.class); String path = crudRequestMapping.value(); String permissionPrefix = String.join(StringConsts.COLON, StrUtil.splitTrim(path, StringConsts.SLASH)); - StpUtil.checkPermission(String.format("%s:%s", permissionPrefix, subPermission)); + StpUtil.checkPermission(String.format("%s:%s", permissionPrefix, api.name().toLowerCase())); } } From 4a8af1f72d9249afa1c013e08674f492f453b020 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 19 Jul 2023 23:11:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=20ID=20=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E6=98=B5?= =?UTF-8?q?=E7=A7=B0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../charles7c/cnadmin/system/mapper/UserMapper.java | 10 ++++++++++ .../cnadmin/system/service/impl/UserServiceImpl.java | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/UserMapper.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/UserMapper.java index 76e84851..978b4ed0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/UserMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/UserMapper.java @@ -54,4 +54,14 @@ public interface UserMapper extends BaseMapper { */ @Select("SELECT * FROM `sys_user` WHERE `username` = #{username}") UserDO selectByUsername(@Param("username") String username); + + /** + * 根据 ID 查询昵称 + * + * @param id + * ID + * @return 昵称 + */ + @Select("SELECT `nickname` FROM `sys_user` WHERE `id` = #{id}") + String selectNicknameById(@Param("id") Long id); } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java index eaf95993..1c73d9af 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java @@ -248,7 +248,7 @@ public class UserServiceImpl extends BaseServiceImpl