tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "!6 fix: 代码生成字段和模板引用包缺失问题修复"

Browse Source 
This reverts commit 4f6bd537d2.
This commit is contained in:
郝先瑞
2024-07-24 11:59:08 +00:00
committed by Gitee
parent 4f6bd537d2
commit 34d6f6e375
38 changed files with 136 additions and 1076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/main/java/com/youlai/system/model/entity/GenConfig.java
View File

@@ -1,53 +0,0 @@
package com.youlai.system.model.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.youlai.system.common.base.BaseEntity;
import lombok.Data;
/**
* 代码生成基础配置
*/
@TableName(value ="gen_config")
@Data
public class GenConfig extends BaseEntity {
/**
* 表名
*/
private String tableName;
/**
* 包名
*/
private String packageName;
/**
* 模块名
*/
private String moduleName;
/**
* 实体名
*/
private String entityName;
/**
* 类描述
*/
private String comment;
/**
* 上级菜单ID
*/
private Long parentMenuId;
/**
* 作者
*/
private String author;
@TableLogic
private Integer isDeleted;
}

88
src/main/java/com/youlai/system/model/entity/GenFieldConfig.java
View File

@@ -1,88 +0,0 @@
package com.youlai.system.model.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.youlai.system.common.base.BaseEntity;
import com.youlai.system.enums.FormTypeEnum;
import com.youlai.system.enums.QueryTypeEnum;
import lombok.Getter;
import lombok.Setter;
/**
* 字段生成配置实体
*
* @author Ray
* @since 2.10.0
*/
@TableName(value = "gen_field_config")
@Getter
@Setter
public class GenFieldConfig extends BaseEntity {
/**
* 关联的配置ID
*/
private Long configId;
/**
* 列名
*/
private String columnName;
/**
* 列类型
*/
private String columnType;
/**
* 字段长度
*/
private String columnLength;
/**
* 字段名称
*/
private String fieldName;
/**
* 字段类型
*/
private String fieldType;
/**
* 字段描述
*/
private String comment;
/**
* 表单类型
*/
private FormTypeEnum formType;
/**
* 查询方式
*/
private QueryTypeEnum queryType;
/**
* 是否在列表显示
*/
private Integer isShowInList;
/**
* 是否在表单显示
*/
private Integer isShowInForm;
/**
* 是否在查询条件显示
*/
private Integer isShowInQuery;
/**
* 是否必填
*/
private Integer isRequired;
}

12
src/main/java/com/youlai/system/model/entity/SysDept.java
View File

@@ -3,7 +3,6 @@ package com.youlai.system.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.youlai.system.common.base.BaseEntity;
import lombok.Getter;
import lombok.Setter;
@@ -17,6 +16,11 @@ import lombok.Setter;
@Getter
@Setter
public class SysDept extends BaseEntity {
/**
* 主键
*/
@TableId(type = IdType.AUTO)
private Long id;
/**
* 部门名称
@@ -58,10 +62,4 @@ public class SysDept extends BaseEntity {
*/
private Long updateBy;
/**
* 逻辑删除标识 (0-未删除 1-已删除)
*/
@TableLogic
private Boolean isDeleted;
}

12
src/main/java/com/youlai/system/model/entity/SysDict.java
View File

@@ -2,7 +2,6 @@ package com.youlai.system.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.youlai.system.common.base.BaseEntity;
import lombok.Data;
@@ -14,6 +13,11 @@ import lombok.Data;
*/
@Data
public class SysDict extends BaseEntity {
/**
* 主键
*/
@TableId(type = IdType.AUTO)
private Long id;
/**
* 类型名称
@@ -35,10 +39,4 @@ public class SysDict extends BaseEntity {
*/
private String remark;
/**
* 逻辑删除标识 (0-未删除 1-已删除)
*/
@TableLogic(value = "0", delval = "1")
private Integer isDeleted;
}

7
src/main/java/com/youlai/system/model/entity/SysRole.java
View File

@@ -2,7 +2,6 @@ package com.youlai.system.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.youlai.system.common.base.BaseEntity;
import lombok.Getter;
import lombok.Setter;
@@ -56,10 +55,4 @@ public class SysRole extends BaseEntity {
* 更新人 ID
*/
private Long updateBy;
/**
* 逻辑删除标识 (0-未删除 1-已删除)
*/
@TableLogic(value = "0", delval = "1")
private Boolean isDeleted;
}

7
src/main/java/com/youlai/system/model/entity/SysUser.java
View File

@@ -2,7 +2,6 @@ package com.youlai.system.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.youlai.system.common.base.BaseEntity;
import lombok.Getter;
import lombok.Setter;
@@ -73,10 +72,4 @@ public class SysUser extends BaseEntity {
* 更新人 ID
*/
private Long updateBy;
/**
* 逻辑删除标识 (0-未删除 1-已删除)
*/
@TableLogic(value = "0", delval = "1")
private Integer isDeleted;
}

48
src/main/java/com/youlai/system/model/form/GenConfigForm.java → src/main/java/com/youlai/system/model/form/GeneratorConfigForm.java
View File

@@ -1,7 +1,5 @@
package com.youlai.system.model.form;
import com.youlai.system.enums.FormTypeEnum;
import com.youlai.system.enums.QueryTypeEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -9,67 +7,53 @@ import java.util.List;
@Schema(description = "代码生成配置表单")
@Data
public class GenConfigForm {
public class GeneratorConfigForm {
@Schema(description = "表名")
private String tableName;
@Schema(description = "类描述")
private String comment;
@Schema(description = "模块名")
private String moduleName;
@Schema(description = "实体名")
private String entityName;
@Schema(description = "包名")
private String packageName;
@Schema(description = "实体名")
private String entityName;
@Schema(description = "模块名")
private String moduleName;
@Schema(description = "作者")
private String author;
@Schema(description = "字段配置列表")
@Schema(description = "字段配置")
private List<FieldConfig> fieldConfigs;
@Schema(description = "字段配置")
@Data
public static class FieldConfig {
@Schema(description = "ID")
private Long configId;
@Schema(description = "列名")
private String columnName;
@Schema(description = "列类型")
private String columnType;
@Schema(description = "字段名")
private String fieldName;
@Schema(description = "字段名称")
private String name;
@Schema(description = "字段类型")
private String fieldType;
private String type;
@Schema(description = "字段描述")
private String comment;
private String description;
@Schema(description = "是否在列表显示")
private Integer isShowInList;
private Boolean showInList;
@Schema(description = "是否在表单显示")
private Integer isShowInForm;
private Boolean showInForm;
@Schema(description = "是否在查询条件显示")
private Integer isShowInQuery;
@Schema(description = "是否必填")
private Integer isRequired;
private Boolean showInQuery;
@Schema(description = "表单类型")
private FormTypeEnum formType;
private String formType;
@Schema(description = "查询类型")
private QueryTypeEnum queryType;
@Schema(description = "查询方式")
private String queryMethod;
}
}

2
src/main/java/com/youlai/system/model/vo/GeneratorPreviewVO.java → src/main/java/com/youlai/system/model/vo/TableGeneratePreviewVO.java
View File

@@ -5,7 +5,7 @@ import lombok.Data;
@Schema(description = "表生成代码预览VO")
@Data
public class GeneratorPreviewVO {
public class TableGeneratePreviewVO {
@Schema(description = "生成文件路径")
private String path;