fix: 合并冲突解决

2025-03-31 08:21:58 +08:00
parent 60cfa78a52 354b9f3c49
commit 04fba012b5
7 changed files with 45 additions and 38 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -113,6 +113,21 @@
            <artifactId>spring-boot-starter-aop</artifactId>
        </dependency>

+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+
        <dependency>
            <groupId>com.mysql</groupId>
            <artifactId>mysql-connector-j</artifactId>
@@ -132,12 +147,14 @@
            <version>${mybatis-plus.version}</version>
        </dependency>

+        <!-- knife4j 接口文档 -->
        <dependency>
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
            <version>${knife4j.version}</version>
        </dependency>

+        <!-- MapStruct 对象映射 -->
        <dependency>
            <groupId>org.mapstruct</groupId>
            <artifactId>mapstruct</artifactId>
@@ -150,25 +167,20 @@
            <version>${mapstruct.version}</version>
        </dependency>

+        <!-- xxl-job 定时任务 -->
        <dependency>
            <groupId>com.xuxueli</groupId>
            <artifactId>xxl-job-core</artifactId>
            <version>${xxl-job.version}</version>
        </dependency>

+        <!-- Excel 工具（EasyExcel-PLus ）  -->
        <dependency>
            <groupId>cn.idev.excel</groupId>
            <artifactId>fastexcel</artifactId>
            <version>${fastexcel.version}</version>
        </dependency>

-
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
        <!-- MinIO 对象存储 -->
        <dependency>
            <groupId>io.minio</groupId>
@@ -176,6 +188,7 @@
            <version>${minio.version}</version>
        </dependency>

+        <!-- 阿里云 OSS 对象存储 -->
        <dependency>
            <groupId>com.aliyun.oss</groupId>
            <artifactId>aliyun-sdk-oss</artifactId>
@@ -189,34 +202,27 @@
            <version>${redisson.version}</version>
        </dependency>

-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
-
+        <!-- mybatis-plus 代码生成器 -->
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-generator</artifactId>
            <version>${mybatis-plus-generator.version}</version>
        </dependency>

+        <!-- velocity 模板引擎(代码生成) -->
        <dependency>
            <groupId>org.apache.velocity</groupId>
            <artifactId>velocity-engine-core</artifactId>
            <version>${velocity.version}</version>
        </dependency>

+        <!-- IP 转省市区 -->
        <dependency>
            <groupId>org.lionsoul</groupId>
            <artifactId>ip2region</artifactId>
            <version>${ip2region.version}</version>
        </dependency>

-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-mail</artifactId>
-        </dependency>
-
        <dependency>
            <groupId>com.aliyun</groupId>
            <artifactId>aliyun-java-sdk-core</artifactId>
@@ -235,6 +241,7 @@
            <version>${weixin-java.version}</version>
        </dependency>

+        <!-- 本地缓存 -->
        <dependency>
            <groupId>com.github.ben-manes.caffeine</groupId>
            <artifactId>caffeine</artifactId>
--- a/src/main/java/com/youlai/boot/system/controller/DictController.java
+++ b/src/main/java/com/youlai/boot/system/controller/DictController.java
@@ -170,9 +170,9 @@ public class DictController {
    @DeleteMapping("/{dictCode}/items/{itemIds}")
    @PreAuthorize("@ss.hasPerm('sys:dict-item:delete')")
    public Result<Void> deleteDictItems(
-            @Parameter(description = "字典ID，多个以英文逗号(,)拼接") @PathVariable String ids
+            @Parameter(description = "字典ID，多个以英文逗号(,)拼接") @PathVariable String itemIds
    ) {
-        dictItemService.deleteDictItemByIds(ids);
+        dictItemService.deleteDictItemByIds(itemIds);
        return Result.success();
    }

--- a/src/main/java/com/youlai/boot/system/controller/UserController.java
+++ b/src/main/java/com/youlai/boot/system/controller/UserController.java
@@ -19,7 +19,7 @@ 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.vo.UserInfoVO;
+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;
@@ -128,9 +128,9 @@ public class UserController {
    @Operation(summary = "获取当前登录用户信息")
    @GetMapping("/me")
    @Log(value = "获取当前登录用户信息", module = LogModuleEnum.USER)
-    public Result<UserInfoVO> getCurrentUserInfo() {
-        UserInfoVO userInfoVO = userService.getCurrentUserInfo();
-        return Result.success(userInfoVO);
+    public Result<CurrentUserDTO> getCurrentUser() {
+        CurrentUserDTO currentUserDTO = userService.getCurrentUser();
+        return Result.success(currentUserDTO);
    }

    @Operation(summary = "用户导入模板下载")
--- a/src/main/java/com/youlai/boot/system/converter/UserConverter.java
+++ b/src/main/java/com/youlai/boot/system/converter/UserConverter.java
@@ -3,7 +3,7 @@ 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.vo.UserInfoVO;
+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;
@@ -38,12 +38,12 @@ public interface UserConverter {
    @Mappings({
            @Mapping(target = "userId", source = "id")
    })
-    UserInfoVO toUserInfoVo(User entity);
+    CurrentUserDTO toCurrentUserDto(User entity);

    User toEntity(UserImportDTO vo);


-    UserProfileVO toProfileVO(UserBO bo);
+    UserProfileVO toProfileVo(UserBO bo);

    User toEntity(UserProfileForm formData);

--- a/src/main/java/com/youlai/boot/system/model/dto/CurrentUserDTO.java
+++ b/src/main/java/com/youlai/boot/system/model/dto/CurrentUserDTO.java
@@ -1,4 +1,4 @@
-package com.youlai.boot.system.model.vo;
+package com.youlai.boot.system.model.dto;

 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -6,14 +6,14 @@ import lombok.Data;
 import java.util.Set;

 /**
- * 用户登录视图对象
+ * 当前登录用户对象
 *
 * @author haoxr
 * @since 2022/1/14
 */
-@Schema(description ="当前登录用户视图对象")
+@Schema(description ="当前登录用户对象")
@Data
-public class UserInfoVO {
+public class CurrentUserDTO {

    @Schema(description="用户ID")
    private Long userId;
--- a/src/main/java/com/youlai/boot/system/service/UserService.java
+++ b/src/main/java/com/youlai/boot/system/service/UserService.java
@@ -4,10 +4,10 @@ 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.core.security.model.AuthCredentials;
+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.UserInfoVO;
 import com.youlai.boot.system.model.vo.UserPageVO;
 import com.youlai.boot.system.model.vo.UserProfileVO;
 import com.youlai.boot.system.model.form.*;
@@ -87,9 +87,9 @@ public interface UserService extends IService<User> {
    /**
     * 获取登录用户信息
     *
-     * @return {@link UserInfoVO} 登录用户信息
+     * @return {@link CurrentUserDTO} 登录用户信息
     */
-    UserInfoVO getCurrentUserInfo();
+    CurrentUserDTO getCurrentUserInfo();

    /**
     * 获取个人中心用户信息
--- a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
@@ -23,13 +23,13 @@ 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.core.security.model.AuthCredentials;
+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.UserInfoVO;
 import com.youlai.boot.system.model.vo.UserPageVO;
 import com.youlai.boot.system.model.vo.UserProfileVO;
 import com.youlai.boot.system.service.*;
@@ -314,10 +314,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
    /**
     * 获取登录用户信息
     *
-     * @return {@link UserInfoVO}   用户信息
+     * @return {@link CurrentUserDTO}   用户信息
     */
    @Override
-    public UserInfoVO getCurrentUserInfo() {
+    public CurrentUserDTO getCurrentUserInfo() {

        String username = SecurityUtils.getUsername();

@@ -332,7 +332,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                )
        );
        // entity->VO
-        UserInfoVO userInfoVO = userConverter.toUserInfoVo(user);
+        CurrentUserDTO userInfoVO = userConverter.toCurrentUserDto(user);

        // 用户角色集合
        Set<String> roles = SecurityUtils.getRoles();
@@ -355,7 +355,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
    @Override
    public UserProfileVO getUserProfile(Long userId) {
        UserBO entity = this.baseMapper.getUserProfile(userId);
-        return userConverter.toProfileVO(entity);
+        return userConverter.toProfileVo(entity);
    }

    /**