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

feat(测试计划): 补充计划详情执行历史接口

This commit is contained in:
song-cc-rock 2024-06-14 14:52:10 +08:00 committed by Craftsman
parent 501a3684b4
commit 1cf7f454d9
6 changed files with 98 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanController.java
View File

@ -1,8 +1,11 @@
package io.metersphere.plan.controller;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import io.metersphere.api.service.scenario.ApiScenarioLogService;
import io.metersphere.plan.constants.TestPlanResourceConfig;
import io.metersphere.plan.domain.TestPlan;
import io.metersphere.plan.dto.TestPlanExecuteHisDTO;
import io.metersphere.plan.dto.request.*;
import io.metersphere.plan.dto.response.TestPlanDetailResponse;
import io.metersphere.plan.dto.response.TestPlanOperationResponse;
@ -19,6 +22,7 @@ import io.metersphere.system.log.constants.OperationLogType;
import io.metersphere.system.notice.annotation.SendNotice;
import io.metersphere.system.notice.constants.NoticeConstants;
import io.metersphere.system.security.CheckOwner;
import io.metersphere.system.utils.PageUtils;
import io.metersphere.system.utils.Pager;
import io.metersphere.system.utils.SessionUtils;
import io.swagger.v3.oas.annotations.Operation;
@ -27,6 +31,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.constraints.NotBlank;
import org.apache.commons.collections4.MapUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -251,4 +256,14 @@ public class TestPlanController {
testPlanManagementService.checkModuleIsOpen(testPlanId, TestPlanResourceConfig.CHECK_TYPE_TEST_PLAN, Collections.singletonList(TestPlanResourceConfig.CONFIG_TEST_PLAN));
testPlanService.deleteScheduleConfig(testPlanId);
}
@PostMapping(value = "/his/page")
@Operation(summary = "测试计划-执行历史-列表分页查询")
@RequiresPermissions(PermissionConstants.TEST_PLAN_READ)
@CheckOwner(resourceId = "#request.getPlanId()", resourceType = "test_plan")
public Pager<List<TestPlanExecuteHisDTO>> pageHis(@Validated TestPlanExecuteHisPageRequest request) {
Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize(),
MapUtils.isEmpty(request.getSort()) ? "tpr.create_time desc" : request.getSortString());
return PageUtils.setPageInfo(page, testPlanService.listHis(request));
}
}

25
backend/services/test-plan/src/main/java/io/metersphere/plan/dto/TestPlanExecuteHisDTO.java Normal file
View File

@ -0,0 +1,25 @@
package io.metersphere.plan.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class TestPlanExecuteHisDTO {
@Schema(description = "执行结果ID")
private String id;
@Schema(description = "序号")
private String num;
@Schema(description = "执行方式")
private String triggerMode;
@Schema(description = "执行状态")
private String execStatus;
@Schema(description = "操作人")
private String createUser;
@Schema(description = "执行起始时间")
private Long startTime;
@Schema(description = "执行结束时间")
private Long endTime;
@Schema(description = "报告是否删除")
private Boolean deleted;
}

12
backend/services/test-plan/src/main/java/io/metersphere/plan/dto/request/TestPlanExecuteHisPageRequest.java Normal file
View File

@ -0,0 +1,12 @@
package io.metersphere.plan.dto.request;
import io.metersphere.system.dto.sdk.BasePageRequest;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class TestPlanExecuteHisPageRequest extends BasePageRequest {
@Schema(description = "测试计划ID", requiredMode = Schema.RequiredMode.REQUIRED)
private String planId;
}

4
backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.java
View File

@ -1,8 +1,10 @@
package io.metersphere.plan.mapper;
import io.metersphere.plan.domain.TestPlan;
import io.metersphere.plan.dto.TestPlanExecuteHisDTO;
import io.metersphere.plan.dto.TestPlanQueryConditions;
import io.metersphere.plan.dto.request.TestPlanBatchProcessRequest;
import io.metersphere.plan.dto.request.TestPlanExecuteHisPageRequest;
import io.metersphere.plan.dto.request.TestPlanTableRequest;
import io.metersphere.plan.dto.response.TestPlanResponse;
import io.metersphere.project.dto.DropNode;
@ -52,4 +54,6 @@ public interface ExtTestPlanMapper {
List<TestPlanResponse> selectByGroupIds(@Param("groupIds") List<String> groupIds);
List<String> selectRightfulIdsForExecute(@Param("ids") List<String> ids);
List<TestPlanExecuteHisDTO> listHis(@Param("request")TestPlanExecuteHisPageRequest request);
}

23
backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.xml
View File

@ -460,6 +460,13 @@
AND status != 'ARCHIVED'
</select>
<select id="listHis" resultType="io.metersphere.plan.dto.TestPlanExecuteHisDTO">
select tpr.id, from_unixtime(tpr.create_time / 1000, '%Y%m%d%H%i%s') as num, tpr.trigger_mode triggerMode, tpr.exec_status execStatus,
tpr.create_user createUser, tpr.start_time startTime, tpr.end_time endTime, tpr.deleted deleted from test_plan_report tpr
where tpr.test_plan_id = #{request.planId}
<include refid="filter"/>
</select>
<update id="batchUpdate">
update test_plan
<set>
@ -479,4 +486,20 @@
</foreach>
and project_id = #{testPlan.projectId}
</update>
<sql id="filter">
<if test="request.filter != null and request.filter.size() > 0">
<foreach collection="request.filter.entrySet()" index="key" item="values">
<if test="values != null and values.size() > 0">
<choose>
<!-- 执行状态 -->
<when test="key == 'execStatus'">
and tpr.exec_status in
<include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
</when>
</choose>
</if>
</foreach>
</if>
</sql>
</mapper>

19
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanService.java
View File

@ -2,6 +2,7 @@ package io.metersphere.plan.service;
import io.metersphere.plan.domain.*;
import io.metersphere.plan.dto.TestPlanCollectionDTO;
import io.metersphere.plan.dto.TestPlanExecuteHisDTO;
import io.metersphere.plan.dto.request.*;
import io.metersphere.plan.dto.response.TestPlanDetailResponse;
import io.metersphere.plan.dto.response.TestPlanOperationResponse;
@ -20,8 +21,10 @@ import io.metersphere.system.domain.User;
import io.metersphere.system.dto.LogInsertModule;
import io.metersphere.system.dto.request.ScheduleConfig;
import io.metersphere.system.dto.request.schedule.BaseScheduleConfigRequest;
import io.metersphere.system.dto.sdk.OptionDTO;
import io.metersphere.system.dto.sdk.request.PosRequest;
import io.metersphere.system.log.constants.OperationLogType;
import io.metersphere.system.mapper.BaseUserMapper;
import io.metersphere.system.mapper.ScheduleMapper;
import io.metersphere.system.mapper.TestPlanModuleMapper;
import io.metersphere.system.mapper.UserMapper;
@ -57,6 +60,8 @@ public class TestPlanService extends TestPlanBaseUtilsService {
@Resource
private ExtTestPlanMapper extTestPlanMapper;
@Resource
private BaseUserMapper baseUserMapper;
@Resource
private TestPlanGroupService testPlanGroupService;
@Resource
private TestPlanConfigMapper testPlanConfigMapper;
@ -826,6 +831,20 @@ public class TestPlanService extends TestPlanBaseUtilsService {
scheduleService.deleteByResourceId(testPlanId, TestPlanScheduleJob.getJobKey(testPlanId), TestPlanScheduleJob.getTriggerKey(testPlanId));
}
public List<TestPlanExecuteHisDTO> listHis(TestPlanExecuteHisPageRequest request) {
List<TestPlanExecuteHisDTO> hisList = extTestPlanMapper.listHis(request);
if (CollectionUtils.isEmpty(hisList)) {
return new ArrayList<>();
}
List<String> userIds = hisList.stream().map(TestPlanExecuteHisDTO::getCreateUser).distinct().toList();
List<OptionDTO> userOptions = baseUserMapper.selectUserOptionByIds(userIds);
Map<String, String> userMap = userOptions.stream().collect(Collectors.toMap(OptionDTO::getId, OptionDTO::getName));
hisList.forEach(his -> {
his.setCreateUser(userMap.getOrDefault(his.getCreateUser(), his.getCreateUser()));
});
return hisList;
}
public List<String> selectRightfulIds(List<String> executeIds) {
return extTestPlanMapper.selectNotArchivedIds(executeIds);
}