From df6867ee052790c3d690f341c422540e47ae5ec3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 16 一月 2023 10:52:14 +0800
Subject: [PATCH] update 优化 默认开启复杂结构 resultMap 自动映射 简化xml编码(多结构实体需带上主键id)
---
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 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..14ff5ae 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,18 @@
package com.ruoyi.generator.domain;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
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 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 +23,6 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("gen_table")
public class GenTable extends BaseEntity {
@@ -104,6 +103,7 @@
/**
* 鐢熸垚璺緞锛堜笉濉粯璁ら」鐩矾寰勶級
*/
+ @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
private String genPath;
/**
@@ -111,12 +111,6 @@
*/
@TableField(exist = false)
private GenTableColumn pkColumn;
-
- /**
- * 瀛愯〃淇℃伅
- */
- @TableField(exist = false)
- private GenTable subTable;
/**
* 琛ㄥ垪淇℃伅
@@ -153,6 +147,12 @@
@TableField(exist = false)
private String treeName;
+ /*
+ * 鑿滃崟id鍒楄〃
+ */
+ @TableField(exist = false)
+ private List<Long> menuIds;
+
/**
* 涓婄骇鑿滃崟ID瀛楁
*/
@@ -164,14 +164,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 +188,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