diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index cd3db1f4f2..a6f8b09f59 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -4276,6 +4276,7 @@ export default { instance_title: 'Task log', add_task: 'Add task', lark_groups: 'Lark group', + dingtalk_groups: ' Dingtalk group', larksuite_groups: 'Larksuite group', send_setting: 'Send settings', retrying_settings: 'Send failed retry settings', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index dc86df15ed..e662658b8a 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -4157,6 +4157,7 @@ export default { instance_title: '任務日誌', add_task: '新增任務', lark_groups: '飛書群', + dingtalk_groups: '釘釘群', larksuite_groups: '國際飛書群', send_setting: '發送設定', retrying_settings: '發送失敗重試設定', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index fd3919a3fb..8c94d478ee 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -4161,6 +4161,7 @@ export default { instance_title: '任务日志', add_task: '添加任务', lark_groups: '飞书群', + dingtalk_groups: '钉钉群', larksuite_groups: '国际飞书群', send_setting: '发送设置', retrying_settings: '发送失败重试设置', diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/api/DingtalkApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/api/DingtalkApi.java index f74058b3c5..20d78b6463 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/api/DingtalkApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/api/DingtalkApi.java @@ -5,6 +5,7 @@ import io.dataease.api.dingtalk.dto.DingtalkEnableEditor; import io.dataease.api.dingtalk.dto.DingtalkSettingCreator; import io.dataease.api.dingtalk.dto.DingtalkTokenRequest; import io.dataease.api.dingtalk.vo.DingtalkInfoVO; +import io.dataease.api.lark.vo.LarkGroupVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; @@ -42,4 +43,8 @@ public interface DingtalkApi { @Operation(summary = "钉钉绑定", hidden = true) @PostMapping("/bind") void bind(@RequestBody DingtalkTokenRequest request); + + @Operation(summary = "获取群组", hidden = true) + @GetMapping("/getGroup") + LarkGroupVO getGroup(); } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/vo/DingtalkChatItem.java b/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/vo/DingtalkChatItem.java new file mode 100644 index 0000000000..8e9af466a9 --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/vo/DingtalkChatItem.java @@ -0,0 +1,13 @@ +package io.dataease.api.dingtalk.vo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class DingtalkChatItem implements Serializable { + + private String id; + + private String name; +} diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/vo/DingtalkInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/vo/DingtalkInfoVO.java index 428d4f7b14..f802adce67 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/vo/DingtalkInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/vo/DingtalkInfoVO.java @@ -1,9 +1,11 @@ package io.dataease.api.dingtalk.vo; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; +import java.util.List; @Schema(description = "钉钉信息") @Data @@ -21,4 +23,10 @@ public class DingtalkInfoVO implements Serializable { @Schema(description = "是否可用") private Boolean valid = false; + @JsonIgnore + private String robotCode; + + @JsonIgnore + private List chatList; + } 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 a5dc14cb04..5d9aa0a759 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 dingtalkGroupList; private List larkGroupList; private List larksuiteGroupList; 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 02c108ef71..845c90a113 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 @@ -45,6 +45,7 @@ public class ReportInfoVO implements Serializable { private List emailList; + private List dingtalkGroupList; private List larkGroupList; private List larksuiteGroupList; 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 94801ff39b..9325763f0a 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), LARKSUITEGROUP(8); + INNER(0), EMAIL(1), WECOM(2), DINGTALK(3), LARK(4), LARKSUITE(5), LARKGROUP(6), WEBHOOK(7), LARKSUITEGROUP(8), DINGTALKGROUP(9); private Integer flag; public Integer getFlag() {