diff --git a/de-xpack b/de-xpack index 2a83b772ef..3d0dab511c 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 2a83b772ef82d2fa37879f332e63ad989ddac7c6 +Subproject commit 3d0dab511c24396bb264b10d44ff48404a1e2e76 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 3e1173739d..2dbe32aa6d 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 @@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import io.swagger.v3.oas.annotations.Hidden; +import java.util.Map; + import static io.dataease.constant.AuthResourceEnum.TASK; /** @@ -44,4 +46,10 @@ public interface TaskLogApi { @PostMapping("terminationTask/{logId}") void terminationTask(@PathVariable("logId") String logId); + @GetMapping("/getLogResourceId") + Long getLogResourceId(@PathVariable("params") Map params); + + @GetMapping("/query2Root") + String query2Root(@PathVariable("params") Map params); + } diff --git a/sdk/common/src/main/java/io/dataease/constant/LogOT.java b/sdk/common/src/main/java/io/dataease/constant/LogOT.java index d1e4e086c8..2d2c0c20b6 100644 --- a/sdk/common/src/main/java/io/dataease/constant/LogOT.java +++ b/sdk/common/src/main/java/io/dataease/constant/LogOT.java @@ -31,7 +31,7 @@ public enum LogOT { SYNC_TASK_DISENABLE(24, "OPERATE_TYPE_SYNC_TASK_DISENABLE"), SYNC_TASK_RUN_IMMEDIATELY(25, "OPERATE_TYPE_SYNC_TASK_RUN_IMMEDIATELY"), SYNC_TASK_RUN_TERMINATION(26, "OPERATE_TYPE_SYNC_TASK_RUN_TERMINATION"), - SYNC_DATASOURCE_SYNC(27, "OPERATE_TYPE_SYNC_DATASOURCE_SYNC"); + CLEAR(27, "CLEAR"); private Integer value; private String name; diff --git a/sdk/common/src/main/java/io/dataease/constant/LogST.java b/sdk/common/src/main/java/io/dataease/constant/LogST.java index 3a8dd368a1..86b6a9739e 100644 --- a/sdk/common/src/main/java/io/dataease/constant/LogST.java +++ b/sdk/common/src/main/java/io/dataease/constant/LogST.java @@ -22,7 +22,8 @@ public enum LogST { DATA(15, "SOURCE_TYPE_DATA"), REPORT_TASK(20, "SOURCE_TYPE_REPORT_TASK"), SYNC_DATASOURCE(21, "SOURCE_TYPE_SYNC_DATASOURCE"), - SYNC_TASK(22, "SOURCE_TYPE_SYNC_TASK"); + SYNC_TASK(22, "SOURCE_TYPE_SYNC_TASK"), + SYNC_TASK_LOG(23, "SOURCE_TYPE_SYNC_TASK_LOG"); private Integer value; private String name;