manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔨 监控模块.

Browse Source
This commit is contained in:
lijiahangmax
2025-09-24 23:09:58 +08:00
parent eb8d618c2a
commit 1881086e98
227 changed files with 11276 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecCommandLogController.java
View File

@@ -164,7 +164,7 @@ public class ExecCommandLogController {
@OperatorLog(ExecCommandLogOperatorType.CLEAR)
@PostMapping("/clear")
@Operation(summary = "清空批量执行日志")
@Operation(summary = "清理批量执行日志")
@PreAuthorize("@ss.hasPermission('exec:exec-command-log:management:clear')")
public Integer clearExecCommandLog(@Validated @RequestBody ExecLogClearRequest request) {
request.setSource(SOURCE);

2
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecJobLogController.java
View File

@@ -153,7 +153,7 @@ public class ExecJobLogController {
@OperatorLog(ExecJobLogOperatorType.CLEAR)
@PostMapping("/clear")
@Operation(summary = "清空计划任务日志")
@Operation(summary = "清理计划任务日志")
@PreAuthorize("@ss.hasPermission('exec:exec-job-log:management:clear')")
public Integer clearExecJobLog(@Validated @RequestBody ExecLogClearRequest request) {
request.setSource(SOURCE);

2
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/UploadTaskController.java
View File

@@ -145,7 +145,7 @@ public class UploadTaskController {
@OperatorLog(UploadTaskOperatorType.CLEAR)
@PostMapping("/clear")
@Operation(summary = "清空上传任务")
@Operation(summary = "清理上传任务")
@PreAuthorize("@ss.hasPermission('exec:upload-task:management:clear')")
public Integer clearUploadTask(@Validated @RequestBody UploadTaskClearRequest request) {
return uploadTaskService.clearUploadTask(request);

2
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecCommandServiceImpl.java
View File

@@ -90,7 +90,7 @@ public class ExecCommandServiceImpl implements ExecCommandService {
@Override
public ExecLogVO execCommand(ExecCommandRequest request) {
log.info("ExecService.execCommand start params: {}", JSON.toJSONString(request));
LoginUser user = Valid.notNull(SecurityUtils.getLoginUser());
LoginUser user = SecurityUtils.getLoginUserNotNull();
Long userId = user.getId();
List<Long> hostIdList = request.getHostIdList();
// 检查主机权限

2
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecHostLogServiceImpl.java
View File

@@ -87,7 +87,7 @@ public class ExecHostLogServiceImpl implements ExecHostLogService {
// 分批次删除
List<List<Long>> partitions = Lists.partition(logIdList, 500);
for (List<Long> batch : partitions) {
LambdaQueryWrapper<ExecHostLogDO> wrapper = execHostLogDAO.wrapper()
LambdaQueryWrapper<ExecHostLogDO> wrapper = execHostLogDAO.lambda()
.in(ExecHostLogDO::getLogId, batch);
effect += execHostLogDAO.delete(wrapper);
}

16
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java
View File

@@ -108,7 +108,7 @@ public class ExecJobServiceImpl implements ExecJobService {
@Transactional(rollbackFor = Exception.class)
public Long createExecJob(ExecJobCreateRequest request) {
log.info("ExecJobService-createExecJob request: {}", JSON.toJSONString(request));
LoginUser loginUser = SecurityUtils.getLoginUser();
LoginUser loginUser = SecurityUtils.getLoginUserNotNull();
// 验证表达式是否正确
Cron.of(request.getExpression());
// 转换
@@ -119,10 +119,8 @@ public class ExecJobServiceImpl implements ExecJobService {
this.checkHostPermission(request.getHostIdList());
// 插入任务
record.setStatus(ExecJobStatusEnum.DISABLED.getStatus());
if (loginUser != null) {
record.setExecUserId(loginUser.getId());
record.setExecUsername(loginUser.getUsername());
}
record.setExecUserId(loginUser.getId());
record.setExecUsername(loginUser.getUsername());
int effect = execJobDAO.insert(record);
Long id = record.getId();
// 设置任务主机
@@ -340,11 +338,9 @@ public class ExecJobServiceImpl implements ExecJobService {
request.setId(id);
request.setExecMode(ExecModeEnum.MANUAL.name());
// 设置执行用户
LoginUser user = SecurityUtils.getLoginUser();
if (user != null) {
request.setUserId(user.getId());
request.setUsername(user.getUsername());
}
LoginUser user = SecurityUtils.getLoginUserNotNull();
request.setUserId(user.getId());
request.setUsername(user.getUsername());
// 上下文触发任务
SpringHolder.getBean(ExecJobService.class).triggerExecJob(request, job);
}

2
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateHostServiceImpl.java
View File

@@ -79,7 +79,7 @@ public class ExecTemplateHostServiceImpl implements ExecTemplateHostService {
@Override
public void setTemplateHost(Long templateId, List<Long> hostList) {
LambdaQueryWrapper<ExecTemplateHostDO> wrapper = execTemplateHostDAO.wrapper()
LambdaQueryWrapper<ExecTemplateHostDO> wrapper = execTemplateHostDAO.lambda()
.eq(ExecTemplateHostDO::getTemplateId, templateId);
if (Lists.isEmpty(hostList)) {
// 为空移除

4
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskFileServiceImpl.java
View File

@@ -61,7 +61,7 @@ public class UploadTaskFileServiceImpl implements UploadTaskFileService {
@Override
public Integer deleteFileByTaskId(Long taskId) {
log.info("UploadTaskFileService-deleteFileByTaskId id: {}", taskId);
LambdaQueryWrapper<UploadTaskFileDO> wrapper = uploadTaskFileDAO.wrapper()
LambdaQueryWrapper<UploadTaskFileDO> wrapper = uploadTaskFileDAO.lambda()
.eq(UploadTaskFileDO::getTaskId, taskId);
int effect = uploadTaskFileDAO.delete(wrapper);
log.info("UploadTaskFileService-deleteFileByTaskId id: {}, effect: {}", taskId, effect);
@@ -71,7 +71,7 @@ public class UploadTaskFileServiceImpl implements UploadTaskFileService {
@Override
public Integer deleteFileByTaskIdList(List<Long> taskIdList) {
log.info("UploadTaskFileService-deleteFileByTaskIdList idList: {}", taskIdList);
LambdaQueryWrapper<UploadTaskFileDO> wrapper = uploadTaskFileDAO.wrapper()
LambdaQueryWrapper<UploadTaskFileDO> wrapper = uploadTaskFileDAO.lambda()
.in(UploadTaskFileDO::getTaskId, taskIdList);
int effect = uploadTaskFileDAO.delete(wrapper);
log.info("UploadTaskFileService-deleteFileByTaskIdList effect: {}", effect);

2
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskServiceImpl.java
View File

@@ -115,7 +115,7 @@ public class UploadTaskServiceImpl implements UploadTaskService {
@Transactional(rollbackFor = Exception.class)
@Override
public UploadTaskCreateVO createUploadTask(UploadTaskCreateRequest request) {
LoginUser user = Valid.notNull(SecurityUtils.getLoginUser());
LoginUser user = SecurityUtils.getLoginUserNotNull();
List<Long> hostIdList = request.getHostIdList();
List<UploadTaskFileRequest> files = request.getFiles();
log.info("UploadTaskService-createUploadTask request: {}", JSON.toJSONString(request));