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
2024-05-09 00:06:08 +08:00
parent 42f1c6f0cb
commit af00e71651
36 changed files with 333 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/UploadTaskController.java
View File

@@ -43,8 +43,6 @@ public class UploadTaskController {
@Resource
private UploadTaskService uploadTaskService;
// TODO 字典颜色 菜单 操作日志
@OperatorLog(UploadTaskOperatorType.UPLOAD)
@PostMapping("/create")
@Operation(summary = "创建上传任务")
@@ -106,7 +104,7 @@ public class UploadTaskController {
}
@PostMapping("/query-count")
@Operation(summary = "查询主机连接日志数量")
@Operation(summary = "查询上传任务数量")
@PreAuthorize("@ss.hasPermission('asset:upload-task:management:clear')")
public Long getUploadTaskCount(@RequestBody UploadTaskQueryRequest request) {
return uploadTaskService.getUploadTaskCount(request);
@@ -114,7 +112,7 @@ public class UploadTaskController {
@OperatorLog(UploadTaskOperatorType.CLEAR)
@PostMapping("/clear")
@Operation(summary = "清空主机连接日志")
@Operation(summary = "清空上传任务")
@PreAuthorize("@ss.hasPermission('asset:upload-task:management:clear')")
public Integer clearUploadTask(@RequestBody UploadTaskQueryRequest request) {
return uploadTaskService.clearUploadTask(request);

2
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/UploadTaskOperatorType.java
View File

@@ -28,7 +28,7 @@ public class UploadTaskOperatorType extends InitializingOperatorTypes {
@Override
public OperatorType[] types() {
return new OperatorType[]{
new OperatorType(M, UPLOAD, "批量上传文件 <sb>${count}</sb>个 (<sb>${name}</sb>)"),
new OperatorType(M, UPLOAD, "批量上传文件 <sb>${count}</sb>个 (${name})"),
new OperatorType(M, CANCEL, "取消上传文件 <sb>${name}</sb>"),
new OperatorType(H, DELETE, "删除上传记录 <sb>${count}</sb>条"),
new OperatorType(H, CLEAR, "清理上传记录 <sb>${count}</sb>条"),

1
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/upload/task/FileUploadTask.java
View File

@@ -135,6 +135,7 @@ public class FileUploadTask implements IFileUploadTask {
List<FileUploadFileItemDTO> files = v.stream()
.map(s -> FileUploadFileItemDTO.builder()
.id(s.getId())
.fileId(s.getFileId())
.remotePath(record.getRemotePath() + Const.SLASH + s.getFilePath())
.status(UploadTaskFileStatusEnum.WAITING.name())
.current(0L)

2
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/upload/uploader/FileUploader.java
View File

@@ -100,7 +100,7 @@ public class FileUploader implements IFileUploader {
private boolean initSession() {
log.info("HostFileUploader.initSession start taskId: {}, hostId: {}", taskId, hostId);
try {
// TODO 测试 打开 executor 后 是否会connect, 不需要的话就关闭 executor 然后重新打开
// TODO 测试看看有没有问题, 则修改为 打开 executor 后 是否会connect, 不需要的话就关闭 executor 然后重新打开
// 打开会话
HostTerminalConnectDTO connectInfo = hostTerminalService.getTerminalConnectInfo(hostId);
this.sessionStore = hostTerminalService.openSessionStore(connectInfo);