From eccdd3046a08255bb79eb8aecbb80422593142d3 Mon Sep 17 00:00:00 2001
From: linrf <linrf@qq.com>
Date: Wed, 26 Jul 2023 09:50:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E9=9B=86=E5=99=A8=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E8=BF=94=E5=9B=9E=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E5=99=A8=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SchCollectorVersionLogServiceImpl.java    | 27 ++++++++++++++++++-
 .../SchCollectorVersionLogVO.java             |  5 +++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionLogServiceImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionLogServiceImpl.java
index 5347328..6741c3f 100644
--- a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionLogServiceImpl.java
+++ b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionLogServiceImpl.java
@@ -1,5 +1,7 @@
 package com.docus.server.service.impl;
 
+import com.docus.core.util.ListUtils;
+import com.docus.core.util.property.Setters;
 import com.docus.infrastructure.web.request.SearchDTO;
 import com.docus.infrastructure.web.response.PageResult;
 import com.docus.server.convert.SchCollectorVersionLogConvert;
@@ -7,12 +9,17 @@ import com.docus.server.dto.scheduling.management.schcollectorversionlog.AddSchC
 import com.docus.server.dto.scheduling.management.schcollectorversionlog.DeleteSchCollectorVersionLogDTO;
 import com.docus.server.dto.scheduling.management.schcollectorversionlog.EditSchCollectorVersionLogDTO;
 import com.docus.server.entity.scheduling.management.SchCollectorVersionLog;
+import com.docus.server.entity.scheduling.management.SchSystemParams;
 import com.docus.server.infrastructure.dao.ISchCollectorVersionLogDao;
+import com.docus.server.infrastructure.dao.ISchSystemParamsDao;
 import com.docus.server.service.ISchCollectorVersionLogService;
 import com.docus.server.vo.scheduling.management.schcollectorversionlog.SchCollectorVersionLogVO;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 采集器版本更新日志管理 服务实现类
@@ -24,6 +31,8 @@ import javax.annotation.Resource;
 public class SchCollectorVersionLogServiceImpl implements ISchCollectorVersionLogService {
     @Resource
     private ISchCollectorVersionLogDao iSchCollectorVersionLogDao;
+    @Resource
+    private ISchSystemParamsDao iSchSystemParamsDao;
 
     /**
      * 按主键查询
@@ -44,7 +53,23 @@ public class SchCollectorVersionLogServiceImpl implements ISchCollectorVersionLo
      */
     @Override
     public PageResult<SchCollectorVersionLogVO> search(SearchDTO searchDTO) {
-        return SchCollectorVersionLogConvert.INSTANCE.convertVO(iSchCollectorVersionLogDao.search(searchDTO));
+        PageResult<SchCollectorVersionLogVO> result = SchCollectorVersionLogConvert.INSTANCE.convertVO(iSchCollectorVersionLogDao.search(searchDTO));
+
+        if (CollectionUtils.isEmpty(result.getList())) {
+            return new PageResult<>();
+        }
+
+        List<SchSystemParams> schSystemParams = iSchSystemParamsDao.findBy("paramValue", ListUtils.distinctSelect(result.getList(), SchCollectorVersionLogVO::getCollectorId));
+        Map<String, SchSystemParams> taskConfigRetryLogMap = ListUtils.toMap(schSystemParams, SchSystemParams::getParamValue);
+
+        Setters.<SchCollectorVersionLogVO>instance().list(result.getList()).cycleSetProperties(p -> {
+            String collectorId = String.valueOf(p.getCollectorId());
+            if (taskConfigRetryLogMap.containsKey(collectorId)) {
+                p.setCollectorName(taskConfigRetryLogMap.get(collectorId).getParamName());
+            }
+        });
+
+        return result;
     }
 
     /**
diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/schcollectorversionlog/SchCollectorVersionLogVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/schcollectorversionlog/SchCollectorVersionLogVO.java
index e2aeaa7..21df6f3 100644
--- a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/schcollectorversionlog/SchCollectorVersionLogVO.java
+++ b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/schcollectorversionlog/SchCollectorVersionLogVO.java
@@ -22,9 +22,12 @@ public class SchCollectorVersionLogVO implements Serializable {
     @ApiModelProperty(value = "主键")
     private Long id;
 
-    @ApiModelProperty(value = "采集器管理id")
+    @ApiModelProperty(value = "采集器id")
     private Long collectorId;
 
+    @ApiModelProperty(value = "采集器名称")
+    private String collectorName;
+
     @ApiModelProperty(value = "操作模块")
     private String operationModule;