From ecaed710c6d4f251eda242f20f61e50982082b20 Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Thu, 11 Apr 2024 21:23:33 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E5=B7=B2=E8=AF=BB=E7=9A=84bug=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=BA=BA=E6=98=AF=E5=88=9B=E5=BB=BA=E4=BA=BA?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E6=94=B6=E4=B8=8D=E5=88=B0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1039160 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001039160 --- .../controller/NotificationController.java | 4 +- .../notice/sender/AbstractNoticeSender.java | 97 +++++++++++++++++-- .../system/service/NotificationService.java | 5 +- frontend/src/api/modules/message/index.ts | 4 +- .../ms-message/MessageCenterDrawer.vue | 2 +- 5 files changed, 96 insertions(+), 16 deletions(-) diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/NotificationController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/NotificationController.java index 9a6d2e7acd..4ab66268b3 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/NotificationController.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/NotificationController.java @@ -41,8 +41,8 @@ public class NotificationController { @GetMapping(value = "/read/all") @Operation(summary = "消息中心-将消息中心所有信息设置为已读消息") - public Integer readAll() { - return notificationService.readAll(SessionUtils.getUserId()); + public Integer readAll(@RequestParam(value = "resourceType", required = false) String resourceType) { + return notificationService.readAll(resourceType, SessionUtils.getUserId()); } @PostMapping(value = "/count") diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/notice/sender/AbstractNoticeSender.java b/backend/services/system-setting/src/main/java/io/metersphere/system/notice/sender/AbstractNoticeSender.java index bafc7ac90b..4c6532b5a0 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/notice/sender/AbstractNoticeSender.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/notice/sender/AbstractNoticeSender.java @@ -1,27 +1,31 @@ package io.metersphere.system.notice.sender; -import io.metersphere.api.domain.ApiDefinitionFollower; -import io.metersphere.api.domain.ApiDefinitionFollowerExample; -import io.metersphere.api.domain.ApiScenarioFollower; -import io.metersphere.api.domain.ApiScenarioFollowerExample; +import io.metersphere.api.domain.*; import io.metersphere.api.mapper.ApiDefinitionFollowerMapper; +import io.metersphere.api.mapper.ApiDefinitionMapper; import io.metersphere.api.mapper.ApiScenarioFollowerMapper; +import io.metersphere.api.mapper.ApiScenarioMapper; +import io.metersphere.bug.domain.Bug; import io.metersphere.bug.domain.BugFollower; import io.metersphere.bug.domain.BugFollowerExample; import io.metersphere.bug.mapper.BugFollowerMapper; -import io.metersphere.functional.domain.CaseReviewFollower; -import io.metersphere.functional.domain.CaseReviewFollowerExample; -import io.metersphere.functional.domain.FunctionalCaseFollower; -import io.metersphere.functional.domain.FunctionalCaseFollowerExample; +import io.metersphere.bug.mapper.BugMapper; +import io.metersphere.functional.domain.*; import io.metersphere.functional.mapper.CaseReviewFollowerMapper; +import io.metersphere.functional.mapper.CaseReviewMapper; import io.metersphere.functional.mapper.FunctionalCaseFollowerMapper; +import io.metersphere.functional.mapper.FunctionalCaseMapper; +import io.metersphere.load.domain.LoadTest; import io.metersphere.load.domain.LoadTestFollower; import io.metersphere.load.domain.LoadTestFollowerExample; import io.metersphere.load.mapper.LoadTestFollowerMapper; +import io.metersphere.load.mapper.LoadTestMapper; +import io.metersphere.plan.domain.TestPlan; import io.metersphere.plan.domain.TestPlanFollower; import io.metersphere.plan.domain.TestPlanFollowerExample; import io.metersphere.plan.mapper.TestPlanFollowerMapper; +import io.metersphere.plan.mapper.TestPlanMapper; import io.metersphere.sdk.util.JSON; import io.metersphere.sdk.util.LogUtils; import io.metersphere.system.domain.User; @@ -39,6 +43,7 @@ import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; public abstract class AbstractNoticeSender implements NoticeSender { @@ -46,18 +51,32 @@ public abstract class AbstractNoticeSender implements NoticeSender { @Resource private BugFollowerMapper bugFollowerMapper; @Resource + private BugMapper bugMapper; + @Resource private TestPlanFollowerMapper testPlanFollowerMapper; @Resource + private TestPlanMapper testPlanMapper; + @Resource private FunctionalCaseFollowerMapper functionalCaseFollowerMapper; @Resource + private FunctionalCaseMapper functionalCaseMapper; + @Resource private ApiScenarioFollowerMapper apiScenarioFollowerMapper; @Resource + private ApiScenarioMapper apiScenarioMapper; + @Resource private ApiDefinitionFollowerMapper apiDefinitionFollowerMapper; @Resource + private ApiDefinitionMapper apiDefinitionMapper; + @Resource private LoadTestFollowerMapper loadTestFollowerMapper; @Resource + private LoadTestMapper loadTestMapper; + @Resource private CaseReviewFollowerMapper caseReviewFollowerMapper; @Resource + private CaseReviewMapper caseReviewMapper; + @Resource private ExtSystemProjectMapper extSystemProjectMapper; @@ -116,7 +135,8 @@ public abstract class AbstractNoticeSender implements NoticeSender { if (StringUtils.isNotBlank(createUser)) { toUsers.add(new Receiver(createUser, NotificationConstants.Type.SYSTEM_NOTICE.name())); } else { - toUsers.add(new Receiver((String) paramMap.get(NoticeConstants.RelatedUser.OPERATOR), NotificationConstants.Type.SYSTEM_NOTICE.name())); + Receiver receiver = handleCreateUser(messageDetail, noticeModel); + toUsers.add(Objects.requireNonNullElseGet(receiver, () -> new Receiver((String) paramMap.get(NoticeConstants.RelatedUser.OPERATOR), NotificationConstants.Type.SYSTEM_NOTICE.name()))); } } case NoticeConstants.RelatedUser.OPERATOR -> { @@ -152,7 +172,64 @@ public abstract class AbstractNoticeSender implements NoticeSender { LogUtils.info("userIds: ", JSON.toJSONString(userIds)); List users = getUsers(userIds, messageDetail.getProjectId()); List realUserIds = users.stream().map(User::getId).toList(); - return toUsers; + return toUsers.stream().filter(t -> realUserIds.contains(t.getUserId())).toList(); + } + + private Receiver handleCreateUser(MessageDetail messageDetail, NoticeModel noticeModel) { + String id = (String) noticeModel.getParamMap().get("id"); + if (StringUtils.isBlank(id)) { + return null; + } + String taskType = messageDetail.getTaskType(); + + Receiver receiver = null; + switch (taskType) { + case NoticeConstants.TaskType.TEST_PLAN_TASK -> { + TestPlan testPlan = testPlanMapper.selectByPrimaryKey(id); + if (testPlan != null) { + receiver = new Receiver(testPlan.getCreateUser(), NotificationConstants.Type.SYSTEM_NOTICE.name()); + } + } + case NoticeConstants.TaskType.CASE_REVIEW_TASK -> { + CaseReview caseReview = caseReviewMapper.selectByPrimaryKey(id); + if (caseReview != null) { + receiver = new Receiver(caseReview.getCreateUser(), NotificationConstants.Type.SYSTEM_NOTICE.name()); + } + } + case NoticeConstants.TaskType.API_SCENARIO_TASK -> { + ApiScenario apiScenario = apiScenarioMapper.selectByPrimaryKey(id); + if (apiScenario != null) { + receiver = new Receiver(apiScenario.getCreateUser(), NotificationConstants.Type.SYSTEM_NOTICE.name()); + } + } + case NoticeConstants.TaskType.API_DEFINITION_TASK -> { + ApiDefinition apiDefinition = apiDefinitionMapper.selectByPrimaryKey(id); + if (apiDefinition != null) { + receiver = new Receiver(apiDefinition.getCreateUser(), NotificationConstants.Type.SYSTEM_NOTICE.name()); + } + } + case NoticeConstants.TaskType.LOAD_TEST_TASK -> { + LoadTest loadTest = loadTestMapper.selectByPrimaryKey(id); + if (loadTest != null) { + receiver = new Receiver(loadTest.getCreateUser(), NotificationConstants.Type.SYSTEM_NOTICE.name()); + } + } + case NoticeConstants.TaskType.FUNCTIONAL_CASE_TASK -> { + FunctionalCase functionalCase = functionalCaseMapper.selectByPrimaryKey(id); + if (functionalCase != null) { + receiver = new Receiver(functionalCase.getCreateUser(), NotificationConstants.Type.SYSTEM_NOTICE.name()); + } + } + case NoticeConstants.TaskType.BUG_TASK -> { + Bug bug = bugMapper.selectByPrimaryKey(id); + if (bug != null) { + receiver = new Receiver(bug.getCreateUser(), NotificationConstants.Type.SYSTEM_NOTICE.name()); + } + } + default -> { + } + } + return receiver; } private List handleFollows(MessageDetail messageDetail, NoticeModel noticeModel) { diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/NotificationService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/NotificationService.java index c1bbb4cfe9..3d9d2f8da1 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/NotificationService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/NotificationService.java @@ -42,10 +42,13 @@ public class NotificationService { return notificationMapper.updateByExampleSelective(record, example); } - public int readAll(String userId) { + public int readAll(String resourceType, String userId) { Notification record = new Notification(); record.setStatus(NotificationConstants.Status.READ.name()); NotificationExample example = new NotificationExample(); + if (StringUtils.isNotBlank(resourceType)) { + example.createCriteria().andResourceTypeEqualTo(resourceType); + } example.createCriteria().andReceiverEqualTo(userId); return notificationMapper.updateByExampleSelective(record, example); } diff --git a/frontend/src/api/modules/message/index.ts b/frontend/src/api/modules/message/index.ts index cce6095672..4a71affa8e 100644 --- a/frontend/src/api/modules/message/index.ts +++ b/frontend/src/api/modules/message/index.ts @@ -85,6 +85,6 @@ export function queryMessageHistoryCount(data: historyQueryParams) { return MSR.post({ url: '/notification/count', data }); } -export function getMessageReadAll() { - return MSR.get({ url: '/notification/read/all' }); +export function getMessageReadAll(resourceType?: string) { + return MSR.get({ url: '/notification/read/all', params: { resourceType } }); } diff --git a/frontend/src/components/business/ms-message/MessageCenterDrawer.vue b/frontend/src/components/business/ms-message/MessageCenterDrawer.vue index c0a4694f9f..98c0070659 100644 --- a/frontend/src/components/business/ms-message/MessageCenterDrawer.vue +++ b/frontend/src/components/business/ms-message/MessageCenterDrawer.vue @@ -318,7 +318,7 @@ // 全部标记为已读 async function prepositionEdit() { - await getMessageReadAll(); + await getMessageReadAll(currentResourceType.value); messageHistoryList.value = []; pageNation.value.current = 1; // 左侧消息总数