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:
WangXu10 2024-05-20 18:30:52 +08:00 committed by Craftsman
parent 8e41b18136
commit 2b609c41f9
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,7 +131,7 @@ public class TestPlanController {
@RequiresPermissions(PermissionConstants.TEST_PLAN_READ) @RequiresPermissions(PermissionConstants.TEST_PLAN_READ)
@CheckOwner(resourceId = "#id", resourceType = "test_plan") @CheckOwner(resourceId = "#id", resourceType = "test_plan")
public TestPlanDetailResponse detail(@NotBlank @PathVariable String id) { public TestPlanDetailResponse detail(@NotBlank @PathVariable String id) {
return testPlanService.detail(id); return testPlanService.detail(id, SessionUtils.getUserId());
} }
@PostMapping(value = "/batch-delete") @PostMapping(value = "/batch-delete")

3
backend/services/test-plan/src/main/java/io/metersphere/plan/dto/response/TestPlanDetailResponse.java
View File

@ -60,4 +60,7 @@ public class TestPlanDetailResponse extends TestPlanStatisticsResponse implement
@Schema(description = "是否定时任务") @Schema(description = "是否定时任务")
private Boolean useSchedule; private Boolean useSchedule;
@Schema(description = "关注标识")
private Boolean followFlag;
} }

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

@ -460,7 +460,7 @@ public class TestPlanService extends TestPlanBaseUtilsService {
* @param id 计划ID * @param id 计划ID
* @return 计划的详情数据 * @return 计划的详情数据
*/ */
public TestPlanDetailResponse detail(String id) { public TestPlanDetailResponse detail(String id, String userId) {
TestPlan testPlan = testPlanMapper.selectByPrimaryKey(id); TestPlan testPlan = testPlanMapper.selectByPrimaryKey(id);
TestPlanDetailResponse response = new TestPlanDetailResponse(); TestPlanDetailResponse response = new TestPlanDetailResponse();
String moduleName = getModuleName(testPlan.getModuleId()); String moduleName = getModuleName(testPlan.getModuleId());
@ -485,9 +485,21 @@ public class TestPlanService extends TestPlanBaseUtilsService {
ScheduleExample example = new ScheduleExample(); ScheduleExample example = new ScheduleExample();
example.createCriteria().andResourceIdEqualTo(id).andResourceTypeEqualTo("TEST_PLAN"); example.createCriteria().andResourceIdEqualTo(id).andResourceTypeEqualTo("TEST_PLAN");
response.setUseSchedule(scheduleMapper.countByExample(example) > 0); response.setUseSchedule(scheduleMapper.countByExample(example) > 0);
//是否关注计划
Boolean isFollow = checkIsFollowCase(id, userId);
response.setFollowFlag(isFollow);
return response; return response;
} }
private Boolean checkIsFollowCase(String testPlanId, String userId) {
TestPlanFollowerExample example = new TestPlanFollowerExample();
example.createCriteria().andTestPlanIdEqualTo(testPlanId).andUserIdEqualTo(userId);
return testPlanFollowerMapper.countByExample(example) > 0;
}
private void getOtherConfig(TestPlanDetailResponse response, TestPlan testPlan) { private void getOtherConfig(TestPlanDetailResponse response, TestPlan testPlan) {
TestPlanConfig testPlanConfig = testPlanConfigMapper.selectByPrimaryKey(testPlan.getId()); TestPlanConfig testPlanConfig = testPlanConfigMapper.selectByPrimaryKey(testPlan.getId());
response.setAutomaticStatusUpdate(testPlanConfig.getAutomaticStatusUpdate()); response.setAutomaticStatusUpdate(testPlanConfig.getAutomaticStatusUpdate());