diff --git a/kernel-s-dict/dict-business/pom.xml b/kernel-s-dict/dict-business/pom.xml
index 0de04c9c3..7ceb1bf23 100644
--- a/kernel-s-dict/dict-business/pom.xml
+++ b/kernel-s-dict/dict-business/pom.xml
@@ -40,6 +40,14 @@
1.0.0
+
+
+
+ cn.stylefeng.roses
+ system-api
+ 1.0.0
+
+
diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java
index 368855633..552cb3a23 100644
--- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java
+++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java
@@ -11,10 +11,12 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource;
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.system.pojo.ztree.ZTreeNode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@@ -154,4 +156,18 @@ public class DictController {
return new SuccessResponseData(flag);
}
+ /**
+ * 字典树列表
+ *
+ * @param
+ * @return
+ * @author huangyao
+ * @date 2021/1/10 17:31
+ */
+ @GetResource(name = "获取zTree形式的字典树(layui版本)", path = "/dict/zTree")
+ @ResponseBody
+ public List layuiSelectParentMenuTreeList(@Validated(DictRequest.dictZTree.class) DictRequest dictRequest) {
+ return this.dictService.dictZTree(dictRequest);
+ }
+
}
diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java
index d9aed57d2..be7959449 100644
--- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java
+++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java
@@ -1,6 +1,7 @@
package cn.stylefeng.roses.kernel.dict.modular.controller;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
+import cn.stylefeng.roses.kernel.dict.modular.entity.SysDict;
import cn.stylefeng.roses.kernel.dict.modular.entity.SysDictType;
import cn.stylefeng.roses.kernel.dict.modular.pojo.request.DictTypeRequest;
import cn.stylefeng.roses.kernel.dict.modular.service.DictTypeService;
@@ -13,6 +14,7 @@ import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@@ -79,6 +81,12 @@ public class DictTypeController {
return new SuccessResponseData();
}
+ @GetResource(name = "获取字典类型详情", path = "/dictType/getDictDetail", requiredPermission = false)
+ public ResponseData getDictDetail(@RequestParam("dictTypeId") Long dictTypeId) {
+ SysDictType detail = this.dictTypeService.findDetail(dictTypeId);
+ return new SuccessResponseData(detail);
+ }
+
/**
* 获取字典类型列表
*
diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/DictTypeMapper.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/DictTypeMapper.java
index 2ae54712e..ae8d4a85d 100644
--- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/DictTypeMapper.java
+++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/DictTypeMapper.java
@@ -1,5 +1,6 @@
package cn.stylefeng.roses.kernel.dict.modular.mapper;
+import cn.stylefeng.roses.kernel.dict.modular.entity.SysDict;
import cn.stylefeng.roses.kernel.dict.modular.entity.SysDictType;
import cn.stylefeng.roses.kernel.dict.modular.pojo.request.DictTypeRequest;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -16,6 +17,16 @@ import java.util.List;
*/
public interface DictTypeMapper extends BaseMapper {
+ /**
+ * 获取字典类型详情
+ *
+ * @param dictTypeId 类型id
+ * @return
+ * @author huangyao
+ * @date 2021/1/10 17:25
+ */
+ SysDictType findDetail(@Param("dictTypeId") Long dictTypeId);
+
/**
* 获取字典类型列表
*
diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/mapping/DictTypeMapper.xml b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/mapping/DictTypeMapper.xml
index 9c3c05b5e..724e5955f 100644
--- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/mapping/DictTypeMapper.xml
+++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/mapping/DictTypeMapper.xml
@@ -2,6 +2,21 @@
+
+