chore: 优化用户管理相关代码

continew-org · Oct 30, 2024 · 9ecdeb5 · 9ecdeb5
1 parent 872bc1c
commit 9ecdeb5
Show file tree

Hide file tree

Showing 23 changed files with 202 additions and 199 deletions.
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java
@@ -23,7 +23,7 @@
 import org.apache.ibatis.annotations.Select;
 import top.continew.admin.common.config.mybatis.DataPermissionMapper;
 import top.continew.admin.system.model.entity.UserDO;
-import top.continew.admin.system.model.resp.UserDetailResp;
+import top.continew.admin.system.model.resp.user.UserDetailResp;
 import top.continew.starter.extension.datapermission.annotation.DataPermission;
 import top.continew.starter.security.crypto.annotation.FieldEncrypt;
 

diff --git a/...tem/model/req/UserBasicInfoUpdateReq.java → ...odel/req/user/UserBasicInfoUpdateReq.java b/...tem/model/req/UserBasicInfoUpdateReq.java → ...odel/req/user/UserBasicInfoUpdateReq.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.admin.system.model.req;
+package top.continew.admin.system.model.req.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

diff --git a/...tem/model/req/UserEmailUpdateRequest.java → ...odel/req/user/UserEmailUpdateRequest.java b/...tem/model/req/UserEmailUpdateRequest.java → ...odel/req/user/UserEmailUpdateRequest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.admin.system.model.req;
+package top.continew.admin.system.model.req.user;
 
 import cn.hutool.core.lang.RegexPool;
 import io.swagger.v3.oas.annotations.media.Schema;

diff --git a/...admin/system/model/req/UserImportReq.java → .../system/model/req/user/UserImportReq.java b/...admin/system/model/req/UserImportReq.java → .../system/model/req/user/UserImportReq.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.admin.system.model.req;
+package top.continew.admin.system.model.req.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

diff --git a/...in/system/model/req/UserImportRowReq.java → ...stem/model/req/user/UserImportRowReq.java b/...in/system/model/req/UserImportRowReq.java → ...stem/model/req/user/UserImportRowReq.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.admin.system.model.req;
+package top.continew.admin.system.model.req.user;
 
 import cn.hutool.core.lang.RegexPool;
 import io.swagger.v3.oas.annotations.media.Schema;

diff --git a/...ystem/model/req/UserPasswordResetReq.java → .../model/req/user/UserPasswordResetReq.java b/...ystem/model/req/UserPasswordResetReq.java → .../model/req/user/UserPasswordResetReq.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.admin.system.model.req;
+package top.continew.admin.system.model.req.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

diff --git a/...stem/model/req/UserPasswordUpdateReq.java → ...model/req/user/UserPasswordUpdateReq.java b/...stem/model/req/UserPasswordUpdateReq.java → ...model/req/user/UserPasswordUpdateReq.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.admin.system.model.req;
+package top.continew.admin.system.model.req.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

diff --git a/.../system/model/req/UserPhoneUpdateReq.java → ...em/model/req/user/UserPhoneUpdateReq.java b/.../system/model/req/UserPhoneUpdateReq.java → ...em/model/req/user/UserPhoneUpdateReq.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.admin.system.model.req;
+package top.continew.admin.system.model.req.user;
 
 import cn.hutool.core.lang.RegexPool;
 import io.swagger.v3.oas.annotations.media.Schema;

diff --git a/...tinew/admin/system/model/req/UserReq.java → .../admin/system/model/req/user/UserReq.java b/...tinew/admin/system/model/req/UserReq.java → .../admin/system/model/req/user/UserReq.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.admin.system.model.req;
+package top.continew.admin.system.model.req.user;
 
 import cn.hutool.core.lang.RegexPool;
 import io.swagger.v3.oas.annotations.media.Schema;

diff --git a/...n/system/model/req/UserRoleUpdateReq.java → ...tem/model/req/user/UserRoleUpdateReq.java b/...n/system/model/req/UserRoleUpdateReq.java → ...tem/model/req/user/UserRoleUpdateReq.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.admin.system.model.req;
+package top.continew.admin.system.model.req.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;

diff --git a/...min/system/model/resp/UserDetailResp.java → ...ystem/model/resp/user/UserDetailResp.java b/...min/system/model/resp/UserDetailResp.java → ...ystem/model/resp/user/UserDetailResp.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.admin.system.model.resp;
+package top.continew.admin.system.model.resp.user;
 
 import cn.crane4j.annotation.Assemble;
 import cn.crane4j.annotation.AssembleMethod;
@@ -30,6 +30,7 @@
 import top.continew.admin.common.context.UserContextHolder;
 import top.continew.admin.common.enums.DisEnableStatusEnum;
 import top.continew.admin.common.enums.GenderEnum;
+import top.continew.admin.system.model.resp.DeptResp;
 import top.continew.admin.system.service.DeptService;
 import top.continew.starter.extension.crud.model.resp.BaseDetailResp;
 import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter;

diff --git a/...ystem/model/resp/UserImportParseResp.java → .../model/resp/user/UserImportParseResp.java b/...ystem/model/resp/UserImportParseResp.java → .../model/resp/user/UserImportParseResp.java
@@ -14,31 +14,35 @@
  * limitations under the License.
  */
 
-package top.continew.admin.system.model.resp;
+package top.continew.admin.system.model.resp.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
- * 用户导入结果
+ * 用户导入解析结果
  *
  * @author kils
- * @since 2024-06-18 14:37
+ * @since 2024/6/18 14:37
  */
 @Data
-@Schema(description = "用户导入结果")
 @AllArgsConstructor
 @NoArgsConstructor
-public class UserImportParseResp {
+@Schema(description = "用户导入解析结果")
+public class UserImportParseResp implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**
-     * 导入会话KEY
+     * 导入会话 Key
      */
-    @Schema(description = "导入会话KEY", example = "1b9d6bcd-bbfd-4b2d-9b5d-ab8dfbbd4bed")
+    @Schema(description = "导入会话Key", example = "1b9d6bcd-bbfd-4b2d-9b5d-ab8dfbbd4bed")
     private String importKey;
 
     /**
@@ -54,9 +58,9 @@ public class UserImportParseResp {
     private Integer validRows;
 
     /**
-     * 用户重复行数
+     * 重复行数
      */
-    @Schema(description = "用户重复行数", example = "100")
+    @Schema(description = "重复行数", example = "100")
     private Integer duplicateUserRows;
 
     /**

diff --git a/...min/system/model/resp/UserImportResp.java → ...ystem/model/resp/user/UserImportResp.java b/...min/system/model/resp/UserImportResp.java → ...ystem/model/resp/user/UserImportResp.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.admin.system.model.resp;
+package top.continew.admin.system.model.resp.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

diff --git a/...new/admin/system/model/resp/UserResp.java → ...dmin/system/model/resp/user/UserResp.java b/...new/admin/system/model/resp/UserResp.java → ...dmin/system/model/resp/user/UserResp.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.admin.system.model.resp;
+package top.continew.admin.system.model.resp.user;
 
 import cn.crane4j.annotation.Assemble;
 import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler;

diff --git a/...system/model/resp/UserSocialBindResp.java → ...m/model/resp/user/UserSocialBindResp.java b/...system/model/resp/UserSocialBindResp.java → ...m/model/resp/user/UserSocialBindResp.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.admin.system.model.resp;
+package top.continew.admin.system.model.resp.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/UserService.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/UserService.java
@@ -20,11 +20,11 @@
 import org.springframework.web.multipart.MultipartFile;
 import top.continew.admin.system.model.entity.UserDO;
 import top.continew.admin.system.model.query.UserQuery;
-import top.continew.admin.system.model.req.*;
-import top.continew.admin.system.model.resp.UserDetailResp;
-import top.continew.admin.system.model.resp.UserImportParseResp;
-import top.continew.admin.system.model.resp.UserImportResp;
-import top.continew.admin.system.model.resp.UserResp;
+import top.continew.admin.system.model.req.user.*;
+import top.continew.admin.system.model.resp.user.UserDetailResp;
+import top.continew.admin.system.model.resp.user.UserImportParseResp;
+import top.continew.admin.system.model.resp.user.UserImportResp;
+import top.continew.admin.system.model.resp.user.UserResp;
 import top.continew.starter.data.mp.service.IService;
 import top.continew.starter.extension.crud.service.BaseService;
 
@@ -47,6 +47,30 @@ public interface UserService extends BaseService<UserResp, UserDetailResp, UserQ
      */
     Long add(UserDO user);
 
+    /**
+     * 下载导入模板
+     *
+     * @param response 响应对象
+     * @throws IOException /
+     */
+    void downloadImportTemplate(HttpServletResponse response) throws IOException;
+
+    /**
+     * 解析导入数据
+     *
+     * @param file 导入文件
+     * @return 解析结果
+     */
+    UserImportParseResp parseImport(MultipartFile file);
+
+    /**
+     * 导入数据
+     *
+     * @param req 导入信息
+     * @return 导入结果
+     */
+    UserImportResp importUser(UserImportReq req);
+
     /**
      * 重置密码
      *
@@ -139,28 +163,4 @@ public interface UserService extends BaseService<UserResp, UserDetailResp, UserQ
      * @return 用户数量
      */
     Long countByDeptIds(List<Long> deptIds);
-
-    /**
-     * 下载用户导入模板
-     *
-     * @param response 响应对象
-     * @throws IOException /
-     */
-    void downloadImportUserTemplate(HttpServletResponse response) throws IOException;
-
-    /**
-     * 导入用户
-     *
-     * @param req 导入信息
-     * @return 导入结果
-     */
-    UserImportResp importUser(UserImportReq req);
-
-    /**
-     * 解析用户导入数据
-     *
-     * @param file 导入用户文件
-     * @return 解析结果
-     */
-    UserImportParseResp parseImportUser(MultipartFile file);
 }
diff --git a/...ew-admin-system/src/main/java/top/continew/admin/system/service/impl/DeptServiceImpl.java b/...ew-admin-system/src/main/java/top/continew/admin/system/service/impl/DeptServiceImpl.java
@@ -34,7 +34,7 @@
 import top.continew.admin.system.model.query.UserQuery;
 import top.continew.admin.system.model.req.DeptReq;
 import top.continew.admin.system.model.resp.DeptResp;
-import top.continew.admin.system.model.resp.UserResp;
+import top.continew.admin.system.model.resp.user.UserResp;
 import top.continew.admin.system.service.DeptService;
 import top.continew.admin.system.service.RoleDeptService;
 import top.continew.admin.system.service.UserService;