调试 采集器异常日志http api

调试 虚拟机使用情况http api
调试 上报任务状态http api
segment2.0
linrf 2 years ago
parent 370ced1502
commit 79f65c0f6f

@ -0,0 +1,15 @@
package com.docus.server;
import com.docus.infrastructure.WebConfig;
import com.docus.infrastructure.web.json.JsonSerializerModule;
import com.docus.server.common.serializer.DefJsonSerializerModule;
public class DefaultWebConfig extends WebConfig {
@Override
public JsonSerializerModule jsonSerializerModu1e() {
super.jsonSerializerModu1e();
return new DefJsonSerializerModule();
}
}

@ -0,0 +1,25 @@
package com.docus.server.common.serializer;
import com.docus.core.util.Convert;
import com.docus.infrastructure.web.json.JsonSerializerModule;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
import java.time.ZoneId;
import java.util.Date;
import java.util.TimeZone;
public class DefJsonSerializerModule extends JsonSerializerModule {
public DefJsonSerializerModule() {
addSerializer(Date.class, new JsonSerializer<Date>() {
@Override
public void serialize(Date date, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
jsonGenerator.writeString(date == null ? null : Convert.toString(date, Convert.DATA_FORMAT_DATETIME_SLASH, TimeZone.getTimeZone(ZoneId.systemDefault())));
}
});
}
}

@ -0,0 +1,67 @@
package com.docus.server.common.serializer;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* handler
*
* @author zhanghang
* @date 2018/1/11
*/
@Component
public class StringToDateConverter implements Converter<String, Date> {
private static final List<String> DATE_FORMARTS = new ArrayList<>(4);
static {
DATE_FORMARTS.add("yyyy-MM");
DATE_FORMARTS.add("yyyy-MM-dd");
DATE_FORMARTS.add("yyyy-MM-dd hh:mm");
DATE_FORMARTS.add("yyyy-MM-dd hh:mm:ss");
}
@Override
public Date convert(String source) {
String value = source.trim();
if ("".equals(value)) {
return null;
}
if (source.matches("^\\d{4}-\\d{1,2}$")) {
return parseDate(source, DATE_FORMARTS.get(0));
} else if (source.matches("^\\d{4}-\\d{1,2}-\\d{1,2}$")) {
return parseDate(source, DATE_FORMARTS.get(1));
} else if (source.matches("^\\d{4}-\\d{1,2}-\\d{1,2} {1}\\d{1,2}:\\d{1,2}$")) {
return parseDate(source, DATE_FORMARTS.get(2));
} else if (source.matches("^\\d{4}-\\d{1,2}-\\d{1,2} {1}\\d{1,2}:\\d{1,2}:\\d{1,2}$")) {
return parseDate(source, DATE_FORMARTS.get(3));
} else {
throw new IllegalArgumentException("Invalid boolean value '" + source + "'");
}
}
/**
*
*
* @param dateStr String
* @param format String
* @return Date
*/
public Date parseDate(String dateStr, String format) {
Date date = null;
try {
DateFormat dateFormat = new SimpleDateFormat(format);
date = dateFormat.parse(dateStr);
} catch (Exception e) {
System.out.println(String.format("日期%s转换%s错误", dateStr, format));
}
return date;
}
}

@ -9,6 +9,7 @@ import com.docus.server.dto.scheduling.management.schcollecterrorlog.EditSchColl
import com.docus.server.service.ISchCollectErrorLogService; import com.docus.server.service.ISchCollectErrorLogService;
import com.docus.server.vo.scheduling.management.schcollecterrorlog.SchCollectErrorLogVO; import com.docus.server.vo.scheduling.management.schcollecterrorlog.SchCollectErrorLogVO;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -52,8 +53,8 @@ public class SchCollectErrorLogController implements SchCollectErrorLogApi {
* @return * @return
*/ */
@Override @Override
public boolean add(AddSchCollectErrorLogDTO addSchCollectErrorLogDTO) { public boolean add(AddSchCollectErrorLogDTO addSchCollectErrorLogDTO, MultipartFile[] multipartFiles) throws Exception {
return iSchCollectErrorLogService.add(addSchCollectErrorLogDTO); return iSchCollectErrorLogService.add(addSchCollectErrorLogDTO, multipartFiles);
} }
/** /**

@ -1,13 +1,12 @@
package com.docus.server.convert; package com.docus.server.convert;
import com.docus.infrastructure.web.response.PageResult; import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.entity.scheduling.management.SchCollectRecord;
import com.docus.server.dto.scheduling.management.schcollectrecord.AddSchCollectRecordDTO; import com.docus.server.dto.scheduling.management.schcollectrecord.AddSchCollectRecordDTO;
import com.docus.server.dto.scheduling.management.schcollectrecord.EditSchCollectRecordDTO; import com.docus.server.dto.scheduling.management.schcollectrecord.EditSchCollectRecordDTO;
import com.docus.server.dto.scheduling.management.schcollectrecord.DeleteSchCollectRecordDTO; import com.docus.server.entity.scheduling.management.SchCollectRecord;
import com.docus.server.vo.scheduling.management.schcollectrecord.SchCollectRecordVO; import com.docus.server.vo.scheduling.management.schcollectrecord.SchCollectRecordVO;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.MappingTarget;
import org.mapstruct.Mappings; import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
@ -28,7 +27,7 @@ public interface SchCollectRecordConvert {
SchCollectRecord convertDO(AddSchCollectRecordDTO addSchCollectRecordDTO); SchCollectRecord convertDO(AddSchCollectRecordDTO addSchCollectRecordDTO);
@Mappings({}) @Mappings({})
SchCollectRecord convertDO(EditSchCollectRecordDTO editSchCollectRecordDTO); SchCollectRecord convertDO(EditSchCollectRecordDTO editSchCollectRecordDTO, @MappingTarget SchCollectRecord schCollectRecord);
@Mappings({}) @Mappings({})
List<SchCollectRecord> convertAddDOList(List<AddSchCollectRecordDTO> addSchCollectRecordDTO); List<SchCollectRecord> convertAddDOList(List<AddSchCollectRecordDTO> addSchCollectRecordDTO);

@ -1,13 +1,13 @@
package com.docus.server.convert; package com.docus.server.convert;
import com.docus.infrastructure.web.response.PageResult; import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.entity.scheduling.management.SchCollectRecordRetryLog; import com.docus.server.dto.scheduling.management.schcollectrecord.EditSchCollectRecordDTO;
import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.AddSchCollectRecordRetryLogDTO; import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.AddSchCollectRecordRetryLogDTO;
import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.EditSchCollectRecordRetryLogDTO; import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.EditSchCollectRecordRetryLogDTO;
import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.DeleteSchCollectRecordRetryLogDTO; import com.docus.server.entity.scheduling.management.SchCollectRecordRetryLog;
import com.docus.server.vo.scheduling.management.schcollectrecordretrylog.SchCollectRecordRetryLogVO; import com.docus.server.vo.scheduling.management.schcollectrecordretrylog.SchCollectRecordRetryLogVO;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.MappingTarget;
import org.mapstruct.Mappings; import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
@ -24,6 +24,9 @@ public interface SchCollectRecordRetryLogConvert {
SchCollectRecordRetryLogConvert INSTANCE = Mappers.getMapper(SchCollectRecordRetryLogConvert.class); SchCollectRecordRetryLogConvert INSTANCE = Mappers.getMapper(SchCollectRecordRetryLogConvert.class);
@Mappings({})
SchCollectRecordRetryLog convertDO(EditSchCollectRecordDTO editSchCollectRecordDTO, @MappingTarget SchCollectRecordRetryLog schCollectRecordRetryLog);
@Mappings({}) @Mappings({})
SchCollectRecordRetryLog convertDO(AddSchCollectRecordRetryLogDTO addSchCollectRecordRetryLogDTO); SchCollectRecordRetryLog convertDO(AddSchCollectRecordRetryLogDTO addSchCollectRecordRetryLogDTO);

@ -6,6 +6,7 @@ import com.docus.server.dto.scheduling.management.schcollecterrorlog.AddSchColle
import com.docus.server.dto.scheduling.management.schcollecterrorlog.DeleteSchCollectErrorLogDTO; import com.docus.server.dto.scheduling.management.schcollecterrorlog.DeleteSchCollectErrorLogDTO;
import com.docus.server.dto.scheduling.management.schcollecterrorlog.EditSchCollectErrorLogDTO; import com.docus.server.dto.scheduling.management.schcollecterrorlog.EditSchCollectErrorLogDTO;
import com.docus.server.vo.scheduling.management.schcollecterrorlog.SchCollectErrorLogVO; import com.docus.server.vo.scheduling.management.schcollecterrorlog.SchCollectErrorLogVO;
import org.springframework.web.multipart.MultipartFile;
/** /**
* *
@ -26,9 +27,10 @@ public interface ISchCollectErrorLogService {
* *
* *
* @param addSchCollectErrorLogDTO * @param addSchCollectErrorLogDTO
* @param multipartFiles
* @return * @return
*/ */
boolean add(AddSchCollectErrorLogDTO addSchCollectErrorLogDTO); boolean add(AddSchCollectErrorLogDTO addSchCollectErrorLogDTO, MultipartFile[] multipartFiles) throws Exception;
/** /**
* *

@ -1,5 +1,6 @@
package com.docus.server.service.impl; package com.docus.server.service.impl;
import com.docus.infrastructure.redis.service.IdService;
import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.request.SearchDTO;
import com.docus.infrastructure.web.response.PageResult; import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.convert.SchCollectErrorLogConvert; import com.docus.server.convert.SchCollectErrorLogConvert;
@ -8,11 +9,16 @@ import com.docus.server.dto.scheduling.management.schcollecterrorlog.DeleteSchCo
import com.docus.server.dto.scheduling.management.schcollecterrorlog.EditSchCollectErrorLogDTO; import com.docus.server.dto.scheduling.management.schcollecterrorlog.EditSchCollectErrorLogDTO;
import com.docus.server.entity.scheduling.management.SchCollectErrorLog; import com.docus.server.entity.scheduling.management.SchCollectErrorLog;
import com.docus.server.infrastructure.dao.ISchCollectErrorLogDao; import com.docus.server.infrastructure.dao.ISchCollectErrorLogDao;
import com.docus.server.service.IFileUploadService;
import com.docus.server.service.ISchCollectErrorLogService; import com.docus.server.service.ISchCollectErrorLogService;
import com.docus.server.vo.scheduling.management.schcollecterrorlog.SchCollectErrorLogVO; import com.docus.server.vo.scheduling.management.schcollecterrorlog.SchCollectErrorLogVO;
import com.docus.server.vo.scheduling.management.schcollectorversionfile.UploadFileVO;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
/** /**
* *
@ -24,6 +30,10 @@ import javax.annotation.Resource;
public class SchCollectErrorLogServiceImpl implements ISchCollectErrorLogService { public class SchCollectErrorLogServiceImpl implements ISchCollectErrorLogService {
@Resource @Resource
private ISchCollectErrorLogDao iSchCollectErrorLogDao; private ISchCollectErrorLogDao iSchCollectErrorLogDao;
@Resource
private IFileUploadService iFileUploadService;
@Resource
private IdService idService;
/** /**
* *
@ -51,11 +61,19 @@ public class SchCollectErrorLogServiceImpl implements ISchCollectErrorLogService
* *
* *
* @param addSchCollectErrorLogDTO * @param addSchCollectErrorLogDTO
* @param multipartFiles
* @return * @return
*/ */
@Override @Override
public boolean add(AddSchCollectErrorLogDTO addSchCollectErrorLogDTO) { public boolean add(AddSchCollectErrorLogDTO addSchCollectErrorLogDTO, MultipartFile[] multipartFiles) throws Exception {
List<UploadFileVO> uploadFileVOList = iFileUploadService.uploadFile(multipartFiles, "COLLECTOR_TASK_ERROR_LOG");
SchCollectErrorLog schCollectErrorLog = SchCollectErrorLogConvert.INSTANCE.convertDO(addSchCollectErrorLogDTO); SchCollectErrorLog schCollectErrorLog = SchCollectErrorLogConvert.INSTANCE.convertDO(addSchCollectErrorLogDTO);
if (!CollectionUtils.isEmpty(uploadFileVOList)) {
schCollectErrorLog.setScreenPath(uploadFileVOList.get(0).getFilePath());
}
schCollectErrorLog.setId(idService.getDateSeq());
return iSchCollectErrorLogDao.add(schCollectErrorLog); return iSchCollectErrorLogDao.add(schCollectErrorLog);
} }

@ -2,15 +2,21 @@ package com.docus.server.service.impl;
import com.docus.core.util.ListUtils; import com.docus.core.util.ListUtils;
import com.docus.core.util.property.Setters; import com.docus.core.util.property.Setters;
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.request.SearchDTO;
import com.docus.infrastructure.web.response.PageResult; import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.convert.SchCollectRecordConvert; import com.docus.server.convert.SchCollectRecordConvert;
import com.docus.server.convert.SchCollectRecordRetryLogConvert;
import com.docus.server.dto.scheduling.management.schcollectrecord.AddSchCollectRecordDTO; import com.docus.server.dto.scheduling.management.schcollectrecord.AddSchCollectRecordDTO;
import com.docus.server.dto.scheduling.management.schcollectrecord.DeleteSchCollectRecordDTO; import com.docus.server.dto.scheduling.management.schcollectrecord.DeleteSchCollectRecordDTO;
import com.docus.server.dto.scheduling.management.schcollectrecord.EditSchCollectRecordDTO; import com.docus.server.dto.scheduling.management.schcollectrecord.EditSchCollectRecordDTO;
import com.docus.server.entity.scheduling.management.SchCollectRecord; import com.docus.server.entity.scheduling.management.SchCollectRecord;
import com.docus.server.entity.scheduling.management.SchCollectRecordRetryLog;
import com.docus.server.entity.scheduling.management.SchSystemParams; import com.docus.server.entity.scheduling.management.SchSystemParams;
import com.docus.server.enums.RetryTaskEnum;
import com.docus.server.infrastructure.dao.ISchCollectRecordDao; import com.docus.server.infrastructure.dao.ISchCollectRecordDao;
import com.docus.server.infrastructure.dao.ISchCollectRecordRetryLogDao;
import com.docus.server.infrastructure.dao.ISchSystemParamsDao; import com.docus.server.infrastructure.dao.ISchSystemParamsDao;
import com.docus.server.service.ISchCollectRecordService; import com.docus.server.service.ISchCollectRecordService;
import com.docus.server.vo.scheduling.management.schcollectrecord.SchCollectRecordVO; import com.docus.server.vo.scheduling.management.schcollectrecord.SchCollectRecordVO;
@ -32,6 +38,8 @@ public class SchCollectRecordServiceImpl implements ISchCollectRecordService {
@Resource @Resource
private ISchCollectRecordDao iSchCollectRecordDao; private ISchCollectRecordDao iSchCollectRecordDao;
@Resource @Resource
private ISchCollectRecordRetryLogDao iSchCollectRecordRetryLogDao;
@Resource
private ISchSystemParamsDao iSchSystemParamsDao; private ISchSystemParamsDao iSchSystemParamsDao;
/** /**
@ -92,8 +100,29 @@ public class SchCollectRecordServiceImpl implements ISchCollectRecordService {
*/ */
@Override @Override
public boolean edit(EditSchCollectRecordDTO editSchCollectRecordDTO) { public boolean edit(EditSchCollectRecordDTO editSchCollectRecordDTO) {
SchCollectRecord schCollectRecord = SchCollectRecordConvert.INSTANCE.convertDO(editSchCollectRecordDTO); RetryTaskEnum isRetryTask = editSchCollectRecordDTO.getIsRetryTask();
return iSchCollectRecordDao.edit(schCollectRecord); Long id = editSchCollectRecordDTO.getId();
if (RetryTaskEnum.NO_RETRY_TASK.equals(isRetryTask)) {
//不是重试任务
SchCollectRecord schCollectRecord = iSchCollectRecordDao.findById(id);
if (null == schCollectRecord) {
throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "不重复任务采集记录不存在!" + id);
}
schCollectRecord = SchCollectRecordConvert.INSTANCE.convertDO(editSchCollectRecordDTO, schCollectRecord);
return iSchCollectRecordDao.updateById(schCollectRecord);
} else {
//重试任务
SchCollectRecordRetryLog schCollectRecordRetryLog = iSchCollectRecordRetryLogDao.findById(id);
if (null == schCollectRecordRetryLog) {
throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "不重复任务采集记录不存在!" + id);
}
schCollectRecordRetryLog = SchCollectRecordRetryLogConvert.INSTANCE.convertDO(editSchCollectRecordDTO, schCollectRecordRetryLog);
return iSchCollectRecordRetryLogDao.updateById(schCollectRecordRetryLog);
}
} }
/** /**

@ -1,5 +1,6 @@
package com.docus.server.service.impl; package com.docus.server.service.impl;
import com.docus.infrastructure.redis.service.IdService;
import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.request.SearchDTO;
import com.docus.infrastructure.web.response.PageResult; import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.convert.SchVirtualLogConvert; import com.docus.server.convert.SchVirtualLogConvert;
@ -24,6 +25,8 @@ import javax.annotation.Resource;
public class SchVirtualLogServiceImpl implements ISchVirtualLogService { public class SchVirtualLogServiceImpl implements ISchVirtualLogService {
@Resource @Resource
private ISchVirtualLogDao iSchVirtualLogDao; private ISchVirtualLogDao iSchVirtualLogDao;
@Resource
private IdService idService;
/** /**
* *
@ -56,6 +59,7 @@ public class SchVirtualLogServiceImpl implements ISchVirtualLogService {
@Override @Override
public boolean add(AddSchVirtualLogDTO addSchVirtualLogDTO) { public boolean add(AddSchVirtualLogDTO addSchVirtualLogDTO) {
SchVirtualLog schVirtualLog = SchVirtualLogConvert.INSTANCE.convertDO(addSchVirtualLogDTO); SchVirtualLog schVirtualLog = SchVirtualLogConvert.INSTANCE.convertDO(addSchVirtualLogDTO);
schVirtualLog.setId(idService.getDateSeq());
return iSchVirtualLogDao.add(schVirtualLog); return iSchVirtualLogDao.add(schVirtualLog);
} }

@ -14,6 +14,7 @@
<result column="task_memo" property="taskMemo"/> <result column="task_memo" property="taskMemo"/>
<result column="start_time" property="startTime"/> <result column="start_time" property="startTime"/>
<result column="end_time" property="endTime"/> <result column="end_time" property="endTime"/>
<result column="elapsed_time" property="elapsedTime"/>
<result column="task_detail_info" property="taskDetailInfo"/> <result column="task_detail_info" property="taskDetailInfo"/>
<result column="task_exec_state" property="taskExecState"/> <result column="task_exec_state" property="taskExecState"/>
<result column="sub_task_exec_state" property="subTaskExecState"/> <result column="sub_task_exec_state" property="subTaskExecState"/>
@ -25,7 +26,7 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
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 id, collect_record_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> </sql>
</mapper> </mapper>

@ -7,8 +7,11 @@ import com.docus.server.dto.scheduling.management.schcollecterrorlog.DeleteSchCo
import com.docus.server.dto.scheduling.management.schcollecterrorlog.EditSchCollectErrorLogDTO; import com.docus.server.dto.scheduling.management.schcollecterrorlog.EditSchCollectErrorLogDTO;
import com.docus.server.vo.scheduling.management.schcollecterrorlog.SchCollectErrorLogVO; import com.docus.server.vo.scheduling.management.schcollecterrorlog.SchCollectErrorLogVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
@ -16,6 +19,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;
/** /**
@ -57,7 +62,10 @@ public interface SchCollectErrorLogApi {
*/ */
@ApiOperation("新增") @ApiOperation("新增")
@PostMapping("/add") @PostMapping("/add")
boolean add(@RequestBody AddSchCollectErrorLogDTO addSchCollectErrorLogDTO); @ApiImplicitParams({
@ApiImplicitParam(name = "screenImage", value = "文件", required = true, dataTypeClass = MultipartFile.class)
})
boolean add(@Validated AddSchCollectErrorLogDTO addSchCollectErrorLogDTO, @RequestPart("screenImage") MultipartFile[] multipartFiles) throws Exception;
/** /**
* *

@ -1,44 +1,38 @@
package com.docus.server.dto.scheduling.management.schcollecterrorlog; package com.docus.server.dto.scheduling.management.schcollecterrorlog;
import com.docus.server.enums.RetryTaskEnum;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.util.Date;
/** /**
* * Add DTO
* AddDTO *
* * @author AutoGenerator
* @author AutoGenerator * @since 2023-07-15
* @since 2023-07-15 */
*/
@Data @Data
@ApiModel(value="AddSchCollectErrorLogDTO对象", description="采集器异常日志") @ApiModel(value = "AddSchCollectErrorLogDTO对象", description = "采集器异常日志")
public class AddSchCollectErrorLogDTO implements Serializable { public class AddSchCollectErrorLogDTO implements Serializable {
@ApiModelProperty(value = "主键")
private Long id;
@ApiModelProperty(value = "采集器终端ip") @ApiModelProperty(value = "采集器终端ip")
private String terminatorIp; private String terminatorIp;
@ApiModelProperty(value = "采集器id") @NotNull(message = "采集记录主键id不能为空")
private Long collectorId;
@ApiModelProperty(value = "采集记录主键id") @ApiModelProperty(value = "采集记录主键id")
private Long collectRecordId; private Long collectRecordId;
@NotNull(message = "任务id不能为空")
@ApiModelProperty(value = "任务id") @ApiModelProperty(value = "任务id")
private Long taskId; private Long taskId;
@NotNull(message = "任务类型不能为空")
@ApiModelProperty(value = "0不是重试任务1是重试任务") @ApiModelProperty(value = "0不是重试任务1是重试任务")
private String isRetryTask; private RetryTaskEnum isRetryTask;
@ApiModelProperty(value = "异常等级") @ApiModelProperty(value = "异常等级")
private String level; private String level;
@ -49,14 +43,13 @@ public class AddSchCollectErrorLogDTO implements Serializable {
@ApiModelProperty(value = "异常信息") @ApiModelProperty(value = "异常信息")
private String exceptionInfo; private String exceptionInfo;
@ApiModelProperty(value = "本地存储路径") @ApiModelProperty(value = "入库时间")
private String screenPath; private Date beginTime;
@ApiModelProperty(value = "产生时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "入库更新时间")
private LocalDateTime updateTime; private Date endTime;
@ApiModelProperty(value = "采集器执行任务耗时时间")
private Long takeUpTime;
} }

@ -1,5 +1,6 @@
package com.docus.server.dto.scheduling.management.schcollectrecord; package com.docus.server.dto.scheduling.management.schcollectrecord;
import com.docus.server.enums.RetryTaskEnum;
import com.docus.server.enums.StateEnum; import com.docus.server.enums.StateEnum;
import com.docus.server.enums.SubStateEnum; import com.docus.server.enums.SubStateEnum;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
@ -23,20 +24,11 @@ public class EditSchCollectRecordDTO implements Serializable {
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
private Long id; private Long id;
@ApiModelProperty(value = "终端主键")
private Long terminatorId;
@ApiModelProperty(value = "采集器id")
private Long collectorId;
@ApiModelProperty(value = "任务id") @ApiModelProperty(value = "任务id")
private Long taskId; private Long taskId;
@ApiModelProperty(value = "任务名称") @ApiModelProperty(value = "0不是重试任务1是重试任务")
private String taskName; private RetryTaskEnum isRetryTask;
@ApiModelProperty(value = "任务描述")
private String taskMemo;
@ApiModelProperty(value = "任务起始时间范围") @ApiModelProperty(value = "任务起始时间范围")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ -49,9 +41,6 @@ public class EditSchCollectRecordDTO implements Serializable {
@ApiModelProperty(value = "任务耗时时间,单位:毫秒") @ApiModelProperty(value = "任务耗时时间,单位:毫秒")
private Long elapsedTime; private Long elapsedTime;
@ApiModelProperty(value = "任务详细信息")
private String taskDetailInfo;
@ApiModelProperty(value = "任务执行状态0成功1失败") @ApiModelProperty(value = "任务执行状态0成功1失败")
private StateEnum taskExecState; private StateEnum taskExecState;
@ -60,17 +49,4 @@ public class EditSchCollectRecordDTO implements Serializable {
@ApiModelProperty(value = "最近一次任务执行失败原因") @ApiModelProperty(value = "最近一次任务执行失败原因")
private String lastTaskErrorMsg; private String lastTaskErrorMsg;
@ApiModelProperty(value = "入库时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@ApiModelProperty(value = "redis队列任务原始报文")
private String taskOriginJson;
} }

@ -1,30 +1,23 @@
package com.docus.server.dto.scheduling.management.schvirtuallog; package com.docus.server.dto.scheduling.management.schvirtuallog;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.util.Date;
/** /**
* * 使 AddDTO
* 使 AddDTO *
* * @author AutoGenerator
* @author AutoGenerator * @since 2023-07-15
* @since 2023-07-15 */
*/
@Data @Data
@ApiModel(value="AddSchVirtualLogDTO对象", description="虚拟机使用情况") @ApiModel(value = "AddSchVirtualLogDTO对象", description = "虚拟机使用情况")
public class AddSchVirtualLogDTO implements Serializable { public class AddSchVirtualLogDTO implements Serializable {
@ApiModelProperty(value = "终端id")
private Long id;
@ApiModelProperty(value = "CPU使用率") @ApiModelProperty(value = "CPU使用率")
private String cpuUtilization; private String cpuUtilization;
@ -43,17 +36,11 @@ public class AddSchVirtualLogDTO implements Serializable {
@ApiModelProperty(value = "采集器终端ip地址") @ApiModelProperty(value = "采集器终端ip地址")
private String ip; private String ip;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
@ApiModelProperty(value = "客户端创建时间") @ApiModelProperty(value = "客户端创建时间")
private LocalDateTime clientTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date clientTime;
@ApiModelProperty(value = "多个磁盘大小单位MB当前使用量和总容量单位MB") @ApiModelProperty(value = "多个磁盘大小单位MB当前使用量和总容量单位MB")
private String diskJson; private String diskJson;
} }

@ -1,30 +1,29 @@
package com.docus.server.entity.scheduling.management; package com.docus.server.entity.scheduling.management;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField; 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.RetryTaskEnum;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*; import java.io.Serializable;
import java.util.Date;
/** /**
* *
* *
* * @author AutoGenerator
* @author AutoGenerator * @since 2023-07-15
* @since 2023-07-15 */
*/
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@TableName("sch_collect_error_log") @TableName("sch_collect_error_log")
@ApiModel(value="SchCollectErrorLog对象", description="采集器异常日志") @ApiModel(value = "SchCollectErrorLog对象", description = "采集器异常日志")
public class SchCollectErrorLog implements Serializable { public class SchCollectErrorLog implements Serializable {
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
@ -49,7 +48,7 @@ public class SchCollectErrorLog implements Serializable {
@ApiModelProperty(value = "0不是重试任务1是重试任务") @ApiModelProperty(value = "0不是重试任务1是重试任务")
@TableField("is_retry_task") @TableField("is_retry_task")
private String isRetryTask; private RetryTaskEnum isRetryTask;
@ApiModelProperty(value = "异常等级") @ApiModelProperty(value = "异常等级")
@TableField("level") @TableField("level")
@ -69,11 +68,13 @@ public class SchCollectErrorLog implements Serializable {
@ApiModelProperty(value = "产生时间") @ApiModelProperty(value = "产生时间")
@TableField("create_time") @TableField("create_time")
private LocalDateTime createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
@TableField("update_time") @TableField("update_time")
private LocalDateTime updateTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
} }

@ -65,6 +65,10 @@ public class SchCollectRecordRetryLog implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime; private Date endTime;
@ApiModelProperty(value = "任务耗时时间,单位:毫秒")
@TableField("elapsed_time")
private Long elapsedTime;
@ApiModelProperty(value = "任务详细信息") @ApiModelProperty(value = "任务详细信息")
@TableField("task_detail_info") @TableField("task_detail_info")
private String taskDetailInfo; private String taskDetailInfo;

@ -1,30 +1,28 @@
package com.docus.server.entity.scheduling.management; package com.docus.server.entity.scheduling.management;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*; import java.io.Serializable;
import java.util.Date;
/** /**
* * 使
* 使 *
* * @author AutoGenerator
* @author AutoGenerator * @since 2023-07-15
* @since 2023-07-15 */
*/
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@TableName("sch_virtual_log") @TableName("sch_virtual_log")
@ApiModel(value="SchVirtualLog对象", description="虚拟机使用情况") @ApiModel(value = "SchVirtualLog对象", description = "虚拟机使用情况")
public class SchVirtualLog implements Serializable { public class SchVirtualLog implements Serializable {
@ApiModelProperty(value = "终端id") @ApiModelProperty(value = "终端id")
@ -55,17 +53,18 @@ public class SchVirtualLog implements Serializable {
@TableField("ip") @TableField("ip")
private String ip; private String ip;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "入库时间")
@TableField("create_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime; private Date createTime;
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "入库更新时间")
@TableField("update_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime; private Date updateTime;
@ApiModelProperty(value = "客户端创建时间") @ApiModelProperty(value = "客户端创建时间")
@TableField("client_time") @TableField("client_time")
private LocalDateTime clientTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date clientTime;
@ApiModelProperty(value = "多个磁盘大小单位MB当前使用量和总容量单位MB") @ApiModelProperty(value = "多个磁盘大小单位MB当前使用量和总容量单位MB")
@TableField("disk_json") @TableField("disk_json")

@ -0,0 +1,29 @@
package com.docus.server.enums;
import com.docus.infrastructure.core.db.enums.IIntegerEnum;
public enum RetryTaskEnum implements IIntegerEnum {
NO_RETRY_TASK(0, "不是重试任务"),
RETRY_TASK(1, "是重试任务");
private Integer value;
private String display;
RetryTaskEnum(Integer value, String display) {
this.value = value;
this.display = display;
}
@Override
public Integer getValue() {
return value;
}
@Override
public String getDisplay() {
return display;
}
}

@ -3,23 +3,18 @@ package com.docus.server.vo.scheduling.management.schcollecterrorlog;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.util.Date;
/** /**
* * VO
* VO *
* * @author AutoGenerator
* @author AutoGenerator * @since 2023-07-15
* @since 2023-07-15 */
*/
@Data @Data
@ApiModel(value="SchCollectErrorLogVO对象", description="采集器异常日志") @ApiModel(value = "SchCollectErrorLogVO对象", description = "采集器异常日志")
public class SchCollectErrorLogVO implements Serializable { public class SchCollectErrorLogVO implements Serializable {
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
@ -53,10 +48,10 @@ public class SchCollectErrorLogVO implements Serializable {
private String screenPath; private String screenPath;
@ApiModelProperty(value = "产生时间") @ApiModelProperty(value = "产生时间")
private LocalDateTime createTime; private Date createTime;
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime; private Date updateTime;
} }

Loading…
Cancel
Save