From c02c6cab109416b098abc1366e5a044b0a5cc113 Mon Sep 17 00:00:00 2001 From: weihongyang <1075331873@qq.com> Date: Wed, 10 Aug 2022 08:49:11 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20feat:=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cnbm/admin/entity/SysDeptEntity.java | 6 ++++++ .../main/java/com/cnbm/admin/entity/SysDictDataEntity.java | 6 ++++++ .../main/java/com/cnbm/admin/entity/SysDictTypeEntity.java | 6 ++++++ .../main/java/com/cnbm/admin/entity/SysLogErrorEntity.java | 6 ++++++ .../main/java/com/cnbm/admin/entity/SysLogLoginEntity.java | 6 ++++++ .../java/com/cnbm/admin/entity/SysLogOperationEntity.java | 6 ++++++ .../src/main/java/com/cnbm/admin/entity/SysMenuEntity.java | 6 ++++++ .../main/java/com/cnbm/admin/entity/SysParamsEntity.java | 6 ++++++ .../java/com/cnbm/admin/entity/SysRoleDataScopeEntity.java | 6 ++++++ .../src/main/java/com/cnbm/admin/entity/SysRoleEntity.java | 6 ++++++ .../main/java/com/cnbm/admin/entity/SysRoleMenuEntity.java | 6 ++++++ .../main/java/com/cnbm/admin/entity/SysRoleUserEntity.java | 6 ++++++ .../src/main/java/com/cnbm/admin/entity/SysUserEntity.java | 6 ++++++ .../src/main/java/com/cnbm/common/entity/BaseEntity.java | 3 +++ 14 files changed, 81 insertions(+) diff --git a/ym-admin/src/main/java/com/cnbm/admin/entity/SysDeptEntity.java b/ym-admin/src/main/java/com/cnbm/admin/entity/SysDeptEntity.java index 436cbbf..8811473 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/entity/SysDeptEntity.java +++ b/ym-admin/src/main/java/com/cnbm/admin/entity/SysDeptEntity.java @@ -2,6 +2,7 @@ package com.cnbm.admin.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.cnbm.common.entity.BaseEntity; import lombok.Data; @@ -51,5 +52,10 @@ public class SysDeptEntity extends BaseEntity { */ @TableField(exist = false) private String parentName; + /** + * 删除标识，是否有效：1可用 0不可用 + */ + @TableLogic + private Integer valid; } diff --git a/ym-admin/src/main/java/com/cnbm/admin/entity/SysDictDataEntity.java b/ym-admin/src/main/java/com/cnbm/admin/entity/SysDictDataEntity.java index 2726cce..b653807 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/entity/SysDictDataEntity.java +++ b/ym-admin/src/main/java/com/cnbm/admin/entity/SysDictDataEntity.java @@ -2,6 +2,7 @@ package com.cnbm.admin.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.cnbm.common.entity.BaseEntity; import lombok.Data; @@ -49,4 +50,9 @@ public class SysDictDataEntity extends BaseEntity { */ @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateDate; + /** + * 删除标识，是否有效：1可用 0不可用 + */ + @TableLogic + private Integer valid; } diff --git a/ym-admin/src/main/java/com/cnbm/admin/entity/SysDictTypeEntity.java b/ym-admin/src/main/java/com/cnbm/admin/entity/SysDictTypeEntity.java index 103054e..87f0f7c 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/entity/SysDictTypeEntity.java +++ b/ym-admin/src/main/java/com/cnbm/admin/entity/SysDictTypeEntity.java @@ -2,6 +2,7 @@ package com.cnbm.admin.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.cnbm.common.entity.BaseEntity; import lombok.Data; @@ -45,4 +46,9 @@ public class SysDictTypeEntity extends BaseEntity { */ @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateDate; + /** + * 删除标识，是否有效：1可用 0不可用 + */ + @TableLogic + private Integer valid; } diff --git a/ym-admin/src/main/java/com/cnbm/admin/entity/SysLogErrorEntity.java b/ym-admin/src/main/java/com/cnbm/admin/entity/SysLogErrorEntity.java index f2cbc59..a03a698 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/entity/SysLogErrorEntity.java +++ b/ym-admin/src/main/java/com/cnbm/admin/entity/SysLogErrorEntity.java @@ -1,5 +1,6 @@ package com.cnbm.admin.entity; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.cnbm.common.entity.BaseEntity; import lombok.Data; @@ -40,5 +41,10 @@ public class SysLogErrorEntity extends BaseEntity { * 异常信息 */ private String errorInfo; + /** + * 删除标识，是否有效：1可用 0不可用 + */ + @TableLogic + private Integer valid; } \ No newline at end of file diff --git a/ym-admin/src/main/java/com/cnbm/admin/entity/SysLogLoginEntity.java b/ym-admin/src/main/java/com/cnbm/admin/entity/SysLogLoginEntity.java index 45b6848..83ec439 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/entity/SysLogLoginEntity.java +++ b/ym-admin/src/main/java/com/cnbm/admin/entity/SysLogLoginEntity.java @@ -1,5 +1,6 @@ package com.cnbm.admin.entity; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.cnbm.common.entity.BaseEntity; import lombok.Data; @@ -31,5 +32,10 @@ public class SysLogLoginEntity extends BaseEntity { * 用户名 */ private String creatorName; + /** + * 删除标识，是否有效：1可用 0不可用 + */ + @TableLogic + private Integer valid; } \ No newline at end of file diff --git a/ym-admin/src/main/java/com/cnbm/admin/entity/SysLogOperationEntity.java b/ym-admin/src/main/java/com/cnbm/admin/entity/SysLogOperationEntity.java index 98cd9dc..9745f86 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/entity/SysLogOperationEntity.java +++ b/ym-admin/src/main/java/com/cnbm/admin/entity/SysLogOperationEntity.java @@ -1,5 +1,6 @@ package com.cnbm.admin.entity; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.cnbm.common.entity.BaseEntity; import lombok.Data; @@ -52,4 +53,9 @@ public class SysLogOperationEntity extends BaseEntity { * 用户名 */ private String creatorName; + /** + * 删除标识，是否有效：1可用 0不可用 + */ + @TableLogic + private Integer valid; } diff --git a/ym-admin/src/main/java/com/cnbm/admin/entity/SysMenuEntity.java b/ym-admin/src/main/java/com/cnbm/admin/entity/SysMenuEntity.java index 3843d0a..8ef25aa 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/entity/SysMenuEntity.java +++ b/ym-admin/src/main/java/com/cnbm/admin/entity/SysMenuEntity.java @@ -2,6 +2,7 @@ package com.cnbm.admin.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.cnbm.common.entity.BaseEntity; import lombok.Data; @@ -63,5 +64,10 @@ public class SysMenuEntity extends BaseEntity { */ @TableField(exist = false) private String parentName; + /** + * 删除标识，是否有效：1可用 0不可用 + */ + @TableLogic + private Integer valid; } diff --git a/ym-admin/src/main/java/com/cnbm/admin/entity/SysParamsEntity.java b/ym-admin/src/main/java/com/cnbm/admin/entity/SysParamsEntity.java index 67aafbc..e3c51f7 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/entity/SysParamsEntity.java +++ b/ym-admin/src/main/java/com/cnbm/admin/entity/SysParamsEntity.java @@ -2,6 +2,7 @@ package com.cnbm.admin.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.cnbm.common.entity.BaseEntity; import lombok.Data; @@ -46,5 +47,10 @@ public class SysParamsEntity extends BaseEntity { */ @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateDate; + /** + * 删除标识，是否有效：1可用 0不可用 + */ + @TableLogic + private Integer valid; } diff --git a/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleDataScopeEntity.java b/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleDataScopeEntity.java index 7e73287..3693efe 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleDataScopeEntity.java +++ b/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleDataScopeEntity.java @@ -1,5 +1,6 @@ package com.cnbm.admin.entity; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.cnbm.common.entity.BaseEntity; import lombok.Data; @@ -24,5 +25,10 @@ public class SysRoleDataScopeEntity extends BaseEntity { * 部门ID */ private Long deptId; + /** + * 删除标识，是否有效：1可用 0不可用 + */ + @TableLogic + private Integer valid; } diff --git a/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleEntity.java b/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleEntity.java index b96a570..2605a31 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleEntity.java +++ b/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleEntity.java @@ -2,6 +2,7 @@ package com.cnbm.admin.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.cnbm.common.entity.BaseEntity; import lombok.Data; @@ -43,4 +44,9 @@ public class SysRoleEntity extends BaseEntity { */ @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateDate; + /** + * 删除标识，是否有效：1可用 0不可用 + */ + @TableLogic + private Integer valid; } diff --git a/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleMenuEntity.java b/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleMenuEntity.java index caf8b8b..96484d1 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleMenuEntity.java +++ b/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleMenuEntity.java @@ -1,5 +1,6 @@ package com.cnbm.admin.entity; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.cnbm.common.entity.BaseEntity; import lombok.Data; @@ -23,5 +24,10 @@ public class SysRoleMenuEntity extends BaseEntity { * 菜单ID */ private Long menuId; + /** + * 删除标识，是否有效：1可用 0不可用 + */ + @TableLogic + private Integer valid; } diff --git a/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleUserEntity.java b/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleUserEntity.java index fd748f8..1103275 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleUserEntity.java +++ b/ym-admin/src/main/java/com/cnbm/admin/entity/SysRoleUserEntity.java @@ -1,5 +1,6 @@ package com.cnbm.admin.entity; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.cnbm.common.entity.BaseEntity; import lombok.Data; @@ -24,6 +25,11 @@ public class SysRoleUserEntity extends BaseEntity { * 用户ID */ private Long userId; + /** + * 删除标识，是否有效：1可用 0不可用 + */ + @TableLogic + private Integer valid; } diff --git a/ym-admin/src/main/java/com/cnbm/admin/entity/SysUserEntity.java b/ym-admin/src/main/java/com/cnbm/admin/entity/SysUserEntity.java index 22d9eef..6c989ed 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/entity/SysUserEntity.java +++ b/ym-admin/src/main/java/com/cnbm/admin/entity/SysUserEntity.java @@ -2,6 +2,7 @@ package com.cnbm.admin.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.cnbm.common.entity.BaseEntity; import lombok.Data; @@ -76,5 +77,10 @@ public class SysUserEntity extends BaseEntity implements Serializable { */ @TableField(exist=false) private String deptName; + /** + * 删除标识，是否有效：1可用 0不可用 + */ + @TableLogic + private Integer valid; } diff --git a/ym-common/src/main/java/com/cnbm/common/entity/BaseEntity.java b/ym-common/src/main/java/com/cnbm/common/entity/BaseEntity.java index 4190a44..2ad188f 100644 --- a/ym-common/src/main/java/com/cnbm/common/entity/BaseEntity.java +++ b/ym-common/src/main/java/com/cnbm/common/entity/BaseEntity.java @@ -3,6 +3,8 @@ package com.cnbm.common.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; + import lombok.Data; import java.io.Serializable; @@ -30,4 +32,5 @@ public abstract class BaseEntity implements Serializable { */ @TableField(fill = FieldFill.INSERT) private Date createDate; + }