From 94c0b6a785c936622ceba4b8c33c09315c36b520 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Wed, 19 Mar 2025 23:24:08 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...PageRequest.java => BaseQueryRequest.java} | 9 +++-- .../visor/common/entity/IOrderRequest.java | 19 ++++++++++ .../visor/common/entity/IPageRequest.java | 26 ++++++++++++++ .../framework/mybatis/core/domain/BaseDO.java | 16 ++++++--- .../mybatis/core/query/DataQuery.java | 35 ++++++++++++++----- .../asset/entity/domain/CommandSnippetDO.java | 14 ++++---- .../asset/entity/domain/ExecHostLogDO.java | 14 ++++---- .../module/asset/entity/domain/ExecJobDO.java | 14 ++++---- .../asset/entity/domain/ExecJobHostDO.java | 14 ++++---- .../module/asset/entity/domain/ExecLogDO.java | 14 ++++---- .../asset/entity/domain/ExecTemplateDO.java | 14 ++++---- .../entity/domain/ExecTemplateHostDO.java | 14 ++++---- .../module/asset/entity/domain/HostDO.java | 14 ++++---- .../asset/entity/domain/HostIdentityDO.java | 14 ++++---- .../module/asset/entity/domain/HostKeyDO.java | 14 ++++---- .../asset/entity/domain/PathBookmarkDO.java | 14 ++++---- .../entity/domain/TerminalConnectLogDO.java | 14 ++++---- .../asset/entity/domain/UploadTaskDO.java | 14 ++++---- .../asset/entity/domain/UploadTaskFileDO.java | 14 ++++---- .../request/exec/ExecJobQueryRequest.java | 4 +-- .../exec/ExecJobUpdateExecUserRequest.java | 4 +-- .../request/exec/ExecLogQueryRequest.java | 4 +-- .../exec/ExecTemplateQueryRequest.java | 4 +-- .../request/host/HostCreateRequest.java | 8 +++-- .../host/HostIdentityQueryRequest.java | 4 +-- .../request/host/HostKeyQueryRequest.java | 4 +-- .../entity/request/host/HostQueryRequest.java | 4 +-- .../request/host/HostUpdateRequest.java | 3 +- .../host/TerminalConnectLogQueryRequest.java | 4 +-- .../host/TerminalSftpLogQueryRequest.java | 4 +-- .../upload/UploadTaskQueryRequest.java | 4 +-- .../dto/operator/OperatorLogQueryDTO.java | 4 +-- .../infra/entity/domain/DataExtraDO.java | 14 ++++---- .../infra/entity/domain/DataGroupDO.java | 14 ++++---- .../infra/entity/domain/DataGroupRelDO.java | 14 ++++---- .../infra/entity/domain/DataPermissionDO.java | 14 ++++---- .../module/infra/entity/domain/DictKeyDO.java | 14 ++++---- .../infra/entity/domain/DictValueDO.java | 14 ++++---- .../infra/entity/domain/FavoriteDO.java | 14 ++++---- .../infra/entity/domain/HistoryValueDO.java | 14 ++++---- .../infra/entity/domain/OperatorLogDO.java | 14 ++++---- .../infra/entity/domain/PreferenceDO.java | 14 ++++---- .../infra/entity/domain/SystemMenuDO.java | 14 ++++---- .../infra/entity/domain/SystemMessageDO.java | 14 ++++---- .../infra/entity/domain/SystemRoleDO.java | 14 ++++---- .../infra/entity/domain/SystemRoleMenuDO.java | 14 ++++---- .../infra/entity/domain/SystemSettingDO.java | 14 ++++---- .../infra/entity/domain/SystemUserDO.java | 14 ++++---- .../infra/entity/domain/SystemUserRoleDO.java | 14 ++++---- .../module/infra/entity/domain/TagDO.java | 14 ++++---- .../module/infra/entity/domain/TagRelDO.java | 14 ++++---- .../request/dict/DictKeyQueryRequest.java | 4 +-- .../request/dict/DictValueQueryRequest.java | 4 +-- .../favorite/FavoriteQueryRequest.java | 4 +-- .../history/HistoryValueQueryRequest.java | 4 +-- .../message/SystemMessageQueryRequest.java | 4 +-- .../operator/OperatorLogQueryRequest.java | 4 +-- .../request/role/SystemRoleQueryRequest.java | 4 +-- .../entity/request/tag/TagQueryRequest.java | 4 +-- .../request/tag/TagRelQueryRequest.java | 4 +-- .../request/user/SystemUserQueryRequest.java | 4 +-- 61 files changed, 338 insertions(+), 324 deletions(-) rename orion-visor-common/src/main/java/org/dromara/visor/common/entity/{PageRequest.java => BaseQueryRequest.java} (86%) create mode 100644 orion-visor-common/src/main/java/org/dromara/visor/common/entity/IOrderRequest.java create mode 100644 orion-visor-common/src/main/java/org/dromara/visor/common/entity/IPageRequest.java diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/entity/PageRequest.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/BaseQueryRequest.java similarity index 86% rename from orion-visor-common/src/main/java/org/dromara/visor/common/entity/PageRequest.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/BaseQueryRequest.java index 409cb4dc..4e62520b 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/entity/PageRequest.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/BaseQueryRequest.java @@ -31,15 +31,15 @@ import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; /** - * 公共页码请求 + * 基本查询请求 * * @author Jiahang Li * @version 1.0.0 * @since 2023/7/12 23:14 */ @Data -@Schema(name = "PageRequest", description = "公共页码请求") -public class PageRequest { +@Schema(name = "BaseQueryRequest", description = "基本查询请求") +public class BaseQueryRequest implements IPageRequest, IOrderRequest { @NotNull(groups = Page.class) @Min(value = 1, groups = Page.class) @@ -53,4 +53,7 @@ public class PageRequest { @Schema(description = "大小") private Integer limit; + @Schema(description = "查询排序") + private Integer order; + } diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/entity/IOrderRequest.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/IOrderRequest.java new file mode 100644 index 00000000..07ad3a43 --- /dev/null +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/IOrderRequest.java @@ -0,0 +1,19 @@ +package org.dromara.visor.common.entity; + +/** + * 查询排序请求 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/3/17 22:04 + */ +public interface IOrderRequest { + + /** + * 查询排序 + * + * @return sort 0DESC 1ASC 其他不排序 + */ + Integer getOrder(); + +} diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/entity/IPageRequest.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/IPageRequest.java new file mode 100644 index 00000000..2aa76059 --- /dev/null +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/IPageRequest.java @@ -0,0 +1,26 @@ +package org.dromara.visor.common.entity; + +/** + * 页码请求 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/3/17 22:02 + */ +public interface IPageRequest { + + /** + * 页码 + * + * @return page + */ + Integer getPage(); + + /** + * 大小 + * + * @return limit + */ + Integer getLimit(); + +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/domain/BaseDO.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/domain/BaseDO.java index f34eb502..e15ccd3e 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/domain/BaseDO.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/domain/BaseDO.java @@ -22,11 +22,12 @@ */ package org.dromara.visor.framework.mybatis.core.domain; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.apache.ibatis.type.JdbcType; import org.dromara.visor.common.constant.Const; @@ -41,10 +42,17 @@ import java.util.Date; * @since 2023/6/23 18:42 */ @Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor public class BaseDO implements Serializable { private static final long serialVersionUID = 1L; + @Schema(description = "id") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + @Schema(description = "创建时间") @TableField(fill = FieldFill.INSERT) private Date createTime; @@ -70,4 +78,4 @@ public class BaseDO implements Serializable { @TableField(fill = FieldFill.INSERT, jdbcType = JdbcType.TINYINT) private Boolean deleted; -} +} \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java index aa52f133..cb175fba 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java @@ -23,7 +23,6 @@ package org.dromara.visor.framework.mybatis.core.query; import cn.orionsec.kit.lang.define.wrapper.DataGrid; -import cn.orionsec.kit.lang.define.wrapper.IPageRequest; import cn.orionsec.kit.lang.define.wrapper.PageRequest; import cn.orionsec.kit.lang.define.wrapper.Pager; import cn.orionsec.kit.lang.utils.Exceptions; @@ -33,11 +32,16 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.reflect.Classes; import cn.orionsec.kit.spring.SpringHolder; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.interfaces.Func; import com.baomidou.mybatisplus.core.conditions.interfaces.Join; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.entity.IOrderRequest; +import org.dromara.visor.common.entity.IPageRequest; +import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.common.utils.SqlUtils; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; @@ -96,9 +100,9 @@ public class DataQuery { return new DataQuery<>(dao, wrapper); } - public DataQuery page(org.dromara.visor.common.entity.PageRequest page) { - org.dromara.visor.common.entity.PageRequest pr = Valid.notNull(page, "page is null"); - this.page = new PageRequest(pr.getPage(), pr.getLimit()); + public DataQuery page(IPageRequest request) { + Valid.notNull(request, "page is null"); + this.page = new PageRequest(request.getPage(), request.getLimit()); return this; } @@ -130,15 +134,30 @@ public class DataQuery { return then; } - public DataQuery limit(IPageRequest page) { - return this.last(Pager.of(page).getSql()); + public DataQuery order(IOrderRequest request, SFunction column) { + BooleanBit sorted = BooleanBit.of(request.getOrder()); + if (sorted == null) { + return this; + } + return this.order(sorted.booleanValue(), column); } - public DataQuery limit(int limit) { + @SuppressWarnings("unchecked") + public DataQuery order(boolean asc, SFunction column) { + // 设置排序 + if (wrapper instanceof Func) { + ((Func>) wrapper).orderBy(true, asc, column); + return this; + } else { + throw Exceptions.argument("wrapper not implements Func"); + } + } + + public DataQuery limit(Number limit) { return this.last(SqlUtils.limit(limit)); } - public DataQuery limit(int offset, int limit) { + public DataQuery limit(Number offset, Number limit) { return this.last(SqlUtils.limit(offset, limit)); } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/CommandSnippetDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/CommandSnippetDO.java index 6ce0e701..7cb2070b 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/CommandSnippetDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/CommandSnippetDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.asset.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2024-1-22 15:28 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class CommandSnippetDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "用户id") @TableField("user_id") private Long userId; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecHostLogDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecHostLogDO.java index 1ade886e..c28f48ac 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecHostLogDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecHostLogDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.asset.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; @@ -40,7 +42,7 @@ import java.util.Date; * @since 2024-3-11 14:05 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -50,10 +52,6 @@ public class ExecHostLogDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "执行日志id") @TableField("log_id") private Long logId; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobDO.java index 4fe31ee8..06b7e6cd 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.asset.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2024-3-28 12:03 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class ExecJobDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "任务名称") @TableField("name") private String name; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobHostDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobHostDO.java index 88d61755..83d62a66 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobHostDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobHostDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.asset.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2024-3-28 12:03 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class ExecJobHostDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "任务id") @TableField("job_id") private Long jobId; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecLogDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecLogDO.java index 586b0651..528044ac 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecLogDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecLogDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.asset.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; @@ -40,7 +42,7 @@ import java.util.Date; * @since 2024-3-11 11:31 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -50,10 +52,6 @@ public class ExecLogDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "执行用户id") @TableField("user_id") private Long userId; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateDO.java index 1903a9dc..af1dcdb9 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.asset.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2024-3-7 18:08 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class ExecTemplateDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "名称") @TableField("name") private String name; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateHostDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateHostDO.java index 6c1f12be..5e11ed4d 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateHostDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateHostDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.asset.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2024-4-22 12:13 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class ExecTemplateHostDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "模板id") @TableField("template_id") private Long templateId; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostDO.java index f40b9a96..0bb142e5 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.asset.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-9-11 14:16 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class HostDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "主机类型") @TableField("type") private String type; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostIdentityDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostIdentityDO.java index 0a17e431..9b2198cb 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostIdentityDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostIdentityDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.asset.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-9-20 11:55 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class HostIdentityDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "名称") @TableField("name") private String name; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostKeyDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostKeyDO.java index ede5fbe5..82465138 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostKeyDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostKeyDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.asset.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-9-20 11:55 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class HostKeyDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "名称") @TableField("name") private String name; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/PathBookmarkDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/PathBookmarkDO.java index 4c48f942..91348aba 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/PathBookmarkDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/PathBookmarkDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.asset.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2024-4-23 23:15 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class PathBookmarkDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "用户id") @TableField("user_id") private Long userId; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java index 4091e219..cdf161fb 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.asset.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; @@ -40,7 +42,7 @@ import java.util.Date; * @since 2023-12-26 22:09 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -50,10 +52,6 @@ public class TerminalConnectLogDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "用户id") @TableField("user_id") private Long userId; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskDO.java index 42b1b183..12bd4015 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.asset.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; @@ -40,7 +42,7 @@ import java.util.Date; * @since 2024-5-7 22:15 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -50,10 +52,6 @@ public class UploadTaskDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "用户id") @TableField("user_id") private Long userId; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskFileDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskFileDO.java index 2b76fc81..c696430e 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskFileDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskFileDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.asset.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; @@ -40,7 +42,7 @@ import java.util.Date; * @since 2024-5-8 10:31 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -50,10 +52,6 @@ public class UploadTaskFileDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "用户id") @TableField("task_id") private Long taskId; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java index 93c6efcf..647fb7b4 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; @@ -41,7 +41,7 @@ import javax.validation.constraints.Size; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "ExecJobQueryRequest", description = "计划任务 查询请求对象") -public class ExecJobQueryRequest extends PageRequest { +public class ExecJobQueryRequest extends BaseQueryRequest { @Schema(description = "id") private Long id; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateExecUserRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateExecUserRequest.java index fdc4d096..3c55bb04 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateExecUserRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateExecUserRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.NotNull; @@ -41,7 +41,7 @@ import javax.validation.constraints.NotNull; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "ExecJobUpdateExecUserRequest", description = "修改计划任务执行用户 查询请求对象") -public class ExecJobUpdateExecUserRequest extends PageRequest { +public class ExecJobUpdateExecUserRequest extends BaseQueryRequest { @NotNull @Schema(description = "id") diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java index 56374fea..74e4bf42 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.exec; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; import java.util.Date; @@ -44,7 +44,7 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "ExecLogQueryRequest", description = "批量执行日志 查询请求对象") -public class ExecLogQueryRequest extends PageRequest { +public class ExecLogQueryRequest extends BaseQueryRequest { @Schema(description = "id") private Long id; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java index 6ea0d6cf..3eea84ce 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; @@ -41,7 +41,7 @@ import javax.validation.constraints.Size; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "ExecTemplateQueryRequest", description = "执行模板 查询请求对象") -public class ExecTemplateQueryRequest extends PageRequest { +public class ExecTemplateQueryRequest extends BaseQueryRequest { @Schema(description = "id") private Long id; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java index dd0c77a2..2c49abce 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java @@ -28,7 +28,10 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.*; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; import java.io.Serializable; import java.util.List; @@ -75,7 +78,8 @@ public class HostCreateRequest implements Serializable { @Schema(description = "主机端口") private Integer port; - @NotEmpty + // TODO + // @NotEmpty @Schema(description = "主机分组") private List groupIdList; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java index eb6b33eb..27c40e1d 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; @@ -41,7 +41,7 @@ import javax.validation.constraints.Size; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "HostIdentityQueryRequest", description = "主机身份 查询请求对象") -public class HostIdentityQueryRequest extends PageRequest { +public class HostIdentityQueryRequest extends BaseQueryRequest { @Schema(description = "搜索") private String searchValue; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java index 8443a2d0..71926d19 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; @@ -41,7 +41,7 @@ import javax.validation.constraints.Size; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "HostKeyQueryRequest", description = "主机密钥 查询请求对象") -public class HostKeyQueryRequest extends PageRequest { +public class HostKeyQueryRequest extends BaseQueryRequest { @Schema(description = "搜索") private String searchValue; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java index 57ebf050..96310e48 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; import java.util.List; @@ -42,7 +42,7 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "HostQueryRequest", description = "主机 查询请求对象") -public class HostQueryRequest extends PageRequest { +public class HostQueryRequest extends BaseQueryRequest { @Schema(description = "搜索") private String searchValue; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java index 2494db6b..db417385 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java @@ -76,7 +76,8 @@ public class HostUpdateRequest implements Serializable { @Schema(description = "主机端口") private Integer port; - @NotEmpty + // TODO + // @NotEmpty @Schema(description = "主机分组") private List groupIdList; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java index 3da046a9..ea6c152b 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.host; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import org.dromara.visor.common.validator.group.Id; import javax.validation.constraints.NotNull; @@ -46,7 +46,7 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "TerminalConnectLogQueryRequest", description = "终端连接日志 查询请求对象") -public class TerminalConnectLogQueryRequest extends PageRequest { +public class TerminalConnectLogQueryRequest extends BaseQueryRequest { @NotNull(groups = Id.class) @Schema(description = "id") diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java index b66aa514..0d89b8b5 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.host; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; import java.util.Date; @@ -43,7 +43,7 @@ import java.util.Date; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "TerminalSftpLogQueryRequest", description = "SFTP 操作日志 查询请求对象") -public class TerminalSftpLogQueryRequest extends PageRequest { +public class TerminalSftpLogQueryRequest extends BaseQueryRequest { @Schema(description = "用户id") private Long userId; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java index 80006255..65906b4b 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.upload; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; import java.util.Date; @@ -43,7 +43,7 @@ import java.util.Date; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "UploadTaskQueryRequest", description = "上传任务 查询请求对象") -public class UploadTaskQueryRequest extends PageRequest { +public class UploadTaskQueryRequest extends BaseQueryRequest { @Schema(description = "id") private Long id; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java index e134b8d6..79d5eae3 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.dto.operator; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; import java.util.Date; @@ -43,7 +43,7 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "OperatorLogQueryDTO", description = "操作日志 查询对象") -public class OperatorLogQueryDTO extends PageRequest { +public class OperatorLogQueryDTO extends BaseQueryRequest { private static final long serialVersionUID = 1L; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataExtraDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataExtraDO.java index 347cc2e5..5aac313d 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataExtraDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataExtraDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-12-19 18:05 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class DataExtraDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "用户id") @TableField("user_id") private Long userId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupDO.java index 79c2298c..fff4bab9 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-11-7 18:44 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class DataGroupDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "父id") @TableField("parent_id") private Long parentId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupRelDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupRelDO.java index d0bcc066..a66ca8a7 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupRelDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupRelDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-11-7 18:44 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class DataGroupRelDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "组id") @TableField("group_id") private Long groupId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataPermissionDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataPermissionDO.java index fd168d45..ecc7ed6f 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataPermissionDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataPermissionDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-11-21 10:32 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class DataPermissionDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "用户id") @TableField("user_id") private Long userId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictKeyDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictKeyDO.java index 6849f4b3..dbfe5346 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictKeyDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictKeyDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-10-16 16:33 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class DictKeyDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "配置项") @TableField("key_name") private String keyName; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictValueDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictValueDO.java index 72eace7e..0ce54f7f 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictValueDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictValueDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-10-16 16:33 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class DictValueDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "配置项id") @TableField("key_id") private Long keyId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/FavoriteDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/FavoriteDO.java index 881be220..964275a4 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/FavoriteDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/FavoriteDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-9-1 10:30 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class FavoriteDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "用户id") @TableField("user_id") private Long userId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/HistoryValueDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/HistoryValueDO.java index 164432cb..74498712 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/HistoryValueDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/HistoryValueDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; @@ -40,7 +42,7 @@ import java.util.Date; * @since 2023-10-16 16:33 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -50,10 +52,6 @@ public class HistoryValueDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "引用id") @TableField("rel_id") private Long relId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/OperatorLogDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/OperatorLogDO.java index 4d0e0321..d4765bce 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/OperatorLogDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/OperatorLogDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; @@ -40,7 +42,7 @@ import java.util.Date; * @since 2023-10-10 17:08 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -50,10 +52,6 @@ public class OperatorLogDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "用户id") @TableField("user_id") private Long userId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/PreferenceDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/PreferenceDO.java index e3999d78..044aba32 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/PreferenceDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/PreferenceDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-9-27 18:37 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class PreferenceDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "用户id") @TableField("user_id") private Long userId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMenuDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMenuDO.java index 574a247e..580d8b68 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMenuDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMenuDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-7-18 10:18 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class SystemMenuDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "父id") @TableField("parent_id") private Long parentId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMessageDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMessageDO.java index 57c1f8bd..bde43519 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMessageDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMessageDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2024-5-11 16:29 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class SystemMessageDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "消息分类") @TableField("classify") private String classify; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java index 127147f1..7010e212 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-7-16 01:19 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class SystemRoleDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "角色名称") @TableField("name") private String name; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleMenuDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleMenuDO.java index e3117bdc..2a732984 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleMenuDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleMenuDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-7-16 01:19 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class SystemRoleMenuDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "角色id") @TableField("role_id") private Long roleId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemSettingDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemSettingDO.java index ff69a4e7..6e21c979 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemSettingDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemSettingDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2024-9-27 18:52 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class SystemSettingDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "配置类型") @TableField("type") private String type; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java index f35c5e03..c7961d97 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; @@ -40,7 +42,7 @@ import java.util.Date; * @since 2023-7-13 18:42 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -50,10 +52,6 @@ public class SystemUserDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "用户名") @TableField("username") private String username; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserRoleDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserRoleDO.java index decec154..f06ec997 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserRoleDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserRoleDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-7-16 01:19 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class SystemUserRoleDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "用户id") @TableField("user_id") private Long userId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagDO.java index bad77fcc..c14fed42 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-9-5 11:58 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class TagDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "标签名称") @TableField("name") private String name; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagRelDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagRelDO.java index 7481e7a1..de44caaf 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagRelDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagRelDO.java @@ -22,12 +22,14 @@ */ package org.dromara.visor.module.infra.entity.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** @@ -38,7 +40,7 @@ import org.dromara.visor.framework.mybatis.core.domain.BaseDO; * @since 2023-9-6 16:54 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,10 +50,6 @@ public class TagRelDO extends BaseDO { private static final long serialVersionUID = 1L; - @Schema(description = "id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @Schema(description = "标签id") @TableField("tag_id") private Long tagId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java index f0032e36..9117047b 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; @@ -41,7 +41,7 @@ import javax.validation.constraints.Size; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "DictKeyQueryRequest", description = "字典配置项 查询请求对象") -public class DictKeyQueryRequest extends PageRequest { +public class DictKeyQueryRequest extends BaseQueryRequest { @Schema(description = "搜索") private String searchValue; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java index c36aeba1..92710839 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; @@ -41,7 +41,7 @@ import javax.validation.constraints.Size; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "DictValueQueryRequest", description = "字典配置值 查询请求对象") -public class DictValueQueryRequest extends PageRequest { +public class DictValueQueryRequest extends BaseQueryRequest { @Schema(description = "配置项id") private Long keyId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java index d95a81ae..083a1e04 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.favorite; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; /** * 收藏 查询请求对象 @@ -39,7 +39,7 @@ import org.dromara.visor.common.entity.PageRequest; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "FavoriteQueryRequest", description = "收藏 查询请求对象") -public class FavoriteQueryRequest extends PageRequest { +public class FavoriteQueryRequest extends BaseQueryRequest { @Schema(description = "用户id") private Long userId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java index fef7d424..a0d51987 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.history; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -43,7 +43,7 @@ import javax.validation.constraints.Size; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "HistoryValueQueryRequest", description = "历史归档 查询请求对象") -public class HistoryValueQueryRequest extends PageRequest { +public class HistoryValueQueryRequest extends BaseQueryRequest { @NotNull @Schema(description = "引用id") diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java index 2d7fb580..f7769360 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.message; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; /** * 系统消息 查询请求对象 @@ -39,7 +39,7 @@ import org.dromara.visor.common.entity.PageRequest; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "SystemMessageQueryRequest", description = "系统消息 查询请求对象") -public class SystemMessageQueryRequest extends PageRequest { +public class SystemMessageQueryRequest extends BaseQueryRequest { @Schema(description = "maxId") private Long maxId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java index 50a3df60..f3b76d64 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.entity.request.operator; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; import java.util.Date; @@ -43,7 +43,7 @@ import java.util.Date; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "OperatorLogQueryRequest", description = "操作日志 查询请求对象") -public class OperatorLogQueryRequest extends PageRequest { +public class OperatorLogQueryRequest extends BaseQueryRequest { @Schema(description = "用户id") private Long userId; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java index db62934d..8e8c2ab1 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; @@ -41,7 +41,7 @@ import javax.validation.constraints.Size; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "SystemRoleQueryRequest", description = "角色 查询请求对象") -public class SystemRoleQueryRequest extends PageRequest { +public class SystemRoleQueryRequest extends BaseQueryRequest { @Schema(description = "id") private Long id; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java index 85999e24..1b539700 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.tag; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; @@ -41,7 +41,7 @@ import javax.validation.constraints.Size; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "TagQueryRequest", description = "标签枚举 查询请求对象") -public class TagQueryRequest extends PageRequest { +public class TagQueryRequest extends BaseQueryRequest { @Size(max = 12) @Schema(description = "标签类型") diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java index 7ae30530..2e4a28c1 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.tag; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; import java.util.Collection; @@ -42,7 +42,7 @@ import java.util.Collection; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "TagRelQueryRequest", description = "标签引用 查询请求对象") -public class TagRelQueryRequest extends PageRequest { +public class TagRelQueryRequest extends BaseQueryRequest { @Schema(description = "id") private Long id; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java index 4ad28f12..d31b30a5 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.common.entity.BaseQueryRequest; import javax.validation.constraints.Size; @@ -41,7 +41,7 @@ import javax.validation.constraints.Size; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Schema(name = "SystemUserQueryRequest", description = "用户 查询请求对象") -public class SystemUserQueryRequest extends PageRequest { +public class SystemUserQueryRequest extends BaseQueryRequest { @Schema(description = "id") private Long id;