feat: Add a logical deletion field.

DataLinkDC · Nov 27, 2024 · a7c2dac · a7c2dac
1 parent f619a41
commit a7c2dac
Show file tree

Hide file tree

Showing 28 changed files with 1,339 additions and 1,002 deletions.
diff --git a/dinky-admin/src/main/java/org/dinky/data/model/Dashboard.java b/dinky-admin/src/main/java/org/dinky/data/model/Dashboard.java
@@ -25,6 +25,7 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -59,6 +60,10 @@ public class Dashboard extends Model<Dashboard> {
     @ApiModelProperty(value = "Layouts", dataType = "String", example = "[]", notes = "Layouts of the metrics")
     private String layouts;
 
+    @ApiModelProperty(value = "Is Delete", dataType = "Boolean", notes = "Whether the user is deleted")
+    @TableLogic
+    private Boolean isDelete;
+
     @TableField(fill = FieldFill.INSERT)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     @JsonSerialize(using = LocalDateTimeSerializer.class)

diff --git a/dinky-admin/src/main/java/org/dinky/data/model/LoginLog.java b/dinky-admin/src/main/java/org/dinky/data/model/LoginLog.java
@@ -34,7 +34,9 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel(value = "LoginLog", description = "Login Log Information")
 @TableName("dinky_sys_login_log")
@@ -85,9 +87,6 @@ public class LoginLog extends DateBaseEntity<LoginLog> implements Serializable {
     @ApiModelProperty(value = "Message", dataType = "String", notes = "Additional message or details about the login")
     private String msg;
 
-    @ApiModelProperty(value = "Is Deleted", dataType = "Boolean", notes = "Flag indicating if the login log is deleted")
-    private Boolean isDeleted;
-
     @ApiModelProperty(value = "Access Time", dataType = "String", notes = "Timestamp indicating the time of login")
     private LocalDateTime accessTime;
 }
diff --git a/dinky-admin/src/main/java/org/dinky/data/model/Metrics.java b/dinky-admin/src/main/java/org/dinky/data/model/Metrics.java
@@ -25,6 +25,7 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -93,6 +94,10 @@ public class Metrics extends Model<Metrics> {
             notes = "Timestamp indicating the last update time of the metrics")
     private LocalDateTime updateTime;
 
+    @ApiModelProperty(value = "Is Delete", dataType = "Boolean", notes = "Whether the user is deleted")
+    @TableLogic
+    private Boolean isDelete;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 

diff --git a/dinky-admin/src/main/java/org/dinky/data/model/OperateLog.java b/dinky-admin/src/main/java/org/dinky/data/model/OperateLog.java
@@ -24,6 +24,7 @@
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
@@ -49,6 +50,10 @@ public class OperateLog implements Serializable {
             notes = "Name of the operation module")
     private String moduleName;
 
+    @ApiModelProperty(value = "Is Delete", dataType = "Boolean", notes = "Whether the user is deleted")
+    @TableLogic
+    private Boolean isDelete;
+
     @ApiModelProperty(
             value = "Business Type",
             dataType = "Integer",

diff --git a/dinky-admin/src/main/java/org/dinky/data/model/Resources.java b/dinky-admin/src/main/java/org/dinky/data/model/Resources.java
@@ -27,6 +27,7 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -105,6 +106,10 @@ public class Resources extends Model<Resources> {
             notes = "Flag indicating if the resource is a directory")
     private Boolean isDirectory;
 
+    @ApiModelProperty(value = "Is Delete", dataType = "Boolean", notes = "Whether the user is deleted")
+    @TableLogic
+    private Boolean isDelete;
+
     @TableField(fill = FieldFill.INSERT)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     @JsonSerialize(using = LocalDateTimeSerializer.class)

diff --git a/dinky-admin/src/main/java/org/dinky/data/model/Savepoints.java b/dinky-admin/src/main/java/org/dinky/data/model/Savepoints.java
@@ -30,6 +30,7 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -95,6 +96,10 @@ public class Savepoints implements Serializable {
             notes = "Timestamp indicating the creation time of the savepoint")
     private LocalDateTime createTime;
 
+    @ApiModelProperty(value = "Is Delete", dataType = "Boolean", notes = "Whether the user is deleted")
+    @TableLogic
+    private Boolean isDelete;
+
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "Creator", dataType = "String", notes = "Creator of the savepoint")
     private Integer creator;

diff --git a/dinky-admin/src/main/java/org/dinky/data/model/SysToken.java b/dinky-admin/src/main/java/org/dinky/data/model/SysToken.java
@@ -19,6 +19,7 @@
 
 package org.dinky.data.model;
 
+import lombok.EqualsAndHashCode;
 import org.dinky.mybatis.model.DateBaseEntity;
 
 import java.io.Serializable;
@@ -39,6 +40,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

diff --git a/dinky-admin/src/main/java/org/dinky/data/model/TaskVersion.java b/dinky-admin/src/main/java/org/dinky/data/model/TaskVersion.java
@@ -27,6 +27,7 @@
 
 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.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -60,6 +61,10 @@ public class TaskVersion implements Serializable {
     @TableField(value = "task_id")
     private Integer taskId;
 
+    @ApiModelProperty(value = "Is Delete", dataType = "Boolean", notes = "Whether the user is deleted")
+    @TableLogic
+    private Boolean isDelete;
+
     @ApiModelProperty(value = "Version ID", dataType = "Integer", notes = "ID of the version")
     @TableField(value = "version_id")
     private Integer versionId;

diff --git a/dinky-admin/src/main/java/org/dinky/data/model/alert/AlertHistory.java b/dinky-admin/src/main/java/org/dinky/data/model/alert/AlertHistory.java
@@ -26,6 +26,7 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -85,6 +86,10 @@ public class AlertHistory implements Serializable {
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     private LocalDateTime createTime;
 
+    @ApiModelProperty(value = "Is Delete", dataType = "Boolean", notes = "Whether the user is deleted")
+    @TableLogic
+    private Boolean isDelete;
+
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @ApiModelProperty(value = "Update Time", example = "2022-02-24 20:12:00", dataType = "LocalDateTime")
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)

diff --git a/dinky-admin/src/main/java/org/dinky/data/model/job/History.java b/dinky-admin/src/main/java/org/dinky/data/model/job/History.java
@@ -27,6 +27,7 @@
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -129,6 +130,10 @@ public class History implements Serializable {
     @ApiModelProperty(value = "Group by count", dataType = "Integer")
     private Long count;
 
+    @ApiModelProperty(value = "Is Delete", dataType = "Boolean", notes = "Whether the user is deleted")
+    @TableLogic
+    private Boolean isDelete;
+
     @ApiModelProperty(hidden = true)
     public JobInstance buildJobInstance() {
         JobInstance jobInstance = new JobInstance();

diff --git a/dinky-admin/src/main/java/org/dinky/data/model/job/JobHistory.java b/dinky-admin/src/main/java/org/dinky/data/model/job/JobHistory.java
@@ -33,6 +33,7 @@
 
 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.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -81,6 +82,10 @@ public class JobHistory implements Serializable {
     @TableField(typeHandler = JSONObjectHandler.class)
     private FlinkJobDetailInfo jobJson;
 
+    @ApiModelProperty(value = "Is Delete", dataType = "Boolean", notes = "Whether the user is deleted")
+    @TableLogic
+    private Boolean isDelete;
+
     @ApiModelProperty(
             value = "Exceptions JSON",
             dataType = "String",

diff --git a/dinky-admin/src/main/java/org/dinky/data/model/job/JobInstance.java b/dinky-admin/src/main/java/org/dinky/data/model/job/JobInstance.java
@@ -27,6 +27,7 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -103,6 +104,10 @@ public class JobInstance implements Serializable {
     @ApiModelProperty(value = "Error", dataType = "String", notes = "Error message associated with the job instance")
     private String error;
 
+    @ApiModelProperty(value = "Is Delete", dataType = "Boolean", notes = "Whether the user is deleted")
+    @TableLogic
+    private Boolean isDelete;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)

diff --git a/dinky-admin/src/main/java/org/dinky/data/model/rbac/Role.java b/dinky-admin/src/main/java/org/dinky/data/model/rbac/Role.java
@@ -63,12 +63,6 @@ public class Role extends DateBaseEntity<Role> implements Serializable {
     @ApiModelProperty(value = "Role Name", dataType = "String", example = "Administrator", notes = "Name of the role")
     private String roleName;
 
-    @ApiModelProperty(
-            value = "Is Delete",
-            dataType = "Boolean",
-            notes = "Flag indicating if the role is marked as deleted")
-    private Boolean isDelete;
-
     @ApiModelProperty(value = "Note", dataType = "String", notes = "Additional notes or details about the role")
     private String note;
 

diff --git a/dinky-admin/src/main/java/org/dinky/data/model/rbac/Tenant.java b/dinky-admin/src/main/java/org/dinky/data/model/rbac/Tenant.java
@@ -53,7 +53,4 @@ public class Tenant extends DateBaseEntity<Tenant> implements Serializable {
     @ApiModelProperty(value = "Tenant Note", required = true, dataType = "String", example = "Default")
     private String note;
 
-    /** is delete */
-    @ApiModelProperty(value = "Is Delete", required = true, dataType = "Boolean", example = "false")
-    private Boolean isDelete;
 }
diff --git a/dinky-admin/src/main/java/org/dinky/data/model/rbac/User.java b/dinky-admin/src/main/java/org/dinky/data/model/rbac/User.java
@@ -29,7 +29,6 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import io.swagger.annotations.ApiModel;
@@ -80,10 +79,6 @@ public class User extends DateBaseEntity<User> implements Serializable {
     @ApiModelProperty(value = "Enabled", dataType = "Boolean", notes = "Whether the user is enabled")
     private Boolean enabled;
 
-    @ApiModelProperty(value = "Is Delete", dataType = "Boolean", notes = "Whether the user is deleted")
-    @TableLogic
-    private Boolean isDelete;
-
     @ApiModelProperty(value = "Super Admin Flag", dataType = "Boolean", notes = "Whether the user is a super admin")
     private Boolean superAdminFlag;
 

diff --git a/dinky-admin/src/main/java/org/dinky/mybatis/model/DateBaseEntity.java b/dinky-admin/src/main/java/org/dinky/mybatis/model/DateBaseEntity.java
@@ -23,6 +23,7 @@
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -56,6 +57,10 @@ public class DateBaseEntity<T extends Model<?>> extends Model<T> {
             example = "2021-05-28 00:00:00")
     private LocalDateTime createTime;
 
+    @ApiModelProperty(value = "Is Delete", dataType = "Boolean", notes = "Whether the user is deleted")
+    @TableLogic
+    private Boolean isDelete;
+
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     @JsonSerialize(using = LocalDateTimeSerializer.class)

diff --git a/dinky-admin/src/main/java/org/dinky/mybatis/model/SuperEntity.java b/dinky-admin/src/main/java/org/dinky/mybatis/model/SuperEntity.java
@@ -30,6 +30,7 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -51,7 +52,9 @@
 @ApiModel(value = "SuperEntity", description = "Super Base Entity", parent = Model.class)
 public class SuperEntity<T extends Model<?>> extends Model<T> {
 
-    /** 主键ID */
+    /**
+     * 主键ID
+     */
     @TableId(value = "id", type = IdType.AUTO)
     @ApiModelProperty(value = "ID", required = true, dataType = "Integer", example = "1", notes = "Primary Key")
     private Integer id;
@@ -96,6 +99,10 @@ public class SuperEntity<T extends Model<?>> extends Model<T> {
     @ApiModelProperty(value = "Updater", required = true, dataType = "String", example = "Updater")
     private Integer updater;
 
+    @ApiModelProperty(value = "Is Delete", dataType = "Boolean", notes = "Whether the user is deleted")
+    @TableLogic
+    private Boolean isDelete;
+
     @Override
     public Serializable pkVal() {
         return this.id;