From 372a94aa276601e661e3df56a37ea7195f089ec5 Mon Sep 17 00:00:00 2001 From: WangXu10 Date: Tue, 22 Oct 2024 18:29:30 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83):?= =?UTF-8?q?=20=E6=9F=A5=E7=9C=8B=E7=BB=93=E6=9E=9C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/api/dto/definition/ApiTaskReportDTO.java | 3 +++ .../io/metersphere/api/dto/scenario/ExecTaskDetailDTO.java | 3 +++ .../metersphere/system/dto/taskhub/ExecTaskItemDetailDTO.java | 3 +++ .../java/io/metersphere/system/mapper/ExtExecTaskMapper.xml | 1 + 4 files changed, 10 insertions(+) diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/definition/ApiTaskReportDTO.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/definition/ApiTaskReportDTO.java index 01d7c954e9..c1a1768819 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/definition/ApiTaskReportDTO.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/definition/ApiTaskReportDTO.java @@ -26,6 +26,9 @@ public class ApiTaskReportDTO { @Schema(description = "结果") private String result; + @Schema(description = "状态") + private String status; + @Schema(description = "资源池ID") private String resourcePoolId; @Schema(description = "资源池名称") diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/scenario/ExecTaskDetailDTO.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/scenario/ExecTaskDetailDTO.java index 6bfb15c121..173a915ba8 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/scenario/ExecTaskDetailDTO.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/scenario/ExecTaskDetailDTO.java @@ -23,6 +23,9 @@ public class ExecTaskDetailDTO extends ApiScenarioReportDTO{ @Schema(description = "结果") private String result; + @Schema(description = "状态") + private String status; + @Schema(description = "节点") private String resourcePoolNode; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskhub/ExecTaskItemDetailDTO.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskhub/ExecTaskItemDetailDTO.java index d32b8a9d54..2def9832e0 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskhub/ExecTaskItemDetailDTO.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskhub/ExecTaskItemDetailDTO.java @@ -33,6 +33,9 @@ public class ExecTaskItemDetailDTO implements Serializable { @Schema(description = "结果") private String result; + @Schema(description = "状态") + private String status; + @Schema(description = "资源池ID", requiredMode = Schema.RequiredMode.REQUIRED) private String resourcePoolId; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskMapper.xml index 55a06c1a8c..aaef053319 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskMapper.xml +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskMapper.xml @@ -125,6 +125,7 @@ exec_task.integrated, exec_task.create_time as createTime, exec_task_item.result as result, + exec_task_item.status as status, exec_task_item.resource_pool_id as resourcePoolId, exec_task_item.resource_pool_node as resourcePoolNode, exec_task_item.thread_id as threadId,