From f28f9d830f32eaea68fd7827ba5b92ef4ef394b0 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 14 Dec 2023 13:39:49 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=8F=91=E9=80=81=E8=87=B3=E8=A7=92=E8=89=B2=E3=80=81=E7=BB=84?= =?UTF-8?q?=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/sechedule/strategy/impl/EmailTaskHandler.java | 6 ++++++ .../xpack/email/dto/request/XpackEmailTaskRequest.java | 4 ++++ .../xpack/email/dto/response/XpackEmailTemplateDTO.java | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java b/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java index 0297af8bf4..70020dc919 100644 --- a/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java +++ b/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java @@ -157,6 +157,11 @@ public class EmailTaskHandler extends TaskHandler implements Job { emailXpackService.saveInstance(taskInstance); } + private void formatReci(XpackEmailTemplateDTO emailTemplateDTO) { + String roleList = emailTemplateDTO.getRoleList(); + String orgList = emailTemplateDTO.getOrgList(); + } + @Async("priorityExecutor") public void sendReport(GlobalTaskInstance taskInstance, SysUserEntity user, Boolean isTempTask) { @@ -177,6 +182,7 @@ public class EmailTaskHandler extends TaskHandler implements Job { token = tokenByUser(user); XpackPixelEntity xpackPixelEntity = buildPixel(emailTemplateDTO); // 下面继续执行发送邮件的 + formatReci(emailTemplateDTO); String recipients = emailTemplateDTO.getRecipients(); String reciUsers = emailTemplateDTO.getReciUsers(); Integer extWaitTime = emailTemplateDTO.getExtWaitTime(); diff --git a/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/email/dto/request/XpackEmailTaskRequest.java b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/email/dto/request/XpackEmailTaskRequest.java index 324c825449..efd9db4f14 100644 --- a/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/email/dto/request/XpackEmailTaskRequest.java +++ b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/email/dto/request/XpackEmailTaskRequest.java @@ -36,4 +36,8 @@ public class XpackEmailTaskRequest extends XpackTaskCreateRequest { private String groups; private Integer extWaitTime = 0; + + private String roleList; + + private String orgList; } diff --git a/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/email/dto/response/XpackEmailTemplateDTO.java b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/email/dto/response/XpackEmailTemplateDTO.java index 2b21ada273..46a7824ef9 100644 --- a/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/email/dto/response/XpackEmailTemplateDTO.java +++ b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/email/dto/response/XpackEmailTemplateDTO.java @@ -39,4 +39,8 @@ public class XpackEmailTemplateDTO implements Serializable { private Integer extWaitTime = 0; + private String roleList; + + private String orgList; + }