From 53df9cb143e1ee40a2f8740fa0b001eda0ea7b71 Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Wed, 16 Oct 2024 22:41:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=A2=9E):=20=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8B=A6=E6=88=AA=E5=99=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=B8=BB=E9=94=AE=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/vms/web/columns.vm | 1 - .../service/exception/GlobalExceptionHandler.java | 9 +++++++-- .../cn/bunny/dao/dto/system/rolePower/PowerAddDto.java | 3 +-- .../cn/bunny/services/controller/PowerController.java | 4 ++-- .../services/controller/SchedulersController.java | 10 +++++----- .../bunny/services/service/impl/PowerServiceImpl.java | 2 -- service/src/main/resources/application-dev.yml | 4 ++-- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/common/common-generator/src/main/resources/vms/web/columns.vm b/common/common-generator/src/main/resources/vms/web/columns.vm index 7b34297..0b0dc7d 100644 --- a/common/common-generator/src/main/resources/vms/web/columns.vm +++ b/common/common-generator/src/main/resources/vms/web/columns.vm @@ -5,7 +5,6 @@ import { $t } from '@/plugins/i18n'; export const columns: TableColumnList = [ { type: 'selection', align: 'left' }, { type: 'index', index: (index: number) => index + 1, label: '序号', width: 60 }, -{ label: $t('id'), prop: 'id' }, #foreach($field in $baseFieldList) // $field.annotation { label: $t('${lowercaseName}_$field.name'), prop: '$field.name' }, diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java b/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java index 1ae83fd..71cb5a8 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java @@ -24,8 +24,6 @@ public class GlobalExceptionHandler { @ExceptionHandler(BunnyException.class) @ResponseBody public Result exceptionHandler(BunnyException exception) { - log.error("GlobalExceptionHandler===>自定义异常信息：{}", exception.getMessage()); - Integer code = exception.getCode() != null ? exception.getCode() : 500; return Result.error(null, code, exception.getMessage()); } @@ -52,6 +50,13 @@ public class GlobalExceptionHandler { return Result.error(null, 500, dataTooLongErrorMatcher.group(1) + " 字段数据过大"); } + // 主键冲突 + String primaryKeyError = "Duplicate entry '(.*?)' for key .*"; + Matcher primaryKeyErrorMatcher = Pattern.compile(primaryKeyError).matcher(message); + if (primaryKeyErrorMatcher.find()) { + return Result.error(null, 500, "主键值" + primaryKeyErrorMatcher.group(1) + "已存在"); + } + return Result.error(null, 500, "服务器异常"); } diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerAddDto.java index 7049de5..faddd66 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerAddDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerAddDto.java @@ -16,9 +16,8 @@ import lombok.NoArgsConstructor; public class PowerAddDto { @Schema(name = "id", title = "主键") - @NotNull(message = "id不能为空") private Long id; - + @Schema(name = "parentId", title = "父级id") private Long parentId; diff --git a/service/src/main/java/cn/bunny/services/controller/PowerController.java b/service/src/main/java/cn/bunny/services/controller/PowerController.java index 94d4cbd..b7baa3e 100644 --- a/service/src/main/java/cn/bunny/services/controller/PowerController.java +++ b/service/src/main/java/cn/bunny/services/controller/PowerController.java @@ -59,9 +59,9 @@ public class PowerController { @Operation(summary = "添加权限", description = "添加权限") @PostMapping("addPower") - public Mono> addPower(@Valid @RequestBody PowerAddDto dto) { + public Result addPower(@Valid @RequestBody PowerAddDto dto) { powerService.addPower(dto); - return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS)); + return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新权限", description = "更新权限") diff --git a/service/src/main/java/cn/bunny/services/controller/SchedulersController.java b/service/src/main/java/cn/bunny/services/controller/SchedulersController.java index f08bcfa..f4d790e 100644 --- a/service/src/main/java/cn/bunny/services/controller/SchedulersController.java +++ b/service/src/main/java/cn/bunny/services/controller/SchedulersController.java @@ -37,7 +37,7 @@ public class SchedulersController { @Autowired private SchedulersService schedulersService; - @Operation(summary = "分页查询Schedulers视图", description = "分页查询Schedulers视图") + @Operation(summary = "分页查询视图", description = "分页查询视图") @GetMapping("getSchedulersList/{page}/{limit}") public Mono>> getSchedulersList( @Parameter(name = "page", description = "当前页", required = true) @@ -57,28 +57,28 @@ public class SchedulersController { return Mono.just(Result.success(mapList)); } - @Operation(summary = "添加Schedulers任务", description = "添加Schedulers任务") + @Operation(summary = "添加任务", description = "添加任务") @PostMapping("addSchedulers") public Mono> addSchedulers(@Valid @RequestBody SchedulersAddDto dto) { schedulersService.addSchedulers(dto); return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS)); } - @Operation(summary = "暂停Schedulers任务", description = "暂停任务") + @Operation(summary = "暂停任务", description = "暂停任务") @PutMapping("/pauseScheduler") public Result pause(@RequestBody SchedulersOperationDto dto) { schedulersService.pauseScheduler(dto); return Result.success(); } - @Operation(summary = "恢复Schedulers任务", description = "恢复任务") + @Operation(summary = "恢复任务", description = "恢复任务") @PutMapping("/resumeScheduler") public Result resume(@RequestBody SchedulersOperationDto dto) { schedulersService.resumeScheduler(dto); return Result.success(); } - @Operation(summary = "删除Schedulers任务", description = "删除任务") + @Operation(summary = "删除任务", description = "删除任务") @DeleteMapping("/deleteSchedulers") public Mono> deleteSchedulers(@RequestBody SchedulersOperationDto dto) { schedulersService.deleteSchedulers(dto); diff --git a/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java index 30e521b..0c1efe0 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java @@ -76,8 +76,6 @@ public class PowerServiceImpl extends ServiceImpl implements // 添加权限时确保权限码和请求地址是唯一的 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(Power::getPowerCode, dto.getPowerCode()) - .or() - .eq(Power::getPowerName, dto.getPowerName()) .or() .eq(Power::getRequestUrl, dto.getRequestUrl()); List powerList = list(wrapper); diff --git a/service/src/main/resources/application-dev.yml b/service/src/main/resources/application-dev.yml index d994dca..93c1bca 100644 --- a/service/src/main/resources/application-dev.yml +++ b/service/src/main/resources/application-dev.yml @@ -17,8 +17,8 @@ mybatis-plus: global-config: db-config: logic-delete-field: isDeleted - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 查看日志 +# configuration: +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 查看日志 # rabbitmq: # host: ${bunny.rabbitmq.host}