Merge pull request #2692 from TencentBlueKing/3.8.x

Merge: 3.8.x->master
TencentBlueKing · Dec 25, 2023 · c6f7c6b · c6f7c6b
2 parents 56a7d0a + 7324967
commit c6f7c6b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...ice-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/IndexServiceImpl.java b/...ice-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/IndexServiceImpl.java
@@ -50,6 +50,7 @@
 import com.tencent.bk.job.manage.model.web.vo.index.JobAndScriptStatistics;
 import com.tencent.bk.job.manage.model.web.vo.task.TaskTemplateVO;
 import com.tencent.bk.job.manage.service.IndexService;
+import com.tencent.bk.job.manage.service.host.HostDetailService;
 import com.tencent.bk.job.manage.service.template.TaskTemplateService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
@@ -74,6 +75,7 @@ public class IndexServiceImpl implements IndexService {
     private final TaskTemplateService taskTemplateService;
     private final TaskTemplateDAO taskTemplateDAO;
     private final ScriptDAO scriptDAO;
+    private final HostDetailService hostDetailService;
 
     @Autowired
     public IndexServiceImpl(IndexGreetingDAO indexGreetingDAO,
@@ -82,14 +84,16 @@ public IndexServiceImpl(IndexGreetingDAO indexGreetingDAO,
                             TopologyHelper topologyHelper,
                             TaskTemplateService taskTemplateService,
                             TaskTemplateDAO taskTemplateDAO,
-                            ScriptDAO scriptDAO) {
+                            ScriptDAO scriptDAO,
+                            HostDetailService hostDetailService) {
         this.indexGreetingDAO = indexGreetingDAO;
         this.applicationDAO = applicationDAO;
         this.applicationHostDAO = applicationHostDAO;
         this.topologyHelper = topologyHelper;
         this.taskTemplateService = taskTemplateService;
         this.taskTemplateDAO = taskTemplateDAO;
         this.scriptDAO = scriptDAO;
+        this.hostDetailService = hostDetailService;
     }
 
     @Override
@@ -187,6 +191,7 @@ public PageData<HostInfoVO> listHostsByAgentStatus(String username,
         List<HostInfoVO> hostInfoVOList;
         val hosts = applicationHostDAO.listHostInfoBySearchContents(
             bizIds, null, null, null, status, start, pageSize);
+        hostDetailService.fillDetailForApplicationHosts(hosts);
         Long count = applicationHostDAO.countHostInfoBySearchContents(
             bizIds, null, null, null, status);
         hostInfoVOList = hosts.stream()