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

feat: xpack测试计划消息通知模板支持添加分享链接

This commit is contained in:
chenjianxing 2021-09-17 11:31:40 +08:00 committed by jianxing
parent d926da8124
commit 22f00e642e
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/api/service/ShareInfoService.java
View File

@ -459,6 +459,14 @@ public class ShareInfoService {
return returnDTO; return returnDTO;
} }
public String getTestPlanShareUrl(String testPlanReportId) {
ShareInfo shareRequest = new ShareInfo();
shareRequest.setCustomData(testPlanReportId);
shareRequest.setShareType(ShareType.PLAN_DB_REPORT.name());
ShareInfo shareInfo = generateShareInfo(shareRequest);
return conversionShareInfoToDTO(shareInfo).getShareUrl();
}
public ShareInfo get(String id) { public ShareInfo get(String id) {
return shareInfoMapper.selectByPrimaryKey(id); return shareInfoMapper.selectByPrimaryKey(id);
} }

14
backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
View File

@ -11,6 +11,7 @@ import io.metersphere.api.dto.automation.TestPlanFailureScenarioDTO;
import io.metersphere.api.dto.automation.TestPlanScenarioRequest; import io.metersphere.api.dto.automation.TestPlanScenarioRequest;
import io.metersphere.api.dto.definition.ApiTestCaseRequest; import io.metersphere.api.dto.definition.ApiTestCaseRequest;
import io.metersphere.api.dto.definition.TestPlanApiCaseDTO; import io.metersphere.api.dto.definition.TestPlanApiCaseDTO;
import io.metersphere.api.service.ShareInfoService;
import io.metersphere.base.domain.*; import io.metersphere.base.domain.*;
import io.metersphere.base.mapper.*; import io.metersphere.base.mapper.*;
import io.metersphere.base.mapper.ext.*; import io.metersphere.base.mapper.ext.*;
@ -21,7 +22,6 @@ import io.metersphere.i18n.Translator;
import io.metersphere.log.vo.OperatingLogDetails; import io.metersphere.log.vo.OperatingLogDetails;
import io.metersphere.notice.sender.NoticeModel; import io.metersphere.notice.sender.NoticeModel;
import io.metersphere.notice.service.NoticeSendService; import io.metersphere.notice.service.NoticeSendService;
import io.metersphere.service.ProjectService;
import io.metersphere.service.SystemParameterService; import io.metersphere.service.SystemParameterService;
import io.metersphere.track.Factory.ReportComponentFactory; import io.metersphere.track.Factory.ReportComponentFactory;
import io.metersphere.track.domain.ReportComponent; import io.metersphere.track.domain.ReportComponent;
@ -31,6 +31,7 @@ import io.metersphere.track.request.report.QueryTestPlanReportRequest;
import io.metersphere.track.request.report.TestPlanReportSaveRequest; import io.metersphere.track.request.report.TestPlanReportSaveRequest;
import io.metersphere.track.request.testcase.QueryTestPlanRequest; import io.metersphere.track.request.testcase.QueryTestPlanRequest;
import io.metersphere.track.request.testplan.LoadCaseRequest; import io.metersphere.track.request.testplan.LoadCaseRequest;
import io.metersphere.xpack.license.service.LicenseService;
import org.apache.commons.beanutils.BeanMap; import org.apache.commons.beanutils.BeanMap;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
@ -78,14 +79,16 @@ public class TestPlanReportService {
ApiTestCaseMapper apiTestCaseMapper; ApiTestCaseMapper apiTestCaseMapper;
@Resource @Resource
LoadTestReportMapper loadTestReportMapper; LoadTestReportMapper loadTestReportMapper;
@Resource
ProjectService projectService;
@Lazy @Lazy
@Resource @Resource
TestPlanService testPlanService; TestPlanService testPlanService;
@Lazy @Lazy
@Resource @Resource
TestPlanReportContentMapper testPlanReportContentMapper; TestPlanReportContentMapper testPlanReportContentMapper;
@Resource
ShareInfoService shareInfoService;
@Resource
LicenseService licenseService;
private final ExecutorService executorService = Executors.newFixedThreadPool(20); private final ExecutorService executorService = Executors.newFixedThreadPool(20);
@ -825,6 +828,11 @@ public class TestPlanReportService {
paramMap.put("projectId", projectId); paramMap.put("projectId", projectId);
paramMap.putAll(new BeanMap(testPlanReport)); paramMap.putAll(new BeanMap(testPlanReport));
if (licenseService.valid() != null) {
String testPlanShareUrl = shareInfoService.getTestPlanShareUrl(testPlanReport.getId());
paramMap.put("planShareUrl", baseSystemConfigDTO.getUrl() + "/sharePlanReport" + testPlanShareUrl);
}
String successfulMailTemplate = ""; String successfulMailTemplate = "";
String errfoMailTemplate = ""; String errfoMailTemplate = "";