Merge pull request #3464 from KouShenhai/dev

KouShenhai · web-flow · commit bf31875211d0 · 2025-02-01T11:06:21.000+08:00
Dev
diff --git a/doc/db/kcloud_platform.sql b/doc/db/kcloud_platform.sql
@@ -774,6 +774,7 @@ INSERT INTO "public"."boot_sys_menu" ("id", "creator", "editor", "create_time",
 INSERT INTO "public"."boot_sys_menu" ("id", "creator", "editor", "create_time", "update_time", "del_flag", "version", "tenant_id", "pid", "permission", "type", "name", "path", "icon", "sort", "status") VALUES (42, 1, 1, '2025-01-21 05:19:17', '2025-01-29 14:32:03.026995', 0, 0, 0, 23, 'sys:menu:save', 1, '新增', '', NULL, 40, 0);
 INSERT INTO "public"."boot_sys_menu" ("id", "creator", "editor", "create_time", "update_time", "del_flag", "version", "tenant_id", "pid", "permission", "type", "name", "path", "icon", "sort", "status") VALUES (43, 1, 1, '2025-01-31 13:08:53.459704', '2025-01-31 13:08:53.459779', 0, 0, 0, 23, 'sys:menu:detail', 1, '查看', NULL, NULL, 10, 0);
 INSERT INTO "public"."boot_sys_menu" ("id", "creator", "editor", "create_time", "update_time", "del_flag", "version", "tenant_id", "pid", "permission", "type", "name", "path", "icon", "sort", "status") VALUES (44, 1, 1, '2025-01-31 13:50:50.855744', '2025-01-31 13:50:50.856767', 0, 0, 0, 23, 'sys:menu:modify', 1, '修改', NULL, NULL, 30, 0);
+INSERT INTO "public"."boot_sys_menu" ("id", "creator", "editor", "create_time", "update_time", "del_flag", "version", "tenant_id", "pid", "permission", "type", "name", "path", "icon", "sort", "status") VALUES (45, 1, 1, '2025-02-01 09:57:06.903239', '2025-02-01 09:57:16.643637', 0, 1, 0, 24, 'sys:dept:tree-list', 1, '查询树列表', NULL, NULL, 50, 0);
 
 -- ----------------------------
 -- Table structure for boot_sys_menu_package
diff --git a/laokou-service/laokou-admin/laokou-admin-adapter/src/main/java/org/laokou/admin/web/DeptsControllerV3.java b/laokou-service/laokou-admin/laokou-admin-adapter/src/main/java/org/laokou/admin/web/DeptsControllerV3.java
@@ -23,6 +23,7 @@
 import org.laokou.admin.dept.api.DeptsServiceI;
 import org.laokou.admin.dept.dto.*;
 import org.laokou.admin.dept.dto.clientobject.DeptCO;
+import org.laokou.admin.dept.dto.clientobject.DeptTreeCO;
 import org.laokou.common.data.cache.annotation.DataCache;
 import org.laokou.common.i18n.dto.Page;
 import org.laokou.common.i18n.dto.Result;
@@ -34,6 +35,8 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 import static org.laokou.common.data.cache.constant.NameConstant.DEPTS;
 import static org.laokou.common.data.cache.constant.Type.DEL;
 
@@ -100,6 +103,14 @@ public Result<Page<DeptCO>> pageV3(@RequestBody DeptPageQry qry) {
 		return deptsServiceI.page(qry);
 	}
 
+	@TraceLog
+	@PostMapping("tree-list")
+	@PreAuthorize("hasAuthority('sys:dept:tree-list')")
+	@Operation(summary = "查询部门树列表", description = "查询部门树列表")
+	public Result<List<DeptTreeCO>> treeListV3(@RequestBody DeptTreeListQry qry) {
+		return deptsServiceI.treeList(qry);
+	}
+
 	@TraceLog
 	@GetMapping("{id}")
 	@DataCache(name = DEPTS, key = "#id")
diff --git a/laokou-service/laokou-admin/laokou-admin-app/src/main/java/org/laokou/admin/dept/command/query/DeptTreeListQryExe.java b/laokou-service/laokou-admin/laokou-admin-app/src/main/java/org/laokou/admin/dept/command/query/DeptTreeListQryExe.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2022-2025 KCloud-Platform-IoT Author or Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.laokou.admin.dept.command.query;
+
+import lombok.RequiredArgsConstructor;
+import org.laokou.admin.dept.convertor.DeptConvertor;
+import org.laokou.admin.dept.dto.DeptTreeListQry;
+import org.laokou.admin.dept.dto.clientobject.DeptTreeCO;
+import org.laokou.admin.dept.gatewayimpl.database.DeptMapper;
+import org.laokou.common.core.utils.TreeUtil;
+import org.laokou.common.i18n.dto.Result;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 查询部门请求执行器.
+ *
+ * @author laokou
+ */
+@Component
+@RequiredArgsConstructor
+public class DeptTreeListQryExe {
+
+	private final DeptMapper deptMapper;
+
+	public Result<List<DeptTreeCO>> execute(DeptTreeListQry qry) {
+		DeptTreeCO co = TreeUtil.buildTreeNode(DeptConvertor.toClientObjs(deptMapper.selectObjectList(qry)),
+				DeptTreeCO.class);
+		return Result.ok(co.getChildren());
+	}
+
+}
diff --git a/laokou-service/laokou-admin/laokou-admin-app/src/main/java/org/laokou/admin/dept/service/DeptsServiceImpl.java b/laokou-service/laokou-admin/laokou-admin-app/src/main/java/org/laokou/admin/dept/service/DeptsServiceImpl.java
@@ -22,12 +22,16 @@
 import org.laokou.admin.dept.command.*;
 import org.laokou.admin.dept.command.query.DeptGetQryExe;
 import org.laokou.admin.dept.command.query.DeptPageQryExe;
+import org.laokou.admin.dept.command.query.DeptTreeListQryExe;
 import org.laokou.admin.dept.dto.*;
 import org.laokou.admin.dept.dto.clientobject.DeptCO;
+import org.laokou.admin.dept.dto.clientobject.DeptTreeCO;
 import org.laokou.common.i18n.dto.Page;
 import org.laokou.common.i18n.dto.Result;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 部门接口实现类.
  *
@@ -51,6 +55,8 @@ public class DeptsServiceImpl implements DeptsServiceI {
 
 	private final DeptGetQryExe deptGetQryExe;
 
+	private final DeptTreeListQryExe deptTreeListQryExe;
+
 	@Override
 	public void save(DeptSaveCmd cmd) {
 		deptSaveCmdExe.executeVoid(cmd);
@@ -81,6 +87,11 @@ public Result<Page<DeptCO>> page(DeptPageQry qry) {
 		return deptPageQryExe.execute(qry);
 	}
 
+	@Override
+	public Result<List<DeptTreeCO>> treeList(DeptTreeListQry qry) {
+		return deptTreeListQryExe.execute(qry);
+	}
+
 	@Override
 	public Result<DeptCO> getById(DeptGetQry qry) {
 		return deptGetQryExe.execute(qry);
diff --git a/laokou-service/laokou-admin/laokou-admin-client/src/main/java/org/laokou/admin/dept/api/DeptsServiceI.java b/laokou-service/laokou-admin/laokou-admin-client/src/main/java/org/laokou/admin/dept/api/DeptsServiceI.java
@@ -19,9 +19,12 @@
 
 import org.laokou.admin.dept.dto.*;
 import org.laokou.admin.dept.dto.clientobject.DeptCO;
+import org.laokou.admin.dept.dto.clientobject.DeptTreeCO;
 import org.laokou.common.i18n.dto.Page;
 import org.laokou.common.i18n.dto.Result;
 
+import java.util.List;
+
 /**
  * 部门接口.
  *
@@ -65,6 +68,12 @@ public interface DeptsServiceI {
 	 */
 	Result<Page<DeptCO>> page(DeptPageQry qry);
 
+	/**
+	 * 查询部门树.
+	 * @param qry 查询请求
+	 */
+	Result<List<DeptTreeCO>> treeList(DeptTreeListQry qry);
+
 	/**
 	 * 查看部门.
 	 * @param qry 查看请求
diff --git a/laokou-service/laokou-admin/laokou-admin-client/src/main/java/org/laokou/admin/dept/dto/DeptPageQry.java b/laokou-service/laokou-admin/laokou-admin-client/src/main/java/org/laokou/admin/dept/dto/DeptPageQry.java
@@ -28,4 +28,6 @@
 @Data
 public class DeptPageQry extends PageQuery {
 
+	private String name;
+
 }
diff --git a/laokou-service/laokou-admin/laokou-admin-client/src/main/java/org/laokou/admin/dept/dto/DeptTreeListQry.java b/laokou-service/laokou-admin/laokou-admin-client/src/main/java/org/laokou/admin/dept/dto/DeptTreeListQry.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022-2025 KCloud-Platform-IoT Author or Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.laokou.admin.dept.dto;
+
+/**
+ * @author laokou
+ */
+public class DeptTreeListQry extends DeptPageQry {
+
+}
diff --git a/laokou-service/laokou-admin/laokou-admin-client/src/main/java/org/laokou/admin/dept/dto/clientobject/DeptTreeCO.java b/laokou-service/laokou-admin/laokou-admin-client/src/main/java/org/laokou/admin/dept/dto/clientobject/DeptTreeCO.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2022-2025 KCloud-Platform-IoT Author or Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.laokou.admin.dept.dto.clientobject;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.laokou.common.core.utils.TreeUtil;
+
+/**
+ * 部门树客户端对象.
+ *
+ * @author laokou
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public class DeptTreeCO extends TreeUtil.TreeNode<DeptTreeCO> {
+
+	/**
+	 * 部门路径.
+	 */
+	private String path;
+
+	/**
+	 * 部门排序.
+	 */
+	private Integer sort;
+
+}
diff --git a/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/dept/convertor/DeptConvertor.java b/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/dept/convertor/DeptConvertor.java
@@ -18,11 +18,12 @@
 package org.laokou.admin.dept.convertor;
 
 import org.laokou.admin.dept.dto.clientobject.DeptCO;
+import org.laokou.admin.dept.dto.clientobject.DeptTreeCO;
 import org.laokou.admin.dept.gatewayimpl.database.dataobject.DeptDO;
 import org.laokou.admin.dept.model.DeptE;
-import org.laokou.common.core.utils.ConvertUtil;
 import org.laokou.common.core.utils.IdGenerator;
-import org.laokou.common.i18n.utils.ObjectUtil;
+
+import java.util.List;
 
 /**
  * 部门转换器.
@@ -31,20 +32,58 @@
  */
 public class DeptConvertor {
 
-	public static DeptDO toDataObject(DeptE deptE) {
-		DeptDO deptDO = ConvertUtil.sourceToTarget(deptE, DeptDO.class);
-		if (ObjectUtil.isNull(deptDO.getId())) {
+	public static DeptDO toDataObject(DeptE deptE, boolean isInsert) {
+		DeptDO deptDO = new DeptDO();
+		if (isInsert) {
 			deptDO.setId(IdGenerator.defaultSnowflakeId());
 		}
+		else {
+			deptDO.setId(deptE.getId());
+		}
+		deptDO.setPid(deptE.getPid());
+		deptDO.setName(deptE.getName());
+		deptDO.setPath(deptE.getPath());
+		deptDO.setSort(deptE.getSort());
 		return deptDO;
 	}
 
 	public static DeptCO toClientObject(DeptDO deptDO) {
-		return ConvertUtil.sourceToTarget(deptDO, DeptCO.class);
+		DeptCO deptCO = new DeptCO();
+		deptCO.setId(deptDO.getId());
+		deptCO.setPid(deptDO.getPid());
+		deptCO.setName(deptDO.getName());
+		deptCO.setPath(deptDO.getPath());
+		deptCO.setSort(deptDO.getSort());
+		return deptCO;
+	}
+
+	public static List<DeptCO> toClientObjects(List<DeptDO> list) {
+		return list.stream().map(DeptConvertor::toClientObject).toList();
 	}
 
 	public static DeptE toEntity(DeptCO deptCO) {
-		return ConvertUtil.sourceToTarget(deptCO, DeptE.class);
+		DeptE deptE = new DeptE();
+		deptE.setId(deptCO.getId());
+		deptE.setPid(deptCO.getPid());
+		deptE.setName(deptCO.getName());
+		deptE.setPath(deptCO.getPath());
+		deptE.setSort(deptCO.getSort());
+		return deptE;
+	}
+
+	public static DeptTreeCO toClientObj(DeptDO deptDO) {
+		DeptTreeCO co = new DeptTreeCO();
+		co.setId(deptDO.getId());
+		co.setName(deptDO.getName());
+		co.setPid(deptDO.getPid());
+		co.setPath(deptDO.getPath());
+		co.setSort(deptDO.getSort());
+		return co;
+
+	}
+
+	public static List<DeptTreeCO> toClientObjs(List<DeptDO> list) {
+		return list.stream().map(DeptConvertor::toClientObj).toList();
 	}
 
 }
diff --git a/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/dept/gatewayimpl/DeptGatewayImpl.java b/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/dept/gatewayimpl/DeptGatewayImpl.java
@@ -40,12 +40,12 @@ public class DeptGatewayImpl implements DeptGateway {
 
 	@Override
 	public void create(DeptE deptE) {
-		deptMapper.insert(DeptConvertor.toDataObject(deptE));
+		deptMapper.insert(DeptConvertor.toDataObject(deptE, true));
 	}
 
 	@Override
 	public void update(DeptE deptE) {
-		DeptDO deptDO = DeptConvertor.toDataObject(deptE);
+		DeptDO deptDO = DeptConvertor.toDataObject(deptE, false);
 		deptDO.setVersion(deptMapper.selectVersion(deptE.getId()));
 		deptMapper.updateById(deptDO);
 	}
diff --git a/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/resources/mapper/dept/DeptMapper.xml b/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/resources/mapper/dept/DeptMapper.xml
@@ -20,25 +20,55 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.laokou.admin.dept.gatewayimpl.database.DeptMapper">
 
-	<select id="selectObjectPage"
-			resultType="org.laokou.admin.dept.gatewayimpl.database.dataobject.DeptDO">
-		SELECT *
-		from boot_sys_dept
-		where del_flag = 0
-		order by id desc
-		limit ${pageQuery.pageSize} offset ${pageQuery.pageIndex}
-	</select>
+  <sql id="selectColumns">
+    id,
+    "name",
+    pid,
+    "path",
+    "sort",
+    create_time
+  </sql>
 
-	<select id="selectObjectCount" resultType="long">
-		SELECT count(1)
-		from boot_sys_dept
-		where del_flag = 0
-	</select>
+  <sql id="selectConditions">
+    where del_flag = 0
+    <if test="pageQuery.name != null and pageQuery.name != ''">
+      and "name" like #{pageQuery.name}
+    </if>
+    <if test="pageQuery.params.startTime != null and pageQuery.params.startTime != ''">
+      and create_time <![CDATA[ >= ]]> #{pageQuery.params.startTime}
+    </if>
+    <if test="pageQuery.params.endTime != null and pageQuery.params.endTime != ''">
+      and create_time <![CDATA[ <= ]]> #{pageQuery.params.endTime}
+    </if>
+  </sql>
+
+  <sql id="selectObjectList">
+    SELECT <include refid="selectColumns"/>
+    from boot_sys_dept
+    <include refid="selectConditions"/>
+    order by "sort" desc
+  </sql>
+
+  <select id="selectObjectPage"
+          resultType="org.laokou.admin.dept.gatewayimpl.database.dataobject.DeptDO">
+    <include refid="selectObjectList"/>
+    limit ${pageQuery.pageSize} offset ${pageQuery.pageIndex}
+  </select>
+
+  <select id="selectObjectCount" resultType="long">
+    SELECT count(1)
+    from boot_sys_dept
+    <include refid="selectConditions"/>
+  </select>
 
 	<select id="selectVersion" resultType="integer">
 		select version
 		from boot_sys_dept
 		where id = #{id}
 	</select>
 
+  <select id="selectObjectList" resultType="org.laokou.admin.dept.gatewayimpl.database.dataobject.DeptDO">
+    <include refid="selectObjectList"/>
+  </select>
+
 </mapper>
diff --git a/ui/config/routes.ts b/ui/config/routes.ts
diff --git a/ui/src/pages/Sys/Permission/dept.tsx b/ui/src/pages/Sys/Permission/dept.tsx
diff --git a/ui/src/pages/Sys/Permission/menu.tsx b/ui/src/pages/Sys/Permission/menu.tsx
diff --git a/ui/src/services/admin/dept.ts b/ui/src/services/admin/dept.ts

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,6 @@`
`28`	`28`	`@Data`
`29`	`29`	`public class DeptPageQry extends PageQuery {`
`30`	`30`
	`31`	`+ private String name;`
	`32`	`+`
`31`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@ public class DeptGatewayImpl implements DeptGateway {`
`40`	`40`
`41`	`41`	`@Override`
`42`	`42`	`public void create(DeptE deptE) {`
`43`		`- deptMapper.insert(DeptConvertor.toDataObject(deptE));`
	`43`	`+ deptMapper.insert(DeptConvertor.toDataObject(deptE, true));`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`
`47`	`47`	`public void update(DeptE deptE) {`
`48`		`- DeptDO deptDO = DeptConvertor.toDataObject(deptE);`
	`48`	`+ DeptDO deptDO = DeptConvertor.toDataObject(deptE, false);`
`49`	`49`	`deptDO.setVersion(deptMapper.selectVersion(deptE.getId()));`
`50`	`50`	`deptMapper.updateById(deptDO);`
`51`	`51`	`}`