diff --git a/src/main/java/com/youlai/boot/auth/controller/AuthController.java b/src/main/java/com/youlai/boot/auth/controller/AuthController.java index 2bf77ad8..3e640527 100644 --- a/src/main/java/com/youlai/boot/auth/controller/AuthController.java +++ b/src/main/java/com/youlai/boot/auth/controller/AuthController.java @@ -1,8 +1,8 @@ package com.youlai.boot.auth.controller; -import com.youlai.boot.auth.model.dto.WxMiniAppCodeLoginDto; -import com.youlai.boot.auth.model.dto.WxMiniAppPhoneLoginDto; -import com.youlai.boot.auth.model.vo.CaptchaVo; +import com.youlai.boot.auth.model.dto.WxMiniAppCodeLoginDTO; +import com.youlai.boot.auth.model.dto.WxMiniAppPhoneLoginDTO; +import com.youlai.boot.auth.model.vo.CaptchaVO; import com.youlai.boot.auth.model.dto.LoginRequest; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.core.web.Result; @@ -34,8 +34,8 @@ public class AuthController { @Operation(summary = "获取验证码") @GetMapping("/captcha") - public Result getCaptcha() { - CaptchaVo captcha = authService.getCaptcha(); + public Result getCaptcha() { + CaptchaVO captcha = authService.getCaptcha(); return Result.success(captcha); } @@ -81,14 +81,14 @@ public class AuthController { @Operation(summary = "微信小程序登录(Code)") @PostMapping("/wx/miniapp/code-login") - public Result loginByWxMiniAppCode(@RequestBody @Valid WxMiniAppCodeLoginDto loginDto) { + public Result loginByWxMiniAppCode(@RequestBody @Valid WxMiniAppCodeLoginDTO loginDto) { AuthenticationToken token = authService.loginByWxMiniAppCode(loginDto); return Result.success(token); } @Operation(summary = "微信小程序登录(手机号)") @PostMapping("/wx/miniapp/phone-login") - public Result loginByWxMiniAppPhone(@RequestBody @Valid WxMiniAppPhoneLoginDto loginDto) { + public Result loginByWxMiniAppPhone(@RequestBody @Valid WxMiniAppPhoneLoginDTO loginDto) { AuthenticationToken token = authService.loginByWxMiniAppPhone(loginDto); return Result.success(token); } diff --git a/src/main/java/com/youlai/boot/auth/model/dto/WxMiniAppCodeLoginDTO.java b/src/main/java/com/youlai/boot/auth/model/dto/WxMiniAppCodeLoginDTO.java index 7c8d98c5..ff58242f 100644 --- a/src/main/java/com/youlai/boot/auth/model/dto/WxMiniAppCodeLoginDTO.java +++ b/src/main/java/com/youlai/boot/auth/model/dto/WxMiniAppCodeLoginDTO.java @@ -10,7 +10,7 @@ import jakarta.validation.constraints.NotBlank; */ @Schema(description = "微信小程序Code登录请求参数") @Data -public class WxMiniAppCodeLoginDto { +public class WxMiniAppCodeLoginDTO { @Schema(description = "微信小程序登录时获取的code", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "code不能为空") diff --git a/src/main/java/com/youlai/boot/auth/model/dto/WxMiniAppPhoneLoginDTO.java b/src/main/java/com/youlai/boot/auth/model/dto/WxMiniAppPhoneLoginDTO.java index 1cf3c892..8dafaa1e 100644 --- a/src/main/java/com/youlai/boot/auth/model/dto/WxMiniAppPhoneLoginDTO.java +++ b/src/main/java/com/youlai/boot/auth/model/dto/WxMiniAppPhoneLoginDTO.java @@ -10,7 +10,7 @@ import jakarta.validation.constraints.NotBlank; */ @Schema(description = "微信小程序手机号登录请求参数") @Data -public class WxMiniAppPhoneLoginDto { +public class WxMiniAppPhoneLoginDTO { @Schema(description = "微信小程序登录时获取的code", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "code不能为空") diff --git a/src/main/java/com/youlai/boot/auth/model/vo/CaptchaVO.java b/src/main/java/com/youlai/boot/auth/model/vo/CaptchaVO.java index f7db81e2..a81fb3c6 100644 --- a/src/main/java/com/youlai/boot/auth/model/vo/CaptchaVO.java +++ b/src/main/java/com/youlai/boot/auth/model/vo/CaptchaVO.java @@ -13,7 +13,7 @@ import lombok.Data; @Schema(description = "验证码信息") @Data @Builder -public class CaptchaVo { +public class CaptchaVO { @Schema(description = "验证码缓存 ID") private String captchaId; diff --git a/src/main/java/com/youlai/boot/auth/service/AuthService.java b/src/main/java/com/youlai/boot/auth/service/AuthService.java index f0b6811c..2b1cb2b4 100644 --- a/src/main/java/com/youlai/boot/auth/service/AuthService.java +++ b/src/main/java/com/youlai/boot/auth/service/AuthService.java @@ -1,9 +1,9 @@ package com.youlai.boot.auth.service; -import com.youlai.boot.auth.model.vo.CaptchaVo; -import com.youlai.boot.auth.model.dto.WxMiniAppPhoneLoginDto; +import com.youlai.boot.auth.model.vo.CaptchaVO; +import com.youlai.boot.auth.model.dto.WxMiniAppPhoneLoginDTO; import com.youlai.boot.security.model.AuthenticationToken; -import com.youlai.boot.auth.model.dto.WxMiniAppCodeLoginDto; +import com.youlai.boot.auth.model.dto.WxMiniAppCodeLoginDTO; /** * 认证服务接口 @@ -32,7 +32,7 @@ public interface AuthService { * * @return 验证码 */ - CaptchaVo getCaptcha(); + CaptchaVO getCaptcha(); /** * 刷新令牌 @@ -56,7 +56,7 @@ public interface AuthService { * @param loginDto 登录参数 * @return 访问令牌 */ - AuthenticationToken loginByWxMiniAppCode(WxMiniAppCodeLoginDto loginDto); + AuthenticationToken loginByWxMiniAppCode(WxMiniAppCodeLoginDTO loginDto); /** * 微信小程序手机号登录 @@ -64,7 +64,7 @@ public interface AuthService { * @param loginDto 登录参数 * @return 访问令牌 */ - AuthenticationToken loginByWxMiniAppPhone(WxMiniAppPhoneLoginDto loginDto); + AuthenticationToken loginByWxMiniAppPhone(WxMiniAppPhoneLoginDTO loginDto); /** * 发送短信验证码 diff --git a/src/main/java/com/youlai/boot/auth/service/impl/AuthServiceImpl.java b/src/main/java/com/youlai/boot/auth/service/impl/AuthServiceImpl.java index 2070efd4..66d7cd1d 100644 --- a/src/main/java/com/youlai/boot/auth/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/youlai/boot/auth/service/impl/AuthServiceImpl.java @@ -5,9 +5,9 @@ import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.youlai.boot.auth.model.dto.WxMiniAppCodeLoginDto; -import com.youlai.boot.auth.model.dto.WxMiniAppPhoneLoginDto; -import com.youlai.boot.auth.model.vo.CaptchaVo; +import com.youlai.boot.auth.model.dto.WxMiniAppCodeLoginDTO; +import com.youlai.boot.auth.model.dto.WxMiniAppPhoneLoginDTO; +import com.youlai.boot.auth.model.vo.CaptchaVO; import com.youlai.boot.auth.service.AuthService; import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.constant.SecurityConstants; @@ -171,7 +171,7 @@ public class AuthServiceImpl implements AuthService { * @return 验证码 */ @Override - public CaptchaVo getCaptcha() { + public CaptchaVO getCaptcha() { String captchaType = captchaProperties.getType(); int width = captchaProperties.getWidth(); @@ -207,7 +207,7 @@ public class AuthServiceImpl implements AuthService { TimeUnit.SECONDS ); - return CaptchaVo.builder() + return CaptchaVO.builder() .captchaId(captchaId) .captchaBase64(imageBase64Data) .build(); @@ -231,7 +231,7 @@ public class AuthServiceImpl implements AuthService { * @return 访问令牌 */ @Override - public AuthenticationToken loginByWxMiniAppCode(WxMiniAppCodeLoginDto loginDto) { + public AuthenticationToken loginByWxMiniAppCode(WxMiniAppCodeLoginDTO loginDto) { // 1. 创建微信小程序认证令牌（未认证） WxMiniAppCodeAuthenticationToken authenticationToken = new WxMiniAppCodeAuthenticationToken(loginDto.getCode()); @@ -252,7 +252,7 @@ public class AuthServiceImpl implements AuthService { * @return 访问令牌 */ @Override - public AuthenticationToken loginByWxMiniAppPhone(WxMiniAppPhoneLoginDto loginDto) { + public AuthenticationToken loginByWxMiniAppPhone(WxMiniAppPhoneLoginDTO loginDto) { // 创建微信小程序手机号认证Token WxMiniAppPhoneAuthenticationToken authenticationToken = new WxMiniAppPhoneAuthenticationToken( loginDto.getCode(), diff --git a/src/main/java/com/youlai/boot/platform/ai/controller/AiAssistantController.java b/src/main/java/com/youlai/boot/platform/ai/controller/AiAssistantController.java index 72744ed2..1e8d6a1b 100644 --- a/src/main/java/com/youlai/boot/platform/ai/controller/AiAssistantController.java +++ b/src/main/java/com/youlai/boot/platform/ai/controller/AiAssistantController.java @@ -3,11 +3,11 @@ package com.youlai.boot.platform.ai.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.youlai.boot.core.web.PageResult; import com.youlai.boot.core.web.Result; -import com.youlai.boot.platform.ai.model.dto.AiExecuteRequestDto; -import com.youlai.boot.platform.ai.model.dto.AiParseRequestDto; -import com.youlai.boot.platform.ai.model.dto.AiParseResponseDto; +import com.youlai.boot.platform.ai.model.dto.AiExecuteRequestDTO; +import com.youlai.boot.platform.ai.model.dto.AiParseRequestDTO; +import com.youlai.boot.platform.ai.model.dto.AiParseResponseDTO; import com.youlai.boot.platform.ai.model.query.AiAssistantPageQuery; -import com.youlai.boot.platform.ai.model.vo.AiAssistantRecordVo; +import com.youlai.boot.platform.ai.model.vo.AiAssistantRecordVO; import com.youlai.boot.platform.ai.service.AiAssistantRecordService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -41,17 +41,17 @@ public class AiAssistantController { @Operation(summary = "解析自然语言命令") @PostMapping("/parse") - public Result parseCommand( - @RequestBody AiParseRequestDto request, + public Result parseCommand( + @RequestBody AiParseRequestDTO request, HttpServletRequest httpRequest ) { log.info("收到 AI 命令解析请求: {}", request.getCommand()); try { - AiParseResponseDto response = aiAssistantRecordService.parseCommand(request, httpRequest); + AiParseResponseDTO response = aiAssistantRecordService.parseCommand(request, httpRequest); return Result.success(response); } catch (Exception e) { log.error("命令解析失败", e); - return Result.success(AiParseResponseDto.builder() + return Result.success(AiParseResponseDTO.builder() .success(false) .error(e.getMessage()) .build()); @@ -61,7 +61,7 @@ public class AiAssistantController { @Operation(summary = "执行已解析的命令") @PostMapping("/execute") public Result executeCommand( - @RequestBody AiExecuteRequestDto request, + @RequestBody AiExecuteRequestDTO request, HttpServletRequest httpRequest ) { log.info("收到 AI 命令执行请求: {}", request.getFunctionCall().getName()); @@ -76,8 +76,8 @@ public class AiAssistantController { @Operation(summary = "获取 AI 命令记录分页列表") @GetMapping("/records") - public PageResult getRecordPage(AiAssistantPageQuery queryParams) { - IPage page = aiAssistantRecordService.getRecordPage(queryParams); + public PageResult getRecordPage(AiAssistantPageQuery queryParams) { + IPage page = aiAssistantRecordService.getRecordPage(queryParams); return PageResult.success(page); } diff --git a/src/main/java/com/youlai/boot/platform/ai/mapper/AiAssistantRecordMapper.java b/src/main/java/com/youlai/boot/platform/ai/mapper/AiAssistantRecordMapper.java index b5131587..140b1487 100644 --- a/src/main/java/com/youlai/boot/platform/ai/mapper/AiAssistantRecordMapper.java +++ b/src/main/java/com/youlai/boot/platform/ai/mapper/AiAssistantRecordMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.platform.ai.model.entity.AiAssistantRecord; import com.youlai.boot.platform.ai.model.query.AiAssistantPageQuery; -import com.youlai.boot.platform.ai.model.vo.AiAssistantRecordVo; +import com.youlai.boot.platform.ai.model.vo.AiAssistantRecordVO; import org.apache.ibatis.annotations.Mapper; @Mapper @@ -18,5 +18,5 @@ public interface AiAssistantRecordMapper extends BaseMapper { * @param queryParams 查询参数 * @return 分页结果 */ - IPage getRecordPage(Page page, AiAssistantPageQuery queryParams); + IPage getRecordPage(Page page, AiAssistantPageQuery queryParams); } diff --git a/src/main/java/com/youlai/boot/platform/ai/model/dto/AiExecuteRequestDTO.java b/src/main/java/com/youlai/boot/platform/ai/model/dto/AiExecuteRequestDTO.java index 80a3058e..c22b5dc7 100644 --- a/src/main/java/com/youlai/boot/platform/ai/model/dto/AiExecuteRequestDTO.java +++ b/src/main/java/com/youlai/boot/platform/ai/model/dto/AiExecuteRequestDTO.java @@ -9,7 +9,7 @@ import lombok.Data; * @since 3.0.0 */ @Data -public class AiExecuteRequestDto { +public class AiExecuteRequestDTO { /** * 关联的解析日志ID @@ -24,7 +24,7 @@ public class AiExecuteRequestDto { /** * 要执行的函数调用 */ - private AiFunctionCallDto functionCall; + private AiFunctionCallDTO functionCall; /** * 确认模式：auto=自动执行, manual=需要用户确认 diff --git a/src/main/java/com/youlai/boot/platform/ai/model/dto/AiExecuteResponseDTO.java b/src/main/java/com/youlai/boot/platform/ai/model/dto/AiExecuteResponseDTO.java index aa2c0371..f90173a0 100644 --- a/src/main/java/com/youlai/boot/platform/ai/model/dto/AiExecuteResponseDTO.java +++ b/src/main/java/com/youlai/boot/platform/ai/model/dto/AiExecuteResponseDTO.java @@ -15,7 +15,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -public class AiExecuteResponseDto { +public class AiExecuteResponseDTO { /** * 是否执行成功 diff --git a/src/main/java/com/youlai/boot/platform/ai/model/dto/AiFunctionCallDTO.java b/src/main/java/com/youlai/boot/platform/ai/model/dto/AiFunctionCallDTO.java index c5aab5b1..5e1dc9b0 100644 --- a/src/main/java/com/youlai/boot/platform/ai/model/dto/AiFunctionCallDTO.java +++ b/src/main/java/com/youlai/boot/platform/ai/model/dto/AiFunctionCallDTO.java @@ -16,7 +16,7 @@ import java.util.Map; @Builder @NoArgsConstructor @AllArgsConstructor -public class AiFunctionCallDto { +public class AiFunctionCallDTO { /** * 函数名称 diff --git a/src/main/java/com/youlai/boot/platform/ai/model/dto/AiParseRequestDTO.java b/src/main/java/com/youlai/boot/platform/ai/model/dto/AiParseRequestDTO.java index 35d7038a..f41cea59 100644 --- a/src/main/java/com/youlai/boot/platform/ai/model/dto/AiParseRequestDTO.java +++ b/src/main/java/com/youlai/boot/platform/ai/model/dto/AiParseRequestDTO.java @@ -10,7 +10,7 @@ import java.util.Map; * @since 3.0.0 */ @Data -public class AiParseRequestDto { +public class AiParseRequestDTO { /** * 用户输入的自然语言命令 diff --git a/src/main/java/com/youlai/boot/platform/ai/model/dto/AiParseResponseDTO.java b/src/main/java/com/youlai/boot/platform/ai/model/dto/AiParseResponseDTO.java index e8c9c372..783756ac 100644 --- a/src/main/java/com/youlai/boot/platform/ai/model/dto/AiParseResponseDTO.java +++ b/src/main/java/com/youlai/boot/platform/ai/model/dto/AiParseResponseDTO.java @@ -16,7 +16,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -public class AiParseResponseDto { +public class AiParseResponseDTO { /** * 解析日志ID（用于关联执行记录） @@ -31,7 +31,7 @@ public class AiParseResponseDto { /** * 解析后的函数调用列表 */ - private List functionCalls; + private List functionCalls; /** * AI 的理解和说明 diff --git a/src/main/java/com/youlai/boot/platform/ai/model/vo/AiAssistantRecordVo.java b/src/main/java/com/youlai/boot/platform/ai/model/vo/AiAssistantRecordVo.java index e72f4129..95249fc9 100644 --- a/src/main/java/com/youlai/boot/platform/ai/model/vo/AiAssistantRecordVo.java +++ b/src/main/java/com/youlai/boot/platform/ai/model/vo/AiAssistantRecordVo.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; */ @Data @Schema(description = "AI 助手行为记录Vo") -public class AiAssistantRecordVo implements Serializable { +public class AiAssistantRecordVO implements Serializable { @Schema(description = "主键ID") private String id; diff --git a/src/main/java/com/youlai/boot/platform/ai/service/AiAssistantRecordService.java b/src/main/java/com/youlai/boot/platform/ai/service/AiAssistantRecordService.java index 2e47a84a..03861aee 100644 --- a/src/main/java/com/youlai/boot/platform/ai/service/AiAssistantRecordService.java +++ b/src/main/java/com/youlai/boot/platform/ai/service/AiAssistantRecordService.java @@ -2,12 +2,12 @@ package com.youlai.boot.platform.ai.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.platform.ai.model.dto.AiExecuteRequestDto; -import com.youlai.boot.platform.ai.model.dto.AiParseRequestDto; -import com.youlai.boot.platform.ai.model.dto.AiParseResponseDto; +import com.youlai.boot.platform.ai.model.dto.AiExecuteRequestDTO; +import com.youlai.boot.platform.ai.model.dto.AiParseRequestDTO; +import com.youlai.boot.platform.ai.model.dto.AiParseResponseDTO; import com.youlai.boot.platform.ai.model.entity.AiAssistantRecord; import com.youlai.boot.platform.ai.model.query.AiAssistantPageQuery; -import com.youlai.boot.platform.ai.model.vo.AiAssistantRecordVo; +import com.youlai.boot.platform.ai.model.vo.AiAssistantRecordVO; import jakarta.servlet.http.HttpServletRequest; import java.util.List; @@ -29,7 +29,7 @@ public interface AiAssistantRecordService extends IService { * @param httpRequest HTTP 请求（用于获取 IP 等上下文） * @return 解析结果（包含 functionCalls 等信息） */ - AiParseResponseDto parseCommand(AiParseRequestDto request, HttpServletRequest httpRequest); + AiParseResponseDTO parseCommand(AiParseRequestDTO request, HttpServletRequest httpRequest); /** * 执行已解析的命令。 @@ -39,7 +39,7 @@ public interface AiAssistantRecordService extends IService { * @return 执行结果 * @throws Exception 执行异常 */ - Object executeCommand(AiExecuteRequestDto request, HttpServletRequest httpRequest) throws Exception; + Object executeCommand(AiExecuteRequestDTO request, HttpServletRequest httpRequest) throws Exception; /** * 获取 AI 助手行为记录分页列表 @@ -47,7 +47,7 @@ public interface AiAssistantRecordService extends IService { * @param queryParams 查询参数 * @return 分页列表 */ - IPage getRecordPage(AiAssistantPageQuery queryParams); + IPage getRecordPage(AiAssistantPageQuery queryParams); /** * 删除 AI 助手行为记录。 diff --git a/src/main/java/com/youlai/boot/platform/ai/service/impl/AiAssistantRecordServiceImpl.java b/src/main/java/com/youlai/boot/platform/ai/service/impl/AiAssistantRecordServiceImpl.java index a56b9709..3835916b 100644 --- a/src/main/java/com/youlai/boot/platform/ai/service/impl/AiAssistantRecordServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/ai/service/impl/AiAssistantRecordServiceImpl.java @@ -10,13 +10,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.boot.platform.ai.mapper.AiAssistantRecordMapper; -import com.youlai.boot.platform.ai.model.dto.AiExecuteRequestDto; -import com.youlai.boot.platform.ai.model.dto.AiFunctionCallDto; -import com.youlai.boot.platform.ai.model.dto.AiParseRequestDto; -import com.youlai.boot.platform.ai.model.dto.AiParseResponseDto; +import com.youlai.boot.platform.ai.model.dto.AiExecuteRequestDTO; +import com.youlai.boot.platform.ai.model.dto.AiFunctionCallDTO; +import com.youlai.boot.platform.ai.model.dto.AiParseRequestDTO; +import com.youlai.boot.platform.ai.model.dto.AiParseResponseDTO; import com.youlai.boot.platform.ai.model.entity.AiAssistantRecord; import com.youlai.boot.platform.ai.model.query.AiAssistantPageQuery; -import com.youlai.boot.platform.ai.model.vo.AiAssistantRecordVo; +import com.youlai.boot.platform.ai.model.vo.AiAssistantRecordVO; import com.youlai.boot.platform.ai.service.AiAssistantRecordService; import com.youlai.boot.platform.ai.tools.UserTools; import com.youlai.boot.security.util.SecurityUtils; @@ -64,12 +64,12 @@ public class AiAssistantRecordServiceImpl private final ChatClient chatClient; @Override - public AiParseResponseDto parseCommand(AiParseRequestDto request, HttpServletRequest httpRequest) { + public AiParseResponseDTO parseCommand(AiParseRequestDTO request, HttpServletRequest httpRequest) { long startTime = System.currentTimeMillis(); String command = Optional.ofNullable(request.getCommand()).orElse("").trim(); if (StrUtil.isBlank(command)) { - return AiParseResponseDto.builder() + return AiParseResponseDTO.builder() .success(false) .error("命令不能为空") .functionCalls(Collections.emptyList()) @@ -116,7 +116,7 @@ public class AiAssistantRecordServiceImpl this.save(commandRecord); - return AiParseResponseDto.builder() + return AiParseResponseDTO.builder() .parseLogId(commandRecord.getId()) .success(parseResult.success()) .functionCalls(parseResult.functionCalls()) @@ -142,7 +142,7 @@ public class AiAssistantRecordServiceImpl return SYSTEM_PROMPT; } - private String buildUserPrompt(AiParseRequestDto request) { + private String buildUserPrompt(AiParseRequestDTO request) { JSONObject payload = JSONUtil.createObj() .set("command", request.getCommand()) .set("currentRoute", request.getCurrentRoute()) @@ -180,7 +180,7 @@ public class AiAssistantRecordServiceImpl String provider = jsonObject.getStr("provider"); String model = jsonObject.getStr("model"); - List functionCalls = toFunctionCallList(jsonObject.getJSONArray("functionCalls")); + List functionCalls = toFunctionCallList(jsonObject.getJSONArray("functionCalls")); return new ParseResult(success, explanation, confidence, error, provider, model, functionCalls); } catch (Exception ex) { @@ -188,12 +188,12 @@ public class AiAssistantRecordServiceImpl } } - private List toFunctionCallList(JSONArray array) { + private List toFunctionCallList(JSONArray array) { if (array == null || array.isEmpty()) { return Collections.emptyList(); } - List result = new ArrayList<>(); + List result = new ArrayList<>(); for (Object element : array) { JSONObject functionJson = JSONUtil.parseObj(element); Map arguments = Optional.ofNullable(functionJson.getJSONObject("arguments")) @@ -201,7 +201,7 @@ public class AiAssistantRecordServiceImpl })) .orElse(Collections.emptyMap()); - result.add(AiFunctionCallDto.builder() + result.add(AiFunctionCallDTO.builder() .name(functionJson.getStr("name")) .description(functionJson.getStr("description")) .arguments(arguments) @@ -217,17 +217,17 @@ public class AiAssistantRecordServiceImpl String error, String provider, String model, - List functionCalls + List functionCalls ) { } @Override - public Object executeCommand(AiExecuteRequestDto request, HttpServletRequest httpRequest) throws Exception { + public Object executeCommand(AiExecuteRequestDTO request, HttpServletRequest httpRequest) throws Exception { Long userId = SecurityUtils.getUserId(); String username = SecurityUtils.getUsername(); String ipAddress = JakartaServletUtil.getClientIP(httpRequest); - AiFunctionCallDto functionCall = request.getFunctionCall(); + AiFunctionCallDTO functionCall = request.getFunctionCall(); AiAssistantRecord commandRecord; if (StrUtil.isNotBlank(request.getParseLogId())) { @@ -264,7 +264,7 @@ public class AiAssistantRecordServiceImpl } } - private Object executeFunctionCall(AiFunctionCallDto functionCall) { + private Object executeFunctionCall(AiFunctionCallDTO functionCall) { String functionName = functionCall.getName(); Map arguments = functionCall.getArguments(); @@ -294,8 +294,8 @@ public class AiAssistantRecordServiceImpl } @Override - public IPage getRecordPage(AiAssistantPageQuery queryParams) { - Page page = new Page<>(queryParams.getPageNum(), queryParams.getPageSize()); + public IPage getRecordPage(AiAssistantPageQuery queryParams) { + Page page = new Page<>(queryParams.getPageNum(), queryParams.getPageSize()); return this.baseMapper.getRecordPage(page, queryParams); } diff --git a/src/main/java/com/youlai/boot/platform/codegen/controller/CodegenController.java b/src/main/java/com/youlai/boot/platform/codegen/controller/CodegenController.java index 05abcfd8..5485dced 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/controller/CodegenController.java +++ b/src/main/java/com/youlai/boot/platform/codegen/controller/CodegenController.java @@ -8,8 +8,8 @@ import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.platform.codegen.service.CodegenService; import com.youlai.boot.platform.codegen.model.form.GenConfigForm; import com.youlai.boot.platform.codegen.model.query.TablePageQuery; -import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVo; -import com.youlai.boot.platform.codegen.model.vo.TablePageVo; +import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVO; +import com.youlai.boot.platform.codegen.model.vo.TablePageVO; import com.youlai.boot.common.annotation.Log; import com.youlai.boot.platform.codegen.service.GenTableService; import io.swagger.v3.oas.annotations.Operation; @@ -46,10 +46,10 @@ public class CodegenController { @Operation(summary = "获取数据表分页列表") @GetMapping("/table/page") @Log(value = "代码生成分页列表", module = LogModuleEnum.OTHER) - public PageResult getTablePage( + public PageResult getTablePage( TablePageQuery queryParams ) { - Page result = codegenService.getTablePage(queryParams); + Page result = codegenService.getTablePage(queryParams); return PageResult.success(result); } @@ -82,9 +82,9 @@ public class CodegenController { @Operation(summary = "获取预览生成代码") @GetMapping("/{tableName}/preview") @Log(value = "预览生成代码", module = LogModuleEnum.OTHER) - public Result> getTablePreviewData(@PathVariable String tableName, + public Result> getTablePreviewData(@PathVariable String tableName, @RequestParam(value = "pageType", required = false, defaultValue = "classic") String pageType) { - List list = codegenService.getCodegenPreviewData(tableName, pageType); + List list = codegenService.getCodegenPreviewData(tableName, pageType); return Result.success(list); } diff --git a/src/main/java/com/youlai/boot/platform/codegen/mapper/DatabaseMapper.java b/src/main/java/com/youlai/boot/platform/codegen/mapper/DatabaseMapper.java index 5737b495..3d742c63 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/mapper/DatabaseMapper.java +++ b/src/main/java/com/youlai/boot/platform/codegen/mapper/DatabaseMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.platform.codegen.model.bo.ColumnMetaData; import com.youlai.boot.platform.codegen.model.bo.TableMetaData; import com.youlai.boot.platform.codegen.model.query.TablePageQuery; -import com.youlai.boot.platform.codegen.model.vo.TablePageVo; +import com.youlai.boot.platform.codegen.model.vo.TablePageVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -27,7 +27,7 @@ public interface DatabaseMapper extends BaseMapper { * @param queryParams * @return */ - Page getTablePage(Page page, TablePageQuery queryParams); + Page getTablePage(Page page, TablePageQuery queryParams); /** * 获取表字段列表 diff --git a/src/main/java/com/youlai/boot/platform/codegen/model/vo/CodegenPreviewVO.java b/src/main/java/com/youlai/boot/platform/codegen/model/vo/CodegenPreviewVO.java index deeb7289..f9435b14 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/model/vo/CodegenPreviewVO.java +++ b/src/main/java/com/youlai/boot/platform/codegen/model/vo/CodegenPreviewVO.java @@ -5,7 +5,7 @@ import lombok.Data; @Schema(description = "代码生成代码预览Vo") @Data -public class CodegenPreviewVo { +public class CodegenPreviewVO { @Schema(description = "生成文件路径") private String path; diff --git a/src/main/java/com/youlai/boot/platform/codegen/model/vo/TablePageVO.java b/src/main/java/com/youlai/boot/platform/codegen/model/vo/TablePageVO.java index 2ac5184d..0b011181 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/model/vo/TablePageVO.java +++ b/src/main/java/com/youlai/boot/platform/codegen/model/vo/TablePageVO.java @@ -6,7 +6,7 @@ import lombok.Data; @Schema(description = "表视图对象") @Data -public class TablePageVo { +public class TablePageVO { @Schema(description = "表名称", example = "sys_user") private String tableName; diff --git a/src/main/java/com/youlai/boot/platform/codegen/service/CodegenService.java b/src/main/java/com/youlai/boot/platform/codegen/service/CodegenService.java index 7fcd0e29..32c020d1 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/service/CodegenService.java +++ b/src/main/java/com/youlai/boot/platform/codegen/service/CodegenService.java @@ -2,8 +2,8 @@ package com.youlai.boot.platform.codegen.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.platform.codegen.model.query.TablePageQuery; -import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVo; -import com.youlai.boot.platform.codegen.model.vo.TablePageVo; +import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVO; +import com.youlai.boot.platform.codegen.model.vo.TablePageVO; import java.util.List; @@ -21,7 +21,7 @@ public interface CodegenService { * @param queryParams 查询参数 * @return */ - Page getTablePage(TablePageQuery queryParams); + Page getTablePage(TablePageQuery queryParams); /** * 获取预览生成代码 @@ -29,7 +29,7 @@ public interface CodegenService { * @param tableName 表名 * @return */ - List getCodegenPreviewData(String tableName, String pageType); + List getCodegenPreviewData(String tableName, String pageType); /** * 下载代码 diff --git a/src/main/java/com/youlai/boot/platform/codegen/service/impl/CodegenServiceImpl.java b/src/main/java/com/youlai/boot/platform/codegen/service/impl/CodegenServiceImpl.java index 24bc902d..8722ec86 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/service/impl/CodegenServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/codegen/service/impl/CodegenServiceImpl.java @@ -21,8 +21,8 @@ import com.youlai.boot.platform.codegen.mapper.DatabaseMapper; import com.youlai.boot.platform.codegen.model.entity.GenTable; import com.youlai.boot.platform.codegen.model.entity.GenTableColumn; import com.youlai.boot.platform.codegen.model.query.TablePageQuery; -import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVo; -import com.youlai.boot.platform.codegen.model.vo.TablePageVo; +import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVO; +import com.youlai.boot.platform.codegen.model.vo.TablePageVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -61,8 +61,8 @@ public class CodegenServiceImpl implements CodegenService { * @param queryParams 查询参数 * @return 分页结果 */ - public Page getTablePage(TablePageQuery queryParams) { - Page page = new Page<>(queryParams.getPageNum(), queryParams.getPageSize()); + public Page getTablePage(TablePageQuery queryParams) { + Page page = new Page<>(queryParams.getPageNum(), queryParams.getPageSize()); // 设置排除的表 List excludeTables = codegenProperties.getExcludeTables(); queryParams.setExcludeTables(excludeTables); @@ -77,9 +77,9 @@ public class CodegenServiceImpl implements CodegenService { * @return 预览数据 */ @Override - public List getCodegenPreviewData(String tableName, String pageType) { + public List getCodegenPreviewData(String tableName, String pageType) { - List list = new ArrayList<>(); + List list = new ArrayList<>(); GenTable genTable = genTableService.getOne(new LambdaQueryWrapper() .eq(GenTable::getTableName, tableName) @@ -100,7 +100,7 @@ public class CodegenServiceImpl implements CodegenService { // 遍历模板配置 Map templateConfigs = codegenProperties.getTemplateConfigs(); for (Map.Entry templateConfigEntry : templateConfigs.entrySet()) { - CodegenPreviewVo previewVo = new CodegenPreviewVo(); + CodegenPreviewVO previewVo = new CodegenPreviewVO(); CodegenProperties.TemplateConfig templateConfig = templateConfigEntry.getValue(); @@ -325,9 +325,9 @@ public class CodegenServiceImpl implements CodegenService { * @param ui 页面类型 */ private void generateAndZipCode(String tableName, ZipOutputStream zip, String ui) { - List codePreviewList = getCodegenPreviewData(tableName, ui); + List codePreviewList = getCodegenPreviewData(tableName, ui); - for (CodegenPreviewVo codePreview : codePreviewList) { + for (CodegenPreviewVO codePreview : codePreviewList) { String fileName = codePreview.getFileName(); String content = codePreview.getContent(); String path = codePreview.getPath(); diff --git a/src/main/java/com/youlai/boot/platform/websocket/service/impl/WebSocketServiceImpl.java b/src/main/java/com/youlai/boot/platform/websocket/service/impl/WebSocketServiceImpl.java index 595b78a2..3ac76600 100644 --- a/src/main/java/com/youlai/boot/platform/websocket/service/impl/WebSocketServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/websocket/service/impl/WebSocketServiceImpl.java @@ -101,7 +101,7 @@ public class WebSocketServiceImpl implements WebSocketService { * * @return 在线用户信息列表 */ - public List getOnlineUsers() { + public List getOnlineUsers() { return userSessionRegistry.getOnlineUsers(); } diff --git a/src/main/java/com/youlai/boot/platform/websocket/session/UserSessionRegistry.java b/src/main/java/com/youlai/boot/platform/websocket/session/UserSessionRegistry.java index 34ee41da..658bbb5b 100644 --- a/src/main/java/com/youlai/boot/platform/websocket/session/UserSessionRegistry.java +++ b/src/main/java/com/youlai/boot/platform/websocket/session/UserSessionRegistry.java @@ -66,7 +66,7 @@ public class UserSessionRegistry { return sessions != null && !sessions.isEmpty(); } - public List getOnlineUsers() { + public List getOnlineUsers() { return userSessionsMap.entrySet().stream() .map(entry -> { String username = entry.getKey(); @@ -78,7 +78,7 @@ public class UserSessionRegistry { .min() .orElse(System.currentTimeMillis()); - return new OnlineUserDto(username, sessions.size(), earliestLoginTime); + return new OnlineUserDTO(username, sessions.size(), earliestLoginTime); }) .collect(Collectors.toList()); } @@ -95,7 +95,7 @@ public class UserSessionRegistry { @Data @AllArgsConstructor @NoArgsConstructor - public static class OnlineUserDto { + public static class OnlineUserDTO { private String username; private int sessionCount; private long loginTime; diff --git a/src/main/java/com/youlai/boot/system/controller/ConfigController.java b/src/main/java/com/youlai/boot/system/controller/ConfigController.java index f21bcb0d..a7df99ed 100644 --- a/src/main/java/com/youlai/boot/system/controller/ConfigController.java +++ b/src/main/java/com/youlai/boot/system/controller/ConfigController.java @@ -7,7 +7,7 @@ import com.youlai.boot.core.web.Result; import com.youlai.boot.common.annotation.Log; 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.model.vo.ConfigVO; import com.youlai.boot.system.service.ConfigService; import io.swagger.v3.oas.annotations.Parameter; import jakarta.validation.Valid; @@ -38,8 +38,8 @@ public class ConfigController { @GetMapping("/page") @PreAuthorize("@ss.hasPerm('sys:config:list')") @Log( value = "系统配置分页列表",module = LogModuleEnum.SETTING) - public PageResult page(@ParameterObject ConfigPageQuery configPageQuery) { - IPage result = configService.page(configPageQuery); + public PageResult page(@ParameterObject ConfigPageQuery configPageQuery) { + IPage result = configService.page(configPageQuery); return PageResult.success(result); } diff --git a/src/main/java/com/youlai/boot/system/controller/DeptController.java b/src/main/java/com/youlai/boot/system/controller/DeptController.java index ed5e6964..bb7fae27 100644 --- a/src/main/java/com/youlai/boot/system/controller/DeptController.java +++ b/src/main/java/com/youlai/boot/system/controller/DeptController.java @@ -6,7 +6,7 @@ import com.youlai.boot.common.model.Option; import com.youlai.boot.core.web.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.system.model.vo.DeptVO; import com.youlai.boot.common.annotation.Log; import com.youlai.boot.system.service.DeptService; import io.swagger.v3.oas.annotations.Parameter; @@ -36,10 +36,10 @@ public class DeptController { @Operation(summary = "部门列表") @GetMapping @Log( value = "部门列表",module = LogModuleEnum.DEPT) - public Result> getDeptList( + public Result> getDeptList( DeptQuery queryParams ) { - List list = deptService.getDeptList(queryParams); + List list = deptService.getDeptList(queryParams); return Result.success(list); } diff --git a/src/main/java/com/youlai/boot/system/controller/DictController.java b/src/main/java/com/youlai/boot/system/controller/DictController.java index 92ae56c2..ea0d2881 100644 --- a/src/main/java/com/youlai/boot/system/controller/DictController.java +++ b/src/main/java/com/youlai/boot/system/controller/DictController.java @@ -8,9 +8,9 @@ import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.system.model.form.DictItemForm; import com.youlai.boot.system.model.query.DictItemPageQuery; import com.youlai.boot.system.model.query.DictPageQuery; -import com.youlai.boot.system.model.vo.DictItemOptionVo; -import com.youlai.boot.system.model.vo.DictItemPageVo; -import com.youlai.boot.system.model.vo.DictPageVo; +import com.youlai.boot.system.model.vo.DictItemOptionVO; +import com.youlai.boot.system.model.vo.DictItemPageVO; +import com.youlai.boot.system.model.vo.DictPageVO; import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.system.model.form.DictForm; import com.youlai.boot.common.annotation.Log; @@ -50,10 +50,10 @@ public class DictController { @Operation(summary = "字典分页列表") @GetMapping("/page") @Log( value = "字典分页列表",module = LogModuleEnum.DICT) - public PageResult getDictPage( + public PageResult getDictPage( DictPageQuery queryParams ) { - Page result = dictService.getDictPage(queryParams); + Page result = dictService.getDictPage(queryParams); return PageResult.success(result); } @@ -127,21 +127,21 @@ public class DictController { //--------------------------------------------------- @Operation(summary = "字典项分页列表") @GetMapping("/{dictCode}/items/page") - public PageResult getDictItemPage( + public PageResult getDictItemPage( @PathVariable String dictCode, DictItemPageQuery queryParams ) { queryParams.setDictCode(dictCode); - Page result = dictItemService.getDictItemPage(queryParams); + Page result = dictItemService.getDictItemPage(queryParams); return PageResult.success(result); } @Operation(summary = "字典项列表") @GetMapping("/{dictCode}/items") - public Result> getDictItems( + public Result> getDictItems( @Parameter(description = "字典编码") @PathVariable String dictCode ) { - List list = dictItemService.getDictItems(dictCode); + List list = dictItemService.getDictItems(dictCode); return Result.success(list); } diff --git a/src/main/java/com/youlai/boot/system/controller/LogController.java b/src/main/java/com/youlai/boot/system/controller/LogController.java index d494f005..48e754ab 100644 --- a/src/main/java/com/youlai/boot/system/controller/LogController.java +++ b/src/main/java/com/youlai/boot/system/controller/LogController.java @@ -3,7 +3,7 @@ package com.youlai.boot.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.core.web.PageResult; import com.youlai.boot.system.model.query.LogPageQuery; -import com.youlai.boot.system.model.vo.LogPageVo; +import com.youlai.boot.system.model.vo.LogPageVO; import com.youlai.boot.system.service.LogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -26,10 +26,10 @@ public class LogController { @Operation(summary = "日志分页列表") @GetMapping("/page") - public PageResult getLogPage( + public PageResult getLogPage( LogPageQuery queryParams ) { - Page result = logService.getLogPage(queryParams); + Page result = logService.getLogPage(queryParams); return PageResult.success(result); } diff --git a/src/main/java/com/youlai/boot/system/controller/MenuController.java b/src/main/java/com/youlai/boot/system/controller/MenuController.java index 7fe0ffc6..e7e014a6 100644 --- a/src/main/java/com/youlai/boot/system/controller/MenuController.java +++ b/src/main/java/com/youlai/boot/system/controller/MenuController.java @@ -7,8 +7,8 @@ import com.youlai.boot.common.model.Option; import com.youlai.boot.core.web.Result; 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.system.model.vo.RouteVo; +import com.youlai.boot.system.model.vo.MenuVO; +import com.youlai.boot.system.model.vo.RouteVO; import com.youlai.boot.system.service.MenuService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -38,8 +38,8 @@ public class MenuController { @Operation(summary = "菜单列表") @GetMapping @Log(value = "菜单列表", module = LogModuleEnum.MENU) - public Result> getMenus(MenuQuery queryParams) { - List menuList = menuService.listMenus(queryParams); + public Result> getMenus(MenuQuery queryParams) { + List menuList = menuService.listMenus(queryParams); return Result.success(menuList); } @@ -55,8 +55,8 @@ public class MenuController { @Operation(summary = "当前用户菜单路由列表") @GetMapping("/routes") - public Result> getCurrentUserRoutes() { - List routeList = menuService.listCurrentUserRoutes(); + public Result> getCurrentUserRoutes() { + List routeList = menuService.listCurrentUserRoutes(); return Result.success(routeList); } diff --git a/src/main/java/com/youlai/boot/system/controller/NoticeController.java b/src/main/java/com/youlai/boot/system/controller/NoticeController.java index af153f36..02979681 100644 --- a/src/main/java/com/youlai/boot/system/controller/NoticeController.java +++ b/src/main/java/com/youlai/boot/system/controller/NoticeController.java @@ -5,9 +5,9 @@ import com.youlai.boot.core.web.PageResult; import com.youlai.boot.core.web.Result; import com.youlai.boot.system.model.form.NoticeForm; import com.youlai.boot.system.model.query.NoticePageQuery; -import com.youlai.boot.system.model.vo.NoticeDetailVo; -import com.youlai.boot.system.model.vo.NoticePageVo; -import com.youlai.boot.system.model.vo.UserNoticePageVo; +import com.youlai.boot.system.model.vo.NoticeDetailVO; +import com.youlai.boot.system.model.vo.NoticePageVO; +import com.youlai.boot.system.model.vo.UserNoticePageVO; import com.youlai.boot.system.service.NoticeService; import com.youlai.boot.system.service.UserNoticeService; import io.swagger.v3.oas.annotations.Operation; @@ -38,8 +38,8 @@ public class NoticeController { @Operation(summary = "通知公告分页列表") @GetMapping("/page") @PreAuthorize("@ss.hasPerm('sys:notice:list')") - public PageResult getNoticePage(NoticePageQuery queryParams) { - IPage result = noticeService.getNoticePage(queryParams); + public PageResult getNoticePage(NoticePageQuery queryParams) { + IPage result = noticeService.getNoticePage(queryParams); return PageResult.success(result); } @@ -63,10 +63,10 @@ public class NoticeController { @Operation(summary = "阅读获取通知公告详情") @GetMapping("/{id}/detail") - public Result getNoticeDetail( + public Result getNoticeDetail( @Parameter(description = "通知公告ID") @PathVariable Long id ) { - NoticeDetailVo detailVo = noticeService.getNoticeDetail(id); + NoticeDetailVO detailVo = noticeService.getNoticeDetail(id); return Result.success(detailVo); } @@ -120,10 +120,10 @@ public class NoticeController { @Operation(summary = "获取我的通知公告分页列表") @GetMapping("/my") - public PageResult getMyNoticePage( + public PageResult getMyNoticePage( NoticePageQuery queryParams ) { - IPage result = noticeService.getMyNoticePage(queryParams); + IPage result = noticeService.getMyNoticePage(queryParams); return PageResult.success(result); } } diff --git a/src/main/java/com/youlai/boot/system/controller/RoleController.java b/src/main/java/com/youlai/boot/system/controller/RoleController.java index 4546fe66..e178518d 100644 --- a/src/main/java/com/youlai/boot/system/controller/RoleController.java +++ b/src/main/java/com/youlai/boot/system/controller/RoleController.java @@ -8,7 +8,7 @@ import com.youlai.boot.core.web.PageResult; import com.youlai.boot.core.web.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.system.model.vo.RolePageVO; import com.youlai.boot.common.annotation.Log; import com.youlai.boot.system.service.RoleService; import io.swagger.v3.oas.annotations.Parameter; @@ -39,10 +39,10 @@ public class RoleController { @Operation(summary = "角色分页列表") @GetMapping("/page") @Log(value = "角色分页列表", module = LogModuleEnum.ROLE) - public PageResult getRolePage( + public PageResult getRolePage( RolePageQuery queryParams ) { - Page result = roleService.getRolePage(queryParams); + Page result = roleService.getRolePage(queryParams); return PageResult.success(result); } diff --git a/src/main/java/com/youlai/boot/system/controller/StatisticsController.java b/src/main/java/com/youlai/boot/system/controller/StatisticsController.java index 737e92a0..50184c5b 100644 --- a/src/main/java/com/youlai/boot/system/controller/StatisticsController.java +++ b/src/main/java/com/youlai/boot/system/controller/StatisticsController.java @@ -1,8 +1,8 @@ package com.youlai.boot.system.controller; import com.youlai.boot.core.web.Result; -import com.youlai.boot.system.model.vo.VisitStatsVo; -import com.youlai.boot.system.model.vo.VisitTrendVo; +import com.youlai.boot.system.model.vo.VisitStatsVO; +import com.youlai.boot.system.model.vo.VisitTrendVO; import com.youlai.boot.system.service.LogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -28,20 +28,20 @@ public class StatisticsController { @Operation(summary = "访问趋势统计") @GetMapping("/visits/trend") - public Result getVisitTrend( + public Result getVisitTrend( @Parameter(description = "开始时间", example = "2024-01-01") @RequestParam String startDate, @Parameter(description = "结束时间", example = "2024-12-31") @RequestParam String endDate ) { LocalDate start = LocalDate.parse(startDate); LocalDate end = LocalDate.parse(endDate); - VisitTrendVo data = logService.getVisitTrend(start, end); + VisitTrendVO data = logService.getVisitTrend(start, end); return Result.success(data); } @Operation(summary = "访问概览统计") @GetMapping("/visits/overview") - public Result getVisitOverview() { - VisitStatsVo result = logService.getVisitStats(); + public Result getVisitOverview() { + VisitStatsVO result = logService.getVisitStats(); return Result.success(result); } } diff --git a/src/main/java/com/youlai/boot/system/controller/UserController.java b/src/main/java/com/youlai/boot/system/controller/UserController.java index b2b436e2..5cfbe33c 100644 --- a/src/main/java/com/youlai/boot/system/controller/UserController.java +++ b/src/main/java/com/youlai/boot/system/controller/UserController.java @@ -14,14 +14,14 @@ import com.youlai.boot.core.web.Result; import com.youlai.boot.common.util.ExcelUtils; import com.youlai.boot.security.util.SecurityUtils; import com.youlai.boot.system.listener.UserImportListener; -import com.youlai.boot.system.model.dto.UserExportDto; -import com.youlai.boot.system.model.dto.UserImportDto; +import com.youlai.boot.system.model.dto.UserExportDTO; +import com.youlai.boot.system.model.dto.UserImportDTO; import com.youlai.boot.system.model.entity.User; import com.youlai.boot.system.model.form.*; import com.youlai.boot.system.model.query.UserPageQuery; -import com.youlai.boot.system.model.dto.CurrentUserDto; -import com.youlai.boot.system.model.vo.UserPageVo; -import com.youlai.boot.system.model.vo.UserProfileVo; +import com.youlai.boot.system.model.dto.CurrentUserDTO; +import com.youlai.boot.system.model.vo.UserPageVO; +import com.youlai.boot.system.model.vo.UserProfileVO; import com.youlai.boot.system.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -59,10 +59,10 @@ public class UserController { @Operation(summary = "用户分页列表") @GetMapping("/page") @Log(value = "用户分页列表", module = LogModuleEnum.USER) - public PageResult getUserPage( + public PageResult getUserPage( @Valid UserPageQuery queryParams ) { - IPage result = userService.getUserPage(queryParams); + IPage result = userService.getUserPage(queryParams); return PageResult.success(result); } @@ -130,8 +130,8 @@ public class UserController { @Operation(summary = "获取当前登录用户信息") @GetMapping("/me") @Log(value = "获取当前登录用户信息", module = LogModuleEnum.USER) - public Result getCurrentUser() { - CurrentUserDto currentUserDto = userService.getCurrentUserInfo(); + public Result getCurrentUser() { + CurrentUserDTO currentUserDto = userService.getCurrentUserInfo(); return Result.success(currentUserDto); } @@ -160,7 +160,7 @@ public class UserController { @Log(value = "导入用户", module = LogModuleEnum.USER) public Result importUsers(MultipartFile file) throws IOException { UserImportListener listener = new UserImportListener(); - ExcelUtils.importExcel(file.getInputStream(), UserImportDto.class, listener); + ExcelUtils.importExcel(file.getInputStream(), UserImportDTO.class, listener); return Result.success(listener.getExcelResult()); } @@ -173,17 +173,17 @@ public class UserController { response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(fileName, StandardCharsets.UTF_8)); - List exportUserList = userService.listExportUsers(queryParams); - EasyExcel.write(response.getOutputStream(), UserExportDto.class).sheet("用户列表") + List exportUserList = userService.listExportUsers(queryParams); + EasyExcel.write(response.getOutputStream(), UserExportDTO.class).sheet("用户列表") .doWrite(exportUserList); } @Operation(summary = "获取个人中心用户信息") @GetMapping("/profile") @Log(value = "获取个人中心用户信息", module = LogModuleEnum.USER) - public Result getUserProfile() { + public Result getUserProfile() { Long userId = SecurityUtils.getUserId(); - UserProfileVo userProfile = userService.getUserProfile(userId); + UserProfileVO userProfile = userService.getUserProfile(userId); return Result.success(userProfile); } 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 03e01c5d..dc448ecd 100644 --- a/src/main/java/com/youlai/boot/system/converter/ConfigConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/ConfigConverter.java @@ -2,7 +2,7 @@ package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.system.model.entity.Config; -import com.youlai.boot.system.model.vo.ConfigVo; +import com.youlai.boot.system.model.vo.ConfigVO; import com.youlai.boot.system.model.form.ConfigForm; import org.mapstruct.Mapper; @@ -15,7 +15,7 @@ import org.mapstruct.Mapper; @Mapper(componentModel = "spring") public interface ConfigConverter { - Page toPageVo(Page page); + Page toPageVo(Page page); Config toEntity(ConfigForm configForm); 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 9952f3f6..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,7 +1,7 @@ package com.youlai.boot.system.converter; import com.youlai.boot.system.model.entity.Dept; -import com.youlai.boot.system.model.vo.DeptVo; +import com.youlai.boot.system.model.vo.DeptVO; import com.youlai.boot.system.model.form.DeptForm; import org.mapstruct.Mapper; @@ -16,7 +16,7 @@ public interface DeptConverter { DeptForm toForm(Dept entity); - DeptVo toVo(Dept entity); + DeptVO toVo(Dept entity); Dept toEntity(DeptForm deptForm); 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 9a844adb..b15d23fc 100644 --- a/src/main/java/com/youlai/boot/system/converter/DictConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/DictConverter.java @@ -2,7 +2,7 @@ package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.system.model.entity.Dict; -import com.youlai.boot.system.model.vo.DictPageVo; +import com.youlai.boot.system.model.vo.DictPageVO; import com.youlai.boot.system.model.form.DictForm; import org.mapstruct.Mapper; @@ -15,7 +15,7 @@ import org.mapstruct.Mapper; @Mapper(componentModel = "spring") public interface DictConverter { - Page toPageVo(Page page); + Page toPageVo(Page page); DictForm toForm(Dict 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 ed0477e2..99a354b0 100644 --- a/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java @@ -3,7 +3,7 @@ package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.system.model.entity.DictItem; import com.youlai.boot.system.model.form.DictItemForm; -import com.youlai.boot.system.model.vo.DictPageVo; +import com.youlai.boot.system.model.vo.DictPageVO; import com.youlai.boot.common.model.Option; import org.mapstruct.Mapper; @@ -18,7 +18,7 @@ import java.util.List; @Mapper(componentModel = "spring") public interface DictItemConverter { - Page toPageVo(Page page); + Page toPageVo(Page page); DictItemForm toForm(DictItem entity); 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 1dd49843..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,7 +1,7 @@ package com.youlai.boot.system.converter; import com.youlai.boot.system.model.entity.Menu; -import com.youlai.boot.system.model.vo.MenuVo; +import com.youlai.boot.system.model.vo.MenuVO; import com.youlai.boot.system.model.form.MenuForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -15,7 +15,7 @@ import org.mapstruct.Mapping; @Mapper(componentModel = "spring") public interface MenuConverter { - MenuVo toVo(Menu entity); + MenuVO toVo(Menu entity); @Mapping(target = "params", ignore = true) MenuForm toForm(Menu entity); diff --git a/src/main/java/com/youlai/boot/system/converter/NoticeConverter.java b/src/main/java/com/youlai/boot/system/converter/NoticeConverter.java index 994868e0..d16a719f 100644 --- a/src/main/java/com/youlai/boot/system/converter/NoticeConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/NoticeConverter.java @@ -1,11 +1,11 @@ package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.system.model.bo.NoticeBo; +import com.youlai.boot.system.model.bo.NoticeBO; import com.youlai.boot.system.model.entity.Notice; import com.youlai.boot.system.model.form.NoticeForm; -import com.youlai.boot.system.model.vo.NoticeDetailVo; -import com.youlai.boot.system.model.vo.NoticePageVo; +import com.youlai.boot.system.model.vo.NoticeDetailVO; +import com.youlai.boot.system.model.vo.NoticePageVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; @@ -30,9 +30,9 @@ public interface NoticeConverter{ }) Notice toEntity(NoticeForm formData); - NoticePageVo toPageVo(NoticeBo bo); + NoticePageVO toPageVo(NoticeBO bo); - Page toPageVo(Page noticePage); + Page toPageVo(Page noticePage); - NoticeDetailVo toDetailVo(NoticeBo noticeBo); + NoticeDetailVO toDetailVo(NoticeBO noticeBo); } 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 bba6dbaf..ddcfc930 100644 --- a/src/main/java/com/youlai/boot/system/converter/RoleConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/RoleConverter.java @@ -2,7 +2,7 @@ package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.system.model.entity.Role; -import com.youlai.boot.system.model.vo.RolePageVo; +import com.youlai.boot.system.model.vo.RolePageVO; import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.form.RoleForm; import org.mapstruct.Mapper; @@ -20,7 +20,7 @@ import java.util.List; @Mapper(componentModel = "spring") public interface RoleConverter { - Page toPageVo(Page page); + Page toPageVo(Page page); @Mappings({ @Mapping(target = "value", source = "id"), 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 ee9b2247..128d4773 100644 --- a/src/main/java/com/youlai/boot/system/converter/UserConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/UserConverter.java @@ -3,12 +3,12 @@ package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.entity.User; -import com.youlai.boot.system.model.dto.CurrentUserDto; -import com.youlai.boot.system.model.vo.UserPageVo; -import com.youlai.boot.system.model.vo.UserProfileVo; -import com.youlai.boot.system.model.bo.UserBo; +import com.youlai.boot.system.model.dto.CurrentUserDTO; +import com.youlai.boot.system.model.vo.UserPageVO; +import com.youlai.boot.system.model.vo.UserProfileVO; +import com.youlai.boot.system.model.bo.UserBO; import com.youlai.boot.system.model.form.UserForm; -import com.youlai.boot.system.model.dto.UserImportDto; +import com.youlai.boot.system.model.dto.UserImportDTO; import com.youlai.boot.system.model.form.UserProfileForm; import org.mapstruct.InheritInverseConfiguration; import org.mapstruct.Mapper; @@ -26,9 +26,9 @@ import java.util.List; @Mapper(componentModel = "spring") public interface UserConverter { - UserPageVo toPageVo(UserBo bo); + UserPageVO toPageVo(UserBO bo); - Page toPageVo(Page bo); + Page toPageVo(Page bo); UserForm toForm(User entity); @@ -38,12 +38,12 @@ public interface UserConverter { @Mappings({ @Mapping(target = "userId", source = "id") }) - CurrentUserDto toCurrentUserDto(User entity); + CurrentUserDTO toCurrentUserDto(User entity); - User toEntity(UserImportDto vo); + User toEntity(UserImportDTO vo); - UserProfileVo toProfileVo(UserBo bo); + UserProfileVO toProfileVo(UserBO bo); 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 66a23f29..77f0ce52 100644 --- a/src/main/java/com/youlai/boot/system/listener/UserImportListener.java +++ b/src/main/java/com/youlai/boot/system/listener/UserImportListener.java @@ -14,7 +14,7 @@ import com.youlai.boot.common.enums.StatusEnum; import com.youlai.boot.core.web.ExcelResult; import com.youlai.boot.system.converter.UserConverter; import com.youlai.boot.system.enums.DictCodeEnum; -import com.youlai.boot.system.model.dto.UserImportDto; +import com.youlai.boot.system.model.dto.UserImportDTO; import com.youlai.boot.system.model.entity.*; import com.youlai.boot.system.service.*; import lombok.Getter; @@ -35,7 +35,7 @@ import java.util.stream.Collectors; * @since 2022/4/10 */ @Slf4j -public class UserImportListener extends AnalysisEventListener { +public class UserImportListener extends AnalysisEventListener { /** * Excel 导入结果 @@ -85,7 +85,7 @@ public class UserImportListener extends AnalysisEventListener { * @param userImportDto 一行数据，类似于 {@link AnalysisContext#readRowHolder()} */ @Override - public void invoke(UserImportDto userImportDto, AnalysisContext analysisContext) { + public void invoke(UserImportDTO userImportDto, AnalysisContext analysisContext) { log.info("解析到一条用户数据:{}", JSONUtil.toJsonStr(userImportDto)); boolean validation = true; diff --git a/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java b/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java index be5901cf..1a0e1426 100644 --- a/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.system.model.entity.DictItem; import com.youlai.boot.system.model.query.DictItemPageQuery; -import com.youlai.boot.system.model.vo.DictItemPageVo; +import com.youlai.boot.system.model.vo.DictItemPageVO; import org.apache.ibatis.annotations.Mapper; /** @@ -19,7 +19,7 @@ public interface DictItemMapper extends BaseMapper { /** * 字典项分页列表 */ - Page getDictItemPage(Page page, DictItemPageQuery queryParams); + Page getDictItemPage(Page page, DictItemPageQuery queryParams); } diff --git a/src/main/java/com/youlai/boot/system/mapper/DictMapper.java b/src/main/java/com/youlai/boot/system/mapper/DictMapper.java index d2c76fb8..a40fbb29 100644 --- a/src/main/java/com/youlai/boot/system/mapper/DictMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/DictMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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 com.youlai.boot.system.model.vo.DictPageVO; import org.apache.ibatis.annotations.Mapper; /** @@ -23,7 +23,7 @@ public interface DictMapper extends BaseMapper { * @param queryParams 查询参数 * @return 字典分页列表 */ - Page getDictPage(Page page, DictPageQuery queryParams); + Page getDictPage(Page page, DictPageQuery queryParams); } diff --git a/src/main/java/com/youlai/boot/system/mapper/LogMapper.java b/src/main/java/com/youlai/boot/system/mapper/LogMapper.java index 21fa6017..1ff3dead 100644 --- a/src/main/java/com/youlai/boot/system/mapper/LogMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/LogMapper.java @@ -2,11 +2,11 @@ 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.VisitCountBo; -import com.youlai.boot.system.model.bo.VisitStatsBo; +import com.youlai.boot.system.model.bo.VisitCountBO; +import com.youlai.boot.system.model.bo.VisitStatsBO; 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.LogPageVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -24,7 +24,7 @@ public interface LogMapper extends BaseMapper { /** * 获取日志分页列表 */ - Page getLogPage(Page page, LogPageQuery queryParams); + Page getLogPage(Page page, LogPageQuery queryParams); /** * 统计浏览数(PV) @@ -32,7 +32,7 @@ public interface LogMapper extends BaseMapper { * @param startDate 开始日期 yyyy-MM-dd * @param endDate 结束日期 yyyy-MM-dd */ - List getPvCounts(String startDate, String endDate); + List getPvCounts(String startDate, String endDate); /** * 统计IP数 @@ -40,17 +40,17 @@ public interface LogMapper extends BaseMapper { * @param startDate 开始日期 yyyy-MM-dd * @param endDate 结束日期 yyyy-MM-dd */ - List getIpCounts(String startDate, String endDate); + List getIpCounts(String startDate, String endDate); /** * 获取浏览量(PV)统计 */ - VisitStatsBo getPvStats(); + VisitStatsBO getPvStats(); /** * 获取访问IP统计 */ - VisitStatsBo getUvStats(); + VisitStatsBO getUvStats(); } diff --git a/src/main/java/com/youlai/boot/system/mapper/NoticeMapper.java b/src/main/java/com/youlai/boot/system/mapper/NoticeMapper.java index f46c270d..74ad716d 100644 --- a/src/main/java/com/youlai/boot/system/mapper/NoticeMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/NoticeMapper.java @@ -2,10 +2,10 @@ 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.NoticeBo; +import com.youlai.boot.system.model.bo.NoticeBO; import com.youlai.boot.system.model.entity.Notice; import com.youlai.boot.system.model.query.NoticePageQuery; -import com.youlai.boot.system.model.vo.NoticePageVo; +import com.youlai.boot.system.model.vo.NoticePageVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,7 +25,7 @@ public interface NoticeMapper extends BaseMapper { * @param queryParams 查询参数 * @return 通知公告分页数据 */ - Page getNoticePage(Page page, NoticePageQuery queryParams); + Page getNoticePage(Page page, NoticePageQuery queryParams); /** * 获取阅读时通知公告详情 @@ -33,5 +33,5 @@ public interface NoticeMapper extends BaseMapper { * @param id 通知公告ID * @return 通知公告详情 */ - NoticeBo getNoticeDetail(@Param("id") Long id); + NoticeBO getNoticeDetail(@Param("id") Long id); } diff --git a/src/main/java/com/youlai/boot/system/mapper/RoleMenuMapper.java b/src/main/java/com/youlai/boot/system/mapper/RoleMenuMapper.java index 111d4e53..5f68f18e 100644 --- a/src/main/java/com/youlai/boot/system/mapper/RoleMenuMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/RoleMenuMapper.java @@ -1,7 +1,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.bo.RolePermsBO; import com.youlai.boot.system.model.entity.RoleMenu; import org.apache.ibatis.annotations.Mapper; @@ -28,7 +28,7 @@ public interface RoleMenuMapper extends BaseMapper { /** * 获取权限和拥有权限的角色列表 */ - List getRolePermsList(String roleCode); + List getRolePermsList(String roleCode); /** diff --git a/src/main/java/com/youlai/boot/system/mapper/UserMapper.java b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java index db110363..9b9ec6b5 100644 --- a/src/main/java/com/youlai/boot/system/mapper/UserMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java @@ -2,13 +2,13 @@ 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.bo.UserBO; 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; import com.youlai.boot.security.model.UserAuthInfo; -import com.youlai.boot.system.model.dto.UserExportDto; +import com.youlai.boot.system.model.dto.UserExportDTO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -30,7 +30,7 @@ public interface UserMapper extends BaseMapper { * @return 用户分页列表 */ @DataPermission(deptAlias = "u", userAlias = "u") - Page getUserPage(Page page, UserPageQuery queryParams); + Page getUserPage(Page page, UserPageQuery queryParams); /** * 获取用户表单详情 @@ -83,7 +83,7 @@ public interface UserMapper extends BaseMapper { * @return 导出用户列表 */ @DataPermission(deptAlias = "u", userAlias = "u") - List listExportUsers(UserPageQuery queryParams); + List listExportUsers(UserPageQuery queryParams); /** * 获取用户个人中心信息 @@ -91,6 +91,6 @@ public interface UserMapper extends BaseMapper { * @param userId 用户ID * @return 用户个人中心信息 */ - UserBo getUserProfile(Long userId); + UserBO getUserProfile(Long userId); } diff --git a/src/main/java/com/youlai/boot/system/mapper/UserNoticeMapper.java b/src/main/java/com/youlai/boot/system/mapper/UserNoticeMapper.java index 0e59c238..78f0e7ef 100644 --- a/src/main/java/com/youlai/boot/system/mapper/UserNoticeMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/UserNoticeMapper.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.system.model.entity.UserNotice; import com.youlai.boot.system.model.query.NoticePageQuery; -import com.youlai.boot.system.model.vo.NoticePageVo; -import com.youlai.boot.system.model.vo.UserNoticePageVo; +import com.youlai.boot.system.model.vo.NoticePageVO; +import com.youlai.boot.system.model.vo.UserNoticePageVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,5 +25,5 @@ public interface UserNoticeMapper extends BaseMapper { * @param queryParams 查询参数 * @return 通知公告分页列表 */ - IPage getMyNoticePage(Page page, @Param("queryParams") NoticePageQuery queryParams); + IPage getMyNoticePage(Page page, @Param("queryParams") NoticePageQuery queryParams); } diff --git a/src/main/java/com/youlai/boot/system/model/bo/NoticeBO.java b/src/main/java/com/youlai/boot/system/model/bo/NoticeBO.java index cc318746..07ee80f6 100644 --- a/src/main/java/com/youlai/boot/system/model/bo/NoticeBO.java +++ b/src/main/java/com/youlai/boot/system/model/bo/NoticeBO.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; * @since 2024-09-01 10:31 */ @Data -public class NoticeBo { +public class NoticeBO { /** * 通知ID diff --git a/src/main/java/com/youlai/boot/system/model/bo/RolePermsBo.java b/src/main/java/com/youlai/boot/system/model/bo/RolePermsBo.java index 3f0c371f..32b9fab8 100644 --- a/src/main/java/com/youlai/boot/system/model/bo/RolePermsBo.java +++ b/src/main/java/com/youlai/boot/system/model/bo/RolePermsBo.java @@ -10,7 +10,7 @@ import java.util.Set; * @since 3.0.0 */ @Data -public class RolePermsBo { +public class RolePermsBO { /** * 角色编码 diff --git a/src/main/java/com/youlai/boot/system/model/bo/UserBO.java b/src/main/java/com/youlai/boot/system/model/bo/UserBO.java index 3fd31c06..61b62ed2 100644 --- a/src/main/java/com/youlai/boot/system/model/bo/UserBO.java +++ b/src/main/java/com/youlai/boot/system/model/bo/UserBO.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; * @since 2022/6/10 */ @Data -public class UserBo { +public class UserBO { /** * 用户ID diff --git a/src/main/java/com/youlai/boot/system/model/bo/VisitCountBo.java b/src/main/java/com/youlai/boot/system/model/bo/VisitCountBo.java index ce6e7c34..cec119de 100644 --- a/src/main/java/com/youlai/boot/system/model/bo/VisitCountBo.java +++ b/src/main/java/com/youlai/boot/system/model/bo/VisitCountBo.java @@ -9,7 +9,7 @@ import lombok.Data; * @since 2.10.0 */ @Data -public class VisitCountBo { +public class VisitCountBO { /** * 日期 yyyy-MM-dd diff --git a/src/main/java/com/youlai/boot/system/model/bo/VisitStatsBO.java b/src/main/java/com/youlai/boot/system/model/bo/VisitStatsBO.java index 0cefd7a6..3b515826 100644 --- a/src/main/java/com/youlai/boot/system/model/bo/VisitStatsBO.java +++ b/src/main/java/com/youlai/boot/system/model/bo/VisitStatsBO.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; */ @Getter @Setter -public class VisitStatsBo { +public class VisitStatsBO { @Schema(description = "今日访问量 (PV)") private Integer todayCount; diff --git a/src/main/java/com/youlai/boot/system/model/dto/CurrentUserDTO.java b/src/main/java/com/youlai/boot/system/model/dto/CurrentUserDTO.java index 5b66167e..bfa5b8a9 100644 --- a/src/main/java/com/youlai/boot/system/model/dto/CurrentUserDTO.java +++ b/src/main/java/com/youlai/boot/system/model/dto/CurrentUserDTO.java @@ -13,7 +13,7 @@ import java.util.Set; */ @Schema(description ="当前登录用户对象") @Data -public class CurrentUserDto { +public class CurrentUserDTO { @Schema(description="用户ID") private Long userId; diff --git a/src/main/java/com/youlai/boot/system/model/dto/NoticeDTO.java b/src/main/java/com/youlai/boot/system/model/dto/NoticeDTO.java index 4ccadfed..c90305fe 100644 --- a/src/main/java/com/youlai/boot/system/model/dto/NoticeDTO.java +++ b/src/main/java/com/youlai/boot/system/model/dto/NoticeDTO.java @@ -13,7 +13,7 @@ import java.time.LocalDateTime; * @since 2024-9-2 14:32:58 */ @Data -public class NoticeDto { +public class NoticeDTO { @Schema(description = "通知ID") private Long id; diff --git a/src/main/java/com/youlai/boot/system/model/dto/UserExportDTO.java b/src/main/java/com/youlai/boot/system/model/dto/UserExportDTO.java index 1b7d36f8..29c8f3a6 100644 --- a/src/main/java/com/youlai/boot/system/model/dto/UserExportDTO.java +++ b/src/main/java/com/youlai/boot/system/model/dto/UserExportDTO.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; @Data @ColumnWidth(20) -public class UserExportDto { +public class UserExportDTO { @ExcelProperty(value = "用户名") private String username; diff --git a/src/main/java/com/youlai/boot/system/model/dto/UserImportDTO.java b/src/main/java/com/youlai/boot/system/model/dto/UserImportDTO.java index 3e2c097d..c5dd7ec7 100644 --- a/src/main/java/com/youlai/boot/system/model/dto/UserImportDTO.java +++ b/src/main/java/com/youlai/boot/system/model/dto/UserImportDTO.java @@ -10,7 +10,7 @@ import lombok.Data; * @since 2022/4/10 */ @Data -public class UserImportDto { +public class UserImportDTO { @ExcelProperty(value = "用户名") private String username; diff --git a/src/main/java/com/youlai/boot/system/model/dto/UserSessionDTO.java b/src/main/java/com/youlai/boot/system/model/dto/UserSessionDTO.java index e83ef229..f7405d67 100644 --- a/src/main/java/com/youlai/boot/system/model/dto/UserSessionDTO.java +++ b/src/main/java/com/youlai/boot/system/model/dto/UserSessionDTO.java @@ -12,7 +12,7 @@ import java.util.Set; * @since 3.0.0 */ @Data -public class UserSessionDto { +public class UserSessionDTO { /** * 用户名 @@ -29,7 +29,7 @@ public class UserSessionDto { */ private long lastActiveTime; - public UserSessionDto(String username) { + public UserSessionDTO(String username) { this.username = username; this.sessionIds = new HashSet<>(); this.lastActiveTime = System.currentTimeMillis(); diff --git a/src/main/java/com/youlai/boot/system/model/vo/ConfigVO.java b/src/main/java/com/youlai/boot/system/model/vo/ConfigVO.java index 70057dc8..7cd2aea8 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/ConfigVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/ConfigVO.java @@ -19,7 +19,7 @@ import java.io.Serializable; @Builder @EqualsAndHashCode(callSuper = false) @Schema(description = "系统配置Vo") -public class ConfigVo { +public class ConfigVO { @Schema(description = "主键") private Long id; diff --git a/src/main/java/com/youlai/boot/system/model/vo/DeptVO.java b/src/main/java/com/youlai/boot/system/model/vo/DeptVO.java index ffebb86a..6cded325 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/DeptVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/DeptVO.java @@ -9,7 +9,7 @@ import java.util.List; @Schema(description = "部门视图对象") @Data -public class DeptVo { +public class DeptVO { @Schema(description = "部门ID") private Long id; @@ -30,7 +30,7 @@ public class DeptVo { private Integer status; @Schema(description = "子部门") - private List children; + private List children; @Schema(description = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm") diff --git a/src/main/java/com/youlai/boot/system/model/vo/DictItemOptionVO.java b/src/main/java/com/youlai/boot/system/model/vo/DictItemOptionVO.java index 3061d5cc..3fc2742c 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/DictItemOptionVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/DictItemOptionVO.java @@ -13,7 +13,7 @@ import lombok.Setter; @Schema(description = "字典项键值对象") @Getter @Setter -public class DictItemOptionVo { +public class DictItemOptionVO { @Schema(description = "字典项值") private String value; diff --git a/src/main/java/com/youlai/boot/system/model/vo/DictItemPageVO.java b/src/main/java/com/youlai/boot/system/model/vo/DictItemPageVO.java index cec5ec0d..53a1b8df 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/DictItemPageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/DictItemPageVO.java @@ -14,7 +14,7 @@ import lombok.Setter; @Schema(description = "字典项分页对象") @Getter @Setter -public class DictItemPageVo { +public class DictItemPageVO { @Schema(description = "字典项ID") private Long id; diff --git a/src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java b/src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java index 091e0892..5185146b 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java @@ -13,7 +13,7 @@ import lombok.Setter; @Schema(description = "字典分页对象") @Getter @Setter -public class DictPageVo { +public class DictPageVO { @Schema(description = "字典ID") private Long id; diff --git a/src/main/java/com/youlai/boot/system/model/vo/LogPageVO.java b/src/main/java/com/youlai/boot/system/model/vo/LogPageVO.java index 2472a0d9..3b38a162 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/LogPageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/LogPageVO.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; */ @Data @Schema(description = "系统日志分页Vo") -public class LogPageVo implements Serializable { +public class LogPageVO implements Serializable { @Schema(description = "主键") private Long id; diff --git a/src/main/java/com/youlai/boot/system/model/vo/MenuVO.java b/src/main/java/com/youlai/boot/system/model/vo/MenuVO.java index a6263833..81010597 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/MenuVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/MenuVO.java @@ -8,7 +8,7 @@ import java.util.List; @Schema(description ="菜单视图对象") @Data -public class MenuVo { +public class MenuVO { @Schema(description = "菜单ID") private Long id; @@ -48,7 +48,7 @@ public class MenuVo { @Schema(description = "子菜单") @JsonInclude(value = JsonInclude.Include.NON_NULL) - private List children; + private List children; } \ No newline at end of file diff --git a/src/main/java/com/youlai/boot/system/model/vo/NoticeDetailVO.java b/src/main/java/com/youlai/boot/system/model/vo/NoticeDetailVO.java index ae25e3ba..cfdf46ff 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/NoticeDetailVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/NoticeDetailVO.java @@ -13,7 +13,7 @@ import java.time.LocalDateTime; * @since 2024-9-8 01:25:06 */ @Data -public class NoticeDetailVo { +public class NoticeDetailVO { @Schema(description = "通知ID") private Long id; diff --git a/src/main/java/com/youlai/boot/system/model/vo/NoticePageVO.java b/src/main/java/com/youlai/boot/system/model/vo/NoticePageVO.java index 1fbf3832..de0b4807 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/NoticePageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/NoticePageVO.java @@ -18,7 +18,7 @@ import java.time.LocalDateTime; @Getter @Setter @Schema(description = "通知公告视图对象") -public class NoticePageVo implements Serializable { +public class NoticePageVO implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/youlai/boot/system/model/vo/RolePageVO.java b/src/main/java/com/youlai/boot/system/model/vo/RolePageVO.java index d68837f8..3c3d7b44 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/RolePageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/RolePageVO.java @@ -8,7 +8,7 @@ import java.time.LocalDateTime; @Schema(description ="角色分页对象") @Data -public class RolePageVo { +public class RolePageVO { @Schema(description="角色ID") private Long id; diff --git a/src/main/java/com/youlai/boot/system/model/vo/RouteVO.java b/src/main/java/com/youlai/boot/system/model/vo/RouteVO.java index 52145172..a07ed419 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/RouteVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/RouteVO.java @@ -16,7 +16,7 @@ import java.util.Map; @Schema(description = "路由对象") @Data @JsonInclude(JsonInclude.Include.NON_EMPTY) -public class RouteVo { +public class RouteVO { @Schema(description = "路由路径", example = "user") private String path; @@ -59,7 +59,7 @@ public class RouteVo { } @Schema(description = "子路由列表") - private List children; + private List children; } \ No newline at end of file diff --git a/src/main/java/com/youlai/boot/system/model/vo/UserNoticePageVO.java b/src/main/java/com/youlai/boot/system/model/vo/UserNoticePageVO.java index 2b6b9713..db2a7fb2 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/UserNoticePageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/UserNoticePageVO.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; */ @Data @Schema(description = "用户公告Vo") -public class UserNoticePageVo { +public class UserNoticePageVO { @Schema(description = "通知ID") private Long id; diff --git a/src/main/java/com/youlai/boot/system/model/vo/UserPageVO.java b/src/main/java/com/youlai/boot/system/model/vo/UserPageVO.java index b15c3a60..d911182e 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/UserPageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/UserPageVO.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; */ @Schema(description ="用户分页对象") @Data -public class UserPageVo { +public class UserPageVO { @Schema(description="用户ID") private Long id; diff --git a/src/main/java/com/youlai/boot/system/model/vo/UserProfileVO.java b/src/main/java/com/youlai/boot/system/model/vo/UserProfileVO.java index d5040b82..39ebd9a7 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/UserProfileVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/UserProfileVO.java @@ -14,7 +14,7 @@ import java.util.Date; */ @Schema(description = "个人中心用户信息") @Data -public class UserProfileVo { +public class UserProfileVO { @Schema(description = "用户ID") private Long id; diff --git a/src/main/java/com/youlai/boot/system/model/vo/VisitStatsVO.java b/src/main/java/com/youlai/boot/system/model/vo/VisitStatsVO.java index f6657e11..7843e100 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/VisitStatsVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/VisitStatsVO.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; @Schema(description = "访问量统计视图对象") @Getter @Setter -public class VisitStatsVo { +public class VisitStatsVO { @Schema(description = "今日独立访客数 (UV)") private Integer todayUvCount; diff --git a/src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java b/src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java index cdf0619f..29447c21 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java @@ -15,7 +15,7 @@ import java.util.List; @Schema(description = "访问趋势Vo") @Getter @Setter -public class VisitTrendVo { +public class VisitTrendVO { @Schema(description = "日期列表") private List dates; diff --git a/src/main/java/com/youlai/boot/system/service/ConfigService.java b/src/main/java/com/youlai/boot/system/service/ConfigService.java index 68d24eb5..988db94d 100644 --- a/src/main/java/com/youlai/boot/system/service/ConfigService.java +++ b/src/main/java/com/youlai/boot/system/service/ConfigService.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; 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.model.vo.ConfigVO; /** * 系统配置Service接口 @@ -20,7 +20,7 @@ public interface ConfigService extends IService { * @param sysConfigPageQuery 查询参数 * @return 系统配置分页列表 */ - IPage page(ConfigPageQuery sysConfigPageQuery); + IPage page(ConfigPageQuery sysConfigPageQuery); /** * 保存系统配置 diff --git a/src/main/java/com/youlai/boot/system/service/DeptService.java b/src/main/java/com/youlai/boot/system/service/DeptService.java index f724fb77..850a948e 100644 --- a/src/main/java/com/youlai/boot/system/service/DeptService.java +++ b/src/main/java/com/youlai/boot/system/service/DeptService.java @@ -5,7 +5,7 @@ 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; -import com.youlai.boot.system.model.vo.DeptVo; +import com.youlai.boot.system.model.vo.DeptVO; import java.util.List; @@ -21,7 +21,7 @@ public interface DeptService extends IService { * * @return 部门列表 */ - List getDeptList(DeptQuery queryParams); + List getDeptList(DeptQuery queryParams); /** * 部门树形下拉选项 diff --git a/src/main/java/com/youlai/boot/system/service/DictItemService.java b/src/main/java/com/youlai/boot/system/service/DictItemService.java index 7439b980..54d4d197 100644 --- a/src/main/java/com/youlai/boot/system/service/DictItemService.java +++ b/src/main/java/com/youlai/boot/system/service/DictItemService.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.boot.system.model.entity.DictItem; import com.youlai.boot.system.model.form.DictItemForm; import com.youlai.boot.system.model.query.DictItemPageQuery; -import com.youlai.boot.system.model.vo.DictItemOptionVo; -import com.youlai.boot.system.model.vo.DictItemPageVo; +import com.youlai.boot.system.model.vo.DictItemOptionVO; +import com.youlai.boot.system.model.vo.DictItemPageVO; import java.util.List; @@ -24,7 +24,7 @@ public interface DictItemService extends IService { * @param queryParams 查询参数 * @return 字典项分页列表 */ - Page getDictItemPage(DictItemPageQuery queryParams); + Page getDictItemPage(DictItemPageQuery queryParams); /** * 获取字典项列表 @@ -32,7 +32,7 @@ public interface DictItemService extends IService { * @param dictCode 字典编码 * @return 字典项列表 */ - List getDictItems(String dictCode); + List getDictItems(String dictCode); /** * 获取字典项表单 diff --git a/src/main/java/com/youlai/boot/system/service/DictService.java b/src/main/java/com/youlai/boot/system/service/DictService.java index a22c7f91..5ab06ab7 100644 --- a/src/main/java/com/youlai/boot/system/service/DictService.java +++ b/src/main/java/com/youlai/boot/system/service/DictService.java @@ -6,8 +6,8 @@ import com.youlai.boot.common.model.Option; 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.DictItemOptionVo; -import com.youlai.boot.system.model.vo.DictPageVo; +import com.youlai.boot.system.model.vo.DictItemOptionVO; +import com.youlai.boot.system.model.vo.DictPageVO; import java.util.List; @@ -25,7 +25,7 @@ public interface DictService extends IService { * @param queryParams 分页查询对象 * @return 字典分页列表 */ - Page getDictPage(DictPageQuery queryParams); + Page getDictPage(DictPageQuery queryParams); /** * 获取字典列表 diff --git a/src/main/java/com/youlai/boot/system/service/LogService.java b/src/main/java/com/youlai/boot/system/service/LogService.java index 58e13718..8a621e66 100644 --- a/src/main/java/com/youlai/boot/system/service/LogService.java +++ b/src/main/java/com/youlai/boot/system/service/LogService.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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; -import com.youlai.boot.system.model.vo.VisitStatsVo; -import com.youlai.boot.system.model.vo.VisitTrendVo; +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 java.time.LocalDate; import java.util.List; @@ -22,7 +22,7 @@ public interface LogService extends IService { /** * 获取日志分页列表 */ - Page getLogPage(LogPageQuery queryParams); + Page getLogPage(LogPageQuery queryParams); /** @@ -31,11 +31,11 @@ public interface LogService extends IService { * @param startDate 开始时间 * @param endDate 结束时间 */ - VisitTrendVo getVisitTrend(LocalDate startDate, LocalDate endDate); + VisitTrendVO getVisitTrend(LocalDate startDate, LocalDate endDate); /** * 获取访问统计 */ - VisitStatsVo getVisitStats(); + VisitStatsVO getVisitStats(); } diff --git a/src/main/java/com/youlai/boot/system/service/MenuService.java b/src/main/java/com/youlai/boot/system/service/MenuService.java index 09457d22..389ec2bb 100644 --- a/src/main/java/com/youlai/boot/system/service/MenuService.java +++ b/src/main/java/com/youlai/boot/system/service/MenuService.java @@ -6,8 +6,8 @@ import com.youlai.boot.system.model.form.MenuForm; import com.youlai.boot.common.model.Option; 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; +import com.youlai.boot.system.model.vo.MenuVO; +import com.youlai.boot.system.model.vo.RouteVO; import java.util.List; import java.util.Set; @@ -23,7 +23,7 @@ public interface MenuService extends IService { /** * 获取菜单表格列表 */ - List listMenus(MenuQuery queryParams); + List listMenus(MenuQuery queryParams); /** * 获取菜单下拉列表 @@ -42,14 +42,14 @@ public interface MenuService extends IService { /** * 获取当前用户的菜单路由列表 */ - List listCurrentUserRoutes(); + List listCurrentUserRoutes(); /** * 获取当前用户的菜单路由列表（指定数据源） * * @param datasource 数据源名称，如：master(主库)、naiveui(NaiveUI数据库)、template(模板数据库) */ - List listCurrentUserRoutes(String datasource); + List listCurrentUserRoutes(String datasource); /** * 修改菜单显示状态 diff --git a/src/main/java/com/youlai/boot/system/service/NoticeService.java b/src/main/java/com/youlai/boot/system/service/NoticeService.java index 96461527..870a3825 100644 --- a/src/main/java/com/youlai/boot/system/service/NoticeService.java +++ b/src/main/java/com/youlai/boot/system/service/NoticeService.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.boot.system.model.entity.Notice; import com.youlai.boot.system.model.form.NoticeForm; import com.youlai.boot.system.model.query.NoticePageQuery; -import com.youlai.boot.system.model.vo.NoticePageVo; -import com.youlai.boot.system.model.vo.UserNoticePageVo; -import com.youlai.boot.system.model.vo.NoticeDetailVo; +import com.youlai.boot.system.model.vo.NoticePageVO; +import com.youlai.boot.system.model.vo.UserNoticePageVO; +import com.youlai.boot.system.model.vo.NoticeDetailVO; /** * 通知公告服务类 @@ -22,7 +22,7 @@ public interface NoticeService extends IService { * * @return 通知公告分页列表 */ - IPage getNoticePage(NoticePageQuery queryParams); + IPage getNoticePage(NoticePageQuery queryParams); /** * 获取通知公告表单数据 @@ -79,7 +79,7 @@ public interface NoticeService extends IService { * @param id 通知公告ID * @return 通知公告详情 */ - NoticeDetailVo getNoticeDetail(Long id); + NoticeDetailVO getNoticeDetail(Long id); /** * 获取我的通知公告分页列表 @@ -87,5 +87,5 @@ public interface NoticeService extends IService { * @param queryParams 查询参数 * @return 通知公告分页列表 */ - IPage getMyNoticePage(NoticePageQuery queryParams); + IPage getMyNoticePage(NoticePageQuery queryParams); } diff --git a/src/main/java/com/youlai/boot/system/service/RoleService.java b/src/main/java/com/youlai/boot/system/service/RoleService.java index 030ed781..43761877 100644 --- a/src/main/java/com/youlai/boot/system/service/RoleService.java +++ b/src/main/java/com/youlai/boot/system/service/RoleService.java @@ -7,7 +7,7 @@ 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; -import com.youlai.boot.system.model.vo.RolePageVo; +import com.youlai.boot.system.model.vo.RolePageVO; import java.util.List; import java.util.Set; @@ -26,7 +26,7 @@ public interface RoleService extends IService { * @param queryParams * @return */ - Page getRolePage(RolePageQuery queryParams); + Page getRolePage(RolePageQuery queryParams); /** diff --git a/src/main/java/com/youlai/boot/system/service/UserNoticeService.java b/src/main/java/com/youlai/boot/system/service/UserNoticeService.java index 24326905..ddf31c11 100644 --- a/src/main/java/com/youlai/boot/system/service/UserNoticeService.java +++ b/src/main/java/com/youlai/boot/system/service/UserNoticeService.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.boot.system.model.entity.UserNotice; import com.youlai.boot.system.model.query.NoticePageQuery; -import com.youlai.boot.system.model.vo.UserNoticePageVo; -import com.youlai.boot.system.model.vo.NoticePageVo; +import com.youlai.boot.system.model.vo.UserNoticePageVO; +import com.youlai.boot.system.model.vo.NoticePageVO; import java.util.List; @@ -31,5 +31,5 @@ public interface UserNoticeService extends IService { * @param queryParams 查询参数 * @return 我的通知公告分页列表 */ - IPage getMyNoticePage(Page page, NoticePageQuery queryParams); + IPage getMyNoticePage(Page page, NoticePageQuery queryParams); } diff --git a/src/main/java/com/youlai/boot/system/service/UserOnlineService.java b/src/main/java/com/youlai/boot/system/service/UserOnlineService.java index 6ec80555..9dde5159 100644 --- a/src/main/java/com/youlai/boot/system/service/UserOnlineService.java +++ b/src/main/java/com/youlai/boot/system/service/UserOnlineService.java @@ -66,9 +66,9 @@ public class UserOnlineService { * * @return 在线用户名列表 */ - public List getOnlineUsers() { + public List getOnlineUsers() { return onlineUsers.values().stream() - .map(info -> new UserOnlineDto(info.getUsername(), info.getLoginTime())) + .map(info -> new UserOnlineDTO(info.getUsername(), info.getLoginTime())) .collect(Collectors.toList()); } @@ -127,7 +127,7 @@ public class UserOnlineService { * 用户在线Dto（用于返回给前端） */ @Data - public static class UserOnlineDto { + public static class UserOnlineDTO { private final String username; private final long loginTime; } @@ -139,7 +139,7 @@ public class UserOnlineService { private static class OnlineUsersChangeEvent { private String type; private int count; - private List users; + private List users; private long timestamp; } } diff --git a/src/main/java/com/youlai/boot/system/service/UserService.java b/src/main/java/com/youlai/boot/system/service/UserService.java index a3a57c60..1fd8be81 100644 --- a/src/main/java/com/youlai/boot/system/service/UserService.java +++ b/src/main/java/com/youlai/boot/system/service/UserService.java @@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.boot.common.model.Option; import com.youlai.boot.security.model.UserAuthInfo; -import com.youlai.boot.system.model.dto.CurrentUserDto; -import com.youlai.boot.system.model.dto.UserExportDto; +import com.youlai.boot.system.model.dto.CurrentUserDTO; +import com.youlai.boot.system.model.dto.UserExportDTO; import com.youlai.boot.system.model.entity.User; import com.youlai.boot.system.model.query.UserPageQuery; -import com.youlai.boot.system.model.vo.UserPageVo; -import com.youlai.boot.system.model.vo.UserProfileVo; +import com.youlai.boot.system.model.vo.UserPageVO; +import com.youlai.boot.system.model.vo.UserProfileVO; import com.youlai.boot.system.model.form.*; import java.util.List; @@ -27,7 +27,7 @@ public interface UserService extends IService { * * @return {@link IPage} 用户分页列表 */ - IPage getUserPage(UserPageQuery queryParams); + IPage getUserPage(UserPageQuery queryParams); /** * 获取用户表单数据 @@ -84,7 +84,7 @@ public interface UserService extends IService { * @param queryParams 查询参数 * @return {@link List} 导出用户列表 */ - List listExportUsers(UserPageQuery queryParams); + List listExportUsers(UserPageQuery queryParams); /** @@ -92,14 +92,14 @@ public interface UserService extends IService { * * @return {@link CurrentUserDto} 登录用户信息 */ - CurrentUserDto getCurrentUserInfo(); + CurrentUserDTO getCurrentUserInfo(); /** * 获取个人中心用户信息 * * @return {@link UserProfileVo} 个人中心用户信息 */ - UserProfileVo getUserProfile(Long userId); + UserProfileVO getUserProfile(Long userId); /** * 修改个人中心用户信息 diff --git a/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java index d0de5653..e4e12c26 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java @@ -11,7 +11,7 @@ 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.model.vo.ConfigVO; import com.youlai.boot.system.service.ConfigService; import com.youlai.boot.security.util.SecurityUtils; import jakarta.annotation.PostConstruct; @@ -54,7 +54,7 @@ public class ConfigServiceImpl extends ServiceImpl impleme * @return 系统配置分页列表 */ @Override - public IPage page(ConfigPageQuery configPageQuery) { + public IPage page(ConfigPageQuery configPageQuery) { Page page = new Page<>(configPageQuery.getPageNum(), configPageQuery.getPageSize()); String keywords = configPageQuery.getKeywords(); LambdaQueryWrapper query = new LambdaQueryWrapper() diff --git a/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java index 784b9024..2d284935 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java @@ -12,7 +12,7 @@ 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; +import com.youlai.boot.system.model.vo.DeptVO; import com.youlai.boot.common.constant.SystemConstants; import com.youlai.boot.common.enums.StatusEnum; import com.youlai.boot.common.model.Option; @@ -42,7 +42,7 @@ public class DeptServiceImpl extends ServiceImpl implements De * 获取部门列表 */ @Override - public List getDeptList(DeptQuery queryParams) { + public List getDeptList(DeptQuery queryParams) { // 查询参数 String keywords = queryParams.getKeywords(); Integer status = queryParams.getStatus(); @@ -83,12 +83,12 @@ public class DeptServiceImpl extends ServiceImpl implements De * @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 -> { - DeptVo deptVo = deptConverter.toVo(dept); - List children = recurDeptList(dept.getId(), deptList); + DeptVO deptVo = deptConverter.toVo(dept); + List children = recurDeptList(dept.getId(), deptList); deptVo.setChildren(children); return deptVo; }).toList(); diff --git a/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java index 9cb89ff9..2804ac49 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java @@ -8,8 +8,8 @@ import com.youlai.boot.system.mapper.DictItemMapper; import com.youlai.boot.system.model.entity.DictItem; import com.youlai.boot.system.model.form.DictItemForm; import com.youlai.boot.system.model.query.DictItemPageQuery; -import com.youlai.boot.system.model.vo.DictItemOptionVo; -import com.youlai.boot.system.model.vo.DictItemPageVo; +import com.youlai.boot.system.model.vo.DictItemOptionVO; +import com.youlai.boot.system.model.vo.DictItemPageVO; import com.youlai.boot.system.service.DictItemService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -36,10 +36,10 @@ public class DictItemServiceImpl extends ServiceImpl i * @return 字典项分页列表 */ @Override - public Page getDictItemPage(DictItemPageQuery queryParams) { + public Page getDictItemPage(DictItemPageQuery queryParams) { int pageNum = queryParams.getPageNum(); int pageSize = queryParams.getPageSize(); - Page page = new Page<>(pageNum, pageSize); + Page page = new Page<>(pageNum, pageSize); return this.baseMapper.getDictItemPage(page, queryParams); } @@ -51,7 +51,7 @@ public class DictItemServiceImpl extends ServiceImpl i * @param dictCode 字典编码 */ @Override - public List getDictItems(String dictCode) { + public List getDictItems(String dictCode) { return this.list( new LambdaQueryWrapper() .eq(DictItem::getDictCode, dictCode) @@ -59,7 +59,7 @@ public class DictItemServiceImpl extends ServiceImpl i .orderByAsc(DictItem::getSort) ).stream() .map(item -> { - DictItemOptionVo dictItemOptionVo = new DictItemOptionVo(); + DictItemOptionVO dictItemOptionVo = new DictItemOptionVO(); dictItemOptionVo.setLabel(item.getLabel()); dictItemOptionVo.setValue(item.getValue()); dictItemOptionVo.setTagType(item.getTagType()); diff --git a/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java index e8fc8c5b..2573b4d3 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java @@ -12,7 +12,7 @@ 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.system.model.vo.DictPageVO; import com.youlai.boot.system.service.DictItemService; import com.youlai.boot.system.service.DictService; import lombok.RequiredArgsConstructor; @@ -40,7 +40,7 @@ public class DictServiceImpl extends ServiceImpl implements Di * @param queryParams 分页查询对象 */ @Override - public Page getDictPage(DictPageQuery queryParams) { + public Page getDictPage(DictPageQuery queryParams) { // 查询参数 int pageNum = queryParams.getPageNum(); int pageSize = queryParams.getPageSize(); diff --git a/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java index 224976cc..b1f505e6 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java @@ -3,13 +3,13 @@ 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.LogMapper; -import com.youlai.boot.system.model.bo.VisitCountBo; -import com.youlai.boot.system.model.bo.VisitStatsBo; +import com.youlai.boot.system.model.bo.VisitCountBO; +import com.youlai.boot.system.model.bo.VisitStatsBO; 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.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.LogService; import org.springframework.stereotype.Service; @@ -36,7 +36,7 @@ public class LogServiceImpl extends ServiceImpl * @return 日志分页列表 */ @Override - public Page getLogPage(LogPageQuery queryParams) { + public Page getLogPage(LogPageQuery queryParams) { return this.baseMapper.getLogPage(new Page<>(queryParams.getPageNum(), queryParams.getPageSize()), queryParams); } @@ -49,8 +49,8 @@ public class LogServiceImpl extends ServiceImpl * @return */ @Override - public VisitTrendVo getVisitTrend(LocalDate startDate, LocalDate endDate) { - VisitTrendVo visitTrend = new VisitTrendVo(); + public VisitTrendVO getVisitTrend(LocalDate startDate, LocalDate endDate) { + VisitTrendVO visitTrend = new VisitTrendVO(); List dates = new ArrayList<>(); // 获取日期范围内的日期 @@ -61,12 +61,12 @@ public class LogServiceImpl extends ServiceImpl visitTrend.setDates(dates); // 获取访问量和访问 IP 数的统计数据 - List pvCounts = this.baseMapper.getPvCounts(dates.get(0) + " 00:00:00", dates.get(dates.size() - 1) + " 23:59:59"); - List ipCounts = this.baseMapper.getIpCounts(dates.get(0) + " 00:00:00", dates.get(dates.size() - 1) + " 23:59:59"); + List pvCounts = this.baseMapper.getPvCounts(dates.get(0) + " 00:00:00", dates.get(dates.size() - 1) + " 23:59:59"); + List ipCounts = this.baseMapper.getIpCounts(dates.get(0) + " 00:00:00", dates.get(dates.size() - 1) + " 23:59:59"); // 将统计数据转换为 Map - Map pvMap = pvCounts.stream().collect(Collectors.toMap(VisitCountBo::getDate, VisitCountBo::getCount)); - Map ipMap = ipCounts.stream().collect(Collectors.toMap(VisitCountBo::getDate, VisitCountBo::getCount)); + Map pvMap = pvCounts.stream().collect(Collectors.toMap(VisitCountBO::getDate, VisitCountBO::getCount)); + Map ipMap = ipCounts.stream().collect(Collectors.toMap(VisitCountBO::getDate, VisitCountBO::getCount)); // 匹配日期和访问量/访问 IP 数 List pvList = new ArrayList<>(); @@ -87,11 +87,11 @@ public class LogServiceImpl extends ServiceImpl * 访问量统计 */ @Override - public VisitStatsVo getVisitStats() { - VisitStatsVo result = new VisitStatsVo(); + public VisitStatsVO getVisitStats() { + VisitStatsVO result = new VisitStatsVO(); // 访客数统计(UV) - VisitStatsBo uvStats = this.baseMapper.getUvStats(); + VisitStatsBO uvStats = this.baseMapper.getUvStats(); if(uvStats!=null){ result.setTodayUvCount(uvStats.getTodayCount()); result.setTotalUvCount(uvStats.getTotalCount()); @@ -99,7 +99,7 @@ public class LogServiceImpl extends ServiceImpl } // 浏览量统计(PV) - VisitStatsBo pvStats = this.baseMapper.getPvStats(); + VisitStatsBO pvStats = this.baseMapper.getPvStats(); if(pvStats!=null){ result.setTodayPvCount(pvStats.getTodayCount()); result.setTotalPvCount(pvStats.getTotalCount()); diff --git a/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java index fc77c1fa..842ff185 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java @@ -17,8 +17,8 @@ import com.youlai.boot.system.mapper.MenuMapper; 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; -import com.youlai.boot.system.model.vo.RouteVo; +import com.youlai.boot.system.model.vo.MenuVO; +import com.youlai.boot.system.model.vo.RouteVO; import com.youlai.boot.common.constant.SystemConstants; import com.youlai.boot.system.enums.MenuTypeEnum; import com.youlai.boot.common.enums.StatusEnum; @@ -55,7 +55,7 @@ public class MenuServiceImpl extends ServiceImpl implements Me * @param queryParams {@link MenuQuery} */ @Override - public List listMenus(MenuQuery queryParams) { + public List listMenus(MenuQuery queryParams) { List menus = this.list(new LambdaQueryWrapper() .like(StrUtil.isNotBlank(queryParams.getKeywords()), Menu::getName, queryParams.getKeywords()) .orderByAsc(Menu::getSort) @@ -88,13 +88,13 @@ public class MenuServiceImpl extends ServiceImpl implements Me * @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)) .map(entity -> { - MenuVo menuVo = menuConverter.toVo(entity); - List children = buildMenuTree(entity.getId(), menuList); + MenuVO menuVo = menuConverter.toVo(entity); + List children = buildMenuTree(entity.getId(), menuList); menuVo.setChildren(children); return menuVo; }).toList(); @@ -142,7 +142,7 @@ public class MenuServiceImpl extends ServiceImpl implements Me * 获取当前用户的菜单路由列表 */ @Override - public List listCurrentUserRoutes() { + public List listCurrentUserRoutes() { Set roleCodes = SecurityUtils.getRoles(); if (CollectionUtil.isEmpty(roleCodes)) { @@ -195,7 +195,7 @@ public class MenuServiceImpl extends ServiceImpl implements Me * - template: 模板项目菜单数据 */ @Override - public List listCurrentUserRoutes(String datasource) { + public List listCurrentUserRoutes(String datasource) { return listCurrentUserRoutes(); } @@ -207,13 +207,13 @@ public class MenuServiceImpl extends ServiceImpl implements Me * @param menuList 菜单列表 * @return 路由层级列表 */ - private List buildRoutes(Long parentId, List menuList) { - List routeList = new ArrayList<>(); + private List buildRoutes(Long parentId, List menuList) { + List routeList = new ArrayList<>(); for (Menu menu : menuList) { if (menu.getParentId().equals(parentId)) { - RouteVo routeVo = toRouteVo(menu); - List children = buildRoutes(menu.getId(), menuList); + RouteVO routeVo = toRouteVo(menu); + List children = buildRoutes(menu.getId(), menuList); if (!children.isEmpty()) { routeVo.setChildren(children); } @@ -227,8 +227,8 @@ public class MenuServiceImpl extends ServiceImpl implements Me /** * 根据RouteBO创建RouteVo */ - private RouteVo toRouteVo(Menu menu) { - RouteVo routeVo = new RouteVo(); + private RouteVO toRouteVo(Menu menu) { + RouteVO routeVo = new RouteVO(); String routePath = menu.getRoutePath(); boolean externalLink = StrUtil.startWithAny(routePath, "http://", "https://"); @@ -249,7 +249,7 @@ public class MenuServiceImpl extends ServiceImpl implements Me // 外链无组件 routeVo.setComponent(externalLink ? null : menu.getComponent()); - RouteVo.Meta meta = new RouteVo.Meta(); + RouteVO.Meta meta = new RouteVO.Meta(); meta.setTitle(menu.getName()); meta.setIcon(menu.getIcon()); meta.setHidden(StatusEnum.DISABLE.getValue().equals(menu.getVisible())); diff --git a/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java index 5efb5a70..c1d35308 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java @@ -13,16 +13,16 @@ import com.youlai.boot.system.converter.NoticeConverter; import com.youlai.boot.system.enums.NoticePublishStatusEnum; import com.youlai.boot.system.enums.NoticeTargetEnum; import com.youlai.boot.system.mapper.NoticeMapper; -import com.youlai.boot.system.model.bo.NoticeBo; -import com.youlai.boot.system.model.dto.NoticeDto; +import com.youlai.boot.system.model.bo.NoticeBO; +import com.youlai.boot.system.model.dto.NoticeDTO; import com.youlai.boot.system.model.entity.Notice; import com.youlai.boot.system.model.entity.UserNotice; import com.youlai.boot.system.model.entity.User; import com.youlai.boot.system.model.form.NoticeForm; import com.youlai.boot.system.model.query.NoticePageQuery; -import com.youlai.boot.system.model.vo.NoticePageVo; -import com.youlai.boot.system.model.vo.UserNoticePageVo; -import com.youlai.boot.system.model.vo.NoticeDetailVo; +import com.youlai.boot.system.model.vo.NoticePageVO; +import com.youlai.boot.system.model.vo.UserNoticePageVO; +import com.youlai.boot.system.model.vo.NoticeDetailVO; import com.youlai.boot.system.service.NoticeService; import com.youlai.boot.system.service.UserNoticeService; import com.youlai.boot.system.service.UserOnlineService; @@ -63,8 +63,8 @@ public class NoticeServiceImpl extends ServiceImpl impleme * @return {@link IPage< NoticePageVo >} 通知公告分页列表 */ @Override - public IPage getNoticePage(NoticePageQuery queryParams) { - Page noticePage = this.baseMapper.getNoticePage( + public IPage getNoticePage(NoticePageQuery queryParams) { + Page noticePage = this.baseMapper.getNoticePage( new Page<>(queryParams.getPageNum(), queryParams.getPageSize()), queryParams ); @@ -215,13 +215,13 @@ public class NoticeServiceImpl extends ServiceImpl impleme Set receivers = targetUserList.stream().map(User::getUsername).collect(Collectors.toSet()); Set allOnlineUsers = userOnlineService.getOnlineUsers().stream() - .map(UserOnlineService.UserOnlineDto::getUsername) + .map(UserOnlineService.UserOnlineDTO::getUsername) .collect(Collectors.toSet()); // 找出在线用户的通知接收者 Set onlineReceivers = new HashSet<>(CollectionUtil.intersection(receivers, allOnlineUsers)); - NoticeDto noticeDto = new NoticeDto(); + NoticeDTO noticeDto = new NoticeDTO(); noticeDto.setId(id); noticeDto.setTitle(notice.getTitle()); noticeDto.setType(notice.getType()); @@ -271,8 +271,8 @@ public class NoticeServiceImpl extends ServiceImpl impleme * @return NoticeDetailVo 通知公告详情 */ @Override - public NoticeDetailVo getNoticeDetail(Long id) { - NoticeBo noticeBo = this.baseMapper.getNoticeDetail(id); + public NoticeDetailVO getNoticeDetail(Long id) { + NoticeBO noticeBo = this.baseMapper.getNoticeDetail(id); // 更新用户通知公告的阅读状态 Long userId = SecurityUtils.getUserId(); userNoticeService.update(new LambdaUpdateWrapper() @@ -291,7 +291,7 @@ public class NoticeServiceImpl extends ServiceImpl impleme * @return 通知公告分页列表 */ @Override - public IPage getMyNoticePage(NoticePageQuery queryParams) { + public IPage getMyNoticePage(NoticePageQuery queryParams) { queryParams.setUserId(SecurityUtils.getUserId()); return userNoticeService.getMyNoticePage( new Page<>(queryParams.getPageNum(), queryParams.getPageSize()), diff --git a/src/main/java/com/youlai/boot/system/service/impl/RoleMenuServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/RoleMenuServiceImpl.java index c9acaf8d..9304ce68 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/RoleMenuServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/RoleMenuServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.system.mapper.RoleMenuMapper; -import com.youlai.boot.system.model.bo.RolePermsBo; +import com.youlai.boot.system.model.bo.RolePermsBO; import com.youlai.boot.system.model.entity.RoleMenu; import com.youlai.boot.system.service.RoleMenuService; import jakarta.annotation.PostConstruct; @@ -36,7 +36,7 @@ public class RoleMenuServiceImpl extends ServiceImpl i public void initRolePermsCache() { log.info("开始初始化权限缓存..."); - List allRolePermsList = this.baseMapper.getRolePermsList(null); + List allRolePermsList = this.baseMapper.getRolePermsList(null); if (CollectionUtil.isEmpty(allRolePermsList)) { log.warn("权限数据为空，跳过缓存初始化"); @@ -67,7 +67,7 @@ public class RoleMenuServiceImpl extends ServiceImpl i redisTemplate.delete(cacheKey); // 重新加载权限 - List list = this.baseMapper.getRolePermsList(null); + List list = this.baseMapper.getRolePermsList(null); if (CollectionUtil.isNotEmpty(list)) { list.forEach(item -> { String roleCode = item.getRoleCode(); @@ -92,9 +92,9 @@ public class RoleMenuServiceImpl extends ServiceImpl i redisTemplate.opsForHash().delete(cacheKey, roleCode); // 重新加载指定角色权限 - List list = this.baseMapper.getRolePermsList(roleCode); + List list = this.baseMapper.getRolePermsList(roleCode); if (CollectionUtil.isNotEmpty(list)) { - RolePermsBo rolePerms = list.get(0); + RolePermsBO rolePerms = list.get(0); if (rolePerms != null) { Set perms = rolePerms.getPerms(); if (CollectionUtil.isNotEmpty(perms)) { @@ -117,9 +117,9 @@ public class RoleMenuServiceImpl extends ServiceImpl i redisTemplate.opsForHash().delete(cacheKey, oldRoleCode); // 添加新角色权限缓存 - List list = this.baseMapper.getRolePermsList(newRoleCode); + List list = this.baseMapper.getRolePermsList(newRoleCode); if (CollectionUtil.isNotEmpty(list)) { - RolePermsBo rolePerms = list.get(0); + RolePermsBO rolePerms = list.get(0); if (rolePerms != null) { Set perms = rolePerms.getPerms(); if (CollectionUtil.isNotEmpty(perms)) { diff --git a/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java index b7654c75..7abc16d9 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java @@ -14,7 +14,7 @@ import com.youlai.boot.system.model.entity.Role; import com.youlai.boot.system.model.entity.RoleMenu; 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.system.model.vo.RolePageVO; import com.youlai.boot.common.constant.SystemConstants; import com.youlai.boot.common.model.Option; import com.youlai.boot.security.util.SecurityUtils; @@ -51,7 +51,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro * @return {@link Page< RolePageVo >} – 角色分页列表 */ @Override - public Page getRolePage(RolePageQuery queryParams) { + public Page getRolePage(RolePageQuery queryParams) { // 查询参数 int pageNum = queryParams.getPageNum(); int pageSize = queryParams.getPageSize(); diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java index b93d7211..aa82529c 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java @@ -8,8 +8,8 @@ import com.youlai.boot.security.util.SecurityUtils; import com.youlai.boot.system.mapper.UserNoticeMapper; import com.youlai.boot.system.model.entity.UserNotice; import com.youlai.boot.system.model.query.NoticePageQuery; -import com.youlai.boot.system.model.vo.NoticePageVo; -import com.youlai.boot.system.model.vo.UserNoticePageVo; +import com.youlai.boot.system.model.vo.NoticePageVO; +import com.youlai.boot.system.model.vo.UserNoticePageVO; import com.youlai.boot.system.service.UserNoticeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -51,7 +51,7 @@ public class UserNoticeServiceImpl extends ServiceImpl getMyNoticePage(Page page, NoticePageQuery queryParams) { + public IPage getMyNoticePage(Page page, NoticePageQuery queryParams) { return this.getBaseMapper().getMyNoticePage( new Page<>(queryParams.getPageNum(), queryParams.getPageSize()), queryParams diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java index 70dbe215..105362c1 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java @@ -22,16 +22,16 @@ import com.youlai.boot.platform.mail.service.MailService; import com.youlai.boot.system.converter.UserConverter; import com.youlai.boot.system.enums.DictCodeEnum; import com.youlai.boot.system.mapper.UserMapper; -import com.youlai.boot.system.model.bo.UserBo; -import com.youlai.boot.system.model.dto.CurrentUserDto; -import com.youlai.boot.system.model.dto.UserExportDto; +import com.youlai.boot.system.model.bo.UserBO; +import com.youlai.boot.system.model.dto.CurrentUserDTO; +import com.youlai.boot.system.model.dto.UserExportDTO; import com.youlai.boot.system.model.entity.DictItem; import com.youlai.boot.system.model.entity.User; import com.youlai.boot.system.model.entity.UserRole; import com.youlai.boot.system.model.form.*; import com.youlai.boot.system.model.query.UserPageQuery; -import com.youlai.boot.system.model.vo.UserPageVo; -import com.youlai.boot.system.model.vo.UserProfileVo; +import com.youlai.boot.system.model.vo.UserPageVO; +import com.youlai.boot.system.model.vo.UserProfileVO; import com.youlai.boot.system.service.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -84,18 +84,18 @@ public class UserServiceImpl extends ServiceImpl implements Us * @return {@link IPage} 用户分页列表 */ @Override - public IPage getUserPage(UserPageQuery queryParams) { + public IPage getUserPage(UserPageQuery queryParams) { // 参数构建 int pageNum = queryParams.getPageNum(); int pageSize = queryParams.getPageSize(); - Page page = new Page<>(pageNum, pageSize); + Page page = new Page<>(pageNum, pageSize); boolean isRoot = SecurityUtils.isRoot(); queryParams.setIsRoot(isRoot); // 查询数据 - Page userPage = this.baseMapper.getUserPage(page, queryParams); + Page userPage = this.baseMapper.getUserPage(page, queryParams); // 实体转换 return userConverter.toPageVo(userPage); @@ -403,12 +403,12 @@ public class UserServiceImpl extends ServiceImpl implements Us * @return {@link List} 导出用户列表 */ @Override - public List listExportUsers(UserPageQuery queryParams) { + public List listExportUsers(UserPageQuery queryParams) { boolean isRoot = SecurityUtils.isRoot(); queryParams.setIsRoot(isRoot); - List exportUsers = this.baseMapper.listExportUsers(queryParams); + List exportUsers = this.baseMapper.listExportUsers(queryParams); if (CollectionUtil.isNotEmpty(exportUsers)) { //获取性别的字典项 Map genderMap = dictItemService.list( @@ -441,7 +441,7 @@ public class UserServiceImpl extends ServiceImpl implements Us * @return {@link CurrentUserDto} 用户信息 */ @Override - public CurrentUserDto getCurrentUserInfo() { + public CurrentUserDTO getCurrentUserInfo() { String username = SecurityUtils.getUsername(); @@ -456,7 +456,7 @@ public class UserServiceImpl extends ServiceImpl implements Us ) ); // entity->Vo - CurrentUserDto userInfoVo = userConverter.toCurrentUserDto(user); + CurrentUserDTO userInfoVo = userConverter.toCurrentUserDto(user); // 用户角色集合 Set roles = SecurityUtils.getRoles(); @@ -477,8 +477,8 @@ public class UserServiceImpl extends ServiceImpl implements Us * @return {@link UserProfileVo} 个人中心用户信息 */ @Override - public UserProfileVo getUserProfile(Long userId) { - UserBo entity = this.baseMapper.getUserProfile(userId); + public UserProfileVO getUserProfile(Long userId) { + UserBO entity = this.baseMapper.getUserProfile(userId); return userConverter.toProfileVo(entity); }