From 71a2a8245db4c04be3f96a9eb9b47931d3130650 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期三, 18 一月 2023 17:09:43 +0800
Subject: [PATCH] refactor 重构 common, framework 包结构, 参照 cloud 版本拆分子模块 ; update 更新模块包名 ; delete 移除 sms 模块, oss 模块, framework 模块 (并入 common 模块) ;
---
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java | 39 ++++++++++++++-------------------------
1 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
index 252f32c..7b8225c 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
@@ -1,18 +1,15 @@
package com.ruoyi.generator.domain;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.constant.GenConstants;
-import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.utils.StringUtils;
+import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.constant.GenConstants;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import org.apache.commons.lang3.ArrayUtils;
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
import java.util.List;
/**
@@ -23,7 +20,6 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("gen_table")
public class GenTable extends BaseEntity {
@@ -104,6 +100,7 @@
/**
* 鐢熸垚璺緞锛堜笉濉粯璁ら」鐩矾寰勶級
*/
+ @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
private String genPath;
/**
@@ -111,12 +108,6 @@
*/
@TableField(exist = false)
private GenTableColumn pkColumn;
-
- /**
- * 瀛愯〃淇℃伅
- */
- @TableField(exist = false)
- private GenTable subTable;
/**
* 琛ㄥ垪淇℃伅
@@ -153,6 +144,12 @@
@TableField(exist = false)
private String treeName;
+ /*
+ * 鑿滃崟id鍒楄〃
+ */
+ @TableField(exist = false)
+ private List<Long> menuIds;
+
/**
* 涓婄骇鑿滃崟ID瀛楁
*/
@@ -164,14 +161,6 @@
*/
@TableField(exist = false)
private String parentMenuName;
-
- public boolean isSub() {
- return isSub(this.tplCategory);
- }
-
- public static boolean isSub(String tplCategory) {
- return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
- }
public boolean isTree() {
return isTree(this.tplCategory);
@@ -196,7 +185,7 @@
public static boolean isSuperColumn(String tplCategory, String javaField) {
if (isTree(tplCategory)) {
return StringUtils.equalsAnyIgnoreCase(javaField,
- ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
+ ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
}
return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
}
--
Gitblit v1.9.3