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

💄 修改表单宽度.

Browse Source
This commit is contained in:
lijiahang
2024-03-13 17:23:42 +08:00
parent 81ae46c181
commit 149e5bc40c
19 changed files with 131 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/ExecOperatorType.java
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.M;
/**
* 批量执行 操作日志类型
* 批量执行 操作记录类型
*
* @author Jiahang Li
* @version 1.0.1
@@ -35,9 +35,9 @@ public class ExecOperatorType extends InitializingOperatorTypes {
new OperatorType(M, EXEC_COMMAND, "执行主机命令"),
new OperatorType(M, INTERRUPT_EXEC, "中断执行命令"),
new OperatorType(M, INTERRUPT_HOST, "中断主机执行命令 ${logId} ${hostName}"),
new OperatorType(H, DELETE_HOST_LOG, "删除主机执行日志 ${logId} ${hostName}"),
new OperatorType(H, DELETE_LOG, "删除执行日志 ${count} 条"),
new OperatorType(H, CLEAR_LOG, "清理执行日志 ${count} 条"),
new OperatorType(H, DELETE_HOST_LOG, "删除主机执行记录 ${logId} ${hostName}"),
new OperatorType(H, DELETE_LOG, "删除执行记录 ${count} 条"),
new OperatorType(H, CLEAR_LOG, "清理执行记录 ${count} 条"),
};
}

10
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecLogServiceImpl.java
View File

@@ -72,7 +72,10 @@ public class ExecLogServiceImpl implements ExecLogService {
// 查询执行状态
List<ExecLogVO> logList = execLogDAO.of()
.createWrapper()
.select(ExecLogDO::getId, ExecLogDO::getStatus, ExecLogDO::getFinishTime)
.select(ExecLogDO::getId,
ExecLogDO::getStatus,
ExecLogDO::getStartTime,
ExecLogDO::getFinishTime)
.in(ExecLogDO::getId, idList)
.then()
.list(ExecLogConvert.MAPPER::to);
@@ -81,6 +84,7 @@ public class ExecLogServiceImpl implements ExecLogService {
.createWrapper()
.select(ExecHostLogDO::getId,
ExecHostLogDO::getStatus,
ExecHostLogDO::getStartTime,
ExecHostLogDO::getFinishTime,
ExecHostLogDO::getExitStatus,
ExecHostLogDO::getErrorMessage)
@@ -167,8 +171,8 @@ public class ExecLogServiceImpl implements ExecLogService {
.eq(ExecLogDO::getUsername, request.getUsername())
.eq(ExecLogDO::getSource, request.getSource())
.eq(ExecLogDO::getSourceId, request.getSourceId())
.eq(ExecLogDO::getDescription, request.getDescription())
.eq(ExecLogDO::getCommand, request.getCommand())
.like(ExecLogDO::getDescription, request.getDescription())
.like(ExecLogDO::getCommand, request.getCommand())
.eq(ExecLogDO::getStatus, request.getStatus())
.ge(ExecLogDO::getStartTime, Arrays1.getIfPresent(request.getStartTimeRange(), 0))
.le(ExecLogDO::getStartTime, Arrays1.getIfPresent(request.getStartTimeRange(), 1))