From 9b018ed1bfe69584eb62b2ab153bbc6f4ff975b2 Mon Sep 17 00:00:00 2001 From: ulleo Date: Fri, 5 Jun 2026 16:36:38 +0800 Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20[=E6=95=B0=E6=8D=AE=E5=A1=AB?= =?UTF-8?q?=E6=8A=A5]=E5=8F=91=E9=80=81=E5=A1=AB=E6=8A=A5=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=94=AF=E6=8C=81=E9=82=AE=E4=BB=B6=E6=88=96=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E5=BE=AE=E4=BF=A1=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/datasource/provider/CalciteProvider.java | 1 + core/core-frontend/src/locales/en.ts | 3 +++ core/core-frontend/src/locales/tw.ts | 3 +++ core/core-frontend/src/locales/zh-CN.ts | 4 ++++ .../io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java | 6 ++++++ 5 files changed, 17 insertions(+) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java index ec7195b5bd..3cc253317f 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java @@ -463,6 +463,7 @@ public class CalciteProvider extends Provider { conn = driverClass.connect(configuration.getJdbc(), props); } catch (Exception e) { + e.printStackTrace(); DEException.throwException(e.getMessage()); } connectionObj.setConnection(conn); diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 8061599b34..936710187f 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -4580,6 +4580,9 @@ export default { task_status: 'Task status', task_progress: 'Finished / Total', task_name: 'Task name', + msg_title: 'You Have a New Data Reporting Task', + msg_content_1: 'You have a new data reporting task: ', + msg_content_2: ', please complete the reporting promptly', add_task: 'Add task', task_remain_time: 'Task validity period', task_sender: 'Task sender', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 28e11ae856..0573c9402d 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -4452,6 +4452,9 @@ export default { task_status: '任務狀態', task_progress: '已填報數/總數', task_name: '任務名稱', + msg_title: '您有一個新的資料填報任務', + msg_content_1: '您有一個新的資料填報任務: ', + msg_content_2: '，請及時完成填報工作', add_task: '新增任務', task_remain_time: '任務有效期限', task_sender: '任務下發人', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index f68e9f3b0a..5b3345483a 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -4431,6 +4431,7 @@ export default { please_select_end_time: '请选择任务结束时间', end_time_error: '结束时间必须大于当前时间', distribute_setting: '下发设置', + notification_setting: '通知设置', task_distribute_setting: '任务下发设置', receive_object: '接收对象', receive_fit_column: '接收对象匹配字段', @@ -4457,6 +4458,9 @@ export default { task_status: '任务状态', task_progress: '已填报数/总数', task_name: '任务名称', + msg_title: '您有一个新的数据填报任务', + msg_content_1: '您有一个新的数据填报任务: ', + msg_content_2: '，请及时完成填报工作', add_task: '添加任务', task_remain_time: '任务有效期', task_sender: '任务下发人', diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java index fdd5611304..5c3c88aa98 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java @@ -27,6 +27,12 @@ public class TaskInfoVO implements Serializable { private List reciFlagList; + private Integer msgType; + + private String msgTitle; + + private String msgContent; + @JsonSerialize(using = LongArray2StringSerialize.class) private List uidList;