diff --git a/README.md b/README.md index 0a7cc4c1..97a1b18b 100644 --- a/README.md +++ b/README.md @@ -43,47 +43,62 @@ ``` youlai-boot ├── sql # SQL脚本 - ├── mysql5 # MySQL5 脚本 - ├── mysql8 # MySQL8 脚本 +│ ├── mysql5 # MySQL5 脚本 +│ └── mysql8 # MySQL8 脚本 ├── src # 源码目录 - ├── common # 公共模块 - ├── config # 自动装配配置 - ├── CorsConfig # 跨域共享配置 - ├── MybatisConfig # Mybatis 自动装配配置 - ├── RedisCacheConfig # Redis 缓存自动装配配置 - ├── RedisConfig # Redis 自动装配配置 - ├── SecurityConfig # Spring Security 自动装配配置 - ├── SwaggerConfig # API 接口文档配置 - ├── WebMvcConfig # WebMvc 配置 - ├── WebSocketConfig # WebSocket 自动装配配置 - ├── XxlJobConfig # XXL-JOB 自动装配配置 - ├── controller # 控制层 - ├── converter # MapStruct 转换器 - ├── filter # 过滤器 - ├── RequestLogFilter # 请求日志过滤器 - ├── VerifyCodeFilter # 验证码过滤器 - ├── model # 模型层 - ├── bo # 业务对象 - ├── dto # 数据传输对象 - ├── entity # 实体对象 - ├── form # 表单对象 - ├── query # 查询参数对象 - ├── vo # 视图对象 - ├── mapper # 数据库访问层 - ├── plugin # 插件(可选) - ├── captcha # 验证码插件，用于生成验证码 - ├── dupsubmit # 防重提交插件，用于防止表单重复提交 - ├── mybatis # Mybatis 插件，数据权限、字段填充 - ├── easyexcel # EasyExcel 插件，Excel 文件的读写 - ├── xxljob # XXL-JOB 插件，分布式任务调度和执行 - ├── security # Spring Security 安全配置和扩展 - ├── util # 工具类 - ├── JwtUtils # JWT 工具类，用于生成和解析 JWT - ├── SecurityUtils # Spring Security 工具类，用于获取当前登录用户 - ├── service # 业务逻辑层 - - -└── end +│ ├── common # 公共模块 +│ │ ├── annotation # 注解定义 +│ │ ├── base # 基础类 +│ │ ├── constant # 常量 +│ │ ├── enums # 枚举类型 +│ │ ├── exception # 异常处理 +│ │ ├── model # 数据模型 +│ │ ├── result # 结果封装 +│ │ └── util # 工具类 +│ ├── config # 自动装配配置 +│ │ ├── CorsConfig # 跨域共享配置 +│ │ ├── MybatisConfig # Mybatis 自动装配配置 +│ │ ├── RedisCacheConfig # Redis 缓存自动装配配置 +│ │ ├── RedisConfig # Redis 自动装配配置 +│ │ ├── SecurityConfig # Spring Security 自动装配配置 +│ │ ├── SwaggerConfig # API 接口文档配置 +│ │ ├── WebMvcConfig # WebMvc 配置 +│ │ ├── WebSocketConfig # WebSocket 自动装配配置 +│ │ └── XxlJobConfig # XXL-JOB 自动装配配置 +│ ├── core # 核心功能模块 +│ │ ├── aspect # 切面 +│ │ │ ├── LogAspect # 日志切面 +│ │ │ └── RepeatSubmitAspect # 防重提交切面 +│ │ ├── filter # 过滤器 +│ │ │ ├── RateLimiterFilter # 限流过滤器 +│ │ │ └── RequestLogFilter # 请求日志过滤器 +│ │ ├── handler # 处理器 +│ │ │ ├── MyDataPermissionHandler # 数据权限处理器 +│ │ │ └── MyMetaObjectHandler # 元对象字段填充处理器 +│ │ └── security # Security 安全中心 +│ ├── platform # 平台基础设施模块 +│ │ ├── auth # 授权 +│ │ ├── file # 文件处理 +│ │ ├── generator # 代码生成器 +│ │ ├── mail # 邮件处理 +│ │ └── sms # 短信处理 +│ ├── system # 系统模块 +│ │ ├── controller # 控制层 +│ │ ├── converter # MapStruct 转换器 +│ │ ├── event # 事件处理 +│ │ ├── handler # 处理器 +│ │ ├── listener # 监听器 +│ │ ├── model # 模型层 +│ │ │ ├── bo # 业务对象 +│ │ │ ├── dto # 数据传输对象 +│ │ │ ├── entity # 实体对象 +│ │ │ ├── form # 表单对象 +│ │ │ ├── query # 查询参数对象 +│ │ │ └── vo # 视图对象 +│ │ ├── mapper # 数据库访问层 +│ │ └── service # 业务逻辑层 +│ └── YouLaiApplication # 启动类 +└── end ``` ## 🌺 前端工程 @@ -111,7 +126,7 @@ youlai-boot 3. **启动项目** - 执行 [SystemApplication.java](src/main/java/com/youlai/system/SystemApplication.java) 的 main 方法完成后端项目启动； + 执行 [SystemApplication.java](src/main/java/com/youlai/boot/YouLaiApplication.java) 的 main 方法完成后端项目启动； 访问接口文档地址 [http://localhost:8989/doc.html](http://localhost:8989/doc.html) 验证项目启动是否成功。 diff --git a/src/main/java/com/youlai/boot/YouLaiBootApplication.java b/src/main/java/com/youlai/boot/YouLaiApplication.java similarity index 77% rename from src/main/java/com/youlai/boot/YouLaiBootApplication.java rename to src/main/java/com/youlai/boot/YouLaiApplication.java index f0313509..e891cb5b 100644 --- a/src/main/java/com/youlai/boot/YouLaiBootApplication.java +++ b/src/main/java/com/youlai/boot/YouLaiApplication.java @@ -6,16 +6,18 @@ import org.springframework.boot.context.properties.ConfigurationPropertiesScan; import org.springframework.scheduling.annotation.EnableScheduling; /** + * 应用启动类 * * @author Ray + * @since 0.0.1 */ @SpringBootApplication @ConfigurationPropertiesScan @EnableScheduling -public class YouLaiBootApplication { +public class YouLaiApplication { public static void main(String[] args) { - SpringApplication.run(YouLaiBootApplication.class, args); + SpringApplication.run(YouLaiApplication.class, args); } } diff --git a/src/main/java/com/youlai/boot/common/annotation/DataPermission.java b/src/main/java/com/youlai/boot/common/annotation/DataPermission.java index 83aba255..10f0d00a 100644 --- a/src/main/java/com/youlai/boot/common/annotation/DataPermission.java +++ b/src/main/java/com/youlai/boot/common/annotation/DataPermission.java @@ -3,7 +3,7 @@ package com.youlai.boot.common.annotation; import java.lang.annotation.*; /** - * MP数据权限注解 + * 数据权限注解 * * @author zc * @since 2.0.0 diff --git a/src/main/java/com/youlai/boot/common/annotation/LogAnnotation.java b/src/main/java/com/youlai/boot/common/annotation/Log.java similarity index 90% rename from src/main/java/com/youlai/boot/common/annotation/LogAnnotation.java rename to src/main/java/com/youlai/boot/common/annotation/Log.java index 049581e8..05f267fc 100644 --- a/src/main/java/com/youlai/boot/common/annotation/LogAnnotation.java +++ b/src/main/java/com/youlai/boot/common/annotation/Log.java @@ -13,7 +13,7 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) @Documented -public @interface LogAnnotation { +public @interface Log { String value() default ""; diff --git a/src/main/java/com/youlai/boot/common/annotation/NoRepeat.java b/src/main/java/com/youlai/boot/common/annotation/RepeatSubmit.java similarity index 93% rename from src/main/java/com/youlai/boot/common/annotation/NoRepeat.java rename to src/main/java/com/youlai/boot/common/annotation/RepeatSubmit.java index 82489843..39c71044 100644 --- a/src/main/java/com/youlai/boot/common/annotation/NoRepeat.java +++ b/src/main/java/com/youlai/boot/common/annotation/RepeatSubmit.java @@ -16,7 +16,7 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Documented @Inherited -public @interface NoRepeat { +public @interface RepeatSubmit { /** * 锁过期时间（秒） diff --git a/src/main/java/com/youlai/boot/config/SecurityConfig.java b/src/main/java/com/youlai/boot/config/SecurityConfig.java index 42c23aef..88e4d375 100644 --- a/src/main/java/com/youlai/boot/config/SecurityConfig.java +++ b/src/main/java/com/youlai/boot/config/SecurityConfig.java @@ -9,7 +9,7 @@ import com.youlai.boot.core.security.exception.MyAccessDeniedHandler; import com.youlai.boot.core.security.exception.MyAuthenticationEntryPoint; import com.youlai.boot.core.security.filter.JwtValidationFilter; import com.youlai.boot.core.security.filter.CaptchaValidationFilter; -import com.youlai.boot.system.service.SysConfigService; +import com.youlai.boot.system.service.ConfigService; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -45,7 +45,7 @@ public class SecurityConfig { private final RedisTemplate redisTemplate; private final CodeGenerator codeGenerator; private final SecurityProperties securityProperties; - private final SysConfigService sysConfigService; + private final ConfigService configService; @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { @@ -66,7 +66,7 @@ public class SecurityConfig { ; // 限流过滤器 - http.addFilterBefore(new RateLimiterFilter(redisTemplate, sysConfigService), UsernamePasswordAuthenticationFilter.class); + http.addFilterBefore(new RateLimiterFilter(redisTemplate, configService), UsernamePasswordAuthenticationFilter.class); // 验证码校验过滤器 http.addFilterBefore(new CaptchaValidationFilter(redisTemplate, codeGenerator), UsernamePasswordAuthenticationFilter.class); // JWT 校验过滤器 diff --git a/src/main/java/com/youlai/boot/config/WebSocketConfig.java b/src/main/java/com/youlai/boot/config/WebSocketConfig.java index a3add524..bd65c941 100644 --- a/src/main/java/com/youlai/boot/config/WebSocketConfig.java +++ b/src/main/java/com/youlai/boot/config/WebSocketConfig.java @@ -5,7 +5,6 @@ import cn.hutool.jwt.JWTPayload; import cn.hutool.jwt.JWTUtil; import com.youlai.boot.common.constant.SecurityConstants; import com.youlai.boot.system.event.UserConnectionEvent; -import com.youlai.boot.system.service.WebsocketService; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.context.ApplicationEventPublisher; diff --git a/src/main/java/com/youlai/boot/core/aspect/LogAspect.java b/src/main/java/com/youlai/boot/core/aspect/LogAspect.java index 4d3528a7..077e68f9 100644 --- a/src/main/java/com/youlai/boot/core/aspect/LogAspect.java +++ b/src/main/java/com/youlai/boot/core/aspect/LogAspect.java @@ -7,10 +7,9 @@ import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; import com.youlai.boot.common.constant.SecurityConstants; import com.youlai.boot.common.util.IPUtils; -import com.youlai.boot.system.model.entity.SysLog; -import com.youlai.boot.common.annotation.LogAnnotation; +import com.youlai.boot.system.model.entity.Log; import com.youlai.boot.core.security.util.SecurityUtils; -import com.youlai.boot.system.service.SysLogService; +import com.youlai.boot.system.service.LogService; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -32,15 +31,15 @@ import org.springframework.stereotype.Component; @Slf4j public class LogAspect { - private final SysLogService logService; + private final LogService logService; private final HttpServletRequest request; - @Pointcut("@annotation(com.youlai.boot.common.annotation.LogAnnotation)") + @Pointcut("@annotation(com.youlai.boot.common.annotation.Log)") public void logPointcut() { } @Around("logPointcut() && @annotation(logAnnotation)") - public Object logExecutionTime(ProceedingJoinPoint joinPoint, LogAnnotation logAnnotation) throws Throwable { + public Object logExecutionTime(ProceedingJoinPoint joinPoint, com.youlai.boot.common.annotation.Log logAnnotation) throws Throwable { String requestURI = request.getRequestURI(); Long userId = null; @@ -55,7 +54,7 @@ public class LogAspect { long executionTime = timer.interval(); // 创建日志记录 - SysLog log = new SysLog(); + Log log = new Log(); log.setModule(logAnnotation.module()); log.setContent(logAnnotation.value()); log.setRequestUri(requestURI); diff --git a/src/main/java/com/youlai/boot/core/aspect/NoRepeatAspect.java b/src/main/java/com/youlai/boot/core/aspect/RepeatSubmitAspect.java similarity index 85% rename from src/main/java/com/youlai/boot/core/aspect/NoRepeatAspect.java rename to src/main/java/com/youlai/boot/core/aspect/RepeatSubmitAspect.java index 076368a7..dbf783a2 100644 --- a/src/main/java/com/youlai/boot/core/aspect/NoRepeatAspect.java +++ b/src/main/java/com/youlai/boot/core/aspect/RepeatSubmitAspect.java @@ -7,7 +7,7 @@ import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.constant.SecurityConstants; import com.youlai.boot.common.result.ResultCode; import com.youlai.boot.common.exception.BusinessException; -import com.youlai.boot.common.annotation.NoRepeat; +import com.youlai.boot.common.annotation.RepeatSubmit; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -34,24 +34,24 @@ import java.util.concurrent.TimeUnit; @Component @Slf4j @RequiredArgsConstructor -public class NoRepeatAspect { +public class RepeatSubmitAspect { private final RedissonClient redissonClient; /** * 防重复提交切点 */ - @Pointcut("@annotation(noRepeat)") - public void preventDuplicateSubmitPointCut(NoRepeat noRepeat) { + @Pointcut("@annotation(repeatSubmit)") + public void preventDuplicateSubmitPointCut(RepeatSubmit repeatSubmit) { log.info("定义防重复提交切点"); } - @Around("preventDuplicateSubmitPointCut(noRepeat)") - public Object doAround(ProceedingJoinPoint pjp, NoRepeat noRepeat) throws Throwable { + @Around("preventDuplicateSubmitPointCut(repeatSubmit)") + public Object doAround(ProceedingJoinPoint pjp, RepeatSubmit repeatSubmit) throws Throwable { String resubmitLockKey = generateResubmitLockKey(); if (resubmitLockKey != null) { - int expire = noRepeat.expire(); // 防重提交锁过期时间 + int expire = repeatSubmit.expire(); // 防重提交锁过期时间 RLock lock = redissonClient.getLock(resubmitLockKey); boolean lockResult = lock.tryLock(0, expire, TimeUnit.SECONDS); // 获取锁失败，直接返回 false if (!lockResult) { diff --git a/src/main/java/com/youlai/boot/core/filter/RateLimiterFilter.java b/src/main/java/com/youlai/boot/core/filter/RateLimiterFilter.java index 2393acf6..62de5609 100644 --- a/src/main/java/com/youlai/boot/core/filter/RateLimiterFilter.java +++ b/src/main/java/com/youlai/boot/core/filter/RateLimiterFilter.java @@ -4,7 +4,7 @@ import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.result.ResultCode; import com.youlai.boot.common.util.IPUtils; import com.youlai.boot.common.util.ResponseUtils; -import com.youlai.boot.system.service.SysConfigService; +import com.youlai.boot.system.service.ConfigService; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -27,11 +27,11 @@ import java.util.concurrent.TimeUnit; public class RateLimiterFilter extends OncePerRequestFilter { private final RedisTemplate redisTemplate; - private final SysConfigService sysConfigService; + private final ConfigService configService; - public RateLimiterFilter(RedisTemplate redisTemplate, SysConfigService sysConfigService) { + public RateLimiterFilter(RedisTemplate redisTemplate, ConfigService configService) { this.redisTemplate = redisTemplate; - this.sysConfigService = sysConfigService; + this.configService = configService; } /** @@ -48,7 +48,7 @@ public class RateLimiterFilter extends OncePerRequestFilter { if (count == null || count == 1) { redisTemplate.expire(key,1, TimeUnit.SECONDS); } - Object systemConfig = sysConfigService.getSystemConfig(RedisConstants.IP_QPS_THRESHOLD_LIMIT_KEY); + Object systemConfig = configService.getSystemConfig(RedisConstants.IP_QPS_THRESHOLD_LIMIT_KEY); long limit = 10; if(systemConfig != null){ limit = Long.parseLong(systemConfig.toString()); diff --git a/src/main/java/com/youlai/boot/core/security/service/SysUserDetailsService.java b/src/main/java/com/youlai/boot/core/security/service/SysUserDetailsService.java index 9b3271ed..577d2044 100644 --- a/src/main/java/com/youlai/boot/core/security/service/SysUserDetailsService.java +++ b/src/main/java/com/youlai/boot/core/security/service/SysUserDetailsService.java @@ -2,7 +2,7 @@ package com.youlai.boot.core.security.service; import com.youlai.boot.core.security.model.SysUserDetails; import com.youlai.boot.system.model.dto.UserAuthInfo; -import com.youlai.boot.system.service.SysUserService; +import com.youlai.boot.system.service.UserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.userdetails.UserDetails; @@ -21,7 +21,7 @@ import org.springframework.stereotype.Service; @Slf4j public class SysUserDetailsService implements UserDetailsService { - private final SysUserService sysUserService; + private final UserService userService; /** * 根据用户名获取用户信息 @@ -33,7 +33,7 @@ public class SysUserDetailsService implements UserDetailsService { @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { try { - UserAuthInfo userAuthInfo = sysUserService.getUserAuthInfo(username); + UserAuthInfo userAuthInfo = userService.getUserAuthInfo(username); if (userAuthInfo == null) { throw new UsernameNotFoundException(username); } diff --git a/src/main/java/com/youlai/boot/infrastructure/auth/controller/AuthController.java b/src/main/java/com/youlai/boot/platform/auth/controller/AuthController.java similarity index 83% rename from src/main/java/com/youlai/boot/infrastructure/auth/controller/AuthController.java rename to src/main/java/com/youlai/boot/platform/auth/controller/AuthController.java index d71ff47d..a8843830 100644 --- a/src/main/java/com/youlai/boot/infrastructure/auth/controller/AuthController.java +++ b/src/main/java/com/youlai/boot/platform/auth/controller/AuthController.java @@ -1,11 +1,11 @@ -package com.youlai.boot.infrastructure.auth.controller; +package com.youlai.boot.platform.auth.controller; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.common.result.Result; -import com.youlai.boot.infrastructure.auth.service.AuthService; +import com.youlai.boot.platform.auth.service.AuthService; import com.youlai.boot.system.model.dto.CaptchaResult; import com.youlai.boot.system.model.dto.LoginResult; -import com.youlai.boot.common.annotation.LogAnnotation; +import com.youlai.boot.common.annotation.Log; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -30,7 +30,7 @@ public class AuthController { @Operation(summary = "登录") @PostMapping("/login") - @LogAnnotation(value = "登录", module = LogModuleEnum.LOGIN) + @Log(value = "登录", module = LogModuleEnum.LOGIN) public Result login( @Parameter(description = "用户名", example = "admin") @RequestParam String username, @Parameter(description = "密码", example = "123456") @RequestParam String password @@ -41,7 +41,7 @@ public class AuthController { @Operation(summary = "注销") @DeleteMapping("/logout") - @LogAnnotation(value = "注销", module = LogModuleEnum.LOGIN) + @Log(value = "注销", module = LogModuleEnum.LOGIN) public Result logout() { authService.logout(); return Result.success(); diff --git a/src/main/java/com/youlai/boot/infrastructure/auth/service/AuthService.java b/src/main/java/com/youlai/boot/platform/auth/service/AuthService.java similarity index 91% rename from src/main/java/com/youlai/boot/infrastructure/auth/service/AuthService.java rename to src/main/java/com/youlai/boot/platform/auth/service/AuthService.java index a0dfb7db..87f713b0 100644 --- a/src/main/java/com/youlai/boot/infrastructure/auth/service/AuthService.java +++ b/src/main/java/com/youlai/boot/platform/auth/service/AuthService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.infrastructure.auth.service; +package com.youlai.boot.platform.auth.service; import com.youlai.boot.system.model.dto.CaptchaResult; import com.youlai.boot.system.model.dto.LoginResult; diff --git a/src/main/java/com/youlai/boot/infrastructure/auth/service/impl/AuthServiceImpl.java b/src/main/java/com/youlai/boot/platform/auth/service/impl/AuthServiceImpl.java similarity index 98% rename from src/main/java/com/youlai/boot/infrastructure/auth/service/impl/AuthServiceImpl.java rename to src/main/java/com/youlai/boot/platform/auth/service/impl/AuthServiceImpl.java index 42897fea..ae403956 100644 --- a/src/main/java/com/youlai/boot/infrastructure/auth/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/auth/service/impl/AuthServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.infrastructure.auth.service.impl; +package com.youlai.boot.platform.auth.service.impl; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.CaptchaUtil; @@ -10,7 +10,7 @@ import cn.hutool.jwt.JWTPayload; import cn.hutool.jwt.JWTUtil; import com.youlai.boot.common.constant.SecurityConstants; import com.youlai.boot.common.enums.CaptchaTypeEnum; -import com.youlai.boot.infrastructure.auth.service.AuthService; +import com.youlai.boot.platform.auth.service.AuthService; import com.youlai.boot.system.model.dto.CaptchaResult; import com.youlai.boot.system.model.dto.LoginResult; import com.youlai.boot.config.property.CaptchaProperties; diff --git a/src/main/java/com/youlai/boot/infrastructure/file/controller/FileController.java b/src/main/java/com/youlai/boot/platform/file/controller/FileController.java similarity index 77% rename from src/main/java/com/youlai/boot/infrastructure/file/controller/FileController.java rename to src/main/java/com/youlai/boot/platform/file/controller/FileController.java index 71b857c3..1b5123ee 100644 --- a/src/main/java/com/youlai/boot/infrastructure/file/controller/FileController.java +++ b/src/main/java/com/youlai/boot/platform/file/controller/FileController.java @@ -1,7 +1,7 @@ -package com.youlai.boot.infrastructure.file.controller; +package com.youlai.boot.platform.file.controller; import com.youlai.boot.common.result.Result; -import com.youlai.boot.infrastructure.file.service.FileService; +import com.youlai.boot.platform.file.service.FileService; import com.youlai.boot.system.model.dto.FileInfo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -30,7 +30,13 @@ public class FileController { @PostMapping @Operation(summary = "文件上传") public Result uploadFile( - @Parameter(name = "file", description = "表单文件对象", required = true, in = ParameterIn.DEFAULT, schema = @Schema(name = "file", format = "binary")) + @Parameter( + name = "file", + description = "表单文件对象", + required = true, + in = ParameterIn.DEFAULT, + schema = @Schema(name = "file", format = "binary") + ) @RequestPart(value = "file") MultipartFile file ) { FileInfo fileInfo = fileService.uploadFile(file); diff --git a/src/main/java/com/youlai/boot/infrastructure/file/service/FileService.java b/src/main/java/com/youlai/boot/platform/file/service/FileService.java similarity index 90% rename from src/main/java/com/youlai/boot/infrastructure/file/service/FileService.java rename to src/main/java/com/youlai/boot/platform/file/service/FileService.java index 4220dc3a..a1aabb45 100644 --- a/src/main/java/com/youlai/boot/infrastructure/file/service/FileService.java +++ b/src/main/java/com/youlai/boot/platform/file/service/FileService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.infrastructure.file.service; +package com.youlai.boot.platform.file.service; import com.youlai.boot.system.model.dto.FileInfo; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/youlai/boot/infrastructure/file/service/impl/AliyunFileService.java b/src/main/java/com/youlai/boot/platform/file/service/impl/AliyunFileService.java similarity index 96% rename from src/main/java/com/youlai/boot/infrastructure/file/service/impl/AliyunFileService.java rename to src/main/java/com/youlai/boot/platform/file/service/impl/AliyunFileService.java index b173356d..b3811f25 100644 --- a/src/main/java/com/youlai/boot/infrastructure/file/service/impl/AliyunFileService.java +++ b/src/main/java/com/youlai/boot/platform/file/service/impl/AliyunFileService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.infrastructure.file.service.impl; +package com.youlai.boot.platform.file.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; @@ -8,7 +8,7 @@ import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.model.ObjectMetadata; import com.aliyun.oss.model.PutObjectRequest; -import com.youlai.boot.infrastructure.file.service.FileService; +import com.youlai.boot.platform.file.service.FileService; import com.youlai.boot.system.model.dto.FileInfo; import jakarta.annotation.PostConstruct; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/infrastructure/file/service/impl/MinioFileService.java b/src/main/java/com/youlai/boot/platform/file/service/impl/MinioFileService.java similarity index 98% rename from src/main/java/com/youlai/boot/infrastructure/file/service/impl/MinioFileService.java rename to src/main/java/com/youlai/boot/platform/file/service/impl/MinioFileService.java index 298044a6..83bbbdd3 100644 --- a/src/main/java/com/youlai/boot/infrastructure/file/service/impl/MinioFileService.java +++ b/src/main/java/com/youlai/boot/platform/file/service/impl/MinioFileService.java @@ -1,11 +1,11 @@ -package com.youlai.boot.infrastructure.file.service.impl; +package com.youlai.boot.platform.file.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.youlai.boot.infrastructure.file.service.FileService; +import com.youlai.boot.platform.file.service.FileService; import com.youlai.boot.system.model.dto.FileInfo; import io.minio.*; import io.minio.errors.*; diff --git a/src/main/java/com/youlai/boot/infrastructure/generator/controller/GeneratorController.java b/src/main/java/com/youlai/boot/platform/generator/controller/GeneratorController.java similarity index 86% rename from src/main/java/com/youlai/boot/infrastructure/generator/controller/GeneratorController.java rename to src/main/java/com/youlai/boot/platform/generator/controller/GeneratorController.java index a5e06bd9..a7407459 100644 --- a/src/main/java/com/youlai/boot/infrastructure/generator/controller/GeneratorController.java +++ b/src/main/java/com/youlai/boot/platform/generator/controller/GeneratorController.java @@ -1,16 +1,16 @@ -package com.youlai.boot.infrastructure.generator.controller; +package com.youlai.boot.platform.generator.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.common.result.PageResult; import com.youlai.boot.common.result.Result; import com.youlai.boot.config.property.GeneratorProperties; import com.youlai.boot.common.enums.LogModuleEnum; -import com.youlai.boot.infrastructure.generator.service.GeneratorService; -import com.youlai.boot.infrastructure.generator.model.form.GenConfigForm; +import com.youlai.boot.platform.generator.service.GeneratorService; +import com.youlai.boot.platform.generator.model.form.GenConfigForm; import com.youlai.boot.system.model.query.TablePageQuery; import com.youlai.boot.system.model.vo.GeneratorPreviewVO; import com.youlai.boot.system.model.vo.TablePageVO; -import com.youlai.boot.common.annotation.LogAnnotation; +import com.youlai.boot.common.annotation.Log; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -41,7 +41,7 @@ public class GeneratorController { @Operation(summary = "获取数据表分页列表") @GetMapping("/table/page") - @LogAnnotation(value = "代码生成分页列表", module = LogModuleEnum.OTHER) + @Log(value = "代码生成分页列表", module = LogModuleEnum.OTHER) public PageResult getTablePage( TablePageQuery queryParams ) { @@ -60,7 +60,7 @@ public class GeneratorController { @Operation(summary = "保存代码生成配置") @PostMapping("/{tableName}/config") - @LogAnnotation(value = "生成代码", module = LogModuleEnum.OTHER) + @Log(value = "生成代码", module = LogModuleEnum.OTHER) public Result saveGenConfig(@RequestBody GenConfigForm formData) { generatorService.saveGenConfig(formData); return Result.success(); @@ -77,7 +77,7 @@ public class GeneratorController { @Operation(summary = "获取预览生成代码") @GetMapping("/{tableName}/preview") - @LogAnnotation(value = "预览生成代码", module = LogModuleEnum.OTHER) + @Log(value = "预览生成代码", module = LogModuleEnum.OTHER) public Result> getTablePreviewData(@PathVariable String tableName) { List list = generatorService.getTablePreviewData(tableName); return Result.success(list); @@ -85,7 +85,7 @@ public class GeneratorController { @Operation(summary = "下载代码") @GetMapping("/{tableName}/download") - @LogAnnotation(value = "下载代码", module = LogModuleEnum.OTHER) + @Log(value = "下载代码", module = LogModuleEnum.OTHER) public void downloadZip(HttpServletResponse response, @PathVariable String tableName) throws IOException { String[] tableNames = tableName.split(","); byte[] data = generatorService.downloadCode(tableNames); diff --git a/src/main/java/com/youlai/boot/infrastructure/generator/mapper/DatabaseMapper.java b/src/main/java/com/youlai/boot/platform/generator/mapper/DatabaseMapper.java similarity index 78% rename from src/main/java/com/youlai/boot/infrastructure/generator/mapper/DatabaseMapper.java rename to src/main/java/com/youlai/boot/platform/generator/mapper/DatabaseMapper.java index a0277dc6..ecca1b3a 100644 --- a/src/main/java/com/youlai/boot/infrastructure/generator/mapper/DatabaseMapper.java +++ b/src/main/java/com/youlai/boot/platform/generator/mapper/DatabaseMapper.java @@ -1,10 +1,10 @@ -package com.youlai.boot.infrastructure.generator.mapper; +package com.youlai.boot.platform.generator.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.system.model.bo.ColumnMetaData; import com.youlai.boot.system.model.bo.TableMetaData; -import com.youlai.boot.system.model.entity.SysDept; +import com.youlai.boot.system.model.entity.Dept; import com.youlai.boot.system.model.query.TablePageQuery; import com.youlai.boot.system.model.vo.TablePageVO; import org.apache.ibatis.annotations.Mapper; @@ -13,7 +13,7 @@ import java.util.List; @Mapper -public interface DatabaseMapper extends BaseMapper { +public interface DatabaseMapper extends BaseMapper { Page getTablePage(Page page, TablePageQuery queryParams); diff --git a/src/main/java/com/youlai/boot/infrastructure/generator/mapper/GenConfigMapper.java b/src/main/java/com/youlai/boot/platform/generator/mapper/GenConfigMapper.java similarity index 67% rename from src/main/java/com/youlai/boot/infrastructure/generator/mapper/GenConfigMapper.java rename to src/main/java/com/youlai/boot/platform/generator/mapper/GenConfigMapper.java index 0c9f0208..9e973c2a 100644 --- a/src/main/java/com/youlai/boot/infrastructure/generator/mapper/GenConfigMapper.java +++ b/src/main/java/com/youlai/boot/platform/generator/mapper/GenConfigMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.infrastructure.generator.mapper; +package com.youlai.boot.platform.generator.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.infrastructure.generator.model.entity.GenConfig; +import com.youlai.boot.platform.generator.model.entity.GenConfig; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/infrastructure/generator/mapper/GenFieldConfigMapper.java b/src/main/java/com/youlai/boot/platform/generator/mapper/GenFieldConfigMapper.java similarity index 67% rename from src/main/java/com/youlai/boot/infrastructure/generator/mapper/GenFieldConfigMapper.java rename to src/main/java/com/youlai/boot/platform/generator/mapper/GenFieldConfigMapper.java index beb953ac..43607c50 100644 --- a/src/main/java/com/youlai/boot/infrastructure/generator/mapper/GenFieldConfigMapper.java +++ b/src/main/java/com/youlai/boot/platform/generator/mapper/GenFieldConfigMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.infrastructure.generator.mapper; +package com.youlai.boot.platform.generator.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig; +import com.youlai.boot.platform.generator.model.entity.GenFieldConfig; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/infrastructure/generator/model/entity/GenConfig.java b/src/main/java/com/youlai/boot/platform/generator/model/entity/GenConfig.java similarity index 92% rename from src/main/java/com/youlai/boot/infrastructure/generator/model/entity/GenConfig.java rename to src/main/java/com/youlai/boot/platform/generator/model/entity/GenConfig.java index 6f1e7b37..474ae2c8 100644 --- a/src/main/java/com/youlai/boot/infrastructure/generator/model/entity/GenConfig.java +++ b/src/main/java/com/youlai/boot/platform/generator/model/entity/GenConfig.java @@ -1,4 +1,4 @@ -package com.youlai.boot.infrastructure.generator.model.entity; +package com.youlai.boot.platform.generator.model.entity; import com.baomidou.mybatisplus.annotation.*; diff --git a/src/main/java/com/youlai/boot/infrastructure/generator/model/entity/GenFieldConfig.java b/src/main/java/com/youlai/boot/platform/generator/model/entity/GenFieldConfig.java similarity index 96% rename from src/main/java/com/youlai/boot/infrastructure/generator/model/entity/GenFieldConfig.java rename to src/main/java/com/youlai/boot/platform/generator/model/entity/GenFieldConfig.java index da556e4f..f00eae32 100644 --- a/src/main/java/com/youlai/boot/infrastructure/generator/model/entity/GenFieldConfig.java +++ b/src/main/java/com/youlai/boot/platform/generator/model/entity/GenFieldConfig.java @@ -1,4 +1,4 @@ -package com.youlai.boot.infrastructure.generator.model.entity; +package com.youlai.boot.platform.generator.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/com/youlai/boot/infrastructure/generator/model/form/GenConfigForm.java b/src/main/java/com/youlai/boot/platform/generator/model/form/GenConfigForm.java similarity index 97% rename from src/main/java/com/youlai/boot/infrastructure/generator/model/form/GenConfigForm.java rename to src/main/java/com/youlai/boot/platform/generator/model/form/GenConfigForm.java index f2a7c81a..df54e163 100644 --- a/src/main/java/com/youlai/boot/infrastructure/generator/model/form/GenConfigForm.java +++ b/src/main/java/com/youlai/boot/platform/generator/model/form/GenConfigForm.java @@ -1,4 +1,4 @@ -package com.youlai.boot.infrastructure.generator.model.form; +package com.youlai.boot.platform.generator.model.form; import com.youlai.boot.common.enums.FormTypeEnum; import com.youlai.boot.common.enums.QueryTypeEnum; diff --git a/src/main/java/com/youlai/boot/infrastructure/generator/service/GenConfigService.java b/src/main/java/com/youlai/boot/platform/generator/service/GenConfigService.java similarity index 60% rename from src/main/java/com/youlai/boot/infrastructure/generator/service/GenConfigService.java rename to src/main/java/com/youlai/boot/platform/generator/service/GenConfigService.java index 6e9a2478..6f9975fe 100644 --- a/src/main/java/com/youlai/boot/infrastructure/generator/service/GenConfigService.java +++ b/src/main/java/com/youlai/boot/platform/generator/service/GenConfigService.java @@ -1,7 +1,7 @@ -package com.youlai.boot.infrastructure.generator.service; +package com.youlai.boot.platform.generator.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.infrastructure.generator.model.entity.GenConfig; +import com.youlai.boot.platform.generator.model.entity.GenConfig; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/boot/infrastructure/generator/service/GenFieldConfigService.java b/src/main/java/com/youlai/boot/platform/generator/service/GenFieldConfigService.java similarity index 60% rename from src/main/java/com/youlai/boot/infrastructure/generator/service/GenFieldConfigService.java rename to src/main/java/com/youlai/boot/platform/generator/service/GenFieldConfigService.java index 568a6f6f..218c8559 100644 --- a/src/main/java/com/youlai/boot/infrastructure/generator/service/GenFieldConfigService.java +++ b/src/main/java/com/youlai/boot/platform/generator/service/GenFieldConfigService.java @@ -1,7 +1,7 @@ -package com.youlai.boot.infrastructure.generator.service; +package com.youlai.boot.platform.generator.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig; +import com.youlai.boot.platform.generator.model.entity.GenFieldConfig; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/boot/infrastructure/generator/service/GeneratorService.java b/src/main/java/com/youlai/boot/platform/generator/service/GeneratorService.java similarity index 90% rename from src/main/java/com/youlai/boot/infrastructure/generator/service/GeneratorService.java rename to src/main/java/com/youlai/boot/platform/generator/service/GeneratorService.java index 25411f61..b02d631c 100644 --- a/src/main/java/com/youlai/boot/infrastructure/generator/service/GeneratorService.java +++ b/src/main/java/com/youlai/boot/platform/generator/service/GeneratorService.java @@ -1,7 +1,7 @@ -package com.youlai.boot.infrastructure.generator.service; +package com.youlai.boot.platform.generator.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.infrastructure.generator.model.form.GenConfigForm; +import com.youlai.boot.platform.generator.model.form.GenConfigForm; import com.youlai.boot.system.model.query.TablePageQuery; import com.youlai.boot.system.model.vo.GeneratorPreviewVO; import com.youlai.boot.system.model.vo.TablePageVO; diff --git a/src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GenConfigServiceImpl.java b/src/main/java/com/youlai/boot/platform/generator/service/impl/GenConfigServiceImpl.java similarity index 57% rename from src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GenConfigServiceImpl.java rename to src/main/java/com/youlai/boot/platform/generator/service/impl/GenConfigServiceImpl.java index 23d55b67..361b7b76 100644 --- a/src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GenConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/generator/service/impl/GenConfigServiceImpl.java @@ -1,9 +1,9 @@ -package com.youlai.boot.infrastructure.generator.service.impl; +package com.youlai.boot.platform.generator.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.infrastructure.generator.mapper.GenConfigMapper; -import com.youlai.boot.infrastructure.generator.model.entity.GenConfig; -import com.youlai.boot.infrastructure.generator.service.GenConfigService; +import com.youlai.boot.platform.generator.mapper.GenConfigMapper; +import com.youlai.boot.platform.generator.model.entity.GenConfig; +import com.youlai.boot.platform.generator.service.GenConfigService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GenFieldConfigServiceImpl.java b/src/main/java/com/youlai/boot/platform/generator/service/impl/GenFieldConfigServiceImpl.java similarity index 58% rename from src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GenFieldConfigServiceImpl.java rename to src/main/java/com/youlai/boot/platform/generator/service/impl/GenFieldConfigServiceImpl.java index 1204253c..28ddb7f6 100644 --- a/src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GenFieldConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/generator/service/impl/GenFieldConfigServiceImpl.java @@ -1,9 +1,9 @@ -package com.youlai.boot.infrastructure.generator.service.impl; +package com.youlai.boot.platform.generator.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.infrastructure.generator.mapper.GenFieldConfigMapper; -import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig; -import com.youlai.boot.infrastructure.generator.service.GenFieldConfigService; +import com.youlai.boot.platform.generator.mapper.GenFieldConfigMapper; +import com.youlai.boot.platform.generator.model.entity.GenFieldConfig; +import com.youlai.boot.platform.generator.service.GenFieldConfigService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GeneratorServiceImpl.java b/src/main/java/com/youlai/boot/platform/generator/service/impl/GeneratorServiceImpl.java similarity index 95% rename from src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GeneratorServiceImpl.java rename to src/main/java/com/youlai/boot/platform/generator/service/impl/GeneratorServiceImpl.java index f5dcaa4f..e96b6ee7 100644 --- a/src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GeneratorServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/generator/service/impl/GeneratorServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.infrastructure.generator.service.impl; +package com.youlai.boot.platform.generator.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; @@ -11,26 +11,26 @@ import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.YouLaiBootApplication; +import com.youlai.boot.YouLaiApplication; import com.youlai.boot.common.enums.FormTypeEnum; import com.youlai.boot.common.enums.JavaTypeEnum; import com.youlai.boot.common.enums.QueryTypeEnum; import com.youlai.boot.config.property.GeneratorProperties; -import com.youlai.boot.infrastructure.generator.service.GenConfigService; -import com.youlai.boot.infrastructure.generator.service.GenFieldConfigService; -import com.youlai.boot.infrastructure.generator.service.GeneratorService; +import com.youlai.boot.platform.generator.service.GenConfigService; +import com.youlai.boot.platform.generator.service.GenFieldConfigService; +import com.youlai.boot.platform.generator.service.GeneratorService; import com.youlai.boot.system.converter.GenConfigConverter; import com.youlai.boot.common.exception.BusinessException; -import com.youlai.boot.infrastructure.generator.mapper.DatabaseMapper; +import com.youlai.boot.platform.generator.mapper.DatabaseMapper; import com.youlai.boot.system.model.bo.ColumnMetaData; import com.youlai.boot.system.model.bo.TableMetaData; -import com.youlai.boot.infrastructure.generator.model.entity.GenConfig; -import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig; -import com.youlai.boot.infrastructure.generator.model.form.GenConfigForm; +import com.youlai.boot.platform.generator.model.entity.GenConfig; +import com.youlai.boot.platform.generator.model.entity.GenFieldConfig; +import com.youlai.boot.platform.generator.model.form.GenConfigForm; import com.youlai.boot.system.model.query.TablePageQuery; import com.youlai.boot.system.model.vo.GeneratorPreviewVO; import com.youlai.boot.system.model.vo.TablePageVO; -import com.youlai.boot.system.service.SysMenuService; +import com.youlai.boot.system.service.MenuService; import lombok.RequiredArgsConstructor; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Value; @@ -58,7 +58,7 @@ public class GeneratorServiceImpl implements GeneratorService { private final GenConfigService genConfigService; private final GenFieldConfigService genFieldConfigService; private final GenConfigConverter genConfigConverter; - private final SysMenuService menuService; + private final MenuService menuService; @Value("${spring.profiles.active}") private String springProfilesActive; @@ -112,7 +112,7 @@ public class GeneratorServiceImpl implements GeneratorService { String entityName = StrUtil.toCamelCase(StrUtil.removePrefix(tableName, tableName.split("_")[0])); genConfig.setEntityName(entityName); - String packageName = YouLaiBootApplication.class.getPackageName(); + String packageName = YouLaiApplication.class.getPackageName(); genConfig.setPackageName(StrUtil.subBefore(packageName, ".", true)); genConfig.setModuleName(StrUtil.subAfter(packageName, ".", true)); diff --git a/src/main/java/com/youlai/boot/platform/mail/controller/MailController.java b/src/main/java/com/youlai/boot/platform/mail/controller/MailController.java new file mode 100644 index 00000000..04a1a3ed --- /dev/null +++ b/src/main/java/com/youlai/boot/platform/mail/controller/MailController.java @@ -0,0 +1,14 @@ +package com.youlai.boot.platform.mail.controller; + +import org.springframework.web.bind.annotation.*; + +/** + * 邮件控制层 + * + * @author Ray + * @since 2.10.0 + */ +@RestController +public class MailController { + +} diff --git a/src/main/java/com/youlai/boot/infrastructure/mail/service/MailService.java b/src/main/java/com/youlai/boot/platform/mail/service/MailService.java similarity index 68% rename from src/main/java/com/youlai/boot/infrastructure/mail/service/MailService.java rename to src/main/java/com/youlai/boot/platform/mail/service/MailService.java index 6a2697f3..f1304cfd 100644 --- a/src/main/java/com/youlai/boot/infrastructure/mail/service/MailService.java +++ b/src/main/java/com/youlai/boot/platform/mail/service/MailService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.infrastructure.mail.service; +package com.youlai.boot.platform.mail.service; /** * 邮件服务接口层 @@ -16,7 +16,7 @@ public interface MailService { * @param subject 邮件主题 * @param text 邮件内容 */ - boolean sendSimpleMail(String to, String subject, String text) ; + void sendMail(String to, String subject, String text) ; /** * 发送带附件的邮件 @@ -26,6 +26,6 @@ public interface MailService { * @param text 邮件内容 * @param filePath 附件路径 */ - boolean sendMailWithAttachment(String to, String subject, String text, String filePath); + void sendMailWithAttachment(String to, String subject, String text, String filePath); } diff --git a/src/main/java/com/youlai/boot/infrastructure/mail/service/impl/MailServiceImpl.java b/src/main/java/com/youlai/boot/platform/mail/service/impl/MailServiceImpl.java similarity index 83% rename from src/main/java/com/youlai/boot/infrastructure/mail/service/impl/MailServiceImpl.java rename to src/main/java/com/youlai/boot/platform/mail/service/impl/MailServiceImpl.java index 48501257..9ffc74b7 100644 --- a/src/main/java/com/youlai/boot/infrastructure/mail/service/impl/MailServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/mail/service/impl/MailServiceImpl.java @@ -1,7 +1,7 @@ -package com.youlai.boot.infrastructure.mail.service.impl; +package com.youlai.boot.platform.mail.service.impl; import com.youlai.boot.config.property.MailProperties; -import com.youlai.boot.infrastructure.mail.service.MailService; +import com.youlai.boot.platform.mail.service.MailService; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import lombok.RequiredArgsConstructor; @@ -37,7 +37,7 @@ public class MailServiceImpl implements MailService { * @param text 邮件内容 */ @Override - public boolean sendSimpleMail(String to, String subject, String text) { + public void sendMail(String to, String subject, String text) { try { SimpleMailMessage message = new SimpleMailMessage(); message.setFrom(mailProperties.getFrom()); @@ -45,11 +45,8 @@ public class MailServiceImpl implements MailService { message.setSubject(subject); message.setText(text); mailSender.send(message); - return true; } catch (Exception e) { - e.printStackTrace(); log.error("发送邮件失败{}", e.getMessage()); - return false; } } @@ -62,7 +59,7 @@ public class MailServiceImpl implements MailService { * @param filePath 附件路径 */ @Override - public boolean sendMailWithAttachment(String to, String subject, String text, String filePath) { + public void sendMailWithAttachment(String to, String subject, String text, String filePath) { MimeMessage message = mailSender.createMimeMessage(); try { MimeMessageHelper helper = new MimeMessageHelper(message, true); @@ -75,9 +72,8 @@ public class MailServiceImpl implements MailService { helper.addAttachment(file.getFilename(), file); mailSender.send(message); - return true; } catch (MessagingException e) { - return false; + log.error("发送邮件失败{}", e.getMessage()); } } } diff --git a/src/main/java/com/youlai/boot/platform/sms/controller/SmsController.java b/src/main/java/com/youlai/boot/platform/sms/controller/SmsController.java new file mode 100644 index 00000000..7d85c6c0 --- /dev/null +++ b/src/main/java/com/youlai/boot/platform/sms/controller/SmsController.java @@ -0,0 +1,22 @@ +package com.youlai.boot.platform.sms.controller; + +import com.youlai.boot.platform.sms.service.SmsService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * 短信控制层 + * + * @author Ray + * @since 2.10.0 + */ +public class SmsController { + + + +} diff --git a/src/main/java/com/youlai/boot/infrastructure/sms/service/SmsService.java b/src/main/java/com/youlai/boot/platform/sms/service/SmsService.java similarity index 90% rename from src/main/java/com/youlai/boot/infrastructure/sms/service/SmsService.java rename to src/main/java/com/youlai/boot/platform/sms/service/SmsService.java index b3d518c2..eb0309d7 100644 --- a/src/main/java/com/youlai/boot/infrastructure/sms/service/SmsService.java +++ b/src/main/java/com/youlai/boot/platform/sms/service/SmsService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.infrastructure.sms.service; +package com.youlai.boot.platform.sms.service; /** * 短信服务接口层 diff --git a/src/main/java/com/youlai/boot/infrastructure/sms/service/impl/AliyunSmsService.java b/src/main/java/com/youlai/boot/platform/sms/service/impl/AliyunSmsService.java similarity index 95% rename from src/main/java/com/youlai/boot/infrastructure/sms/service/impl/AliyunSmsService.java rename to src/main/java/com/youlai/boot/platform/sms/service/impl/AliyunSmsService.java index 64085dd0..328fa717 100644 --- a/src/main/java/com/youlai/boot/infrastructure/sms/service/impl/AliyunSmsService.java +++ b/src/main/java/com/youlai/boot/platform/sms/service/impl/AliyunSmsService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.infrastructure.sms.service.impl; +package com.youlai.boot.platform.sms.service.impl; import com.aliyuncs.CommonRequest; import com.aliyuncs.CommonResponse; @@ -9,7 +9,7 @@ import com.aliyuncs.exceptions.ServerException; import com.aliyuncs.http.MethodType; import com.aliyuncs.profile.DefaultProfile; import com.youlai.boot.config.property.AliyunSmsProperties; -import com.youlai.boot.infrastructure.sms.service.SmsService; +import com.youlai.boot.platform.sms.service.SmsService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/system/controller/WebsocketController.java b/src/main/java/com/youlai/boot/platform/websocket/controller/WebsocketController.java similarity index 97% rename from src/main/java/com/youlai/boot/system/controller/WebsocketController.java rename to src/main/java/com/youlai/boot/platform/websocket/controller/WebsocketController.java index 859da8fc..4a94135b 100644 --- a/src/main/java/com/youlai/boot/system/controller/WebsocketController.java +++ b/src/main/java/com/youlai/boot/platform/websocket/controller/WebsocketController.java @@ -1,4 +1,4 @@ -package com.youlai.boot.system.controller; +package com.youlai.boot.platform.websocket.controller; import com.youlai.boot.system.model.dto.ChatMessage; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/system/service/WebsocketService.java b/src/main/java/com/youlai/boot/platform/websocket/service/WebsocketService.java similarity index 68% rename from src/main/java/com/youlai/boot/system/service/WebsocketService.java rename to src/main/java/com/youlai/boot/platform/websocket/service/WebsocketService.java index 7c54cc9e..5c16d281 100644 --- a/src/main/java/com/youlai/boot/system/service/WebsocketService.java +++ b/src/main/java/com/youlai/boot/platform/websocket/service/WebsocketService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.system.service; +package com.youlai.boot.platform.websocket.service; public interface WebsocketService { diff --git a/src/main/java/com/youlai/boot/system/service/impl/WebsocketServiceImpl.java b/src/main/java/com/youlai/boot/platform/websocket/service/impl/WebsocketServiceImpl.java similarity index 92% rename from src/main/java/com/youlai/boot/system/service/impl/WebsocketServiceImpl.java rename to src/main/java/com/youlai/boot/platform/websocket/service/impl/WebsocketServiceImpl.java index bd7534ab..b8ac3cae 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/WebsocketServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/websocket/service/impl/WebsocketServiceImpl.java @@ -1,7 +1,7 @@ -package com.youlai.boot.system.service.impl; +package com.youlai.boot.platform.websocket.service.impl; import com.youlai.boot.system.event.UserConnectionEvent; -import com.youlai.boot.system.service.WebsocketService; +import com.youlai.boot.platform.websocket.service.WebsocketService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; diff --git a/src/main/java/com/youlai/boot/system/controller/SysConfigController.java b/src/main/java/com/youlai/boot/system/controller/ConfigController.java similarity index 81% rename from src/main/java/com/youlai/boot/system/controller/SysConfigController.java rename to src/main/java/com/youlai/boot/system/controller/ConfigController.java index ae810cf3..f1a2643a 100644 --- a/src/main/java/com/youlai/boot/system/controller/SysConfigController.java +++ b/src/main/java/com/youlai/boot/system/controller/ConfigController.java @@ -6,7 +6,7 @@ import com.youlai.boot.common.result.Result; import com.youlai.boot.system.model.form.ConfigForm; import com.youlai.boot.system.model.query.ConfigPageQuery; import com.youlai.boot.system.model.vo.ConfigVO; -import com.youlai.boot.system.service.SysConfigService; +import com.youlai.boot.system.service.ConfigService; import io.swagger.v3.oas.annotations.Parameter; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -29,15 +29,15 @@ import org.springframework.security.access.prepost.PreAuthorize; @RequiredArgsConstructor @Tag(name = "10.系统配置") @RequestMapping("/api/v1/config") -public class SysConfigController { +public class ConfigController { - private final SysConfigService sysConfigService; + private final ConfigService configService; @GetMapping("/page") @Operation(summary = "系统配置分页列表") @PreAuthorize("@ss.hasPerm('sys:config:query')") public PageResult page(@ParameterObject ConfigPageQuery configPageQuery) { - IPage result = sysConfigService.page(configPageQuery); + IPage result = configService.page(configPageQuery); return PageResult.success(result); } @@ -45,7 +45,7 @@ public class SysConfigController { @PostMapping @PreAuthorize("@ss.hasPerm('sys:config:add')") public Result save(@RequestBody @Valid ConfigForm configForm) { - return Result.judge(sysConfigService.save(configForm)); + return Result.judge(configService.save(configForm)); } @Operation(summary = "获取系统配置表单数据") @@ -53,7 +53,7 @@ public class SysConfigController { public Result getConfigForm( @Parameter(description = "系统配置ID") @PathVariable Long id ) { - ConfigForm formData = sysConfigService.getConfigFormData(id); + ConfigForm formData = configService.getConfigFormData(id); return Result.success(formData); } @@ -61,21 +61,21 @@ public class SysConfigController { @PatchMapping @PreAuthorize("@ss.hasPerm('sys:config:refresh')") public Result refreshCache() { - return Result.judge(sysConfigService.refreshCache()); + return Result.judge(configService.refreshCache()); } @PutMapping(value = "/{id}") @Operation(summary = "修改系统配置") @PreAuthorize("@ss.hasPerm('sys:config:update')") public Result update(@Valid @PathVariable Long id, @RequestBody ConfigForm configForm) { - return Result.judge(sysConfigService.edit(id, configForm)); + return Result.judge(configService.edit(id, configForm)); } @DeleteMapping("/{id}") @Operation(summary = "删除系统配置") @PreAuthorize("@ss.hasPerm('sys:config:delete')") public Result delete(@PathVariable Long id) { - return Result.judge(sysConfigService.delete(id)); + return Result.judge(configService.delete(id)); } } diff --git a/src/main/java/com/youlai/boot/system/controller/SysDeptController.java b/src/main/java/com/youlai/boot/system/controller/DeptController.java similarity index 89% rename from src/main/java/com/youlai/boot/system/controller/SysDeptController.java rename to src/main/java/com/youlai/boot/system/controller/DeptController.java index 6c72cd38..68b62ecf 100644 --- a/src/main/java/com/youlai/boot/system/controller/SysDeptController.java +++ b/src/main/java/com/youlai/boot/system/controller/DeptController.java @@ -1,14 +1,14 @@ package com.youlai.boot.system.controller; import com.youlai.boot.common.enums.LogModuleEnum; -import com.youlai.boot.common.annotation.NoRepeat; +import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.common.model.Option; import com.youlai.boot.common.result.Result; import com.youlai.boot.system.model.form.DeptForm; import com.youlai.boot.system.model.query.DeptQuery; import com.youlai.boot.system.model.vo.DeptVO; -import com.youlai.boot.common.annotation.LogAnnotation; -import com.youlai.boot.system.service.SysDeptService; +import com.youlai.boot.common.annotation.Log; +import com.youlai.boot.system.service.DeptService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -29,13 +29,13 @@ import java.util.List; @RestController @RequestMapping("/api/v1/dept") @RequiredArgsConstructor -public class SysDeptController { +public class DeptController { - private final SysDeptService deptService; + private final DeptService deptService; @Operation(summary = "部门列表") @GetMapping - @LogAnnotation( value = "部门列表",module = LogModuleEnum.DEPT) + @Log( value = "部门列表",module = LogModuleEnum.DEPT) public Result> getDeptList( DeptQuery queryParams ) { @@ -53,7 +53,7 @@ public class SysDeptController { @Operation(summary = "新增部门") @PostMapping @PreAuthorize("@ss.hasPerm('sys:dept:add')") - @NoRepeat + @RepeatSubmit public Result saveDept( @Valid @RequestBody DeptForm formData ) { diff --git a/src/main/java/com/youlai/boot/system/controller/SysDictController.java b/src/main/java/com/youlai/boot/system/controller/DictController.java similarity index 90% rename from src/main/java/com/youlai/boot/system/controller/SysDictController.java rename to src/main/java/com/youlai/boot/system/controller/DictController.java index e2a5f8af..1d79d993 100644 --- a/src/main/java/com/youlai/boot/system/controller/SysDictController.java +++ b/src/main/java/com/youlai/boot/system/controller/DictController.java @@ -7,10 +7,10 @@ import com.youlai.boot.common.result.Result; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.system.model.query.DictPageQuery; import com.youlai.boot.system.model.vo.DictPageVO; -import com.youlai.boot.common.annotation.NoRepeat; +import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.system.model.form.DictForm; -import com.youlai.boot.common.annotation.LogAnnotation; -import com.youlai.boot.system.service.SysDictService; +import com.youlai.boot.common.annotation.Log; +import com.youlai.boot.system.service.DictService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -30,13 +30,13 @@ import java.util.List; @RestController @RequestMapping("/api/v1/dict") @RequiredArgsConstructor -public class SysDictController { +public class DictController { - private final SysDictService dictService; + private final DictService dictService; @Operation(summary = "字典分页列表") @GetMapping("/page") - @LogAnnotation( value = "字典分页列表",module = LogModuleEnum.DICT) + @Log( value = "字典分页列表",module = LogModuleEnum.DICT) public PageResult getDictPage( DictPageQuery queryParams ) { @@ -72,7 +72,7 @@ public class SysDictController { @Operation(summary = "新增字典") @PostMapping @PreAuthorize("@ss.hasPerm('sys:dict:add')") - @NoRepeat + @RepeatSubmit public Result saveDict(@RequestBody DictForm formData) { boolean result = dictService.saveDict(formData); return Result.judge(result); diff --git a/src/main/java/com/youlai/boot/system/controller/SysLogController.java b/src/main/java/com/youlai/boot/system/controller/LogController.java similarity index 93% rename from src/main/java/com/youlai/boot/system/controller/SysLogController.java rename to src/main/java/com/youlai/boot/system/controller/LogController.java index 20bc84f9..f829a981 100644 --- a/src/main/java/com/youlai/boot/system/controller/SysLogController.java +++ b/src/main/java/com/youlai/boot/system/controller/LogController.java @@ -7,7 +7,7 @@ import com.youlai.boot.system.model.query.LogPageQuery; import com.youlai.boot.system.model.vo.LogPageVO; import com.youlai.boot.system.model.vo.VisitStatsVO; import com.youlai.boot.system.model.vo.VisitTrendVO; -import com.youlai.boot.system.service.SysLogService; +import com.youlai.boot.system.service.LogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -28,9 +28,9 @@ import java.util.List; @RestController @RequestMapping("/api/v1/logs") @RequiredArgsConstructor -public class SysLogController { +public class LogController { - private final SysLogService logService; + private final LogService logService; @Operation(summary = "日志分页列表") @GetMapping("/page") diff --git a/src/main/java/com/youlai/boot/system/controller/SysMenuController.java b/src/main/java/com/youlai/boot/system/controller/MenuController.java similarity index 91% rename from src/main/java/com/youlai/boot/system/controller/SysMenuController.java rename to src/main/java/com/youlai/boot/system/controller/MenuController.java index 046f56a3..22537cb7 100644 --- a/src/main/java/com/youlai/boot/system/controller/SysMenuController.java +++ b/src/main/java/com/youlai/boot/system/controller/MenuController.java @@ -2,15 +2,15 @@ package com.youlai.boot.system.controller; import com.youlai.boot.common.result.Result; import com.youlai.boot.common.enums.LogModuleEnum; -import com.youlai.boot.common.annotation.NoRepeat; +import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.system.model.form.MenuForm; import com.youlai.boot.system.model.query.MenuQuery; import com.youlai.boot.system.model.vo.MenuVO; import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.vo.RouteVO; -import com.youlai.boot.common.annotation.LogAnnotation; +import com.youlai.boot.common.annotation.Log; import com.youlai.boot.core.security.util.SecurityUtils; -import com.youlai.boot.system.service.SysMenuService; +import com.youlai.boot.system.service.MenuService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -33,13 +33,13 @@ import java.util.Set; @RequestMapping("/api/v1/menus") @RequiredArgsConstructor @Slf4j -public class SysMenuController { +public class MenuController { - private final SysMenuService menuService; + private final MenuService menuService; @Operation(summary = "菜单列表") @GetMapping - @LogAnnotation( value = "菜单列表",module = LogModuleEnum.MENU) + @Log( value = "菜单列表",module = LogModuleEnum.MENU) public Result> listMenus(MenuQuery queryParams) { List menuList = menuService.listMenus(queryParams); return Result.success(menuList); @@ -75,7 +75,7 @@ public class SysMenuController { @Operation(summary = "新增菜单") @PostMapping @PreAuthorize("@ss.hasPerm('sys:menu:add')") - @NoRepeat + @RepeatSubmit public Result addMenu(@RequestBody MenuForm menuForm) { boolean result = menuService.saveMenu(menuForm); return Result.judge(result); diff --git a/src/main/java/com/youlai/boot/system/controller/SysRoleController.java b/src/main/java/com/youlai/boot/system/controller/RoleController.java similarity index 92% rename from src/main/java/com/youlai/boot/system/controller/SysRoleController.java rename to src/main/java/com/youlai/boot/system/controller/RoleController.java index e9f758a1..54cdcf33 100644 --- a/src/main/java/com/youlai/boot/system/controller/SysRoleController.java +++ b/src/main/java/com/youlai/boot/system/controller/RoleController.java @@ -2,15 +2,15 @@ package com.youlai.boot.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.common.enums.LogModuleEnum; -import com.youlai.boot.common.annotation.NoRepeat; +import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.common.model.Option; import com.youlai.boot.common.result.PageResult; import com.youlai.boot.common.result.Result; import com.youlai.boot.system.model.form.RoleForm; import com.youlai.boot.system.model.query.RolePageQuery; import com.youlai.boot.system.model.vo.RolePageVO; -import com.youlai.boot.common.annotation.LogAnnotation; -import com.youlai.boot.system.service.SysRoleService; +import com.youlai.boot.common.annotation.Log; +import com.youlai.boot.system.service.RoleService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -33,13 +33,13 @@ import java.util.List; @RestController @RequestMapping("/api/v1/roles") @RequiredArgsConstructor -public class SysRoleController { +public class RoleController { - private final SysRoleService roleService; + private final RoleService roleService; @Operation(summary = "角色分页列表") @GetMapping("/page") - @LogAnnotation( value = "角色分页列表",module = LogModuleEnum.ROLE) + @Log( value = "角色分页列表",module = LogModuleEnum.ROLE) public PageResult getRolePage( RolePageQuery queryParams ) { @@ -57,7 +57,7 @@ public class SysRoleController { @Operation(summary = "新增角色") @PostMapping @PreAuthorize("@ss.hasPerm('sys:role:add')") - @NoRepeat + @RepeatSubmit public Result addRole(@Valid @RequestBody RoleForm roleForm) { boolean result = roleService.saveRole(roleForm); return Result.judge(result); diff --git a/src/main/java/com/youlai/boot/system/controller/SysUserController.java b/src/main/java/com/youlai/boot/system/controller/UserController.java similarity index 94% rename from src/main/java/com/youlai/boot/system/controller/SysUserController.java rename to src/main/java/com/youlai/boot/system/controller/UserController.java index d9537515..90586df2 100644 --- a/src/main/java/com/youlai/boot/system/controller/SysUserController.java +++ b/src/main/java/com/youlai/boot/system/controller/UserController.java @@ -4,6 +4,7 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.youlai.boot.system.model.entity.User; import com.youlai.boot.system.model.form.*; import com.youlai.boot.common.result.PageResult; import com.youlai.boot.common.result.Result; @@ -13,15 +14,14 @@ import com.youlai.boot.core.security.util.SecurityUtils; import com.youlai.boot.common.util.ExcelUtils; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.system.model.dto.UserImportDTO; -import com.youlai.boot.common.annotation.NoRepeat; +import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.system.listener.UserImportListener; -import com.youlai.boot.system.model.entity.SysUser; import com.youlai.boot.system.model.query.UserPageQuery; import com.youlai.boot.system.model.dto.UserExportDTO; import com.youlai.boot.system.model.vo.UserInfoVO; import com.youlai.boot.system.model.vo.UserPageVO; -import com.youlai.boot.common.annotation.LogAnnotation; -import com.youlai.boot.system.service.SysUserService; +import com.youlai.boot.common.annotation.Log; +import com.youlai.boot.system.service.UserService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -52,13 +52,13 @@ import java.util.List; @RestController @RequestMapping("/api/v1/users") @RequiredArgsConstructor -public class SysUserController { +public class UserController { - private final SysUserService userService; + private final UserService userService; @Operation(summary = "用户分页列表") @GetMapping("/page") - @LogAnnotation(value = "用户分页列表", module = LogModuleEnum.USER) + @Log(value = "用户分页列表", module = LogModuleEnum.USER) public PageResult listPagedUsers( UserPageQuery queryParams ) { @@ -69,7 +69,7 @@ public class SysUserController { @Operation(summary = "新增用户") @PostMapping @PreAuthorize("@ss.hasPerm('sys:user:add')") - @NoRepeat + @RepeatSubmit public Result saveUser( @RequestBody @Valid UserForm userForm ) { @@ -112,9 +112,9 @@ public class SysUserController { @Parameter(description = "用户ID") @PathVariable Long userId, @Parameter(description = "用户状态(1:启用;0:禁用)") @RequestParam Integer status ) { - boolean result = userService.update(new LambdaUpdateWrapper() - .eq(SysUser::getId, userId) - .set(SysUser::getStatus, status) + boolean result = userService.update(new LambdaUpdateWrapper() + .eq(User::getId, userId) + .set(User::getStatus, status) ); return Result.judge(result); } diff --git a/src/main/java/com/youlai/boot/system/converter/ConfigConverter.java b/src/main/java/com/youlai/boot/system/converter/ConfigConverter.java index 297b9287..dc448ecd 100644 --- a/src/main/java/com/youlai/boot/system/converter/ConfigConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/ConfigConverter.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.system.model.entity.SysConfig; +import com.youlai.boot.system.model.entity.Config; import com.youlai.boot.system.model.vo.ConfigVO; import com.youlai.boot.system.model.form.ConfigForm; import org.mapstruct.Mapper; @@ -15,9 +15,9 @@ import org.mapstruct.Mapper; @Mapper(componentModel = "spring") public interface ConfigConverter { - Page toPageVo(Page page); + Page toPageVo(Page page); - SysConfig toEntity(ConfigForm configForm); + Config toEntity(ConfigForm configForm); - ConfigForm toForm(SysConfig entity); + ConfigForm toForm(Config entity); } diff --git a/src/main/java/com/youlai/boot/system/converter/DeptConverter.java b/src/main/java/com/youlai/boot/system/converter/DeptConverter.java index 14c493a9..1ca1510e 100644 --- a/src/main/java/com/youlai/boot/system/converter/DeptConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/DeptConverter.java @@ -1,6 +1,6 @@ package com.youlai.boot.system.converter; -import com.youlai.boot.system.model.entity.SysDept; +import com.youlai.boot.system.model.entity.Dept; import com.youlai.boot.system.model.vo.DeptVO; import com.youlai.boot.system.model.form.DeptForm; import org.mapstruct.Mapper; @@ -14,10 +14,10 @@ import org.mapstruct.Mapper; @Mapper(componentModel = "spring") public interface DeptConverter { - DeptForm toForm(SysDept entity); + DeptForm toForm(Dept entity); - DeptVO toVo(SysDept entity); + DeptVO toVo(Dept entity); - SysDept toEntity(DeptForm deptForm); + Dept toEntity(DeptForm deptForm); } \ No newline at end of file diff --git a/src/main/java/com/youlai/boot/system/converter/DictConverter.java b/src/main/java/com/youlai/boot/system/converter/DictConverter.java index 8c7d1cef..b15d23fc 100644 --- a/src/main/java/com/youlai/boot/system/converter/DictConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/DictConverter.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.system.model.entity.SysDict; +import com.youlai.boot.system.model.entity.Dict; import com.youlai.boot.system.model.vo.DictPageVO; import com.youlai.boot.system.model.form.DictForm; import org.mapstruct.Mapper; @@ -15,9 +15,9 @@ import org.mapstruct.Mapper; @Mapper(componentModel = "spring") public interface DictConverter { - Page toPageVo(Page page); + Page toPageVo(Page page); - DictForm toForm(SysDict entity); + DictForm toForm(Dict entity); - SysDict toEntity(DictForm entity); + Dict toEntity(DictForm entity); } diff --git a/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java b/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java index 9c0eadae..ea49d58b 100644 --- a/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.system.model.entity.SysDictItem; +import com.youlai.boot.system.model.entity.DictItem; import com.youlai.boot.system.model.vo.DictPageVO; import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.form.DictForm; @@ -20,20 +20,20 @@ import java.util.List; @Mapper(componentModel = "spring") public interface DictItemConverter { - Page toPageVo(Page page); + Page toPageVo(Page page); - DictForm toForm(SysDictItem entity); + DictForm toForm(DictItem entity); - SysDictItem toEntity(DictForm.DictItem dictItems); - List toEntity(List dictItems); + DictItem toEntity(DictForm.DictItem dictItems); + List toEntity(List dictItems); - DictForm.DictItem toDictItem(SysDictItem entity); - List toDictItem(List entities); + DictForm.DictItem toDictItem(DictItem entity); + List toDictItem(List entities); @Mappings({ @Mapping(target = "value", source = "value"), @Mapping(target = "label", source = "name") }) - Option toOption(SysDictItem dictItem); - List> toOption(List dictItems); + Option toOption(DictItem dictItem); + List> toOption(List dictItems); } diff --git a/src/main/java/com/youlai/boot/system/converter/GenConfigConverter.java b/src/main/java/com/youlai/boot/system/converter/GenConfigConverter.java index b2d765da..e09b2cf8 100644 --- a/src/main/java/com/youlai/boot/system/converter/GenConfigConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/GenConfigConverter.java @@ -1,8 +1,8 @@ package com.youlai.boot.system.converter; -import com.youlai.boot.infrastructure.generator.model.entity.GenConfig; -import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig; -import com.youlai.boot.infrastructure.generator.model.form.GenConfigForm; +import com.youlai.boot.platform.generator.model.entity.GenConfig; +import com.youlai.boot.platform.generator.model.entity.GenFieldConfig; +import com.youlai.boot.platform.generator.model.form.GenConfigForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/src/main/java/com/youlai/boot/system/converter/MenuConverter.java b/src/main/java/com/youlai/boot/system/converter/MenuConverter.java index f27b5bf7..a360ed4e 100644 --- a/src/main/java/com/youlai/boot/system/converter/MenuConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/MenuConverter.java @@ -1,6 +1,6 @@ package com.youlai.boot.system.converter; -import com.youlai.boot.system.model.entity.SysMenu; +import com.youlai.boot.system.model.entity.Menu; import com.youlai.boot.system.model.vo.MenuVO; import com.youlai.boot.system.model.form.MenuForm; import org.mapstruct.Mapper; @@ -15,12 +15,12 @@ import org.mapstruct.Mapping; @Mapper(componentModel = "spring") public interface MenuConverter { - MenuVO toVo(SysMenu entity); + MenuVO toVo(Menu entity); @Mapping(target = "params", ignore = true) - MenuForm toForm(SysMenu entity); + MenuForm toForm(Menu entity); @Mapping(target = "params", ignore = true) - SysMenu toEntity(MenuForm menuForm); + Menu toEntity(MenuForm menuForm); } \ No newline at end of file diff --git a/src/main/java/com/youlai/boot/system/converter/RoleConverter.java b/src/main/java/com/youlai/boot/system/converter/RoleConverter.java index 38fd3404..2ef57392 100644 --- a/src/main/java/com/youlai/boot/system/converter/RoleConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/RoleConverter.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.system.model.entity.SysRole; +import com.youlai.boot.system.model.entity.Role; import com.youlai.boot.system.model.vo.RolePageVO; import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.form.RoleForm; @@ -20,17 +20,17 @@ import java.util.List; @Mapper(componentModel = "spring") public interface RoleConverter { - Page toPageVo(Page page); + Page toPageVo(Page page); @Mappings({ @Mapping(target = "value", source = "id"), @Mapping(target = "label", source = "name") }) - Option entity2Option(SysRole role); + Option entity2Option(Role role); - List> entities2Options(List roles); + List> entities2Options(List roles); - SysRole toEntity(RoleForm roleForm); + Role toEntity(RoleForm roleForm); - RoleForm toForm(SysRole entity); + RoleForm toForm(Role entity); } \ No newline at end of file diff --git a/src/main/java/com/youlai/boot/system/converter/UserConverter.java b/src/main/java/com/youlai/boot/system/converter/UserConverter.java index 5d2b3f19..8ba19974 100644 --- a/src/main/java/com/youlai/boot/system/converter/UserConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/UserConverter.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.system.model.entity.SysUser; +import com.youlai.boot.system.model.entity.User; import com.youlai.boot.system.model.vo.UserInfoVO; import com.youlai.boot.system.model.vo.UserPageVO; import com.youlai.boot.system.model.vo.UserProfileVO; @@ -30,20 +30,20 @@ public interface UserConverter { Page toPageVo(Page bo); - UserForm toForm(SysUser entity); + UserForm toForm(User entity); @InheritInverseConfiguration(name = "toForm") - SysUser toEntity(UserForm entity); + User toEntity(UserForm entity); @Mappings({ @Mapping(target = "userId", source = "id") }) - UserInfoVO toUserInfoVo(SysUser entity); + UserInfoVO toUserInfoVo(User entity); - SysUser toEntity(UserImportDTO vo); + User toEntity(UserImportDTO vo); UserProfileVO toProfileVO(UserBO bo); - SysUser toEntity(UserProfileForm formData); + User toEntity(UserProfileForm formData); } diff --git a/src/main/java/com/youlai/boot/system/listener/UserImportListener.java b/src/main/java/com/youlai/boot/system/listener/UserImportListener.java index cce542f4..9fb8b011 100644 --- a/src/main/java/com/youlai/boot/system/listener/UserImportListener.java +++ b/src/main/java/com/youlai/boot/system/listener/UserImportListener.java @@ -8,20 +8,20 @@ import cn.hutool.json.JSONUtil; import com.alibaba.excel.context.AnalysisContext; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.youlai.boot.common.base.BaseAnalysisEventListener; -import com.youlai.boot.system.model.entity.SysDept; -import com.youlai.boot.system.model.entity.SysRole; -import com.youlai.boot.system.model.entity.SysUser; -import com.youlai.boot.system.model.entity.SysUserRole; +import com.youlai.boot.system.model.entity.Dept; +import com.youlai.boot.system.model.entity.Role; +import com.youlai.boot.system.model.entity.User; +import com.youlai.boot.system.model.entity.UserRole; import com.youlai.boot.common.base.IBaseEnum; import com.youlai.boot.common.constant.SystemConstants; import com.youlai.boot.common.enums.GenderEnum; import com.youlai.boot.common.enums.StatusEnum; import com.youlai.boot.system.converter.UserConverter; import com.youlai.boot.system.model.dto.UserImportDTO; -import com.youlai.boot.system.service.SysDeptService; -import com.youlai.boot.system.service.SysRoleService; -import com.youlai.boot.system.service.SysUserRoleService; -import com.youlai.boot.system.service.SysUserService; +import com.youlai.boot.system.service.DeptService; +import com.youlai.boot.system.service.RoleService; +import com.youlai.boot.system.service.UserRoleService; +import com.youlai.boot.system.service.UserService; import lombok.extern.slf4j.Slf4j; import org.springframework.security.crypto.password.PasswordEncoder; @@ -49,19 +49,19 @@ public class UserImportListener extends BaseAnalysisEventListener // 导入返回信息 StringBuilder msg = new StringBuilder(); - private final SysUserService userService; + private final UserService userService; private final PasswordEncoder passwordEncoder; private final UserConverter userConverter; - private final SysRoleService roleService; - private final SysUserRoleService userRoleService; - private final SysDeptService deptService; + private final RoleService roleService; + private final UserRoleService userRoleService; + private final DeptService deptService; public UserImportListener() { - this.userService = SpringUtil.getBean(SysUserService.class); + this.userService = SpringUtil.getBean(UserService.class); this.passwordEncoder = SpringUtil.getBean(PasswordEncoder.class); - this.roleService = SpringUtil.getBean(SysRoleService.class); - this.userRoleService = SpringUtil.getBean(SysUserRoleService.class); - this.deptService = SpringUtil.getBean(SysDeptService.class); + this.roleService = SpringUtil.getBean(RoleService.class); + this.userRoleService = SpringUtil.getBean(UserRoleService.class); + this.deptService = SpringUtil.getBean(DeptService.class); this.userConverter = SpringUtil.getBean(UserConverter.class); } @@ -83,7 +83,7 @@ public class UserImportListener extends BaseAnalysisEventListener if (StrUtil.isBlank(username)) { validationMsg.append("用户名为空；"); } else { - long count = userService.count(new LambdaQueryWrapper().eq(SysUser::getUsername, username)); + long count = userService.count(new LambdaQueryWrapper().eq(User::getUsername, username)); if (count > 0) { validationMsg.append("用户名已存在；"); } @@ -105,7 +105,7 @@ public class UserImportListener extends BaseAnalysisEventListener if (validationMsg.isEmpty()) { // 校验通过，持久化至数据库 - SysUser entity = userConverter.toEntity(userImportDTO); + User entity = userConverter.toEntity(userImportDTO); entity.setPassword(passwordEncoder.encode(SystemConstants.DEFAULT_PASSWORD)); // 默认密码 // 性别翻译 String genderLabel = userImportDTO.getGenderLabel(); @@ -119,19 +119,19 @@ public class UserImportListener extends BaseAnalysisEventListener List roleIds = null; if (StrUtil.isNotBlank(roleCodes)) { roleIds = roleService.list( - new LambdaQueryWrapper() - .in(SysRole::getCode, (Object) roleCodes.split(",")) - .eq(SysRole::getStatus, StatusEnum.ENABLE.getValue()) - .select(SysRole::getId) + new LambdaQueryWrapper() + .in(Role::getCode, (Object) roleCodes.split(",")) + .eq(Role::getStatus, StatusEnum.ENABLE.getValue()) + .select(Role::getId) ).stream() - .map(SysRole::getId) + .map(Role::getId) .collect(Collectors.toList()); } // 部门解析 String deptCode = userImportDTO.getDeptCode(); if (StrUtil.isNotBlank(deptCode)) { - SysDept dept = deptService.getOne(new LambdaQueryWrapper().eq(SysDept::getCode, deptCode) - .select(SysDept::getId) + Dept dept = deptService.getOne(new LambdaQueryWrapper().eq(Dept::getCode, deptCode) + .select(Dept::getId) ); if (dept != null) { entity.setDeptId(dept.getId()); @@ -144,8 +144,8 @@ public class UserImportListener extends BaseAnalysisEventListener validCount++; // 保存用户角色关联 if (CollectionUtil.isNotEmpty(roleIds)) { - List userRoles = roleIds.stream() - .map(roleId -> new SysUserRole(entity.getId(), roleId)) + List userRoles = roleIds.stream() + .map(roleId -> new UserRole(entity.getId(), roleId)) .collect(Collectors.toList()); userRoleService.saveBatch(userRoles); } diff --git a/src/main/java/com/youlai/boot/system/mapper/SysConfigMapper.java b/src/main/java/com/youlai/boot/system/mapper/ConfigMapper.java similarity index 66% rename from src/main/java/com/youlai/boot/system/mapper/SysConfigMapper.java rename to src/main/java/com/youlai/boot/system/mapper/ConfigMapper.java index cc94aeaf..d63997dc 100644 --- a/src/main/java/com/youlai/boot/system/mapper/SysConfigMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/ConfigMapper.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.system.model.entity.SysConfig; +import com.youlai.boot.system.model.entity.Config; import org.apache.ibatis.annotations.Mapper; /** @@ -11,6 +11,6 @@ import org.apache.ibatis.annotations.Mapper; * @since 2024-7-29 11:41:04 */ @Mapper -public interface SysConfigMapper extends BaseMapper { +public interface ConfigMapper extends BaseMapper { } diff --git a/src/main/java/com/youlai/boot/system/mapper/SysDeptMapper.java b/src/main/java/com/youlai/boot/system/mapper/DeptMapper.java similarity index 69% rename from src/main/java/com/youlai/boot/system/mapper/SysDeptMapper.java rename to src/main/java/com/youlai/boot/system/mapper/DeptMapper.java index c320d9df..e00f27bf 100644 --- a/src/main/java/com/youlai/boot/system/mapper/SysDeptMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/DeptMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.youlai.boot.common.annotation.DataPermission; -import com.youlai.boot.system.model.entity.SysDept; +import com.youlai.boot.system.model.entity.Dept; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,9 +12,9 @@ import java.util.List; @Mapper -public interface SysDeptMapper extends BaseMapper { +public interface DeptMapper extends BaseMapper { @DataPermission(deptIdColumnName = "id") @Override - List selectList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + List selectList(@Param(Constants.WRAPPER) Wrapper queryWrapper); } diff --git a/src/main/java/com/youlai/boot/system/mapper/SysDictItemMapper.java b/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java similarity index 64% rename from src/main/java/com/youlai/boot/system/mapper/SysDictItemMapper.java rename to src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java index 1dc7fcf2..7f6a137c 100644 --- a/src/main/java/com/youlai/boot/system/mapper/SysDictItemMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.system.model.entity.SysDictItem; +import com.youlai.boot.system.model.entity.DictItem; import org.apache.ibatis.annotations.Mapper; /** @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper; * @since 2.9.0 */ @Mapper -public interface SysDictItemMapper extends BaseMapper { +public interface DictItemMapper extends BaseMapper { } diff --git a/src/main/java/com/youlai/boot/system/mapper/SysDictMapper.java b/src/main/java/com/youlai/boot/system/mapper/DictMapper.java similarity index 84% rename from src/main/java/com/youlai/boot/system/mapper/SysDictMapper.java rename to src/main/java/com/youlai/boot/system/mapper/DictMapper.java index 56f74d66..6fff142f 100644 --- a/src/main/java/com/youlai/boot/system/mapper/SysDictMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/DictMapper.java @@ -2,7 +2,7 @@ package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.system.model.entity.SysDict; +import com.youlai.boot.system.model.entity.Dict; import com.youlai.boot.system.model.query.DictPageQuery; import com.youlai.boot.system.model.vo.DictPageVO; import org.apache.ibatis.annotations.Mapper; @@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Mapper; * @since 2.9.0 */ @Mapper -public interface SysDictMapper extends BaseMapper { +public interface DictMapper extends BaseMapper { /** * 字典分页列表 diff --git a/src/main/java/com/youlai/boot/system/mapper/SysLogMapper.java b/src/main/java/com/youlai/boot/system/mapper/LogMapper.java similarity index 92% rename from src/main/java/com/youlai/boot/system/mapper/SysLogMapper.java rename to src/main/java/com/youlai/boot/system/mapper/LogMapper.java index d6f95d9a..a29bc6a8 100644 --- a/src/main/java/com/youlai/boot/system/mapper/SysLogMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/LogMapper.java @@ -2,7 +2,7 @@ package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.system.model.bo.VisitCount; -import com.youlai.boot.system.model.entity.SysLog; +import com.youlai.boot.system.model.entity.Log; import com.youlai.boot.system.model.query.LogPageQuery; import com.youlai.boot.system.model.vo.LogPageVO; import com.youlai.boot.system.model.vo.VisitStatsVO; @@ -19,7 +19,7 @@ import java.util.List; * @since 2.10.0 */ @Mapper -public interface SysLogMapper extends BaseMapper { +public interface LogMapper extends BaseMapper { /** * 获取日志分页列表 diff --git a/src/main/java/com/youlai/boot/system/mapper/SysMenuMapper.java b/src/main/java/com/youlai/boot/system/mapper/MenuMapper.java similarity index 78% rename from src/main/java/com/youlai/boot/system/mapper/SysMenuMapper.java rename to src/main/java/com/youlai/boot/system/mapper/MenuMapper.java index e5317350..73ae140f 100644 --- a/src/main/java/com/youlai/boot/system/mapper/SysMenuMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/MenuMapper.java @@ -2,7 +2,7 @@ package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.youlai.boot.system.model.bo.RouteBO; -import com.youlai.boot.system.model.entity.SysMenu; +import com.youlai.boot.system.model.entity.Menu; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -16,7 +16,7 @@ import java.util.Set; */ @Mapper -public interface SysMenuMapper extends BaseMapper { +public interface MenuMapper extends BaseMapper { /** * 获取菜单路由列表 diff --git a/src/main/java/com/youlai/boot/system/mapper/SysRoleMapper.java b/src/main/java/com/youlai/boot/system/mapper/RoleMapper.java similarity index 74% rename from src/main/java/com/youlai/boot/system/mapper/SysRoleMapper.java rename to src/main/java/com/youlai/boot/system/mapper/RoleMapper.java index 758324cd..b546cc98 100644 --- a/src/main/java/com/youlai/boot/system/mapper/SysRoleMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/RoleMapper.java @@ -1,13 +1,13 @@ package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.system.model.entity.SysRole; +import com.youlai.boot.system.model.entity.Role; import org.apache.ibatis.annotations.Mapper; import java.util.Set; @Mapper -public interface SysRoleMapper extends BaseMapper { +public interface RoleMapper extends BaseMapper { /** diff --git a/src/main/java/com/youlai/boot/system/mapper/SysRoleMenuMapper.java b/src/main/java/com/youlai/boot/system/mapper/RoleMenuMapper.java similarity index 85% rename from src/main/java/com/youlai/boot/system/mapper/SysRoleMenuMapper.java rename to src/main/java/com/youlai/boot/system/mapper/RoleMenuMapper.java index 8d488095..5f68f18e 100644 --- a/src/main/java/com/youlai/boot/system/mapper/SysRoleMenuMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/RoleMenuMapper.java @@ -2,7 +2,7 @@ package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.youlai.boot.system.model.bo.RolePermsBO; -import com.youlai.boot.system.model.entity.SysRoleMenu; +import com.youlai.boot.system.model.entity.RoleMenu; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -15,7 +15,7 @@ import java.util.Set; * @since 2022/6/4 */ @Mapper -public interface SysRoleMenuMapper extends BaseMapper { +public interface RoleMenuMapper extends BaseMapper { /** * 获取角色拥有的菜单ID集合 diff --git a/src/main/java/com/youlai/boot/system/mapper/SysUserMapper.java b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java similarity index 93% rename from src/main/java/com/youlai/boot/system/mapper/SysUserMapper.java rename to src/main/java/com/youlai/boot/system/mapper/UserMapper.java index 760b3470..2d6c3fed 100644 --- a/src/main/java/com/youlai/boot/system/mapper/SysUserMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java @@ -3,7 +3,7 @@ package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.system.model.bo.UserBO; -import com.youlai.boot.system.model.entity.SysUser; +import com.youlai.boot.system.model.entity.User; import com.youlai.boot.system.model.query.UserPageQuery; import com.youlai.boot.system.model.form.UserForm; import com.youlai.boot.common.annotation.DataPermission; @@ -20,7 +20,7 @@ import java.util.List; * @since 2022/1/14 */ @Mapper -public interface SysUserMapper extends BaseMapper { +public interface UserMapper extends BaseMapper { /** * 获取用户分页列表 diff --git a/src/main/java/com/youlai/boot/system/mapper/SysUserRoleMapper.java b/src/main/java/com/youlai/boot/system/mapper/UserRoleMapper.java similarity index 74% rename from src/main/java/com/youlai/boot/system/mapper/SysUserRoleMapper.java rename to src/main/java/com/youlai/boot/system/mapper/UserRoleMapper.java index df047efe..196c2a52 100644 --- a/src/main/java/com/youlai/boot/system/mapper/SysUserRoleMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/UserRoleMapper.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.system.model.entity.SysUserRole; +import com.youlai.boot.system.model.entity.UserRole; import org.apache.ibatis.annotations.Mapper; /** @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper; * @since 2022/1/15 */ @Mapper -public interface SysUserRoleMapper extends BaseMapper { +public interface UserRoleMapper extends BaseMapper { /** * 获取角色绑定的用户数 diff --git a/src/main/java/com/youlai/boot/system/model/entity/SysConfig.java b/src/main/java/com/youlai/boot/system/model/entity/Config.java similarity index 95% rename from src/main/java/com/youlai/boot/system/model/entity/SysConfig.java rename to src/main/java/com/youlai/boot/system/model/entity/Config.java index 95464996..a82a515c 100644 --- a/src/main/java/com/youlai/boot/system/model/entity/SysConfig.java +++ b/src/main/java/com/youlai/boot/system/model/entity/Config.java @@ -14,7 +14,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "系统配置") @TableName("sys_config") @Data -public class SysConfig extends BaseEntity { +public class Config extends BaseEntity { @Schema(description = "配置名称") private String configName; diff --git a/src/main/java/com/youlai/boot/system/model/entity/SysDept.java b/src/main/java/com/youlai/boot/system/model/entity/Dept.java similarity index 84% rename from src/main/java/com/youlai/boot/system/model/entity/SysDept.java rename to src/main/java/com/youlai/boot/system/model/entity/Dept.java index 7627fe5c..9083ffd2 100644 --- a/src/main/java/com/youlai/boot/system/model/entity/SysDept.java +++ b/src/main/java/com/youlai/boot/system/model/entity/Dept.java @@ -1,18 +1,20 @@ package com.youlai.boot.system.model.entity; +import com.baomidou.mybatisplus.annotation.TableName; import com.youlai.boot.common.base.BaseEntity; import lombok.Getter; import lombok.Setter; /** - * 部门 实体 + * 部门实体 * * @author Ray * @since 2024/06/23 */ +@TableName("sys_dept") @Getter @Setter -public class SysDept extends BaseEntity { +public class Dept extends BaseEntity { /** * 部门名称 diff --git a/src/main/java/com/youlai/boot/system/model/entity/SysDict.java b/src/main/java/com/youlai/boot/system/model/entity/Dict.java similarity index 79% rename from src/main/java/com/youlai/boot/system/model/entity/SysDict.java rename to src/main/java/com/youlai/boot/system/model/entity/Dict.java index ff58c043..586b4fa4 100644 --- a/src/main/java/com/youlai/boot/system/model/entity/SysDict.java +++ b/src/main/java/com/youlai/boot/system/model/entity/Dict.java @@ -1,5 +1,6 @@ package com.youlai.boot.system.model.entity; +import com.baomidou.mybatisplus.annotation.TableName; import com.youlai.boot.common.base.BaseEntity; import lombok.Data; @@ -9,8 +10,9 @@ import lombok.Data; * @author haoxr * @since 2022/12/17 */ +@TableName("sys_dict") @Data -public class SysDict extends BaseEntity { +public class Dict extends BaseEntity { /** * 类型名称 diff --git a/src/main/java/com/youlai/boot/system/model/entity/SysDictItem.java b/src/main/java/com/youlai/boot/system/model/entity/DictItem.java similarity index 85% rename from src/main/java/com/youlai/boot/system/model/entity/SysDictItem.java rename to src/main/java/com/youlai/boot/system/model/entity/DictItem.java index ba379e73..0750a3c8 100644 --- a/src/main/java/com/youlai/boot/system/model/entity/SysDictItem.java +++ b/src/main/java/com/youlai/boot/system/model/entity/DictItem.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** @@ -13,8 +14,9 @@ import lombok.Data; * @author haoxr * @since 2022/12/17 */ +@TableName("sys_dict_item") @Data -public class SysDictItem implements Serializable { +public class DictItem implements Serializable { /** * 主键 */ diff --git a/src/main/java/com/youlai/boot/system/model/entity/SysLog.java b/src/main/java/com/youlai/boot/system/model/entity/Log.java similarity index 94% rename from src/main/java/com/youlai/boot/system/model/entity/SysLog.java rename to src/main/java/com/youlai/boot/system/model/entity/Log.java index 2c9326f3..db4e8748 100644 --- a/src/main/java/com/youlai/boot/system/model/entity/SysLog.java +++ b/src/main/java/com/youlai/boot/system/model/entity/Log.java @@ -14,8 +14,9 @@ import lombok.Data; * @author Ray * @since 2.10.0 */ +@TableName("sys_log") @Data -public class SysLog implements Serializable { +public class Log implements Serializable { /** * 主键 */ diff --git a/src/main/java/com/youlai/boot/system/model/entity/SysMenu.java b/src/main/java/com/youlai/boot/system/model/entity/Menu.java similarity index 97% rename from src/main/java/com/youlai/boot/system/model/entity/SysMenu.java rename to src/main/java/com/youlai/boot/system/model/entity/Menu.java index d7c5cd32..cd5a1aae 100644 --- a/src/main/java/com/youlai/boot/system/model/entity/SysMenu.java +++ b/src/main/java/com/youlai/boot/system/model/entity/Menu.java @@ -9,14 +9,15 @@ import lombok.Setter; import java.time.LocalDateTime; /** - * 菜单 实体 + * 菜单实体 * * @author Ray * @since 2023/3/6 */ +@TableName("sys_menu") @Getter @Setter -public class SysMenu { +public class Menu { /** * 菜单ID */ diff --git a/src/main/java/com/youlai/boot/system/model/entity/SysRole.java b/src/main/java/com/youlai/boot/system/model/entity/Role.java similarity index 83% rename from src/main/java/com/youlai/boot/system/model/entity/SysRole.java rename to src/main/java/com/youlai/boot/system/model/entity/Role.java index 4cc58d11..724e5e35 100644 --- a/src/main/java/com/youlai/boot/system/model/entity/SysRole.java +++ b/src/main/java/com/youlai/boot/system/model/entity/Role.java @@ -1,18 +1,20 @@ package com.youlai.boot.system.model.entity; +import com.baomidou.mybatisplus.annotation.TableName; import com.youlai.boot.common.base.BaseEntity; import lombok.Getter; import lombok.Setter; /** - * 角色 实体 + * 角色实体 * * @author Ray * @since 2024/6/23 */ +@TableName("sys_role") @Getter @Setter -public class SysRole extends BaseEntity { +public class Role extends BaseEntity { /** * 角色名称 diff --git a/src/main/java/com/youlai/boot/system/model/entity/SysRoleMenu.java b/src/main/java/com/youlai/boot/system/model/entity/RoleMenu.java similarity index 81% rename from src/main/java/com/youlai/boot/system/model/entity/SysRoleMenu.java rename to src/main/java/com/youlai/boot/system/model/entity/RoleMenu.java index 03464b3e..a81c4c27 100644 --- a/src/main/java/com/youlai/boot/system/model/entity/SysRoleMenu.java +++ b/src/main/java/com/youlai/boot/system/model/entity/RoleMenu.java @@ -1,6 +1,7 @@ package com.youlai.boot.system.model.entity; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,10 +10,11 @@ import lombok.NoArgsConstructor; /** * 角色和菜单关联表 */ +@TableName("sys_role_menu") @Data @AllArgsConstructor @NoArgsConstructor -public class SysRoleMenu { +public class RoleMenu { /** * 角色ID */ diff --git a/src/main/java/com/youlai/boot/system/model/entity/SysUser.java b/src/main/java/com/youlai/boot/system/model/entity/User.java similarity index 87% rename from src/main/java/com/youlai/boot/system/model/entity/SysUser.java rename to src/main/java/com/youlai/boot/system/model/entity/User.java index 9e513182..e617910e 100644 --- a/src/main/java/com/youlai/boot/system/model/entity/SysUser.java +++ b/src/main/java/com/youlai/boot/system/model/entity/User.java @@ -1,15 +1,17 @@ package com.youlai.boot.system.model.entity; +import com.baomidou.mybatisplus.annotation.TableName; import com.youlai.boot.common.base.BaseEntity; import lombok.Getter; import lombok.Setter; /** - * 用户 实体 + * 用户实体 */ +@TableName("sys_user") @Getter @Setter -public class SysUser extends BaseEntity { +public class User extends BaseEntity { /** * 用户名 diff --git a/src/main/java/com/youlai/boot/system/model/entity/SysUserRole.java b/src/main/java/com/youlai/boot/system/model/entity/UserRole.java similarity index 82% rename from src/main/java/com/youlai/boot/system/model/entity/SysUserRole.java rename to src/main/java/com/youlai/boot/system/model/entity/UserRole.java index 1fbbcaec..9db979db 100644 --- a/src/main/java/com/youlai/boot/system/model/entity/SysUserRole.java +++ b/src/main/java/com/youlai/boot/system/model/entity/UserRole.java @@ -1,6 +1,7 @@ package com.youlai.boot.system.model.entity; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -12,10 +13,11 @@ import lombok.NoArgsConstructor; * @author haoxr * @since 2022/12/17 */ +@TableName("sys_user_role") @Data @AllArgsConstructor @NoArgsConstructor -public class SysUserRole { +public class UserRole { /** * 用户ID */ diff --git a/src/main/java/com/youlai/boot/system/service/SysConfigService.java b/src/main/java/com/youlai/boot/system/service/ConfigService.java similarity index 92% rename from src/main/java/com/youlai/boot/system/service/SysConfigService.java rename to src/main/java/com/youlai/boot/system/service/ConfigService.java index d842b4ae..988db94d 100644 --- a/src/main/java/com/youlai/boot/system/service/SysConfigService.java +++ b/src/main/java/com/youlai/boot/system/service/ConfigService.java @@ -2,7 +2,7 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.system.model.entity.SysConfig; +import com.youlai.boot.system.model.entity.Config; import com.youlai.boot.system.model.form.ConfigForm; import com.youlai.boot.system.model.query.ConfigPageQuery; import com.youlai.boot.system.model.vo.ConfigVO; @@ -13,7 +13,7 @@ import com.youlai.boot.system.model.vo.ConfigVO; * @author Theo * @since 2024-07-29 11:17:26 */ -public interface SysConfigService extends IService { +public interface ConfigService extends IService { /** * 分页查询系统配置 diff --git a/src/main/java/com/youlai/boot/system/service/SysDeptService.java b/src/main/java/com/youlai/boot/system/service/DeptService.java similarity index 92% rename from src/main/java/com/youlai/boot/system/service/SysDeptService.java rename to src/main/java/com/youlai/boot/system/service/DeptService.java index b293ca92..850a948e 100644 --- a/src/main/java/com/youlai/boot/system/service/SysDeptService.java +++ b/src/main/java/com/youlai/boot/system/service/DeptService.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.system.model.entity.SysDept; +import com.youlai.boot.system.model.entity.Dept; import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.form.DeptForm; import com.youlai.boot.system.model.query.DeptQuery; @@ -15,7 +15,7 @@ import java.util.List; * @author haoxr * @since 2021/8/22 */ -public interface SysDeptService extends IService { +public interface DeptService extends IService { /** * 部门列表 * diff --git a/src/main/java/com/youlai/boot/system/service/SysDictItemService.java b/src/main/java/com/youlai/boot/system/service/DictItemService.java similarity index 58% rename from src/main/java/com/youlai/boot/system/service/SysDictItemService.java rename to src/main/java/com/youlai/boot/system/service/DictItemService.java index c4a4b99d..f3114d68 100644 --- a/src/main/java/com/youlai/boot/system/service/SysDictItemService.java +++ b/src/main/java/com/youlai/boot/system/service/DictItemService.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.system.model.entity.SysDictItem; +import com.youlai.boot.system.model.entity.DictItem; /** * 字典项 接口 @@ -9,6 +9,6 @@ import com.youlai.boot.system.model.entity.SysDictItem; * @author Ray Hao * @since 2023/3/4 */ -public interface SysDictItemService extends IService { +public interface DictItemService extends IService { } diff --git a/src/main/java/com/youlai/boot/system/service/SysDictService.java b/src/main/java/com/youlai/boot/system/service/DictService.java similarity index 93% rename from src/main/java/com/youlai/boot/system/service/SysDictService.java rename to src/main/java/com/youlai/boot/system/service/DictService.java index 4b7309fd..1cf6c6a9 100644 --- a/src/main/java/com/youlai/boot/system/service/SysDictService.java +++ b/src/main/java/com/youlai/boot/system/service/DictService.java @@ -3,7 +3,7 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.boot.common.model.Option; -import com.youlai.boot.system.model.entity.SysDict; +import com.youlai.boot.system.model.entity.Dict; import com.youlai.boot.system.model.form.DictForm; import com.youlai.boot.system.model.query.DictPageQuery; import com.youlai.boot.system.model.vo.DictPageVO; @@ -16,7 +16,7 @@ import java.util.List; * @author haoxr * @since 2022/10/12 */ -public interface SysDictService extends IService { +public interface DictService extends IService { /** * 字典分页列表 diff --git a/src/main/java/com/youlai/boot/system/service/SysLogService.java b/src/main/java/com/youlai/boot/system/service/LogService.java similarity index 90% rename from src/main/java/com/youlai/boot/system/service/SysLogService.java rename to src/main/java/com/youlai/boot/system/service/LogService.java index 2bb7a589..ccfece2c 100644 --- a/src/main/java/com/youlai/boot/system/service/SysLogService.java +++ b/src/main/java/com/youlai/boot/system/service/LogService.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.system.model.entity.SysLog; +import com.youlai.boot.system.model.entity.Log; import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.boot.system.model.query.LogPageQuery; import com.youlai.boot.system.model.vo.LogPageVO; @@ -17,7 +17,7 @@ import java.util.List; * @author Ray * @since 2.10.0 */ -public interface SysLogService extends IService { +public interface LogService extends IService { /** * 获取日志分页列表 diff --git a/src/main/java/com/youlai/boot/system/service/SysMenuService.java b/src/main/java/com/youlai/boot/system/service/MenuService.java similarity index 89% rename from src/main/java/com/youlai/boot/system/service/SysMenuService.java rename to src/main/java/com/youlai/boot/system/service/MenuService.java index 99335b60..a6b9f763 100644 --- a/src/main/java/com/youlai/boot/system/service/SysMenuService.java +++ b/src/main/java/com/youlai/boot/system/service/MenuService.java @@ -1,10 +1,10 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.infrastructure.generator.model.entity.GenConfig; +import com.youlai.boot.platform.generator.model.entity.GenConfig; import com.youlai.boot.system.model.form.MenuForm; import com.youlai.boot.common.model.Option; -import com.youlai.boot.system.model.entity.SysMenu; +import com.youlai.boot.system.model.entity.Menu; import com.youlai.boot.system.model.query.MenuQuery; import com.youlai.boot.system.model.vo.MenuVO; import com.youlai.boot.system.model.vo.RouteVO; @@ -18,7 +18,7 @@ import java.util.Set; * @author haoxr * @since 2020/11/06 */ -public interface SysMenuService extends IService { +public interface MenuService extends IService { /** * 获取菜单表格列表 diff --git a/src/main/java/com/youlai/boot/system/service/SysRoleMenuService.java b/src/main/java/com/youlai/boot/system/service/RoleMenuService.java similarity index 89% rename from src/main/java/com/youlai/boot/system/service/SysRoleMenuService.java rename to src/main/java/com/youlai/boot/system/service/RoleMenuService.java index b8e7e3dc..dc9e47a4 100644 --- a/src/main/java/com/youlai/boot/system/service/SysRoleMenuService.java +++ b/src/main/java/com/youlai/boot/system/service/RoleMenuService.java @@ -2,7 +2,7 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.system.model.entity.SysRoleMenu; +import com.youlai.boot.system.model.entity.RoleMenu; import java.util.List; import java.util.Set; @@ -13,7 +13,7 @@ import java.util.Set; * @author haoxr * @since 2.5.0 */ -public interface SysRoleMenuService extends IService { +public interface RoleMenuService extends IService { /** * 获取角色拥有的菜单ID集合 diff --git a/src/main/java/com/youlai/boot/system/service/SysRoleService.java b/src/main/java/com/youlai/boot/system/service/RoleService.java similarity index 94% rename from src/main/java/com/youlai/boot/system/service/SysRoleService.java rename to src/main/java/com/youlai/boot/system/service/RoleService.java index ac63a157..348af800 100644 --- a/src/main/java/com/youlai/boot/system/service/SysRoleService.java +++ b/src/main/java/com/youlai/boot/system/service/RoleService.java @@ -3,7 +3,7 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.system.model.entity.SysRole; +import com.youlai.boot.system.model.entity.Role; import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.form.RoleForm; import com.youlai.boot.system.model.query.RolePageQuery; @@ -18,7 +18,7 @@ import java.util.Set; * @author haoxr * @since 2022/6/3 */ -public interface SysRoleService extends IService { +public interface RoleService extends IService { /** * 角色分页列表 diff --git a/src/main/java/com/youlai/boot/system/service/SysUserRoleService.java b/src/main/java/com/youlai/boot/system/service/UserRoleService.java similarity index 79% rename from src/main/java/com/youlai/boot/system/service/SysUserRoleService.java rename to src/main/java/com/youlai/boot/system/service/UserRoleService.java index 6c8b36d2..697b86ca 100644 --- a/src/main/java/com/youlai/boot/system/service/SysUserRoleService.java +++ b/src/main/java/com/youlai/boot/system/service/UserRoleService.java @@ -2,11 +2,11 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.system.model.entity.SysUserRole; +import com.youlai.boot.system.model.entity.UserRole; import java.util.List; -public interface SysUserRoleService extends IService { +public interface UserRoleService extends IService { /** * 保存用户角色 diff --git a/src/main/java/com/youlai/boot/system/service/SysUserService.java b/src/main/java/com/youlai/boot/system/service/UserService.java similarity index 96% rename from src/main/java/com/youlai/boot/system/service/SysUserService.java rename to src/main/java/com/youlai/boot/system/service/UserService.java index 3c9c0165..45eadd78 100644 --- a/src/main/java/com/youlai/boot/system/service/SysUserService.java +++ b/src/main/java/com/youlai/boot/system/service/UserService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.boot.common.enums.ContactType; import com.youlai.boot.system.model.dto.UserAuthInfo; import com.youlai.boot.system.model.dto.UserExportDTO; -import com.youlai.boot.system.model.entity.SysUser; +import com.youlai.boot.system.model.entity.User; import com.youlai.boot.system.model.query.UserPageQuery; import com.youlai.boot.system.model.vo.UserInfoVO; import com.youlai.boot.system.model.vo.UserPageVO; @@ -21,7 +21,7 @@ import java.util.List; * @author haoxr * @since 2022/1/14 */ -public interface SysUserService extends IService { +public interface UserService extends IService { /** * 用户分页列表 diff --git a/src/main/java/com/youlai/boot/system/service/impl/SysConfigServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java similarity index 70% rename from src/main/java/com/youlai/boot/system/service/impl/SysConfigServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java index 423d8f27..c7f8579f 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java @@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.system.converter.ConfigConverter; -import com.youlai.boot.system.mapper.SysConfigMapper; -import com.youlai.boot.system.model.entity.SysConfig; +import com.youlai.boot.system.mapper.ConfigMapper; +import com.youlai.boot.system.model.entity.Config; import com.youlai.boot.system.model.form.ConfigForm; import com.youlai.boot.system.model.query.ConfigPageQuery; import com.youlai.boot.system.model.vo.ConfigVO; -import com.youlai.boot.system.service.SysConfigService; +import com.youlai.boot.system.service.ConfigService; import com.youlai.boot.core.security.util.SecurityUtils; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; @@ -32,9 +32,9 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class SysConfigServiceImpl extends ServiceImpl implements SysConfigService { +public class ConfigServiceImpl extends ServiceImpl implements ConfigService { - private final SysConfigMapper sysConfigMapper; + private final ConfigMapper configMapper; private final ConfigConverter configConverter; @@ -57,15 +57,15 @@ public class SysConfigServiceImpl extends ServiceImpl page(ConfigPageQuery configPageQuery) { - Page page = new Page<>(configPageQuery.getPageNum(), configPageQuery.getPageSize()); + Page page = new Page<>(configPageQuery.getPageNum(), configPageQuery.getPageSize()); String keywords = configPageQuery.getKeywords(); - LambdaQueryWrapper query = new LambdaQueryWrapper() + LambdaQueryWrapper query = new LambdaQueryWrapper() .and(StringUtils.isNotBlank(keywords), - q -> q.like(SysConfig::getConfigKey, keywords) + q -> q.like(Config::getConfigKey, keywords) .or() - .like(SysConfig::getConfigName, keywords) + .like(Config::getConfigName, keywords) ); - Page pageList = this.page(page, query); + Page pageList = this.page(page, query); return configConverter.toPageVo(pageList); } @@ -78,11 +78,11 @@ public class SysConfigServiceImpl extends ServiceImpl().eq(SysConfig::getConfigKey, configForm.getConfigKey())) == 0, + super.count(new LambdaQueryWrapper().eq(Config::getConfigKey, configForm.getConfigKey())) == 0, "配置键已存在"); - SysConfig sysConfig = configConverter.toEntity(configForm); - sysConfig.setCreateBy(SecurityUtils.getUserId()); - return this.save(sysConfig); + Config config = configConverter.toEntity(configForm); + config.setCreateBy(SecurityUtils.getUserId()); + return this.save(config); } /** @@ -93,7 +93,7 @@ public class SysConfigServiceImpl extends ServiceImpl().eq(SysConfig::getConfigKey, configForm.getConfigKey()).ne(SysConfig::getId, id)) == 0, + super.count(new LambdaQueryWrapper().eq(Config::getConfigKey, configForm.getConfigKey()).ne(Config::getId, id)) == 0, "配置键已存在"); - SysConfig sysConfig = configConverter.toEntity(configForm); - sysConfig.setUpdateBy(SecurityUtils.getUserId()); - return this.updateById(sysConfig); + Config config = configConverter.toEntity(configForm); + config.setUpdateBy(SecurityUtils.getUserId()); + return this.updateById(config); } /** @@ -123,7 +123,7 @@ public class SysConfigServiceImpl extends ServiceImpl().eq(SysConfig::getId,id)); + return super.remove(new LambdaQueryWrapper().eq(Config::getId,id)); } return false; } @@ -136,9 +136,9 @@ public class SysConfigServiceImpl extends ServiceImpl list = this.list(); + List list = this.list(); if (list != null) { - Map map = list.stream().collect(Collectors.toMap(SysConfig::getConfigKey, SysConfig::getConfigValue)); + Map map = list.stream().collect(Collectors.toMap(Config::getConfigKey, Config::getConfigValue)); redisTemplate.opsForHash().putAll(RedisConstants.SYSTEM_CONFIG_KEY, map); return true; } diff --git a/src/main/java/com/youlai/boot/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java similarity index 80% rename from src/main/java/com/youlai/boot/system/service/impl/SysDeptServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java index 95f556df..98402189 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/SysDeptServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java @@ -6,8 +6,8 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.boot.system.converter.DeptConverter; -import com.youlai.boot.system.mapper.SysDeptMapper; -import com.youlai.boot.system.model.entity.SysDept; +import com.youlai.boot.system.mapper.DeptMapper; +import com.youlai.boot.system.model.entity.Dept; import com.youlai.boot.system.model.form.DeptForm; import com.youlai.boot.system.model.query.DeptQuery; import com.youlai.boot.system.model.vo.DeptVO; @@ -15,7 +15,7 @@ import com.youlai.boot.common.constant.SymbolConstant; import com.youlai.boot.common.constant.SystemConstants; import com.youlai.boot.common.enums.StatusEnum; import com.youlai.boot.common.model.Option; -import com.youlai.boot.system.service.SysDeptService; +import com.youlai.boot.system.service.DeptService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -32,7 +32,7 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class SysDeptServiceImpl extends ServiceImpl implements SysDeptService { +public class DeptServiceImpl extends ServiceImpl implements DeptService { private final DeptConverter deptConverter; @@ -47,11 +47,11 @@ public class SysDeptServiceImpl extends ServiceImpl impl Integer status = queryParams.getStatus(); // 查询数据 - List deptList = this.list( - new LambdaQueryWrapper() - .like(StrUtil.isNotBlank(keywords), SysDept::getName, keywords) - .eq(status != null, SysDept::getStatus, status) - .orderByAsc(SysDept::getSort) + List deptList = this.list( + new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(keywords), Dept::getName, keywords) + .eq(status != null, Dept::getStatus, status) + .orderByAsc(Dept::getSort) ); if (CollectionUtil.isEmpty(deptList)) { @@ -60,11 +60,11 @@ public class SysDeptServiceImpl extends ServiceImpl impl // 获取所有部门ID Set deptIds = deptList.stream() - .map(SysDept::getId) + .map(Dept::getId) .collect(Collectors.toSet()); // 获取父节点ID Set parentIds = deptList.stream() - .map(SysDept::getParentId) + .map(Dept::getParentId) .collect(Collectors.toSet()); // 获取根节点ID（递归的起点），即父节点ID中不包含在部门ID中的节点，注意这里不能拿顶级部门 O 作为根节点，因为部门筛选的时候 O 会被过滤掉 List rootIds = CollectionUtil.subtractToList(parentIds, deptIds); @@ -82,7 +82,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl * @param deptList 部门列表 * @return 部门树形列表 */ - public List recurDeptList(Long parentId, List deptList) { + public List recurDeptList(Long parentId, List deptList) { return deptList.stream() .filter(dept -> dept.getParentId().equals(parentId)) .map(dept -> { @@ -101,21 +101,21 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override public List> listDeptOptions() { - List deptList = this.list(new LambdaQueryWrapper() - .eq(SysDept::getStatus, StatusEnum.ENABLE.getValue()) - .select(SysDept::getId, SysDept::getParentId, SysDept::getName) - .orderByAsc(SysDept::getSort) + List deptList = this.list(new LambdaQueryWrapper() + .eq(Dept::getStatus, StatusEnum.ENABLE.getValue()) + .select(Dept::getId, Dept::getParentId, Dept::getName) + .orderByAsc(Dept::getSort) ); if (CollectionUtil.isEmpty(deptList)) { return Collections.EMPTY_LIST; } Set deptIds = deptList.stream() - .map(SysDept::getId) + .map(Dept::getId) .collect(Collectors.toSet()); Set parentIds = deptList.stream() - .map(SysDept::getParentId) + .map(Dept::getParentId) .collect(Collectors.toSet()); List rootIds = CollectionUtil.subtractToList(parentIds, deptIds); @@ -136,13 +136,13 @@ public class SysDeptServiceImpl extends ServiceImpl impl public Long saveDept(DeptForm formData) { // 校验部门名称是否存在 String code = formData.getCode(); - long count = this.count(new LambdaQueryWrapper() - .eq(SysDept::getCode, code) + long count = this.count(new LambdaQueryWrapper() + .eq(Dept::getCode, code) ); Assert.isTrue(count == 0, "部门编号已存在"); // form->entity - SysDept entity = deptConverter.toEntity(formData); + Dept entity = deptConverter.toEntity(formData); // 生成部门路径(tree_path)，格式：父节点tree_path + , + 父节点ID，用于删除部门时级联删除子部门 String treePath = generateDeptTreePath(formData.getParentId()); @@ -164,7 +164,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl */ @Override public DeptForm getDeptForm(Long deptId) { - SysDept entity = this.getById(deptId); + Dept entity = this.getById(deptId); return deptConverter.toForm(entity); } @@ -180,15 +180,15 @@ public class SysDeptServiceImpl extends ServiceImpl impl public Long updateDept(Long deptId, DeptForm formData) { // 校验部门名称/部门编号是否存在 String code = formData.getCode(); - long count = this.count(new LambdaQueryWrapper() - .ne(SysDept::getId, deptId) - .eq(SysDept::getCode, code) + long count = this.count(new LambdaQueryWrapper() + .ne(Dept::getId, deptId) + .eq(Dept::getCode, code) ); Assert.isTrue(count == 0, "部门编号已存在"); // form->entity - SysDept entity = deptConverter.toEntity(formData); + Dept entity = deptConverter.toEntity(formData); entity.setId(deptId); // 生成部门路径(tree_path)，格式：父节点tree_path + , + 父节点ID，用于删除部门时级联删除子部门 @@ -209,7 +209,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl * @param deptList 部门列表 * @return 部门表格层级列表 */ - public static List> recurDeptTreeOptions(long parentId, List deptList) { + public static List> recurDeptTreeOptions(long parentId, List deptList) { return CollectionUtil.emptyIfNull(deptList).stream() .filter(dept -> dept.getParentId().equals(parentId)) .map(dept -> { @@ -236,8 +236,8 @@ public class SysDeptServiceImpl extends ServiceImpl impl if (StrUtil.isNotBlank(ids)) { String[] menuIds = ids.split(SymbolConstant.COMMA); for (String deptId : menuIds) { - this.remove(new LambdaQueryWrapper() - .eq(SysDept::getId, deptId) + this.remove(new LambdaQueryWrapper() + .eq(Dept::getId, deptId) .or() .apply("CONCAT (',',tree_path,',') LIKE CONCAT('%,',{0},',%')", deptId)); } @@ -257,7 +257,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl if (SystemConstants.ROOT_NODE_ID.equals(parentId)) { treePath = String.valueOf(parentId); } else { - SysDept parent = this.getById(parentId); + Dept parent = this.getById(parentId); if (parent != null) { treePath = parent.getTreePath() + SymbolConstant.COMMA + parent.getId(); } diff --git a/src/main/java/com/youlai/boot/system/service/impl/SysDictItemServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java similarity index 52% rename from src/main/java/com/youlai/boot/system/service/impl/SysDictItemServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java index cba61cca..f5b73f84 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/SysDictItemServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java @@ -1,9 +1,9 @@ package com.youlai.boot.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.system.mapper.SysDictItemMapper; -import com.youlai.boot.system.model.entity.SysDictItem; -import com.youlai.boot.system.service.SysDictItemService; +import com.youlai.boot.system.mapper.DictItemMapper; +import com.youlai.boot.system.model.entity.DictItem; +import com.youlai.boot.system.service.DictItemService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; */ @Service @RequiredArgsConstructor -public class SysDictItemServiceImpl extends ServiceImpl implements SysDictItemService { +public class DictItemServiceImpl extends ServiceImpl implements DictItemService { } diff --git a/src/main/java/com/youlai/boot/system/service/impl/SysDictServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java similarity index 73% rename from src/main/java/com/youlai/boot/system/service/impl/SysDictServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java index 7a4c5fd6..8e3489a7 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/SysDictServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java @@ -8,15 +8,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.boot.system.converter.DictConverter; import com.youlai.boot.system.converter.DictItemConverter; -import com.youlai.boot.system.mapper.SysDictMapper; -import com.youlai.boot.system.model.entity.SysDict; -import com.youlai.boot.system.model.entity.SysDictItem; +import com.youlai.boot.system.mapper.DictMapper; +import com.youlai.boot.system.model.entity.Dict; +import com.youlai.boot.system.model.entity.DictItem; import com.youlai.boot.system.model.form.DictForm; import com.youlai.boot.system.model.query.DictPageQuery; import com.youlai.boot.system.model.vo.DictPageVO; import com.youlai.boot.common.model.Option; -import com.youlai.boot.system.service.SysDictItemService; -import com.youlai.boot.system.service.SysDictService; +import com.youlai.boot.system.service.DictItemService; +import com.youlai.boot.system.service.DictService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,9 +32,9 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class SysDictServiceImpl extends ServiceImpl implements SysDictService { +public class DictServiceImpl extends ServiceImpl implements DictService { - private final SysDictItemService dictItemService; + private final DictItemService dictItemService; private final DictConverter dictConverter; private final DictItemConverter dictItemConverter; @@ -61,11 +61,11 @@ public class SysDictServiceImpl extends ServiceImpl impl @Override public boolean saveDict(DictForm dictForm) { // 保存字典 - SysDict entity = dictConverter.toEntity(dictForm); + Dict entity = dictConverter.toEntity(dictForm); // 校验 code 是否唯一 - long count = this.count(new LambdaQueryWrapper() - .eq(SysDict::getCode, entity.getCode()) + long count = this.count(new LambdaQueryWrapper() + .eq(Dict::getCode, entity.getCode()) ); Assert.isTrue(count == 0, "字典编码已存在"); @@ -73,7 +73,7 @@ public class SysDictServiceImpl extends ServiceImpl impl // 保存字典项 if (result) { List dictFormDictItems = dictForm.getDictItems(); - List dictItems = dictItemConverter.toEntity(dictFormDictItems); + List dictItems = dictItemConverter.toEntity(dictFormDictItems); dictItems.forEach(dictItem -> dictItem.setDictId(entity.getId())); dictItemService.saveBatch(dictItems); } @@ -89,13 +89,13 @@ public class SysDictServiceImpl extends ServiceImpl impl @Override public DictForm getDictForm(Long id) { // 获取字典 - SysDict entity = this.getById(id); + Dict entity = this.getById(id); Assert.isTrue(entity != null, "字典不存在"); DictForm dictForm = dictConverter.toForm(entity); // 获取字典项集合 - List dictItems = dictItemService.list(new LambdaQueryWrapper() - .eq(SysDictItem::getDictId, id) + List dictItems = dictItemService.list(new LambdaQueryWrapper() + .eq(DictItem::getDictId, id) ); // 转换数据项 List dictItemList = dictItemConverter.toDictItem(dictItems); @@ -112,12 +112,12 @@ public class SysDictServiceImpl extends ServiceImpl impl @Override public boolean updateDict(Long id, DictForm dictForm) { // 更新字典 - SysDict entity = dictConverter.toEntity(dictForm); + Dict entity = dictConverter.toEntity(dictForm); // 校验 code 是否唯一 - long count = this.count(new LambdaQueryWrapper() - .eq(SysDict::getCode, entity.getCode()) - .ne(SysDict::getId, id) + long count = this.count(new LambdaQueryWrapper() + .eq(Dict::getCode, entity.getCode()) + .ne(Dict::getId, id) ); Assert.isTrue(count == 0, "字典编码已存在"); @@ -126,21 +126,21 @@ public class SysDictServiceImpl extends ServiceImpl impl if (result) { // 更新字典项 List dictFormDictItems = dictForm.getDictItems(); - List dictItems = dictItemConverter.toEntity(dictFormDictItems); + List dictItems = dictItemConverter.toEntity(dictFormDictItems); // 获取当前数据库中的字典项 - List currentDictItemEntities = dictItemService.list(new LambdaQueryWrapper() - .eq(SysDictItem::getDictId, id) + List currentDictItemEntities = dictItemService.list(new LambdaQueryWrapper() + .eq(DictItem::getDictId, id) ); // 获取当前数据库中存在的字典项ID集合 Set currentDictItemIds = currentDictItemEntities.stream() - .map(SysDictItem::getId) + .map(DictItem::getId) .collect(Collectors.toSet()); // 获取新提交的字典项ID集合 Set newAttrIds = dictItems.stream() - .map(SysDictItem::getId) + .map(DictItem::getId) .filter(Objects::nonNull) .collect(Collectors.toSet()); @@ -154,7 +154,7 @@ public class SysDictServiceImpl extends ServiceImpl impl } // 更新或新增字典项 - for (SysDictItem dictItem : dictItems) { + for (DictItem dictItem : dictItems) { if (dictItem.getId() != null && currentDictItemIds.contains(dictItem.getId())) { // 更新现有字典项 dictItemService.updateById(dictItem); @@ -187,8 +187,8 @@ public class SysDictServiceImpl extends ServiceImpl impl if (result) { // 删除字典下的字典项 dictItemService.remove( - new LambdaQueryWrapper() - .eq(SysDictItem::getDictId, id) + new LambdaQueryWrapper() + .eq(DictItem::getDictId, id) ); } } @@ -202,9 +202,9 @@ public class SysDictServiceImpl extends ServiceImpl impl @Override public List> listDictItemsByCode(String code) { // 根据字典编码获取字典ID - SysDict dict = this.getOne(new LambdaQueryWrapper() - .eq(SysDict::getCode, code) - .select(SysDict::getId) + Dict dict = this.getOne(new LambdaQueryWrapper() + .eq(Dict::getCode, code) + .select(Dict::getId) .last("limit 1") ); // 如果字典不存在，则返回空集合 @@ -213,9 +213,9 @@ public class SysDictServiceImpl extends ServiceImpl impl } // 获取字典项 - List dictItems = dictItemService.list( - new LambdaQueryWrapper() - .eq(SysDictItem::getDictId, dict.getId()) + List dictItems = dictItemService.list( + new LambdaQueryWrapper() + .eq(DictItem::getDictId, dict.getId()) ); // 转换为 Option @@ -227,9 +227,9 @@ public class SysDictServiceImpl extends ServiceImpl impl */ @Override public List> getDictList() { - return this.list(new LambdaQueryWrapper() - .eq(SysDict::getStatus, 1) - .select(SysDict::getName, SysDict::getCode) + return this.list(new LambdaQueryWrapper() + .eq(Dict::getStatus, 1) + .select(Dict::getName, Dict::getCode) ).stream() .map(dict -> new Option<>(dict.getCode(), dict.getName())) .toList(); diff --git a/src/main/java/com/youlai/boot/system/service/impl/SysLogServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java similarity index 93% rename from src/main/java/com/youlai/boot/system/service/impl/SysLogServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java index 54e12fb0..c8887e14 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/SysLogServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java @@ -2,14 +2,14 @@ package com.youlai.boot.system.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.system.mapper.SysLogMapper; +import com.youlai.boot.system.mapper.LogMapper; import com.youlai.boot.system.model.bo.VisitCount; -import com.youlai.boot.system.model.entity.SysLog; +import com.youlai.boot.system.model.entity.Log; import com.youlai.boot.system.model.query.LogPageQuery; import com.youlai.boot.system.model.vo.LogPageVO; import com.youlai.boot.system.model.vo.VisitStatsVO; import com.youlai.boot.system.model.vo.VisitTrendVO; -import com.youlai.boot.system.service.SysLogService; +import com.youlai.boot.system.service.LogService; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -26,8 +26,8 @@ import java.util.stream.Collectors; * @since 2.10.0 */ @Service -public class SysLogServiceImpl extends ServiceImpl - implements SysLogService { +public class LogServiceImpl extends ServiceImpl + implements LogService { /** * 获取日志分页列表 diff --git a/src/main/java/com/youlai/boot/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java similarity index 85% rename from src/main/java/com/youlai/boot/system/service/impl/SysMenuServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java index 9db0bfee..ddd927c9 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java @@ -11,10 +11,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.youlai.boot.system.converter.MenuConverter; -import com.youlai.boot.system.mapper.SysMenuMapper; +import com.youlai.boot.system.mapper.MenuMapper; import com.youlai.boot.system.model.bo.RouteBO; -import com.youlai.boot.infrastructure.generator.model.entity.GenConfig; -import com.youlai.boot.system.model.entity.SysMenu; +import com.youlai.boot.platform.generator.model.entity.GenConfig; +import com.youlai.boot.system.model.entity.Menu; import com.youlai.boot.system.model.form.MenuForm; import com.youlai.boot.system.model.query.MenuQuery; import com.youlai.boot.system.model.vo.MenuVO; @@ -24,8 +24,8 @@ import com.youlai.boot.common.enums.MenuTypeEnum; import com.youlai.boot.common.enums.StatusEnum; import com.youlai.boot.common.model.KeyValue; import com.youlai.boot.common.model.Option; -import com.youlai.boot.system.service.SysMenuService; -import com.youlai.boot.system.service.SysRoleMenuService; +import com.youlai.boot.system.service.MenuService; +import com.youlai.boot.system.service.RoleMenuService; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.cache.annotation.CacheEvict; @@ -42,11 +42,11 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class SysMenuServiceImpl extends ServiceImpl implements SysMenuService { +public class MenuServiceImpl extends ServiceImpl implements MenuService { private final MenuConverter menuConverter; - private final SysRoleMenuService roleMenuService; + private final RoleMenuService roleMenuService; /** @@ -56,18 +56,18 @@ public class SysMenuServiceImpl extends ServiceImpl impl */ @Override public List listMenus(MenuQuery queryParams) { - List menus = this.list(new LambdaQueryWrapper() - .like(StrUtil.isNotBlank(queryParams.getKeywords()), SysMenu::getName, queryParams.getKeywords()) - .orderByAsc(SysMenu::getSort) + List menus = this.list(new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(queryParams.getKeywords()), Menu::getName, queryParams.getKeywords()) + .orderByAsc(Menu::getSort) ); // 获取所有菜单ID Set menuIds = menus.stream() - .map(SysMenu::getId) + .map(Menu::getId) .collect(Collectors.toSet()); // 获取所有父级ID Set parentIds = menus.stream() - .map(SysMenu::getParentId) + .map(Menu::getParentId) .collect(Collectors.toSet()); // 获取根节点ID（递归的起点），即父节点ID中不包含在部门ID中的节点，注意这里不能拿顶级菜单 O 作为根节点，因为菜单筛选的时候 O 会被过滤掉 @@ -88,7 +88,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl * @param menuList 菜单列表 * @return 菜单列表 */ - private List buildMenuTree(Long parentId, List menuList) { + private List buildMenuTree(Long parentId, List menuList) { return CollectionUtil.emptyIfNull(menuList) .stream() .filter(menu -> menu.getParentId().equals(parentId)) @@ -107,9 +107,9 @@ public class SysMenuServiceImpl extends ServiceImpl impl */ @Override public List