From ffcdd8099662209be9b033ce85241a4c2bd2504e Mon Sep 17 00:00:00 2001 From: lijiahang Date: Thu, 16 Jan 2025 10:03:38 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/visor/module/asset/dao/HostDAO.java | 1 + .../visor/module/asset/entity/domain/HostDO.java | 4 ++++ .../module/asset/entity/domain/HostIdentityDO.java | 4 ++++ .../module/asset/entity/domain/HostKeyDO.java | 4 ++++ .../module/asset/entity/dto/HostCacheDTO.java | 3 +++ .../asset/entity/dto/HostIdentityCacheDTO.java | 14 ++++---------- .../module/asset/entity/dto/HostKeyCacheDTO.java | 14 ++++---------- .../entity/request/exec/ExecCommandRequest.java | 2 +- .../entity/request/exec/ExecLogQueryRequest.java | 2 +- .../entity/request/host/HostCreateRequest.java | 4 ++++ .../request/host/HostIdentityCreateRequest.java | 4 ++++ .../request/host/HostIdentityQueryRequest.java | 4 ++++ .../request/host/HostIdentityUpdateRequest.java | 4 ++++ .../entity/request/host/HostKeyCreateRequest.java | 4 ++++ .../entity/request/host/HostKeyQueryRequest.java | 4 ++++ .../entity/request/host/HostKeyUpdateRequest.java | 4 ++++ .../entity/request/host/HostQueryRequest.java | 4 ++++ .../entity/request/host/HostUpdateRequest.java | 4 ++++ .../request/upload/UploadTaskCreateRequest.java | 2 +- .../request/upload/UploadTaskQueryRequest.java | 2 +- .../visor/module/asset/entity/vo/HostBaseVO.java | 3 +++ .../module/asset/entity/vo/HostIdentityVO.java | 9 +++++++++ .../visor/module/asset/entity/vo/HostKeyVO.java | 9 +++++++++ .../visor/module/asset/entity/vo/HostVO.java | 3 +++ .../service/impl/HostIdentityServiceImpl.java | 5 +++-- .../asset/service/impl/HostKeyServiceImpl.java | 1 + .../module/asset/service/impl/HostServiceImpl.java | 7 ++++--- .../main/resources/mapper/HostIdentityMapper.xml | 11 ++++++----- .../src/main/resources/mapper/HostKeyMapper.xml | 11 ++++++----- .../src/main/resources/mapper/HostMapper.xml | 3 ++- 30 files changed, 110 insertions(+), 40 deletions(-) diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostDAO.java index 1d51933b..bb40536c 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostDAO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostDAO.java @@ -50,6 +50,7 @@ public interface HostDAO extends IMapper { HostDO::getAddress, HostDO::getPort, HostDO::getStatus, + HostDO::getDescription, HostDO::getCreateTime, HostDO::getUpdateTime, HostDO::getCreator, 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 6ea8dcbe..f40b9a96 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 @@ -84,4 +84,8 @@ public class HostDO extends BaseDO { @TableField("config") private String config; + @Schema(description = "描述") + @TableField("description") + private String description; + } 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 837f993f..0a17e431 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 @@ -72,4 +72,8 @@ public class HostIdentityDO extends BaseDO { @TableField("key_id") private Long keyId; + @Schema(description = "描述") + @TableField("description") + private String description; + } 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 e83cdba3..ede5fbe5 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 @@ -68,4 +68,8 @@ public class HostKeyDO extends BaseDO { @TableField("password") private String password; + @Schema(description = "描述") + @TableField("description") + private String description; + } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostCacheDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostCacheDTO.java index 5590adf1..a49ddd0c 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostCacheDTO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostCacheDTO.java @@ -69,4 +69,7 @@ public class HostCacheDTO implements LongCacheIdModel, Serializable { @Schema(description = "主机状态") private String status; + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostIdentityCacheDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostIdentityCacheDTO.java index ea5b801e..4cf4f769 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostIdentityCacheDTO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostIdentityCacheDTO.java @@ -61,16 +61,10 @@ public class HostIdentityCacheDTO implements LongCacheIdModel, Serializable { @Schema(description = "密钥id") private Long keyId; - /** - * 资产页面展示 - */ - @Schema(description = "创建时间") + @Schema(description = "描述") + private String description; + + @Schema(description = "创建时间 资产页面展示") private Date createTime; - /** - * 资产页面展示 - */ - @Schema(description = "修改时间") - private Date updateTime; - } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostKeyCacheDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostKeyCacheDTO.java index a9923eb1..049037ca 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostKeyCacheDTO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostKeyCacheDTO.java @@ -52,16 +52,10 @@ public class HostKeyCacheDTO implements LongCacheIdModel, Serializable { @Schema(description = "名称") private String name; - /** - * 资产页面展示 - */ - @Schema(description = "创建时间") + @Schema(description = "描述") + private String description; + + @Schema(description = "创建时间 资产页面展示") private Date createTime; - /** - * 资产页面展示 - */ - @Schema(description = "修改时间") - private Date updateTime; - } 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/ExecCommandRequest.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/ExecCommandRequest.java index 66f1dfe8..660568a5 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/ExecCommandRequest.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/ExecCommandRequest.java @@ -47,7 +47,7 @@ import java.util.List; @Schema(name = "ExecCommandRequest", description = "批量执行命令 请求对象") public class ExecCommandRequest { - @Size(max = 128) + @Size(max = 255) @Schema(description = "执行描述") private String description; 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 5856dab0..56374fea 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 @@ -66,7 +66,7 @@ public class ExecLogQueryRequest extends PageRequest { @Schema(description = "执行方式") private String execMode; - @Size(max = 128) + @Size(max = 255) @Schema(description = "执行描述") private String description; 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 42a21b80..23bf9166 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 @@ -85,4 +85,8 @@ public class HostCreateRequest implements Serializable { @Schema(description = "tags") private List tags; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } 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/HostIdentityCreateRequest.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/HostIdentityCreateRequest.java index 1b30d977..9404b4ca 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/HostIdentityCreateRequest.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/HostIdentityCreateRequest.java @@ -69,4 +69,8 @@ public class HostIdentityCreateRequest implements Serializable { @Schema(description = "密钥id") private Long keyId; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } 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 3c473b78..eb6b33eb 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 @@ -64,4 +64,8 @@ public class HostIdentityQueryRequest extends PageRequest { @Schema(description = "密钥id") private Long keyId; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } 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/HostIdentityUpdateRequest.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/HostIdentityUpdateRequest.java index 037a946d..ad83db8a 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/HostIdentityUpdateRequest.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/HostIdentityUpdateRequest.java @@ -77,4 +77,8 @@ public class HostIdentityUpdateRequest implements UpdatePasswordAction { @Schema(description = "是否使用新密码") private Boolean useNewPassword; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } 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/HostKeyCreateRequest.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/HostKeyCreateRequest.java index f4ec71cd..35e3edd2 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/HostKeyCreateRequest.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/HostKeyCreateRequest.java @@ -65,4 +65,8 @@ public class HostKeyCreateRequest implements Serializable { @Schema(description = "密码") private String password; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } 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 4bb70c5c..8443a2d0 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 @@ -53,4 +53,8 @@ public class HostKeyQueryRequest extends PageRequest { @Schema(description = "名称") private String name; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } 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/HostKeyUpdateRequest.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/HostKeyUpdateRequest.java index 79580606..4721b941 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/HostKeyUpdateRequest.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/HostKeyUpdateRequest.java @@ -73,4 +73,8 @@ public class HostKeyUpdateRequest implements UpdatePasswordAction { @Schema(description = "是否使用新密码") private Boolean useNewPassword; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } 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 f673e054..57ebf050 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 @@ -77,6 +77,10 @@ public class HostQueryRequest extends PageRequest { @Schema(description = "tag") private List tags; + @Size(max = 255) + @Schema(description = "描述") + private String description; + @Schema(description = "是否查询 tag 信息") private Boolean queryTag; 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 23ae2c20..0414b028 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 @@ -83,4 +83,8 @@ public class HostUpdateRequest implements Serializable { @Schema(description = "tags") private List tags; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } 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/UploadTaskCreateRequest.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/UploadTaskCreateRequest.java index 67a791c5..ca6111fa 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/UploadTaskCreateRequest.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/UploadTaskCreateRequest.java @@ -56,7 +56,7 @@ public class UploadTaskCreateRequest implements Serializable { @Schema(description = "远程路径") private String remotePath; - @Size(max = 128) + @Size(max = 255) @Schema(description = "描述") private String description; 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 e578975a..80006255 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 @@ -51,7 +51,7 @@ public class UploadTaskQueryRequest extends PageRequest { @Schema(description = "用户id") private Long userId; - @Size(max = 128) + @Size(max = 255) @Schema(description = "描述") private String description; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostBaseVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostBaseVO.java index d6c0de63..ab59528c 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostBaseVO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostBaseVO.java @@ -64,4 +64,7 @@ public class HostBaseVO implements Serializable { @Schema(description = "主机端口") private Integer port; + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostIdentityVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostIdentityVO.java index 63e49335..384154d6 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostIdentityVO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostIdentityVO.java @@ -65,10 +65,19 @@ public class HostIdentityVO implements Serializable { @Schema(description = "密钥名称") private String keyName; + @Schema(description = "描述") + private String description; + @Schema(description = "创建时间") private Date createTime; @Schema(description = "修改时间") private Date updateTime; + @Schema(description = "创建人") + private String creator; + + @Schema(description = "修改人") + private String updater; + } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostKeyVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostKeyVO.java index f2152faa..baeaea41 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostKeyVO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostKeyVO.java @@ -59,10 +59,19 @@ public class HostKeyVO implements Serializable { @Schema(description = "私钥文本") private String privateKey; + @Schema(description = "描述") + private String description; + @Schema(description = "创建时间") private Date createTime; @Schema(description = "修改时间") private Date updateTime; + @Schema(description = "创建人") + private String creator; + + @Schema(description = "修改人") + private String updater; + } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostVO.java index fc6df963..560b9abe 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostVO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostVO.java @@ -74,6 +74,9 @@ public class HostVO implements Serializable { @Schema(description = "主机状态") private String status; + @Schema(description = "描述") + private String description; + @Schema(description = "创建时间") private Date createTime; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java index d03705c0..9962d945 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java @@ -295,10 +295,11 @@ public class HostIdentityServiceImpl implements HostIdentityService { String searchValue = request.getSearchValue(); return hostIdentityDAO.wrapper() .eq(HostIdentityDO::getId, request.getId()) - .like(HostIdentityDO::getName, request.getName()) .eq(HostIdentityDO::getType, request.getType()) - .like(HostIdentityDO::getUsername, request.getUsername()) .eq(HostIdentityDO::getKeyId, request.getKeyId()) + .like(HostIdentityDO::getName, request.getName()) + .like(HostIdentityDO::getUsername, request.getUsername()) + .like(HostIdentityDO::getDescription, request.getDescription()) .and(Strings.isNotEmpty(searchValue), c -> c .eq(HostIdentityDO::getId, searchValue).or() .like(HostIdentityDO::getName, searchValue).or() diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java index 8a0d8b76..f09ad180 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java @@ -254,6 +254,7 @@ public class HostKeyServiceImpl implements HostKeyService { return hostKeyDAO.wrapper() .eq(HostKeyDO::getId, request.getId()) .like(HostKeyDO::getName, request.getName()) + .like(HostKeyDO::getDescription, request.getDescription()) .and(Strings.isNotEmpty(searchValue), c -> c .eq(HostKeyDO::getId, searchValue).or() .like(HostKeyDO::getName, searchValue) diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java index 2c8c7454..d21992db 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java @@ -404,12 +404,13 @@ public class HostServiceImpl implements HostService { } // 基础条件 wrapper.eq(HostDO::getId, request.getId()) - .like(HostDO::getName, request.getName()) - .like(HostDO::getCode, request.getCode()) - .like(HostDO::getAddress, request.getAddress()) .eq(HostDO::getStatus, request.getStatus()) .eq(HostDO::getType, request.getType()) .eq(HostDO::getOsType, request.getOsType()) + .like(HostDO::getName, request.getName()) + .like(HostDO::getCode, request.getCode()) + .like(HostDO::getAddress, request.getAddress()) + .like(HostDO::getDescription, request.getDescription()) .and(Strings.isNotEmpty(searchValue), c -> c .eq(HostDO::getId, searchValue).or() .like(HostDO::getName, searchValue).or() diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml index a69ca9f9..69393b15 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml @@ -5,20 +5,21 @@ + + + + + - - - - - id, name, username, password, key_id, create_time, update_time, creator, updater, deleted + id, name, username, password, key_id, description, create_time, update_time, creator, updater, deleted diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostKeyMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostKeyMapper.xml index 8bf10dd6..539a22e2 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostKeyMapper.xml +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostKeyMapper.xml @@ -5,20 +5,21 @@ + + + + + - - - - - id, name, public_key, private_key, password, create_time, update_time, creator, updater, deleted + id, name, public_key, private_key, password, description, create_time, update_time, creator, updater, deleted diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostMapper.xml index a1f75c3f..f909461b 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostMapper.xml +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostMapper.xml @@ -13,6 +13,7 @@ + @@ -22,7 +23,7 @@ - id, type, os_type, name, code, address, port, status, config, create_time, update_time, creator, updater, deleted + id, type, os_type, name, code, address, port, status, config, description, create_time, update_time, creator, updater, deleted