Merge pull request TencentBlueKing#2716 from jsonwan/github_perf/step…

…_api perf: 提供步骤详情与步骤执行结果查询的APIGW接口 TencentBlueKing#2596
wangyu096 · Jan 3, 2024 · 85946fd · 85946fd
2 parents ef18c64 + 9b9a49c
commit 85946fd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/docs/apidoc/bk-api-gateway/v3/zh/get_step_instance_detail.md b/docs/apidoc/bk-api-gateway/v3/zh/get_step_instance_detail.md
@@ -60,7 +60,9 @@
               "bk_host_id": 1,
               "bk_cloud_id": 0,
               "ip": "192.168.1.1",
-              "ipv6": null
+              "ipv6": null,
+              "bk_agent_id": "020000000052540079809816967513755991",
+              "alive": 1
             }],
             "topo_node_list": [{
               "node_type": "set",
@@ -88,7 +90,9 @@
                     "bk_host_id": 1,
                     "bk_cloud_id": 0,
                     "ip": "192.168.1.1",
-                    "ipv6": null
+                    "ipv6": null,
+                    "bk_agent_id": "020000000052540079809816967513755991",
+                    "alive": 1
                   }],
                   "topo_node_list": [{
                     "node_type": "set",
@@ -118,7 +122,9 @@
                 "bk_host_id": 1,
                 "bk_cloud_id": 0,
                 "ip": "192.168.1.1",
-                "ipv6": null
+                "ipv6": null,
+                "bk_agent_id": "020000000052540079809816967513755991",
+                "alive": 1
               }],
               "topo_node_list": [{
                 "node_type": "set",
@@ -203,6 +209,8 @@
 | bk_cloud_id | long      |  否        | 管控区域ID  |
 | ip          | string    |  否        | IP        |
 | ipv6        | string    |  否        | IPv6      |
+| bk_agent_id | string    |  否        | Agent ID  |
+| alive       | int       |  否        | Agent是否正常，取值为：1-正常，0-异常 |
 
 ##### topo_node
 

diff --git a/...ckend/commons/esb-sdk/src/main/java/com/tencent/bk/job/common/esb/model/job/EsbIpDTO.java b/...ckend/commons/esb-sdk/src/main/java/com/tencent/bk/job/common/esb/model/job/EsbIpDTO.java
@@ -64,6 +64,14 @@ public class EsbIpDTO {
     @JsonPropertyDescription("ipv6")
     private String ipv6;
 
+    @JsonProperty("bk_agent_id")
+    @JsonPropertyDescription("Agent Id")
+    private String agentId;
+
+    @JsonProperty("alive")
+    @JsonPropertyDescription("Agent是否正常")
+    private Integer alive;
+
     public EsbIpDTO(Long hostId, Long bkCloudId, String ip) {
         this.hostId = hostId;
         this.bkCloudId = bkCloudId;
@@ -90,6 +98,8 @@ public static EsbIpDTO fromHost(HostDTO host) {
         esbIp.setIp(host.getIp());
         esbIp.setIpv6(host.getIpv6());
         esbIp.setHostId(host.getHostId());
+        esbIp.setAgentId(host.getAgentId());
+        esbIp.setAlive(host.getAlive());
         return esbIp;
     }