From 061495eb13d508ddd7f16349d4121f9ef765d274 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Mon, 10 Nov 2025 09:57:36 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visor/module/asset/entity/vo/HostAgentStatusVO.java | 4 ++++ .../visor/module/asset/service/impl/HostAgentServiceImpl.java | 3 ++- orion-visor-ui/src/api/asset/host-agent.ts | 1 + .../src/views/asset/host-list/components/host-form-spec.vue | 2 ++ .../views/monitor/monitor-host/types/use-monitor-host-list.ts | 1 + .../components/path-bookmark/path-bookmark-form-drawer.vue | 4 ++-- .../setting/general/terminal-ssh-interact-block.vue | 2 +- 7 files changed, 13 insertions(+), 4 deletions(-) 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/HostAgentStatusVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostAgentStatusVO.java index d0d0ceee..0643d1dc 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostAgentStatusVO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostAgentStatusVO.java @@ -29,6 +29,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.Date; /** * 主机探针状态 视图响应对象 @@ -61,4 +62,7 @@ public class HostAgentStatusVO implements Serializable { @Schema(description = "探针在线状态") private Integer agentOnlineStatus; + @Schema(description = "探针切换在线状态时间") + private Date agentOnlineChangeTime; + } 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/HostAgentServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentServiceImpl.java index a54a8e42..c77941f6 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentServiceImpl.java @@ -119,7 +119,8 @@ public class HostAgentServiceImpl implements HostAgentService { .select(HostDO::getId, HostDO::getAgentVersion, HostDO::getAgentInstallStatus, - HostDO::getAgentOnlineStatus) + HostDO::getAgentOnlineStatus, + HostDO::getAgentOnlineChangeTime) .in(HostDO::getId, idList) .then() .stream() diff --git a/orion-visor-ui/src/api/asset/host-agent.ts b/orion-visor-ui/src/api/asset/host-agent.ts index d07c658d..7af74484 100644 --- a/orion-visor-ui/src/api/asset/host-agent.ts +++ b/orion-visor-ui/src/api/asset/host-agent.ts @@ -10,6 +10,7 @@ export interface HostAgentStatusResponse { latestVersion: string; agentInstallStatus: number; agentOnlineStatus: number; + agentOnlineChangeTime: number; } /** diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-form-spec.vue b/orion-visor-ui/src/views/asset/host-list/components/host-form-spec.vue index f4fa0dd1..08d7235d 100644 --- a/orion-visor-ui/src/views/asset/host-list/components/host-form-spec.vue +++ b/orion-visor-ui/src/views/asset/host-list/components/host-form-spec.vue @@ -143,6 +143,7 @@ v-model="formModel.publicIpAddresses" class="input" size="mini" + placeholder="支持输入多个地址 回车后添加" allow-clear /> @@ -156,6 +157,7 @@ v-model="formModel.privateIpAddresses" class="input" size="mini" + placeholder="支持输入多个地址 回车后添加" allow-clear /> diff --git a/orion-visor-ui/src/views/monitor/monitor-host/types/use-monitor-host-list.ts b/orion-visor-ui/src/views/monitor/monitor-host/types/use-monitor-host-list.ts index 7d12cbbd..0270f056 100644 --- a/orion-visor-ui/src/views/monitor/monitor-host/types/use-monitor-host-list.ts +++ b/orion-visor-ui/src/views/monitor/monitor-host/types/use-monitor-host-list.ts @@ -174,6 +174,7 @@ export default function useMonitorHostList(options: UseMonitorHostListOptions) { s.latestVersion = item.latestVersion; s.agentInstallStatus = item.agentInstallStatus; s.agentOnlineStatus = item.agentOnlineStatus; + s.agentOnlineChangeTime = item.agentOnlineChangeTime; }); }); } catch (e) { diff --git a/orion-visor-ui/src/views/terminal/components/path-bookmark/path-bookmark-form-drawer.vue b/orion-visor-ui/src/views/terminal/components/path-bookmark/path-bookmark-form-drawer.vue index 2110a4f3..bcf254d8 100644 --- a/orion-visor-ui/src/views/terminal/components/path-bookmark/path-bookmark-form-drawer.vue +++ b/orion-visor-ui/src/views/terminal/components/path-bookmark/path-bookmark-form-drawer.vue @@ -85,7 +85,7 @@ // 打开新增 const openAdd = () => { - title.value = '添加路径标签'; + title.value = '添加路径书签'; isAddHandle.value = true; renderForm({ ...defaultForm() }); setVisible(true); @@ -93,7 +93,7 @@ // 打开修改 const openUpdate = (record: any) => { - title.value = '修改路径标签'; + title.value = '修改路径书签'; isAddHandle.value = false; renderForm({ ...defaultForm(), ...record }); setVisible(true); diff --git a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-interact-block.vue b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-interact-block.vue index 0aa8a695..3887b302 100644 --- a/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-interact-block.vue +++ b/orion-visor-ui/src/views/terminal/components/setting/general/terminal-ssh-interact-block.vue @@ -64,7 +64,7 @@ - +