From 50a862870d6945c8b69adfb283826b84abeb236b Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 03 四月 2024 16:56:47 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DeptController.java |   61 +++++++++++++++++++++++++++---
 1 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DeptController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DeptController.java
index 75a7ffb..7dbd864 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DeptController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DeptController.java
@@ -11,15 +11,14 @@
 import com.zy.asrs.wcs.system.entity.Dept;
 import com.zy.asrs.wcs.system.service.DeptService;
 import com.zy.asrs.wcs.utils.ExcelUtil;
+import com.zy.asrs.wcs.utils.NodeUtils;
+import com.zy.asrs.wcs.utils.Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @RestController
 @RequestMapping("/api")
@@ -43,15 +42,47 @@
     }
 
     @PreAuthorize("hasAuthority('system:dept:list')")
+    @PostMapping("/dept/tree")
+    public R tree(@RequestBody Map<String, Object> map) {
+//        PageParam<Dept, BaseParam> param = new PageParam<>(buildParam(map, BaseParam.class), Dept.class);
+//        QueryWrapper<Dept> wrapper = param.buildWrapper(true, queryWrapper -> queryWrapper.orderByAsc("sort"));
+        List<Dept> deptList = deptService.list(new LambdaQueryWrapper<Dept>().orderByAsc(Dept::getSort));
+        List<Dept> treeData = Utils.toTreeData(deptList, 0L, Dept::getParentId, Dept::getId, Dept::setChildren);
+        if (!Cools.isEmpty(map.get("condition"))) {
+            Utils.treeRemove(treeData, String.valueOf(map.get("condition")), Dept::getName, Dept::getChildren);
+            Utils.treeRemove(treeData, String.valueOf(map.get("condition")), Dept::getName, Dept::getChildren);
+        }
+        return R.ok().add(treeData);
+    }
+
+    @PreAuthorize("hasAuthority('system:dept:list')")
     @GetMapping("/dept/{id}")
     public R get(@PathVariable("id") Long id) {
         return R.ok().add(deptService.getById(id));
     }
 
     @PreAuthorize("hasAuthority('system:dept:save')")
-    @OperationLog("娣诲姞Dept")
+    @OperationLog("娣诲姞閮ㄩ棬")
     @PostMapping("/dept/save")
     public R save(@RequestBody Dept dept) {
+        if (dept.getParentId() != null && dept.getParentId() > 0) {
+            Dept parent = deptService.getById(dept.getParentId());
+            if (parent != null) {
+                dept.setParentName(parent.getName());
+            }
+        } else {
+            dept.setParentId(0L);
+        }
+
+        NodeUtils nodeUtils = new NodeUtils();
+        nodeUtils.generatePath0(item -> deptService.getById(item.getParentId()), dept, Dept::getId, Dept::getName, Dept::getParentId);
+        dept.setPath(nodeUtils.path.toString());
+        dept.setPathName(nodeUtils.pathName.toString());
+
+        dept.setCreateBy(getLoginUserId());
+        dept.setCreateTime(new Date());
+        dept.setUpdateBy(getLoginUserId());
+        dept.setUpdateTime(new Date());
         if (!deptService.save(dept)) {
             return R.error("娣诲姞澶辫触");
         }
@@ -59,9 +90,25 @@
     }
 
     @PreAuthorize("hasAuthority('system:dept:update')")
-    @OperationLog("淇敼Dept")
+    @OperationLog("淇敼閮ㄩ棬")
     @PostMapping("/dept/update")
     public R update(@RequestBody Dept dept) {
+        if (dept.getParentId() != null && dept.getParentId() > 0) {
+            Dept parent = deptService.getById(dept.getParentId());
+            if (parent != null) {
+                dept.setParentName(parent.getName());
+            }
+        } else {
+            dept.setParentId(0L);
+        }
+
+        NodeUtils nodeUtils = new NodeUtils();
+        nodeUtils.generatePath0(item -> deptService.getById(item.getParentId()), dept, Dept::getId, Dept::getName, Dept::getParentId);
+        dept.setPath(nodeUtils.path.toString());
+        dept.setPathName(nodeUtils.pathName.toString());
+
+        dept.setUpdateBy(getLoginUserId());
+        dept.setUpdateTime(new Date());
         if (!deptService.updateById(dept)) {
             return R.error("淇敼澶辫触");
         }
@@ -69,7 +116,7 @@
     }
 
     @PreAuthorize("hasAuthority('system:dept:remove')")
-    @OperationLog("鍒犻櫎Dept")
+    @OperationLog("鍒犻櫎閮ㄩ棬")
     @PostMapping("/dept/remove/{ids}")
     public R remove(@PathVariable Long[] ids) {
         if (!deptService.removeByIds(Arrays.asList(ids))) {

--
Gitblit v1.9.1