From f2f9eb980aa56f0cd338d71ac63145ae7e9a397f Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Fri, 18 Oct 2024 22:25:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generator/AdminCodeGenerator.java | 8 +-- .../generator/generator/WebGeneratorCode.java | 12 ++-- .../ScheduleExecuteLogDto.java} | 4 +- .../executeLog/QuartzExecuteLogAddDto.java | 55 ----------------- .../executeLog/QuartzExecuteLogUpdateDto.java | 59 ------------------- .../SchedulersGroupAddDto.java | 2 +- .../SchedulersGroupDto.java | 2 +- .../SchedulersGroupUpdateDto.java | 2 +- .../{ => template}/EmailTemplateAddDto.java | 2 +- .../{ => template}/EmailTemplateDto.java | 2 +- .../EmailTemplateUpdateDto.java | 2 +- .../{ => user}/EmailUserUpdateStatusDto.java | 2 +- .../email/{ => user}/EmailUsersAddDto.java | 2 +- .../email/{ => user}/EmailUsersDto.java | 2 +- .../email/{ => user}/EmailUsersUpdateDto.java | 2 +- .../rolePower/{ => power}/PowerAddDto.java | 2 +- .../rolePower/{ => power}/PowerDto.java | 2 +- .../PowerUpdateBatchByParentIdDto.java | 2 +- .../rolePower/{ => power}/PowerUpdateDto.java | 2 +- .../rolePower/{ => role}/RoleAddDto.java | 2 +- .../system/rolePower/{ => role}/RoleDto.java | 2 +- .../rolePower/{ => role}/RoleUpdateDto.java | 2 +- .../ScheduleExecuteLog.java} | 4 +- .../ScheduleExecuteLogJson.java} | 4 +- .../cn/bunny/dao/pojo/common/EmailSend.java | 1 + .../bunny/dao/pojo/common/EmailSendInit.java | 1 + .../EmailTemplateEnums.java} | 6 +- .../bunny/dao/pojo/enums/OperationType.java | 8 --- .../cn/bunny/dao/vo/{ => common}/BaseVo.java | 4 +- .../java/cn/bunny/dao/vo/common/KvData.java | 38 ------------ .../cn/bunny/dao/vo/common/TreeSelectVo.java | 33 ++++++++--- .../java/cn/bunny/dao/vo/i18n/I18nTypeVo.java | 2 +- .../java/cn/bunny/dao/vo/i18n/I18nVo.java | 2 +- .../{quartz => log}/QuartzExecuteLogVo.java | 8 +-- .../java/cn/bunny/dao/vo/system/DeptVo.java | 2 +- .../cn/bunny/dao/vo/system/MenuIconVo.java | 2 +- .../dao/vo/system/email/EmailTemplateVo.java | 2 +- .../dao/vo/system/email/EmailUsersVo.java | 2 +- .../bunny/dao/vo/system/files/FileInfoVo.java | 2 +- .../cn/bunny/dao/vo/system/files/FilesVo.java | 2 +- .../dao/vo/system/rolePower/PowerVo.java | 2 +- .../bunny/dao/vo/system/rolePower/RoleVo.java | 2 +- .../dao/vo/system/router/RouterManageVo.java | 2 +- .../bunny/dao/vo/system/user/AdminUserVo.java | 2 +- .../cn/bunny/dao/vo/system/user/LoginVo.java | 2 +- .../cn/bunny/dao/vo/system/user/UserVo.java | 2 +- .../controller/EmailTemplateController.java | 6 +- .../controller/EmailUsersController.java | 8 +-- .../services/controller/PowerController.java | 8 +-- .../services/controller/RoleController.java | 6 +- ...java => ScheduleExecuteLogController.java} | 20 +++---- .../controller/SchedulersGroupController.java | 6 +- .../bunny/services/factory/EmailFactory.java | 4 +- .../services/mapper/EmailTemplateMapper.java | 2 +- .../services/mapper/EmailUsersMapper.java | 2 +- .../cn/bunny/services/mapper/PowerMapper.java | 2 +- .../cn/bunny/services/mapper/RoleMapper.java | 2 +- ...per.java => ScheduleExecuteLogMapper.java} | 8 +-- .../mapper/SchedulersGroupMapper.java | 2 +- .../service/EmailTemplateService.java | 6 +- .../services/service/EmailUsersService.java | 8 +-- .../bunny/services/service/PowerService.java | 8 +-- .../bunny/services/service/RoleService.java | 6 +- ...ce.java => ScheduleExecuteLogService.java} | 10 ++-- .../service/SchedulersGroupService.java | 6 +- .../impl/EmailTemplateServiceImpl.java | 14 ++--- .../service/impl/EmailUsersServiceImpl.java | 8 +-- .../service/impl/PowerServiceImpl.java | 8 +-- .../service/impl/RoleServiceImpl.java | 6 +- ...ava => ScheduleExecuteLogServiceImpl.java} | 16 ++--- .../impl/SchedulersGroupServiceImpl.java | 6 +- ...apper.xml => ScheduleExecuteLogMapper.xml} | 6 +- 72 files changed, 175 insertions(+), 316 deletions(-) rename dao/src/main/java/cn/bunny/dao/dto/{quartz/executeLog/QuartzExecuteLogDto.java => log/ScheduleExecuteLogDto.java} (92%) delete mode 100644 dao/src/main/java/cn/bunny/dao/dto/quartz/executeLog/QuartzExecuteLogAddDto.java delete mode 100644 dao/src/main/java/cn/bunny/dao/dto/quartz/executeLog/QuartzExecuteLogUpdateDto.java rename dao/src/main/java/cn/bunny/dao/dto/quartz/{scheduleGroup => group}/SchedulersGroupAddDto.java (94%) rename dao/src/main/java/cn/bunny/dao/dto/quartz/{scheduleGroup => group}/SchedulersGroupDto.java (92%) rename dao/src/main/java/cn/bunny/dao/dto/quartz/{scheduleGroup => group}/SchedulersGroupUpdateDto.java (94%) rename dao/src/main/java/cn/bunny/dao/dto/system/email/{ => template}/EmailTemplateAddDto.java (96%) rename dao/src/main/java/cn/bunny/dao/dto/system/email/{ => template}/EmailTemplateDto.java (93%) rename dao/src/main/java/cn/bunny/dao/dto/system/email/{ => template}/EmailTemplateUpdateDto.java (96%) rename dao/src/main/java/cn/bunny/dao/dto/system/email/{ => user}/EmailUserUpdateStatusDto.java (93%) rename dao/src/main/java/cn/bunny/dao/dto/system/email/{ => user}/EmailUsersAddDto.java (96%) rename dao/src/main/java/cn/bunny/dao/dto/system/email/{ => user}/EmailUsersDto.java (94%) rename dao/src/main/java/cn/bunny/dao/dto/system/email/{ => user}/EmailUsersUpdateDto.java (96%) rename dao/src/main/java/cn/bunny/dao/dto/system/rolePower/{ => power}/PowerAddDto.java (95%) rename dao/src/main/java/cn/bunny/dao/dto/system/rolePower/{ => power}/PowerDto.java (92%) rename dao/src/main/java/cn/bunny/dao/dto/system/rolePower/{ => power}/PowerUpdateBatchByParentIdDto.java (94%) rename dao/src/main/java/cn/bunny/dao/dto/system/rolePower/{ => power}/PowerUpdateDto.java (95%) rename dao/src/main/java/cn/bunny/dao/dto/system/rolePower/{ => role}/RoleAddDto.java (94%) rename dao/src/main/java/cn/bunny/dao/dto/system/rolePower/{ => role}/RoleDto.java (91%) rename dao/src/main/java/cn/bunny/dao/dto/system/rolePower/{ => role}/RoleUpdateDto.java (94%) rename dao/src/main/java/cn/bunny/dao/entity/{quartz/QuartzExecuteLog.java => log/ScheduleExecuteLog.java} (93%) rename dao/src/main/java/cn/bunny/dao/entity/{quartz/QuartzExecuteLogJson.java => log/ScheduleExecuteLogJson.java} (91%) rename dao/src/main/java/cn/bunny/dao/pojo/{common/EmailTemplateTypes.java => enums/EmailTemplateEnums.java} (77%) delete mode 100644 dao/src/main/java/cn/bunny/dao/pojo/enums/OperationType.java rename dao/src/main/java/cn/bunny/dao/vo/{ => common}/BaseVo.java (98%) delete mode 100644 dao/src/main/java/cn/bunny/dao/vo/common/KvData.java rename dao/src/main/java/cn/bunny/dao/vo/{quartz => log}/QuartzExecuteLogVo.java (86%) rename service/src/main/java/cn/bunny/services/controller/{QuartzExecuteLogController.java => ScheduleExecuteLogController.java} (74%) rename service/src/main/java/cn/bunny/services/mapper/{QuartzExecuteLogMapper.java => ScheduleExecuteLogMapper.java} (72%) rename service/src/main/java/cn/bunny/services/service/{QuartzExecuteLogService.java => ScheduleExecuteLogService.java} (69%) rename service/src/main/java/cn/bunny/services/service/impl/{QuartzExecuteLogServiceImpl.java => ScheduleExecuteLogServiceImpl.java} (74%) rename service/src/main/resources/mapper/{QuartzExecuteLogMapper.xml => ScheduleExecuteLogMapper.xml} (93%) diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/AdminCodeGenerator.java b/common/common-generator/src/main/java/cn/bunny/common/generator/generator/AdminCodeGenerator.java index b642a72..d061802 100644 --- a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/AdminCodeGenerator.java +++ b/common/common-generator/src/main/java/cn/bunny/common/generator/generator/AdminCodeGenerator.java @@ -14,13 +14,13 @@ public class AdminCodeGenerator { // 作者名称 public static final String author = "Bunny"; // 公共路径 - public static final String outputDir = "D:\\MyFolder\\auth-admin\\auth-server-java\\service"; - // public static final String outputDir = "D:\\Project\\web\\PC\\auth\\auth-server-java\\service"; + // public static final String outputDir = "D:\\MyFolder\\auth-admin\\auth-server-java\\service"; + public static final String outputDir = "D:\\Project\\web\\PC\\auth\\auth-server-java\\service"; // 实体类名称 public static final String entity = "Bunny"; public static void main(String[] args) { - Generation("quartz_execute_log"); + Generation("log_user_login"); } /** @@ -51,7 +51,7 @@ public class AdminCodeGenerator { .strategyConfig(builder -> { // 设置要生成的表名 builder.addInclude(tableName) - .addTablePrefix("sys_", "v_") + .addTablePrefix("sys_", "v_", "log_") .entityBuilder() .enableLombok() .enableChainModel() diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java b/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java index c768d86..1d6f08c 100644 --- a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java +++ b/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java @@ -3,11 +3,9 @@ package cn.bunny.common.generator.generator; import cn.bunny.common.generator.entity.BaseField; import cn.bunny.common.generator.entity.BaseResultMap; import cn.bunny.common.generator.utils.GeneratorCodeUtils; -import cn.bunny.dao.dto.quartz.executeLog.QuartzExecuteLogAddDto; -import cn.bunny.dao.dto.quartz.executeLog.QuartzExecuteLogDto; -import cn.bunny.dao.dto.quartz.executeLog.QuartzExecuteLogUpdateDto; -import cn.bunny.dao.entity.quartz.QuartzExecuteLog; -import cn.bunny.dao.vo.quartz.QuartzExecuteLogVo; +import cn.bunny.dao.dto.log.ScheduleExecuteLogDto; +import cn.bunny.dao.entity.log.ScheduleExecuteLog; +import cn.bunny.dao.vo.log.QuartzExecuteLogVo; import com.baomidou.mybatisplus.annotation.TableName; import com.google.common.base.CaseFormat; import io.swagger.v3.oas.annotations.media.Schema; @@ -51,8 +49,8 @@ public class WebGeneratorCode { public static String resourceMapperPath = "D:\\MyFolder\\auth-admin\\auth-server-java\\service\\src\\main\\resources\\mapper\\"; public static void main(String[] args) throws Exception { - Class originalClass = QuartzExecuteLog.class; - Class dtoClass = QuartzExecuteLogDto.class; + Class originalClass = ScheduleExecuteLog.class; + Class dtoClass = ScheduleExecuteLogDto.class; Class addDtoClass = QuartzExecuteLogAddDto.class; Class updateDtoClass = QuartzExecuteLogUpdateDto.class; Class voClass = QuartzExecuteLogVo.class; diff --git a/dao/src/main/java/cn/bunny/dao/dto/quartz/executeLog/QuartzExecuteLogDto.java b/dao/src/main/java/cn/bunny/dao/dto/log/ScheduleExecuteLogDto.java similarity index 92% rename from dao/src/main/java/cn/bunny/dao/dto/quartz/executeLog/QuartzExecuteLogDto.java rename to dao/src/main/java/cn/bunny/dao/dto/log/ScheduleExecuteLogDto.java index 64840c0..5a493e4 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/quartz/executeLog/QuartzExecuteLogDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/log/ScheduleExecuteLogDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.quartz.executeLog; +package cn.bunny.dao.dto.log; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -13,7 +13,7 @@ import java.time.LocalDateTime; @NoArgsConstructor @Builder @Schema(name = "QuartzExecuteLogDto对象", title = "调度任务执行日志分页查询", description = "调度任务执行日志分页查询") -public class QuartzExecuteLogDto { +public class ScheduleExecuteLogDto { @Schema(name = "jobName", title = "任务名称") private String jobName; diff --git a/dao/src/main/java/cn/bunny/dao/dto/quartz/executeLog/QuartzExecuteLogAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/quartz/executeLog/QuartzExecuteLogAddDto.java deleted file mode 100644 index 03d6e7b..0000000 --- a/dao/src/main/java/cn/bunny/dao/dto/quartz/executeLog/QuartzExecuteLogAddDto.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.bunny.dao.dto.quartz.executeLog; - -import cn.bunny.dao.entity.quartz.QuartzExecuteLogJson; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.time.LocalDateTime; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "QuartzExecuteLogAddDto对象", title = "添加调度任务执行日志", description = "添加调度任务执行日志") -public class QuartzExecuteLogAddDto { - - @Schema(name = "jobName", title = "任务名称") - @NotBlank(message = "任务分组不能为空") - @NotNull(message = "任务分组不能为空") - private String jobName; - - @Schema(name = "jobGroup", title = "任务分组") - @NotBlank(message = "任务分组不能为空") - @NotNull(message = "任务分组不能为空") - private String jobGroup; - - @Schema(name = "jobClassName", title = "执行任务类名") - @NotBlank(message = "任务分组不能为空") - @NotNull(message = "任务分组不能为空") - private String jobClassName; - - @Schema(name = "cronExpression", title = "执行任务core表达式") - @NotBlank(message = "任务分组不能为空") - @NotNull(message = "任务分组不能为空") - private String cronExpression; - - @Schema(name = "triggerName", title = "触发器名称") - @NotBlank(message = "任务分组不能为空") - @NotNull(message = "任务分组不能为空") - private String triggerName; - - @Schema(name = "executeResult", title = "执行结果") - private QuartzExecuteLogJson executeResult; - - @Schema(name = "duration", title = "执行时间") - private Integer duration; - - @Schema(name = "endTime", title = "结束时间") - private LocalDateTime endTime; - -} diff --git a/dao/src/main/java/cn/bunny/dao/dto/quartz/executeLog/QuartzExecuteLogUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/quartz/executeLog/QuartzExecuteLogUpdateDto.java deleted file mode 100644 index f175ce5..0000000 --- a/dao/src/main/java/cn/bunny/dao/dto/quartz/executeLog/QuartzExecuteLogUpdateDto.java +++ /dev/null @@ -1,59 +0,0 @@ -package cn.bunny.dao.dto.quartz.executeLog; - -import cn.bunny.dao.entity.quartz.QuartzExecuteLogJson; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.time.LocalDateTime; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "QuartzExecuteLogUpdateDto对象", title = "更新调度任务执行日志", description = "更新调度任务执行日志") -public class QuartzExecuteLogUpdateDto { - - @Schema(name = "id", title = "主键") - @NotNull(message = "id不能为空") - private Long id; - - @Schema(name = "jobName", title = "任务名称") - @NotBlank(message = "任务分组不能为空") - @NotNull(message = "任务分组不能为空") - private String jobName; - - @Schema(name = "jobGroup", title = "任务分组") - @NotBlank(message = "任务分组不能为空") - @NotNull(message = "任务分组不能为空") - private String jobGroup; - - @Schema(name = "jobClassName", title = "执行任务类名") - @NotBlank(message = "任务分组不能为空") - @NotNull(message = "任务分组不能为空") - private String jobClassName; - - @Schema(name = "cronExpression", title = "执行任务core表达式") - @NotBlank(message = "任务分组不能为空") - @NotNull(message = "任务分组不能为空") - private String cronExpression; - - @Schema(name = "triggerName", title = "触发器名称") - @NotBlank(message = "任务分组不能为空") - @NotNull(message = "任务分组不能为空") - private String triggerName; - - @Schema(name = "executeResult", title = "执行结果") - private QuartzExecuteLogJson executeResult; - - @Schema(name = "duration", title = "执行时间") - private Integer duration; - - @Schema(name = "endTime", title = "结束时间") - private LocalDateTime endTime; - -} \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dao/dto/quartz/scheduleGroup/SchedulersGroupAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/quartz/group/SchedulersGroupAddDto.java similarity index 94% rename from dao/src/main/java/cn/bunny/dao/dto/quartz/scheduleGroup/SchedulersGroupAddDto.java rename to dao/src/main/java/cn/bunny/dao/dto/quartz/group/SchedulersGroupAddDto.java index 1808b4d..b225963 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/quartz/scheduleGroup/SchedulersGroupAddDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/quartz/group/SchedulersGroupAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.quartz.scheduleGroup; +package cn.bunny.dao.dto.quartz.group; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/dao/src/main/java/cn/bunny/dao/dto/quartz/scheduleGroup/SchedulersGroupDto.java b/dao/src/main/java/cn/bunny/dao/dto/quartz/group/SchedulersGroupDto.java similarity index 92% rename from dao/src/main/java/cn/bunny/dao/dto/quartz/scheduleGroup/SchedulersGroupDto.java rename to dao/src/main/java/cn/bunny/dao/dto/quartz/group/SchedulersGroupDto.java index 293f1f4..dc36c78 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/quartz/scheduleGroup/SchedulersGroupDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/quartz/group/SchedulersGroupDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.quartz.scheduleGroup; +package cn.bunny.dao.dto.quartz.group; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/dao/src/main/java/cn/bunny/dao/dto/quartz/scheduleGroup/SchedulersGroupUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/quartz/group/SchedulersGroupUpdateDto.java similarity index 94% rename from dao/src/main/java/cn/bunny/dao/dto/quartz/scheduleGroup/SchedulersGroupUpdateDto.java rename to dao/src/main/java/cn/bunny/dao/dto/quartz/group/SchedulersGroupUpdateDto.java index 2245a58..725a5ed 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/quartz/scheduleGroup/SchedulersGroupUpdateDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/quartz/group/SchedulersGroupUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.quartz.scheduleGroup; +package cn.bunny.dao.dto.quartz.group; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailTemplateAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/email/template/EmailTemplateAddDto.java similarity index 96% rename from dao/src/main/java/cn/bunny/dao/dto/system/email/EmailTemplateAddDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/email/template/EmailTemplateAddDto.java index 696784d..1c7ba6a 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailTemplateAddDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/email/template/EmailTemplateAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.email; +package cn.bunny.dao.dto.system.email.template; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailTemplateDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/email/template/EmailTemplateDto.java similarity index 93% rename from dao/src/main/java/cn/bunny/dao/dto/system/email/EmailTemplateDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/email/template/EmailTemplateDto.java index bc93a62..0ae196a 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailTemplateDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/email/template/EmailTemplateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.email; +package cn.bunny.dao.dto.system.email.template; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailTemplateUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/email/template/EmailTemplateUpdateDto.java similarity index 96% rename from dao/src/main/java/cn/bunny/dao/dto/system/email/EmailTemplateUpdateDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/email/template/EmailTemplateUpdateDto.java index 0b30f46..0985fd9 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailTemplateUpdateDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/email/template/EmailTemplateUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.email; +package cn.bunny.dao.dto.system.email.template; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUserUpdateStatusDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUserUpdateStatusDto.java similarity index 93% rename from dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUserUpdateStatusDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUserUpdateStatusDto.java index a4c4bd5..c5b2cd9 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUserUpdateStatusDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUserUpdateStatusDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.email; +package cn.bunny.dao.dto.system.email.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUsersAddDto.java similarity index 96% rename from dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersAddDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUsersAddDto.java index e38e0b7..e555967 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersAddDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUsersAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.email; +package cn.bunny.dao.dto.system.email.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUsersDto.java similarity index 94% rename from dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUsersDto.java index 5780dc0..db194e8 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUsersDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.email; +package cn.bunny.dao.dto.system.email.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUsersUpdateDto.java similarity index 96% rename from dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersUpdateDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUsersUpdateDto.java index e6867ee..771e7be 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersUpdateDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/email/user/EmailUsersUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.email; +package cn.bunny.dao.dto.system.email.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; 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/power/PowerAddDto.java similarity index 95% rename from dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerAddDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/rolePower/power/PowerAddDto.java index faddd66..bc41978 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/power/PowerAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.rolePower; +package cn.bunny.dao.dto.system.rolePower.power; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/power/PowerDto.java similarity index 92% rename from dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/rolePower/power/PowerDto.java index ad46bd6..c05d3d4 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/power/PowerDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.rolePower; +package cn.bunny.dao.dto.system.rolePower.power; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerUpdateBatchByParentIdDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/power/PowerUpdateBatchByParentIdDto.java similarity index 94% rename from dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerUpdateBatchByParentIdDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/rolePower/power/PowerUpdateBatchByParentIdDto.java index ffe1092..ff0603b 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerUpdateBatchByParentIdDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/power/PowerUpdateBatchByParentIdDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.rolePower; +package cn.bunny.dao.dto.system.rolePower.power; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/power/PowerUpdateDto.java similarity index 95% rename from dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerUpdateDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/rolePower/power/PowerUpdateDto.java index a3a8723..1d79e32 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerUpdateDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/power/PowerUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.rolePower; +package cn.bunny.dao.dto.system.rolePower.power; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/role/RoleAddDto.java similarity index 94% rename from dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleAddDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/rolePower/role/RoleAddDto.java index e128deb..9587cfb 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleAddDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/role/RoleAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.rolePower; +package cn.bunny.dao.dto.system.rolePower.role; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/role/RoleDto.java similarity index 91% rename from dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/rolePower/role/RoleDto.java index b946f8d..fd90f49 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/role/RoleDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.rolePower; +package cn.bunny.dao.dto.system.rolePower.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/role/RoleUpdateDto.java similarity index 94% rename from dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleUpdateDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/rolePower/role/RoleUpdateDto.java index 47772f3..0724733 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleUpdateDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/role/RoleUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.rolePower; +package cn.bunny.dao.dto.system.rolePower.role; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/dao/src/main/java/cn/bunny/dao/entity/quartz/QuartzExecuteLog.java b/dao/src/main/java/cn/bunny/dao/entity/log/ScheduleExecuteLog.java similarity index 93% rename from dao/src/main/java/cn/bunny/dao/entity/quartz/QuartzExecuteLog.java rename to dao/src/main/java/cn/bunny/dao/entity/log/ScheduleExecuteLog.java index f5cf902..ef3ab3e 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/quartz/QuartzExecuteLog.java +++ b/dao/src/main/java/cn/bunny/dao/entity/log/ScheduleExecuteLog.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.entity.quartz; +package cn.bunny.dao.entity.log; import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; @@ -22,7 +22,7 @@ import java.time.LocalDateTime; @Accessors(chain = true) @TableName("log_quartz_execute") @Schema(name = "QuartzExecuteLog对象", title = "调度任务执行日志", description = "调度任务执行日志") -public class QuartzExecuteLog extends BaseEntity { +public class ScheduleExecuteLog extends BaseEntity { @Schema(name = "jobName", title = "任务名称") private String jobName; diff --git a/dao/src/main/java/cn/bunny/dao/entity/quartz/QuartzExecuteLogJson.java b/dao/src/main/java/cn/bunny/dao/entity/log/ScheduleExecuteLogJson.java similarity index 91% rename from dao/src/main/java/cn/bunny/dao/entity/quartz/QuartzExecuteLogJson.java rename to dao/src/main/java/cn/bunny/dao/entity/log/ScheduleExecuteLogJson.java index 005daed..db9479c 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/quartz/QuartzExecuteLogJson.java +++ b/dao/src/main/java/cn/bunny/dao/entity/log/ScheduleExecuteLogJson.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.entity.quartz; +package cn.bunny.dao.entity.log; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @Builder @Schema(name = "QuartzExecuteLog对象", title = "执行任务的日志", description = "执行任务的日志") -public class QuartzExecuteLogJson { +public class ScheduleExecuteLogJson { @Schema(name = "result", title = "执行结果") private String result; diff --git a/dao/src/main/java/cn/bunny/dao/pojo/common/EmailSend.java b/dao/src/main/java/cn/bunny/dao/pojo/common/EmailSend.java index 360c22c..7042769 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/common/EmailSend.java +++ b/dao/src/main/java/cn/bunny/dao/pojo/common/EmailSend.java @@ -34,4 +34,5 @@ public class EmailSend { @Schema(name = "file", title = "发送的文件") private MultipartFile[] files; + } \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dao/pojo/common/EmailSendInit.java b/dao/src/main/java/cn/bunny/dao/pojo/common/EmailSendInit.java index 9e54c13..007daea 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/common/EmailSendInit.java +++ b/dao/src/main/java/cn/bunny/dao/pojo/common/EmailSendInit.java @@ -27,4 +27,5 @@ public class EmailSendInit { @Schema(name = "password", title = "密码") private String password; + } \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dao/pojo/common/EmailTemplateTypes.java b/dao/src/main/java/cn/bunny/dao/pojo/enums/EmailTemplateEnums.java similarity index 77% rename from dao/src/main/java/cn/bunny/dao/pojo/common/EmailTemplateTypes.java rename to dao/src/main/java/cn/bunny/dao/pojo/enums/EmailTemplateEnums.java index 66e4d03..e97f71e 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/common/EmailTemplateTypes.java +++ b/dao/src/main/java/cn/bunny/dao/pojo/enums/EmailTemplateEnums.java @@ -1,11 +1,11 @@ -package cn.bunny.dao.pojo.common; +package cn.bunny.dao.pojo.enums; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; @Getter @Schema(description = "Email Template Types") -public enum EmailTemplateTypes { +public enum EmailTemplateEnums { VERIFICATION_CODE("verification_code", "邮箱验证码发送"), NOTIFICATION("notification", "通知型邮件"), WARNING("warning", "警告型邮件"), @@ -14,7 +14,7 @@ public enum EmailTemplateTypes { private final String type; private final String summary; - EmailTemplateTypes(String type, String summary) { + EmailTemplateEnums(String type, String summary) { this.type = type; this.summary = summary; } diff --git a/dao/src/main/java/cn/bunny/dao/pojo/enums/OperationType.java b/dao/src/main/java/cn/bunny/dao/pojo/enums/OperationType.java deleted file mode 100644 index f7137d1..0000000 --- a/dao/src/main/java/cn/bunny/dao/pojo/enums/OperationType.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.bunny.dao.pojo.enums; - -/** - * 数据库操作类型 - */ -public enum OperationType { - UPDATE, INSERT -} diff --git a/dao/src/main/java/cn/bunny/dao/vo/BaseVo.java b/dao/src/main/java/cn/bunny/dao/vo/common/BaseVo.java similarity index 98% rename from dao/src/main/java/cn/bunny/dao/vo/BaseVo.java rename to dao/src/main/java/cn/bunny/dao/vo/common/BaseVo.java index b3a4f7e..3522530 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/BaseVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/common/BaseVo.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.vo; +package cn.bunny.dao.vo.common; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; @@ -17,6 +17,7 @@ import java.time.LocalDateTime; @Data @Schema(name = "BaseVo", title = "基础返回对象内容", description = "基础返回对象内容") public class BaseVo implements Serializable { + @Schema(name = "id", title = "主键") @JsonProperty("id") @JsonFormat(shape = JsonFormat.Shape.STRING) @@ -44,4 +45,5 @@ public class BaseVo implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) @JSONField(serializeUsing = ToStringSerializer.class) private Long updateUser; + } \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dao/vo/common/KvData.java b/dao/src/main/java/cn/bunny/dao/vo/common/KvData.java deleted file mode 100644 index 314302a..0000000 --- a/dao/src/main/java/cn/bunny/dao/vo/common/KvData.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.bunny.dao.vo.common; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@ApiModel(value = "KvData对象", description = "基础键值对数据") -public class KvData { - @ApiModelProperty(value = "id", name = "主键") - @JsonProperty("id") - @JsonFormat(shape = JsonFormat.Shape.STRING) - @JSONField(serializeUsing = ToStringSerializer.class) - private Long id; - - @ApiModelProperty("值内容") - @JsonFormat(shape = JsonFormat.Shape.STRING) - @JSONField(serializeUsing = ToStringSerializer.class) - private Object value; - - @ApiModelProperty("值内容") - @JsonFormat(shape = JsonFormat.Shape.STRING) - @JSONField(serializeUsing = ToStringSerializer.class) - private Object key; - - @ApiModelProperty("显示内容") - private String label; -} diff --git a/dao/src/main/java/cn/bunny/dao/vo/common/TreeSelectVo.java b/dao/src/main/java/cn/bunny/dao/vo/common/TreeSelectVo.java index 9b94f80..9627bfb 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/common/TreeSelectVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/common/TreeSelectVo.java @@ -2,24 +2,41 @@ package cn.bunny.dao.vo.common; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import lombok.EqualsAndHashCode; import java.util.List; -@EqualsAndHashCode(callSuper = true) @Data -@ApiModel(value = "TreeSelectList对象", description = "树形结构数据") -public class TreeSelectVo extends KvData { +@Schema(name = "TreeSelectList对象", title = "树形结构数据", description = "树形结构数据") +public class TreeSelectVo { - @ApiModelProperty("父级id") + @Schema(name = "id", title = "主键") + @JsonProperty("id") + @JsonFormat(shape = JsonFormat.Shape.STRING) + @JSONField(serializeUsing = ToStringSerializer.class) + private Long id; + + @Schema(name = "value", title = "值内容") + @JsonFormat(shape = JsonFormat.Shape.STRING) + @JSONField(serializeUsing = ToStringSerializer.class) + private Object value; + + @Schema(name = "key", title = "key内容") + @JsonFormat(shape = JsonFormat.Shape.STRING) + @JSONField(serializeUsing = ToStringSerializer.class) + private Object key; + + @Schema(name = "label", title = "显示内容") + private String label; + + @Schema(name = "parentId", title = "父级id") @JsonFormat(shape = JsonFormat.Shape.STRING) @JSONField(serializeUsing = ToStringSerializer.class) private Long parentId; - @ApiModelProperty("子级内容") + @Schema(name = "children", title = "子级内容") private List children; } \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nTypeVo.java b/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nTypeVo.java index 822d774..cac2f51 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nTypeVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nTypeVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.i18n; -import cn.bunny.dao.vo.BaseVo; +import cn.bunny.dao.vo.common.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nVo.java b/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nVo.java index 9105edd..ccb7d67 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.i18n; -import cn.bunny.dao.vo.BaseVo; +import cn.bunny.dao.vo.common.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/quartz/QuartzExecuteLogVo.java b/dao/src/main/java/cn/bunny/dao/vo/log/QuartzExecuteLogVo.java similarity index 86% rename from dao/src/main/java/cn/bunny/dao/vo/quartz/QuartzExecuteLogVo.java rename to dao/src/main/java/cn/bunny/dao/vo/log/QuartzExecuteLogVo.java index bea91ce..56875bb 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/quartz/QuartzExecuteLogVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/log/QuartzExecuteLogVo.java @@ -1,7 +1,7 @@ -package cn.bunny.dao.vo.quartz; +package cn.bunny.dao.vo.log; -import cn.bunny.dao.entity.quartz.QuartzExecuteLogJson; -import cn.bunny.dao.vo.BaseVo; +import cn.bunny.dao.entity.log.ScheduleExecuteLogJson; +import cn.bunny.dao.vo.common.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -31,7 +31,7 @@ public class QuartzExecuteLogVo extends BaseVo { private String triggerName; @Schema(name = "executeResult", title = "执行结果") - private QuartzExecuteLogJson executeResult; + private ScheduleExecuteLogJson executeResult; @Schema(name = "duration", title = "执行时间") private Integer duration; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/DeptVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/DeptVo.java index f282dbd..3f1ee6c 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/DeptVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/DeptVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system; -import cn.bunny.dao.vo.BaseVo; +import cn.bunny.dao.vo.common.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/MenuIconVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/MenuIconVo.java index e491b81..60ca2d5 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/MenuIconVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/MenuIconVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system; -import cn.bunny.dao.vo.BaseVo; +import cn.bunny.dao.vo.common.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailTemplateVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailTemplateVo.java index a9984b5..ed9507c 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailTemplateVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailTemplateVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.email; -import cn.bunny.dao.vo.BaseVo; +import cn.bunny.dao.vo.common.BaseVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailUsersVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailUsersVo.java index b71d2ba..d5aed86 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailUsersVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailUsersVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.email; -import cn.bunny.dao.vo.BaseVo; +import cn.bunny.dao.vo.common.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/files/FileInfoVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/files/FileInfoVo.java index 4794bde..a346b89 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/files/FileInfoVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/files/FileInfoVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.files; -import cn.bunny.dao.vo.BaseVo; +import cn.bunny.dao.vo.common.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/files/FilesVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/files/FilesVo.java index 0ad9c4a..7782a18 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/files/FilesVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/files/FilesVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.files; -import cn.bunny.dao.vo.BaseVo; +import cn.bunny.dao.vo.common.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/PowerVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/PowerVo.java index f27e6d3..80ee567 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/PowerVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/PowerVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.rolePower; -import cn.bunny.dao.vo.BaseVo; +import cn.bunny.dao.vo.common.BaseVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/RoleVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/RoleVo.java index 84492ca..98b440c 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/RoleVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/RoleVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.rolePower; -import cn.bunny.dao.vo.BaseVo; +import cn.bunny.dao.vo.common.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/router/RouterManageVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/router/RouterManageVo.java index 9b0bc02..e925c8d 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/router/RouterManageVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/router/RouterManageVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.router; -import cn.bunny.dao.vo.BaseVo; +import cn.bunny.dao.vo.common.BaseVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/user/AdminUserVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/user/AdminUserVo.java index 81c3e9e..62e981a 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/user/AdminUserVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/user/AdminUserVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.user; -import cn.bunny.dao.vo.BaseVo; +import cn.bunny.dao.vo.common.BaseVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/user/LoginVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/user/LoginVo.java index 3d04ec3..1e20f30 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/user/LoginVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/user/LoginVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.user; -import cn.bunny.dao.vo.BaseVo; +import cn.bunny.dao.vo.common.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/user/UserVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/user/UserVo.java index fd85f36..2aab1a3 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/user/UserVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/user/UserVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.user; -import cn.bunny.dao.vo.BaseVo; +import cn.bunny.dao.vo.common.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java b/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java index b12be0c..086f3f6 100644 --- a/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java +++ b/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java @@ -1,8 +1,8 @@ package cn.bunny.services.controller; -import cn.bunny.dao.dto.system.email.EmailTemplateAddDto; -import cn.bunny.dao.dto.system.email.EmailTemplateDto; -import cn.bunny.dao.dto.system.email.EmailTemplateUpdateDto; +import cn.bunny.dao.dto.system.email.template.EmailTemplateAddDto; +import cn.bunny.dao.dto.system.email.template.EmailTemplateDto; +import cn.bunny.dao.dto.system.email.template.EmailTemplateUpdateDto; import cn.bunny.dao.entity.system.EmailTemplate; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; diff --git a/service/src/main/java/cn/bunny/services/controller/EmailUsersController.java b/service/src/main/java/cn/bunny/services/controller/EmailUsersController.java index dedbf1d..a1eccdd 100644 --- a/service/src/main/java/cn/bunny/services/controller/EmailUsersController.java +++ b/service/src/main/java/cn/bunny/services/controller/EmailUsersController.java @@ -1,9 +1,9 @@ package cn.bunny.services.controller; -import cn.bunny.dao.dto.system.email.EmailUserUpdateStatusDto; -import cn.bunny.dao.dto.system.email.EmailUsersAddDto; -import cn.bunny.dao.dto.system.email.EmailUsersDto; -import cn.bunny.dao.dto.system.email.EmailUsersUpdateDto; +import cn.bunny.dao.dto.system.email.user.EmailUserUpdateStatusDto; +import cn.bunny.dao.dto.system.email.user.EmailUsersAddDto; +import cn.bunny.dao.dto.system.email.user.EmailUsersDto; +import cn.bunny.dao.dto.system.email.user.EmailUsersUpdateDto; import cn.bunny.dao.entity.system.EmailUsers; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; 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 b7baa3e..7564c2d 100644 --- a/service/src/main/java/cn/bunny/services/controller/PowerController.java +++ b/service/src/main/java/cn/bunny/services/controller/PowerController.java @@ -1,9 +1,9 @@ package cn.bunny.services.controller; -import cn.bunny.dao.dto.system.rolePower.PowerAddDto; -import cn.bunny.dao.dto.system.rolePower.PowerDto; -import cn.bunny.dao.dto.system.rolePower.PowerUpdateBatchByParentIdDto; -import cn.bunny.dao.dto.system.rolePower.PowerUpdateDto; +import cn.bunny.dao.dto.system.rolePower.power.PowerAddDto; +import cn.bunny.dao.dto.system.rolePower.power.PowerDto; +import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateBatchByParentIdDto; +import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateDto; import cn.bunny.dao.entity.system.Power; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; diff --git a/service/src/main/java/cn/bunny/services/controller/RoleController.java b/service/src/main/java/cn/bunny/services/controller/RoleController.java index 4a8ac2c..ceb56fa 100644 --- a/service/src/main/java/cn/bunny/services/controller/RoleController.java +++ b/service/src/main/java/cn/bunny/services/controller/RoleController.java @@ -1,8 +1,8 @@ package cn.bunny.services.controller; -import cn.bunny.dao.dto.system.rolePower.RoleAddDto; -import cn.bunny.dao.dto.system.rolePower.RoleDto; -import cn.bunny.dao.dto.system.rolePower.RoleUpdateDto; +import cn.bunny.dao.dto.system.rolePower.role.RoleAddDto; +import cn.bunny.dao.dto.system.rolePower.role.RoleDto; +import cn.bunny.dao.dto.system.rolePower.role.RoleUpdateDto; import cn.bunny.dao.entity.system.Role; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; diff --git a/service/src/main/java/cn/bunny/services/controller/QuartzExecuteLogController.java b/service/src/main/java/cn/bunny/services/controller/ScheduleExecuteLogController.java similarity index 74% rename from service/src/main/java/cn/bunny/services/controller/QuartzExecuteLogController.java rename to service/src/main/java/cn/bunny/services/controller/ScheduleExecuteLogController.java index 14cea95..00d4d55 100644 --- a/service/src/main/java/cn/bunny/services/controller/QuartzExecuteLogController.java +++ b/service/src/main/java/cn/bunny/services/controller/ScheduleExecuteLogController.java @@ -1,12 +1,12 @@ package cn.bunny.services.controller; -import cn.bunny.dao.dto.quartz.executeLog.QuartzExecuteLogDto; -import cn.bunny.dao.entity.quartz.QuartzExecuteLog; +import cn.bunny.dao.dto.log.ScheduleExecuteLogDto; +import cn.bunny.dao.entity.log.ScheduleExecuteLog; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; import cn.bunny.dao.pojo.result.ResultCodeEnum; -import cn.bunny.dao.vo.quartz.QuartzExecuteLogVo; -import cn.bunny.services.service.QuartzExecuteLogService; +import cn.bunny.dao.vo.log.QuartzExecuteLogVo; +import cn.bunny.services.service.ScheduleExecuteLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -28,10 +28,10 @@ import java.util.List; @Tag(name = "调度任务执行日志", description = "调度任务执行日志相关接口") @RestController @RequestMapping("admin/quartzExecuteLog") -public class QuartzExecuteLogController { +public class ScheduleExecuteLogController { @Autowired - private QuartzExecuteLogService quartzExecuteLogService; + private ScheduleExecuteLogService scheduleExecuteLogService; @Operation(summary = "分页查询调度任务执行日志", description = "分页查询调度任务执行日志") @GetMapping("getQuartzExecuteLogList/{page}/{limit}") @@ -40,16 +40,16 @@ public class QuartzExecuteLogController { @PathVariable("page") Integer page, @Parameter(name = "limit", description = "每页记录数", required = true) @PathVariable("limit") Integer limit, - QuartzExecuteLogDto dto) { - Page pageParams = new Page<>(page, limit); - PageResult pageResult = quartzExecuteLogService.getQuartzExecuteLogList(pageParams, dto); + ScheduleExecuteLogDto dto) { + Page pageParams = new Page<>(page, limit); + PageResult pageResult = scheduleExecuteLogService.getQuartzExecuteLogList(pageParams, dto); return Mono.just(Result.success(pageResult)); } @Operation(summary = "删除调度任务执行日志", description = "删除调度任务执行日志") @DeleteMapping("deleteQuartzExecuteLog") public Mono> deleteQuartzExecuteLog(@RequestBody List ids) { - quartzExecuteLogService.deleteQuartzExecuteLog(ids); + scheduleExecuteLogService.deleteQuartzExecuteLog(ids); return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS)); } } diff --git a/service/src/main/java/cn/bunny/services/controller/SchedulersGroupController.java b/service/src/main/java/cn/bunny/services/controller/SchedulersGroupController.java index af63121..730166f 100644 --- a/service/src/main/java/cn/bunny/services/controller/SchedulersGroupController.java +++ b/service/src/main/java/cn/bunny/services/controller/SchedulersGroupController.java @@ -1,8 +1,8 @@ package cn.bunny.services.controller; -import cn.bunny.dao.dto.quartz.scheduleGroup.SchedulersGroupAddDto; -import cn.bunny.dao.dto.quartz.scheduleGroup.SchedulersGroupDto; -import cn.bunny.dao.dto.quartz.scheduleGroup.SchedulersGroupUpdateDto; +import cn.bunny.dao.dto.quartz.group.SchedulersGroupAddDto; +import cn.bunny.dao.dto.quartz.group.SchedulersGroupDto; +import cn.bunny.dao.dto.quartz.group.SchedulersGroupUpdateDto; import cn.bunny.dao.entity.quartz.SchedulersGroup; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; diff --git a/service/src/main/java/cn/bunny/services/factory/EmailFactory.java b/service/src/main/java/cn/bunny/services/factory/EmailFactory.java index 7e5becb..9bf6202 100644 --- a/service/src/main/java/cn/bunny/services/factory/EmailFactory.java +++ b/service/src/main/java/cn/bunny/services/factory/EmailFactory.java @@ -6,7 +6,7 @@ import cn.bunny.dao.entity.system.EmailTemplate; import cn.bunny.dao.entity.system.EmailUsers; import cn.bunny.dao.pojo.common.EmailSend; import cn.bunny.dao.pojo.common.EmailSendInit; -import cn.bunny.dao.pojo.common.EmailTemplateTypes; +import cn.bunny.dao.pojo.enums.EmailTemplateEnums; import cn.bunny.dao.pojo.result.ResultCodeEnum; import cn.bunny.services.mapper.EmailTemplateMapper; import cn.bunny.services.mapper.EmailUsersMapper; @@ -37,7 +37,7 @@ public class EmailFactory { // 查询验证码邮件模板 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(EmailTemplate::getIsDefault, true); - lambdaQueryWrapper.eq(EmailTemplate::getType, EmailTemplateTypes.VERIFICATION_CODE.getType()); + lambdaQueryWrapper.eq(EmailTemplate::getType, EmailTemplateEnums.VERIFICATION_CODE.getType()); EmailTemplate emailTemplate = emailTemplateMapper.selectOne(lambdaQueryWrapper); // 判断邮件模板是否为空 diff --git a/service/src/main/java/cn/bunny/services/mapper/EmailTemplateMapper.java b/service/src/main/java/cn/bunny/services/mapper/EmailTemplateMapper.java index 1543395..73266c9 100644 --- a/service/src/main/java/cn/bunny/services/mapper/EmailTemplateMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/EmailTemplateMapper.java @@ -1,6 +1,6 @@ package cn.bunny.services.mapper; -import cn.bunny.dao.dto.system.email.EmailTemplateDto; +import cn.bunny.dao.dto.system.email.template.EmailTemplateDto; import cn.bunny.dao.entity.system.EmailTemplate; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/EmailUsersMapper.java b/service/src/main/java/cn/bunny/services/mapper/EmailUsersMapper.java index 3a182eb..799b8b9 100644 --- a/service/src/main/java/cn/bunny/services/mapper/EmailUsersMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/EmailUsersMapper.java @@ -1,6 +1,6 @@ package cn.bunny.services.mapper; -import cn.bunny.dao.dto.system.email.EmailUsersDto; +import cn.bunny.dao.dto.system.email.user.EmailUsersDto; import cn.bunny.dao.entity.system.EmailUsers; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/PowerMapper.java b/service/src/main/java/cn/bunny/services/mapper/PowerMapper.java index 4296fd0..b25a0f0 100644 --- a/service/src/main/java/cn/bunny/services/mapper/PowerMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/PowerMapper.java @@ -1,6 +1,6 @@ package cn.bunny.services.mapper; -import cn.bunny.dao.dto.system.rolePower.PowerDto; +import cn.bunny.dao.dto.system.rolePower.power.PowerDto; import cn.bunny.dao.entity.system.Power; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/RoleMapper.java b/service/src/main/java/cn/bunny/services/mapper/RoleMapper.java index 5cbcb43..cb89573 100644 --- a/service/src/main/java/cn/bunny/services/mapper/RoleMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/RoleMapper.java @@ -1,6 +1,6 @@ package cn.bunny.services.mapper; -import cn.bunny.dao.dto.system.rolePower.RoleDto; +import cn.bunny.dao.dto.system.rolePower.role.RoleDto; import cn.bunny.dao.entity.system.Role; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/QuartzExecuteLogMapper.java b/service/src/main/java/cn/bunny/services/mapper/ScheduleExecuteLogMapper.java similarity index 72% rename from service/src/main/java/cn/bunny/services/mapper/QuartzExecuteLogMapper.java rename to service/src/main/java/cn/bunny/services/mapper/ScheduleExecuteLogMapper.java index d079366..8b29db8 100644 --- a/service/src/main/java/cn/bunny/services/mapper/QuartzExecuteLogMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/ScheduleExecuteLogMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper; -import cn.bunny.dao.dto.quartz.executeLog.QuartzExecuteLogDto; -import cn.bunny.dao.entity.quartz.QuartzExecuteLog; +import cn.bunny.dao.dto.log.ScheduleExecuteLogDto; +import cn.bunny.dao.entity.log.ScheduleExecuteLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,7 +19,7 @@ import java.util.List; * @since 2024-10-18 12:56:39 */ @Mapper -public interface QuartzExecuteLogMapper extends BaseMapper { +public interface ScheduleExecuteLogMapper extends BaseMapper { /** * * 分页查询调度任务执行日志内容 @@ -28,7 +28,7 @@ public interface QuartzExecuteLogMapper extends BaseMapper { * @param dto 调度任务执行日志查询表单 * @return 调度任务执行日志分页结果 */ - IPage selectListByPage(@Param("page") Page pageParams, @Param("dto") QuartzExecuteLogDto dto); + IPage selectListByPage(@Param("page") Page pageParams, @Param("dto") ScheduleExecuteLogDto dto); /** * 物理删除调度任务执行日志 diff --git a/service/src/main/java/cn/bunny/services/mapper/SchedulersGroupMapper.java b/service/src/main/java/cn/bunny/services/mapper/SchedulersGroupMapper.java index f3c610d..ae6c1d4 100644 --- a/service/src/main/java/cn/bunny/services/mapper/SchedulersGroupMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/SchedulersGroupMapper.java @@ -1,6 +1,6 @@ package cn.bunny.services.mapper; -import cn.bunny.dao.dto.quartz.scheduleGroup.SchedulersGroupDto; +import cn.bunny.dao.dto.quartz.group.SchedulersGroupDto; import cn.bunny.dao.entity.quartz.SchedulersGroup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/EmailTemplateService.java b/service/src/main/java/cn/bunny/services/service/EmailTemplateService.java index 8e3613e..2afb74f 100644 --- a/service/src/main/java/cn/bunny/services/service/EmailTemplateService.java +++ b/service/src/main/java/cn/bunny/services/service/EmailTemplateService.java @@ -1,8 +1,8 @@ package cn.bunny.services.service; -import cn.bunny.dao.dto.system.email.EmailTemplateAddDto; -import cn.bunny.dao.dto.system.email.EmailTemplateDto; -import cn.bunny.dao.dto.system.email.EmailTemplateUpdateDto; +import cn.bunny.dao.dto.system.email.template.EmailTemplateAddDto; +import cn.bunny.dao.dto.system.email.template.EmailTemplateDto; +import cn.bunny.dao.dto.system.email.template.EmailTemplateUpdateDto; import cn.bunny.dao.entity.system.EmailTemplate; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.system.email.EmailTemplateVo; diff --git a/service/src/main/java/cn/bunny/services/service/EmailUsersService.java b/service/src/main/java/cn/bunny/services/service/EmailUsersService.java index 78234f6..eb54d25 100644 --- a/service/src/main/java/cn/bunny/services/service/EmailUsersService.java +++ b/service/src/main/java/cn/bunny/services/service/EmailUsersService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service; -import cn.bunny.dao.dto.system.email.EmailUserUpdateStatusDto; -import cn.bunny.dao.dto.system.email.EmailUsersAddDto; -import cn.bunny.dao.dto.system.email.EmailUsersDto; -import cn.bunny.dao.dto.system.email.EmailUsersUpdateDto; +import cn.bunny.dao.dto.system.email.user.EmailUserUpdateStatusDto; +import cn.bunny.dao.dto.system.email.user.EmailUsersAddDto; +import cn.bunny.dao.dto.system.email.user.EmailUsersDto; +import cn.bunny.dao.dto.system.email.user.EmailUsersUpdateDto; import cn.bunny.dao.entity.system.EmailUsers; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.system.email.EmailUsersVo; diff --git a/service/src/main/java/cn/bunny/services/service/PowerService.java b/service/src/main/java/cn/bunny/services/service/PowerService.java index 6f859e7..293ac79 100644 --- a/service/src/main/java/cn/bunny/services/service/PowerService.java +++ b/service/src/main/java/cn/bunny/services/service/PowerService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service; -import cn.bunny.dao.dto.system.rolePower.PowerAddDto; -import cn.bunny.dao.dto.system.rolePower.PowerDto; -import cn.bunny.dao.dto.system.rolePower.PowerUpdateBatchByParentIdDto; -import cn.bunny.dao.dto.system.rolePower.PowerUpdateDto; +import cn.bunny.dao.dto.system.rolePower.power.PowerAddDto; +import cn.bunny.dao.dto.system.rolePower.power.PowerDto; +import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateBatchByParentIdDto; +import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateDto; import cn.bunny.dao.entity.system.Power; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.system.rolePower.PowerVo; diff --git a/service/src/main/java/cn/bunny/services/service/RoleService.java b/service/src/main/java/cn/bunny/services/service/RoleService.java index a36b1ea..f54b643 100644 --- a/service/src/main/java/cn/bunny/services/service/RoleService.java +++ b/service/src/main/java/cn/bunny/services/service/RoleService.java @@ -1,8 +1,8 @@ package cn.bunny.services.service; -import cn.bunny.dao.dto.system.rolePower.RoleAddDto; -import cn.bunny.dao.dto.system.rolePower.RoleDto; -import cn.bunny.dao.dto.system.rolePower.RoleUpdateDto; +import cn.bunny.dao.dto.system.rolePower.role.RoleAddDto; +import cn.bunny.dao.dto.system.rolePower.role.RoleDto; +import cn.bunny.dao.dto.system.rolePower.role.RoleUpdateDto; import cn.bunny.dao.entity.system.Role; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.system.rolePower.RoleVo; diff --git a/service/src/main/java/cn/bunny/services/service/QuartzExecuteLogService.java b/service/src/main/java/cn/bunny/services/service/ScheduleExecuteLogService.java similarity index 69% rename from service/src/main/java/cn/bunny/services/service/QuartzExecuteLogService.java rename to service/src/main/java/cn/bunny/services/service/ScheduleExecuteLogService.java index 34957bc..9408f66 100644 --- a/service/src/main/java/cn/bunny/services/service/QuartzExecuteLogService.java +++ b/service/src/main/java/cn/bunny/services/service/ScheduleExecuteLogService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service; -import cn.bunny.dao.dto.quartz.executeLog.QuartzExecuteLogDto; -import cn.bunny.dao.entity.quartz.QuartzExecuteLog; +import cn.bunny.dao.dto.log.ScheduleExecuteLogDto; +import cn.bunny.dao.entity.log.ScheduleExecuteLog; import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.vo.quartz.QuartzExecuteLogVo; +import cn.bunny.dao.vo.log.QuartzExecuteLogVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -17,14 +17,14 @@ import java.util.List; * @author Bunny * @since 2024-10-18 12:56:39 */ -public interface QuartzExecuteLogService extends IService { +public interface ScheduleExecuteLogService extends IService { /** * * 获取调度任务执行日志列表 * * @return 调度任务执行日志返回列表 */ - PageResult getQuartzExecuteLogList(Page pageParams, QuartzExecuteLogDto dto); + PageResult getQuartzExecuteLogList(Page pageParams, ScheduleExecuteLogDto dto); /** * * 删除|批量删除调度任务执行日志类型 diff --git a/service/src/main/java/cn/bunny/services/service/SchedulersGroupService.java b/service/src/main/java/cn/bunny/services/service/SchedulersGroupService.java index af1aa98..6a1ebdb 100644 --- a/service/src/main/java/cn/bunny/services/service/SchedulersGroupService.java +++ b/service/src/main/java/cn/bunny/services/service/SchedulersGroupService.java @@ -1,8 +1,8 @@ package cn.bunny.services.service; -import cn.bunny.dao.dto.quartz.scheduleGroup.SchedulersGroupAddDto; -import cn.bunny.dao.dto.quartz.scheduleGroup.SchedulersGroupDto; -import cn.bunny.dao.dto.quartz.scheduleGroup.SchedulersGroupUpdateDto; +import cn.bunny.dao.dto.quartz.group.SchedulersGroupAddDto; +import cn.bunny.dao.dto.quartz.group.SchedulersGroupDto; +import cn.bunny.dao.dto.quartz.group.SchedulersGroupUpdateDto; import cn.bunny.dao.entity.quartz.SchedulersGroup; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.quartz.SchedulersGroupVo; diff --git a/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java index dafeadb..4ddde5c 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java @@ -1,11 +1,11 @@ package cn.bunny.services.service.impl; import cn.bunny.common.service.exception.BunnyException; -import cn.bunny.dao.dto.system.email.EmailTemplateAddDto; -import cn.bunny.dao.dto.system.email.EmailTemplateDto; -import cn.bunny.dao.dto.system.email.EmailTemplateUpdateDto; +import cn.bunny.dao.dto.system.email.template.EmailTemplateAddDto; +import cn.bunny.dao.dto.system.email.template.EmailTemplateDto; +import cn.bunny.dao.dto.system.email.template.EmailTemplateUpdateDto; import cn.bunny.dao.entity.system.EmailTemplate; -import cn.bunny.dao.pojo.common.EmailTemplateTypes; +import cn.bunny.dao.pojo.enums.EmailTemplateEnums; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.email.EmailTemplateVo; @@ -115,10 +115,10 @@ public class EmailTemplateServiceImpl extends ServiceImpl> getEmailTypes() { - return Arrays.stream(EmailTemplateTypes.values()).map(emailTemplateTypes -> { + return Arrays.stream(EmailTemplateEnums.values()).map(emailTemplateEnums -> { Map map = new HashMap<>(); - map.put("key", emailTemplateTypes.getSummary()); - map.put("value", emailTemplateTypes.getType()); + map.put("key", emailTemplateEnums.getSummary()); + map.put("value", emailTemplateEnums.getType()); return map; }).toList(); } diff --git a/service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java index 047269d..7edf7e5 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.impl; import cn.bunny.common.service.exception.BunnyException; -import cn.bunny.dao.dto.system.email.EmailUserUpdateStatusDto; -import cn.bunny.dao.dto.system.email.EmailUsersAddDto; -import cn.bunny.dao.dto.system.email.EmailUsersDto; -import cn.bunny.dao.dto.system.email.EmailUsersUpdateDto; +import cn.bunny.dao.dto.system.email.user.EmailUserUpdateStatusDto; +import cn.bunny.dao.dto.system.email.user.EmailUsersAddDto; +import cn.bunny.dao.dto.system.email.user.EmailUsersDto; +import cn.bunny.dao.dto.system.email.user.EmailUsersUpdateDto; import cn.bunny.dao.entity.system.EmailUsers; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.ResultCodeEnum; 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 cff1986..eea7068 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 @@ -1,10 +1,10 @@ package cn.bunny.services.service.impl; import cn.bunny.common.service.exception.BunnyException; -import cn.bunny.dao.dto.system.rolePower.PowerAddDto; -import cn.bunny.dao.dto.system.rolePower.PowerDto; -import cn.bunny.dao.dto.system.rolePower.PowerUpdateBatchByParentIdDto; -import cn.bunny.dao.dto.system.rolePower.PowerUpdateDto; +import cn.bunny.dao.dto.system.rolePower.power.PowerAddDto; +import cn.bunny.dao.dto.system.rolePower.power.PowerDto; +import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateBatchByParentIdDto; +import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateDto; import cn.bunny.dao.entity.system.Power; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.ResultCodeEnum; diff --git a/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java index 53d19b3..690f0a3 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.impl; import cn.bunny.common.service.exception.BunnyException; -import cn.bunny.dao.dto.system.rolePower.RoleAddDto; -import cn.bunny.dao.dto.system.rolePower.RoleDto; -import cn.bunny.dao.dto.system.rolePower.RoleUpdateDto; +import cn.bunny.dao.dto.system.rolePower.role.RoleAddDto; +import cn.bunny.dao.dto.system.rolePower.role.RoleDto; +import cn.bunny.dao.dto.system.rolePower.role.RoleUpdateDto; import cn.bunny.dao.entity.system.Role; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.ResultCodeEnum; diff --git a/service/src/main/java/cn/bunny/services/service/impl/QuartzExecuteLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/ScheduleExecuteLogServiceImpl.java similarity index 74% rename from service/src/main/java/cn/bunny/services/service/impl/QuartzExecuteLogServiceImpl.java rename to service/src/main/java/cn/bunny/services/service/impl/ScheduleExecuteLogServiceImpl.java index fd16c00..63e4ac5 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/QuartzExecuteLogServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/ScheduleExecuteLogServiceImpl.java @@ -1,11 +1,11 @@ package cn.bunny.services.service.impl; -import cn.bunny.dao.dto.quartz.executeLog.QuartzExecuteLogDto; -import cn.bunny.dao.entity.quartz.QuartzExecuteLog; +import cn.bunny.dao.dto.log.ScheduleExecuteLogDto; +import cn.bunny.dao.entity.log.ScheduleExecuteLog; import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.vo.quartz.QuartzExecuteLogVo; -import cn.bunny.services.mapper.QuartzExecuteLogMapper; -import cn.bunny.services.service.QuartzExecuteLogService; +import cn.bunny.dao.vo.log.QuartzExecuteLogVo; +import cn.bunny.services.mapper.ScheduleExecuteLogMapper; +import cn.bunny.services.service.ScheduleExecuteLogService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -23,7 +23,7 @@ import java.util.List; * @since 2024-10-18 12:56:39 */ @Service -public class QuartzExecuteLogServiceImpl extends ServiceImpl implements QuartzExecuteLogService { +public class ScheduleExecuteLogServiceImpl extends ServiceImpl implements ScheduleExecuteLogService { /** * * 调度任务执行日志 服务实现类 @@ -33,9 +33,9 @@ public class QuartzExecuteLogServiceImpl extends ServiceImpl getQuartzExecuteLogList(Page pageParams, QuartzExecuteLogDto dto) { + public PageResult getQuartzExecuteLogList(Page pageParams, ScheduleExecuteLogDto dto) { // 分页查询菜单图标 - IPage page = baseMapper.selectListByPage(pageParams, dto); + IPage page = baseMapper.selectListByPage(pageParams, dto); List voList = page.getRecords().stream().map(quartzExecuteLog -> { QuartzExecuteLogVo quartzExecuteLogVo = new QuartzExecuteLogVo(); diff --git a/service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java index 75d14bd..06de656 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java @@ -1,8 +1,8 @@ package cn.bunny.services.service.impl; -import cn.bunny.dao.dto.quartz.scheduleGroup.SchedulersGroupAddDto; -import cn.bunny.dao.dto.quartz.scheduleGroup.SchedulersGroupDto; -import cn.bunny.dao.dto.quartz.scheduleGroup.SchedulersGroupUpdateDto; +import cn.bunny.dao.dto.quartz.group.SchedulersGroupAddDto; +import cn.bunny.dao.dto.quartz.group.SchedulersGroupDto; +import cn.bunny.dao.dto.quartz.group.SchedulersGroupUpdateDto; import cn.bunny.dao.entity.quartz.SchedulersGroup; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.quartz.SchedulersGroupVo; diff --git a/service/src/main/resources/mapper/QuartzExecuteLogMapper.xml b/service/src/main/resources/mapper/ScheduleExecuteLogMapper.xml similarity index 93% rename from service/src/main/resources/mapper/QuartzExecuteLogMapper.xml rename to service/src/main/resources/mapper/ScheduleExecuteLogMapper.xml index d384a35..761731a 100644 --- a/service/src/main/resources/mapper/QuartzExecuteLogMapper.xml +++ b/service/src/main/resources/mapper/ScheduleExecuteLogMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -26,7 +26,7 @@ - select from log_quartz_execute