🚧 定时任务.

This commit is contained in:
lijiahangmax
2024-04-12 00:07:36 +08:00
parent 8d550b9057
commit d757e13b46
34 changed files with 118 additions and 114 deletions

View File

@@ -1,4 +1,4 @@
### 创建计划执行任务
### 创建计划任务
POST {{baseUrl}}/asset/exec-job/create
Content-Type: application/json
Authorization: {{token}}
@@ -13,7 +13,7 @@ Authorization: {{token}}
}
### 更新计划执行任务
### 更新计划任务
PUT {{baseUrl}}/asset/exec-job/update
Content-Type: application/json
Authorization: {{token}}
@@ -31,7 +31,7 @@ Authorization: {{token}}
}
### 更新计划执行任务状态
### 更新计划任务状态
PUT {{baseUrl}}/asset/exec-job/update-status
Content-Type: application/json
Authorization: {{token}}
@@ -42,12 +42,12 @@ Authorization: {{token}}
}
### 查询计划执行任务
### 查询计划任务
GET {{baseUrl}}/asset/exec-job/get?id=1
Authorization: {{token}}
### 分页查询计划执行任务
### 分页查询计划任务
POST {{baseUrl}}/asset/exec-job/query
Content-Type: application/json
Authorization: {{token}}
@@ -62,7 +62,7 @@ Authorization: {{token}}
}
### 删除计划执行任务
### 删除计划任务
DELETE {{baseUrl}}/asset/exec-job/delete?id=1
Authorization: {{token}}

View File

@@ -22,13 +22,13 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 计划执行任务 api
* 计划任务 api
*
* @author Jiahang Li
* @version 1.0.3
* @since 2024-3-28 12:03
*/
@Tag(name = "asset - 计划执行任务服务")
@Tag(name = "asset - 计划任务服务")
@Slf4j
@Validated
@RestWrapper
@@ -42,7 +42,7 @@ public class ExecJobController {
@OperatorLog(ExecJobOperatorType.CREATE)
@PostMapping("/create")
@Operation(summary = "创建计划执行任务")
@Operation(summary = "创建计划任务")
@PreAuthorize("@ss.hasPermission('asset:exec-job:create')")
public Long createExecJob(@Validated @RequestBody ExecJobCreateRequest request) {
return execJobService.createExecJob(request);
@@ -50,7 +50,7 @@ public class ExecJobController {
@OperatorLog(ExecJobOperatorType.UPDATE)
@PutMapping("/update")
@Operation(summary = "更新计划执行任务")
@Operation(summary = "更新计划任务")
@PreAuthorize("@ss.hasPermission('asset:exec-job:update')")
public Integer updateExecJob(@Validated @RequestBody ExecJobUpdateRequest request) {
return execJobService.updateExecJobById(request);
@@ -58,7 +58,7 @@ public class ExecJobController {
@OperatorLog(ExecJobOperatorType.UPDATE_STATUS)
@PutMapping("/update-status")
@Operation(summary = "更新计划执行任务状态")
@Operation(summary = "更新计划任务状态")
@PreAuthorize("@ss.hasPermission('asset:exec-job:update-status')")
public Integer updateExecJobStatus(@Validated @RequestBody ExecJobUpdateStatusRequest request) {
return execJobService.updateExecJobStatus(request);
@@ -66,7 +66,7 @@ public class ExecJobController {
@IgnoreLog(IgnoreLogMode.RET)
@GetMapping("/get")
@Operation(summary = "查询计划执行任务")
@Operation(summary = "查询计划任务")
@Parameter(name = "id", description = "id", required = true)
@PreAuthorize("@ss.hasPermission('asset:exec-job:query')")
public ExecJobVO getExecJob(@RequestParam("id") Long id) {
@@ -75,7 +75,7 @@ public class ExecJobController {
@IgnoreLog(IgnoreLogMode.RET)
@PostMapping("/query")
@Operation(summary = "分页查询计划执行任务")
@Operation(summary = "分页查询计划任务")
@PreAuthorize("@ss.hasPermission('asset:exec-job:query')")
public DataGrid<ExecJobVO> getExecJobPage(@Validated(Page.class) @RequestBody ExecJobQueryRequest request) {
return execJobService.getExecJobPage(request);
@@ -83,7 +83,7 @@ public class ExecJobController {
@OperatorLog(ExecJobOperatorType.DELETE)
@DeleteMapping("/delete")
@Operation(summary = "删除计划执行任务")
@Operation(summary = "删除计划任务")
@Parameter(name = "id", description = "id", required = true)
@PreAuthorize("@ss.hasPermission('asset:exec-job:delete')")
public Integer deleteExecJob(@RequestParam("id") Long id) {
@@ -92,7 +92,7 @@ public class ExecJobController {
@OperatorLog(ExecJobOperatorType.TRIGGER)
@PostMapping("/trigger")
@Operation(summary = "手动触发计划执行任务")
@Operation(summary = "手动触发计划任务")
@PreAuthorize("@ss.hasPermission('asset:exec-job:trigger')")
public HttpWrapper<?> triggerExecJob(@Validated @RequestBody ExecJobTriggerRequest request) {
execJobService.manualTriggerExecJob(request.getId());

View File

@@ -1,9 +1,9 @@
### 查询计划执行任务日志
### 查询计划任务日志
GET {{baseUrl}}/asset/exec-job-log/get?id=1
Authorization: {{token}}
### 分页查询计划执行任务日志
### 分页查询计划任务日志
POST {{baseUrl}}/asset/exec-job-log/query
Content-Type: application/json
Authorization: {{token}}
@@ -20,12 +20,12 @@ Authorization: {{token}}
}
### 删除计划执行任务日志
### 删除计划任务日志
DELETE {{baseUrl}}/asset/exec-job-log/delete?id=1
Authorization: {{token}}
### 批量删除计划执行任务日志
### 批量删除计划任务日志
DELETE {{baseUrl}}/asset/exec-job-log/batch-delete?idList=1,2,3
Authorization: {{token}}

View File

@@ -28,13 +28,13 @@ import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 计划执行任务日志 api
* 计划任务日志 api
*
* @author Jiahang Li
* @version 1.0.1
* @since 2024-3-11 11:31
*/
@Tag(name = "asset - 计划执行任务日志服务")
@Tag(name = "asset - 计划任务日志服务")
@Slf4j
@Validated
@RestWrapper
@@ -53,7 +53,7 @@ public class ExecJobLogController {
@IgnoreLog(IgnoreLogMode.RET)
@PostMapping("/query")
@Operation(summary = "分页查询计划执行任务日志")
@Operation(summary = "分页查询计划任务日志")
@PreAuthorize("@ss.hasPermission('asset:exec-job-log:query')")
public DataGrid<ExecLogVO> getExecJobLogPage(@Validated(Page.class) @RequestBody ExecLogQueryRequest request) {
request.setSource(SOURCE);
@@ -62,7 +62,7 @@ public class ExecJobLogController {
@IgnoreLog(IgnoreLogMode.RET)
@GetMapping("/get")
@Operation(summary = "查询计划执行任务日志")
@Operation(summary = "查询计划任务日志")
@PreAuthorize("@ss.hasPermission('asset:exec-job-log:query')")
public ExecLogVO getExecJobLog(@RequestParam("id") Long id) {
return execLogService.getExecLog(id, SOURCE);
@@ -87,7 +87,7 @@ public class ExecJobLogController {
@OperatorLog(ExecJobLogOperatorType.DELETE)
@DeleteMapping("/delete")
@Operation(summary = "删除计划执行任务日志")
@Operation(summary = "删除计划任务日志")
@Parameter(name = "id", description = "id", required = true)
@PreAuthorize("@ss.hasPermission('asset:exec-job-log:delete')")
public Integer deleteExecJobLog(@RequestParam("id") Long id) {
@@ -96,7 +96,7 @@ public class ExecJobLogController {
@OperatorLog(ExecJobLogOperatorType.DELETE)
@DeleteMapping("/batch-delete")
@Operation(summary = "删除计划执行任务日志")
@Operation(summary = "删除计划任务日志")
@Parameter(name = "idList", description = "idList", required = true)
@PreAuthorize("@ss.hasPermission('asset:exec-job-log:delete')")
public Integer batchDeleteExecJobLog(@RequestParam("idList") List<Long> idList) {
@@ -113,7 +113,7 @@ public class ExecJobLogController {
}
@PostMapping("/query-count")
@Operation(summary = "查询计划执行任务日志数量")
@Operation(summary = "查询计划任务日志数量")
@PreAuthorize("@ss.hasPermission('asset:exec-job-log:management:clear')")
public Long getExecJobLogCount(@RequestBody ExecLogQueryRequest request) {
request.setSource(SOURCE);
@@ -122,7 +122,7 @@ public class ExecJobLogController {
@OperatorLog(ExecJobLogOperatorType.CLEAR)
@PostMapping("/clear")
@Operation(summary = "清空计划执行任务日志")
@Operation(summary = "清空计划任务日志")
@PreAuthorize("@ss.hasPermission('asset:exec-job-log:management:clear')")
public Integer clearExecJobLog(@RequestBody ExecLogQueryRequest request) {
request.setSource(SOURCE);
@@ -130,8 +130,8 @@ public class ExecJobLogController {
}
@PostMapping("/tail")
@Operation(summary = "查看计划执行任务日志")
@PreAuthorize("@ss.hasAnyPermission('asset:exec-job-log:query', 'asset:exec-job:exec')")
@Operation(summary = "查看计划任务日志")
@PreAuthorize("@ss.hasPermission('asset:exec-job-log:query')")
public String getExecJobLogTailToken(@Validated @RequestBody ExecLogTailRequest request) {
request.setSource(SOURCE);
return execLogService.getExecLogTailToken(request);
@@ -139,8 +139,8 @@ public class ExecJobLogController {
@OperatorLog(ExecJobLogOperatorType.DOWNLOAD)
@GetMapping("/download")
@Operation(summary = "下载计划执行任务日志")
@PreAuthorize("@ss.hasAnyPermission('asset:exec-job-log:query', 'asset:exec-job:exec')")
@Operation(summary = "下载计划任务日志")
@PreAuthorize("@ss.hasPermission('asset:exec-job-log:query')")
public void downloadExecJobLogFile(@RequestParam("id") Long id, HttpServletResponse response) {
execLogService.downloadLogFile(id, SOURCE, response);
}

View File

@@ -11,7 +11,7 @@ import org.mapstruct.factory.Mappers;
import java.util.List;
/**
* 计划执行任务 内部对象转换器
* 计划任务 内部对象转换器
*
* @author Jiahang Li
* @version 1.0.3

View File

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 计划执行任务 Mapper 接口
* 计划任务 Mapper 接口
*
* @author Jiahang Li
* @version 1.0.3

View File

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 计划执行任务主机 Mapper 接口
* 计划任务主机 Mapper 接口
*
* @author Jiahang Li
* @version 1.0.3

View File

@@ -31,7 +31,7 @@ public class ExecCommandLogOperatorType extends InitializingOperatorTypes {
new OperatorType(H, DELETE, "删除批量执行日志 <sb>${count}</sb> 条"),
new OperatorType(H, DELETE_HOST, "删除批量执行主机日志 <sb>${logId}</sb> <sb>${hostName}</sb>"),
new OperatorType(H, CLEAR, "清理批量执行日志 <sb>${count}</sb> 条"),
new OperatorType(L, DOWNLOAD, "下载主机执行日志 <sb>${logId}</sb> <sb>${hostName}</sb>"),
new OperatorType(L, DOWNLOAD, "下载批量执行日志 <sb>${logId}</sb> <sb>${hostName}</sb>"),
};
}

View File

@@ -8,7 +8,7 @@ import static com.orion.ops.framework.biz.operator.log.core.enums.OperatorRiskLe
import static com.orion.ops.framework.biz.operator.log.core.enums.OperatorRiskLevel.L;
/**
* 计划执行日志 操作记录类型
* 计划任务执行日志 操作记录类型
*
* @author Jiahang Li
* @version 1.0.1
@@ -28,10 +28,10 @@ public class ExecJobLogOperatorType extends InitializingOperatorTypes {
@Override
public OperatorType[] types() {
return new OperatorType[]{
new OperatorType(H, DELETE, "删除计划执行日志 <sb>${count}</sb> 条"),
new OperatorType(H, DELETE_HOST, "删除计划执行主机日志 <sb>${logId}</sb> <sb>${hostName}</sb>"),
new OperatorType(H, CLEAR, "清理计划执行日志 <sb>${count}</sb> 条"),
new OperatorType(L, DOWNLOAD, "下载主机执行日志 <sb>${logId}</sb> <sb>${hostName}</sb>"),
new OperatorType(H, DELETE, "删除计划任务执行日志 <sb>${count}</sb> 条"),
new OperatorType(H, DELETE_HOST, "删除计划任务执行主机日志 <sb>${logId}</sb> <sb>${hostName}</sb>"),
new OperatorType(H, CLEAR, "清理计划任务执行日志 <sb>${count}</sb> 条"),
new OperatorType(L, DOWNLOAD, "下载计划任务执行日志 <sb>${logId}</sb> <sb>${hostName}</sb>"),
};
}

View File

@@ -7,7 +7,7 @@ import com.orion.ops.framework.biz.operator.log.core.model.OperatorType;
import static com.orion.ops.framework.biz.operator.log.core.enums.OperatorRiskLevel.*;
/**
* 计划执行任务 操作日志类型
* 计划任务 操作日志类型
*
* @author Jiahang Li
* @version 1.0.3
@@ -29,11 +29,11 @@ public class ExecJobOperatorType extends InitializingOperatorTypes {
@Override
public OperatorType[] types() {
return new OperatorType[]{
new OperatorType(L, CREATE, "创建计划执行任务 <sb>${name}</sb>"),
new OperatorType(M, UPDATE, "更新计划执行任务 <sb>${before}</sb>"),
new OperatorType(M, UPDATE_STATUS, "<sb>${statusName}</sb>计划执行任务 <sb>${name}</sb>"),
new OperatorType(M, TRIGGER, "手动触发计划执行任务 <sb>${name}</sb>"),
new OperatorType(H, DELETE, "删除计划执行任务 <sb>${name}</sb>"),
new OperatorType(L, CREATE, "创建计划任务 <sb>${name}</sb>"),
new OperatorType(M, UPDATE, "更新计划任务 <sb>${before}</sb>"),
new OperatorType(M, UPDATE_STATUS, "<sb>${statusName}</sb>计划任务 <sb>${name}</sb>"),
new OperatorType(M, TRIGGER, "手动触发计划任务 <sb>${name}</sb>"),
new OperatorType(H, DELETE, "删除计划任务 <sb>${name}</sb>"),
};
}

View File

@@ -9,7 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
/**
* 计划执行任务 实体对象
* 计划任务 实体对象
*
* @author Jiahang Li
* @version 1.0.3
@@ -21,7 +21,7 @@ import lombok.*;
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@TableName(value = "exec_job", autoResultMap = true)
@Schema(name = "ExecJobDO", description = "计划执行任务 实体对象")
@Schema(name = "ExecJobDO", description = "计划任务 实体对象")
public class ExecJobDO extends BaseDO {
private static final long serialVersionUID = 1L;

View File

@@ -9,7 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
/**
* 计划执行任务主机 实体对象
* 计划任务主机 实体对象
*
* @author Jiahang Li
* @version 1.0.3
@@ -21,7 +21,7 @@ import lombok.*;
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@TableName(value = "exec_job_host", autoResultMap = true)
@Schema(name = "ExecJobHostDO", description = "计划执行任务主机 实体对象")
@Schema(name = "ExecJobHostDO", description = "计划任务主机 实体对象")
public class ExecJobHostDO extends BaseDO {
private static final long serialVersionUID = 1L;

View File

@@ -14,7 +14,7 @@ import java.io.Serializable;
import java.util.List;
/**
* 计划执行任务 创建请求对象
* 计划任务 创建请求对象
*
* @author Jiahang Li
* @version 1.0.3
@@ -24,7 +24,7 @@ import java.util.List;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "ExecJobCreateRequest", description = "计划执行任务 创建请求对象")
@Schema(name = "ExecJobCreateRequest", description = "计划任务 创建请求对象")
public class ExecJobCreateRequest implements Serializable {
private static final long serialVersionUID = 1L;

View File

@@ -7,7 +7,7 @@ import lombok.*;
import javax.validation.constraints.Size;
/**
* 计划执行任务 查询请求对象
* 计划任务 查询请求对象
*
* @author Jiahang Li
* @version 1.0.3
@@ -18,7 +18,7 @@ import javax.validation.constraints.Size;
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@Schema(name = "ExecJobQueryRequest", description = "计划执行任务 查询请求对象")
@Schema(name = "ExecJobQueryRequest", description = "计划任务 查询请求对象")
public class ExecJobQueryRequest extends PageRequest {
@Schema(description = "id")

View File

@@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 计划执行任务 手动触发请求对象
* 计划任务 手动触发请求对象
*
* @author Jiahang Li
* @version 1.0.3
@@ -20,7 +20,7 @@ import java.io.Serializable;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "ExecJobTriggerRequest", description = "计划执行任务 手动触发请求对象")
@Schema(name = "ExecJobTriggerRequest", description = "计划任务 手动触发请求对象")
public class ExecJobTriggerRequest implements Serializable {
private static final long serialVersionUID = 1L;

View File

@@ -14,7 +14,7 @@ import java.io.Serializable;
import java.util.List;
/**
* 计划执行任务 更新请求对象
* 计划任务 更新请求对象
*
* @author Jiahang Li
* @version 1.0.3
@@ -24,7 +24,7 @@ import java.util.List;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "ExecJobUpdateRequest", description = "计划执行任务 更新请求对象")
@Schema(name = "ExecJobUpdateRequest", description = "计划任务 更新请求对象")
public class ExecJobUpdateRequest implements Serializable {
private static final long serialVersionUID = 1L;

View File

@@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 计划执行任务 更新状态请求对象
* 计划任务 更新状态请求对象
*
* @author Jiahang Li
* @version 1.0.3
@@ -20,7 +20,7 @@ import java.io.Serializable;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "ExecJobUpdateStatusRequest", description = "计划执行任务 更新状态请求对象")
@Schema(name = "ExecJobUpdateStatusRequest", description = "计划任务 更新状态请求对象")
public class ExecJobUpdateStatusRequest implements Serializable {
private static final long serialVersionUID = 1L;

View File

@@ -10,7 +10,7 @@ import java.io.Serializable;
import java.util.Date;
/**
* 计划执行任务主机 视图响应对象
* 计划任务主机 视图响应对象
*
* @author Jiahang Li
* @version 1.0.3
@@ -20,7 +20,7 @@ import java.util.Date;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "ExecJobHostVO", description = "计划执行任务主机 视图响应对象")
@Schema(name = "ExecJobHostVO", description = "计划任务主机 视图响应对象")
public class ExecJobHostVO implements Serializable {
private static final long serialVersionUID = 1L;

View File

@@ -11,7 +11,7 @@ import java.util.Date;
import java.util.List;
/**
* 计划执行任务 视图响应对象
* 计划任务 视图响应对象
*
* @author Jiahang Li
* @version 1.0.3
@@ -21,7 +21,7 @@ import java.util.List;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "ExecJobVO", description = "计划执行任务 视图响应对象")
@Schema(name = "ExecJobVO", description = "计划任务 视图响应对象")
public class ExecJobVO implements Serializable {
private static final long serialVersionUID = 1L;

View File

@@ -15,7 +15,7 @@ public enum ExecSourceEnum {
BATCH,
/**
* 计划执行
* 计划任务
*/
JOB,

View File

@@ -11,7 +11,7 @@ import org.quartz.Job;
import org.quartz.JobExecutionContext;
/**
* 计划执行命令任务
* 计划命令任务
*
* @author Jiahang Li
* @version 1.0.0

View File

@@ -3,7 +3,7 @@ package com.orion.ops.module.asset.service;
import java.util.List;
/**
* 计划执行任务主机 服务类
* 计划任务主机 服务类
*
* @author Jiahang Li
* @version 1.0.3

View File

@@ -5,7 +5,7 @@ import com.orion.ops.module.asset.entity.request.exec.*;
import com.orion.ops.module.asset.entity.vo.ExecJobVO;
/**
* 计划执行任务 服务类
* 计划任务 服务类
*
* @author Jiahang Li
* @version 1.0.3
@@ -14,7 +14,7 @@ import com.orion.ops.module.asset.entity.vo.ExecJobVO;
public interface ExecJobService {
/**
* 创建计划执行任务
* 创建计划任务
*
* @param request request
* @return id
@@ -22,7 +22,7 @@ public interface ExecJobService {
Long createExecJob(ExecJobCreateRequest request);
/**
* 更新计划执行任务
* 更新计划任务
*
* @param request request
* @return effect
@@ -30,7 +30,7 @@ public interface ExecJobService {
Integer updateExecJobById(ExecJobUpdateRequest request);
/**
* 更新计划执行任务状态
* 更新计划任务状态
*
* @param request request
* @return effect
@@ -38,7 +38,7 @@ public interface ExecJobService {
Integer updateExecJobStatus(ExecJobUpdateStatusRequest request);
/**
* 查询计划执行任务
* 查询计划任务
*
* @param id id
* @return row
@@ -46,7 +46,7 @@ public interface ExecJobService {
ExecJobVO getExecJobById(Long id);
/**
* 分页查询计划执行任务
* 分页查询计划任务
*
* @param request request
* @return rows
@@ -62,7 +62,7 @@ public interface ExecJobService {
Integer getNextExecSeq(Long id);
/**
* 删除计划执行任务
* 删除计划任务
*
* @param id id
* @return effect

View File

@@ -11,7 +11,7 @@ import java.util.List;
import java.util.stream.Collectors;
/**
* 计划执行任务主机 服务实现类
* 计划任务主机 服务实现类
*
* @author Jiahang Li
* @version 1.0.3

View File

@@ -43,7 +43,7 @@ import java.util.function.Function;
import java.util.stream.Collectors;
/**
* 计划执行任务 服务实现类
* 计划任务 服务实现类
*
* @author Jiahang Li
* @version 1.0.3

View File

@@ -217,7 +217,7 @@ public class HostServiceImpl implements HostService {
log.info("HostService-deleteHostRelByIdAsync id: {}", id);
// 删除主机配置
hostConfigDAO.deleteByHostId(id);
// 删除计划执行任务主机
// 删除计划任务主机
execJobHostService.deleteByHostId(id);
// 删除分组
dataGroupRelApi.deleteByRelId(DataGroupTypeEnum.HOST, id);