test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(接口测试): 统一任务中心Jenkins调用状态 

--bug=1019144 --user=赵勇 【接口测试】Jenkins中api调用执行接口CASE-任务中心显示JENKINS字样 https://www.tapd.cn/55049933/s/1283764
This commit is contained in:
fit2-zhao 2022-10-31 16:32:02 +08:00 committed by fit2-zhao
parent 9cc723d6ab
commit d45f1f635c
3 changed files with 60 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api-test/frontend/src/business/history/task/ApiTaskCenter.vue
View File

@ -161,7 +161,7 @@ export default {
{id: 'BATCH', label: this.$t('api_test.automation.batch_execute')}, {id: 'BATCH', label: this.$t('api_test.automation.batch_execute')},
{id: 'SCHEDULE', label: this.$t('commons.trigger_mode.schedule')}, {id: 'SCHEDULE', label: this.$t('commons.trigger_mode.schedule')},
{id: 'MANUAL', label: this.$t('commons.trigger_mode.manual')}, {id: 'MANUAL', label: this.$t('commons.trigger_mode.manual')},
{id: 'API', label: 'API'} {id: 'API', label: this.$t('commons.trigger_mode.api')}
], ],
runStatus: [ runStatus: [
{id: '', label: this.$t('api_test.definition.document.data_set.all')}, {id: '', label: this.$t('api_test.definition.document.data_set.all')},
@ -371,7 +371,7 @@ export default {
if (mode === 'TEST_PLAN_SCHEDULE') { if (mode === 'TEST_PLAN_SCHEDULE') {
return this.$t('commons.trigger_mode.schedule'); return this.$t('commons.trigger_mode.schedule');
} }
if (mode === 'API') { if (mode.startsWith('JENKINS')) {
return this.$t('commons.trigger_mode.api'); return this.$t('commons.trigger_mode.api');
} }
if (mode === 'BATCH') { if (mode === 'BATCH') {

4
framework/sdk-parent/frontend/src/components/task/TaskCenter.vue
View File

@ -164,7 +164,7 @@ export default {
{id: 'BATCH', label: this.$t('api_test.automation.batch_execute')}, {id: 'BATCH', label: this.$t('api_test.automation.batch_execute')},
{id: 'SCHEDULE', label: this.$t('commons.trigger_mode.schedule')}, {id: 'SCHEDULE', label: this.$t('commons.trigger_mode.schedule')},
{id: 'MANUAL', label: this.$t('commons.trigger_mode.manual')}, {id: 'MANUAL', label: this.$t('commons.trigger_mode.manual')},
{id: 'API', label: 'API'} {id: 'API', label: this.$t('commons.trigger_mode.api')}
], ],
runStatus: [ runStatus: [
{id: '', label: this.$t('api_test.definition.document.data_set.all')}, {id: '', label: this.$t('api_test.definition.document.data_set.all')},
@ -374,7 +374,7 @@ export default {
if (mode === 'BATCH') { if (mode === 'BATCH') {
return this.$t('api_test.automation.batch_execute'); return this.$t('api_test.automation.batch_execute');
} }
if (mode === 'JENKINS_RUN_TEST_PLAN') { if (mode.startsWith('JENKINS')) {
return this.$t('commons.trigger_mode.api'); return this.$t('commons.trigger_mode.api');
} }
return mode; return mode;

63
framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseTaskMapper.xml
View File

@ -15,7 +15,14 @@
#{id} #{id}
</foreach> </foreach>
<if test="request.triggerMode != null and request.triggerMode != ''"> <if test="request.triggerMode != null and request.triggerMode != ''">
AND t.trigger_mode = #{request.triggerMode} <choose>
<when test="request.triggerMode== 'API'">
AND t.trigger_mode in ('JENKINS_API_PLAN', 'JENKINS_SCENARIO_PLAN', 'JENKINS_PERFORMANCE_TEST', 'JENKINS')
</when>
<otherwise>
AND t.trigger_mode = #{request.triggerMode}
</otherwise>
</choose>
</if> </if>
<if test="request.executionStatus != null and request.executionStatus != ''"> <if test="request.executionStatus != null and request.executionStatus != ''">
AND t.status = #{request.executionStatus} AND t.status = #{request.executionStatus}
@ -36,7 +43,14 @@
</foreach> </foreach>
<if test="request.triggerMode != null and request.triggerMode != ''"> <if test="request.triggerMode != null and request.triggerMode != ''">
AND t.trigger_mode = #{request.triggerMode} <choose>
<when test="request.triggerMode== 'API'">
AND t.trigger_mode in ('JENKINS_API_PLAN', 'JENKINS_SCENARIO_PLAN', 'JENKINS_PERFORMANCE_TEST', 'JENKINS')
</when>
<otherwise>
AND t.trigger_mode = #{request.triggerMode}
</otherwise>
</choose>
</if> </if>
<if test="request.executionStatus != null and request.executionStatus != ''"> <if test="request.executionStatus != null and request.executionStatus != ''">
AND t.status = #{request.executionStatus} AND t.status = #{request.executionStatus}
@ -57,7 +71,14 @@
#{id} #{id}
</foreach> </foreach>
<if test="request.triggerMode != null and request.triggerMode != ''"> <if test="request.triggerMode != null and request.triggerMode != ''">
AND t.trigger_mode = #{request.triggerMode} <choose>
<when test="request.triggerMode== 'API'">
AND t.trigger_mode in ('JENKINS_API_PLAN', 'JENKINS_SCENARIO_PLAN', 'JENKINS_PERFORMANCE_TEST', 'JENKINS')
</when>
<otherwise>
AND t.trigger_mode = #{request.triggerMode}
</otherwise>
</choose>
</if> </if>
<if test="request.executionStatus != null and request.executionStatus != ''"> <if test="request.executionStatus != null and request.executionStatus != ''">
AND t.status = #{request.executionStatus} AND t.status = #{request.executionStatus}
@ -119,7 +140,14 @@
#{id} #{id}
</foreach> </foreach>
<if test="request.triggerMode != null and request.triggerMode != ''"> <if test="request.triggerMode != null and request.triggerMode != ''">
AND t.trigger_mode = #{request.triggerMode} <choose>
<when test="request.triggerMode== 'API'">
AND t.trigger_mode in ('JENKINS_API_PLAN', 'JENKINS_SCENARIO_PLAN', 'JENKINS_PERFORMANCE_TEST', 'JENKINS')
</when>
<otherwise>
AND t.trigger_mode = #{request.triggerMode}
</otherwise>
</choose>
</if> </if>
<if test="request.executionStatus != null and request.executionStatus != ''"> <if test="request.executionStatus != null and request.executionStatus != ''">
AND t.status = #{request.executionStatus} AND t.status = #{request.executionStatus}
@ -140,7 +168,14 @@
#{id} #{id}
</foreach> </foreach>
<if test="request.triggerMode != null and request.triggerMode != ''"> <if test="request.triggerMode != null and request.triggerMode != ''">
AND t.trigger_mode = #{request.triggerMode} <choose>
<when test="request.triggerMode== 'API'">
AND t.trigger_mode in ('JENKINS_API_PLAN', 'JENKINS_SCENARIO_PLAN', 'JENKINS_PERFORMANCE_TEST', 'JENKINS')
</when>
<otherwise>
AND t.trigger_mode = #{request.triggerMode}
</otherwise>
</choose>
</if> </if>
<if test="request.executionStatus != null and request.executionStatus != ''"> <if test="request.executionStatus != null and request.executionStatus != ''">
AND t.status = #{request.executionStatus} AND t.status = #{request.executionStatus}
@ -162,7 +197,14 @@
</foreach> </foreach>
<if test="request.triggerMode != null and request.triggerMode != ''"> <if test="request.triggerMode != null and request.triggerMode != ''">
AND t.trigger_mode = #{request.triggerMode} <choose>
<when test="request.triggerMode== 'API'">
AND t.trigger_mode in ('JENKINS_API_PLAN', 'JENKINS_SCENARIO_PLAN', 'JENKINS_PERFORMANCE_TEST', 'JENKINS')
</when>
<otherwise>
AND t.trigger_mode = #{request.triggerMode}
</otherwise>
</choose>
</if> </if>
<if test="request.executionStatus != null and request.executionStatus != ''"> <if test="request.executionStatus != null and request.executionStatus != ''">
AND t.status = #{request.executionStatus} AND t.status = #{request.executionStatus}
@ -184,7 +226,14 @@
#{id} #{id}
</foreach> </foreach>
<if test="request.triggerMode != null and request.triggerMode != ''"> <if test="request.triggerMode != null and request.triggerMode != ''">
AND t.trigger_mode = #{request.triggerMode} <choose>
<when test="request.triggerMode== 'API'">
AND t.trigger_mode in ('JENKINS_API_PLAN', 'JENKINS_SCENARIO_PLAN', 'JENKINS_PERFORMANCE_TEST', 'JENKINS')
</when>
<otherwise>
AND t.trigger_mode = #{request.triggerMode}
</otherwise>
</choose>
</if> </if>
<if test="request.executionStatus != null and request.executionStatus != ''"> <if test="request.executionStatus != null and request.executionStatus != ''">
AND t.status = #{request.executionStatus} AND t.status = #{request.executionStatus}