diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/TaskTerminatorErrorLogController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/TaskTerminatorErrorLogController.java index 8967281..e136305 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/TaskTerminatorErrorLogController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/TaskTerminatorErrorLogController.java @@ -6,6 +6,7 @@ import com.docus.server.api.scheduling.management.TaskTerminatorErrorLogApi; import com.docus.server.entity.scheduling.management.TaskTerminatorErrorLog; import com.docus.server.service.ITaskTerminatorErrorLogService; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.util.List; @@ -52,7 +53,7 @@ public class TaskTerminatorErrorLogController implements TaskTerminatorErrorLogA * @return 成功或失败 */ @Override - public boolean add(TaskTerminatorErrorLog taskTerminatorErrorLog) { + public boolean add(TaskTerminatorErrorLog taskTerminatorErrorLog, MultipartFile screenUrl) { return iTaskTerminatorErrorLogService.add(taskTerminatorErrorLog); } diff --git a/collector-scheduling-management/src/test/java/com/docus/server/TsmsAuthApiApplicationTests.java b/collector-scheduling-management/src/test/java/com/docus/server/TsmsAuthApiApplicationTests.java index 09102c4..18fefea 100644 --- a/collector-scheduling-management/src/test/java/com/docus/server/TsmsAuthApiApplicationTests.java +++ b/collector-scheduling-management/src/test/java/com/docus/server/TsmsAuthApiApplicationTests.java @@ -44,7 +44,7 @@ class ScrewTests { //打开目录 .openOutputDir(false) //文件类型 - .fileType(EngineFileType.WORD) + .fileType(EngineFileType.HTML) //生成模板实现 .produceType(EngineTemplateType.freemarker) .build(); diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorErrorLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorErrorLogApi.java index f5d52c5..418892f 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorErrorLogApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorErrorLogApi.java @@ -4,8 +4,11 @@ import com.docus.infrastructure.web.request.SearchRequest; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.scheduling.management.TaskTerminatorErrorLog; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; 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.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -13,6 +16,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -57,8 +62,11 @@ public interface TaskTerminatorErrorLogApi { * @return 成功或失败 */ @ApiOperation("新增") - @PostMapping("/add") - boolean add(@RequestBody TaskTerminatorErrorLog taskTerminatorErrorLog); + @PostMapping(value = "/add", headers = {"content-type=multipart/form-data"}) + @ApiImplicitParams({ + @ApiImplicitParam(name = "screenUrl", value = "截图文件", required = true, dataTypeClass = MultipartFile.class) + }) + boolean add(@Validated TaskTerminatorErrorLog taskTerminatorErrorLog, @RequestPart("screenUrl") MultipartFile screenUrl); /** * 编辑 diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskTerminator.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskTerminator.java index fc78e14..35286b1 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskTerminator.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskTerminator.java @@ -32,6 +32,14 @@ public class TaskTerminator implements Serializable { @TableId(value = "id", type = IdType.ASSIGN_UUID) private Long id; + @ApiModelProperty(value = "终端IP") + @TableField("terminator_ip") + private String terminatorIp; + + @ApiModelProperty(value = "资源管理器名称") + @TableField("terminator_name") + private String terminatorName; + @ApiModelProperty(value = "只干某些任务,任务偏好属性") @TableField("only_collector_ids") private String onlyCollectorIds; @@ -44,17 +52,13 @@ public class TaskTerminator implements Serializable { @TableField("not_collector_ids") private String notCollectorIds; - @ApiModelProperty(value = "资源管理器名称") - @TableField("terminator_name") - private String terminatorName; - @ApiModelProperty(value = "终端重试键") @TableField("retry_key") private String retryKey; - @ApiModelProperty(value = "终端IP") - @TableField("terminator_ip") - private String terminatorIp; + @ApiModelProperty(value = "是否限制采集器类型,0:否,1:是") + @TableField("restrict_state") + private String restrictState; @ApiModelProperty(value = "忙闲状态,0:空闲,1:繁忙") @TableField("busy_state") diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskTerminatorCollect.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskTerminatorCollect.java index 98727b2..0cbfc61 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskTerminatorCollect.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskTerminatorCollect.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.docus.server.enums.CollectTypeEnum; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -43,7 +42,11 @@ public class TaskTerminatorCollect implements Serializable { @ApiModelProperty(value = "采集器类型") @TableField("collect_type") - private CollectTypeEnum collectType; + private String collectType; + + @ApiModelProperty(value = "任务id") + @TableField("task_id") + private Long taskId; @ApiModelProperty(value = "任务名称") @TableField("task_name") @@ -69,6 +72,10 @@ public class TaskTerminatorCollect implements Serializable { @TableField("task_exec_state") private String taskExecState; + @ApiModelProperty(value = "子任务执行状态:0:接收,1:启动,2:异常,3:推迟,4:完成,5:作废") + @TableField("sub_task_exec_state") + private String subTaskExecState; + @ApiModelProperty(value = "任务其他扩展配置") @TableField("task_params") private String taskParams; @@ -77,6 +84,11 @@ public class TaskTerminatorCollect implements Serializable { @TableField("last_task_error_msg") private String lastTaskErrorMsg; + @ApiModelProperty(value = "任务耗时时间") + @TableField("elapsed_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date elapsedTime; + @ApiModelProperty(value = "入库时间") @TableField("create_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskTerminatorCollectRetryLog.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskTerminatorCollectRetryLog.java index 8237f09..a85a9d9 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskTerminatorCollectRetryLog.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskTerminatorCollectRetryLog.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.docus.server.enums.CollectTypeEnum; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -46,7 +45,11 @@ public class TaskTerminatorCollectRetryLog implements Serializable { @ApiModelProperty(value = "采集器类型") @TableField("collect_type") - private CollectTypeEnum collectType; + private String collectType; + + @ApiModelProperty(value = "任务id") + @TableField("task_id") + private Long taskId; @ApiModelProperty(value = "任务名称") @TableField("task_name") @@ -74,6 +77,10 @@ public class TaskTerminatorCollectRetryLog implements Serializable { @TableField("task_exec_state") private String taskExecState; + @ApiModelProperty(value = "子任务执行状态:0:接收,1:启动,2:异常,3:推迟,4:完成,5:作废") + @TableField("sub_task_exec_state") + private String subTaskExecState; + @ApiModelProperty(value = "任务其他扩展配置") @TableField("task_params") private String taskParams;