From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/system/controller/DeptController.java | 85 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 84 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/DeptController.java b/src/main/java/org/springblade/modules/system/controller/DeptController.java
index 9044fcf..5944693 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -39,6 +39,7 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.node.DeptUserTreeNode;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.wrapper.DeptWrapper;
@@ -61,7 +62,7 @@
@AllArgsConstructor
@RequestMapping(AppConstant.APPLICATION_SYSTEM_NAME + "/dept")
@Api(value = "部门", tags = "部门")
-@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public class DeptController extends BladeController {
private final IDeptService deptService;
@@ -120,6 +121,17 @@
}
/**
+ * 获取部门树形结构
+ */
+ @GetMapping("/treeByDept")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "树形结构", notes = "树形结构")
+ public R<List<DeptVO>> treeByDept(@RequestParam(value = "deptId", required = true) Long deptId) {
+ List<DeptVO> tree = deptService.tree(deptId);
+ return R.data(tree);
+ }
+
+ /**
* 懒加载获取部门树形结构
*/
@GetMapping("/lazy-tree")
@@ -138,6 +150,22 @@
@ApiOperation(value = "新增或修改", notes = "传入dept")
public R submit(@Valid @RequestBody Dept dept) {
if (deptService.submit(dept)) {
+ CacheUtil.clear(SYS_CACHE);
+ // 返回懒加载树更新节点所需字段
+ Kv kv = Kv.create().set("id", String.valueOf(dept.getId())).set("tenantId", dept.getTenantId())
+ .set("deptCategoryName", DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory()));
+ return R.data(kv);
+ }
+ return R.fail("操作失败");
+ }
+
+ /**
+ * 自定义新增或修改
+ */
+ @PostMapping("/saveOrUpdateDeptInfo")
+ @ApiOperation(value = "自定义新增或修改", notes = "传入dept")
+ public R saveOrUpdateDeptInfo(@Valid @RequestBody Dept dept) {
+ if (deptService.saveOrUpdateDeptInfo(dept)) {
CacheUtil.clear(SYS_CACHE);
// 返回懒加载树更新节点所需字段
Kv kv = Kv.create().set("id", String.valueOf(dept.getId())).set("tenantId", dept.getTenantId())
@@ -174,5 +202,60 @@
return R.data(list);
}
+ /**
+ * 数据处理(社区绑定）
+ */
+ @GetMapping("/dataHandle")
+ public R dataHandle() {
+ return R.data(deptService.dataHandle());
+ }
+
+ /**
+ * 数据处理(社区绑定）-- 处理社区
+ */
+ @GetMapping("/dataHandleCommunity")
+ public R dataHandleCommunity() {
+ return R.data(deptService.dataHandleCommunity());
+ }
+
+
+ /**
+ * 数据处理(区域网格编号绑定）
+ */
+ @GetMapping("/dataRegionGridCodeBindHandle")
+ public R dataRegionGridCodeBindHandle() {
+ return R.data(deptService.dataRegionGridCodeBindHandle());
+ }
+
+
+ /**
+ * 查询组织机构树数据（下级包含人员信息）(数据量太大，不建议使用)
+ * @param treeNode
+ * @return
+ */
+ @GetMapping("/getDeptAndUserTree")
+ @ApiOperation(value = "查询组织机构树数据（下级包含人员信息）")
+ public R getDeptAndUserTree(DeptUserTreeNode treeNode) {
+ return R.data(deptService.getDeptAndUserTree(treeNode));
+ }
+
+ /**
+ * 数据处理(社区绑定）-- 处理社区(派出所下）
+ */
+ @GetMapping("/dataHandleCommunityByPolice")
+ public R dataHandleCommunityByPolice() {
+ return R.data(deptService.dataHandleCommunityByPolice());
+ }
+
+ /**
+ * 查询组织机构树数据（下级包含人员信息）(懒加载)
+ * @param treeNode
+ * @return
+ */
+ @GetMapping("/getDeptAndUserTreeLazyTree")
+ @ApiOperation(value = "查询组织机构树数据（下级包含人员信息）")
+ public R getDeptAndUserTreeLazyTree(DeptUserTreeNode treeNode) {
+ return R.data(deptService.getDeptAndUserTreeLazyTree(treeNode));
+ }
}
--
Gitblit v1.9.3