Remove statements (DataLinkDC#2377)

* fix dag npe * refactor task submit * merge dev * merge dev and formate code * fix some problem * merge dev * remove useSession * formate code * formate code * fix task vesion time * change task version create * formate code * remove statement * refactor ddl, merge statement * formate code * optimizeTheCode * formate code
Zzm0809 · Oct 11, 2023 · 96ce025 · 96ce025
1 parent 0ba9d2c
commit 96ce025
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 414 deletions.
diff --git a/dinky-admin/src/main/java/org/dinky/assertion/Assert.java b/dinky-admin/src/main/java/org/dinky/assertion/Assert.java
@@ -22,7 +22,6 @@
 import org.dinky.data.exception.BusException;
 import org.dinky.data.model.Cluster;
 import org.dinky.data.model.Jar;
-import org.dinky.data.model.Statement;
 import org.dinky.data.model.Task;
 
 /**
@@ -44,12 +43,6 @@ static void check(Task task) {
         }
     }
 
-    static void check(Statement statement) {
-        if (statement == null) {
-            throw new BusException("FlinkSql语句不存在");
-        }
-    }
-
     static void checkHost(String host) {
         if (host == null || "".equals(host)) {
             throw new BusException("集群地址暂不可用");

diff --git a/dinky-admin/src/main/java/org/dinky/controller/StatementController.java b/dinky-admin/src/main/java/org/dinky/controller/StatementController.java
diff --git a/dinky-admin/src/main/java/org/dinky/controller/TaskController.java b/dinky-admin/src/main/java/org/dinky/controller/TaskController.java
@@ -34,8 +34,10 @@
 import org.dinky.job.JobResult;
 import org.dinky.process.exception.ExcuteException;
 import org.dinky.service.TaskService;
+import org.dinky.utils.JsonUtils;
 
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -172,6 +174,20 @@ public Result<TaskDTO> getOneById(@RequestParam Integer id) {
         return Result.succeed(taskService.getTaskInfoById(id));
     }
 
+    @PostMapping("/getPrintTables")
+    @ApiOperation("Get Print Tables")
+    @SuppressWarnings("unchecked")
+    @ApiImplicitParam(name = "statement", value = "Statement", dataType = "String", paramType = "body", required = true)
+    public Result<List<String>> getPrintTables(@RequestBody String statement) {
+        try {
+            Map<String, String> data = JsonUtils.toMap(statement);
+            String ss = data.get("statement");
+            return Result.succeed(taskService.getPrintTables(ss));
+        } catch (Exception e) {
+            return Result.failed(e.getMessage());
+        }
+    }
+
     @GetMapping(value = "/listFlinkSQLEnv")
     @ApiOperation("Get All FlinkSQLEnv")
     public Result<List<Task>> listFlinkSQLEnv() {

diff --git a/dinky-admin/src/main/java/org/dinky/data/model/Statement.java b/dinky-admin/src/main/java/org/dinky/data/model/Statement.java
diff --git a/dinky-admin/src/main/java/org/dinky/mapper/StatementMapper.java b/dinky-admin/src/main/java/org/dinky/mapper/StatementMapper.java
diff --git a/dinky-admin/src/main/java/org/dinky/service/StatementService.java b/dinky-admin/src/main/java/org/dinky/service/StatementService.java
diff --git a/dinky-admin/src/main/java/org/dinky/service/TaskService.java b/dinky-admin/src/main/java/org/dinky/service/TaskService.java
@@ -101,4 +101,6 @@ public interface TaskService extends ISuperService<Task> {
     List<JobTypeOverView> getTaskOnlineRate();
 
     JobModelOverview getJobStreamingOrBatchModelOverview();
+
+    List<String> getPrintTables(String statement);
 }
diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/CatalogueServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/CatalogueServiceImpl.java
@@ -29,7 +29,6 @@
 import org.dinky.data.model.History;
 import org.dinky.data.model.JobHistory;
 import org.dinky.data.model.JobInstance;
-import org.dinky.data.model.Statement;
 import org.dinky.data.model.Task;
 import org.dinky.data.result.Result;
 import org.dinky.mapper.CatalogueMapper;
@@ -38,7 +37,6 @@
 import org.dinky.service.HistoryService;
 import org.dinky.service.JobHistoryService;
 import org.dinky.service.JobInstanceService;
-import org.dinky.service.StatementService;
 import org.dinky.service.TaskService;
 
 import java.io.BufferedReader;
@@ -80,8 +78,6 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
 
     private final JobHistoryService jobHistoryService;
 
-    private final StatementService statementService;
-
     /**
      * @return
      */
@@ -304,13 +300,6 @@ public boolean copyTask(Catalogue catalogue) {
         newTask.setStep(JobLifeCycle.DEVELOP.getValue());
         taskService.save(newTask);
 
-        Statement statementServiceById = statementService.getById(catalogue.getTaskId());
-        // 新建作业的sql语句
-        Statement statement = new Statement();
-        statement.setStatement(statementServiceById.getStatement());
-        statement.setId(newTask.getId());
-        statementService.save(statement);
-
         Catalogue singleCatalogue =
                 this.getOne(new LambdaQueryWrapper<Catalogue>().eq(Catalogue::getTaskId, catalogue.getTaskId()));
 
@@ -420,8 +409,6 @@ public Result<Void> deleteCatalogueById(Integer catalogueId) {
             // doing: cascade delete jobInstance && jobHistory && history && statement
             // 获取 task 表中的作业
             Task task = taskService.getById(catalogue.getTaskId());
-            // 获取 statement 表中的作业
-            Statement statement = statementService.getById(catalogue.getTaskId());
             // 获取 job instance 表中的作业
             List<JobInstance> jobInstanceList = jobInstanceService.list(
                     new LambdaQueryWrapper<JobInstance>().eq(JobInstance::getTaskId, catalogue.getTaskId()));
@@ -443,10 +430,6 @@ public Result<Void> deleteCatalogueById(Integer catalogueId) {
             if (task != null) {
                 taskService.removeById(task.getId());
             }
-            // 删除 statement 表中的作业
-            if (statement != null) {
-                statementService.removeById(statement.getId());
-            }
         }
 
         // 如果是文件夹 , 且下边没有子文件夹 , 则删除