From 5d1ecc51d15cf0a60ed052ed0e01d9d3ce9a6e14 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 26 Nov 2020 18:04:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestPlanTestCaseMapper.java | 14 ++++++++
 .../mapper/ext/ExtTestPlanTestCaseMapper.xml  | 24 +++++++++++--
 .../TestPlanTestCaseController.java           | 10 ++++++
 .../service/TestPlanTestCaseService.java      |  4 +++
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 .../view/comonents/TestPlanTestCaseEdit.vue   | 35 +++++++++----------
 frontend/src/business/components/xpack        |  2 +-
 7 files changed, 68 insertions(+), 23 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
index 1bff19ab89..da5b9c6e3f 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
@@ -38,4 +38,18 @@ public interface ExtTestPlanTestCaseMapper {
      */
     List<TestPlanCaseDTO> listTestCaseByProjectIds(@Param("ids") List<String> ids);
 
+    /**
+     * 获取完整的测试计划下用例的详细信息
+     * @param request id(test_plan_test_case.id) 不能为空
+     * @return TestPlanCaseDTO
+     */
+    TestPlanCaseDTO getTestPlanTestCase(@Param("request") QueryTestPlanCaseRequest request);
+
+    /**
+     * 获取测试计划下的 TestPlanTestCaseID 和 TestCaseName
+     * @param request planId 不能为空
+     * @return List<TestPlanCaseDTO>
+     */
+    List<TestPlanCaseDTO> getTestPlanTestCaseList(@Param("request") QueryTestPlanCaseRequest request);
+
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index 7b267835c1..a95041bbe4 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -121,7 +121,9 @@
     </select>
 
     <select id="list" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
-        select test_case.remark, test_plan_test_case.id as id, test_plan_test_case.*,test_case.*,test_case_node.name as model, project.name as projectName
+        select test_plan_test_case.id as id, test_case.id as caseId, test_case.name, test_case.priority, test_case.type,
+        test_case.node_path, test_case.method, test_case.num, test_plan_test_case.executor, test_plan_test_case.status,
+        test_plan_test_case.update_time, test_case_node.name as model, project.name as projectName, test_plan_test_case.plan_id as planId
         from test_plan_test_case
         inner join test_case on test_plan_test_case.case_id = test_case.id
         left join test_case_node on test_case_node.id=test_case.node_id
@@ -134,7 +136,8 @@
                 </include>
             </if>
             <if test="request.name != null">
-                and (test_case.name like CONCAT('%', #{request.name},'%') or test_case.num like CONCAT('%', #{request.name},'%'))
+                and (test_case.name like CONCAT('%', #{request.name},'%') or test_case.num like
+                CONCAT('%',#{request.name},'%'))
             </if>
             <if test="request.id != null">
                 and test_case.id = #{request.id}
@@ -210,6 +213,23 @@
             </foreach>
         </if>
     </select>
+
+    <select id="getTestPlanTestCase" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
+        select test_case.remark, test_plan_test_case.id as id, test_plan_test_case.*,test_case.*,test_case_node.name as model, project.name as projectName
+        from test_plan_test_case
+        inner join test_case on test_plan_test_case.case_id = test_case.id
+        left join test_case_node on test_case_node.id=test_case.node_id
+        inner join project on project.id = test_case.project_id
+        where test_plan_test_case.id = #{request.id}
+    </select>
+
+    <select id="getTestPlanTestCaseList" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
+        select test_plan_test_case.id as id, test_case.name
+        from test_plan_test_case
+        inner join test_case on test_plan_test_case.case_id = test_case.id
+        where test_plan_test_case.plan_id = #{request.planId}
+    </select>
+
     <select id="listTestCaseByProjectIds" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
         select distinct * from test_plan_test_case, test_case
         where test_plan_test_case.case_id = test_case.id
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
index d2e3e8a853..4001e5b827 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
@@ -83,6 +83,16 @@ public class TestPlanTestCaseController {
         return testPlanTestCaseService.list(request);
     }
 
+    @PostMapping("/list/ids")
+    public List<TestPlanCaseDTO> getTestPlanCaseIds(@RequestBody QueryTestPlanCaseRequest request) {
+        return testPlanTestCaseService.list(request);
+    }
+
+    @PostMapping("/get")
+    public TestPlanCaseDTO getTestPlanCase(@RequestBody QueryTestPlanCaseRequest request) {
+        return testPlanTestCaseService.getTestPlanCase(request);
+    }
+
     @PostMapping("/edit")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
     public void editTestCase(@RequestBody TestPlanTestCaseWithBLOBs testPlanTestCase) {
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
index 04abe860b0..314b55c0eb 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
@@ -148,4 +148,8 @@ public class TestPlanTestCaseService {
     public int updateTestCaseStates(List<String> ids, String reportStatus) {
         return extTestPlanTestCaseMapper.updateTestCaseStates(ids, reportStatus);
     }
+
+    public TestPlanCaseDTO getTestPlanCase(QueryTestPlanCaseRequest request) {
+        return extTestPlanTestCaseMapper.getTestPlanTestCase(request);
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 57d6f78efa..bb494fc68a 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 57d6f78efa4b0300be188e8b024511ceef0873ed
+Subproject commit bb494fc68a2367359c9048fa7250c7618de4afb6
diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
index c2fe737e3d..cd9e3c6e3f 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
@@ -473,25 +473,22 @@ export default {
     },
     getTestCase(index) {
       let testCase = this.testCases[index];
-      let item = {};
-      Object.assign(item, testCase);
-      item.results = JSON.parse(item.results);
-      item.steps = JSON.parse(item.steps);
-      if (item.issues) {
-        item.issues = JSON.parse(item.issues);
-      } else {
-        item.issues = {};
-        item.issues.hasIssues = false;
-      }
-      item.steptResults = [];
-      for (let i = 0; i < item.steps.length; i++) {
-        if (item.results[i]) {
-          item.steps[i].actualResult = item.results[i].actualResult;
-          item.steps[i].executeResult = item.results[i].executeResult;
+      // id 为 TestPlanTestCase 的 id
+      this.result = this.$post('/test/plan/case/get', {id: testCase.id}, response => {
+        let item = {};
+        Object.assign(item, response.data);
+        item.results = JSON.parse(item.results);
+        item.steps = JSON.parse(item.steps);
+        item.steptResults = [];
+        for (let i = 0; i < item.steps.length; i++) {
+          if (item.results[i]) {
+            item.steps[i].actualResult = item.results[i].actualResult;
+            item.steps[i].executeResult = item.results[i].executeResult;
+          }
+          item.steptResults.push(item.steps[i]);
         }
-        item.steptResults.push(item.steps[i]);
-      }
-      this.testCase = item;
+        this.testCase = item;
+      })
       this.initTest();
       this.getIssues(testCase.caseId);
       this.stepResultChange();
@@ -546,7 +543,7 @@ export default {
       this.$post('/test/plan/case/edit', {id: this.testCase.id, reportId: reportId});
     },
     initData(testCase) {
-      this.result = this.$post('/test/plan/case/list/all', this.searchParam, response => {
+      this.result = this.$post('/test/plan/case/list/ids', this.searchParam, response => {
         this.testCases = response.data;
         for (let i = 0; i < this.testCases.length; i++) {
           if (this.testCases[i].id === testCase.id) {
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 71d57ae5d7..8a972a1987 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 71d57ae5d7f8bb5c93a29504ac6f2300dc189ce9
+Subproject commit 8a972a198775b3783ed6e4cef27197e53d1ebdc8

From 6ed65e22d35cbed9352afb8375593a81b0d414cb Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 30 Nov 2020 16:40:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestPlanTestCaseMapper.java |  6 -----
 .../mapper/ext/ExtTestPlanTestCaseMapper.xml  |  9 -------
 .../TestPlanTestCaseController.java           |  5 ----
 .../service/TestPlanTestCaseService.java      |  4 ---
 .../view/comonents/TestPlanTestCaseEdit.vue   | 25 ++++++++++++-------
 5 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
index 5b3838279b..0d5932d035 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
@@ -39,12 +39,6 @@ public interface ExtTestPlanTestCaseMapper {
     List<TestPlanCaseDTO> listTestCaseByProjectIds(@Param("ids") List<String> ids);
 
     TestPlanCaseDTO get(String testPlanTestCaseId);
-    /**
-     * 获取完整的测试计划下用例的详细信息
-     * @param request id(test_plan_test_case.id) 不能为空
-     * @return TestPlanCaseDTO
-     */
-    TestPlanCaseDTO getTestPlanTestCase(@Param("request") QueryTestPlanCaseRequest request);
 
     /**
      * 获取测试计划下的 TestPlanTestCaseID 和 TestCaseName
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index 229381d77e..aaf36a69b8 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -214,15 +214,6 @@
         </if>
     </select>
 
-    <select id="getTestPlanTestCase" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
-        select test_case.remark, test_plan_test_case.id as id, test_plan_test_case.*,test_case.*,test_case_node.name as model, project.name as projectName
-        from test_plan_test_case
-        inner join test_case on test_plan_test_case.case_id = test_case.id
-        left join test_case_node on test_case_node.id=test_case.node_id
-        inner join project on project.id = test_case.project_id
-        where test_plan_test_case.id = #{request.id}
-    </select>
-
     <select id="getTestPlanTestCaseList" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
         select test_plan_test_case.id as id, test_case.name
         from test_plan_test_case
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
index 4001e5b827..cedcf7eeda 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
@@ -88,11 +88,6 @@ public class TestPlanTestCaseController {
         return testPlanTestCaseService.list(request);
     }
 
-    @PostMapping("/get")
-    public TestPlanCaseDTO getTestPlanCase(@RequestBody QueryTestPlanCaseRequest request) {
-        return testPlanTestCaseService.getTestPlanCase(request);
-    }
-
     @PostMapping("/edit")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
     public void editTestCase(@RequestBody TestPlanTestCaseWithBLOBs testPlanTestCase) {
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
index b309f2c6fc..e5d306bf4f 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
@@ -146,8 +146,4 @@ public class TestPlanTestCaseService {
     public int updateTestCaseStates(List<String> ids, String reportStatus) {
         return extTestPlanTestCaseMapper.updateTestCaseStates(ids, reportStatus);
     }
-
-    public TestPlanCaseDTO getTestPlanCase(QueryTestPlanCaseRequest request) {
-        return extTestPlanTestCaseMapper.getTestPlanTestCase(request);
-    }
 }
diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
index cd9e3c6e3f..70f36abe3f 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
@@ -474,11 +474,16 @@ export default {
     getTestCase(index) {
       let testCase = this.testCases[index];
       // id 为 TestPlanTestCase 的 id
-      this.result = this.$post('/test/plan/case/get', {id: testCase.id}, response => {
+      this.result = this.$get('/test/plan/case/get/' + testCase.id, response => {
         let item = {};
         Object.assign(item, response.data);
         item.results = JSON.parse(item.results);
         item.steps = JSON.parse(item.steps);
+        if (item.issues) {
+          item.issues = JSON.parse(item.issues);
+        } else {
+          item.issues = {};
+        }
         item.steptResults = [];
         for (let i = 0; i < item.steps.length; i++) {
           if (item.results[i]) {
@@ -488,8 +493,10 @@ export default {
           item.steptResults.push(item.steps[i]);
         }
         this.testCase = item;
+        this.getRelatedTest();
+        this.initTest();
       })
-      this.initTest();
+
       this.getIssues(testCase.caseId);
       this.stepResultChange();
       this.getFileMetaData(testCase);
@@ -518,12 +525,13 @@ export default {
     },
     initTest() {
       this.$nextTick(() => {
-        if (this.testCase.method === 'auto') {
-          if (this.$refs.apiTestDetail && this.testCase.type === 'api') {
-
-            this.$refs.apiTestDetail.init();
-          } else if (this.testCase.type === 'performance') {
-            this.$refs.performanceTestDetail.init();
+        if (this.testCase.testId && this.testCase.testId !== 'other') {
+          if (this.testCase.method === 'auto') {
+            if (this.$refs.apiTestDetail && this.testCase.type === 'api') {
+              this.$refs.apiTestDetail.init();
+            } else if (this.testCase.type === 'performance') {
+              this.$refs.performanceTestDetail.init();
+            }
           }
         }
       });
@@ -549,7 +557,6 @@ export default {
           if (this.testCases[i].id === testCase.id) {
             this.index = i;
             this.getTestCase(i);
-            this.getRelatedTest();
           }
         }
       });

From 57b86dd2ef7f4dd746e4e26302cfd680228af880 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 30 Nov 2020 17:07:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BF=AE=E5=A4=8D=E5=8D=95=E4=BD=8D=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parse/xml/reader/jmx/JmeterDocumentParser.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
index 99c004e8f2..c81ceb1b0a 100644
--- a/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
+++ b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
@@ -785,7 +785,7 @@ public class JmeterDocumentParser implements DocumentParser {
         threadGroup.appendChild(createStringProp(document, "LogFilename", ""));
         // bzm - Concurrency Thread Group "Thread Iterations Limit:" 设置为空
 //        threadGroup.appendChild(createStringProp(document, "Iterations", "1"));
-        threadGroup.appendChild(createStringProp(document, "Unit", "M"));
+        threadGroup.appendChild(createStringProp(document, "Unit", "S"));
     }
 
     private void processCheckoutTimer(Element element) {
@@ -912,7 +912,7 @@ public class JmeterDocumentParser implements DocumentParser {
                                             } else {
                                                 duration = (Integer) durations;
                                             }
-                                            prop.getFirstChild().setNodeValue(String.valueOf(duration * 60));
+                                            prop.getFirstChild().setNodeValue(String.valueOf(duration));
                                             continue;
                                         }
                                         Object rpsLimits = context.getProperty("rpsLimit");