fix: 作业执行详情-步骤-主机信息需要显示主机快照数据，而不是当前的数据 TencentBlueKing#2494

wangyu096 · Oct 10, 2023 · 5784263 · 5784263
1 parent d3541f0
commit 5784263
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/backend/commons/common/src/main/java/com/tencent/bk/job/common/model/dto/HostDTO.java b/src/backend/commons/common/src/main/java/com/tencent/bk/job/common/model/dto/HostDTO.java
@@ -90,11 +90,20 @@ public class HostDTO implements Cloneable {
     private String ipv6;
 
     /**
-     * agent状态，0-异常，1-正常
+     * agent存活状态，0-异常，1-正常
      */
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Integer alive;
 
+    /**
+     * 操作系统
+     */
+    private String os;
+    /**
+     * 主机名称
+     */
+    private String hostname;
+
     @Deprecated
     public HostDTO(Long bkCloudId, String ip) {
         this.bkCloudId = bkCloudId;
@@ -172,6 +181,8 @@ public static HostInfoVO toVO(HostDTO hostDTO) {
         cloudAreaInfo.setId(hostDTO.getBkCloudId());
         cloudAreaInfo.setName(hostDTO.getBkCloudName());
         hostInfoVO.setCloudArea(cloudAreaInfo);
+        hostInfoVO.setOs(hostDTO.getOs());
+        hostInfoVO.setHostName(hostDTO.getHostname());
         return hostInfoVO;
     }
 

diff --git a/...execute/src/main/java/com/tencent/bk/job/execute/service/impl/TaskExecuteServiceImpl.java b/...execute/src/main/java/com/tencent/bk/job/execute/service/impl/TaskExecuteServiceImpl.java
@@ -1177,6 +1177,8 @@ private void fillHostsDetail(Collection<HostDTO> hosts, Map<String, HostDTO> hos
                 host.setIp(hostDetail.getIp());
                 host.setIpv6(hostDetail.getIpv6());
                 host.setBkCloudName(hostDetail.getBkCloudName());
+                host.setOs(hostDetail.getOs());
+                host.setAlive(hostDetail.getAlive());
             });
         }
     }