diff --git a/backend/src/main/java/io/metersphere/notice/service/DingTaskService.java b/backend/src/main/java/io/metersphere/notice/service/DingTaskService.java index fef93eb126..dd30c10ff3 100644 --- a/backend/src/main/java/io/metersphere/notice/service/DingTaskService.java +++ b/backend/src/main/java/io/metersphere/notice/service/DingTaskService.java @@ -6,6 +6,7 @@ import com.dingtalk.api.request.OapiRobotSendRequest; import com.dingtalk.api.response.OapiRobotSendResponse; import com.taobao.api.ApiException; import io.metersphere.commons.constants.NoticeConstants; +import io.metersphere.commons.utils.LogUtil; import io.metersphere.notice.domain.MessageDetail; import io.metersphere.notice.domain.UserDetail; import io.metersphere.service.UserService; @@ -62,7 +63,7 @@ public class DingTaskService { try { response = client.execute(request); } catch (ApiException e) { - e.printStackTrace(); + LogUtil.error(e); } System.out.println(response.getErrcode()); } diff --git a/backend/src/main/java/io/metersphere/notice/service/WxChatTaskService.java b/backend/src/main/java/io/metersphere/notice/service/WxChatTaskService.java index a4bc03e904..10be211dc5 100644 --- a/backend/src/main/java/io/metersphere/notice/service/WxChatTaskService.java +++ b/backend/src/main/java/io/metersphere/notice/service/WxChatTaskService.java @@ -1,6 +1,7 @@ package io.metersphere.notice.service; import io.metersphere.commons.constants.NoticeConstants; +import io.metersphere.commons.utils.LogUtil; import io.metersphere.notice.domain.MessageDetail; import io.metersphere.notice.domain.UserDetail; import io.metersphere.notice.message.TextMessage; @@ -55,7 +56,7 @@ public class WxChatTaskService { SendResult result = WxChatbotClient.send(Webhook, message); System.out.println(result); } catch (IOException e) { - e.printStackTrace(); + LogUtil.error(e); } } diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java index a3e0bee76a..69575d5f69 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java @@ -8,6 +8,7 @@ import io.metersphere.base.mapper.ext.ExtTestCaseReviewMapper; import io.metersphere.base.mapper.ext.ExtTestReviewCaseMapper; import io.metersphere.commons.constants.NoticeConstants; import io.metersphere.commons.constants.TestCaseReviewStatus; +import io.metersphere.commons.constants.TestPlanStatus; import io.metersphere.commons.constants.TestReviewCaseStatus; import io.metersphere.commons.exception.MSException; import io.metersphere.commons.user.SessionUser; @@ -184,28 +185,31 @@ public class TestCaseReviewService { testCaseReview.setUpdateTime(System.currentTimeMillis()); checkCaseReviewExist(testCaseReview); testCaseReviewMapper.updateByPrimaryKeySelective(testCaseReview); - List userIds=new ArrayList<>(); + List userIds = new ArrayList<>(); userIds.addAll(testCaseReview.getUserIds()); - try { - String context = getReviewContext(testCaseReview, NoticeConstants.CREATE); - MessageSettingDetail messageSettingDetail = noticeService.searchMessage(); - List taskList = messageSettingDetail.getReviewTask(); - taskList.forEach(r -> { - switch (r.getType()) { - case NoticeConstants.NAIL_ROBOT: - dingTaskService.sendNailRobot(r, userIds, context, NoticeConstants.CREATE); - break; - case NoticeConstants.WECHAT_ROBOT: - wxChatTaskService.sendWechatRobot(r, userIds, context, NoticeConstants.CREATE); - break; - case NoticeConstants.EMAIL: - mailService.sendReviewerNotice(r, userIds, testCaseReview, NoticeConstants.CREATE); - break; - } - }); - } catch (Exception e) { - LogUtil.error(e); + if (StringUtils.equals(TestPlanStatus.Completed.name(), testCaseReview.getStatus())) { + try { + String context = getReviewContext(testCaseReview, NoticeConstants.UPDATE); + MessageSettingDetail messageSettingDetail = noticeService.searchMessage(); + List taskList = messageSettingDetail.getReviewTask(); + taskList.forEach(r -> { + switch (r.getType()) { + case NoticeConstants.NAIL_ROBOT: + dingTaskService.sendNailRobot(r, userIds, context, NoticeConstants.UPDATE); + break; + case NoticeConstants.WECHAT_ROBOT: + wxChatTaskService.sendWechatRobot(r, userIds, context, NoticeConstants.UPDATE); + break; + case NoticeConstants.EMAIL: + mailService.sendReviewerNotice(r, userIds, testCaseReview, NoticeConstants.UPDATE); + break; + } + }); + } catch (Exception e) { + LogUtil.error(e); + } } + } private void editCaseReviewer(SaveTestCaseReviewRequest testCaseReview) { diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java index 7ae31d1ea3..14e16fb576 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java @@ -165,20 +165,20 @@ public class TestPlanService { //已完成,写入实际完成时间 testPlan.setActualEndTime(System.currentTimeMillis()); try { - BeanUtils.copyBean(testPlans, testPlan); - String context = getTestPlanContext(testPlans, NoticeConstants.CREATE); + BeanUtils.copyBean(testPlans, getTestPlan(testPlan.getId())); + String context = getTestPlanContext(testPlans, NoticeConstants.UPDATE); MessageSettingDetail messageSettingDetail = noticeService.searchMessage(); - List taskList = messageSettingDetail.getReviewTask(); + List taskList = messageSettingDetail.getTestCasePlanTask(); taskList.forEach(r -> { switch (r.getType()) { case NoticeConstants.NAIL_ROBOT: - dingTaskService.sendNailRobot(r, userIds, context, NoticeConstants.CREATE); + dingTaskService.sendNailRobot(r, userIds, context, NoticeConstants.UPDATE); break; case NoticeConstants.WECHAT_ROBOT: - wxChatTaskService.sendWechatRobot(r, userIds, context, NoticeConstants.CREATE); + wxChatTaskService.sendWechatRobot(r, userIds, context, NoticeConstants.UPDATE); break; case NoticeConstants.EMAIL: - mailService.sendTestPlanStartNotice(r, userIds, testPlans, NoticeConstants.CREATE); + mailService.sendTestPlanStartNotice(r, userIds, testPlans, NoticeConstants.UPDATE); break; } });