From ced523116fc5f726c4bf6d9a1ca472dd750de88b Mon Sep 17 00:00:00 2001 From: uidoer <2513889970@qq.com> Date: Mon, 24 Mar 2025 15:51:15 +0800 Subject: [PATCH] =?UTF-8?q?mod:=20=E6=B7=BB=E5=8A=A0auto-table=20=E8=A1=A8?= =?UTF-8?q?=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 32 +++++++-- .../common/exception/BusinessException.java | 2 + .../java/vip/fuck/sm/entity/ColumnEntity.java | 57 +-------------- .../vip/fuck/sm/entity/SysContentEntity.java | 2 +- src/main/java/vip/fuck/sm/entity/SysDept.java | 2 +- .../fuck/sm/entity/SysDictDetailEntity.java | 2 +- .../vip/fuck/sm/entity/SysDictEntity.java | 2 +- .../vip/fuck/sm/entity/SysFilesEntity.java | 2 +- .../java/vip/fuck/sm/entity/SysGenerator.java | 2 +- src/main/java/vip/fuck/sm/entity/SysLog.java | 2 +- .../vip/fuck/sm/entity/SysPermission.java | 2 +- .../vip/fuck/sm/entity/SysPlugsEntity.java | 4 +- src/main/java/vip/fuck/sm/entity/SysRole.java | 2 +- .../vip/fuck/sm/entity/SysRoleDeptEntity.java | 2 +- .../vip/fuck/sm/entity/SysRolePermission.java | 2 +- src/main/java/vip/fuck/sm/entity/SysUser.java | 2 +- .../java/vip/fuck/sm/entity/SysUserRole.java | 2 +- .../java/vip/fuck/sm/entity/TableEntity.java | 70 ++----------------- 18 files changed, 54 insertions(+), 137 deletions(-) diff --git a/pom.xml b/pom.xml index 8de65bb..788d5bb 100644 --- a/pom.xml +++ b/pom.xml @@ -37,16 +37,36 @@ solon-web - - org.dromara.autotable - auto-table - 2.3.1 - + org.dromara.autotable auto-table-solon-plugin 2.3.1 + + + org.projectlombok + lombok + + + + + + org.dromara.autotable + auto-table-annotation + 2.3.1 + + + + org.dromara.autotable + auto-table-core + 2.3.1 + + + org.projectlombok + lombok + + @@ -83,6 +103,8 @@ org.projectlombok lombok + 1.18.34 + provided diff --git a/src/main/java/vip/fuck/sm/common/exception/BusinessException.java b/src/main/java/vip/fuck/sm/common/exception/BusinessException.java index 2a398da..26d68c0 100644 --- a/src/main/java/vip/fuck/sm/common/exception/BusinessException.java +++ b/src/main/java/vip/fuck/sm/common/exception/BusinessException.java @@ -1,6 +1,7 @@ package vip.fuck.sm.common.exception; import lombok.Data; +import lombok.EqualsAndHashCode; import vip.fuck.sm.common.exception.code.BaseResponseCode; import vip.fuck.sm.common.exception.code.ResponseCodeInterface; @@ -11,6 +12,7 @@ import vip.fuck.sm.common.exception.code.ResponseCodeInterface; * @version V1.0 * @date 2020年3月18日 */ +@EqualsAndHashCode(callSuper = true) @Data public class BusinessException extends RuntimeException { /** diff --git a/src/main/java/vip/fuck/sm/entity/ColumnEntity.java b/src/main/java/vip/fuck/sm/entity/ColumnEntity.java index f4b6623..dd06fa8 100644 --- a/src/main/java/vip/fuck/sm/entity/ColumnEntity.java +++ b/src/main/java/vip/fuck/sm/entity/ColumnEntity.java @@ -1,6 +1,8 @@ package vip.fuck.sm.entity; import lombok.Data; +import lombok.Getter; +import lombok.Setter; /** * 代码生成 列属性 @@ -46,59 +48,4 @@ public class ColumnEntity { */ private String extra; - public String getColumnName() { - return columnName; - } - - public void setColumnName(String columnName) { - this.columnName = columnName; - } - - public String getDataType() { - return dataType; - } - - public void setDataType(String dataType) { - this.dataType = dataType; - } - - public String getComments() { - return comments; - } - - public void setComments(String comments) { - this.comments = comments; - } - - public String getAttrname() { - return attrname; - } - - public void setAttrname(String attrname) { - this.attrname = attrname; - } - - public String getAttrName() { - return attrName; - } - - public void setAttrName(String attrName) { - this.attrName = attrName; - } - - public String getAttrType() { - return attrType; - } - - public void setAttrType(String attrType) { - this.attrType = attrType; - } - - public String getExtra() { - return extra; - } - - public void setExtra(String extra) { - this.extra = extra; - } } diff --git a/src/main/java/vip/fuck/sm/entity/SysContentEntity.java b/src/main/java/vip/fuck/sm/entity/SysContentEntity.java index c319b02..2d44780 100644 --- a/src/main/java/vip/fuck/sm/entity/SysContentEntity.java +++ b/src/main/java/vip/fuck/sm/entity/SysContentEntity.java @@ -19,7 +19,7 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Data @TableName("sys_content") -@AutoTable("sys_content") +@AutoTable(value = "sys_content",comment = "内容管理") public class SysContentEntity extends BasePageEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/vip/fuck/sm/entity/SysDept.java b/src/main/java/vip/fuck/sm/entity/SysDept.java index 14004f2..9b7a3f8 100644 --- a/src/main/java/vip/fuck/sm/entity/SysDept.java +++ b/src/main/java/vip/fuck/sm/entity/SysDept.java @@ -17,7 +17,7 @@ import java.util.Date; */ @Data @TableName("sys_dept") -@AutoTable("sys_dept") +@AutoTable(value = "sys_dept",comment = "部门") public class SysDept implements Serializable { @TableId(type = IdType.AUTO) @PrimaryKey(autoIncrement = true) diff --git a/src/main/java/vip/fuck/sm/entity/SysDictDetailEntity.java b/src/main/java/vip/fuck/sm/entity/SysDictDetailEntity.java index 300431f..fe33e71 100644 --- a/src/main/java/vip/fuck/sm/entity/SysDictDetailEntity.java +++ b/src/main/java/vip/fuck/sm/entity/SysDictDetailEntity.java @@ -20,7 +20,7 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Data @TableName("sys_dict_detail") -@AutoTable("sys_dict_detail") +@AutoTable(value = "sys_dict_detail",comment = "字典明细") public class SysDictDetailEntity extends BasePageEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/vip/fuck/sm/entity/SysDictEntity.java b/src/main/java/vip/fuck/sm/entity/SysDictEntity.java index 05a0209..716be78 100644 --- a/src/main/java/vip/fuck/sm/entity/SysDictEntity.java +++ b/src/main/java/vip/fuck/sm/entity/SysDictEntity.java @@ -22,7 +22,7 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Data @TableName("sys_dict") -@AutoTable("sys_dict") +@AutoTable(value = "sys_dict",comment = "字典管理") public class SysDictEntity extends BasePageEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/vip/fuck/sm/entity/SysFilesEntity.java b/src/main/java/vip/fuck/sm/entity/SysFilesEntity.java index f71407d..21cad47 100644 --- a/src/main/java/vip/fuck/sm/entity/SysFilesEntity.java +++ b/src/main/java/vip/fuck/sm/entity/SysFilesEntity.java @@ -19,7 +19,7 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Data @TableName("sys_files") -@AutoTable("sys_files") +@AutoTable(value = "sys_files",comment = "文件上传") public class SysFilesEntity extends BasePageEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/vip/fuck/sm/entity/SysGenerator.java b/src/main/java/vip/fuck/sm/entity/SysGenerator.java index c3abb05..fad0504 100644 --- a/src/main/java/vip/fuck/sm/entity/SysGenerator.java +++ b/src/main/java/vip/fuck/sm/entity/SysGenerator.java @@ -20,7 +20,7 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("sys_generator") -@AutoTable("sys_generator") +@AutoTable(value = "sys_generator",comment = "代码生成") public class SysGenerator extends BasePageEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/vip/fuck/sm/entity/SysLog.java b/src/main/java/vip/fuck/sm/entity/SysLog.java index fff89e1..df056fc 100644 --- a/src/main/java/vip/fuck/sm/entity/SysLog.java +++ b/src/main/java/vip/fuck/sm/entity/SysLog.java @@ -20,7 +20,7 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Data @TableName("sys_log") -@AutoTable("sys_log") +@AutoTable(value = "sys_log",comment = "操作日志") public class SysLog extends BasePageEntity implements Serializable { @TableId(type = IdType.AUTO) @PrimaryKey(autoIncrement = true) diff --git a/src/main/java/vip/fuck/sm/entity/SysPermission.java b/src/main/java/vip/fuck/sm/entity/SysPermission.java index ab833a2..f78254f 100644 --- a/src/main/java/vip/fuck/sm/entity/SysPermission.java +++ b/src/main/java/vip/fuck/sm/entity/SysPermission.java @@ -21,7 +21,7 @@ import java.util.Date; */ @Data @TableName("sys_permission") -@AutoTable("sys_permission") +@AutoTable(value = "sys_permission",comment = "权限菜单") public class SysPermission implements Serializable { diff --git a/src/main/java/vip/fuck/sm/entity/SysPlugsEntity.java b/src/main/java/vip/fuck/sm/entity/SysPlugsEntity.java index d36bba3..58a6f8f 100644 --- a/src/main/java/vip/fuck/sm/entity/SysPlugsEntity.java +++ b/src/main/java/vip/fuck/sm/entity/SysPlugsEntity.java @@ -1,6 +1,7 @@ package vip.fuck.sm.entity; import com.baomidou.mybatisplus.annotation.*; +import lombok.EqualsAndHashCode; import org.dromara.autotable.annotation.AutoTable; import org.dromara.autotable.annotation.PrimaryKey; import vip.fuck.sm.entity.BasePageEntity; @@ -17,9 +18,10 @@ import lombok.Data; * @email xian.zi.ming@qq.com * @date 2025-03-22 20:59:06 */ +@EqualsAndHashCode(callSuper = true) @Data @TableName("sys_plugs") -@AutoTable("sys_plugs") +@AutoTable(value = "sys_plugs",comment = "系统插件") public class SysPlugsEntity extends BasePageEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/vip/fuck/sm/entity/SysRole.java b/src/main/java/vip/fuck/sm/entity/SysRole.java index 7d8ef9c..0a391a1 100644 --- a/src/main/java/vip/fuck/sm/entity/SysRole.java +++ b/src/main/java/vip/fuck/sm/entity/SysRole.java @@ -24,7 +24,7 @@ import java.util.List; @Data @Accessors(chain = true) @TableName("sys_role") -@AutoTable("sys_role") +@AutoTable(value = "sys_role",comment = "角色") public class SysRole extends BasePageEntity implements Serializable { @TableId(type = IdType.AUTO) @PrimaryKey(autoIncrement = true) diff --git a/src/main/java/vip/fuck/sm/entity/SysRoleDeptEntity.java b/src/main/java/vip/fuck/sm/entity/SysRoleDeptEntity.java index 06b4f4b..5198655 100644 --- a/src/main/java/vip/fuck/sm/entity/SysRoleDeptEntity.java +++ b/src/main/java/vip/fuck/sm/entity/SysRoleDeptEntity.java @@ -19,7 +19,7 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Data @TableName("sys_role_dept") -@AutoTable("sys_role_dept") +@AutoTable(value = "sys_role_dept",comment = "角色部门") public class SysRoleDeptEntity extends BasePageEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/vip/fuck/sm/entity/SysRolePermission.java b/src/main/java/vip/fuck/sm/entity/SysRolePermission.java index 07232df..ca9a23d 100644 --- a/src/main/java/vip/fuck/sm/entity/SysRolePermission.java +++ b/src/main/java/vip/fuck/sm/entity/SysRolePermission.java @@ -17,7 +17,7 @@ import java.util.Date; */ @Data @TableName("sys_role_permission") -@AutoTable("sys_role_permission") +@AutoTable(value = "sys_role_permission",comment = "角色权限") public class SysRolePermission implements Serializable { @TableId(type = IdType.AUTO) @PrimaryKey(autoIncrement = true) diff --git a/src/main/java/vip/fuck/sm/entity/SysUser.java b/src/main/java/vip/fuck/sm/entity/SysUser.java index 816dbb8..1b0663d 100644 --- a/src/main/java/vip/fuck/sm/entity/SysUser.java +++ b/src/main/java/vip/fuck/sm/entity/SysUser.java @@ -23,7 +23,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Data @TableName("sys_user") -@AutoTable("sys_user") +@AutoTable(value = "sys_user",comment = "系统用户") public class SysUser extends BasePageEntity implements Serializable { @TableId(type = IdType.AUTO) @PrimaryKey(autoIncrement = true) diff --git a/src/main/java/vip/fuck/sm/entity/SysUserRole.java b/src/main/java/vip/fuck/sm/entity/SysUserRole.java index 8fb193e..d2a6516 100644 --- a/src/main/java/vip/fuck/sm/entity/SysUserRole.java +++ b/src/main/java/vip/fuck/sm/entity/SysUserRole.java @@ -17,7 +17,7 @@ import java.util.Date; */ @Data @TableName("sys_user_role") -@AutoTable("sys_user_role") +@AutoTable(value = "sys_user_role",comment = "用户角色") public class SysUserRole implements Serializable { @TableId(type = IdType.AUTO) @PrimaryKey(autoIncrement = true) diff --git a/src/main/java/vip/fuck/sm/entity/TableEntity.java b/src/main/java/vip/fuck/sm/entity/TableEntity.java index b8dd062..4b913ca 100644 --- a/src/main/java/vip/fuck/sm/entity/TableEntity.java +++ b/src/main/java/vip/fuck/sm/entity/TableEntity.java @@ -1,5 +1,10 @@ package vip.fuck.sm.entity; + +import lombok.Getter; +import lombok.Setter; + + import java.util.List; /** @@ -9,6 +14,8 @@ import java.util.List; * @version V1.0 * @date 2020年3月18日 */ +@Getter +@Setter public class TableEntity { //表的名称 private String tableName; @@ -27,67 +34,4 @@ public class TableEntity { //类名(都小写)，如：sys_user => sysuser private String classNameLower; - public List getHtmlColumns() { - return htmlColumns; - } - - public void setHtmlColumns(List htmlColumns) { - this.htmlColumns = htmlColumns; - } - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public String getComments() { - return comments; - } - - public void setComments(String comments) { - this.comments = comments; - } - - public ColumnEntity getPk() { - return pk; - } - - public void setPk(ColumnEntity pk) { - this.pk = pk; - } - - public List getColumns() { - return columns; - } - - public void setColumns(List columns) { - this.columns = columns; - } - - public String getClassName() { - return className; - } - - public void setClassName(String className) { - this.className = className; - } - - public String getClassname() { - return classname; - } - - public void setClassname(String classname) { - this.classname = classname; - } - - public String getClassNameLower() { - return classNameLower; - } - - public void setClassNameLower(String classNameLower) { - this.classNameLower = classNameLower; - } }