manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔨 添加描述字段.

Browse Source
This commit is contained in:
lijiahang
2025-01-16 10:03:38 +08:00
parent f804dc0338
commit ffcdd80996
30 changed files with 110 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostDAO.java
View File

@@ -50,6 +50,7 @@ public interface HostDAO extends IMapper<HostDO> {
HostDO::getAddress,
HostDO::getPort,
HostDO::getStatus,
HostDO::getDescription,
HostDO::getCreateTime,
HostDO::getUpdateTime,
HostDO::getCreator,

4
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostDO.java
View File

@@ -84,4 +84,8 @@ public class HostDO extends BaseDO {
@TableField("config")
private String config;
@Schema(description = "描述")
@TableField("description")
private String description;
}

4
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostIdentityDO.java
View File

@@ -72,4 +72,8 @@ public class HostIdentityDO extends BaseDO {
@TableField("key_id")
private Long keyId;
@Schema(description = "描述")
@TableField("description")
private String description;
}

4
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostKeyDO.java
View File

@@ -68,4 +68,8 @@ public class HostKeyDO extends BaseDO {
@TableField("password")
private String password;
@Schema(description = "描述")
@TableField("description")
private String description;
}

3
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostCacheDTO.java
View File

@@ -69,4 +69,7 @@ public class HostCacheDTO implements LongCacheIdModel, Serializable {
@Schema(description = "主机状态")
private String status;
@Schema(description = "描述")
private String description;
}

14
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostIdentityCacheDTO.java
View File

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

14
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostKeyCacheDTO.java
View File

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

2
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
View File

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

2
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
View File

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

4
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
View File

@@ -85,4 +85,8 @@ public class HostCreateRequest implements Serializable {
@Schema(description = "tags")
private List<Long> tags;
@Size(max = 255)
@Schema(description = "描述")
private String description;
}

4
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
View File

@@ -69,4 +69,8 @@ public class HostIdentityCreateRequest implements Serializable {
@Schema(description = "密钥id")
private Long keyId;
@Size(max = 255)
@Schema(description = "描述")
private String description;
}

4
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
View File

@@ -64,4 +64,8 @@ public class HostIdentityQueryRequest extends PageRequest {
@Schema(description = "密钥id")
private Long keyId;
@Size(max = 255)
@Schema(description = "描述")
private String description;
}

4
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
View File

@@ -77,4 +77,8 @@ public class HostIdentityUpdateRequest implements UpdatePasswordAction {
@Schema(description = "是否使用新密码")
private Boolean useNewPassword;
@Size(max = 255)
@Schema(description = "描述")
private String description;
}

4
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
View File

@@ -65,4 +65,8 @@ public class HostKeyCreateRequest implements Serializable {
@Schema(description = "密码")
private String password;
@Size(max = 255)
@Schema(description = "描述")
private String description;
}

4
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
View File

@@ -53,4 +53,8 @@ public class HostKeyQueryRequest extends PageRequest {
@Schema(description = "名称")
private String name;
@Size(max = 255)
@Schema(description = "描述")
private String description;
}

4
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
View File

@@ -73,4 +73,8 @@ public class HostKeyUpdateRequest implements UpdatePasswordAction {
@Schema(description = "是否使用新密码")
private Boolean useNewPassword;
@Size(max = 255)
@Schema(description = "描述")
private String description;
}

4
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
View File

@@ -77,6 +77,10 @@ public class HostQueryRequest extends PageRequest {
@Schema(description = "tag")
private List<Long> tags;
@Size(max = 255)
@Schema(description = "描述")
private String description;
@Schema(description = "是否查询 tag 信息")
private Boolean queryTag;

4
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
View File

@@ -83,4 +83,8 @@ public class HostUpdateRequest implements Serializable {
@Schema(description = "tags")
private List<Long> tags;
@Size(max = 255)
@Schema(description = "描述")
private String description;
}

2
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
View File

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

2
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
View File

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

3
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostBaseVO.java
View File

@@ -64,4 +64,7 @@ public class HostBaseVO implements Serializable {
@Schema(description = "主机端口")
private Integer port;
@Schema(description = "描述")
private String description;
}

9
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostIdentityVO.java
View File

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

9
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostKeyVO.java
View File

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

3
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostVO.java
View File

@@ -74,6 +74,9 @@ public class HostVO implements Serializable {
@Schema(description = "主机状态")
private String status;
@Schema(description = "描述")
private String description;
@Schema(description = "创建时间")
private Date createTime;

5
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java
View File

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

1
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java
View File

@@ -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)

7
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java
View File

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

11
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml
View File

@@ -5,20 +5,21 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="org.dromara.visor.module.asset.entity.domain.HostIdentityDO">
<id column="id" property="id"/>
<result column="name" property="name"/>
<result column="username" property="username"/>
<result column="password" property="password"/>
<result column="key_id" property="keyId"/>
<result column="description" property="description"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="creator" property="creator"/>
<result column="updater" property="updater"/>
<result column="deleted" property="deleted"/>
<result column="name" property="name"/>
<result column="username" property="username"/>
<result column="password" property="password"/>
<result column="key_id" property="keyId"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
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
</sql>
</mapper>

11
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostKeyMapper.xml
View File

@@ -5,20 +5,21 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="org.dromara.visor.module.asset.entity.domain.HostKeyDO">
<id column="id" property="id"/>
<result column="name" property="name"/>
<result column="public_key" property="publicKey"/>
<result column="private_key" property="privateKey"/>
<result column="password" property="password"/>
<result column="description" property="description"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="creator" property="creator"/>
<result column="updater" property="updater"/>
<result column="deleted" property="deleted"/>
<result column="name" property="name"/>
<result column="public_key" property="publicKey"/>
<result column="private_key" property="privateKey"/>
<result column="password" property="password"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
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
</sql>
</mapper>

3
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostMapper.xml
View File

@@ -13,6 +13,7 @@
<result column="port" property="port"/>
<result column="status" property="status"/>
<result column="config" property="config"/>
<result column="description" property="description"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="creator" property="creator"/>
@@ -22,7 +23,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
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
</sql>
<update id="setKeyIdWithNull">