From 149b44640ec5f081563bc145dd4cf73e059ac82c Mon Sep 17 00:00:00 2001
From: Bunny <1319900154@qq.com>
Date: Fri, 4 Oct 2024 23:36:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=A2=9E):=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vms/web/index.vm       | 24 ++++++++++++++++
 .../exception/GlobalExceptionHandler.java     |  4 ++-
 .../dao/dto/system/files/FileUploadDto.java   |  4 +++
 .../system/user/UserUpdateWithAvatarDto.java  | 28 +++++++++++++++++++
 .../user/UserUpdateWithPasswordDto.java       |  1 +
 .../cn/bunny/dao/entity/system}/Files.java    |  2 +-
 .../services/controller/UserController.java   |  8 ++++++
 .../cn/bunny/services/mapper/FilesMapper.java |  2 +-
 .../bunny/services/service/FilesService.java  |  2 +-
 .../bunny/services/service/UserService.java   |  7 +++++
 .../service/impl/FilesServiceImpl.java        |  2 +-
 .../service/impl/UserServiceImpl.java         | 21 ++++++++++++++
 .../src/main/resources/mapper/FilesMapper.xml |  2 +-
 13 files changed, 101 insertions(+), 6 deletions(-)
 create mode 100644 dao/src/main/java/cn/bunny/dao/dto/system/user/UserUpdateWithAvatarDto.java
 rename {service/src/main/java/cn/bunny/services/Bunny => dao/src/main/java/cn/bunny/dao/entity/system}/Files.java (96%)

diff --git a/common/common-generator/src/main/resources/vms/web/index.vm b/common/common-generator/src/main/resources/vms/web/index.vm
index 663e778..742e5ad 100644
--- a/common/common-generator/src/main/resources/vms/web/index.vm
+++ b/common/common-generator/src/main/resources/vms/web/index.vm
@@ -17,6 +17,27 @@
     const formRef = ref();
     const ${lowercaseName}Store = use${originalName}Store();
 
+    /**
+     * * 当前页改变时
+     */
+    const onCurrentPageChange = async (value: number) => {
+        ${lowercaseName}Store.pagination.currentPage = value;
+        await onSearch();
+    };
+
+    /**
+     * * 当分页发生变化
+     * @param value
+     */
+    const onPageSizeChange = async (value: number) => {
+        ${lowercaseName}Store.pagination.pageSize = value;
+        await onSearch();
+    };
+
+    /**
+     * 重置表单
+     * @param formEl
+     */
     const resetForm = async formEl => {
         if (!formEl) return;
         formEl.resetFields();
@@ -63,6 +84,9 @@
                         row-key="id"
                         showOverflowTooltip
                         table-layout="auto"
+                        :pagination="${lowercaseName}Store.pagination"
+                        @page-size-change="onPageSizeChange"
+					    @page-current-change="onCurrentPageChange"
                 >
 
                     <template #createUser="{ row }">
diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java b/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java
index 6542c8e..f939b85 100644
--- a/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java
+++ b/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java
@@ -76,7 +76,9 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public Result<String> handleValidationExceptions(MethodArgumentNotValidException ex) {
         log.error("表单验证失败：{}", ex.getMessage());
-        String errorMessage = ex.getBindingResult().getFieldErrors().stream().map(DefaultMessageSourceResolvable::getDefaultMessage).collect(Collectors.joining(", "));
+        String errorMessage = ex.getBindingResult().getFieldErrors().stream()
+                .map(DefaultMessageSourceResolvable::getDefaultMessage)
+                .collect(Collectors.joining(", "));
         return Result.error(null, 201, errorMessage);
     }
 
diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/files/FileUploadDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/files/FileUploadDto.java
index 8aaed7b..a184995 100644
--- a/dao/src/main/java/cn/bunny/dao/dto/system/files/FileUploadDto.java
+++ b/dao/src/main/java/cn/bunny/dao/dto/system/files/FileUploadDto.java
@@ -1,6 +1,8 @@
 package cn.bunny.dao.dto.system.files;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -15,9 +17,11 @@ import org.springframework.web.multipart.MultipartFile;
 public class FileUploadDto {
 
     @Schema(name = "file", title = "文件")
+    @NotNull(message = "文件不能为空")
     MultipartFile file;
 
     @Schema(name = "type", title = "文件类型")
+    @NotBlank(message = "文件类型不能为空")
     String type;
 
 }
\ No newline at end of file
diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/user/UserUpdateWithAvatarDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/user/UserUpdateWithAvatarDto.java
new file mode 100644
index 0000000..2c9f89d
--- /dev/null
+++ b/dao/src/main/java/cn/bunny/dao/dto/system/user/UserUpdateWithAvatarDto.java
@@ -0,0 +1,28 @@
+package cn.bunny.dao.dto.system.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Schema(name = "UserUpdateWithAvatarDto对象", title = "管理员用户修改头像", description = "管理员用户修改头像")
+public class UserUpdateWithAvatarDto {
+
+    @Schema(name = "userId", title = "用户ID")
+    @NotNull(message = "用户ID不能为空")
+    private Long userId;
+
+    @Schema(name = "avatar", title = "用户头像")
+    @NotBlank(message = "用户头像不能为空")
+    @NotEmpty
+    private String avatar;
+
+}
\ No newline at end of file
diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/user/UserUpdateWithPasswordDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/user/UserUpdateWithPasswordDto.java
index 5167116..c859bfa 100644
--- a/dao/src/main/java/cn/bunny/dao/dto/system/user/UserUpdateWithPasswordDto.java
+++ b/dao/src/main/java/cn/bunny/dao/dto/system/user/UserUpdateWithPasswordDto.java
@@ -26,3 +26,4 @@ public class UserUpdateWithPasswordDto {
     private String password;
 
 }
+
diff --git a/service/src/main/java/cn/bunny/services/Bunny/Files.java b/dao/src/main/java/cn/bunny/dao/entity/system/Files.java
similarity index 96%
rename from service/src/main/java/cn/bunny/services/Bunny/Files.java
rename to dao/src/main/java/cn/bunny/dao/entity/system/Files.java
index f5ef409..9dd663f 100644
--- a/service/src/main/java/cn/bunny/services/Bunny/Files.java
+++ b/dao/src/main/java/cn/bunny/dao/entity/system/Files.java
@@ -1,4 +1,4 @@
-package cn.bunny.services.Bunny;
+package cn.bunny.dao.entity.system;
 
 import cn.bunny.dao.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/service/src/main/java/cn/bunny/services/controller/UserController.java b/service/src/main/java/cn/bunny/services/controller/UserController.java
index 4b56fef..9ca21cf 100644
--- a/service/src/main/java/cn/bunny/services/controller/UserController.java
+++ b/service/src/main/java/cn/bunny/services/controller/UserController.java
@@ -70,6 +70,14 @@ public class UserController {
         return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
     }
 
+    @Operation(summary = "管理员上传用户头像", description = "管理员上传用户头像")
+    @PutMapping("uploadAvatarByAdmin")
+    public Result<String> uploadAvatarByAdmin(@Valid UserUpdateWithAvatarDto dto) {
+        userService.uploadAvatarByAdmin(dto);
+        return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
+    }
+
+
     @Operation(summary = "登录发送邮件验证码", description = "登录发送邮件验证码")
     @PostMapping("noAuth/sendLoginEmail")
     public Result<String> sendLoginEmail(String email) {
diff --git a/service/src/main/java/cn/bunny/services/mapper/FilesMapper.java b/service/src/main/java/cn/bunny/services/mapper/FilesMapper.java
index bdab061..0a49324 100644
--- a/service/src/main/java/cn/bunny/services/mapper/FilesMapper.java
+++ b/service/src/main/java/cn/bunny/services/mapper/FilesMapper.java
@@ -1,6 +1,6 @@
 package cn.bunny.services.mapper;
 
-import cn.bunny.services.Bunny.Files;
+import cn.bunny.dao.entity.system.Files;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/service/src/main/java/cn/bunny/services/service/FilesService.java b/service/src/main/java/cn/bunny/services/service/FilesService.java
index 096e4ea..1847b29 100644
--- a/service/src/main/java/cn/bunny/services/service/FilesService.java
+++ b/service/src/main/java/cn/bunny/services/service/FilesService.java
@@ -1,8 +1,8 @@
 package cn.bunny.services.service;
 
 import cn.bunny.dao.dto.system.files.FileUploadDto;
+import cn.bunny.dao.entity.system.Files;
 import cn.bunny.dao.vo.system.files.FileInfoVo;
-import cn.bunny.services.Bunny.Files;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
diff --git a/service/src/main/java/cn/bunny/services/service/UserService.java b/service/src/main/java/cn/bunny/services/service/UserService.java
index 569138d..4b863a6 100644
--- a/service/src/main/java/cn/bunny/services/service/UserService.java
+++ b/service/src/main/java/cn/bunny/services/service/UserService.java
@@ -86,4 +86,11 @@ public interface UserService extends IService<AdminUser> {
      * @param dto 管理员用户修改密码
      */
     void updateUserPasswordByAdmin(UserUpdateWithPasswordDto dto);
+
+    /**
+     * * 管理员上传用户头像
+     *
+     * @param dto 管理员用户修改头像
+     */
+    void uploadAvatarByAdmin(UserUpdateWithAvatarDto dto);
 }
diff --git a/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java
index 32ab581..0ad599b 100644
--- a/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java
@@ -5,10 +5,10 @@ import cn.bunny.common.service.exception.BunnyException;
 import cn.bunny.common.service.utils.FileUtil;
 import cn.bunny.common.service.utils.minio.MinioUtil;
 import cn.bunny.dao.dto.system.files.FileUploadDto;
+import cn.bunny.dao.entity.system.Files;
 import cn.bunny.dao.pojo.common.MinioFIlePath;
 import cn.bunny.dao.pojo.result.ResultCodeEnum;
 import cn.bunny.dao.vo.system.files.FileInfoVo;
-import cn.bunny.services.Bunny.Files;
 import cn.bunny.services.mapper.FilesMapper;
 import cn.bunny.services.service.FilesService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java
index 2540a6b..13e176a 100644
--- a/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java
@@ -165,6 +165,27 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, AdminUser> implemen
         updateById(adminUser);
     }
 
+    /**
+     * * 管理员上传用户头像
+     *
+     * @param dto 管理员用户修改头像
+     */
+    @Override
+    public void uploadAvatarByAdmin(UserUpdateWithAvatarDto dto) {
+        String avatar = dto.getAvatar();
+        Long userId = dto.getUserId();
+
+        // 判断是否存在这个用户
+        AdminUser adminUser = getOne(Wrappers.<AdminUser>lambdaQuery().eq(AdminUser::getId, userId));
+        if (adminUser == null) throw new BunnyException(ResultCodeEnum.USER_IS_EMPTY);
+
+        // 更新用户
+        adminUser = new AdminUser();
+        adminUser.setId(userId);
+        adminUser.setAvatar(avatar);
+        updateById(adminUser);
+    }
+
     /**
      * * 用户信息 服务实现类
      *
diff --git a/service/src/main/resources/mapper/FilesMapper.xml b/service/src/main/resources/mapper/FilesMapper.xml
index 1e03719..ec48991 100644
--- a/service/src/main/resources/mapper/FilesMapper.xml
+++ b/service/src/main/resources/mapper/FilesMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="cn.bunny.services.mapper.FilesMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.bunny.services.Bunny.Files">
+    <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.Files">
         <id column="id" property="id"/>
         <result column="filename" property="filename"/>
         <result column="filepath" property="filepath"/>