From e7824950a19b806b56e108ecf4944f7b04f3ebc9 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Tue, 7 Jan 2025 23:32:50 +0800 Subject: [PATCH] =?UTF-8?q?fix(1.4.0-beta1):=20=E6=B7=BB=E5=8A=A0=20@Equal?= =?UTF-8?q?sAndHashCode(callSuper=3Dtrue)=20=E5=8E=BB=E9=99=A4warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/datasource/persistence/po/CreateUpdateDt.java | 2 ++ .../template/datasource/persistence/po/DistributedLock.java | 2 ++ .../template/datasource/persistence/po/GroupConfig.java | 2 ++ .../aizuda/snailjob/template/datasource/persistence/po/Job.java | 2 ++ .../template/datasource/persistence/po/JobLogMessage.java | 2 ++ .../template/datasource/persistence/po/JobNotifyConfig.java | 2 ++ .../snailjob/template/datasource/persistence/po/JobSummary.java | 2 ++ .../snailjob/template/datasource/persistence/po/JobTask.java | 2 ++ .../template/datasource/persistence/po/JobTaskBatch.java | 2 ++ .../snailjob/template/datasource/persistence/po/Namespace.java | 2 ++ .../template/datasource/persistence/po/NotifyConfig.java | 2 ++ .../template/datasource/persistence/po/RetryDeadLetter.java | 2 ++ .../template/datasource/persistence/po/RetrySceneConfig.java | 2 ++ .../template/datasource/persistence/po/RetrySummary.java | 2 ++ .../snailjob/template/datasource/persistence/po/RetryTask.java | 2 ++ .../template/datasource/persistence/po/RetryTaskLog.java | 2 ++ .../template/datasource/persistence/po/RetryTaskLogMessage.java | 2 ++ .../snailjob/template/datasource/persistence/po/ServerNode.java | 2 ++ .../snailjob/template/datasource/persistence/po/SystemUser.java | 2 ++ .../datasource/persistence/po/SystemUserPermission.java | 2 ++ .../snailjob/template/datasource/persistence/po/Workflow.java | 2 ++ .../template/datasource/persistence/po/WorkflowNode.java | 2 ++ .../template/datasource/persistence/po/WorkflowTaskBatch.java | 2 ++ .../com/aizuda/snailjob/server/web/model/base/PageResult.java | 2 ++ .../snailjob/server/web/model/request/JobLineQueryVo.java | 2 ++ .../aizuda/snailjob/server/web/model/request/LineQueryVO.java | 2 ++ .../server/web/model/request/RetryDeadLetterQueryVO.java | 2 ++ .../server/web/model/request/RetryTaskLogMessageQueryVO.java | 2 ++ .../snailjob/server/web/model/request/RetryTaskLogQueryVO.java | 2 ++ .../snailjob/server/web/model/request/RetryTaskQueryVO.java | 2 ++ .../snailjob/server/web/model/request/ServerNodeQueryVO.java | 2 ++ .../snailjob/server/web/model/request/SystemUserQueryVO.java | 2 ++ 32 files changed, 64 insertions(+) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/CreateUpdateDt.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/CreateUpdateDt.java index 4b21ba9c7..911c81c00 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/CreateUpdateDt.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/CreateUpdateDt.java @@ -3,10 +3,12 @@ package com.aizuda.snailjob.template.datasource.persistence.po; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; +import lombok.EqualsAndHashCode; import java.time.LocalDateTime; @Data +@EqualsAndHashCode(callSuper=true) public class CreateUpdateDt extends CreateDt { /** diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/DistributedLock.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/DistributedLock.java index b34aaa1ad..c5dc1f011 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/DistributedLock.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/DistributedLock.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; import java.time.LocalDateTime; @@ -15,6 +16,7 @@ import java.time.LocalDateTime; */ @Data @TableName("sj_distributed_lock") +@EqualsAndHashCode(callSuper=true) public class DistributedLock extends CreateUpdateDt { /** diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/GroupConfig.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/GroupConfig.java index 882409c9f..9bfbffedf 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/GroupConfig.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/GroupConfig.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 组配置 @@ -14,6 +15,7 @@ import lombok.Data; */ @Data @TableName("sj_group_config") +@EqualsAndHashCode(callSuper=true) public class GroupConfig extends CreateUpdateDt { @TableId(value = "id", type = IdType.AUTO) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Job.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Job.java index 5e640c201..41ce2c344 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Job.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Job.java @@ -5,6 +5,7 @@ import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.common.core.enums.StatusEnum; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 任务信息 @@ -14,6 +15,7 @@ import lombok.Data; */ @Data @TableName("sj_job") +@EqualsAndHashCode(callSuper=true) public class Job extends CreateUpdateDt { /** diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobLogMessage.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobLogMessage.java index 02739ed51..8c3590a87 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobLogMessage.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobLogMessage.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 调度日志 @@ -13,6 +14,7 @@ import lombok.Data; */ @Data @TableName("sj_job_log_message") +@EqualsAndHashCode(callSuper=true) public class JobLogMessage extends CreateDt { /** diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobNotifyConfig.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobNotifyConfig.java index cf58e3a6c..9ba393391 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobNotifyConfig.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobNotifyConfig.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 任务通知配置 @@ -13,6 +14,7 @@ import lombok.Data; */ @Data @TableName("sj_job_notify_config") +@EqualsAndHashCode(callSuper=true) public class JobNotifyConfig extends CreateUpdateDt { @TableId(value = "id", type = IdType.AUTO) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobSummary.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobSummary.java index 7e2079d3e..161432673 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobSummary.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobSummary.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; import java.time.LocalDateTime; @@ -16,6 +17,7 @@ import java.time.LocalDateTime; */ @Data @TableName("sj_job_summary") +@EqualsAndHashCode(callSuper=true) public class JobSummary extends CreateUpdateDt { /** diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobTask.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobTask.java index 78aba3fd4..182f43407 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobTask.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobTask.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 任务实例 @@ -18,6 +19,7 @@ import lombok.Data; */ @Data @TableName("sj_job_task") +@EqualsAndHashCode(callSuper=true) public class JobTask extends CreateUpdateDt { /** diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobTaskBatch.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobTaskBatch.java index 6d441e80d..234e5996e 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobTaskBatch.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/JobTaskBatch.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; /** @@ -14,6 +15,7 @@ import lombok.Data; */ @Data @TableName("sj_job_task_batch") +@EqualsAndHashCode(callSuper=true) public class JobTaskBatch extends CreateUpdateDt { /** diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Namespace.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Namespace.java index 02fa0beb2..45c61cc2a 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Namespace.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Namespace.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 命名空间 @@ -13,6 +14,7 @@ import lombok.Data; */ @Data @TableName("sj_namespace") +@EqualsAndHashCode(callSuper=true) public class Namespace extends CreateUpdateDt { /** diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/NotifyConfig.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/NotifyConfig.java index ac8010e59..cc5c6a67f 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/NotifyConfig.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/NotifyConfig.java @@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; import java.time.LocalDateTime; @Data @TableName("sj_notify_config") +@EqualsAndHashCode(callSuper=true) public class NotifyConfig extends CreateUpdateDt { @TableId(value = "id", type = IdType.AUTO) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryDeadLetter.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryDeadLetter.java index 72b2e47ad..a85d52466 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryDeadLetter.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryDeadLetter.java @@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 死信队列 */ @Data @TableName("sj_retry_dead_letter") +@EqualsAndHashCode(callSuper=true) public class RetryDeadLetter extends CreateDt { @TableId(value = "id", type = IdType.AUTO) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetrySceneConfig.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetrySceneConfig.java index 0a8e5a335..738a85120 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetrySceneConfig.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetrySceneConfig.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 场景配置 @@ -14,6 +15,7 @@ import lombok.Data; */ @Data @TableName("sj_retry_scene_config") +@EqualsAndHashCode(callSuper=true) public class RetrySceneConfig extends CreateUpdateDt { @TableId(value = "id", type = IdType.AUTO) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetrySummary.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetrySummary.java index 15a94ff75..a5588c27e 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetrySummary.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetrySummary.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; import java.time.LocalDateTime; @@ -14,6 +15,7 @@ import java.time.LocalDateTime; */ @Data @TableName("sj_retry_summary") +@EqualsAndHashCode(callSuper=true) public class RetrySummary extends CreateUpdateDt { /** diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryTask.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryTask.java index 010fca488..519bf7d98 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryTask.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryTask.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; import java.time.LocalDateTime; @@ -12,6 +13,7 @@ import java.time.LocalDateTime; */ @Data @TableName("sj_retry_task") +@EqualsAndHashCode(callSuper=true) public class RetryTask extends CreateUpdateDt { @TableId(value = "id", type = IdType.AUTO) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryTaskLog.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryTaskLog.java index 8ec9315b2..bc144ae72 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryTaskLog.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryTaskLog.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 重试任务日志 @@ -13,6 +14,7 @@ import lombok.Data; */ @Data @TableName("sj_retry_task_log") +@EqualsAndHashCode(callSuper=true) public class RetryTaskLog extends CreateUpdateDt { @TableId(value = "id", type = IdType.AUTO) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryTaskLogMessage.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryTaskLogMessage.java index 457dbfe89..86de68d14 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryTaskLogMessage.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryTaskLogMessage.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 重试日志异常信息记录表 @@ -13,6 +14,7 @@ import lombok.Data; */ @Data @TableName("sj_retry_task_log_message") +@EqualsAndHashCode(callSuper=true) public class RetryTaskLogMessage extends CreateDt { /** diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/ServerNode.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/ServerNode.java index 4495acd94..efbeacee5 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/ServerNode.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/ServerNode.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; import java.time.LocalDateTime; @@ -15,6 +16,7 @@ import java.time.LocalDateTime; */ @Data @TableName("sj_server_node") +@EqualsAndHashCode(callSuper=true) public class ServerNode extends CreateUpdateDt { @TableId(value = "id", type = IdType.AUTO) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/SystemUser.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/SystemUser.java index 6f70b23d4..2759bebb4 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/SystemUser.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/SystemUser.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 系统用户 @@ -13,6 +14,7 @@ import lombok.Data; */ @Data @TableName("sj_system_user") +@EqualsAndHashCode(callSuper=true) public class SystemUser extends CreateUpdateDt { @TableId(value = "id", type = IdType.AUTO) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/SystemUserPermission.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/SystemUserPermission.java index 83999abae..a8af17519 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/SystemUserPermission.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/SystemUserPermission.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 系统用户权限表 @@ -13,6 +14,7 @@ import lombok.Data; */ @Data @TableName("sj_system_user_permission") +@EqualsAndHashCode(callSuper=true) public class SystemUserPermission extends CreateDt { @TableId(value = "id", type = IdType.AUTO) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Workflow.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Workflow.java index b09f3c0b3..104d78022 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Workflow.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Workflow.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; /** * * 工作流 @@ -16,6 +17,7 @@ import lombok.Data; */ @Data @TableName("sj_workflow") +@EqualsAndHashCode(callSuper=true) public class Workflow extends CreateUpdateDt { /** diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/WorkflowNode.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/WorkflowNode.java index 9ec256e10..1ebc1673b 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/WorkflowNode.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/WorkflowNode.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 工作流节点 @@ -13,6 +14,7 @@ import lombok.Data; */ @Data @TableName("sj_workflow_node") +@EqualsAndHashCode(callSuper=true) public class WorkflowNode extends CreateUpdateDt { /** diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/WorkflowTaskBatch.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/WorkflowTaskBatch.java index 52be09b80..cd3426bfe 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/WorkflowTaskBatch.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/WorkflowTaskBatch.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serial; import java.io.Serializable; @@ -18,6 +19,7 @@ import java.time.LocalDateTime; */ @Data @TableName("sj_workflow_task_batch") +@EqualsAndHashCode(callSuper=true) public class WorkflowTaskBatch extends CreateUpdateDt { /** diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/base/PageResult.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/base/PageResult.java index f82371c7e..48e72a56e 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/base/PageResult.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/base/PageResult.java @@ -4,12 +4,14 @@ import com.aizuda.snailjob.common.core.model.Result; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author: opensnail * @date : 2022-02-16 14:07 */ @Data +@EqualsAndHashCode(callSuper = true) @AllArgsConstructor public class PageResult extends Result { diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobLineQueryVo.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobLineQueryVo.java index d24d389b8..3d40ae1e7 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobLineQueryVo.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobLineQueryVo.java @@ -2,8 +2,10 @@ package com.aizuda.snailjob.server.web.model.request; import com.aizuda.snailjob.server.common.enums.SystemModeEnum; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = true) public class JobLineQueryVo extends LineQueryVO { /** * 系统模式 diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/LineQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/LineQueryVO.java index 638b11806..47c3d3ab4 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/LineQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/LineQueryVO.java @@ -2,8 +2,10 @@ package com.aizuda.snailjob.server.web.model.request; import com.aizuda.snailjob.server.web.model.base.BaseQueryVO; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = true) public class LineQueryVO extends BaseQueryVO { /** * 组名称 diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryDeadLetterQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryDeadLetterQueryVO.java index 3305581ee..f99648c69 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryDeadLetterQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryDeadLetterQueryVO.java @@ -2,12 +2,14 @@ package com.aizuda.snailjob.server.web.model.request; import com.aizuda.snailjob.server.web.model.base.BaseQueryVO; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author: opensnail * @date : 2022-02-28 09:45 */ @Data +@EqualsAndHashCode(callSuper = true) public class RetryDeadLetterQueryVO extends BaseQueryVO { private String groupName; private String sceneName; diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskLogMessageQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskLogMessageQueryVO.java index aec461131..339d14459 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskLogMessageQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskLogMessageQueryVO.java @@ -2,12 +2,14 @@ package com.aizuda.snailjob.server.web.model.request; import com.aizuda.snailjob.server.web.model.base.BaseQueryVO; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author: opensnail * @date : 2022-02-28 09:08 */ @Data +@EqualsAndHashCode(callSuper = true) public class RetryTaskLogMessageQueryVO extends BaseQueryVO { private String groupName; diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskLogQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskLogQueryVO.java index ee2974640..a6d39b4e8 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskLogQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskLogQueryVO.java @@ -2,6 +2,7 @@ package com.aizuda.snailjob.server.web.model.request; import com.aizuda.snailjob.server.web.model.base.BaseQueryVO; import lombok.Data; +import lombok.EqualsAndHashCode; import java.time.LocalDateTime; @@ -10,6 +11,7 @@ import java.time.LocalDateTime; * @date : 2022-02-28 09:08 */ @Data +@EqualsAndHashCode(callSuper = true) public class RetryTaskLogQueryVO extends BaseQueryVO { private String groupName; diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskQueryVO.java index 0b59a42a6..02d4ce727 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskQueryVO.java @@ -2,6 +2,7 @@ package com.aizuda.snailjob.server.web.model.request; import com.aizuda.snailjob.server.web.model.base.BaseQueryVO; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author opensnail @@ -9,6 +10,7 @@ import lombok.Data; * @since 2.0 */ @Data +@EqualsAndHashCode(callSuper = true) public class RetryTaskQueryVO extends BaseQueryVO { private String groupName; diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/ServerNodeQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/ServerNodeQueryVO.java index ae27258c0..878a751ae 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/ServerNodeQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/ServerNodeQueryVO.java @@ -2,6 +2,7 @@ package com.aizuda.snailjob.server.web.model.request; import com.aizuda.snailjob.server.web.model.base.BaseQueryVO; import lombok.Data; +import lombok.EqualsAndHashCode; /** @@ -9,6 +10,7 @@ import lombok.Data; * @date : 2021-11-22 13:45 */ @Data +@EqualsAndHashCode(callSuper = true) public class ServerNodeQueryVO extends BaseQueryVO { private String groupName; diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/SystemUserQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/SystemUserQueryVO.java index a5c1642e5..115a6c0b5 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/SystemUserQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/SystemUserQueryVO.java @@ -2,6 +2,7 @@ package com.aizuda.snailjob.server.web.model.request; import com.aizuda.snailjob.server.web.model.base.BaseQueryVO; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author opensnail @@ -9,6 +10,7 @@ import lombok.Data; * @since 2.0 */ @Data +@EqualsAndHashCode(callSuper = true) public class SystemUserQueryVO extends BaseQueryVO { private String username;