[Feature] Logical delete

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)

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;
 }

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;
 

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",

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)

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;

dinky-admin/src/main/java/org/dinky/data/model/SysToken.java

@@ -36,9 +36,11 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

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;

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)

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();

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",

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)

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;
 

dinky-admin/src/main/java/org/dinky/data/model/rbac/Tenant.java

@@ -52,8 +52,4 @@ public class Tenant extends DateBaseEntity<Tenant> implements Serializable {
     /** note */
     @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;
 }

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;
 

dinky-admin/src/main/java/org/dinky/interceptor/PostgreSQLPrepareInterceptor.java

@@ -31,12 +31,15 @@
 import java.sql.Connection;
 import java.util.Properties;
 
+import lombok.extern.slf4j.Slf4j;
+
 @Intercepts({
     @Signature(
             type = StatementHandler.class,
             method = "prepare",
             args = {Connection.class, Integer.class})
 })
+@Slf4j
 public class PostgreSQLPrepareInterceptor implements Interceptor {
     @Override
     public Object intercept(final Invocation invocation) throws Throwable {
@@ -45,6 +48,10 @@ public Object intercept(final Invocation invocation) throws Throwable {
         Field field = boundSql.getClass().getDeclaredField("sql");
         field.setAccessible(true);
         field.set(boundSql, boundSql.getSql().replace("`", "\"").toLowerCase());
+        field.set(boundSql, boundSql.getSql().replaceAll("is_delete = 0", "is_delete = false"));
+        field.set(boundSql, boundSql.getSql().replaceAll("is_delete = 1", "is_delete = true"));
+        field.set(boundSql, boundSql.getSql().replaceAll("set is_delete = 0", "set is_delete = false"));
+        field.set(boundSql, boundSql.getSql().replaceAll("set is_delete = 1", "set is_delete = true"));
         return invocation.proceed();
     }
 

dinky-admin/src/main/java/org/dinky/mapper/MenuMapper.java

@@ -33,10 +33,6 @@ public interface MenuMapper extends SuperMapper<Menu> {
 
     List<Menu> listAllMenus();
 
-    List<Menu> selectMenuList(Menu menu);
-
-    List<String> selectMenuPerms();
-
     List<Menu> selectMenuListByUserId(Menu menu);
 
     List<String> selectMenuPermsByUserId(Integer userId);
@@ -45,11 +41,7 @@ public interface MenuMapper extends SuperMapper<Menu> {
 
     List<Menu> selectMenuTreeByUserId(@Param("userId") Integer userId);
 
-    List<Integer> selectMenuListByRoleId(Integer roleId);
-
     int hasChildByMenuId(Integer menuId);
 
-    Menu checkMenuNameUnique(@Param("name") String name, @Param("parentId") Integer parentId);
-
     List<String> selectMenuPermsByRoleId(Integer roleId);
 }

dinky-admin/src/main/java/org/dinky/mapper/RoleMapper.java

@@ -23,19 +23,13 @@
 import org.dinky.mybatis.mapper.SuperMapper;
 
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Set;
 
 /** role mapper interface */
 @Mapper
 public interface RoleMapper extends SuperMapper<Role> {
 
-    List<Role> getRoleByIds(@Param("roleIds") Set<Integer> roleIds);
-
-    List<Role> getRoleByTenantIdAndIds(@Param("tenantId") String tenantId, @Param("roleIds") Set<Integer> roleIds);
-
     /**
      * Query roles by user ID.
      *

dinky-admin/src/main/java/org/dinky/mapper/RoleMenuMapper.java

@@ -24,15 +24,9 @@
 
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-
 /** MenuMapper */
 @Mapper
 public interface RoleMenuMapper extends SuperMapper<RoleMenu> {
 
     int checkMenuExistRole(Integer menuId);
-
-    int deleteRoleMenuByRoleId(Integer roleId);
-
-    int batchRoleMenu(List<RoleMenu> roleMenuList);
 }

dinky-admin/src/main/java/org/dinky/mapper/TaskMapper.java

@@ -39,12 +39,6 @@
 @Mapper
 public interface TaskMapper extends SuperMapper<Task> {
 
-    List<Task> queryOnLineTaskByDoneStatus(
-            @Param("parentIds") List<Integer> parentIds,
-            @Param("stepIds") List<Integer> stepIds,
-            @Param("includeNull") boolean includeNull,
-            @Param("jobStatuses") List<String> jobStatuses);
-
     @InterceptorIgnore(tenantLine = "true")
     Task getTaskByNameAndTenantId(@Param("name") String name, @Param("tenantId") Integer tenantId);
 

dinky-admin/src/main/java/org/dinky/mapper/TenantMapper.java

@@ -23,14 +23,7 @@
 import org.dinky.mybatis.mapper.SuperMapper;
 
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Set;
 
 /** tenant mapper interface */
 @Mapper
-public interface TenantMapper extends SuperMapper<Tenant> {
-
-    List<Tenant> getTenantByIds(@Param("tenantIds") Set<Integer> tenantIds);
-}
+public interface TenantMapper extends SuperMapper<Tenant> {}

dinky-admin/src/main/java/org/dinky/mapper/UserMapper.java

@@ -33,7 +33,5 @@
 @Mapper
 public interface UserMapper extends SuperMapper<User> {
 
-    Integer queryAdminUserByTenant(@Param("tenantId") Integer tenantId);
-
     Integer recoveryUser(@Param("id") Integer userId);
 }