增加构建通知

backend/src/main/java/com/qqchen/deploy/backend/notification/adapter/impl/EmailChannelAdapter.java

@@ -25,63 +25,61 @@ import java.util.Properties;
 @Slf4j
 @Component
 public class EmailChannelAdapter implements INotificationChannelAdapter<EmailNotificationConfig, EmailSendNotificationRequest> {
-    
+
-    private final ObjectMapper objectMapper = new ObjectMapper();
-    
     @Override
     public void send(EmailNotificationConfig emailConfig, EmailSendNotificationRequest request) throws Exception {
         // 1. 校验配置
         validateEmailConfig(emailConfig);
-        
+
         // 2. 创建JavaMailSender
         JavaMailSenderImpl mailSender = createMailSender(emailConfig);
-        
+
         // 3. 校验收件人
         if (CollectionUtils.isEmpty(request.getToReceivers())) {
             throw new IllegalArgumentException("收件人列表不能为空");
         }
-        
+
         // 4. 构建邮件
         MimeMessage mimeMessage = mailSender.createMimeMessage();
         MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
-        
+
         // 设置发件人
         if (emailConfig.getFromName() != null && !emailConfig.getFromName().isEmpty()) {
             helper.setFrom(new InternetAddress(emailConfig.getFrom(), emailConfig.getFromName(), "UTF-8"));
         } else {
             helper.setFrom(emailConfig.getFrom());
         }
-        
+
         // 设置收件人
         helper.setTo(request.getToReceivers().toArray(new String[0]));
-        
+
         // 设置抄送
         if (!CollectionUtils.isEmpty(request.getCcReceivers())) {
             helper.setCc(request.getCcReceivers().toArray(new String[0]));
         }
-        
+
         // 设置密送
         if (!CollectionUtils.isEmpty(request.getBccReceivers())) {
             helper.setBcc(request.getBccReceivers().toArray(new String[0]));
         }
-        
+
         // 设置主题
         helper.setSubject(request.getSubject());
-        
+
         // 设置内容（支持HTML）
         helper.setText(request.getContent(), request.getIsHtml() != null ? request.getIsHtml() : false);
-        
+
         // 5. 发送邮件
         log.info("发送邮件通知 - 收件人: {}, 主题: {}", request.getToReceivers(), request.getSubject());
         mailSender.send(mimeMessage);
         log.info("邮件通知发送成功");
     }
-    
+
     @Override
     public NotificationChannelTypeEnum supportedType() {
         return NotificationChannelTypeEnum.EMAIL;
     }
-    
+
     @Override
     public String validateConfig(EmailNotificationConfig emailConfig) {
         try {
@@ -91,18 +89,18 @@ public class EmailChannelAdapter implements INotificationChannelAdapter<EmailNot
             return "配置验证失败: " + e.getMessage();
         }
     }
-    
+
     @Override
     public void testConnection(EmailNotificationConfig emailConfig) throws Exception {
         // 1. 校验配置
         validateEmailConfig(emailConfig);
-        
+
         // 3. 创建JavaMailSender
         JavaMailSenderImpl mailSender = createMailSender(emailConfig);
-        
+
         // 4. 测试SMTP连接
         log.info("测试SMTP连接 - 服务器: {}:{}", emailConfig.getSmtpHost(), emailConfig.getSmtpPort());
-        
+
         try {
             // 测试连接
             mailSender.testConnection();
@@ -111,11 +109,11 @@ public class EmailChannelAdapter implements INotificationChannelAdapter<EmailNot
             log.error("SMTP连接测试失败: {}", e.getMessage());
             throw new Exception("SMTP连接失败: " + e.getMessage(), e);
         }
-        
+
         // 5. 测试连接成功（不发送测试邮件，因为没有默认收件人）
         log.info("邮件通知渠道配置测试成功 - SMTP连接正常");
     }
-    
+
     /**
      * 校验邮件配置
      */
@@ -123,24 +121,24 @@ public class EmailChannelAdapter implements INotificationChannelAdapter<EmailNot
         if (config.getSmtpHost() == null || config.getSmtpHost().isEmpty()) {
             throw new IllegalArgumentException("SMTP服务器地址不能为空");
         }
-        
+
         if (config.getSmtpPort() == null) {
             throw new IllegalArgumentException("SMTP端口不能为空");
         }
-        
+
         if (config.getUsername() == null || config.getUsername().isEmpty()) {
             throw new IllegalArgumentException("SMTP用户名不能为空");
         }
-        
+
         if (config.getPassword() == null || config.getPassword().isEmpty()) {
             throw new IllegalArgumentException("SMTP密码不能为空");
         }
-        
+
         if (config.getFrom() == null || config.getFrom().isEmpty()) {
             throw new IllegalArgumentException("发件人邮箱不能为空");
         }
     }
-    
+
     /**
      * 创建JavaMailSender
      */
@@ -150,22 +148,22 @@ public class EmailChannelAdapter implements INotificationChannelAdapter<EmailNot
         mailSender.setPort(config.getSmtpPort());
         mailSender.setUsername(config.getUsername());
         mailSender.setPassword(config.getPassword());
-        
+
         // 设置邮件属性
         Properties props = mailSender.getJavaMailProperties();
         props.put("mail.transport.protocol", "smtp");
         props.put("mail.smtp.auth", "true");
         props.put("mail.smtp.starttls.enable", "true");
         props.put("mail.debug", "false");
-        
+
         // 如果使用SSL
         if (Boolean.TRUE.equals(config.getUseSsl())) {
             props.put("mail.smtp.ssl.enable", "true");
             props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
         }
-        
+
         return mailSender;
     }
-    
+
 }
 

backend/src/main/java/com/qqchen/deploy/backend/notification/repository/INotificationTemplateRepository.java

@@ -20,36 +20,41 @@ import java.util.Optional;
  */
 @Repository
 public interface INotificationTemplateRepository extends IBaseRepository<NotificationTemplate, Long> {
-    
+
     /**
      * 根据编码查找模板
      */
     Optional<NotificationTemplate> findByCode(String code);
-    
+
     /**
      * 根据编码和启用状态查找模板
      */
     Optional<NotificationTemplate> findByCodeAndEnabled(String code, Boolean enabled);
-    
+
+
+    @Query("SELECT t FROM NotificationTemplate t WHERE t.id = :id AND t.enabled = :enabled AND t.deleted = false")
+    Optional<NotificationTemplate> findByIdAndEnabled(@Param("id") Long id, @Param("enabled") Boolean enabled);
+
+
     /**
      * 根据渠道类型查找模板
      */
     List<NotificationTemplate> findByChannelTypeAndEnabled(NotificationChannelTypeEnum channelType, Boolean enabled);
-    
+
     /**
      * 检查编码是否存在（排除指定ID）
      */
     @Query("SELECT COUNT(t) > 0 FROM NotificationTemplate t WHERE t.code = :code AND t.id != :id")
     boolean existsByCodeAndIdNot(@Param("code") String code, @Param("id") Long id);
-    
+
     /**
      * 分页查询模板
      */
     @Query("SELECT t FROM NotificationTemplate t WHERE " +
-           "(:name IS NULL OR t.name LIKE %:name%) AND " +
+        "(:name IS NULL OR t.name LIKE %:name%) AND " +
-           "(:code IS NULL OR t.code LIKE %:code%) AND " +
+        "(:code IS NULL OR t.code LIKE %:code%) AND " +
-           "(:channelType IS NULL OR t.channelType = :channelType) AND " +
+        "(:channelType IS NULL OR t.channelType = :channelType) AND " +
-           "(:enabled IS NULL OR t.enabled = :enabled)")
+        "(:enabled IS NULL OR t.enabled = :enabled)")
     Page<NotificationTemplate> findByConditions(
         @Param("name") String name,
         @Param("code") String code,

backend/src/main/java/com/qqchen/deploy/backend/notification/service/INotificationTemplateService.java

@@ -26,6 +26,8 @@ public interface INotificationTemplateService extends IBaseService<NotificationT
 
     String renderByCode(String templateCode, Map<String, Object> params);
 
+    String renderById(Long id, Map<String, Object> params);
+
 
     /**
      * 根据编码获取模板

backend/src/main/java/com/qqchen/deploy/backend/notification/service/impl/NotificationChannelServiceImpl.java

@@ -143,8 +143,7 @@ public class NotificationChannelServiceImpl extends BaseServiceImpl<Notification
 
         // 6. 发送通知
         try {
-            log.info("发送通知 - 渠道ID: {}, 渠道类型: {}, 内容: {}",
+            log.info("发送通知 - 渠道ID: {}, 渠道类型: {}, 内容: {}", channel.getId(), channel.getChannelType(), request.getContent());
-                channel.getId(), channel.getChannelType(), request.getContent());
 
             adapter.send(config, request);
 

backend/src/main/java/com/qqchen/deploy/backend/notification/service/impl/NotificationServiceImpl.java

@@ -71,7 +71,7 @@ public class NotificationServiceImpl implements INotificationService {
         }
 
         // 5. 渲染模板内容
-        String content = notificationTemplateService.renderByCode(template.getCode(), request.getParams());
+        String content = notificationTemplateService.renderTemplate(template.getContentTemplate(), request.getParams());
 
         // 6. 根据渠道类型发送通知
         switch (template.getChannelType()) {

backend/src/main/java/com/qqchen/deploy/backend/notification/service/impl/NotificationTemplateServiceImpl.java

@@ -69,6 +69,12 @@ public class NotificationTemplateServiceImpl extends BaseServiceImpl<Notificatio
         return processTemplate(template.getContentTemplate(), params);
     }
 
+    @Override
+    public String renderById(Long id, Map<String, Object> params) {
+        NotificationTemplate template = getTemplateById(id);
+        return processTemplate(template.getContentTemplate(), params);
+    }
+
 
     @Override
     public NotificationTemplateDTO getByCode(String code) {
@@ -92,6 +98,11 @@ public class NotificationTemplateServiceImpl extends BaseServiceImpl<Notificatio
             .orElseThrow(() -> new BusinessException(ResponseCode.NOTIFICATION_TEMPLATE_NOT_FOUND));
     }
 
+    private NotificationTemplate getTemplateById(Long id) {
+        return notificationTemplateRepository.findByIdAndEnabled(id, true)
+            .orElseThrow(() -> new BusinessException(ResponseCode.NOTIFICATION_TEMPLATE_NOT_FOUND));
+    }
+
 
     /**
      * FreeMarker模板处理