From cd54724515df193f7e03537f8dc80e8a24feb7f2 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 03 二月 2021 12:48:36 +0800
Subject: [PATCH] feat(系统管理微服务): 部门管理
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/DeptTree.java | 2 ++
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java | 5 +++++
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java | 18 +++++++++++++++++-
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java | 5 +++++
4 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/DeptTree.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/DeptTree.java
index f67313d..170182c 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/DeptTree.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/DeptTree.java
@@ -12,4 +12,6 @@
public class DeptTree extends Tree<Dept> {
private Integer orderNum;
+ private String deptType;
+ private String deptFunction;
}
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java
index dea2a32..bfcc26e 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java
@@ -25,7 +25,7 @@
public static final Long TOP_DEPT_ID = 0L;
private static final long serialVersionUID = -7790334862410409053L;
- @TableId(value = "DEPT_ID", type = IdType.AUTO)
+ @TableId(value = "DEPT_ID")
private Long deptId;
@TableField(value = "PARENT_ID")
@@ -51,6 +51,22 @@
@TableField("delFlag")
private Integer delFlag = 0;
+ @FieldInfo(name = "deptType", type = "varchar", explain = "部门类型")
+ @TableField("deptType")
+ private String deptType = "部门类型";
+
+ @FieldInfo(name = "deptTypeName", type = "varchar", explain = "部门类型")
+ @TableField(exist = false)
+ private String deptTypeName;
+
+ @FieldInfo(name = "deptFunction", type = "varchar", explain = "部门职能")
+ @TableField("deptFunction")
+ private String deptFunction = "04";
+
+ @FieldInfo(name = "deptFunctionName", type = "varchar", explain = "部门职能")
+ @TableField(exist = false)
+ private String deptFunctionName;
+
private transient String createTimeFrom;
private transient String createTimeTo;
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java
index c455af2..71a2c6d 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java
@@ -70,4 +70,9 @@
List<Dept> depts = this.deptService.findDepts(dept, request);
ExcelKit.$Export(Dept.class, response).downXlsx(depts, false);
}
+
+ @GetMapping("redis")
+ public void setDeptToRedis(){
+ deptService.setDeptRedis();
+ }
}
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
index 9618758..a90b52a 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.system.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.DeptTree;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.Tree;
@@ -7,6 +8,7 @@
import cc.mrbird.febs.common.core.entity.constant.PageConstant;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.entity.system.DicItem;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.common.core.utils.TreeUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
@@ -75,6 +77,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void createDept(Dept dept) {
+ dept.setDeptId(SequenceUtil.generateId(0L, ModuleCode.FRAM_SYSTEM));
if (dept.getParentId() == null) {
dept.setParentId(Dept.TOP_DEPT_ID);
}
@@ -124,6 +127,8 @@
tree.setParentId(dept.getParentId().toString());
tree.setLabel(dept.getDeptName());
tree.setOrderNum(dept.getOrderNum());
+ tree.setDeptFunction(dept.getDeptFunction());
+ tree.setDeptType(dept.getDeptType());
trees.add(tree);
});
}
--
Gitblit v1.8.0