From afe7ee165eab4a0035a1972bd5b1291d0c49841d Mon Sep 17 00:00:00 2001 From: jianneng-fit2cloud Date: Mon, 10 Feb 2025 13:41:43 +0800 Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E5=90=8C=E6=AD=A5=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=BA=90=E6=95=B0=E6=8D=AE=E6=BA=90=E3=80=81?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8-?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=AD=98=E5=9C=A8=20SQL=20?= =?UTF-8?q?=E6=B3=A8=E5=85=A5=E9=A3=8E=E9=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- .../sync/datasource/api/SyncDatasourceApi.java | 6 +++--- .../datasource/dto/DatasourceGridRequest.java | 16 ++++++++++++++++ .../io/dataease/api/sync/task/api/TaskApi.java | 4 ++-- .../dataease/api/sync/task/api/TaskLogApi.java | 9 ++++++--- .../api/sync/task/dto/TaskGridRequest.java | 17 +++++++++++++++++ .../api/sync/task/dto/TaskLogGridRequest.java | 16 ++++++++++++++++ 7 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/DatasourceGridRequest.java create mode 100644 sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskGridRequest.java create mode 100644 sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskLogGridRequest.java diff --git a/de-xpack b/de-xpack index c46bca7f1c..72ffc6926b 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit c46bca7f1c5e8a0af8ecd5a71bce3ec1a5008d98 +Subproject commit 72ffc6926bffb15ae6c6515b805851f337e0a4b2 diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java index 6208d52703..999ded94c2 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java +++ b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java @@ -2,12 +2,12 @@ package io.dataease.api.sync.datasource.api; import com.baomidou.mybatisplus.core.metadata.IPage; import io.dataease.api.sync.datasource.dto.DBTableDTO; +import io.dataease.api.sync.datasource.dto.DatasourceGridRequest; import io.dataease.api.sync.datasource.dto.GetDatasourceRequest; import io.dataease.api.sync.datasource.dto.SyncDatasourceDTO; import io.dataease.api.sync.datasource.vo.SyncDatasourceVO; import io.dataease.auth.DeApiPath; import io.dataease.exception.DEException; -import io.dataease.request.BaseGridRequest; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -26,10 +26,10 @@ import static io.dataease.constant.AuthResourceEnum.SYNC_DATASOURCE; public interface SyncDatasourceApi { @PostMapping("/source/pager/{goPage}/{pageSize}") - IPage sourcePager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody BaseGridRequest request); + IPage sourcePager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody DatasourceGridRequest request); @PostMapping("/target/pager/{goPage}/{pageSize}") - IPage targetPager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody BaseGridRequest request); + IPage targetPager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody DatasourceGridRequest request); @PostMapping("/save") void save(@RequestBody SyncDatasourceDTO dataSourceDTO) throws DEException; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/DatasourceGridRequest.java b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/DatasourceGridRequest.java new file mode 100644 index 0000000000..27bd525d4a --- /dev/null +++ b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/dto/DatasourceGridRequest.java @@ -0,0 +1,16 @@ +package io.dataease.api.sync.datasource.dto; + +import io.dataease.model.KeywordRequest; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.List; + +@EqualsAndHashCode(callSuper = true) +@Data +public class DatasourceGridRequest extends KeywordRequest implements Serializable { + private List status; + private List dsType; + private List createTime; +} 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 4538c6b8e2..213d575b8a 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,11 @@ package io.dataease.api.sync.task.api; import com.baomidou.mybatisplus.core.metadata.IPage; +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.dataease.request.BaseGridRequest; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -20,7 +20,7 @@ import static io.dataease.constant.AuthResourceEnum.TASK; public interface TaskApi { @PostMapping("/pager/{goPage}/{pageSize}") - IPage pager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody BaseGridRequest request); + IPage pager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody TaskGridRequest request); @PostMapping("/add") void add(@RequestBody TaskInfoDTO jobInfo) 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 4cdb661796..e05f62941f 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 @@ -1,11 +1,14 @@ package io.dataease.api.sync.task.api; import com.baomidou.mybatisplus.core.metadata.IPage; +import io.dataease.api.sync.task.dto.TaskLogGridRequest; import io.dataease.api.sync.task.vo.LogResultVO; import io.dataease.api.sync.task.vo.TaskLogVO; import io.dataease.auth.DeApiPath; -import io.dataease.request.BaseGridRequest; -import org.springframework.web.bind.annotation.*; +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 static io.dataease.constant.AuthResourceEnum.TASK; @@ -16,7 +19,7 @@ import static io.dataease.constant.AuthResourceEnum.TASK; @DeApiPath(value = "/sync/task/log", rt = TASK) public interface TaskLogApi { @PostMapping("/pager/{goPage}/{pageSize}") - IPage pager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody BaseGridRequest request); + IPage pager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody TaskLogGridRequest request); @GetMapping("/detail/{logId}/{fromLineNum}") LogResultVO logDetail(@PathVariable("logId") String logId, @PathVariable("fromLineNum") int fromLineNum); diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskGridRequest.java b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskGridRequest.java new file mode 100644 index 0000000000..71402d09d5 --- /dev/null +++ b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskGridRequest.java @@ -0,0 +1,17 @@ +package io.dataease.api.sync.task.dto; + +import io.dataease.model.KeywordRequest; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.List; + +@EqualsAndHashCode(callSuper = true) +@Data +public class TaskGridRequest extends KeywordRequest implements Serializable { + private List logStatus; + private List status; + private List lastExecuteTime; + private List nextExecuteTime; +} diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskLogGridRequest.java b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskLogGridRequest.java new file mode 100644 index 0000000000..fa7ab8aa5e --- /dev/null +++ b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/TaskLogGridRequest.java @@ -0,0 +1,16 @@ +package io.dataease.api.sync.task.dto; + +import io.dataease.model.KeywordRequest; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.List; + +@EqualsAndHashCode(callSuper = true) +@Data +public class TaskLogGridRequest extends KeywordRequest implements Serializable { + private String taskId; + private List status; + private List lastExecuteTime; +}