wip: 代码生成临时提交

src/main/java/com/youlai/system/model/entity/GenConfig.java

@@ -11,27 +11,12 @@ import lombok.Data;
 @TableName(value ="gen_config")
 @Data
 public class GenConfig extends BaseEntity {
-    /**
-     * 
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
 
     /**
      * 表名
      */
     private String tableName;
 
-    /**
-     * 表注释
-     */
-    private String tableComment;
-
-    /**
-     * 实体名
-     */
-    private String entityName;
-
     /**
      * 包名
      */
@@ -42,6 +27,21 @@ public class GenConfig extends BaseEntity {
      */
     private String moduleName;
 
+    /**
+     * 实体名
+     */
+    private String entityName;
+
+    /**
+     * 类描述
+     */
+    private String comment;
+
+    /**
+     * 上级菜单ID
+     */
+    private Long parentMenuId;
+
     /**
      * 作者
      */
@@ -49,5 +49,5 @@ public class GenConfig extends BaseEntity {
 
 
     @TableLogic
-    private Boolean isDeleted;
+    private Integer isDeleted;
 }

src/main/java/com/youlai/system/model/entity/GenFieldConfig.java

@@ -1,38 +1,44 @@
 package com.youlai.system.model.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.youlai.system.common.base.BaseEntity;
 import com.youlai.system.enums.FormTypeEnum;
 import com.youlai.system.enums.QueryTypeEnum;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
- * 字段配置实体
+ * 字段生成配置实体
  *
  * @author Ray
  * @since 2.10.0
  */
 @TableName(value = "gen_field_config")
-@Data
+@Getter
+@Setter
 public class GenFieldConfig extends BaseEntity {
-    /**
-     * 主键
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
 
     /**
      * 关联的配置ID
      */
     private Long configId;
 
+    /**
+     * 列名
+     */
+    private String columnName;
+
+    /**
+     * 列类型
+     */
+    private String columnType;
+
+    /**
+     * 字段长度
+     */
+    private String columnLength;
+
     /**
      * 字段名称
      */
@@ -46,7 +52,7 @@ public class GenFieldConfig extends BaseEntity {
     /**
      * 字段描述
      */
-    private String fieldComment;
+    private String comment;
 
     /**
      * 表单类型
@@ -61,22 +67,22 @@ public class GenFieldConfig extends BaseEntity {
     /**
      * 是否在列表显示
      */
-    private Boolean isShowInList;
+    private Integer isShowInList;
 
     /**
      * 是否在表单显示
      */
-    private Boolean isShowInForm;
+    private Integer isShowInForm;
 
     /**
      * 是否在查询条件显示
      */
-    private Boolean isShowInQuery;
+    private Integer isShowInQuery;
 
     /**
      * 是否必填
      */
-    private Boolean isRequired;
+    private Integer isRequired;
 
 
 }

src/main/java/com/youlai/system/model/entity/SysDept.java

@@ -17,11 +17,6 @@ import lombok.Setter;
 @Getter
 @Setter
 public class SysDept extends BaseEntity {
-    /**
-     * 主键
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
 
     /**
      * 部门名称

src/main/java/com/youlai/system/model/entity/SysDict.java

@@ -14,11 +14,6 @@ import lombok.Data;
  */
 @Data
 public class SysDict extends BaseEntity {
-    /**
-     * 主键 
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
 
     /**
      * 类型名称

src/main/java/com/youlai/system/model/form/GenConfigForm.java

@@ -9,52 +9,64 @@ import java.util.List;
 
 @Schema(description = "代码生成配置表单")
 @Data
-public class GenCodeConfigForm {
+public class GenConfigForm {
 
     @Schema(description = "表名")
     private String tableName;
 
-    @Schema(description = "实体名")
-    private String entityName;
-
-    @Schema(description = "包名")
-    private String packageName;
+    @Schema(description = "类描述")
+    private String comment;
 
     @Schema(description = "模块名")
     private String moduleName;
 
+    @Schema(description = "包名")
+    private String packageName;
+
+    @Schema(description = "实体名")
+    private String entityName;
+
     @Schema(description = "作者")
     private String author;
 
-    @Schema(description = "字段配置")
+    @Schema(description = "字段配置列表")
     private List<FieldConfig> fieldConfigs;
 
     @Schema(description = "字段配置")
     @Data
     public static class FieldConfig {
 
-        @Schema(description = "字段名称")
-        private String name;
+        @Schema(description = "列名")
+        private String columnName;
+
+        @Schema(description = "列类型")
+        private String columnType;
+
+        @Schema(description = "字段名")
+        private String fieldName;
 
         @Schema(description = "字段类型")
-        private String type;
+        private String fieldType;
 
         @Schema(description = "字段描述")
-        private String description;
+        private String comment;
 
         @Schema(description = "是否在列表显示")
-        private Boolean showInList;
+        private Integer isShowInList;
 
         @Schema(description = "是否在表单显示")
-        private Boolean showInForm;
+        private Integer isShowInForm;
 
         @Schema(description = "是否在查询条件显示")
-        private Boolean showInQuery;
+        private Integer isShowInQuery;
+
+        @Schema(description = "是否必填")
+        private Integer isRequired;
 
         @Schema(description = "表单类型")
         private FormTypeEnum formType;
 
-        @Schema(description = "查询方式")
+        @Schema(description = "查询类型")
         private QueryTypeEnum queryType;
 
     }