From 53dea0ef5fc8b035397b73b10f7a819ebf381b1c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 09 七月 2024 09:39:11 +0800
Subject: [PATCH] 分页优化

---
 src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java |   85 +++++++++++++++++++++++++++++++++---------
 1 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java
index d4d2290..6f296cb 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java
@@ -1,10 +1,9 @@
 package com.mindskip.xzs.service.impl;
 
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.mindskip.xzs.domain.Department;
 import com.mindskip.xzs.domain.enums.DeptAdminEnum;
 import com.mindskip.xzs.domain.vo.BaseSelect;
+import com.mindskip.xzs.domain.vo.CascaderDataVO;
 import com.mindskip.xzs.domain.vo.UpdateDeptAdminVO;
 import com.mindskip.xzs.repository.BaseMapper;
 import com.mindskip.xzs.repository.DepartmentMapper;
@@ -12,14 +11,14 @@
 import com.mindskip.xzs.repository.UserMapper;
 import com.mindskip.xzs.service.DepartmentService;
 import com.mindskip.xzs.utility.ModelMapperSingle;
+import com.mindskip.xzs.utility.TreeUtils;
 import com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM;
 import org.modelmapper.ModelMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -39,11 +38,9 @@
     }
 
     @Override
-    public Integer add(String name) {
-        Department department = new Department();
-        department.setDeleted("0");
-        department.setName(name);
-        return departmentMapper.add(department);
+    public Integer add(Department model) {
+        model.setDeleted("0");
+        return departmentMapper.add(model);
     }
 
     @Override
@@ -77,10 +74,33 @@
     }
 
     @Override
-    public PageInfo<DepartmentResponseVM> gets(DepartmentResponseVM departmentResponseVM) {
-        return PageHelper.startPage(departmentResponseVM.getPageIndex(), departmentResponseVM.getPageSize(), "id desc").doSelectPageInfo(() ->
-                departmentMapper.page(departmentResponseVM)
-        );
+    public List<DepartmentResponseVM> gets(DepartmentResponseVM departmentResponseVM) {
+        List<DepartmentResponseVM> deptList = departmentMapper.page(departmentResponseVM);
+        return this.buildPageTree(deptList);
+    }
+
+    public List<DepartmentResponseVM> buildPageTree(List<DepartmentResponseVM> departments) {
+        // 鐢ㄤ簬瀛樺偍宸茬粡鏀惧叆鏍戠殑鑺傜偣锛屼互value涓洪敭
+        Map<Integer, DepartmentResponseVM> map = new HashMap<>();
+        List<DepartmentResponseVM> rootNodes = new ArrayList<>();
+
+        // 绗竴姝ワ細灏嗘墍鏈夎妭鐐规斁鍏ap涓紝骞跺垵濮嬪寲children鍒楄〃
+        for (DepartmentResponseVM dept : departments) {
+            map.put(dept.getId(), dept);
+            dept.setChildren(new ArrayList<>());
+        }
+        // 绗簩姝ワ細鏋勫缓鏍戝舰缁撴瀯
+        for (DepartmentResponseVM dept : departments) {
+            if (dept.getParentId() == null) {
+                rootNodes.add(dept);
+            } else {
+                DepartmentResponseVM parent = map.get(dept.getParentId());
+                if (parent != null) {
+                    parent.getChildren().add(dept);
+                }
+            }
+        }
+        return rootNodes;
     }
 
     @Override
@@ -89,11 +109,8 @@
     }
 
     @Override
-    public List<Department> gets(Integer deptId) {
-        if (deptId == null || deptId == -1) {
-            deptId = null;
-        }
-        return departmentMapper.gets(deptId);
+    public List<Department> gets(List<Integer> deptId) {
+        return TreeUtils.build(departmentMapper.gets(deptId));
     }
 
     @Override
@@ -133,4 +150,36 @@
         // 淇敼娌¤閫夋嫨鐨勭敤鎴峰苟涓斾笉鏄埆鐨勯儴闂ㄧ鐞嗗憳鐨勭敤鎴疯鑹蹭负1
         userMapper.cancelUserDeptAdmin(form);
     }
+
+    @Override
+    public List<CascaderDataVO> cascader() {
+        List<CascaderDataVO> deptList = departmentMapper.list();
+        List<CascaderDataVO> tree = this.buildTree(deptList);
+        return tree;
+    }
+
+
+    public List<CascaderDataVO> buildTree(List<CascaderDataVO> departments) {
+        // 鐢ㄤ簬瀛樺偍宸茬粡鏀惧叆鏍戠殑鑺傜偣锛屼互value涓洪敭
+        Map<Integer, CascaderDataVO> map = new HashMap<>();
+        List<CascaderDataVO> rootNodes = new ArrayList<>();
+
+        // 绗竴姝ワ細灏嗘墍鏈夎妭鐐规斁鍏ap涓紝骞跺垵濮嬪寲children鍒楄〃
+        for (CascaderDataVO dept : departments) {
+            map.put(dept.getValue(), dept);
+            dept.setChildren(new ArrayList<>());
+        }
+        // 绗簩姝ワ細鏋勫缓鏍戝舰缁撴瀯
+        for (CascaderDataVO dept : departments) {
+            if (dept.getParentId() == null) { // 鍋囪椤剁骇閮ㄩ棬鐨刾arentId涓簄ull鎴�0
+                rootNodes.add(dept);
+            } else {
+                CascaderDataVO parent = map.get(dept.getParentId());
+                if (parent != null) {
+                    parent.getChildren().add(dept);
+                }
+            }
+        }
+        return rootNodes;
+    }
 }

--
Gitblit v1.8.0