采集管理配置

collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorConfigDaoImpl.java

@@ -87,8 +87,8 @@ public class SchCollectorConfigDaoImpl extends BaseDaoImpl<SchCollectorConfigMap
             query.le(SchCollectorConfig::getCreateTime, endTime);
         }
 
-        if (searchDTO.getParams("collectorCode") != null && searchDTO.getParams("collectorCode") != "") {
+        if (searchDTO.getParams("collectorId") != null && searchDTO.getParams("collectorId") != "") {
-            query.eq(SchCollectorConfig::getCollectorCode, searchDTO.getParams("collectorCode"));
+            query.eq(SchCollectorConfig::getCollectorId, searchDTO.getParams("collectorId"));
         }
 
         if (searchDTO.getParams("configType") != null && searchDTO.getParams("configType") != "") {

collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorConfigServiceImpl.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.redis.service.IdService;
 import com.docus.infrastructure.web.request.SearchDTO;
 import com.docus.infrastructure.web.response.PageResult;
@@ -8,12 +10,18 @@ import com.docus.server.dto.scheduling.management.schcollectorconfig.AddSchColle
 import com.docus.server.dto.scheduling.management.schcollectorconfig.DeleteSchCollectorConfigDTO;
 import com.docus.server.dto.scheduling.management.schcollectorconfig.EditSchCollectorConfigDTO;
 import com.docus.server.entity.scheduling.management.SchCollectorConfig;
+import com.docus.server.entity.scheduling.management.SchSystemParams;
+import com.docus.server.enums.ConfigTypeEnum;
 import com.docus.server.infrastructure.dao.ISchCollectorConfigDao;
+import com.docus.server.infrastructure.dao.ISchSystemParamsDao;
 import com.docus.server.service.ISchCollectorConfigService;
 import com.docus.server.vo.scheduling.management.schcollectorconfig.SchCollectorConfigVO;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 采集器配置 服务实现类
@@ -26,6 +34,8 @@ public class SchCollectorConfigServiceImpl implements ISchCollectorConfigService
     @Resource
     private ISchCollectorConfigDao iSchCollectorConfigDao;
     @Resource
+    private ISchSystemParamsDao iSchSystemParamsDao;
+    @Resource
     private IdService idService;
 
     /**
@@ -47,7 +57,25 @@ public class SchCollectorConfigServiceImpl implements ISchCollectorConfigService
      */
     @Override
     public PageResult<SchCollectorConfigVO> search(SearchDTO searchDTO) {
-        return SchCollectorConfigConvert.INSTANCE.convertVO(iSchCollectorConfigDao.search(searchDTO));
+
+        PageResult<SchCollectorConfigVO> result = SchCollectorConfigConvert.INSTANCE.convertVO(iSchCollectorConfigDao.search(searchDTO));
+        if (CollectionUtils.isEmpty(result.getList())) {
+            return new PageResult<>();
+        }
+
+        List<SchSystemParams> schSystemParams = iSchSystemParamsDao.findBy("paramValue", ListUtils.distinctSelect(result.getList(), SchCollectorConfigVO::getCollectorId));
+        Map<String, SchSystemParams> taskConfigRetryLogMap = ListUtils.toMap(schSystemParams, SchSystemParams::getParamValue);
+
+        Setters.<SchCollectorConfigVO>instance().list(result.getList()).cycleSetProperties(p -> {
+            String collectorId = String.valueOf(p.getCollectorId());
+            if (taskConfigRetryLogMap.containsKey(collectorId)) {
+                p.setCollectorName(taskConfigRetryLogMap.get(collectorId).getParamName());
+            } else {
+                p.setCollectorName("公共");
+            }
+        });
+
+        return result;
     }
 
     /**
@@ -59,15 +87,18 @@ public class SchCollectorConfigServiceImpl implements ISchCollectorConfigService
     @Override
     public boolean add(AddSchCollectorConfigDTO addSchCollectorConfigDTO) {
 
-        String collectorCode = addSchCollectorConfigDTO.getCollectorCode();
+        Long collectorId = addSchCollectorConfigDTO.getCollectorId();
 
-        SchCollectorConfig schCollectorConfigDO = iSchCollectorConfigDao.findOneBy("collectorCode", collectorCode);
+        SchCollectorConfig schCollectorConfigDO = iSchCollectorConfigDao.findOneBy("collectorId", collectorId);
 
         if (null == schCollectorConfigDO) {
 
+
             SchCollectorConfig schCollectorConfig = SchCollectorConfigConvert.INSTANCE.convertDO(addSchCollectorConfigDTO);
             schCollectorConfig.setId(idService.getDateSeq());
-
+            if (addSchCollectorConfigDTO.getConfigType().equals(ConfigTypeEnum.PUBLIC_CONFIG)) {
+                schCollectorConfig.setCollectorId(0L); //共有类型
+            }
             return iSchCollectorConfigDao.add(schCollectorConfig);
         } else {
 
@@ -84,7 +115,8 @@ public class SchCollectorConfigServiceImpl implements ISchCollectorConfigService
      */
     @Override
     public boolean edit(EditSchCollectorConfigDTO editSchCollectorConfigDTO) {
-        SchCollectorConfig schCollectorConfig = SchCollectorConfigConvert.INSTANCE.convertDO(editSchCollectorConfigDTO);
+        SchCollectorConfig schCollectorConfig = iSchCollectorConfigDao.findById(editSchCollectorConfigDTO.getId());
+        schCollectorConfig.setConfigJson(editSchCollectorConfigDTO.getConfigJson());
         return iSchCollectorConfigDao.edit(schCollectorConfig);
     }
 

collector-scheduling-management/src/main/resources/mapper/SchCollectorConfigMapper.xml

@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap"
                type="com.docus.server.entity.scheduling.management.SchCollectorConfig">
                     <id column="id" property="id"/>
-                    <result column="collector_code" property="collectorCode"/>
+                    <result column="collector_id" property="collectorId"/>
                     <result column="config_type" property="configType"/>
                     <result column="config_json" property="configJson"/>
                     <result column="create_time" property="createTime"/>
@@ -15,7 +15,7 @@
 
             <!-- 通用查询结果列 -->
             <sql id="Base_Column_List">
-                id, collector_code, config_type, config_json, create_time, update_time
+                id, collector_id, config_type, config_json, create_time, update_time
             </sql>
 
 </mapper>

docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorconfig/AddSchCollectorConfigDTO.java

@@ -18,8 +18,8 @@ import java.io.Serializable;
 @ApiModel(value = "AddSchCollectorConfigDTO对象", description = "采集器配置")
 public class AddSchCollectorConfigDTO implements Serializable {
 
-    @ApiModelProperty(value = "采集器类型")
+    @ApiModelProperty(value = "采集器id")
-    private String collectorCode;
+    private Long collectorId;
 
     @NotNull
     @ApiModelProperty(value = "配置类型，0：采集器公共配置，1：采集器私有配置")

docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorconfig/EditSchCollectorConfigDTO.java

@@ -16,12 +16,9 @@ import java.io.Serializable;
 @ApiModel(value = "EditSchCollectorConfigDTO对象", description = "采集器配置")
 public class EditSchCollectorConfigDTO implements Serializable {
 
-    @ApiModelProperty(value = "主键")
+    @ApiModelProperty(value = "id")
     private Long id;
 
-    @ApiModelProperty(value = "采集器类型")
-    private String collectorCode;
-
     @ApiModelProperty(value = "配置参数")
     private String configJson;
 

docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorConfig.java

@@ -30,9 +30,9 @@ public class SchCollectorConfig implements Serializable {
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private Long id;
 
-    @ApiModelProperty(value = "采集器类型")
+    @ApiModelProperty(value = "采集器id")
-    @TableField("collector_code")
+    @TableField("collector_id")
-    private String collectorCode;
+    private Long collectorId;
 
     @ApiModelProperty(value = "配置类型，0：采集器公共配置，1：采集器私有配置")
     @TableField("config_type")

docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/schcollectorconfig/SchCollectorConfigVO.java

@@ -22,8 +22,11 @@ public class SchCollectorConfigVO implements Serializable {
     @ApiModelProperty(value = "主键")
     private Long id;
 
+    @ApiModelProperty(value = "采集器Id")
+    private Long collectorId;
+
     @ApiModelProperty(value = "采集器类型")
-    private String collectorCode;
+    private String collectorName;
 
     @ApiModelProperty(value = "配置类型，0：采集器公共配置，1：采集器私有配置")
     private ConfigTypeEnum configType;