From 98372322f25e5a3a56fdc8b47bbc1c118584331b Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 9 Jan 2025 17:50:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E5=AE=9A=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E5=A2=9E=E5=8A=A0=E5=9B=BD=E9=99=85=E9=A3=9E=E4=B9=A6?= =?UTF-8?q?=E6=8E=A8=E9=80=81=20#13241?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V2.10.5__ddl.sql | 2 ++ core/core-frontend/src/locales/en.ts | 1 + core/core-frontend/src/locales/tw.ts | 1 + core/core-frontend/src/locales/zh-CN.ts | 1 + .../src/main/java/io/dataease/api/lark/api/LarksuiteApi.java | 5 +++++ .../main/java/io/dataease/api/report/dto/ReportCreator.java | 1 + .../main/java/io/dataease/api/report/vo/ReportInfoVO.java | 2 ++ .../main/java/io/dataease/api/threshold/dto/BaseReciDTO.java | 2 ++ .../src/main/java/io/dataease/constant/MessageEnum.java | 2 +- 9 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 core/core-backend/src/main/resources/db/migration/V2.10.5__ddl.sql diff --git a/core/core-backend/src/main/resources/db/migration/V2.10.5__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10.5__ddl.sql new file mode 100644 index 0000000000..23475e734b --- /dev/null +++ b/core/core-backend/src/main/resources/db/migration/V2.10.5__ddl.sql @@ -0,0 +1,2 @@ +ALTER TABLE `xpack_threshold_info` + ADD COLUMN `reci_larksuite_groups` longtext NULL COMMENT '国际飞书群' AFTER `reci_lark_groups`; diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 40cbd2ec67..4e00d84497 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -4011,6 +4011,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr instance_title: 'Task log', add_task: 'Add task', lark_groups: 'Lark group', + larksuite_groups: 'Larksuite group', send_setting: 'Send settings', retrying_settings: 'Send failed retry settings', start_time: 'Start time', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 2209c3d3f3..b62ee07097 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -3903,6 +3903,7 @@ export default { instance_title: '任務日誌', add_task: '新增任務', lark_groups: '飛書群', + larksuite_groups: '國際飛書群', send_setting: '發送設定', retrying_settings: '發送失敗重試設定', start_time: '開始時間', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 1f47ae466d..5a87357bd5 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -3907,6 +3907,7 @@ export default { instance_title: '任务日志', add_task: '添加任务', lark_groups: '飞书群', + larksuite_groups: '国际飞书群', send_setting: '发送设置', retrying_settings: '发送失败重试设置', start_time: '开始时间', diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarksuiteApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarksuiteApi.java index ea64ffa00b..72b764413c 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarksuiteApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarksuiteApi.java @@ -4,6 +4,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.api.lark.dto.LarkEnableEditor; import io.dataease.api.lark.dto.LarkSettingCreator; import io.dataease.api.lark.dto.LarkTokenRequest; +import io.dataease.api.lark.vo.LarkGroupVO; import io.dataease.api.lark.vo.LarkInfoVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -42,4 +43,8 @@ public interface LarksuiteApi { @Operation(summary = "国际飞书绑定", hidden = true) @PostMapping("/bind") void bind(@RequestBody LarkTokenRequest request); + + @Operation(summary = "获取群组", hidden = true) + @GetMapping("/getGroup") + LarkGroupVO getGroup(); } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportCreator.java b/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportCreator.java index b473fd39d9..740b66218f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportCreator.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportCreator.java @@ -44,6 +44,7 @@ public class ReportCreator implements Serializable { private List emailList; private List larkGroupList; + private List larksuiteGroupList; private Integer extWaitTime; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportInfoVO.java index 7e9bfe48c6..4c9f1596ea 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportInfoVO.java @@ -47,6 +47,8 @@ public class ReportInfoVO implements Serializable { private List larkGroupList; + private List larksuiteGroupList; + private Integer extWaitTime; private Integer rateType; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/BaseReciDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/BaseReciDTO.java index 52e3a0d082..0a0d423cc7 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/BaseReciDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/BaseReciDTO.java @@ -21,5 +21,7 @@ public class BaseReciDTO implements Serializable { private List larkGroupList; + private List larksuiteGroupList; + private List webhookList; } diff --git a/sdk/common/src/main/java/io/dataease/constant/MessageEnum.java b/sdk/common/src/main/java/io/dataease/constant/MessageEnum.java index ea98a76afc..94801ff39b 100644 --- a/sdk/common/src/main/java/io/dataease/constant/MessageEnum.java +++ b/sdk/common/src/main/java/io/dataease/constant/MessageEnum.java @@ -4,7 +4,7 @@ import java.util.Arrays; public enum MessageEnum { - INNER(0), EMAIL(1), WECOM(2), DINGTALK(3), LARK(4), LARKSUITE(5), LARKGROUP(6), WEBHOOK(7); + INNER(0), EMAIL(1), WECOM(2), DINGTALK(3), LARK(4), LARKSUITE(5), LARKGROUP(6), WEBHOOK(7), LARKSUITEGROUP(8); private Integer flag; public Integer getFlag() {