From a9a6ce548a09c45df02d076c2227bfd282c23f99 Mon Sep 17 00:00:00 2001 From: jianneng-fit2cloud Date: Thu, 20 Feb 2025 10:06:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E5=90=8C=E6=AD=A5=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E7=9C=8B=E4=BB=BB=E5=8A=A1ID,=E6=9A=B4?= =?UTF-8?q?=E9=9C=B2=E6=89=A7=E8=A1=8C=E4=B8=80=E6=AC=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/en.ts | 3 ++- core/core-frontend/src/locales/tw.ts | 3 ++- core/core-frontend/src/locales/zh-CN.ts | 3 ++- de-xpack | 2 +- .../dataease/api/sync/task/api/TaskApi.java | 23 ++++++++++++------- .../api/sync/task/api/TaskLogApi.java | 2 ++ .../java/io/dataease/doc/SwaggerConfig.java | 5 ++++ 7 files changed, 29 insertions(+), 12 deletions(-) diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 81fd803ab6..6c1fc50046 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -3997,7 +3997,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr dynamic_partition_enable: 'Dynamic Partitioning', time_end: 'End', es_query_param_formatter_error: - 'Query parameter format error, please enter the correct JSON format, please check' + 'Query parameter format error, please enter the correct JSON format, please check', + show_task_id: 'View Task ID' }, watermark: { support_params: 'Currently supported parameters:', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 6f54c9d952..3a954c2e41 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -3889,7 +3889,8 @@ export default { es_params_tip: '請遵循 Elasitcsearch 的查詢語法', dynamic_partition_enable: '動態分區', time_end: '結束', - es_query_param_formatter_error: '查詢參數格式錯誤，請輸入正確的JSON格式，請檢查' + es_query_param_formatter_error: '查詢參數格式錯誤，請輸入正確的JSON格式，請檢查', + show_task_id: '查看任務ID' }, watermark: { support_params: '目前支援的參數：', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 5473765750..88dd31ea40 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -3901,7 +3901,8 @@ export default { es_params_tip: '请遵循 Elasitcsearch 的查询语法', dynamic_partition_enable: '动态分区', time_end: '结束', - es_query_param_formatter_error: '查询参数格式错误，请输入正确的JSON格式，请检查' + es_query_param_formatter_error: '查询参数格式错误，请输入正确的JSON格式，请检查', + show_task_id: '查看任务ID' }, watermark: { support_params: '当前支持的参数：', diff --git a/de-xpack b/de-xpack index 8f2c8afd36..c507f816c9 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 8f2c8afd3657fa46b4ab0888533001f42cc545e7 +Subproject commit c507f816c9f338d8477fb1b5a28d43ea5979d314 diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskApi.java b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskApi.java index 213d575b8a..bd8ebe0d57 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskApi.java +++ b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskApi.java @@ -1,11 +1,14 @@ package io.dataease.api.sync.task.api; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.api.sync.task.dto.TaskGridRequest; import io.dataease.api.sync.task.dto.TaskInfoDTO; import io.dataease.api.sync.task.vo.TaskInfoVO; import io.dataease.auth.DeApiPath; import io.dataease.exception.DEException; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -16,36 +19,40 @@ import static io.dataease.constant.AuthResourceEnum.TASK; * @author fit2cloud * @date 2023/11/20 10:14 **/ +@Tag(name = "同步管理:任务管理") +@ApiSupport(order = 888, author = "fit2cloud-someone") @DeApiPath(value = "/sync/task", rt = TASK) public interface TaskApi { + @Operation(hidden = true) @PostMapping("/pager/{goPage}/{pageSize}") IPage pager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody TaskGridRequest request); - + @Operation(hidden = true) @PostMapping("/add") void add(@RequestBody TaskInfoDTO jobInfo) throws DEException; - + @Operation(hidden = true) @PostMapping("/update") void update(@RequestBody TaskInfoDTO jobInfo) throws DEException; - + @Operation(hidden = true) @PostMapping("/remove/{id}") void remove(@PathVariable(value = "id") String id) throws DEException; - + @Operation(hidden = true) @GetMapping("start/{id}") void startJob(@PathVariable(value = "id") String id) throws DEException; - + @Operation(hidden = true) @GetMapping("stop/{id}") void stopJob(@PathVariable(value = "id") String id) throws DEException; - + @Operation(hidden = true) @GetMapping("/get/{id}") TaskInfoVO getOneById(@PathVariable(value = "id") String id) throws DEException; + @Operation(summary = "执行一次任务") @GetMapping("/execute/{id}") void execute(@PathVariable(value = "id") String id) throws DEException; - + @Operation(hidden = true) @PostMapping("/batch/del") void batchDelete(@RequestBody List ids) throws DEException; - + @Operation(hidden = true) @GetMapping("/count") Long count() throws DEException; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskLogApi.java b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskLogApi.java index e05f62941f..3e1173739d 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskLogApi.java +++ b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskLogApi.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import io.swagger.v3.oas.annotations.Hidden; import static io.dataease.constant.AuthResourceEnum.TASK; @@ -16,6 +17,7 @@ import static io.dataease.constant.AuthResourceEnum.TASK; * @author fit2cloud * @date 2023/12/4 12:43 **/ +@Hidden @DeApiPath(value = "/sync/task/log", rt = TASK) public interface TaskLogApi { @PostMapping("/pager/{goPage}/{pageSize}") diff --git a/sdk/common/src/main/java/io/dataease/doc/SwaggerConfig.java b/sdk/common/src/main/java/io/dataease/doc/SwaggerConfig.java index 7141578230..9ef4f0928f 100644 --- a/sdk/common/src/main/java/io/dataease/doc/SwaggerConfig.java +++ b/sdk/common/src/main/java/io/dataease/doc/SwaggerConfig.java @@ -87,5 +87,10 @@ public class SwaggerConfig { return GroupedOpenApi.builder().group("7-xpackpermission").displayName("权限相关xpack").packagesToScan("io.dataease.xpack.permissions").build(); } + @Bean + public GroupedOpenApi syncApi() { + return GroupedOpenApi.builder().group("8-xpacksync").displayName("同步管理").packagesToScan("io.dataease.xpack.sync.task").build(); + } + }