From 9117526096f5ff885a5f0d72fb5e0f39f6ebd0bc Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 25 Jan 2024 10:43:04 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E5=86=85=E7=BD=AE=E5=B1=9E=E6=80=A7=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/plugin/api/constants/ElementProperty.java  | 5 +++++
 .../io/metersphere/sdk/constants/ProcessDataStatus.java    | 5 -----
 .../api/parser/jmeter/MsHTTPElementConverter.java          | 7 ++++---
 3 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 backend/framework/plugin/plugin-api-sdk/src/main/java/io/metersphere/plugin/api/constants/ElementProperty.java
 delete mode 100644 backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/ProcessDataStatus.java

diff --git a/backend/framework/plugin/plugin-api-sdk/src/main/java/io/metersphere/plugin/api/constants/ElementProperty.java b/backend/framework/plugin/plugin-api-sdk/src/main/java/io/metersphere/plugin/api/constants/ElementProperty.java
new file mode 100644
index 0000000000..940ed483a6
--- /dev/null
+++ b/backend/framework/plugin/plugin-api-sdk/src/main/java/io/metersphere/plugin/api/constants/ElementProperty.java
@@ -0,0 +1,5 @@
+package io.metersphere.plugin.api.constants;
+
+public enum ElementProperty {
+    MS_RESOURCE_ID, MS_STEP_ID, MS_FAKE_ERROR, MS_REPORT_ID
+}
diff --git a/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/ProcessDataStatus.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/ProcessDataStatus.java
deleted file mode 100644
index 052aa5d719..0000000000
--- a/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/ProcessDataStatus.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.metersphere.sdk.constants;
-
-public enum ProcessDataStatus {
-    MS_RESOURCE_ID, MS_STEP_ID, MS_FAKE_ERROR
-}
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/MsHTTPElementConverter.java b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/MsHTTPElementConverter.java
index 947ac8206b..bd3ab12795 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/MsHTTPElementConverter.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/MsHTTPElementConverter.java
@@ -9,7 +9,7 @@ import io.metersphere.api.parser.jmeter.body.MsFormDataBodyConverter;
 import io.metersphere.api.parser.jmeter.body.MsWWWFormBodyConverter;
 import io.metersphere.plugin.api.dto.ParameterConfig;
 import io.metersphere.plugin.api.spi.AbstractJmeterElementConverter;
-import io.metersphere.sdk.constants.ProcessDataStatus;
+import io.metersphere.plugin.api.constants.ElementProperty;
 import io.metersphere.sdk.util.LogUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -44,8 +44,9 @@ public class MsHTTPElementConverter extends AbstractJmeterElementConverter<MsHTT
         sampler.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass(HTTP_TEST_SAMPLE_GUI));
 
         // TODO: 当前步骤唯一标识，很重要，结果和步骤匹配的关键
-        sampler.setProperty(ProcessDataStatus.MS_RESOURCE_ID.name(), msHTTPElement.getResourceId());
-        sampler.setProperty(ProcessDataStatus.MS_STEP_ID.name(), msHTTPElement.getStepId());
+        sampler.setProperty(ElementProperty.MS_RESOURCE_ID.name(), msHTTPElement.getResourceId());
+        sampler.setProperty(ElementProperty.MS_STEP_ID.name(), msHTTPElement.getStepId());
+        sampler.setProperty(ElementProperty.MS_REPORT_ID.name(), config.getReportId());
 
         sampler.setMethod(msHTTPElement.getMethod());
         // todo 根据环境设置