消息任务管理

segment2.0
linrf 2 years ago
parent 3e33ad5c14
commit f0db03d3f0

@ -1,7 +1,7 @@
package com.docus.server.collect.basic.http;
import com.docus.server.collect.AbstractHttpCollector;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.util.PeriodTime;
import com.docus.server.record.common.pojo.dto.TBasicDTO;
import com.google.common.collect.Lists;

@ -1,7 +1,7 @@
package com.docus.server.collect.basic.ws;
import com.docus.server.collect.AbstractWsCollector;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.util.PeriodTime;
import com.docus.server.record.common.pojo.dto.TBasicDTO;
import com.google.common.collect.Lists;

@ -1,7 +1,7 @@
package com.docus.server.collect.dept.http;
import com.docus.server.collect.AbstractHttpCollector;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.util.PeriodTime;
import com.docus.server.sys.common.pojo.dto.DeptDTO;
import com.google.common.collect.Lists;

@ -1,7 +1,7 @@
package com.docus.server.collect.dept.ws;
import com.docus.server.collect.AbstractWsCollector;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.util.PeriodTime;
import com.docus.server.sys.common.pojo.dto.DeptDTO;
import com.google.common.collect.Lists;

@ -5,7 +5,7 @@ import com.docus.core.util.MapObjUtil;
import com.docus.core.util.json.JSON;
import com.docus.server.collect.AbstractJobCollector;
import com.docus.server.collect.web.common.dto.NoViewCollectionDto;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.enums.QueryWayEnum;
import com.docus.server.util.PeriodTime;
import org.springframework.stereotype.Component;

@ -1,7 +1,7 @@
package com.docus.server.collect.user.http;
import com.docus.server.collect.AbstractHttpCollector;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.util.PeriodTime;
import com.docus.server.sys.common.pojo.dto.UserDTO;
import com.google.common.collect.Lists;

@ -1,7 +1,7 @@
package com.docus.server.collect.user.ws;
import com.docus.server.collect.AbstractWsCollector;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.util.PeriodTime;
import com.docus.server.sys.common.pojo.dto.UserDTO;
import com.google.common.collect.Lists;

@ -9,11 +9,11 @@
</encoder>
</appender>
<!-- <appender name="action" class="ch.qos.logback.core.ConsoleAppender">-->
<!-- <encoder class="com.docus.infrastructure.log.FilterMessagePatternLayoutEncoder">-->
<!-- <pattern>%message%n</pattern>-->
<!-- </encoder>-->
<!-- </appender>-->
<!-- <appender name="action" class="ch.qos.logback.core.ConsoleAppender">-->
<!-- <encoder class="com.docus.infrastructure.log.FilterMessagePatternLayoutEncoder">-->
<!-- <pattern>%message%n</pattern>-->
<!-- </encoder>-->
<!-- </appender>-->
<appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
@ -53,7 +53,7 @@
<appender-ref ref="external-interface"/>
</logger>
<!-- <logger name="com.docus.infrastructure.log.ActionLogger" additivity="false" level="INFO">-->
<!-- <logger name="com.docus.infrastructure.log.ActionLogger" additivity="false" level="INFO">-->
<!-- <appender-ref ref="action"/>-->
<!-- </logger>-->

@ -1,6 +1,6 @@
package com.docus.server.collect;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.util.PeriodTime;
import java.util.List;

@ -1,6 +1,6 @@
package com.docus.server.collect;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.util.PeriodTime;
public interface IJob<T> {

@ -1,7 +1,7 @@
package com.docus.server.collect.basic.http;
import com.docus.server.collect.ICollector;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.record.common.pojo.dto.TBasicDTO;

@ -6,12 +6,12 @@ import com.docus.infrastructure.web.response.PageResult;
import com.docus.log.executor.TrackRetrySpringExecutor;
import com.docus.log.handler.IJobHandler;
import com.docus.log.handler.impl.MethodJobHandler;
import com.docus.server.entity.TaskMessage;
import com.docus.server.archivefile.service.ITaskMessageService;
import com.docus.server.collect.IConverter;
import com.docus.server.collect.IHttpResult;
import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
import com.docus.server.collect.web.process.VisitorProcessor;
import com.docus.server.collect.web.service.CollectService;
import com.docus.server.archivefile.service.ITaskMessageService;
import com.docus.server.enums.CollectTypeEnum;
import com.docus.server.enums.StateEnum;
import com.github.pagehelper.PageHelper;
@ -68,4 +68,12 @@ public class TestRestController {
return CommonResult.success(pageResult);
}
@ApiOperation("TEST-4")
@GetMapping("/get4")
public PageResult<TaskMessage> get4() throws Exception {
PageHelper.startPage(1, 10);
List<TaskMessage> list = messageService.findByState(StateEnum.OK);
return new PageResult<>(list);
}
}

@ -1,7 +1,7 @@
package com.docus.server.collect.basic.view;
import com.docus.server.collect.ICollector;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.his.service.IHisService;

@ -1,7 +1,7 @@
package com.docus.server.collect.basic.ws;
import com.docus.server.collect.ICollector;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.record.common.pojo.dto.TBasicDTO;

@ -1,7 +1,7 @@
package com.docus.server.collect.dept.http;
import com.docus.server.collect.ICollector;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.sys.common.pojo.dto.DeptDTO;

@ -1,7 +1,7 @@
package com.docus.server.collect.dept.view;
import com.docus.server.collect.ICollector;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.his.service.IHisService;

@ -1,7 +1,7 @@
package com.docus.server.collect.dept.ws;
import com.docus.server.collect.ICollector;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.sys.common.pojo.dto.DeptDTO;

@ -3,7 +3,7 @@ package com.docus.server.collect.report.noview;
import com.docus.server.collect.ICollector;
import com.docus.server.collect.IJob;
import com.docus.server.collect.IJobResult;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.xxl.job.core.handler.annotation.XxlJob;

@ -4,7 +4,7 @@ import com.docus.server.bl.service.IBlService;
import com.docus.server.collect.ICollector;
import com.docus.server.collect.IJob;
import com.docus.server.collect.IJobResult;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.constants.DSKeyConstants;

@ -3,7 +3,7 @@ package com.docus.server.collect.report.view;
import com.docus.server.collect.ICollector;
import com.docus.server.collect.IJob;
import com.docus.server.collect.IJobResult;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.constants.DSKeyConstants;

@ -3,7 +3,7 @@ package com.docus.server.collect.report.view;
import com.docus.server.collect.ICollector;
import com.docus.server.collect.IJob;
import com.docus.server.collect.IJobResult;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.constants.DSKeyConstants;

@ -3,7 +3,7 @@ package com.docus.server.collect.report.view;
import com.docus.server.collect.ICollector;
import com.docus.server.collect.IJob;
import com.docus.server.collect.IJobResult;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.constants.DSKeyConstants;

@ -3,7 +3,7 @@ package com.docus.server.collect.report.view;
import com.docus.server.collect.ICollector;
import com.docus.server.collect.IJob;
import com.docus.server.collect.IJobResult;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.constants.DSKeyConstants;

@ -3,7 +3,7 @@ package com.docus.server.collect.report.view;
import com.docus.server.collect.ICollector;
import com.docus.server.collect.IJob;
import com.docus.server.collect.IJobResult;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.constants.DSKeyConstants;

@ -3,7 +3,7 @@ package com.docus.server.collect.report.view;
import com.docus.server.collect.ICollector;
import com.docus.server.collect.IJob;
import com.docus.server.collect.IJobResult;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.constants.DSKeyConstants;

@ -3,7 +3,7 @@ package com.docus.server.collect.report.view;
import com.docus.server.collect.ICollector;
import com.docus.server.collect.IJob;
import com.docus.server.collect.IJobResult;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.constants.DSKeyConstants;

@ -3,7 +3,7 @@ package com.docus.server.collect.report.view;
import com.docus.server.collect.ICollector;
import com.docus.server.collect.IJob;
import com.docus.server.collect.IJobResult;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.constants.DSKeyConstants;

@ -1,7 +1,7 @@
package com.docus.server.collect.user.http;
import com.docus.server.collect.ICollector;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.sys.common.pojo.dto.UserDTO;

@ -4,7 +4,7 @@ import com.docus.core.util.DateUtil;
import com.docus.core.util.Func;
import com.docus.core.util.ListUtils;
import com.docus.server.collect.ICollector;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.his.service.IHisService;

@ -1,7 +1,7 @@
package com.docus.server.collect.user.ws;
import com.docus.server.collect.ICollector;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.collect.web.job.AbstractCollectJob;
import com.docus.server.util.PeriodTime;
import com.docus.server.sys.common.pojo.dto.UserDTO;

@ -2,7 +2,7 @@ package com.docus.server.collect.web.job;
import com.docus.core.util.Func;
import com.docus.infrastructure.redis.service.IdService;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.docus.server.archivefile.service.ITaskConfigService;
import com.docus.server.collect.IJob;
import com.docus.server.collect.web.service.CollectService;

@ -1,6 +1,6 @@
package com.docus.server.collect.web.job;
import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
import com.docus.server.entity.TaskMessage;
import com.docus.server.archivefile.service.ITaskMessageService;
import com.docus.server.collect.web.service.TrackRetryService;
import com.docus.server.enums.StateEnum;

@ -7,8 +7,8 @@ import com.docus.log.executor.TrackRetrySpringExecutor;
import com.docus.log.handler.IJobHandler;
import com.docus.log.handler.impl.MethodJobHandler;
import com.docus.server.archivefile.infrastructure.dao.ITaskMessageRetryLogDao;
import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
import com.docus.server.archivefile.infrastructure.entity.TaskMessageRetryLog;
import com.docus.server.entity.TaskMessage;
import com.docus.server.entity.TaskMessageRetryLog;
import com.docus.server.enums.StateEnum;
import com.docus.server.util.ExceptionUtils;
import lombok.extern.slf4j.Slf4j;

@ -0,0 +1,66 @@
package com.docus.server.archivefile.controller;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.api.archivefile.TaskConfigApi;
import com.docus.server.archivefile.service.ITaskConfigService;
import com.docus.server.entity.TaskConfig;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* Controller
* Generated on 2023-06-28
*/
@RestController
public class TaskConfigController implements TaskConfigApi {
@Resource
private ITaskConfigService taskConfigService;
/**
*
*
* @param id Id
* @return
*/
@Override
public TaskConfig find(String id) {
return taskConfigService.getTaskConfigById(id);
}
/**
*
*
* @param searchRequest
* @return
*/
@Override
public PageResult<TaskConfig> search(SearchRequest searchRequest) {
return taskConfigService.search(searchRequest);
}
/**
*
*
* @param taskConfig
* @return
*/
@Override
public boolean saveOrUpdate(TaskConfig taskConfig) {
return taskConfigService.updateTaskConfig(taskConfig);
}
/**
*
*
* @param ids ids
* @return
*/
@Override
public int delete(List<Long> ids) {
return taskConfigService.deleteTaskConfig(ids);
}
}

@ -0,0 +1,56 @@
package com.docus.server.archivefile.controller;
import com.docus.core.util.ListUtils;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.api.archivefile.TaskMessageApi;
import com.docus.server.archivefile.convert.TaskMessageConvert;
import com.docus.server.archivefile.convert.TaskMessageConverter;
import com.docus.server.archivefile.service.ITaskMessageRetryLogService;
import com.docus.server.archivefile.service.ITaskMessageService;
import com.docus.server.entity.TaskMessage;
import com.docus.server.entity.TaskMessageRetryLog;
import com.docus.server.vo.TaskMessageVO;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* Controller
* Generated on 2023-06-28
*/
@RestController
public class TaskMessageController implements TaskMessageApi {
@Resource
private ITaskMessageService taskMessageService;
@Resource
private ITaskMessageRetryLogService taskMessageRetryLogService;
@Resource
private TaskMessageConverter taskMessageConverter;
/**
*
*
* @param id Id
* @return
*/
@Override
public TaskMessageVO find(String id) {
TaskMessage taskMessage = taskMessageService.findById(id);
return TaskMessageConvert.INSTANCE.convert(taskMessage);
}
/*
*
* @param searchRequest
* @return
*/
@Override
public PageResult<TaskMessageVO> search(SearchRequest searchRequest) {
PageResult<TaskMessage> pageResult = taskMessageService.search(searchRequest);
List<TaskMessageRetryLog> retryLogs = taskMessageRetryLogService.findByTaskIds(ListUtils.distinctSelect(pageResult.getList(), TaskMessage::getId));
List<TaskMessageVO> taskMessages = taskMessageConverter.toTaskMessageVO(pageResult.getList(), retryLogs);
return new PageResult<>(taskMessages, pageResult.getTotal(), pageResult.getPageNum(), pageResult.getPageSize());
}
}

@ -0,0 +1,40 @@
package com.docus.server.archivefile.controller;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.api.archivefile.TaskMessageRetryLogApi;
import com.docus.server.archivefile.service.ITaskMessageRetryLogService;
import com.docus.server.entity.TaskMessageRetryLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
/**
* Controller
* Generated on 2023-06-28
*/
@RestController
public class TaskMessageRetryLogController implements TaskMessageRetryLogApi {
@Autowired
private ITaskMessageRetryLogService taskMessageRetryLogService;
/**
*
*
* @param id Id
* @return
*/
@Override
public TaskMessageRetryLog find(String id) {
return taskMessageRetryLogService.findById(id);
}
/*
*
* @param searchRequest
* @return
*/
@Override
public PageResult<TaskMessageRetryLog> search(SearchRequest searchRequest) {
return taskMessageRetryLogService.search(searchRequest);
}
}

@ -0,0 +1,21 @@
package com.docus.server.archivefile.convert;
import com.docus.server.entity.TaskMessage;
import com.docus.server.vo.TaskMessageVO;
import org.mapstruct.Mapper;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
import java.util.List;
@Mapper
public interface TaskMessageConvert {
TaskMessageConvert INSTANCE = Mappers.getMapper(TaskMessageConvert.class);
@Mappings({})
TaskMessageVO convert(TaskMessage taskMessage);
@Mappings({})
List<TaskMessageVO> convert(List<TaskMessage> taskMessages);
}

@ -1,13 +1,19 @@
package com.docus.server.archivefile.convert;
import com.docus.core.util.DateUtil;
import com.docus.core.util.ListUtils;
import com.docus.core.util.property.Setters;
import com.docus.infrastructure.redis.service.IdService;
import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
import com.docus.server.entity.TaskMessage;
import com.docus.server.entity.TaskMessageRetryLog;
import com.docus.server.enums.CollectTypeEnum;
import com.docus.server.enums.StateEnum;
import com.docus.server.vo.TaskMessageVO;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@Component
public class TaskMessageConverter {
@ -28,4 +34,16 @@ public class TaskMessageConverter {
taskOriginalMessage.setUpdateTime(DateUtil.now());
return taskOriginalMessage;
}
public List<TaskMessageVO> toTaskMessageVO(List<TaskMessage> list, List<TaskMessageRetryLog> taskMessageRetryLogs) {
Map<Long, TaskMessageRetryLog> longTaskMessageRetryLogMap = ListUtils.toMap(taskMessageRetryLogs, TaskMessageRetryLog::getMessageId);
List<TaskMessageVO> taskMessageVOList = TaskMessageConvert.INSTANCE.convert(list);
return Setters.<TaskMessageVO>instance().list(taskMessageVOList).cycleSetProperties(taskMessage -> {
if (longTaskMessageRetryLogMap.containsKey(taskMessage.getId())) {
taskMessage.setHaveRetryLog(true);
}
});
}
}

@ -0,0 +1,8 @@
package com.docus.server.archivefile.convert;
import org.springframework.stereotype.Component;
@Component
public class TaskMessageRetryLogConverter {
}

@ -1,7 +1,10 @@
package com.docus.server.archivefile.infrastructure.dao;
import com.docus.infrastructure.core.db.dao.IBaseDao;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.entity.TaskConfig;
public interface ITaskConfigDao extends IBaseDao<TaskConfig> {
PageResult<TaskConfig> searchTaskConfig(SearchRequest searchRequest);
}

@ -1,8 +1,11 @@
package com.docus.server.archivefile.infrastructure.dao;
import com.docus.infrastructure.core.db.dao.IBaseDao;
import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.entity.TaskMessage;
public interface ITaskMessageDao extends IBaseDao<TaskMessage> {
PageResult<TaskMessage> searchTaskMessage(SearchRequest request);
}

@ -1,7 +1,10 @@
package com.docus.server.archivefile.infrastructure.dao;
import com.docus.infrastructure.core.db.dao.IBaseDao;
import com.docus.server.archivefile.infrastructure.entity.TaskMessageRetryLog;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.entity.TaskMessageRetryLog;
public interface ITaskMessageRetryLogDao extends IBaseDao<TaskMessageRetryLog> {
PageResult<TaskMessageRetryLog> search(SearchRequest searchRequest);
}

@ -1,13 +1,47 @@
package com.docus.server.archivefile.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.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.archivefile.infrastructure.dao.ITaskConfigDao;
import com.docus.server.archivefile.infrastructure.mapper.TaskConfigMapper;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import com.github.pagehelper.PageHelper;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public class TaskConfigDaoImpl extends BaseDaoImpl<TaskConfigMapper, TaskConfig> implements ITaskConfigDao {
@Override
public PageResult<TaskConfig> searchTaskConfig(SearchRequest searchRequest) {
PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize());
LambdaQueryWrapper<TaskConfig> query = Wrappers.lambdaQuery();
//时间范围默认按createTime
if (searchRequest.getBeginTime() != null) {
query.ge(TaskConfig::getCreateTime, searchRequest.getBeginTime());
}
if (searchRequest.getEndTime() != null) {
query.le(TaskConfig::getCreateTime, searchRequest.getEndTime());
}
if (searchRequest.getParams("state") != null) {
query.eq(TaskConfig::getState, searchRequest.getParams("state"));
}
if (Func.isNotBlank(searchRequest.getKeyword())) {
query.like(TaskConfig::getName, String.format("%s%s%s", "%", searchRequest.getKeyword(), "%"));
}
if (searchRequest.getParams("type") != null) {
query.eq(TaskConfig::getType, searchRequest.getParams("type"));
}
//默认createTime倒序排序
query.orderByDesc(TaskConfig::getCreateTime);
List<TaskConfig> list = super.find(query);
return new PageResult<>(list);
}
}

@ -1,11 +1,47 @@
package com.docus.server.archivefile.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.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.archivefile.infrastructure.dao.ITaskMessageDao;
import com.docus.server.archivefile.infrastructure.mapper.TaskMessageMapper;
import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
import com.docus.server.entity.TaskMessage;
import com.github.pagehelper.PageHelper;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public class TaskMessageDaoImpl extends BaseDaoImpl<TaskMessageMapper, TaskMessage> implements ITaskMessageDao {
@Override
public PageResult<TaskMessage> searchTaskMessage(SearchRequest searchRequest) {
PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize());
LambdaQueryWrapper<TaskMessage> query = Wrappers.lambdaQuery();
//时间范围默认按createTime
if (searchRequest.getBeginTime() != null) {
query.ge(TaskMessage::getCreateTime, searchRequest.getBeginTime());
}
if (searchRequest.getEndTime() != null) {
query.le(TaskMessage::getCreateTime, searchRequest.getEndTime());
}
if (searchRequest.getParams("state") != null) {
query.eq(TaskMessage::getState, searchRequest.getParams("state"));
}
if (Func.isNotBlank(searchRequest.getKeyword())) {
query.like(TaskMessage::getName, String.format("%s%s%s", "%", searchRequest.getKeyword(), "%"));
}
if (searchRequest.getParams("collectType") != null) {
query.eq(TaskMessage::getCollectType, searchRequest.getParams("collectType"));
}
//默认createTime倒序排序
query.orderByDesc(TaskMessage::getCreateTime);
List<TaskMessage> list = super.find(query);
return new PageResult<>(list);
}
}

@ -1,11 +1,46 @@
package com.docus.server.archivefile.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.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.archivefile.infrastructure.dao.ITaskMessageRetryLogDao;
import com.docus.server.archivefile.infrastructure.entity.TaskMessageRetryLog;
import com.docus.server.archivefile.infrastructure.mapper.TaskMessageRetryLogMapper;
import com.docus.server.entity.TaskMessageRetryLog;
import com.github.pagehelper.PageHelper;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public class TaskMessageRetryLogDaoImpl extends BaseDaoImpl<TaskMessageRetryLogMapper, TaskMessageRetryLog> implements ITaskMessageRetryLogDao {
@Override
public PageResult<TaskMessageRetryLog> search(SearchRequest searchRequest) {
PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize());
LambdaQueryWrapper<TaskMessageRetryLog> query = Wrappers.lambdaQuery();
//时间范围默认按createTime
if (searchRequest.getBeginTime() != null) {
query.ge(TaskMessageRetryLog::getCreateTime, searchRequest.getBeginTime());
}
if (searchRequest.getEndTime() != null) {
query.le(TaskMessageRetryLog::getCreateTime, searchRequest.getEndTime());
}
if (searchRequest.getParams("state") != null) {
query.eq(TaskMessageRetryLog::getState, searchRequest.getParams("state"));
}
if (Func.isNotBlank(searchRequest.getKeyword())) {
query.like(TaskMessageRetryLog::getName, String.format("%s%s%s", "%", searchRequest.getKeyword(), "%"));
}
if (searchRequest.getParams("collectType") != null) {
query.eq(TaskMessageRetryLog::getCollectType, searchRequest.getParams("collectType"));
}
//默认createTime倒序排序
query.orderByDesc(TaskMessageRetryLog::getCreateTime);
List<TaskMessageRetryLog> list = super.find(query);
return new PageResult<>(list);
}
}

@ -1,7 +1,7 @@
package com.docus.server.archivefile.infrastructure.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.entity.TaskConfig;
import org.apache.ibatis.annotations.Mapper;
@Mapper

@ -1,7 +1,7 @@
package com.docus.server.archivefile.infrastructure.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
import com.docus.server.entity.TaskMessage;
import org.apache.ibatis.annotations.Mapper;
/**

@ -1,7 +1,7 @@
package com.docus.server.archivefile.infrastructure.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.docus.server.archivefile.infrastructure.entity.TaskMessageRetryLog;
import com.docus.server.entity.TaskMessageRetryLog;
import org.apache.ibatis.annotations.Mapper;
/**

@ -1,8 +1,11 @@
package com.docus.server.archivefile.service;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.entity.TaskConfig;
import java.util.Date;
import java.util.List;
public interface ITaskConfigService {
@ -12,6 +15,9 @@ public interface ITaskConfigService {
TaskConfig getTaskConfigById(String taskConfigId);
void updateTaskConfig(TaskConfig taskConfig);
boolean updateTaskConfig(TaskConfig taskConfig);
PageResult<TaskConfig> search(SearchRequest searchRequest);
int deleteTaskConfig(List<Long> ids);
}

@ -1,4 +1,15 @@
package com.docus.server.archivefile.service;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.entity.TaskMessageRetryLog;
import java.util.List;
public interface ITaskMessageRetryLogService {
List<TaskMessageRetryLog> findByTaskIds(List<Long> taskIds);
TaskMessageRetryLog findById(String id);
PageResult<TaskMessageRetryLog> search(SearchRequest searchRequest);
}

@ -1,6 +1,8 @@
package com.docus.server.archivefile.service;
import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.entity.TaskMessage;
import com.docus.server.enums.CollectTypeEnum;
import com.docus.server.enums.StateEnum;
@ -14,4 +16,7 @@ public interface ITaskMessageService {
List<TaskMessage> findByState(StateEnum stateEnum);
TaskMessage findById(String id);
PageResult<TaskMessage> search(SearchRequest searchRequest);
}

@ -1,17 +1,19 @@
package com.docus.server.archivefile.service.impl;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.archivefile.infrastructure.dao.ITaskConfigDao;
import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
import com.docus.server.archivefile.service.ITaskConfigService;
import com.docus.server.entity.TaskConfig;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@Service
public class TaskConfigServiceImpl implements ITaskConfigService {
@Resource
private ITaskConfigDao taskConfigDao;
@ -39,8 +41,19 @@ public class TaskConfigServiceImpl implements ITaskConfigService {
@Transactional(rollbackFor = Exception.class)
@Override
public void updateTaskConfig(TaskConfig taskConfig) {
taskConfigDao.saveOrUpdate(taskConfig);
public boolean updateTaskConfig(TaskConfig taskConfig) {
return taskConfigDao.saveOrUpdate(taskConfig);
}
@Override
public PageResult<TaskConfig> search(SearchRequest searchRequest) {
return taskConfigDao.searchTaskConfig(searchRequest);
}
@Transactional(rollbackFor = Exception.class)
@Override
public int deleteTaskConfig(List<Long> ids) {
return taskConfigDao.deleteByIdList(ids);
}
}

@ -1,17 +1,35 @@
package com.docus.server.archivefile.service.impl;
import com.docus.server.archivefile.convert.TaskMessageConverter;
import com.docus.server.archivefile.infrastructure.dao.ITaskMessageDao;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.archivefile.convert.TaskMessageRetryLogConverter;
import com.docus.server.archivefile.infrastructure.dao.ITaskMessageRetryLogDao;
import com.docus.server.archivefile.service.ITaskMessageRetryLogService;
import com.docus.server.entity.TaskMessageRetryLog;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service
public class TaskMessageRetryLogServiceImpl implements ITaskMessageRetryLogService {
@Resource
private TaskMessageConverter converter;
private TaskMessageRetryLogConverter taskMessageRetryLogConverter;
@Resource
private ITaskMessageDao taskMessageDao;
private ITaskMessageRetryLogDao taskMessageRetryLogDao;
@Override
public List<TaskMessageRetryLog> findByTaskIds(List<Long> taskIds) {
return taskMessageRetryLogDao.findBy("messageId", taskIds);
}
@Override
public TaskMessageRetryLog findById(String id) {
return taskMessageRetryLogDao.findById(id);
}
@Override
public PageResult<TaskMessageRetryLog> search(SearchRequest searchRequest) {
return taskMessageRetryLogDao.search(searchRequest);
}
}

@ -2,10 +2,12 @@ package com.docus.server.archivefile.service.impl;
import com.docus.core.util.DateUtil;
import com.docus.core.util.Func;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.archivefile.convert.TaskMessageConverter;
import com.docus.server.archivefile.infrastructure.dao.ITaskMessageDao;
import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
import com.docus.server.archivefile.service.ITaskMessageService;
import com.docus.server.entity.TaskMessage;
import com.docus.server.enums.CollectTypeEnum;
import com.docus.server.enums.StateEnum;
import org.springframework.stereotype.Service;
@ -52,4 +54,14 @@ public class TaskMessageServiceImpl implements ITaskMessageService {
public List<TaskMessage> findByState(StateEnum stateEnum) {
return taskMessageDao.findBy("state", stateEnum);
}
@Override
public TaskMessage findById(String id) {
return taskMessageDao.findById(id);
}
@Override
public PageResult<TaskMessage> search(SearchRequest request) {
return taskMessageDao.searchTaskMessage(request);
}
}

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xmgps.tsms.auth.api.mapper.TaskConfigMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap"
type="com.docus.server.entity.TaskConfig">
<id column="id" property="id"/>
<result column="name" property="name"/>
<result column="type" property="type"/>
<result column="start_time" property="startTime"/>
<result column="end_time" property="endTime"/>
<result column="all_pointer_time" property="allPointerTime"/>
<result column="page_size" property="pageSize"/>
<result column="spilt_period" property="spiltPeriod"/>
<result column="inc_pointer_time" property="incPointerTime"/>
<result column="param" property="param"/>
<result column="state" property="state"/>
<result column="last_error_msg" property="lastErrorMsg"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, name, type, start_time, end_time, all_pointer_time, page_size, spilt_period, inc_pointer_time, param, state, last_error_msg
</sql>
</mapper>

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xmgps.tsms.auth.api.mapper.TaskMessageMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap"
type="com.docus.server.entity.TaskMessage">
<id column="id" property="id"/>
<result column="name" property="name"/>
<result column="memo" property="memo"/>
<result column="collect_type" property="collectType"/>
<result column="retry_key" property="retryKey"/>
<result column="json_str" property="jsonStr"/>
<result column="source" property="source"/>
<result column="state" property="state"/>
<result column="error_msg" property="errorMsg"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, name, memo, collect_type, retry_key, json_str, source, state, error_msg, create_time, update_time
</sql>
</mapper>

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xmgps.tsms.auth.api.mapper.TaskMessageRetryLogMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap"
type="com.docus.server.entity.TaskMessageRetryLog">
<id column="id" property="id"/>
<result column="message_id" property="messageId"/>
<result column="name" property="name"/>
<result column="memo" property="memo"/>
<result column="collect_type" property="collectType"/>
<result column="retry_key" property="retryKey"/>
<result column="json_str" property="jsonStr"/>
<result column="source" property="source"/>
<result column="state" property="state"/>
<result column="error_msg" property="errorMsg"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, message_id, name, memo, collect_type, retry_key, json_str, source, state, error_msg, create_time, update_time
</sql>
</mapper>

@ -41,8 +41,8 @@ public class PowerUserServiceImpl implements IPowerUserService {
}
@Override
public List<PowerUser> findByUserNameList(Collection<Object> values) {
return userDao.findByList("userName", values);
public List<PowerUser> findByUserNameList(Collection<Object> userNames) {
return userDao.findBy("userName", userNames);
}
@Transactional

@ -0,0 +1,51 @@
package com.docus.server.common;
import com.docus.infrastructure.web.api.CommonResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.MethodParameter;
import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
import javax.servlet.http.HttpServletRequest;
//统一controller输出格式和抛出的异常
@RestControllerAdvice
public class GlobalResponseBodyAdvice implements ResponseBodyAdvice<Object> {
private static final Logger logger = LoggerFactory.getLogger(GlobalResponseBodyAdvice.class);
@Override
public boolean supports(MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> aClass) {
return !CommonResult.class.isAssignableFrom(methodParameter.getParameterType());
}
@Override
public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass,
ServerHttpRequest request, ServerHttpResponse response) {
String path = request.getURI().getPath();
// 跟swagger冲突跳出response包装
if (path.contains("swagger") || path.contains("api-docs")) {
return body;
}
//springBootAdmin获取服务信息
if (path.startsWith("/actuator")) {
return body;
}
return CommonResult.success(body);
}
@ResponseBody
@ExceptionHandler(value = Exception.class)
public Object defaultErrorHandler(HttpServletRequest req, Exception ex) {
return CommonResult.failed("系统出错");
}
}

@ -0,0 +1,67 @@
package com.docus.server.api.archivefile;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.entity.TaskConfig;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import java.util.List;
/**
* API
* Generated on 2023-06-28
*/
@Api(value = "主动消息任务管理接口", tags = "主动消息任务管理接口")
@FeignClient(value = "docus-collector-api", contextId = "docus-collector-api.TaskConfigApi")
@RequestMapping("/taskConfig")
public interface TaskConfigApi {
/**
*
*
* @param id id
* @return
*/
@ApiOperation("按主键查询")
@GetMapping("/find/{id}")
TaskConfig find(@PathVariable(value = "id") String id);
/**
*
*
* @param searchRequest
* @return
*/
@ApiOperation("关键字搜素")
@PostMapping("/search")
PageResult<TaskConfig> search(@RequestBody SearchRequest searchRequest);
/**
*
*
* @param taskConfig
* @return
*/
@ApiOperation("新增或编辑")
@PostMapping("/saveOrUpdate")
boolean saveOrUpdate(@RequestBody TaskConfig taskConfig);
/**
*
*
* @param ids ids
* @return
*/
@ApiOperation("批量删除")
@DeleteMapping("/delete")
int delete(@RequestBody List<Long> ids);
}

@ -0,0 +1,39 @@
package com.docus.server.api.archivefile;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.vo.TaskMessageVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* API
* Generated on 2023-06-28
*/
@FeignClient(value = "docus-collector-api", contextId = "docus-collector-api.TaskMessageApi")
@RequestMapping("/taskMessage")
public interface TaskMessageApi {
/**
*
*
* @param id id
* @return
*/
@GetMapping("/find/{id}")
TaskMessageVO find(@PathVariable(value = "id") String id);
/*
*
* @param searchRequest
* @return
*/
@PostMapping("/search")
PageResult<TaskMessageVO> search(@RequestBody SearchRequest searchRequest);
}

@ -0,0 +1,39 @@
package com.docus.server.api.archivefile;
import com.docus.infrastructure.web.request.SearchRequest;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.entity.TaskMessageRetryLog;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* API
* Generated on 2023-06-28
*/
@FeignClient(value = "docus-collector-api", contextId = "docus-collector-api.TaskMessageRetryLogApi")
@RequestMapping("/taskMessageRetryLog")
public interface TaskMessageRetryLogApi {
/**
*
*
* @param id id
* @return
*/
@GetMapping("/find/{id}")
TaskMessageRetryLog find(@PathVariable(value = "id") String id);
/*
*
* @param searchRequest
* @return
*/
@PostMapping("/search")
PageResult<TaskMessageRetryLog> search(@RequestBody SearchRequest searchRequest);
}

@ -1,4 +0,0 @@
package com.docus.server.entity;
public class A {
}

@ -1,9 +1,12 @@
package com.docus.server.archivefile.infrastructure.entity;
package com.docus.server.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.docus.server.enums.StateEnum;
import com.docus.server.util.DateSpiltUtil;
import com.docus.server.util.PeriodTime;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@ -12,36 +15,42 @@ import java.util.List;
/**
*
*/
@ApiModel(value = "TaskConfig对象", description = "")
@Data
@JsonIgnoreProperties(value = {"incPeriodTimes", "allPeriodTimes", "offset", "pageNum"})
public class TaskConfig {
@ApiModelProperty(value = "主键")
private String id;
/**
*
*/
@ApiModelProperty(value = "任务名字")
private String name;
/**
* deptuser....
*/
@ApiModelProperty(value = "任务类型")
private String type;
/**
*
*/
@ApiModelProperty(value = "数据起始时间范围")
private Date startTime;
/**
*
*/
@ApiModelProperty(value = "数据结束时间范围")
private Date endTime;
/**
*
*/
@ApiModelProperty(value = "指针时间,当前全量任务的任务执行到的时间")
private Date allPointerTime;
/**
*
@ -56,33 +65,39 @@ public class TaskConfig {
/**
*
*/
@ApiModelProperty(value = "每页大小")
private int pageSize;
/**
*
*/
@ApiModelProperty(value = "时间分割周期,把起始时间结束时间进行分割,单位为秒")
private Long spiltPeriod;
/**
*
*/
@ApiModelProperty(value = "指针时间,当前增量任务的执行到的时间")
private Date incPointerTime;
/**
*
*/
@ApiModelProperty(value = "任务其他参数配置")
private String param;
/**
*
*/
@ApiModelProperty(value = "执行状态")
private StateEnum state = StateEnum.OK;
/**
*
*/
@ApiModelProperty(value = "上回失败信息")
private String lastErrorMsg;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "更新时间")
private Date updateTime;
public List<PeriodTime> getAllPeriodTimes() {

@ -1,4 +1,4 @@
package com.docus.server.archivefile.infrastructure.entity;
package com.docus.server.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

@ -0,0 +1,14 @@
package com.docus.server.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
public class TaskMessageExt extends TaskMessage {
@ApiModelProperty(value = "是否有重试详情日志")
private boolean haveRetryLog;
}

@ -1,4 +1,4 @@
package com.docus.server.archivefile.infrastructure.entity;
package com.docus.server.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

@ -0,0 +1,48 @@
package com.docus.server.vo;
import com.docus.server.enums.CollectTypeEnum;
import com.docus.server.enums.StateEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
public class TaskMessageVO {
@ApiModelProperty(value = "主键")
private Long id;
@ApiModelProperty(value = "采集名字")
private String name;
@ApiModelProperty(value = "采集描述")
private String memo;
@ApiModelProperty(value = "采集类型")
private CollectTypeEnum collectType;
@ApiModelProperty(value = "重试标示")
private String retryKey;
@ApiModelProperty(value = "原始报文转对象json")
private String jsonStr;
@ApiModelProperty(value = "原始报文")
private String source;
@ApiModelProperty(value = "状态 1失败0:成功")
private StateEnum state;
@ApiModelProperty(value = "本批次异常信息")
private String errorMsg;
@ApiModelProperty(value = "入库时间")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
private Date updateTime;
@ApiModelProperty(value = "是否有重试详情日志")
private boolean haveRetryLog;
}
Loading…
Cancel
Save