From 3341eb5f2c6070d108d3fec0677e2ae00458c4d5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 15 三月 2022 13:18:24 +0800
Subject: [PATCH] update 优化 TreeEntity 树实体 去除未知泛型
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 2 +-
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 2 +-
ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 2 +-
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java | 4 ++--
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java | 2 +-
ruoyi-generator/src/main/resources/vm/java/bo.java.vm | 2 +-
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
index 5e7af73..f44eacd 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
@@ -16,7 +16,7 @@
@Data
@EqualsAndHashCode(callSuper = true)
-public class TreeEntity extends BaseEntity {
+public class TreeEntity<T> extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -38,6 +38,6 @@
*/
@TableField(exist = false)
@ApiModelProperty(value = "瀛愰儴闂�")
- private List<?> children = new ArrayList<>();
+ private List<T> children = new ArrayList<>();
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
index 46e9936..ccfe07d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@@ -24,7 +24,7 @@
@EqualsAndHashCode(callSuper = true)
@TableName("sys_dept")
@ApiModel("閮ㄩ棬涓氬姟瀵硅薄")
-public class SysDept extends TreeEntity {
+public class SysDept extends TreeEntity<SysDept> {
private static final long serialVersionUID = 1L;
/**
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index 00db941..8668481 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -23,7 +23,7 @@
@EqualsAndHashCode(callSuper = true)
@TableName("sys_menu")
@ApiModel("鑿滃崟鏉冮檺涓氬姟瀵硅薄")
-public class SysMenu extends TreeEntity {
+public class SysMenu extends TreeEntity<SysMenu> {
/**
* 鑿滃崟ID
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
index 1ca4a7a..b480aa0 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
@@ -17,7 +17,7 @@
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("test_tree")
-public class TestTree extends TreeEntity {
+public class TestTree extends TreeEntity<TestTree> {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java
index 29f4ac9..211a79f 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java
@@ -21,7 +21,7 @@
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("娴嬭瘯鏍戣〃涓氬姟瀵硅薄")
-public class TestTreeBo extends TreeEntity {
+public class TestTreeBo extends TreeEntity<TestTreeBo> {
/**
* 涓婚敭
diff --git a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
index 94d6050..13b9873 100644
--- a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
@@ -28,7 +28,7 @@
#if($table.crud || $table.sub)
#set($Entity="BaseEntity")
#elseif($table.tree)
-#set($Entity="TreeEntity")
+#set($Entity="TreeEntity<${ClassName}Bo>")
#end
@Data
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index 2cf259c..8fde4ad 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -25,7 +25,7 @@
#if($table.crud || $table.sub)
#set($Entity="BaseEntity")
#elseif($table.tree)
- #set($Entity="TreeEntity")
+ #set($Entity="TreeEntity<${ClassName}>")
#end
@Data
@TableName("${tableName}")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index a582714..5b6213e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -143,7 +143,7 @@
router.setComponent(getComponent(menu));
router.setQuery(menu.getQueryParam());
router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
- List<SysMenu> cMenus = (List<SysMenu>) menu.getChildren();
+ List<SysMenu> cMenus = menu.getChildren();
if (!cMenus.isEmpty() && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
router.setAlwaysShow(true);
router.setRedirect("noRedirect");
--
Gitblit v1.9.3