From 81ab86103655d3272c08bdd7ca335305407fc0e5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 28 二月 2022 10:56:59 +0800
Subject: [PATCH] fix 修复代码生成 基于路径生成 路径为空问题
---
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java | 64 +++++++------------------------
1 files changed, 15 insertions(+), 49 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
index 2460360..763acd7 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
@@ -1,34 +1,32 @@
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.core.domain.BaseEntity;
import com.ruoyi.common.utils.StringUtils;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
/**
* 浠ｇ爜鐢熸垚涓氬姟瀛楁琛� gen_table_column
*
- * @author ruoyi
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
@TableName("gen_table_column")
-public class GenTableColumn implements Serializable {
- private static final long serialVersionUID = 1L;
+public class GenTableColumn extends BaseEntity {
/**
* 缂栧彿
*/
- @TableId(value = "column_id", type = IdType.AUTO)
+ @TableId(value = "column_id")
private Long columnId;
/**
@@ -125,38 +123,6 @@
*/
private Integer sort;
- /**
- * 鍒涘缓鑰�
- */
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 鏇存柊鑰�
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 璇锋眰鍙傛暟
- */
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
-
public String getCapJavaField() {
return StringUtils.uncapitalize(javaField);
}
@@ -223,10 +189,10 @@
public static boolean isSuperColumn(String javaField) {
return StringUtils.equalsAnyIgnoreCase(javaField,
- // BaseEntity
- "createBy", "createTime", "updateBy", "updateTime", "remark",
- // TreeEntity
- "parentName", "parentId", "orderNum", "ancestors");
+ // BaseEntity
+ "createBy", "createTime", "updateBy", "updateTime",
+ // TreeEntity
+ "parentName", "parentId");
}
public boolean isUsableColumn() {
--
Gitblit v1.9.3