From c5c10c1bb95f5bb7fdc8b714c5c998e78c26e0f7 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 09 七月 2024 09:47:43 +0800
Subject: [PATCH] feat：标签新增、下拉增加部门id
---
src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java | 80 +++++++++++++++++++++++++++++++++-------
1 files changed, 66 insertions(+), 14 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 503fd0b..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
@@ -90,7 +110,7 @@
@Override
public List<Department> gets(List<Integer> deptId) {
- return departmentMapper.gets(deptId);
+ return TreeUtils.build(departmentMapper.gets(deptId));
}
@Override
@@ -130,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