From 902d862ee5b4e5d9c8da5edf8e42e54a3b5e479d Mon Sep 17 00:00:00 2001
From: Jie Zheng <201507802@qq.com>
Date: Tue, 14 Jan 2025 17:24:01 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E3=80=81=E8=A7=92=E8=89=B2=E3=80=81=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhengjie/modules/system/domain/Dict.java  |  6 ---
 .../system/domain/dto/RoleQueryCriteria.java  |  3 ++
 .../system/domain/dto/UserQueryCriteria.java  |  3 ++
 .../modules/system/mapper/RoleMapper.java     |  4 +-
 .../modules/system/mapper/UserMapper.java     |  2 +
 .../system/service/impl/DictServiceImpl.java  |  6 ++-
 .../system/service/impl/RoleServiceImpl.java  |  7 +--
 .../system/service/impl/UserServiceImpl.java  |  7 +--
 .../resources/mapper/system/DictMapper.xml    | 14 +-----
 .../resources/mapper/system/RoleMapper.xml    | 47 +++++++++++++------
 .../resources/mapper/system/UserMapper.xml    | 43 ++++++++++++-----
 11 files changed, 85 insertions(+), 57 deletions(-)

diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java
index 3b7068c..1a2578a 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java
@@ -16,7 +16,6 @@
 package me.zhengjie.modules.system.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
@@ -26,7 +25,6 @@ import me.zhengjie.base.BaseEntity;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.List;
 
 /**
 * @author Zheng Jie
@@ -42,10 +40,6 @@ public class Dict extends BaseEntity implements Serializable {
     @TableId(value = "dict_id", type = IdType.AUTO)
     private Long id;
 
-    @TableField(exist = false)
-    @ApiModelProperty(value = "字典详情")
-    private List<DictDetail> dictDetails;
-
     @NotBlank
     @ApiModelProperty(value = "名称")
     private String name;
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/RoleQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/RoleQueryCriteria.java
index 05c3f5c..7fc738b 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/RoleQueryCriteria.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/RoleQueryCriteria.java
@@ -38,4 +38,7 @@ public class RoleQueryCriteria {
 
     @ApiModelProperty(value = "每页数据量", example = "10")
     private Integer size = 10;
+
+    @ApiModelProperty(value = "偏移量", hidden = true)
+    private long offset;
 }
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/UserQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/UserQueryCriteria.java
index 0815c93..9a6b8b9 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/UserQueryCriteria.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/UserQueryCriteria.java
@@ -53,4 +53,7 @@ public class UserQueryCriteria implements Serializable {
 
     @ApiModelProperty(value = "每页数据量", example = "10")
     private Integer size = 10;
+
+    @ApiModelProperty(value = "偏移量", hidden = true)
+    private long offset;
 }
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/RoleMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/RoleMapper.java
index 6aeab80..210b033 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/RoleMapper.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/RoleMapper.java
@@ -35,9 +35,9 @@ public interface RoleMapper extends BaseMapper<Role> {
 
     List<Role> queryAll();
 
-    List<Role> findAll(@Param("criteria") RoleQueryCriteria criteria);
+    Long countAll(@Param("criteria") RoleQueryCriteria criteria);
 
-    IPage<Role> findAll(@Param("criteria") RoleQueryCriteria criteria, Page<Object> page);
+    List<Role> findAll(@Param("criteria") RoleQueryCriteria criteria);
 
     Role findById(@Param("roleId") Long roleId);
 
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/UserMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/UserMapper.java
index 5eb5a7e..a2a5743 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/UserMapper.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/UserMapper.java
@@ -34,6 +34,8 @@ import java.util.Set;
 @Mapper
 public interface UserMapper extends BaseMapper<User> {
 
+    Long countAll(@Param("criteria") UserQueryCriteria criteria);
+
     List<User> findAll(@Param("criteria") UserQueryCriteria criteria);
 
     IPage<User> findAll(@Param("criteria") UserQueryCriteria criteria, Page<Object> page);
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java
index 5158875..2e44bbc 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java
@@ -44,6 +44,7 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
     private final DictMapper dictMapper;
     private final RedisUtils redisUtils;
     private final DictDetailMapper deleteDetail;
+    private final DictDetailMapper dictDetailMapper;
 
     @Override
     public PageResult<Dict> queryAll(DictQueryCriteria criteria, Page<Object> page){
@@ -91,8 +92,9 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
     public void download(List<Dict> dicts, HttpServletResponse response) throws IOException {
         List<Map<String, Object>> list = new ArrayList<>();
         for (Dict dict : dicts) {
-            if(CollectionUtil.isNotEmpty(dict.getDictDetails())){
-                for (DictDetail dictDetail : dict.getDictDetails()) {
+            List<DictDetail> dictDetails = dictDetailMapper.findByDictName(dict.getName());
+            if(CollectionUtil.isNotEmpty(dictDetails)){
+                for (DictDetail dictDetail : dictDetails) {
                     Map<String,Object> map = new LinkedHashMap<>();
                     map.put("字典名称", dict.getName());
                     map.put("字典描述", dict.getDescription());
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java
index 076f6db..c5dbd68 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java
@@ -17,7 +17,6 @@ package me.zhengjie.modules.system.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -70,8 +69,10 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
 
     @Override
     public PageResult<Role> queryAll(RoleQueryCriteria criteria, Page<Object> page) {
-        IPage<Role> roles = roleMapper.findAll(criteria, page);
-        return PageUtil.toPage(roles);
+        criteria.setOffset(page.offset());
+        List<Role> roles = roleMapper.findAll(criteria);
+        Long total = roleMapper.countAll(criteria);
+        return PageUtil.toPage(roles, total);
     }
 
     @Override
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
index 65e2539..9968121 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
@@ -15,7 +15,6 @@
  */
 package me.zhengjie.modules.system.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -62,8 +61,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     @Override
     public PageResult<User> queryAll(UserQueryCriteria criteria, Page<Object> page) {
-        IPage<User> users = userMapper.findAll(criteria, page);
-        return PageUtil.toPage(users);
+        criteria.setOffset(page.offset());
+        List<User> users = userMapper.findAll(criteria);
+        Long total = userMapper.countAll(criteria);
+        return PageUtil.toPage(users, total);
     }
 
     @Override
diff --git a/eladmin/eladmin-system/src/main/resources/mapper/system/DictMapper.xml b/eladmin/eladmin-system/src/main/resources/mapper/system/DictMapper.xml
index 317a570..b382e25 100644
--- a/eladmin/eladmin-system/src/main/resources/mapper/system/DictMapper.xml
+++ b/eladmin/eladmin-system/src/main/resources/mapper/system/DictMapper.xml
@@ -9,27 +9,15 @@
         <result column="update_by" property="updateBy" jdbcType="VARCHAR"/>
         <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
-        <collection property="dictDetails" ofType="me.zhengjie.modules.system.domain.DictDetail">
-            <id column="dd_id" property="id" jdbcType="BIGINT"/>
-            <result column="label" property="label" jdbcType="VARCHAR"/>
-            <result column="value" property="value" jdbcType="VARCHAR"/>
-            <result column="dd_create_time" property="createTime" jdbcType="TIMESTAMP"/>
-        </collection>
     </resultMap>
 
     <sql id="Base_Column_List">
         d.dict_id, d.name, d.description, d.create_by, d.update_by, d.create_time, d.update_time
     </sql>
 
-    <sql id="Dict_Details_Column_List">
-        dd.detail_id as dd_id, dd.label, dd.`value`, dd.create_time as dd_create_time
-    </sql>
-
     <select id="findAll" resultMap="BaseResultMap">
-        SELECT <include refid="Base_Column_List"/>,
-        <include refid="Dict_Details_Column_List"/>
+        SELECT <include refid="Base_Column_List"/>
         from sys_dict d
-        left join sys_dict_detail dd on d.dict_id = dd.dict_id
         <where>
             <if test="criteria.blurry != null and criteria.blurry != ''">
                 and (
diff --git a/eladmin/eladmin-system/src/main/resources/mapper/system/RoleMapper.xml b/eladmin/eladmin-system/src/main/resources/mapper/system/RoleMapper.xml
index edccd95..fc5c08b 100644
--- a/eladmin/eladmin-system/src/main/resources/mapper/system/RoleMapper.xml
+++ b/eladmin/eladmin-system/src/main/resources/mapper/system/RoleMapper.xml
@@ -36,21 +36,7 @@
         dept.dept_id as dept_id, dept.name as dept_name
     </sql>
 
-    <select id="queryAll" resultType="me.zhengjie.modules.system.domain.Role">
-        select role_id as id, name, level
-        from sys_role order by level
-    </select>
-
-    <select id="findAll" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>,
-        <include refid="Dept_Column_List"/>,
-        <include refid="Menu_Column_List"/>
-        from sys_role role
-        left join sys_roles_menus srm on role.role_id = srm.role_id
-        left join  sys_menu menu on menu.menu_id = srm.menu_id
-        left join sys_roles_depts srd on role.role_id = srd.role_id
-        left join sys_dept dept on dept.dept_id = srd.dept_id
+    <sql id="Where_sql">
         <where>
             <if test="criteria.blurry != null and criteria.blurry != ''">
                 and (
@@ -62,7 +48,38 @@
                 and role.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]}
             </if>
         </where>
+    </sql>
+
+    <select id="queryAll" resultType="me.zhengjie.modules.system.domain.Role">
+        select role_id as id, name, level
+        from sys_role order by level
+    </select>
+
+    <select id="findAll" resultMap="BaseResultMap">
+        select role.*,
+        <include refid="Dept_Column_List"/>,
+        <include refid="Menu_Column_List"/>
+        from (
+        select
+        <include refid="Base_Column_List"/>
+        from sys_role role
+        <include refid="Where_sql"/>
         order by role.level
+        <if test="criteria.offset != null">
+            limit #{criteria.offset}, #{criteria.size}
+        </if>
+        ) role
+        left join sys_roles_menus srm on role.role_role_id = srm.role_id
+        left join  sys_menu menu on menu.menu_id = srm.menu_id
+        left join sys_roles_depts srd on role.role_role_id = srd.role_id
+        left join sys_dept dept on dept.dept_id = srd.dept_id
+        order by role.role_level
+    </select>
+
+    <select id="countAll" resultType="java.lang.Long">
+        select count(*)
+        from sys_role role
+        <include refid="Where_sql"/>
     </select>
 
     <select id="findByName" resultType="me.zhengjie.modules.system.domain.Role">
diff --git a/eladmin/eladmin-system/src/main/resources/mapper/system/UserMapper.xml b/eladmin/eladmin-system/src/main/resources/mapper/system/UserMapper.xml
index 6343b3d..f386dc9 100644
--- a/eladmin/eladmin-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/eladmin/eladmin-system/src/main/resources/mapper/system/UserMapper.xml
@@ -36,7 +36,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-           u.user_id as user_user_id, u.dept_id as user_dept_id, u.username as user_username,
+        u.user_id as user_user_id, u.dept_id as user_dept_id, u.username as user_username,
            u.nick_name as user_nick_name, u.email as user_email, u.phone as user_phone,
            u.gender as user_gender, u.avatar_name as user_avatar_name, u.avatar_path as user_avatar_path,
            u.enabled as user_enabled, u.pwd_reset_time as user_pwd_reset_time, u.create_by as user_create_by,
@@ -52,17 +52,7 @@
         r.role_id as role_id, r.name as role_name, r.level as role_level, r.data_scope as role_data_scope
     </sql>
 
-    <select id="findAll" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>,
-        <include refid="Job_Column_List"/>,
-        <include refid="Role_Column_List"/>
-        from sys_user u
-        left join sys_dept d on u.dept_id = d.dept_id
-        left join sys_users_jobs suj on u.user_id = suj.user_id
-        left join sys_job j on suj.job_id = j.job_id
-        left join sys_users_roles sur on u.user_id = sur.user_id
-        left join sys_role r on sur.role_id = r.role_id
+    <sql id="Whrer_Sql">
         <where>
             <if test="criteria.id != null">
                 and u.user_id = #{criteria.id}
@@ -87,7 +77,34 @@
                 and u.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]}
             </if>
         </where>
+    </sql>
+
+    <select id="findAll" resultMap="BaseResultMap">
+        select u.*,
+        <include refid="Job_Column_List"/>,
+        <include refid="Role_Column_List"/>
+        from (
+        select
+        <include refid="Base_Column_List"/>
+        from sys_user u
+        left join sys_dept d on u.dept_id = d.dept_id
+        <include refid="Whrer_Sql"/>
         order by u.user_id desc
+        <if test="criteria.offset != null">
+            limit #{criteria.offset}, #{criteria.size}
+        </if>
+        ) u
+        left join sys_users_jobs suj on u.user_user_id = suj.user_id
+        left join sys_job j on suj.job_id = j.job_id
+        left join sys_users_roles sur on u.user_user_id = sur.user_id
+        left join sys_role r on sur.role_id = r.role_id
+        order by u.user_user_id desc
+    </select>
+
+    <select id="countAll" resultType="java.lang.Long">
+        select count(*)
+        from sys_user u
+        <include refid="Whrer_Sql"/>
     </select>
 
     <select id="findByUsername" resultMap="BaseResultMap">
@@ -158,4 +175,4 @@
             #{id}
         </foreach>
     </update>
-</mapper>
+</mapper>
\ No newline at end of file