fix: Refactor notification sending methods to improve code reuse and clarity

Author: fit2-zhao

backend/crm/src/main/java/cn/cordys/crm/system/notice/CommonNoticeSendService.java

@@ -49,7 +49,7 @@ private static void setLanguage(String language) {
         LocaleContextHolder.setLocale(locale);
     }
 
-    @Async
+    @Async("threadPoolTaskExecutor")
     public void sendNotice(String module, String event, List<Map> resources, String userId, String currentOrganizationId) {
         User operator = userBaseMapper.selectByPrimaryKey(userId);
         setLanguage(operator.getLanguage());
@@ -150,6 +150,9 @@ private List<String> getRelatedUsers(Object relatedUsers) {
     }
 
     private String getContext(String event) {
+        if (StringUtils.isBlank(event)) {
+            return null;
+        }
         Map<String, String> defaultTemplateMap = MessageTemplateUtils.getDefaultTemplateMap();
         return defaultTemplateMap.get(event + "_TEXT");
     }
@@ -186,6 +189,10 @@ public List<String> getNoticeReceiveUserIds(MessageTaskConfigDTO messageTaskConf
             return receiveUserIds;
         }
 
+        if (StringUtils.isBlank(orgId)) {
+            return receiveUserIds;
+        }
+
         String departmentId = extOrganizationUserMapper.getDepartmentByUserId(owner);
 
         if (StringUtils.isBlank(departmentId)) {

backend/crm/src/main/java/cn/cordys/crm/system/notice/NoticeSendService.java

@@ -29,24 +29,29 @@ public class NoticeSendService {
     private final InSiteNoticeSender inSiteNoticeSender;
     private final MessageDetailService messageDetailService;
 
-    @Async("threadPoolTaskExecutor")
-    public void send(String module, NoticeModel noticeModel) {
+    private void doSend(String module, NoticeModel noticeModel, String organizationId) {
         setLanguage(noticeModel.getParamMap().get("Language"));
-        boolean useTemplate = Boolean.getBoolean((String) noticeModel.getParamMap().get("useTemplate"));
+        boolean useTemplate = Boolean.parseBoolean(
+                (String) noticeModel.getParamMap().getOrDefault("useTemplate", "false"));
         String template = (String) noticeModel.getParamMap().get("template");
         try {
-            String organizationId = (String) noticeModel.getParamMap().get("organizationId");
-            List<MessageDetailDTO> messageDetails = messageDetailService.searchMessageByTypeAndOrgId(module, useTemplate, template, organizationId);
+            List<MessageDetailDTO> messageDetails = messageDetailService
+                    .searchMessageByTypeAndOrgId(module, useTemplate, template, organizationId);
 
             messageDetails.stream()
-                    .filter(messageDetail -> Strings.CS.equals(messageDetail.getEvent(), noticeModel.getEvent()))
-                    .forEach(messageDetail -> sendNotification(messageDetail, noticeModel));
-
+                    .filter(md -> Strings.CS.equals(md.getEvent(), noticeModel.getEvent()))
+                    .forEach(md -> sendNotification(md, noticeModel));
         } catch (Exception e) {
             log.error("Error sending notification", e);
         }
     }
 
+    @Async("threadPoolTaskExecutor")
+    public void send(String module, NoticeModel noticeModel) {
+        String organizationId = (String) noticeModel.getParamMap().get("organizationId");
+        doSend(module, noticeModel, organizationId);
+    }
+
     private void setLanguage(Object languageObj) {
         String language = languageObj instanceof String ? (String) languageObj : "";
         Locale locale = Locale.SIMPLIFIED_CHINESE;
@@ -97,38 +102,13 @@ public void sendNotification(MessageDetailDTO messageDetail, NoticeModel noticeM
 
     @Async("threadPoolTaskExecutor")
     public void send(String organizationId, String module, NoticeModel noticeModel) {
-        setLanguage(noticeModel.getParamMap().get("Language"));
-        boolean useTemplate = Boolean.getBoolean((String) noticeModel.getParamMap().get("useTemplate"));
-        String template = (String) noticeModel.getParamMap().get("template");
-        try {
-            List<MessageDetailDTO> messageDetails = messageDetailService.searchMessageByTypeAndOrgId(module, useTemplate, template, organizationId);
-
-            messageDetails.stream()
-                    .filter(messageDetail -> Strings.CS.equals(messageDetail.getEvent(), noticeModel.getEvent()))
-                    .forEach(messageDetail -> sendNotification(messageDetail, noticeModel));
-
-        } catch (Exception e) {
-            log.error("Error sending notification", e);
-        }
+        doSend(module, noticeModel, organizationId);
     }
 
     @Async("threadPoolTaskExecutor")
     public void sendOther(String module, NoticeModel noticeModel, boolean excludeSelf) {
-        setLanguage(noticeModel.getParamMap().get("Language"));
-        boolean useTemplate = Boolean.parseBoolean((String) noticeModel.getParamMap().get("useTemplate"));
-        String template = (String) noticeModel.getParamMap().get("template");
         noticeModel.setExcludeSelf(excludeSelf);
-        try {
-            String organizationId = (String) noticeModel.getParamMap().get("organizationId");
-            List<MessageDetailDTO> messageDetails = messageDetailService.searchMessageByTypeAndOrgId(module, useTemplate, template, organizationId)
-                    .stream()
-                    .filter(messageDetail -> Strings.CS.equals(messageDetail.getEvent(), noticeModel.getEvent()))
-                    .toList();
-
-            messageDetails.forEach(messageDetail -> sendNotification(messageDetail, noticeModel));
-
-        } catch (Exception e) {
-            log.error("Error sending other notifications", e);
-        }
+        String organizationId = (String) noticeModel.getParamMap().get("organizationId");
+        doSend(module, noticeModel, organizationId);
     }
 }