fix(测试计划): 补充计划报告分享过期删除标识

This commit is contained in:
song-cc-rock 2024-06-19 18:34:09 +08:00 committed by Craftsman
parent 65b30cb9dd
commit 1b26df9c2d
2 changed files with 20 additions and 4 deletions

View File

@ -21,5 +21,8 @@ public class TestPlanShareResponse {
private String reportId;
@Schema(description = "分享链接是否被删")
private Boolean deleted;
private boolean deleted;
@Schema(description = "分享链接是否过期")
private boolean expired;
}

View File

@ -31,6 +31,7 @@ import java.util.List;
import static io.metersphere.sdk.util.ShareUtil.getTimeMills;
@Service
@Transactional(rollbackFor = Exception.class)
public class TestPlanReportShareService {
@Resource
@ -94,16 +95,28 @@ public class TestPlanReportShareService {
* @return 分享信息
*/
public TestPlanShareResponse get(String id) {
ShareInfo shareInfo = checkResource(id);
TestPlanShareResponse dto = new TestPlanShareResponse();
ShareInfo shareInfo = shareInfoMapper.selectByPrimaryKey(id);
// 无分享记录, 过期直接返回
if (shareInfo == null) {
dto.setExpired(true);
return dto;
}
BeanUtils.copyBean(dto, shareInfo);
dto.setReportId(new String(shareInfo.getCustomData()));
//检查报告ID是否存在
dto.setDeleted(false);
// 检查报告ID是否存在
TestPlanReport testPlanReport = testPlanReportMapper.selectByPrimaryKey(dto.getReportId());
if (testPlanReport == null || testPlanReport.getDeleted()) {
dto.setDeleted(true);
}
// 报告正常, 校验分享时间是否过期
if (!dto.isDeleted()) {
try {
validateExpired(shareInfo);
} catch (Exception e) {
dto.setExpired(true);
}
}
return dto;
}