diff --git a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/logs/entity/GenLogs.java b/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/logs/entity/GenLogs.java index ea911ee..542f625 100644 --- a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/logs/entity/GenLogs.java +++ b/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/logs/entity/GenLogs.java @@ -32,6 +32,9 @@ public class GenLogs extends BaseEntity { /** 归属表ID */ private String tableId; + /** 表类型 */ + private String tableType; + /** 包名 */ private String packageName; @@ -50,6 +53,8 @@ public class GenLogs extends BaseEntity { /** 作者名 */ private String authorName; + /** 模板ID */ + private String templateId; // ======================================== diff --git a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/logs/wrapper/GenBuilderModel.java b/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/logs/wrapper/GenBuilderModel.java index d272875..2b44410 100644 --- a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/logs/wrapper/GenBuilderModel.java +++ b/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/logs/wrapper/GenBuilderModel.java @@ -30,10 +30,12 @@ import org.opsli.modulars.generator.table.wrapper.GenTableAndColumnModel; @EqualsAndHashCode(callSuper = false) public class GenBuilderModel extends ApiWrapper { - /** 归属表ID */ private String tableId; + /** 表类型 */ + private String tableType; + /** 包名 */ private String packageName; @@ -52,6 +54,9 @@ public class GenBuilderModel extends ApiWrapper { /** 作者名 */ private String authorName; + /** 模板ID */ + private String templateId; + /** 代码模型 */ private GenTableAndColumnModel model; diff --git a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/logs/wrapper/GenLogsModel.java b/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/logs/wrapper/GenLogsModel.java index a1c0f8b..c82880a 100644 --- a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/logs/wrapper/GenLogsModel.java +++ b/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/logs/wrapper/GenLogsModel.java @@ -16,6 +16,7 @@ package org.opsli.modulars.generator.logs.wrapper; import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -23,6 +24,7 @@ import org.opsli.api.base.warpper.ApiWrapper; import org.opsli.common.annotation.validator.Validator; import org.opsli.common.annotation.validator.ValidatorLenMax; import org.opsli.common.enums.ValidatorType; +import org.opsli.plugins.excel.annotation.ExcelInfo; /** * 代码生成器 - 生成日志 模型 @@ -42,6 +44,13 @@ public class GenLogsModel extends ApiWrapper { @ValidatorLenMax(19) private String tableId; + /** 表类型 */ + @ApiModelProperty(value = "表类型") + @ExcelIgnore + @Validator({ValidatorType.IS_NOT_NULL}) + @ValidatorLenMax(1) + private String tableType; + /** 包名 */ @ApiModelProperty(value = "包名") @@ -85,4 +94,11 @@ public class GenLogsModel extends ApiWrapper { @ValidatorLenMax(64) private String authorName; + /** 模板ID */ + @ApiModelProperty(value = "模板ID") + @ExcelIgnore + @Validator({ValidatorType.IS_NOT_NULL}) + @ValidatorLenMax(19) + private String templateId; + }