feat: sendemail节点新增是否发送飞书选项#AI Commit#

Author: zqburde

dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/java/com/webank/wedatasphere/dss/appconn/sendemail/email/Email.java

@@ -43,4 +43,7 @@ public interface Email {
 
     String getEmailType();
     void setEmailType(String emailType);
+
+    String getFeishuTo();
+    void setFeishuTo(String feishuTo);
 }

dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/resources/appconn.properties

@@ -30,5 +30,8 @@ wds.dss.appconn.email.password=
 # wds.dss.appconn.email.smtp.ssl.enable=true
 # wds.dss.appconn.email.smtp.timeout=25000
 
-
+# Feishu connection properties. Whether to send Feishu messages is selected on each sendemail node.
+# wds.dss.appconn.feishu.app.id=
+# wds.dss.appconn.feishu.app.secret=
+# wds.dss.appconn.feishu.api.base.url=https://open.feishu.cn/open-apis
 

dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/resources/init.sql

@@ -20,6 +20,18 @@ delete from `dss_workflow_node_to_group` where `node_id`=@sendemail_nodeId;
 
 delete from `dss_workflow_node_to_ui` where `workflow_node_id`=@sendemail_nodeId;
 
+select @sendemail_node_ui_send_feishu:=id from `dss_workflow_node_ui` where `key` = 'sendFeishu' limit 1;
+insert into `dss_workflow_node_ui`(`key`,`description`,`description_en`,`lable_name`,`lable_name_en`,`ui_type`,`required`,`value`,`default_value`,`is_hidden`,`condition`,`is_advanced`,`order`,`node_menu_type`,`is_base_info`,`position`)
+select 'sendFeishu','请选择是否发送飞书','Please choose whether to send Feishu message','是否发送飞书','Send Feishu','Select',0,'["true","false"]','false',0,NULL,0,1,1,0,'runtime'
+where @sendemail_node_ui_send_feishu is null;
+select @sendemail_node_ui_send_feishu:=id from `dss_workflow_node_ui` where `key` = 'sendFeishu' limit 1;
+
+select @sendemail_node_ui_feishu_to:=id from `dss_workflow_node_ui` where `key` = 'feishuTo' limit 1;
+insert into `dss_workflow_node_ui`(`key`,`description`,`description_en`,`lable_name`,`lable_name_en`,`ui_type`,`required`,`value`,`default_value`,`is_hidden`,`condition`,`is_advanced`,`order`,`node_menu_type`,`is_base_info`,`position`)
+select 'feishuTo','请填写飞书接收人英文名，多个用英文分号分隔','Please enter Feishu receiver name, separated by semicolons','飞书接收人','Feishu To','Input',0,NULL,NULL,0,NULL,0,1,1,0,'runtime'
+where @sendemail_node_ui_feishu_to is null;
+select @sendemail_node_ui_feishu_to:=id from `dss_workflow_node_ui` where `key` = 'feishuTo' limit 1;
+
 -- 查找节点所属组的id
 select @sendemail_node_groupId:=id from `dss_workflow_node_group` where `name` = '数据输出';
 
@@ -49,3 +61,5 @@ INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@sende
 INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@sendemail_nodeId, @sendemail_node_ui_lable_name_9);
 INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@sendemail_nodeId, @sendemail_node_ui_lable_name_10);
 INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@sendemail_nodeId, @sendemail_node_ui_lable_name_11);
+INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@sendemail_nodeId, @sendemail_node_ui_send_feishu);
+INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@sendemail_nodeId, @sendemail_node_ui_feishu_to);

dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/SendEmailRefExecutionOperation.scala

@@ -19,6 +19,7 @@ package com.webank.wedatasphere.dss.appconn.sendemail
 import java.util
 
 import com.webank.wedatasphere.dss.appconn.sendemail.conf.SendEmailAppConnInstanceConfiguration
+import com.webank.wedatasphere.dss.appconn.sendemail.feishu.FeishuMessageSender
 import com.webank.wedatasphere.dss.standard.app.development.listener.ref.ExecutionResponseRef.ExecutionResponseRefBuilder
 import com.webank.wedatasphere.dss.standard.app.development.listener.ref.{ExecutionResponseRef, RefExecutionRequestRef}
 import com.webank.wedatasphere.dss.standard.app.development.operation.{AbstractDevelopmentOperation, RefExecutionOperation}
@@ -63,9 +64,28 @@ class SendEmailRefExecutionOperation
       return putErrorMsg(t.getMessage, t)
     }
     Utils.tryCatch {
+      // Step1: send email
       emailSender.send(email)
-      new ExecutionResponseRefBuilder().success()
-    }(putErrorMsg("发送邮件失败！", _))
+    } { t =>
+      return putErrorMsg("发送邮件失败！", t)
+    }
+
+    // Step 2: Send to Feishu (optional, controlled by node runtime parameter and feishuTo field)
+    val runtimeMap = requestRef.getExecutionRequestRefContext.getRuntimeMap
+    val sendFeishu = Option(runtimeMap.get("sendFeishu")).exists(_.toString.equalsIgnoreCase("true"))
+    if (sendFeishu && email.getFeishuTo != null && email.getFeishuTo.trim.nonEmpty) {
+      logger.info(s"Feishu sending is selected and feishuTo is configured: ${email.getFeishuTo}")
+      Utils.tryCatch {
+        FeishuMessageSender.send(email)
+        logger.info("Feishu sending completed successfully.")
+      } { t =>
+        return putErrorMsg("飞书发送失败！", t)
+      }
+    } else if (sendFeishu) {
+      logger.warn("Feishu sending is selected but feishuTo is empty, skip Feishu sending.")
+    }
+
+    new ExecutionResponseRefBuilder().success()
   }
 
   protected def putErrorMsg(errorMsg: String, t: Throwable): ExecutionResponseRef = {

dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/conf/SendEmailAppConnConfiguration.scala

@@ -56,4 +56,9 @@ object SendEmailAppConnConfiguration {
       "com.webank.wedatasphere.dss.appconn.sendemail.hook.entity.visualis.VisualisEmailInfo," +
       "com.webank.wedatasphere.dss.appconn.sendemail.hook.entity.visualis.MetaBaseEmailInfo," +
       "com.webank.wedatasphere.dss.appconn.sendemail.hook.entity.mlssv2.Mlssv2EmailInfo")
+
+  // Feishu integration configuration
+  val FEISHU_APP_ID = CommonVars("wds.dss.appconn.feishu.app.id", "")
+  val FEISHU_APP_SECRET = CommonVars("wds.dss.appconn.feishu.app.secret", "")
+  val FEISHU_API_BASE_URL = CommonVars("wds.dss.appconn.feishu.api.base.url", "https://open.feishu.cn/open-apis")
 }

dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/email/domain/AbstractEmail.scala

@@ -30,6 +30,7 @@ class AbstractEmail extends Email {
   private var cc: String = _
   private var bcc: String = _
   private var emialType: String = _
+  private var feishuTo: String = _
 
   override def getContent: String = content
   override def setContent(content: String): Unit = this.content = content
@@ -56,4 +57,7 @@ class AbstractEmail extends Email {
 
   override def getEmailType: String = emialType
   override def setEmailType(emailType: String): Unit = this.emialType = emailType
+
+  override def getFeishuTo: String = feishuTo
+  override def setFeishuTo(feishuTo: String): Unit = this.feishuTo = feishuTo
 }

dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/email/generate/AbstractEmailGenerator.scala

@@ -68,6 +68,8 @@ trait AbstractEmailGenerator extends EmailGenerator with Logging{
     email.setFrom(from)
     val to = if (runtimeMap.get("to") != null) runtimeMap.get("to").toString else ""
     email.setTo(to)
+    val feishuTo = if (runtimeMap.get("feishuTo") != null) runtimeMap.get("feishuTo").toString else ""
+    email.setFeishuTo(feishuTo)
   }
 
   protected def generateEmailContent(requestRef: RefExecutionRequestRef.RefExecutionRequestRefImpl, email: AbstractEmail): Unit

dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/feishu/FeishuConfig.scala

@@ -25,28 +25,22 @@ import org.apache.linkis.common.utils.Logging
  */
 object FeishuConfig extends Logging {
 
-  def isEnabled: Boolean = SendEmailAppConnConfiguration.FEISHU_ENABLED.getValue
-
   def getAppId: String = SendEmailAppConnConfiguration.FEISHU_APP_ID.getValue
 
   def getAppSecret: String = SendEmailAppConnConfiguration.FEISHU_APP_SECRET.getValue
 
   def getApiBaseUrl: String = SendEmailAppConnConfiguration.FEISHU_API_BASE_URL.getValue
 
   def validate(): Unit = {
-    if (isEnabled) {
-      if (getAppId.isEmpty) {
-        throw new IllegalArgumentException("Feishu is enabled but app.id is not configured. " +
-          "Please set wds.dss.appconn.feishu.app.id in appconn.properties.")
-      }
-      if (getAppSecret.isEmpty) {
-        throw new IllegalArgumentException("Feishu is enabled but app.secret is not configured. " +
-          "Please set wds.dss.appconn.feishu.app.secret in appconn.properties.")
-      }
-      logger.info(s"Feishu integration is enabled. App ID: ${getAppId}, API Base URL: ${getApiBaseUrl}")
-    } else {
-      logger.info("Feishu integration is disabled.")
+    if (getAppId.isEmpty) {
+      throw new IllegalArgumentException("Feishu app.id is not configured. " +
+        "Please set wds.dss.appconn.feishu.app.id in appconn.properties.")
+    }
+    if (getAppSecret.isEmpty) {
+      throw new IllegalArgumentException("Feishu app.secret is not configured. " +
+        "Please set wds.dss.appconn.feishu.app.secret in appconn.properties.")
     }
+    logger.info(s"Feishu integration config validated. App ID: ${getAppId}, API Base URL: ${getApiBaseUrl}")
   }
 
 }

dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/feishu/FeishuMessageSender.scala

@@ -43,8 +43,8 @@ object FeishuMessageSender extends Logging {
     // Validate Feishu configuration
     FeishuConfig.validate()
 
-    // Parse receiver IDs (comma separated)
-    val receivers = feishuTo.split(",").map(_.trim).filter(_.nonEmpty)
+    // Parse receiver IDs (semicolon separated)
+    val receivers = feishuTo.split(";").map(_.trim).filter(_.nonEmpty)
     if (receivers.isEmpty) {
       logger.warn("No valid Feishu receiver IDs found, skip Feishu sending.")
       return