采集调度器 采集记录

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

@@ -2,6 +2,7 @@ package com.docus.server.infrastructure.dao.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.docus.core.util.Func;
 import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl;
 import com.docus.infrastructure.web.request.SearchDTO;
 import com.docus.infrastructure.web.response.PageResult;
@@ -11,7 +12,6 @@ import com.docus.server.infrastructure.mapper.SchCollectRecordMapper;
 import com.github.pagehelper.PageHelper;
 import org.springframework.stereotype.Repository;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -83,18 +83,15 @@ public class SchCollectRecordDaoImpl extends BaseDaoImpl<SchCollectRecordMapper,
             query.ge(SchCollectRecord::getCreateTime, searchDTO.getBeginTime());
         }
         if (searchDTO.getEndTime() != null) {
-            Date endTime = searchDTO.getEndTime();
+            query.le(SchCollectRecord::getCreateTime, searchDTO.getEndTime());
-            query.le(SchCollectRecord::getCreateTime, endTime);
         }
-        //关键字比较，多个列or
+
-        //if (!StringUtils.isEmpty(searchDTO.getKeyword())) {
+        Object collectorId = searchDTO.getParams("collectorId");
-        //单个列用like
+
-        //query. like(SchCollectRecord::getxxx, searchDTO.getKeyword());
+        if (Func.isNotEmpty(collectorId)) {
-        //多个列用like
+            query.eq(SchCollectRecord::getCollectorId, collectorId);
-        //query. and(sub -> sub.like(SchCollectRecord::getxx1, searchDTO.getKeyword())
+        }
-        // оr(). like(SchCollectRecord::getXX2, searchDTO.getKeyword()))
+
-        //);
-        //}
         //默认createTime倒序排序
         query.orderByDesc(SchCollectRecord::getCreateTime);
         List<SchCollectRecord> list = super.find(query);

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

@@ -2,6 +2,7 @@ package com.docus.server.infrastructure.dao.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.docus.core.util.Func;
 import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl;
 import com.docus.infrastructure.web.request.SearchDTO;
 import com.docus.infrastructure.web.response.PageResult;
@@ -11,7 +12,6 @@ import com.docus.server.infrastructure.mapper.SchCollectRecordRetryLogMapper;
 import com.github.pagehelper.PageHelper;
 import org.springframework.stereotype.Repository;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -83,18 +83,14 @@ public class SchCollectRecordRetryLogDaoImpl extends BaseDaoImpl<SchCollectRecor
             query.ge(SchCollectRecordRetryLog::getCreateTime, searchDTO.getBeginTime());
         }
         if (searchDTO.getEndTime() != null) {
-            Date endTime = searchDTO.getEndTime();
+            query.le(SchCollectRecordRetryLog::getCreateTime, searchDTO.getEndTime());
-            query.le(SchCollectRecordRetryLog::getCreateTime, endTime);
+        }
+
+        Object collectorId = searchDTO.getParams("collectorId");
+
+        if (Func.isNotEmpty(collectorId)) {
+            query.eq(SchCollectRecordRetryLog::getCollectorId, collectorId);
         }
-        //关键字比较，多个列or
-        //if (!StringUtils.isEmpty(searchDTO.getKeyword())) {
-        //单个列用like
-        //query. like(SchCollectRecordRetryLog::getxxx, searchDTO.getKeyword());
-        //多个列用like
-        //query. and(sub -> sub.like(SchCollectRecordRetryLog::getxx1, searchDTO.getKeyword())
-        // оr(). like(SchCollectRecordRetryLog::getXX2, searchDTO.getKeyword()))
-        //);
-        //}
         //默认createTime倒序排序
         query.orderByDesc(SchCollectRecordRetryLog::getCreateTime);
         List<SchCollectRecordRetryLog> list = super.find(query);

collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectRecordRetryLogServiceImpl.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.SchCollectRecordRetryLogConvert;
@@ -7,12 +9,17 @@ import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.AddSc
 import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.DeleteSchCollectRecordRetryLogDTO;
 import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.EditSchCollectRecordRetryLogDTO;
 import com.docus.server.entity.scheduling.management.SchCollectRecordRetryLog;
+import com.docus.server.entity.scheduling.management.SchSystemParams;
 import com.docus.server.infrastructure.dao.ISchCollectRecordRetryLogDao;
+import com.docus.server.infrastructure.dao.ISchSystemParamsDao;
 import com.docus.server.service.ISchCollectRecordRetryLogService;
 import com.docus.server.vo.scheduling.management.schcollectrecordretrylog.SchCollectRecordRetryLogVO;
 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 SchCollectRecordRetryLogServiceImpl implements ISchCollectRecordRetryLogService {
     @Resource
     private ISchCollectRecordRetryLogDao iSchCollectRecordRetryLogDao;
+    @Resource
+    private ISchSystemParamsDao iSchSystemParamsDao;
 
     /**
      * 按主键查询
@@ -44,7 +53,23 @@ public class SchCollectRecordRetryLogServiceImpl implements ISchCollectRecordRet
      */
     @Override
     public PageResult<SchCollectRecordRetryLogVO> search(SearchDTO searchDTO) {
-        return SchCollectRecordRetryLogConvert.INSTANCE.convertVO(iSchCollectRecordRetryLogDao.search(searchDTO));
+        PageResult<SchCollectRecordRetryLogVO> result = SchCollectRecordRetryLogConvert.INSTANCE.convertVO(iSchCollectRecordRetryLogDao.search(searchDTO));
+
+        if (CollectionUtils.isEmpty(result.getList())) {
+            return new PageResult<>();
+        }
+
+        List<SchSystemParams> schSystemParams = iSchSystemParamsDao.findBy("paramValue", ListUtils.distinctSelect(result.getList(), SchCollectRecordRetryLogVO::getCollectorId));
+        Map<String, SchSystemParams> taskConfigRetryLogMap = ListUtils.toMap(schSystemParams, SchSystemParams::getParamValue);
+
+        Setters.<SchCollectRecordRetryLogVO>instance().list(result.getList()).cycleSetProperties(p -> {
+            String collectorId = String.valueOf(p.getCollectorId());
+            if (taskConfigRetryLogMap.containsKey(collectorId)) {
+                p.setCollectorName(taskConfigRetryLogMap.get(collectorId).getParamName());
+            }
+        });
+
+        return result;
     }
 
     /**

collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectRecordServiceImpl.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.SchCollectRecordConvert;
@@ -7,12 +9,17 @@ import com.docus.server.dto.scheduling.management.schcollectrecord.AddSchCollect
 import com.docus.server.dto.scheduling.management.schcollectrecord.DeleteSchCollectRecordDTO;
 import com.docus.server.dto.scheduling.management.schcollectrecord.EditSchCollectRecordDTO;
 import com.docus.server.entity.scheduling.management.SchCollectRecord;
+import com.docus.server.entity.scheduling.management.SchSystemParams;
 import com.docus.server.infrastructure.dao.ISchCollectRecordDao;
+import com.docus.server.infrastructure.dao.ISchSystemParamsDao;
 import com.docus.server.service.ISchCollectRecordService;
 import com.docus.server.vo.scheduling.management.schcollectrecord.SchCollectRecordVO;
 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 SchCollectRecordServiceImpl implements ISchCollectRecordService {
     @Resource
     private ISchCollectRecordDao iSchCollectRecordDao;
+    @Resource
+    private ISchSystemParamsDao iSchSystemParamsDao;
 
     /**
      * 按主键查询
@@ -44,7 +53,23 @@ public class SchCollectRecordServiceImpl implements ISchCollectRecordService {
      */
     @Override
     public PageResult<SchCollectRecordVO> search(SearchDTO searchDTO) {
-        return SchCollectRecordConvert.INSTANCE.convertVO(iSchCollectRecordDao.search(searchDTO));
+        PageResult<SchCollectRecordVO> result = SchCollectRecordConvert.INSTANCE.convertVO(iSchCollectRecordDao.search(searchDTO));
+
+        if (CollectionUtils.isEmpty(result.getList())) {
+            return new PageResult<>();
+        }
+
+        List<SchSystemParams> schSystemParams = iSchSystemParamsDao.findBy("paramValue", ListUtils.distinctSelect(result.getList(), SchCollectRecordVO::getCollectorId));
+        Map<String, SchSystemParams> taskConfigRetryLogMap = ListUtils.toMap(schSystemParams, SchSystemParams::getParamValue);
+
+        Setters.<SchCollectRecordVO>instance().list(result.getList()).cycleSetProperties(p -> {
+            String collectorId = String.valueOf(p.getCollectorId());
+            if (taskConfigRetryLogMap.containsKey(collectorId)) {
+                p.setCollectorName(taskConfigRetryLogMap.get(collectorId).getParamName());
+            }
+        });
+
+        return result;
     }
 
     /**

collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorConfigServiceImpl.java

@@ -1,9 +1,12 @@
 package com.docus.server.service.impl;
 
+import com.docus.core.util.Func;
 import com.docus.core.util.ListUtils;
 import com.docus.core.util.json.JSON;
 import com.docus.core.util.property.Setters;
 import com.docus.infrastructure.redis.service.IdService;
+import com.docus.infrastructure.web.exception.ApiException;
+import com.docus.infrastructure.web.exception.ExceptionCode;
 import com.docus.infrastructure.web.request.SearchDTO;
 import com.docus.infrastructure.web.response.PageResult;
 import com.docus.server.common.MsgConstants;
@@ -99,20 +102,18 @@ public class SchCollectorConfigServiceImpl implements ISchCollectorConfigService
 
         SchCollectorConfig schCollectorConfigDO = iSchCollectorConfigDao.findOneBy("collectorId", collectorId);
 
-        if (null == schCollectorConfigDO) {
+        if (Func.notNull(schCollectorConfigDO)) {
-
+            throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "采集器类型已经存在");
+        }
 
         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 {
 
-            schCollectorConfigDO.setConfigJson(addSchCollectorConfigDTO.getConfigJson());
-            return iSchCollectorConfigDao.updateById(schCollectorConfigDO);
-        }
     }
 
     /**

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

@@ -7,7 +7,7 @@
                type="com.docus.server.entity.scheduling.management.SchCollectRecord">
                     <id column="id" property="id"/>
                     <result column="terminator_id" property="terminatorId"/>
-                    <result column="collector_type" property="collectorType"/>
+                    <result column="collector_id" property="collectorId"/>
                     <result column="task_id" property="taskId"/>
                     <result column="task_name" property="taskName"/>
                     <result column="task_memo" property="taskMemo"/>
@@ -25,7 +25,7 @@
 
             <!-- 通用查询结果列 -->
             <sql id="Base_Column_List">
-                id, terminator_id, collector_type, task_id, task_name, task_memo, start_time, end_time, elapsed_time, task_detail_info, task_exec_state, sub_task_exec_state, last_task_error_msg, create_time, update_time, task_origin_json
+                id, terminator_id, collector_id, task_id, task_name, task_memo, start_time, end_time, elapsed_time, task_detail_info, task_exec_state, sub_task_exec_state, last_task_error_msg, create_time, update_time, task_origin_json
             </sql>
 
 </mapper>

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

@@ -8,7 +8,7 @@
                     <id column="id" property="id"/>
                     <result column="collect_record_id" property="collectRecordId"/>
                     <result column="terminator_id" property="terminatorId"/>
-                    <result column="collect_type" property="collectType"/>
+                    <result column="collector_id" property="collectorId"/>
                     <result column="task_id" property="taskId"/>
                     <result column="task_name" property="taskName"/>
                     <result column="task_memo" property="taskMemo"/>
@@ -16,14 +16,16 @@
                     <result column="end_time" property="endTime"/>
                     <result column="task_detail_info" property="taskDetailInfo"/>
                     <result column="task_exec_state" property="taskExecState"/>
+                    <result column="sub_task_exec_state" property="subTaskExecState"/>
                     <result column="last_task_error_msg" property="lastTaskErrorMsg"/>
                     <result column="create_time" property="createTime"/>
                     <result column="update_time" property="updateTime"/>
+                    <result column="task_origin_json" property="taskOriginJson"/>
         </resultMap>
 
             <!-- 通用查询结果列 -->
             <sql id="Base_Column_List">
-                id, collect_record_id, terminator_id, collect_type, task_id, task_name, task_memo, start_time, end_time, task_detail_info, task_exec_state, last_task_error_msg, create_time, update_time
+                id, collect_record_id, terminator_id, collector_id, task_id, task_name, task_memo, start_time, end_time, task_detail_info, task_exec_state, sub_task_exec_state,last_task_error_msg, create_time, update_time,task_origin_json
             </sql>
 
 </mapper>

docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecord/AddSchCollectRecordDTO.java

@@ -1,18 +1,16 @@
 package com.docus.server.dto.scheduling.management.schcollectrecord;
 
+import com.docus.server.enums.StateEnum;
+import com.docus.server.enums.SubStateEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import com.docus.server.enums.*;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
-*
  * 采集记录表 AddDTO
  *
  * @author AutoGenerator
@@ -28,8 +26,8 @@ public class AddSchCollectRecordDTO implements Serializable {
     @ApiModelProperty(value = "终端主键")
     private Long terminatorId;
 
-    @ApiModelProperty(value = "采集器类型")
+    @ApiModelProperty(value = "采集器id")
-    private String collectorType;
+    private Long collectorId;
 
     @ApiModelProperty(value = "任务id")
     private Long taskId;
@@ -41,10 +39,12 @@ public class AddSchCollectRecordDTO implements Serializable {
     private String taskMemo;
 
     @ApiModelProperty(value = "任务起始时间范围")
-    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
 
     @ApiModelProperty(value = "任务结束时间范围")
-    private LocalDateTime endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
 
     @ApiModelProperty(value = "任务耗时时间,单位：毫秒")
     private Long elapsedTime;
@@ -53,19 +53,21 @@ public class AddSchCollectRecordDTO implements Serializable {
     private String taskDetailInfo;
 
     @ApiModelProperty(value = "任务执行状态，0：成功，1：失败")
-    private String taskExecState;
+    private StateEnum taskExecState;
 
     @ApiModelProperty(value = "子任务执行状态：0：接收，1：启动，2：异常，3：推迟，4：完成，5：作废")
-    private String subTaskExecState;
+    private SubStateEnum subTaskExecState;
 
     @ApiModelProperty(value = "最近一次任务执行失败原因")
     private String lastTaskErrorMsg;
 
     @ApiModelProperty(value = "入库时间")
-    private LocalDateTime createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @ApiModelProperty(value = "入库更新时间")
-    private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 
     @ApiModelProperty(value = "redis队列任务原始报文")
     private String taskOriginJson;

docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecord/EditSchCollectRecordDTO.java

@@ -1,18 +1,16 @@
 package com.docus.server.dto.scheduling.management.schcollectrecord;
 
+import com.docus.server.enums.StateEnum;
+import com.docus.server.enums.SubStateEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import com.docus.server.enums.*;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
-*
  * 采集记录表 EditDTO
  *
  * @author AutoGenerator
@@ -28,8 +26,8 @@ public class EditSchCollectRecordDTO implements Serializable {
     @ApiModelProperty(value = "终端主键")
     private Long terminatorId;
 
-    @ApiModelProperty(value = "采集器类型")
+    @ApiModelProperty(value = "采集器id")
-    private String collectorType;
+    private Long collectorId;
 
     @ApiModelProperty(value = "任务id")
     private Long taskId;
@@ -41,10 +39,12 @@ public class EditSchCollectRecordDTO implements Serializable {
     private String taskMemo;
 
     @ApiModelProperty(value = "任务起始时间范围")
-    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
 
     @ApiModelProperty(value = "任务结束时间范围")
-    private LocalDateTime endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
 
     @ApiModelProperty(value = "任务耗时时间,单位：毫秒")
     private Long elapsedTime;
@@ -53,19 +53,21 @@ public class EditSchCollectRecordDTO implements Serializable {
     private String taskDetailInfo;
 
     @ApiModelProperty(value = "任务执行状态，0：成功，1：失败")
-    private String taskExecState;
+    private StateEnum taskExecState;
 
     @ApiModelProperty(value = "子任务执行状态：0：接收，1：启动，2：异常，3：推迟，4：完成，5：作废")
-    private String subTaskExecState;
+    private SubStateEnum subTaskExecState;
 
     @ApiModelProperty(value = "最近一次任务执行失败原因")
     private String lastTaskErrorMsg;
 
     @ApiModelProperty(value = "入库时间")
-    private LocalDateTime createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @ApiModelProperty(value = "入库更新时间")
-    private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 
     @ApiModelProperty(value = "redis队列任务原始报文")
     private String taskOriginJson;

docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecordretrylog/AddSchCollectRecordRetryLogDTO.java

@@ -1,18 +1,16 @@
 package com.docus.server.dto.scheduling.management.schcollectrecordretrylog;
 
+import com.docus.server.enums.StateEnum;
+import com.docus.server.enums.SubStateEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import com.docus.server.enums.*;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
-*
  * 采集记录表重试表 AddDTO
  *
  * @author AutoGenerator
@@ -31,8 +29,8 @@ public class AddSchCollectRecordRetryLogDTO implements Serializable {
     @ApiModelProperty(value = "终端主键")
     private Long terminatorId;
 
-    @ApiModelProperty(value = "采集器类型")
+    @ApiModelProperty(value = "采集器id")
-    private CollectTypeEnum collectType;
+    private Long collectorId;
 
     @ApiModelProperty(value = "任务id")
     private Long taskId;
@@ -43,26 +41,34 @@ public class AddSchCollectRecordRetryLogDTO implements Serializable {
     @ApiModelProperty(value = "任务描述")
     private String taskMemo;
 
-    @ApiModelProperty(value = "数据起始时间范围")
+    @ApiModelProperty(value = "任务起始时间范围")
-    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
 
-    @ApiModelProperty(value = "数据结束时间范围")
+    @ApiModelProperty(value = "任务结束时间范围")
-    private LocalDateTime endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
 
     @ApiModelProperty(value = "任务详细信息")
     private String taskDetailInfo;
 
     @ApiModelProperty(value = "任务执行状态，0：成功，1：失败")
-    private String taskExecState;
+    private StateEnum taskExecState;
+
+    @ApiModelProperty(value = "子任务执行状态：0：接收，1：启动，2：异常，3：推迟，4：完成，5：作废")
+    private SubStateEnum subTaskExecState;
 
     @ApiModelProperty(value = "最近一次任务执行失败原因")
     private String lastTaskErrorMsg;
 
     @ApiModelProperty(value = "入库时间")
-    private LocalDateTime createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @ApiModelProperty(value = "入库更新时间")
-    private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-
+    private Date updateTime;
 
+    @ApiModelProperty(value = "redis队列任务原始报文")
+    private String taskOriginJson;
 }

docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecordretrylog/EditSchCollectRecordRetryLogDTO.java

@@ -1,18 +1,16 @@
 package com.docus.server.dto.scheduling.management.schcollectrecordretrylog;
 
+import com.docus.server.enums.StateEnum;
+import com.docus.server.enums.SubStateEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import com.docus.server.enums.*;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
-*
  * 采集记录表重试表 EditDTO
  *
  * @author AutoGenerator
@@ -31,8 +29,8 @@ public class EditSchCollectRecordRetryLogDTO implements Serializable {
     @ApiModelProperty(value = "终端主键")
     private Long terminatorId;
 
-    @ApiModelProperty(value = "采集器类型")
+    @ApiModelProperty(value = "采集器id")
-    private CollectTypeEnum collectType;
+    private Long collectorId;
 
     @ApiModelProperty(value = "任务id")
     private Long taskId;
@@ -43,26 +41,35 @@ public class EditSchCollectRecordRetryLogDTO implements Serializable {
     @ApiModelProperty(value = "任务描述")
     private String taskMemo;
 
-    @ApiModelProperty(value = "数据起始时间范围")
+    @ApiModelProperty(value = "任务起始时间范围")
-    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
 
-    @ApiModelProperty(value = "数据结束时间范围")
+    @ApiModelProperty(value = "任务结束时间范围")
-    private LocalDateTime endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
 
     @ApiModelProperty(value = "任务详细信息")
     private String taskDetailInfo;
 
     @ApiModelProperty(value = "任务执行状态，0：成功，1：失败")
-    private String taskExecState;
+    private StateEnum taskExecState;
+
+    @ApiModelProperty(value = "子任务执行状态：0：接收，1：启动，2：异常，3：推迟，4：完成，5：作废")
+    private SubStateEnum subTaskExecState;
 
     @ApiModelProperty(value = "最近一次任务执行失败原因")
     private String lastTaskErrorMsg;
 
     @ApiModelProperty(value = "入库时间")
-    private LocalDateTime createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @ApiModelProperty(value = "入库更新时间")
-    private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 
+    @ApiModelProperty(value = "redis队列任务原始报文")
+    private String taskOriginJson;
 
 }

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

@@ -1,21 +1,21 @@
 package com.docus.server.entity.scheduling.management;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.docus.server.enums.StateEnum;
+import com.docus.server.enums.SubStateEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
-import com.docus.server.enums.*;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
-*
  * 采集记录表
  *
  * @author AutoGenerator
@@ -35,9 +35,9 @@ public class SchCollectRecord implements Serializable {
     @TableField("terminator_id")
     private Long terminatorId;
 
-    @ApiModelProperty(value = "采集器类型")
+    @ApiModelProperty(value = "采集器id")
-    @TableField("collector_type")
+    @TableField("collector_id")
-    private String collectorType;
+    private Long collectorId;
 
     @ApiModelProperty(value = "任务id")
     @TableField("task_id")
@@ -53,11 +53,13 @@ public class SchCollectRecord implements Serializable {
 
     @ApiModelProperty(value = "任务起始时间范围")
     @TableField("start_time")
-    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
 
     @ApiModelProperty(value = "任务结束时间范围")
     @TableField("end_time")
-    private LocalDateTime endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
 
     @ApiModelProperty(value = "任务耗时时间,单位：毫秒")
     @TableField("elapsed_time")
@@ -69,11 +71,11 @@ public class SchCollectRecord implements Serializable {
 
     @ApiModelProperty(value = "任务执行状态，0：成功，1：失败")
     @TableField("task_exec_state")
-    private String taskExecState;
+    private StateEnum taskExecState;
 
     @ApiModelProperty(value = "子任务执行状态：0：接收，1：启动，2：异常，3：推迟，4：完成，5：作废")
     @TableField("sub_task_exec_state")
-    private String subTaskExecState;
+    private SubStateEnum subTaskExecState;
 
     @ApiModelProperty(value = "最近一次任务执行失败原因")
     @TableField("last_task_error_msg")
@@ -81,11 +83,13 @@ public class SchCollectRecord implements Serializable {
 
     @ApiModelProperty(value = "入库时间")
     @TableField("create_time")
-    private LocalDateTime createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @ApiModelProperty(value = "入库更新时间")
     @TableField("update_time")
-    private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 
     @ApiModelProperty(value = "redis队列任务原始报文")
     @TableField("task_origin_json")

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

@@ -1,21 +1,21 @@
 package com.docus.server.entity.scheduling.management;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.docus.server.enums.StateEnum;
+import com.docus.server.enums.SubStateEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
-import com.docus.server.enums.*;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
-*
  * 采集记录表重试表
  *
  * @author AutoGenerator
@@ -39,9 +39,9 @@ public class SchCollectRecordRetryLog implements Serializable {
     @TableField("terminator_id")
     private Long terminatorId;
 
-    @ApiModelProperty(value = "采集器类型")
+    @ApiModelProperty(value = "采集器id")
-    @TableField("collect_type")
+    @TableField("collector_id")
-    private CollectTypeEnum collectType;
+    private Long collectorId;
 
     @ApiModelProperty(value = "任务id")
     @TableField("task_id")
@@ -55,13 +55,15 @@ public class SchCollectRecordRetryLog implements Serializable {
     @TableField("task_memo")
     private String taskMemo;
 
-    @ApiModelProperty(value = "数据起始时间范围")
+    @ApiModelProperty(value = "任务起始时间范围")
     @TableField("start_time")
-    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
 
-    @ApiModelProperty(value = "数据结束时间范围")
+    @ApiModelProperty(value = "任务结束时间范围")
     @TableField("end_time")
-    private LocalDateTime endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
 
     @ApiModelProperty(value = "任务详细信息")
     @TableField("task_detail_info")
@@ -69,7 +71,11 @@ public class SchCollectRecordRetryLog implements Serializable {
 
     @ApiModelProperty(value = "任务执行状态，0：成功，1：失败")
     @TableField("task_exec_state")
-    private String taskExecState;
+    private StateEnum taskExecState;
+
+    @ApiModelProperty(value = "子任务执行状态：0：接收，1：启动，2：异常，3：推迟，4：完成，5：作废")
+    @TableField("sub_task_exec_state")
+    private SubStateEnum subTaskExecState;
 
     @ApiModelProperty(value = "最近一次任务执行失败原因")
     @TableField("last_task_error_msg")
@@ -77,11 +83,15 @@ public class SchCollectRecordRetryLog implements Serializable {
 
     @ApiModelProperty(value = "入库时间")
     @TableField("create_time")
-    private LocalDateTime createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @ApiModelProperty(value = "入库更新时间")
     @TableField("update_time")
-    private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-
+    private Date updateTime;
 
+    @ApiModelProperty(value = "redis队列任务原始报文")
+    @TableField("task_origin_json")
+    private String taskOriginJson;
 }

docus-client-interface/src/main/java/com/docus/server/enums/SubStateEnum.java

@@ -0,0 +1,32 @@
+package com.docus.server.enums;
+
+import com.docus.infrastructure.core.db.enums.IIntegerEnum;
+
+public enum SubStateEnum implements IIntegerEnum {
+    RECEIVE(0, "接收"),
+    START(1, "启动"),
+    ERROR(2, "异常"),
+    DELAY(3, "推迟"),
+    COMPLETE(4, "完成"),
+    CANCEL(5, "作废"),
+    ;
+
+    private Integer value;
+    private String display;
+
+    SubStateEnum(Integer value, String display) {
+        this.value = value;
+        this.display = display;
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+    @Override
+    public String getDisplay() {
+
+        return display;
+    }
+}

docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/schcollectrecord/SchCollectRecordVO.java

@@ -1,18 +1,16 @@
 package com.docus.server.vo.scheduling.management.schcollectrecord;
 
+import com.docus.server.enums.StateEnum;
+import com.docus.server.enums.SubStateEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import com.docus.server.enums.*;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
-*
  * 采集记录表 VO
  *
  * @author AutoGenerator
@@ -28,8 +26,11 @@ public class SchCollectRecordVO implements Serializable {
     @ApiModelProperty(value = "终端主键")
     private Long terminatorId;
 
+    @ApiModelProperty(value = "采集器id")
+    private Long collectorId;
+
     @ApiModelProperty(value = "采集器类型")
-    private String collectorType;
+    private String collectorName;
 
     @ApiModelProperty(value = "任务id")
     private Long taskId;
@@ -41,10 +42,12 @@ public class SchCollectRecordVO implements Serializable {
     private String taskMemo;
 
     @ApiModelProperty(value = "任务起始时间范围")
-    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
 
     @ApiModelProperty(value = "任务结束时间范围")
-    private LocalDateTime endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
 
     @ApiModelProperty(value = "任务耗时时间,单位：毫秒")
     private Long elapsedTime;
@@ -53,19 +56,21 @@ public class SchCollectRecordVO implements Serializable {
     private String taskDetailInfo;
 
     @ApiModelProperty(value = "任务执行状态，0：成功，1：失败")
-    private String taskExecState;
+    private StateEnum taskExecState;
 
     @ApiModelProperty(value = "子任务执行状态：0：接收，1：启动，2：异常，3：推迟，4：完成，5：作废")
-    private String subTaskExecState;
+    private SubStateEnum subTaskExecState;
 
     @ApiModelProperty(value = "最近一次任务执行失败原因")
     private String lastTaskErrorMsg;
 
     @ApiModelProperty(value = "入库时间")
-    private LocalDateTime createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @ApiModelProperty(value = "入库更新时间")
-    private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 
     @ApiModelProperty(value = "redis队列任务原始报文")
     private String taskOriginJson;

docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/schcollectrecordretrylog/SchCollectRecordRetryLogVO.java

@@ -1,18 +1,16 @@
 package com.docus.server.vo.scheduling.management.schcollectrecordretrylog;
 
+import com.docus.server.enums.StateEnum;
+import com.docus.server.enums.SubStateEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import com.docus.server.enums.*;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
-*
  * 采集记录表重试表 VO
  *
  * @author AutoGenerator
@@ -31,8 +29,11 @@ public class SchCollectRecordRetryLogVO implements Serializable {
     @ApiModelProperty(value = "终端主键")
     private Long terminatorId;
 
+    @ApiModelProperty(value = "采集器id")
+    private Long collectorId;
+
     @ApiModelProperty(value = "采集器类型")
-    private CollectTypeEnum collectType;
+    private String collectorName;
 
     @ApiModelProperty(value = "任务id")
     private Long taskId;
@@ -43,26 +44,36 @@ public class SchCollectRecordRetryLogVO implements Serializable {
     @ApiModelProperty(value = "任务描述")
     private String taskMemo;
 
-    @ApiModelProperty(value = "数据起始时间范围")
+    @ApiModelProperty(value = "任务起始时间范围")
-    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
 
-    @ApiModelProperty(value = "数据结束时间范围")
+    @ApiModelProperty(value = "任务结束时间范围")
-    private LocalDateTime endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
 
     @ApiModelProperty(value = "任务详细信息")
     private String taskDetailInfo;
 
     @ApiModelProperty(value = "任务执行状态，0：成功，1：失败")
-    private String taskExecState;
+    private StateEnum taskExecState;
+
+    @ApiModelProperty(value = "子任务执行状态：0：接收，1：启动，2：异常，3：推迟，4：完成，5：作废")
+    private SubStateEnum subTaskExecState;
 
     @ApiModelProperty(value = "最近一次任务执行失败原因")
     private String lastTaskErrorMsg;
 
     @ApiModelProperty(value = "入库时间")
-    private LocalDateTime createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     @ApiModelProperty(value = "入库更新时间")
-    private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "redis队列任务原始报文")
+    private String taskOriginJson;
 
 
 }