Added dlink-admin module code style (#889)

dlink-admin/src/main/java/com/dlink/Dlink.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink;
 
 import org.springframework.boot.SpringApplication;

dlink-admin/src/main/java/com/dlink/assertion/Assert.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.assertion;
 
 import com.dlink.exception.BusException;

dlink-admin/src/main/java/com/dlink/assertion/Tips.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.assertion;
 
 /**

dlink-admin/src/main/java/com/dlink/common/banner/BannerInitializer.java

@@ -17,18 +17,19 @@
  *
  */
 
-
 package com.dlink.common.banner;
 
 import com.dlink.constant.CommonConstant;
 import com.dlink.utils.CustomBanner;
+
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
 import com.nepxion.banner.BannerConstant;
 import com.nepxion.banner.Description;
 import com.nepxion.banner.LogoBanner;
 import com.taobao.text.Color;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 /**
  * BannerInitializer

dlink-admin/src/main/java/com/dlink/common/result/PageResult.java

@@ -17,17 +17,16 @@
  *
  */
 
-
 package com.dlink.common.result;
 
+import java.io.Serializable;
+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
-import java.util.List;
-
 /**
  * 分页结果
  *

dlink-admin/src/main/java/com/dlink/common/result/ProTableResult.java

@@ -17,17 +17,16 @@
  *
  */
 
-
 package com.dlink.common.result;
 
+import java.io.Serializable;
+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
-import java.util.List;
-
 /**
  * Ant Design Pro ProTable Query Result
  *

dlink-admin/src/main/java/com/dlink/common/result/Result.java

@@ -17,16 +17,16 @@
  *
  */
 
-
 package com.dlink.common.result;
 
 import com.dlink.model.CodeEnum;
+
+import java.io.Serializable;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
-
 /**
  * 返回对象
  *

dlink-admin/src/main/java/com/dlink/configure/SaTokenConfigure.java

@@ -17,14 +17,14 @@
  *
  */
 
-
 package com.dlink.configure;
 
-import cn.dev33.satoken.interceptor.SaRouteInterceptor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import cn.dev33.satoken.interceptor.SaRouteInterceptor;
+
 /**
  * SaTokenConfigure
  *

dlink-admin/src/main/java/com/dlink/context/SpringContextUtils.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.context;
 
 import org.springframework.beans.BeansException;

dlink-admin/src/main/java/com/dlink/controller/APIController.java

@@ -17,18 +17,29 @@
  *
  */
 
-
 package com.dlink.controller;
 
 import com.dlink.common.result.Result;
-import com.dlink.dto.*;
+import com.dlink.dto.APICancelDTO;
+import com.dlink.dto.APIExecuteJarDTO;
+import com.dlink.dto.APIExecuteSqlDTO;
+import com.dlink.dto.APIExplainSqlDTO;
+import com.dlink.dto.APISavePointDTO;
+import com.dlink.dto.APISavePointTaskDTO;
 import com.dlink.service.APIService;
 import com.dlink.service.JobInstanceService;
 import com.dlink.service.StudioService;
 import com.dlink.service.TaskService;
-import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * APIController

dlink-admin/src/main/java/com/dlink/controller/AdminController.java

@@ -17,17 +17,23 @@
  *
  */
 
-
 package com.dlink.controller;
 
-import cn.dev33.satoken.stp.StpUtil;
 import com.dlink.assertion.Asserts;
 import com.dlink.common.result.Result;
 import com.dlink.dto.LoginUTO;
 import com.dlink.service.UserService;
-import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import cn.dev33.satoken.stp.StpUtil;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * AdminController

dlink-admin/src/main/java/com/dlink/controller/AlertGroupController.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.controller;
 
 import com.dlink.common.result.ProTableResult;
@@ -26,14 +25,23 @@ import com.dlink.model.AlertGroup;
 import com.dlink.model.AlertHistory;
 import com.dlink.service.AlertGroupService;
 import com.dlink.service.AlertHistoryService;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * AlertGroupController
  *

dlink-admin/src/main/java/com/dlink/controller/AlertHistoryController.java

@@ -17,21 +17,28 @@
  *
  */
 
-
 package com.dlink.controller;
 
 import com.dlink.common.result.ProTableResult;
 import com.dlink.common.result.Result;
 import com.dlink.model.AlertHistory;
 import com.dlink.service.AlertHistoryService;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * AlertHistoryController
  *

dlink-admin/src/main/java/com/dlink/controller/AlertInstanceController.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.controller;
 
 import com.dlink.alert.AlertPool;
@@ -26,13 +25,19 @@ import com.dlink.common.result.ProTableResult;
 import com.dlink.common.result.Result;
 import com.dlink.model.AlertInstance;
 import com.dlink.service.AlertInstanceService;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.fasterxml.jackson.databind.JsonNode;
+
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * AlertInstanceController

dlink-admin/src/main/java/com/dlink/controller/CatalogueController.java

@@ -17,27 +17,38 @@
  *
  */
 
-
 package com.dlink.controller;
 
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ZipUtil;
 import com.dlink.common.result.ProTableResult;
 import com.dlink.common.result.Result;
 import com.dlink.dto.CatalogueTaskDTO;
 import com.dlink.model.Catalogue;
 import com.dlink.service.CatalogueService;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ZipUtil;
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * CatalogueController
  *
@@ -83,7 +94,6 @@ public class CatalogueController {
         return Result.succeed("上传zip包并创建工程成功");
     }
 
-
     private void traverseFile(String sourcePath, Catalogue catalog) throws Exception {
         File file = new File(sourcePath);
         File[] fs = file.listFiles();
@@ -92,7 +102,6 @@ public class CatalogueController {
         }
         for (File fl : fs) {
             if (fl.isFile()) {
-                System.out.println(fl.getName());
                 CatalogueTaskDTO dto = getCatalogueTaskDTO(fl.getName(), catalogueService.findByParentIdAndName(catalog.getParentId(), catalog.getName()).getId());
                 String fileText = getFileText(fl);
                 catalogueService.createCatalogAndFileTask(dto, fileText);
@@ -244,7 +253,7 @@ public class CatalogueController {
     @PostMapping("/copyTask")
     public Result copyTask(@RequestBody Catalogue catalogue) throws Exception {
 
-        if ( catalogueService.copyTask(catalogue)) {
+        if (catalogueService.copyTask(catalogue)) {
             return Result.succeed("复制作业成功");
         } else {
             return Result.failed("复制作业失败");

dlink-admin/src/main/java/com/dlink/controller/ClusterConfigurationController.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.controller;
 
 import com.dlink.assertion.Asserts;
@@ -26,8 +25,10 @@ import com.dlink.common.result.Result;
 import com.dlink.gateway.result.TestResult;
 import com.dlink.model.ClusterConfiguration;
 import com.dlink.service.ClusterConfigurationService;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,8 +38,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.fasterxml.jackson.databind.JsonNode;
+
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * ClusterConfigController

dlink-admin/src/main/java/com/dlink/controller/ClusterController.java

@@ -17,25 +17,30 @@
  *
  */
 
-
 package com.dlink.controller;
 
-import com.dlink.api.FlinkAPI;
 import com.dlink.assertion.Asserts;
-import com.dlink.cluster.FlinkClusterInfo;
 import com.dlink.common.result.ProTableResult;
 import com.dlink.common.result.Result;
 import com.dlink.model.Cluster;
-import com.dlink.result.SubmitResult;
 import com.dlink.service.ClusterService;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * ClusterController
  *

dlink-admin/src/main/java/com/dlink/controller/DataBaseController.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.controller;
 
 import com.dlink.assertion.Asserts;
@@ -27,15 +26,25 @@ import com.dlink.constant.CommonConstant;
 import com.dlink.metadata.driver.DriverPool;
 import com.dlink.model.DataBase;
 import com.dlink.service.DataBaseService;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.fasterxml.jackson.databind.JsonNode;
+
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * DataBaseController

dlink-admin/src/main/java/com/dlink/controller/DocumentController.java

@@ -17,21 +17,30 @@
  *
  */
 
-
 package com.dlink.controller;
 
 import com.dlink.common.result.ProTableResult;
 import com.dlink.common.result.Result;
 import com.dlink.model.Document;
 import com.dlink.service.DocumentService;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * DocumentController
  *

dlink-admin/src/main/java/com/dlink/controller/HistoryController.java

@@ -17,21 +17,27 @@
  *
  */
 
-
 package com.dlink.controller;
 
 import com.dlink.common.result.ProTableResult;
 import com.dlink.common.result.Result;
 import com.dlink.model.History;
 import com.dlink.service.HistoryService;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * HistoryController
  *

dlink-admin/src/main/java/com/dlink/controller/JarController.java

@@ -17,15 +17,16 @@
  *
  */
 
-
 package com.dlink.controller;
 
 import com.dlink.common.result.ProTableResult;
 import com.dlink.common.result.Result;
 import com.dlink.model.Jar;
 import com.dlink.service.JarService;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,8 +36,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.fasterxml.jackson.databind.JsonNode;
+
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * JarController

dlink-admin/src/main/java/com/dlink/controller/JobInstanceController.java

@@ -17,9 +17,19 @@
  *
  */
 
-
 package com.dlink.controller;
 
+import com.dlink.api.FlinkAPI;
+import com.dlink.assertion.Asserts;
+import com.dlink.common.result.ProTableResult;
+import com.dlink.common.result.Result;
+import com.dlink.job.BuildConfiguration;
+import com.dlink.model.JobInstance;
+import com.dlink.model.JobManagerConfiguration;
+import com.dlink.model.TaskManagerConfiguration;
+import com.dlink.service.JobInstanceService;
+import com.dlink.service.TaskService;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -35,16 +45,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.dlink.api.FlinkAPI;
-import com.dlink.assertion.Asserts;
-import com.dlink.common.result.ProTableResult;
-import com.dlink.common.result.Result;
-import com.dlink.job.BuildConfiguration;
-import com.dlink.model.JobInstance;
-import com.dlink.model.JobManagerConfiguration;
-import com.dlink.model.TaskManagerConfiguration;
-import com.dlink.service.JobInstanceService;
-import com.dlink.service.TaskService;
 import com.fasterxml.jackson.databind.JsonNode;
 
 import lombok.extern.slf4j.Slf4j;
@@ -99,9 +99,9 @@ public class JobInstanceController {
      * 获取指定ID的信息
      */
     @PostMapping("/getOneById")
-    public Result getOneById(@RequestBody JobInstance JobInstance) throws Exception {
-        JobInstance = jobInstanceService.getById(JobInstance.getId());
-        return Result.succeed(JobInstance, "获取成功");
+    public Result getOneById(@RequestBody JobInstance jobInstance) throws Exception {
+        jobInstance = jobInstanceService.getById(jobInstance.getId());
+        return Result.succeed(jobInstance, "获取成功");
     }
 
     /**

dlink-admin/src/main/java/com/dlink/controller/SavepointsController.java

@@ -17,21 +17,30 @@
  *
  */
 
-
 package com.dlink.controller;
 
 import com.dlink.common.result.ProTableResult;
 import com.dlink.common.result.Result;
 import com.dlink.model.Savepoints;
 import com.dlink.service.SavepointsService;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * SavepointsController
  *

dlink-admin/src/main/java/com/dlink/controller/StatementController.java

@@ -17,16 +17,16 @@
  *
  */
 
-
 package com.dlink.controller;
 
 import com.dlink.common.result.ProTableResult;
 import com.dlink.common.result.Result;
 import com.dlink.model.Statement;
-import com.dlink.result.SubmitResult;
 import com.dlink.service.StatementService;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -35,8 +35,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.fasterxml.jackson.databind.JsonNode;
+
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * StatementController

dlink-admin/src/main/java/com/dlink/controller/StudioController.java

@@ -17,9 +17,18 @@
  *
  */
 
-
 package com.dlink.controller;
 
+import com.dlink.common.result.Result;
+import com.dlink.dto.SessionDTO;
+import com.dlink.dto.StudioCADTO;
+import com.dlink.dto.StudioDDLDTO;
+import com.dlink.dto.StudioExecuteDTO;
+import com.dlink.dto.StudioMetaStoreDTO;
+import com.dlink.job.JobResult;
+import com.dlink.result.IResult;
+import com.dlink.service.StudioService;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,15 +42,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.dlink.common.result.Result;
-import com.dlink.dto.SessionDTO;
-import com.dlink.dto.StudioCADTO;
-import com.dlink.dto.StudioDDLDTO;
-import com.dlink.dto.StudioExecuteDTO;
-import com.dlink.dto.StudioMetaStoreDTO;
-import com.dlink.job.JobResult;
-import com.dlink.result.IResult;
-import com.dlink.service.StudioService;
 import com.fasterxml.jackson.databind.JsonNode;
 
 import lombok.extern.slf4j.Slf4j;

dlink-admin/src/main/java/com/dlink/controller/SysConfigController.java

@@ -17,21 +17,29 @@
  *
  */
 
-
 package com.dlink.controller;
 
 import com.dlink.common.result.ProTableResult;
 import com.dlink.common.result.Result;
 import com.dlink.model.SysConfig;
 import com.dlink.service.SysConfigService;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * SysConfigController
  *

dlink-admin/src/main/java/com/dlink/controller/TaskController.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.controller;
 
 import com.dlink.common.result.ProTableResult;
@@ -30,17 +29,27 @@ import com.dlink.model.Task;
 import com.dlink.model.TaskOperatingSavepointSelect;
 import com.dlink.service.TaskService;
 import com.dlink.utils.TaskOneClickOperatingUtil;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * 任务 Controller
  *
@@ -157,7 +166,6 @@ public class TaskController {
         return taskService.releaseTask(id);
     }
 
-
     @PostMapping("/rollbackTask")
     public Result rollbackTask(@RequestBody TaskRollbackVersionDTO dto) throws Exception {
 
@@ -255,7 +263,7 @@ public class TaskController {
     /**
      * json文件上传  导入task
      */
-    @PostMapping(value="/uploadTaskJson")
+    @PostMapping(value = "/uploadTaskJson")
     public Result uploadTaskJson(@RequestParam("file") MultipartFile file) throws Exception {
         return taskService.uploadTaskJson(file);
     }
@@ -329,6 +337,5 @@ public class TaskController {
         return TaskOneClickOperatingUtil.queryOneClickOperatingTaskStatus();
     }
 
-
 }
 

dlink-admin/src/main/java/com/dlink/controller/TaskVersionController.java

@@ -17,24 +17,26 @@
  *
  */
 
-
 package com.dlink.controller;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.dlink.common.result.ProTableResult;
 import com.dlink.dto.TaskVersionHistoryDTO;
 import com.dlink.model.TaskVersion;
 import com.dlink.service.TaskVersionService;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.stream.Collectors;
+import com.fasterxml.jackson.databind.JsonNode;
+
+import cn.hutool.core.bean.BeanUtil;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * 任务版本 Controller

dlink-admin/src/main/java/com/dlink/controller/UserController.java

@@ -17,26 +17,29 @@
  *
  */
 
-
 package com.dlink.controller;
 
 import com.dlink.assertion.Asserts;
 import com.dlink.common.result.ProTableResult;
 import com.dlink.common.result.Result;
 import com.dlink.dto.ModifyPasswordDTO;
-import com.dlink.gateway.result.TestResult;
-import com.dlink.model.ClusterConfiguration;
 import com.dlink.model.User;
 import com.dlink.service.UserService;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * UserController

dlink-admin/src/main/java/com/dlink/db/annotation/Save.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.db.annotation;
 
 /**

dlink-admin/src/main/java/com/dlink/db/config/MybatisPlusConfigure.java

@@ -17,20 +17,20 @@
  *
  */
 
-
 package com.dlink.db.config;
 
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.dlink.db.handler.DateMetaObjectHandler;
 import com.dlink.db.properties.MybatisPlusFillProperties;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+
 /**
  * MybatisPlusConfigure
  *

dlink-admin/src/main/java/com/dlink/db/handler/DateMetaObjectHandler.java

@@ -17,15 +17,16 @@
  *
  */
 
-
 package com.dlink.db.handler;
 
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.dlink.db.properties.MybatisPlusFillProperties;
+
 import org.apache.ibatis.reflection.MetaObject;
 
 import java.time.LocalDateTime;
 
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+
 /**
  * DateMetaObjectHandler
  *

dlink-admin/src/main/java/com/dlink/db/mapper/SuperMapper.java

@@ -17,18 +17,18 @@
  *
  */
 
-
 package com.dlink.db.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 /**
  * SuperMapper
  *

dlink-admin/src/main/java/com/dlink/db/model/SuperEntity.java

@@ -17,27 +17,28 @@
  *
  */
 
-
 package com.dlink.db.model;
 
+import com.dlink.db.annotation.Save;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import javax.validation.constraints.NotNull;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.dlink.db.annotation.Save;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-
 /**
  * SuperEntity
  *

dlink-admin/src/main/java/com/dlink/db/properties/MybatisPlusFillProperties.java

@@ -17,12 +17,12 @@
  *
  */
 
-
 package com.dlink.db.properties;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
  * MybatisPlusFillProperties

dlink-admin/src/main/java/com/dlink/db/service/ISuperService.java

@@ -17,16 +17,14 @@
  *
  */
 
-
 package com.dlink.db.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.dlink.common.result.ProTableResult;
-import com.fasterxml.jackson.databind.JsonNode;
 
-import java.util.LinkedHashMap;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fasterxml.jackson.databind.JsonNode;
 
 /**
  * ISuperService

dlink-admin/src/main/java/com/dlink/db/service/impl/SuperServiceImpl.java

@@ -17,24 +17,23 @@
  *
  */
 
-
 package com.dlink.db.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dlink.assertion.Asserts;
 import com.dlink.common.result.ProTableResult;
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.db.service.ISuperService;
 import com.dlink.db.util.ProTableUtil;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 /**
  * SuperServiceImpl
  *

dlink-admin/src/main/java/com/dlink/db/util/ProTableUtil.java

@@ -17,16 +17,19 @@
  *
  */
 
-
 package com.dlink.db.util;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeType;
 import com.google.common.base.CaseFormat;
 
-import java.util.*;
-
 /**
  * ProTableUtil
  *

dlink-admin/src/main/java/com/dlink/dto/APICancelDTO.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.dto;
 
 import com.dlink.gateway.config.GatewayConfig;
 import com.dlink.job.JobConfig;
+
 import lombok.Getter;
 import lombok.Setter;
 

dlink-admin/src/main/java/com/dlink/dto/APIExecuteJarDTO.java

@@ -17,12 +17,12 @@
  *
  */
 
-
 package com.dlink.dto;
 
 import com.dlink.gateway.config.GatewayConfig;
 import com.dlink.gateway.config.SavePointStrategy;
 import com.dlink.job.JobConfig;
+
 import lombok.Getter;
 import lombok.Setter;
 

dlink-admin/src/main/java/com/dlink/dto/APIExecuteSqlDTO.java

@@ -17,17 +17,17 @@
  *
  */
 
-
 package com.dlink.dto;
 
 import com.dlink.assertion.Asserts;
 import com.dlink.gateway.config.GatewayConfig;
 import com.dlink.job.JobConfig;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.util.Map;
 
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * APIExecuteSqlDTO
  *

dlink-admin/src/main/java/com/dlink/dto/APIExplainSqlDTO.java

@@ -17,15 +17,15 @@
  *
  */
 
-
 package com.dlink.dto;
 
 import com.dlink.job.JobConfig;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.util.Map;
 
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * APIExplainSqlDTO
  *

dlink-admin/src/main/java/com/dlink/dto/APISavePointDTO.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.dto;
 
 import com.dlink.gateway.config.GatewayConfig;
 import com.dlink.job.JobConfig;
+
 import lombok.Getter;
 import lombok.Setter;
 

dlink-admin/src/main/java/com/dlink/dto/APISavePointTaskDTO.java

@@ -17,10 +17,10 @@
  *
  */
 
-
 package com.dlink.dto;
 
 import com.dlink.gateway.config.SavePointType;
+
 import lombok.Getter;
 import lombok.Setter;
 

dlink-admin/src/main/java/com/dlink/dto/AbstractStatementDTO.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.dto;
 
 /**
@@ -32,7 +31,6 @@ public class AbstractStatementDTO {
     private Integer envId;
     private boolean fragment = false;
 
-
     public String getStatement() {
         return statement;
     }

dlink-admin/src/main/java/com/dlink/dto/CatalogueTaskDTO.java

@@ -17,10 +17,10 @@
  *
  */
 
-
 package com.dlink.dto;
 
 import com.dlink.config.Dialect;
+
 import lombok.Getter;
 import lombok.Setter;
 

dlink-admin/src/main/java/com/dlink/dto/LoginUTO.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.dto;
 
 import lombok.Getter;

dlink-admin/src/main/java/com/dlink/dto/ModifyPasswordDTO.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.dto;
 
 import lombok.Getter;

dlink-admin/src/main/java/com/dlink/dto/SessionDTO.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.dto;
 
 import lombok.Getter;

dlink-admin/src/main/java/com/dlink/dto/SqlDTO.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.dto;
 
 import lombok.Getter;

dlink-admin/src/main/java/com/dlink/dto/StudioCADTO.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.dto;
 
 import lombok.Getter;

dlink-admin/src/main/java/com/dlink/dto/StudioDDLDTO.java

@@ -17,10 +17,10 @@
  *
  */
 
-
 package com.dlink.dto;
 
 import com.dlink.job.JobConfig;
+
 import lombok.Getter;
 import lombok.Setter;
 

dlink-admin/src/main/java/com/dlink/dto/StudioExecuteDTO.java

@@ -17,11 +17,14 @@
  *
  */
 
-
 package com.dlink.dto;
 
 import com.dlink.assertion.Asserts;
 import com.dlink.job.JobConfig;
+
+import java.util.HashMap;
+import java.util.Map;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -29,9 +32,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * StudioExecuteDTO
  *

dlink-admin/src/main/java/com/dlink/dto/StudioMetaStoreDTO.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.dto;
 
 import com.dlink.gateway.GatewayType;

dlink-admin/src/main/java/com/dlink/dto/TaskRollbackVersionDTO.java

@@ -17,17 +17,15 @@
  *
  */
 
-
 package com.dlink.dto;
 
-import lombok.Data;
-
 import java.io.Serializable;
 
+import lombok.Data;
+
 /**
  * @author huang
  * @description: 任务回滚DTO
- * @date 2022/6/23 10:25
  */
 @Data
 public class TaskRollbackVersionDTO implements Serializable {

dlink-admin/src/main/java/com/dlink/dto/TaskVersionConfigureDTO.java

@@ -17,17 +17,15 @@
  *
  */
 
-
 package com.dlink.dto;
 
-import lombok.Data;
-
 import java.io.Serializable;
 
+import lombok.Data;
+
 /**
  * @author huang
  * @description: 版本信息配置
- * @date 2022/6/23 10:25
  */
 @Data
 public class TaskVersionConfigureDTO implements Serializable {

dlink-admin/src/main/java/com/dlink/dto/TaskVersionHistoryDTO.java

@@ -17,18 +17,16 @@
  *
  */
 
-
 package com.dlink.dto;
 
-import lombok.Data;
-
 import java.io.Serializable;
 import java.util.Date;
 
+import lombok.Data;
+
 /**
  * @author huang
  * @description: 任务版本记录
- * @date 2022/6/27 18:17
  */
 @Data
 public class TaskVersionHistoryDTO implements Serializable {

dlink-admin/src/main/java/com/dlink/exception/BusException.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.exception;
 
 /**

dlink-admin/src/main/java/com/dlink/exception/WebExceptionHandler.java

@@ -17,14 +17,13 @@
  *
  */
 
-
 package com.dlink.exception;
 
-import cn.dev33.satoken.exception.NotLoginException;
-
 import com.dlink.common.result.Result;
 import com.dlink.model.CodeEnum;
 
+import javax.servlet.http.HttpServletResponse;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -33,7 +32,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.http.HttpServletResponse;
+import cn.dev33.satoken.exception.NotLoginException;
 
 /**
  * WebExceptionHandler

dlink-admin/src/main/java/com/dlink/init/SystemInit.java

@@ -17,9 +17,16 @@
  *
  */
 
-
 package com.dlink.init;
 
+import com.dlink.daemon.task.DaemonFactory;
+import com.dlink.daemon.task.DaemonTaskConfig;
+import com.dlink.job.FlinkJobTask;
+import com.dlink.model.JobInstance;
+import com.dlink.service.JobInstanceService;
+import com.dlink.service.SysConfigService;
+import com.dlink.service.TaskService;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,14 +38,6 @@ import org.springframework.boot.ApplicationRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
-import com.dlink.daemon.task.DaemonFactory;
-import com.dlink.daemon.task.DaemonTaskConfig;
-import com.dlink.job.FlinkJobTask;
-import com.dlink.model.JobInstance;
-import com.dlink.service.JobInstanceService;
-import com.dlink.service.SysConfigService;
-import com.dlink.service.TaskService;
-
 /**
  * SystemInit
  *

dlink-admin/src/main/java/com/dlink/job/BuildConfiguration.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.job;
 
 import com.dlink.api.FlinkAPI;
@@ -26,9 +25,14 @@ import com.dlink.model.JobManagerConfiguration;
 import com.dlink.model.TaskContainerConfigInfo;
 import com.dlink.model.TaskManagerConfiguration;
 import com.dlink.utils.JSONUtil;
-import com.fasterxml.jackson.databind.JsonNode;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.fasterxml.jackson.databind.JsonNode;
 
 /**
  * @program: dlink
@@ -95,14 +99,14 @@ public class BuildConfiguration {
                 String containerId = taskManagers.get("id").asText();// 获取container id
                 String containerPath =  taskManagers.get("path").asText(); // 获取container path
                 Integer dataPort = taskManagers.get("dataPort").asInt(); // 获取container dataPort
-                Integer jmxPort =taskManagers.get("jmxPort").asInt(); // 获取container jmxPort
-                Long timeSinceLastHeartbeat =taskManagers.get("timeSinceLastHeartbeat").asLong(); // 获取container timeSinceLastHeartbeat
-                Integer slotsNumber =taskManagers.get("slotsNumber").asInt(); // 获取container slotsNumber
+                Integer jmxPort = taskManagers.get("jmxPort").asInt(); // 获取container jmxPort
+                Long timeSinceLastHeartbeat = taskManagers.get("timeSinceLastHeartbeat").asLong(); // 获取container timeSinceLastHeartbeat
+                Integer slotsNumber = taskManagers.get("slotsNumber").asInt(); // 获取container slotsNumber
                 Integer freeSlots = taskManagers.get("freeSlots").asInt(); // 获取container freeSlots
                 String totalResource =  JSONUtil.toJsonString(taskManagers.get("totalResource")); // 获取container totalResource
-                String freeResource =  JSONUtil.toJsonString(taskManagers.get("freeResource") ); // 获取container freeResource
-                String hardware = JSONUtil.toJsonString(taskManagers.get("hardware") ); // 获取container hardware
-                String memoryConfiguration = JSONUtil.toJsonString(taskManagers.get("memoryConfiguration") ); // 获取container memoryConfiguration
+                String freeResource =  JSONUtil.toJsonString(taskManagers.get("freeResource")); // 获取container freeResource
+                String hardware = JSONUtil.toJsonString(taskManagers.get("hardware")); // 获取container hardware
+                String memoryConfiguration = JSONUtil.toJsonString(taskManagers.get("memoryConfiguration")); // 获取container memoryConfiguration
                 Asserts.checkNull(containerId, "获取不到 containerId , containerId不能为空");
                 JsonNode taskManagerMetrics = flinkAPI.getTaskManagerMetrics(containerId);//获取taskManager metrics
                 String taskManagerLog = flinkAPI.getTaskManagerLog(containerId);//获取taskManager日志
@@ -143,7 +147,6 @@ public class BuildConfiguration {
                 taskContainerConfigInfo.setTaskManagerThreadDump(taskManagerThreadDumps);
                 taskContainerConfigInfo.setTaskManagerStdout(taskManagerStdOut);
 
-
                 taskManagerConfiguration.setTaskContainerConfigInfo(taskContainerConfigInfo);
 
                 // 将taskManagerConfiguration添加到set集合中

dlink-admin/src/main/java/com/dlink/job/FlinkJobTask.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.job;
 
 import com.dlink.assertion.Asserts;
@@ -29,20 +28,21 @@ import com.dlink.daemon.task.DaemonTaskConfig;
 import com.dlink.model.JobInstance;
 import com.dlink.model.JobStatus;
 import com.dlink.service.TaskService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.DependsOn;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.DependsOn;
+
 @DependsOn("springContextUtils")
 public class FlinkJobTask implements DaemonTask {
 
     private static final Logger log = LoggerFactory.getLogger(FlinkJobTask.class);
 
     private DaemonTaskConfig config;
-    public final static String TYPE = "jobInstance";
+    public static final String TYPE = "jobInstance";
     private static TaskService taskService;
     private long preDealTime;
 

dlink-admin/src/main/java/com/dlink/job/FlinkJobTaskPool.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.job;
 
 import com.dlink.model.JobInfoDetail;
@@ -38,7 +37,7 @@ public class FlinkJobTaskPool extends AbstractPool<JobInfoDetail> {
 
     private static FlinkJobTaskPool instance = new FlinkJobTaskPool();
 
-    public static FlinkJobTaskPool getInstance(){
+    public static FlinkJobTaskPool getInstance() {
         return instance;
     }
 

dlink-admin/src/main/java/com/dlink/job/Job2MysqlHandler.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.job;
 
 import com.dlink.assertion.Asserts;
@@ -25,13 +24,27 @@ import com.dlink.context.SpringContextUtils;
 import com.dlink.daemon.task.DaemonFactory;
 import com.dlink.daemon.task.DaemonTaskConfig;
 import com.dlink.gateway.GatewayType;
-import com.dlink.model.*;
-import com.dlink.service.*;
+import com.dlink.model.Cluster;
+import com.dlink.model.ClusterConfiguration;
+import com.dlink.model.History;
+import com.dlink.model.Jar;
+import com.dlink.model.JobHistory;
+import com.dlink.model.JobInstance;
+import com.dlink.model.JobStatus;
+import com.dlink.model.Task;
+import com.dlink.service.ClusterConfigurationService;
+import com.dlink.service.ClusterService;
+import com.dlink.service.HistoryService;
+import com.dlink.service.JarService;
+import com.dlink.service.JobHistoryService;
+import com.dlink.service.JobInstanceService;
+import com.dlink.service.TaskService;
 import com.dlink.utils.JSONUtil;
-import org.springframework.context.annotation.DependsOn;
 
 import java.time.LocalDateTime;
 
+import org.springframework.context.annotation.DependsOn;
+
 /**
  * Job2MysqlHandler
  *

dlink-admin/src/main/java/com/dlink/mapper/AlertGroupMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.AlertGroup;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**

dlink-admin/src/main/java/com/dlink/mapper/AlertHistoryMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.AlertHistory;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**

dlink-admin/src/main/java/com/dlink/mapper/AlertInstanceMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.AlertInstance;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**

dlink-admin/src/main/java/com/dlink/mapper/CatalogueMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.Catalogue;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**

dlink-admin/src/main/java/com/dlink/mapper/ClusterConfigurationMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.ClusterConfiguration;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**

dlink-admin/src/main/java/com/dlink/mapper/ClusterMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.Cluster;
+
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

dlink-admin/src/main/java/com/dlink/mapper/DataBaseMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.DataBase;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**

dlink-admin/src/main/java/com/dlink/mapper/DocumentMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.Document;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**

dlink-admin/src/main/java/com/dlink/mapper/HistoryMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.History;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**

dlink-admin/src/main/java/com/dlink/mapper/JarMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.Jar;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**

dlink-admin/src/main/java/com/dlink/mapper/JobHistoryMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.JobHistory;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**

dlink-admin/src/main/java/com/dlink/mapper/JobInstanceMapper.java

@@ -17,12 +17,12 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.JobInstance;
 import com.dlink.model.JobInstanceCount;
+
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

dlink-admin/src/main/java/com/dlink/mapper/SavepointsMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.Savepoints;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**

dlink-admin/src/main/java/com/dlink/mapper/StatementMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.Statement;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**

dlink-admin/src/main/java/com/dlink/mapper/SysConfigMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.SysConfig;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**

dlink-admin/src/main/java/com/dlink/mapper/TaskMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.Task;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

dlink-admin/src/main/java/com/dlink/mapper/TaskVersionMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.TaskVersion;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**

dlink-admin/src/main/java/com/dlink/mapper/UserMapper.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.mapper;
 
 import com.dlink.db.mapper.SuperMapper;
 import com.dlink.model.User;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**

dlink-admin/src/main/java/com/dlink/model/AlertGroup.java

@@ -17,17 +17,18 @@
  *
  */
 
-
 package com.dlink.model;
 
+import com.dlink.db.model.SuperEntity;
+
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.dlink.db.model.SuperEntity;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.List;
-
 /**
  * AlertGroup
  *

dlink-admin/src/main/java/com/dlink/model/AlertHistory.java

@@ -17,16 +17,20 @@
  *
  */
 
-
 package com.dlink.model;
 
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * AlertHistory
  *

dlink-admin/src/main/java/com/dlink/model/AlertInstance.java

@@ -17,11 +17,12 @@
  *
  */
 
-
 package com.dlink.model;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.dlink.db.model.SuperEntity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

dlink-admin/src/main/java/com/dlink/model/Catalogue.java

@@ -17,11 +17,12 @@
  *
  */
 
-
 package com.dlink.model;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.dlink.db.model.SuperEntity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

dlink-admin/src/main/java/com/dlink/model/Cluster.java

@@ -17,13 +17,14 @@
  *
  */
 
-
 package com.dlink.model;
 
+import com.dlink.db.model.SuperEntity;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.dlink.db.model.SuperEntity;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

dlink-admin/src/main/java/com/dlink/model/ClusterConfiguration.java

@@ -17,22 +17,23 @@
  *
  */
 
-
 package com.dlink.model;
 
+import com.dlink.assertion.Asserts;
+import com.dlink.db.model.SuperEntity;
+
+import java.util.HashMap;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.dlink.assertion.Asserts;
-import com.dlink.db.model.SuperEntity;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * ClusterConfig
  *
@@ -60,7 +61,6 @@ public class ClusterConfiguration extends SuperEntity {
     @TableField(exist = false)
     private Map<String, Object> config = new HashMap<>();
 
-
     public Map<String, Object> parseConfig() {
         ObjectMapper objectMapper = new ObjectMapper();
         try {

dlink-admin/src/main/java/com/dlink/model/CodeEnum.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.model;
 
 /**

dlink-admin/src/main/java/com/dlink/model/DataBase.java

@@ -17,19 +17,20 @@
  *
  */
 
-
 package com.dlink.model;
 
+import com.dlink.db.model.SuperEntity;
+import com.dlink.metadata.driver.DriverConfig;
+
+import java.time.LocalDateTime;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.dlink.db.model.SuperEntity;
-import com.dlink.metadata.driver.DriverConfig;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.time.LocalDateTime;
-
 /**
  * DataBase
  *

dlink-admin/src/main/java/com/dlink/model/Document.java

@@ -17,11 +17,12 @@
  *
  */
 
-
 package com.dlink.model;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.dlink.db.model.SuperEntity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

dlink-admin/src/main/java/com/dlink/model/History.java

@@ -17,18 +17,18 @@
  *
  */
 
-
 package com.dlink.model;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
  * History
  *

dlink-admin/src/main/java/com/dlink/model/Jar.java

@@ -17,13 +17,14 @@
  *
  */
 
-
 package com.dlink.model;
 
+import com.dlink.db.model.SuperEntity;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.dlink.db.model.SuperEntity;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

dlink-admin/src/main/java/com/dlink/model/JobHistory.java

@@ -17,19 +17,19 @@
  *
  */
 
-
 package com.dlink.model;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
  * JobHistory
  *

dlink-admin/src/main/java/com/dlink/model/JobInfoDetail.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.model;
 
 import java.util.Set;
@@ -80,19 +79,19 @@ public class JobInfoDetail {
     public void setJobManagerConfiguration(JobManagerConfiguration jobMangerConfiguration) {
         this.jobManagerConfiguration = jobMangerConfiguration;
     }
+
     public JobManagerConfiguration getJobManagerConfiguration() {
         return jobManagerConfiguration;
     }
 
-
     public void setTaskManagerConfiguration(Set<TaskManagerConfiguration> taskManagerConfiguration) {
         this.taskManagerConfiguration = taskManagerConfiguration;
     }
+
     public Set<TaskManagerConfiguration> getTaskManagerConfiguration() {
         return taskManagerConfiguration;
     }
 
-
     public History getHistory() {
         return history;
     }

dlink-admin/src/main/java/com/dlink/model/JobInstance.java

@@ -17,17 +17,21 @@
  *
  */
 
-
 package com.dlink.model;
 
-import com.baomidou.mybatisplus.annotation.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
  * JobInstance
  *
@@ -60,15 +64,15 @@ public class JobInstance implements Serializable {
 
     private String error;
 
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
 
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime finishTime;
 
     private Long duration;

dlink-admin/src/main/java/com/dlink/model/JobInstanceCount.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.model;
 
 /**

dlink-admin/src/main/java/com/dlink/model/JobInstanceStatus.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.model;
 
 /**

dlink-admin/src/main/java/com/dlink/model/JobManagerConfiguration.java

@@ -17,13 +17,12 @@
  *
  */
 
-
 package com.dlink.model;
 
-import lombok.Data;
-
 import java.util.Map;
 
+import lombok.Data;
+
 /**
  * @program: dlink
  * @description: JobManager 配置信息
@@ -34,7 +33,7 @@ import java.util.Map;
 @Data
 public class JobManagerConfiguration {
 
-    private Map<String, String> metrics ;
+    private Map<String, String> metrics;
 
     private Map<String, String> jobManagerConfig;
 

dlink-admin/src/main/java/com/dlink/model/Savepoints.java

@@ -17,18 +17,24 @@
  *
  */
 
-
 package com.dlink.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.dlink.db.annotation.Save;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
+import javax.validation.constraints.NotNull;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * Savepoints
  *

dlink-admin/src/main/java/com/dlink/model/SqlGeneration.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.model;
 
 /**

dlink-admin/src/main/java/com/dlink/model/Statement.java

@@ -17,15 +17,15 @@
  *
  */
 
-
 package com.dlink.model;
 
+import java.io.Serializable;
+
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-
 /**
  * Statement
  *

dlink-admin/src/main/java/com/dlink/model/SysConfig.java

@@ -17,18 +17,24 @@
  *
  */
 
-
 package com.dlink.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.dlink.db.annotation.Save;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
+import javax.validation.constraints.NotNull;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * SysConfig
  *
@@ -60,5 +66,4 @@ public class SysConfig implements Serializable {
         return this.id;
     }
 
-
 }

dlink-admin/src/main/java/com/dlink/model/Task.java

@@ -17,27 +17,28 @@
  *
  */
 
-
 package com.dlink.model;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.dlink.assertion.Asserts;
 import com.dlink.db.model.SuperEntity;
 import com.dlink.job.JobConfig;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * 任务
  *
@@ -154,11 +155,12 @@ public class Task extends SuperEntity {
             alias, fg, sts, batchModel, checkPoint, parallelism, savePointStrategy, savePointPath, map);
     }
 
-    public JsonNode parseJsonNode(){
+    public JsonNode parseJsonNode() {
         ObjectMapper mapper = new ObjectMapper();
         return parseJsonNode(mapper);
     }
-    public JsonNode parseJsonNode(ObjectMapper mapper){
+
+    public JsonNode parseJsonNode(ObjectMapper mapper) {
         JsonNode jsonNode = mapper.createObjectNode();
         ((ObjectNode)jsonNode).put("name",this.getName());
         ((ObjectNode)jsonNode).put("alias",this.alias);

dlink-admin/src/main/java/com/dlink/model/TaskContainerConfigInfo.java

@@ -17,29 +17,22 @@
  *
  */
 
+package com.dlink.model;
 
-package com.dlink.model;/**
- * @program: dlink
- * @description:
- * @author: zhumingye
- * @create: 2022-06-27 11:41
- */
+import java.util.Map;
 
 import lombok.Data;
 
-import java.util.Map;
-
 /**
  * @program: dlink
  * @description:
  * @author: zhumingye
  * @create: 2022-06-27 11:41
  */
-
 @Data
 public class TaskContainerConfigInfo {
 
-    private Map<String, String> metrics ;
+    private Map<String, String> metrics;
 
     private String taskManagerLog;
 

dlink-admin/src/main/java/com/dlink/model/TaskManagerConfiguration.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.model;
 
 import lombok.Data;

dlink-admin/src/main/java/com/dlink/model/TaskVersion.java

@@ -17,23 +17,24 @@
  *
  */
 
-
 package com.dlink.model;
 
+import com.dlink.dto.TaskVersionConfigureDTO;
+
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.dlink.dto.TaskVersionConfigureDTO;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
     * 作业
     */

dlink-admin/src/main/java/com/dlink/model/User.java

@@ -17,18 +17,24 @@
  *
  */
 
-
 package com.dlink.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.dlink.db.annotation.Save;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
+import javax.validation.constraints.NotNull;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * User
  *

dlink-admin/src/main/java/com/dlink/result/APIJobResult.java

@@ -17,16 +17,16 @@
  *
  */
 
-
 package com.dlink.result;
 
 import com.dlink.job.Job;
 import com.dlink.job.JobResult;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.time.LocalDateTime;
 
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * APIJobResult
  *

dlink-admin/src/main/java/com/dlink/result/TaskOperatingResult.java

@@ -24,12 +24,12 @@ import com.dlink.model.CodeEnum;
 import com.dlink.model.Task;
 import com.dlink.model.TaskOperatingSavepointSelect;
 import com.dlink.model.TaskOperatingStatus;
+
 import lombok.Data;
 
 /**
  * @author mydq
  * @version 1.0
- * @date 2022/7/16 21:09
  **/
 @Data
 public class TaskOperatingResult {

dlink-admin/src/main/java/com/dlink/security/SecurityAspect.java

@@ -17,26 +17,24 @@
  *
  */
 
-
 package com.dlink.security;
 
-
 import com.dlink.common.result.ProTableResult;
 import com.dlink.common.result.Result;
 import com.dlink.model.History;
 import com.dlink.model.JobInfoDetail;
 import com.dlink.result.ExplainResult;
 import com.dlink.result.SqlExplainResult;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 @Aspect
 @Component
@@ -49,8 +47,7 @@ public class SecurityAspect {
     // 敏感信息屏蔽码
     public static final String MASK = "'password'='******'";
 
-
-    @AfterReturning(pointcut = "execution(* com.dlink.controller..*.*(..))", returning="returnValue")
+    @AfterReturning(pointcut = "execution(* com.dlink.controller..*.*(..))", returning = "returnValue")
     public void afterReturning(JoinPoint joinPoint, Object returnValue) {
 
         // mask sql for explain
@@ -68,7 +65,7 @@ public class SecurityAspect {
         }
 
         // /api/studio/explainSql
-        if (returnValue instanceof Result<?> && ((Result<?>) returnValue).getDatas() instanceof List<?> ) {
+        if (returnValue instanceof Result<?> && ((Result<?>) returnValue).getDatas() instanceof List<?>) {
             List<?> list = (List<?>) ((Result<?>) returnValue).getDatas();
             if (list.isEmpty() || !(list.get(0)  instanceof SqlExplainResult)) {
                 return;
@@ -117,7 +114,6 @@ public class SecurityAspect {
         }
     }
 
-
     /**
      * 将info中的敏感信息中打码
      *

dlink-admin/src/main/java/com/dlink/service/APIService.java

@@ -17,13 +17,17 @@
  *
  */
 
-
 package com.dlink.service;
 
-import com.dlink.dto.*;
+import com.dlink.dto.APICancelDTO;
+import com.dlink.dto.APIExecuteJarDTO;
+import com.dlink.dto.APIExecuteSqlDTO;
+import com.dlink.dto.APIExplainSqlDTO;
+import com.dlink.dto.APISavePointDTO;
 import com.dlink.gateway.result.SavePointResult;
 import com.dlink.result.APIJobResult;
 import com.dlink.result.ExplainResult;
+
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 /**

dlink-admin/src/main/java/com/dlink/service/AlertGroupService.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.db.service.ISuperService;

dlink-admin/src/main/java/com/dlink/service/AlertHistoryService.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.db.service.ISuperService;

dlink-admin/src/main/java/com/dlink/service/AlertInstanceService.java

@@ -17,17 +17,17 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.alert.AlertResult;
 import com.dlink.common.result.Result;
 import com.dlink.db.service.ISuperService;
 import com.dlink.model.AlertInstance;
-import com.fasterxml.jackson.databind.JsonNode;
 
 import java.util.List;
 
+import com.fasterxml.jackson.databind.JsonNode;
+
 /**
  * AlertInstanceService
  *

dlink-admin/src/main/java/com/dlink/service/CatalogueService.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.db.service.ISuperService;
@@ -36,7 +35,7 @@ public interface CatalogueService extends ISuperService<Catalogue> {
 
     List<Catalogue> getAllData();
 
-    Catalogue findByParentIdAndName(Integer parent_id, String name);
+    Catalogue findByParentIdAndName(Integer parentId, String name);
 
     Catalogue createCatalogueAndTask(CatalogueTaskDTO catalogueTaskDTO);
 

dlink-admin/src/main/java/com/dlink/service/ClusterConfigurationService.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.db.service.ISuperService;

dlink-admin/src/main/java/com/dlink/service/ClusterService.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.cluster.FlinkClusterInfo;

dlink-admin/src/main/java/com/dlink/service/DataBaseService.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.db.service.ISuperService;

dlink-admin/src/main/java/com/dlink/service/DocumentService.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.db.service.ISuperService;

dlink-admin/src/main/java/com/dlink/service/HistoryService.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.db.service.ISuperService;

dlink-admin/src/main/java/com/dlink/service/JarService.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.db.service.ISuperService;

dlink-admin/src/main/java/com/dlink/service/JobHistoryService.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.db.service.ISuperService;

dlink-admin/src/main/java/com/dlink/service/JobInstanceService.java

@@ -17,17 +17,17 @@
  *
  */
 
-
 package com.dlink.service;
 
-import java.util.List;
-
 import com.dlink.common.result.ProTableResult;
 import com.dlink.db.service.ISuperService;
 import com.dlink.explainer.lineage.LineageResult;
 import com.dlink.model.JobInfoDetail;
 import com.dlink.model.JobInstance;
 import com.dlink.model.JobInstanceStatus;
+
+import java.util.List;
+
 import com.fasterxml.jackson.databind.JsonNode;
 
 /**

dlink-admin/src/main/java/com/dlink/service/SavepointsService.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.db.service.ISuperService;

dlink-admin/src/main/java/com/dlink/service/StatementService.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.db.service.ISuperService;

dlink-admin/src/main/java/com/dlink/service/StudioService.java

@@ -17,11 +17,8 @@
  *
  */
 
-
 package com.dlink.service;
 
-import java.util.List;
-
 import com.dlink.dto.SessionDTO;
 import com.dlink.dto.SqlDTO;
 import com.dlink.dto.StudioCADTO;
@@ -37,6 +34,9 @@ import com.dlink.result.IResult;
 import com.dlink.result.SelectResult;
 import com.dlink.result.SqlExplainResult;
 import com.dlink.session.SessionInfo;
+
+import java.util.List;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 

dlink-admin/src/main/java/com/dlink/service/SysConfigService.java

@@ -17,15 +17,15 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.db.service.ISuperService;
 import com.dlink.model.SysConfig;
-import com.fasterxml.jackson.databind.JsonNode;
 
 import java.util.Map;
 
+import com.fasterxml.jackson.databind.JsonNode;
+
 /**
  * SysConfig
  *

dlink-admin/src/main/java/com/dlink/service/TaskService.java

@@ -17,10 +17,8 @@
  *
  */
 
-
 package com.dlink.service;
 
-
 import com.dlink.common.result.Result;
 import com.dlink.db.service.ISuperService;
 import com.dlink.dto.TaskRollbackVersionDTO;
@@ -31,12 +29,14 @@ import com.dlink.model.JobLifeCycle;
 import com.dlink.model.JobStatus;
 import com.dlink.model.Task;
 import com.dlink.result.SqlExplainResult;
-import com.fasterxml.jackson.databind.JsonNode;
-import org.springframework.web.multipart.MultipartFile;
 import com.dlink.result.TaskOperatingResult;
 
 import java.util.List;
 
+import org.springframework.web.multipart.MultipartFile;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
 /**
  * 作业 服务类
  *

dlink-admin/src/main/java/com/dlink/service/TaskVersionService.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.db.service.ISuperService;

dlink-admin/src/main/java/com/dlink/service/UserService.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.service;
 
 import com.dlink.common.result.Result;

dlink-admin/src/main/java/com/dlink/service/impl/APIServiceImpl.java

@@ -17,10 +17,13 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import com.dlink.dto.*;
+import com.dlink.dto.APICancelDTO;
+import com.dlink.dto.APIExecuteJarDTO;
+import com.dlink.dto.APIExecuteSqlDTO;
+import com.dlink.dto.APIExplainSqlDTO;
+import com.dlink.dto.APISavePointDTO;
 import com.dlink.gateway.result.SavePointResult;
 import com.dlink.job.JobConfig;
 import com.dlink.job.JobManager;
@@ -29,10 +32,12 @@ import com.dlink.result.APIJobResult;
 import com.dlink.result.ExplainResult;
 import com.dlink.service.APIService;
 import com.dlink.utils.RunTimeUtil;
+
+import org.springframework.stereotype.Service;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.springframework.stereotype.Service;
 
 /**
  * APIServiceImpl

dlink-admin/src/main/java/com/dlink/service/impl/AlertGroupServiceImpl.java

@@ -17,10 +17,8 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dlink.assertion.Asserts;
 import com.dlink.db.service.impl.SuperServiceImpl;
 import com.dlink.mapper.AlertGroupMapper;
@@ -28,12 +26,15 @@ import com.dlink.model.AlertGroup;
 import com.dlink.model.AlertInstance;
 import com.dlink.service.AlertGroupService;
 import com.dlink.service.AlertInstanceService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 /**
  * AlertGroupServiceImpl
  *

dlink-admin/src/main/java/com/dlink/service/impl/AlertHistoryServiceImpl.java

@@ -17,13 +17,13 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
 import com.dlink.db.service.impl.SuperServiceImpl;
 import com.dlink.mapper.AlertHistoryMapper;
 import com.dlink.model.AlertHistory;
 import com.dlink.service.AlertHistoryService;
+
 import org.springframework.stereotype.Service;
 
 /**

dlink-admin/src/main/java/com/dlink/service/impl/AlertInstanceServiceImpl.java

@@ -17,11 +17,8 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dlink.alert.Alert;
 import com.dlink.alert.AlertConfig;
 import com.dlink.alert.AlertMsg;
@@ -35,12 +32,10 @@ import com.dlink.model.AlertInstance;
 import com.dlink.service.AlertGroupService;
 import com.dlink.service.AlertInstanceService;
 import com.dlink.utils.JSONUtil;
-import com.fasterxml.jackson.databind.JsonNode;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -55,6 +50,13 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fasterxml.jackson.databind.JsonNode;
+
 /**
  * AlertInstanceServiceImpl
  *
@@ -89,22 +91,21 @@ public class AlertInstanceServiceImpl extends SuperServiceImpl<AlertInstanceMapp
         alertMsg.setJobStartTime(currentDateTime);
         alertMsg.setJobEndTime(currentDateTime);
         alertMsg.setJobDuration("1 Seconds");
-        String linkUrl = "http://cdh1:8081/#/job/"+ uuid+"/overview";
-        String exceptionUrl = "http://cdh1:8081/#/job/"+uuid+"/exceptions";
+        String linkUrl = "http://cdh1:8081/#/job/" + uuid + "/overview";
+        String exceptionUrl = "http://cdh1:8081/#/job/" + uuid + "/exceptions";
 
         Map<String, String> map = JSONUtil.toMap(alertInstance.getParams());
-        if ( map.get("msgtype").equals(ShowType.MARKDOWN.getValue())) {
+        if (map.get("msgtype").equals(ShowType.MARKDOWN.getValue())) {
             alertMsg.setLinkUrl("[跳转至该任务的 FlinkWeb](" + linkUrl + ")");
             alertMsg.setExceptionUrl("[点击查看该任务的异常日志](" + exceptionUrl + ")");
-        }else {
+        } else {
             alertMsg.setLinkUrl(linkUrl);
             alertMsg.setExceptionUrl(exceptionUrl);
         }
-        String title = "任务【"+alertMsg.getJobName()+"】：" +alertMsg.getJobStatus() + "!";
+        String title = "任务【" + alertMsg.getJobName() + "】：" + alertMsg.getJobStatus() + "!";
         return alert.send(title, alertMsg.toString());
     }
 
-
     @Override
     public Result deleteAlertInstance(JsonNode para) {
         if (para.size() > 0) {
@@ -128,13 +129,13 @@ public class AlertInstanceServiceImpl extends SuperServiceImpl<AlertInstanceMapp
         }
     }
 
-    private void writeBackGroupInformation(Map<Integer, Set<Integer>> alertGroupInformation){
-        if (MapUtils.isEmpty(alertGroupInformation)){
+    private void writeBackGroupInformation(Map<Integer, Set<Integer>> alertGroupInformation) {
+        if (MapUtils.isEmpty(alertGroupInformation)) {
             return;
         }
         final Map<Integer, String> result = new HashMap<>(8);
         for (Map.Entry<Integer, Set<Integer>> entry : alertGroupInformation.entrySet()) {
-            if (entry.getKey() == null){
+            if (entry.getKey() == null) {
                 continue;
             }
             final Set<Integer> groupIdSet = entry.getValue();
@@ -161,12 +162,11 @@ public class AlertInstanceServiceImpl extends SuperServiceImpl<AlertInstanceMapp
         alertGroupService.updateBatchById(list);
     }
 
-
-    private Map<Integer, Set<Integer>> getAlertGroupInformation(){
+    private Map<Integer, Set<Integer>> getAlertGroupInformation() {
         final LambdaQueryWrapper<AlertGroup> select = new LambdaQueryWrapper<AlertGroup>()
                 .select(AlertGroup::getId, AlertGroup::getAlertInstanceIds);
         final List<AlertGroup> list = alertGroupService.list(select);
-        if (CollectionUtils.isEmpty(list)){
+        if (CollectionUtils.isEmpty(list)) {
             return new HashMap<>(0);
         }
         final Map<Integer, Set<Integer>> map = new HashMap<>(list.size());
@@ -180,16 +180,16 @@ public class AlertInstanceServiceImpl extends SuperServiceImpl<AlertInstanceMapp
     }
 
     private void buildGroup(Map<Integer, Set<Integer>> map, AlertGroup alertGroup) {
-        if (StringUtils.isBlank(alertGroup.getAlertInstanceIds())){
+        if (StringUtils.isBlank(alertGroup.getAlertInstanceIds())) {
             return;
         }
         for (String instanceId : alertGroup.getAlertInstanceIds().split(",")) {
-            if (StringUtils.isBlank(instanceId)){
+            if (StringUtils.isBlank(instanceId)) {
                 continue;
             }
             final Integer instanceIdInt = Integer.valueOf(instanceId);
             Set<Integer> groupIdSet = map.get(instanceIdInt);
-            if (CollectionUtils.isEmpty(groupIdSet)){
+            if (CollectionUtils.isEmpty(groupIdSet)) {
                 groupIdSet = new HashSet<>();
                 map.put(instanceIdInt, groupIdSet);
             }

dlink-admin/src/main/java/com/dlink/service/impl/CatalogueServiceImpl.java

@@ -17,31 +17,37 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import static com.dlink.assertion.Asserts.isNotNull;
+import static com.dlink.assertion.Asserts.isNull;
+
 import com.dlink.assertion.Asserts;
 import com.dlink.db.service.impl.SuperServiceImpl;
 import com.dlink.dto.CatalogueTaskDTO;
 import com.dlink.mapper.CatalogueMapper;
-import com.dlink.model.*;
+import com.dlink.model.Catalogue;
+import com.dlink.model.JobLifeCycle;
+import com.dlink.model.Statement;
+import com.dlink.model.Task;
+import com.dlink.model.TaskVersion;
 import com.dlink.service.CatalogueService;
 import com.dlink.service.StatementService;
 import com.dlink.service.TaskService;
 import com.dlink.service.TaskVersionService;
+
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
-import static com.dlink.assertion.Asserts.isNotNull;
-import static com.dlink.assertion.Asserts.isNull;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 
 /**
  * CatalogueServiceImpl
@@ -66,8 +72,8 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
     }
 
     @Override
-    public Catalogue findByParentIdAndName(Integer parent_id, String name) {
-        return baseMapper.selectOne(Wrappers.<Catalogue>query().eq("parent_id", parent_id).eq("name", name));
+    public Catalogue findByParentIdAndName(Integer parentId, String name) {
+        return baseMapper.selectOne(Wrappers.<Catalogue>query().eq("parent_id", parentId).eq("name", name));
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -134,7 +140,7 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
                 taskService.removeById(catalogue.getTaskId());
                 statementService.removeById(catalogue.getTaskId());
                 List<TaskVersion> taskVersionList = taskVersionService.getTaskVersionByTaskId(catalogue.getTaskId());
-                if(taskVersionList.size() > 0 ){
+                if (taskVersionList.size() > 0) {
                     taskVersionService.removeByIds(taskVersionList);
                 }
             }
@@ -154,7 +160,6 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
         }
     }
 
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean copyTask(Catalogue catalogue) {
@@ -177,7 +182,7 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
         //设置复制后的作业名称为：原名称+自增序列
         size = size + 1;
         newTask.setName(oldTask.getName() + "_" + size);
-        newTask.setAlias(oldTask.getAlias() + "_" + size );
+        newTask.setAlias(oldTask.getAlias() + "_" + size);
         newTask.setStep(JobLifeCycle.DEVELOP.getValue());
         taskService.save(newTask);
 
@@ -201,7 +206,7 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
     }
 
     @Override
-    public Integer addDependCatalogue(String[] catalogueNames){
+    public Integer addDependCatalogue(String[] catalogueNames) {
         Integer parentId = 0;
         for (int i = 0; i < catalogueNames.length - 1; i++) {
             String catalogueName = catalogueNames[i];

dlink-admin/src/main/java/com/dlink/service/impl/ClusterConfigurationServiceImpl.java

@@ -17,10 +17,8 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dlink.assertion.Asserts;
 import com.dlink.db.service.impl.SuperServiceImpl;
 import com.dlink.gateway.GatewayType;
@@ -32,12 +30,15 @@ import com.dlink.job.JobManager;
 import com.dlink.mapper.ClusterConfigurationMapper;
 import com.dlink.model.ClusterConfiguration;
 import com.dlink.service.ClusterConfigurationService;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 /**
  * ClusterConfigServiceImpl
  *
@@ -89,7 +90,7 @@ public class ClusterConfigurationServiceImpl extends SuperServiceImpl<ClusterCon
             }
             if (kubernetesConfig.containsKey("kubernetes.cluster-id")) {
                 gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.cluster-id", kubernetesConfig.get("kubernetes.cluster-id").toString());
-            }else{
+            } else {
                 //初始化FlinkKubeClient需要CLUSTER_ID,先用UUID代替，后面使用job名称来作为CLUSTER_ID
                 gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.cluster-id", UUID.randomUUID().toString());
             }

dlink-admin/src/main/java/com/dlink/service/impl/ClusterServiceImpl.java

@@ -17,10 +17,8 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dlink.assertion.Assert;
 import com.dlink.cluster.FlinkCluster;
 import com.dlink.cluster.FlinkClusterInfo;
@@ -30,12 +28,15 @@ import com.dlink.db.service.impl.SuperServiceImpl;
 import com.dlink.mapper.ClusterMapper;
 import com.dlink.model.Cluster;
 import com.dlink.service.ClusterService;
-import org.springframework.stereotype.Service;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.List;
 
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 /**
  * ClusterServiceImpl
  *

dlink-admin/src/main/java/com/dlink/service/impl/DataBaseServiceImpl.java

@@ -17,24 +17,29 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dlink.assertion.Asserts;
 import com.dlink.constant.CommonConstant;
 import com.dlink.db.service.impl.SuperServiceImpl;
 import com.dlink.mapper.DataBaseMapper;
 import com.dlink.metadata.driver.Driver;
-import com.dlink.model.*;
+import com.dlink.model.Column;
+import com.dlink.model.DataBase;
+import com.dlink.model.Schema;
+import com.dlink.model.SqlGeneration;
+import com.dlink.model.Table;
 import com.dlink.service.DataBaseService;
+
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 /**
  * DataBaseServiceImpl

dlink-admin/src/main/java/com/dlink/service/impl/DocumentServiceImpl.java

@@ -17,19 +17,20 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dlink.assertion.Asserts;
 import com.dlink.db.service.impl.SuperServiceImpl;
 import com.dlink.mapper.DocumentMapper;
 import com.dlink.model.Document;
 import com.dlink.service.DocumentService;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 /**
  * DocumentServiceImpl
  *

dlink-admin/src/main/java/com/dlink/service/impl/HistoryServiceImpl.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
 import com.dlink.db.service.impl.SuperServiceImpl;
@@ -25,6 +24,7 @@ import com.dlink.mapper.HistoryMapper;
 import com.dlink.model.History;
 import com.dlink.result.ResultPool;
 import com.dlink.service.HistoryService;
+
 import org.springframework.stereotype.Service;
 
 /**

dlink-admin/src/main/java/com/dlink/service/impl/JarServiceImpl.java

@@ -17,18 +17,19 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dlink.db.service.impl.SuperServiceImpl;
 import com.dlink.mapper.JarMapper;
 import com.dlink.model.Jar;
 import com.dlink.service.JarService;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 /**
  * JarServiceImpl
  *

dlink-admin/src/main/java/com/dlink/service/impl/JobHistoryServiceImpl.java

@@ -17,23 +17,23 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import com.dlink.constant.FlinkRestResultConstant;
-import org.springframework.stereotype.Service;
-
 import com.dlink.api.FlinkAPI;
 import com.dlink.assertion.Asserts;
+import com.dlink.constant.FlinkRestResultConstant;
 import com.dlink.db.service.impl.SuperServiceImpl;
 import com.dlink.mapper.JobHistoryMapper;
 import com.dlink.model.JobHistory;
 import com.dlink.service.JobHistoryService;
 import com.dlink.utils.JSONUtil;
-import com.fasterxml.jackson.databind.JsonNode;
 
 import java.util.Objects;
 
+import org.springframework.stereotype.Service;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
 /**
  * JobHistoryServiceImpl
  *
@@ -93,7 +93,7 @@ public class JobHistoryServiceImpl extends SuperServiceImpl<JobHistoryMapper, Jo
         jobHistory.setId(id);
         try {
             JsonNode jobInfo = FlinkAPI.build(jobManagerHost).getJobInfo(jobId);
-            if(jobInfo.has(FlinkRestResultConstant.ERRORS)){
+            if (jobInfo.has(FlinkRestResultConstant.ERRORS)) {
                 final JobHistory dbHistory = getById(id);
                 if (Objects.nonNull(dbHistory)) {
                     jobHistory = dbHistory;

dlink-admin/src/main/java/com/dlink/service/impl/JobInstanceServiceImpl.java

@@ -17,17 +17,8 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dlink.assertion.Asserts;
 import com.dlink.common.result.ProTableResult;
 import com.dlink.db.service.impl.SuperServiceImpl;
@@ -48,6 +39,15 @@ import com.dlink.service.HistoryService;
 import com.dlink.service.JobHistoryService;
 import com.dlink.service.JobInstanceService;
 import com.dlink.utils.JSONUtil;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -181,7 +181,6 @@ public class JobInstanceServiceImpl extends SuperServiceImpl<JobInstanceMapper,
         return jobInfoDetail;
     }
 
-
     @Override
     public LineageResult getLineage(Integer id) {
         History history = getJobInfoDetail(id).getHistory();

dlink-admin/src/main/java/com/dlink/service/impl/SavepointsServiceImpl.java

@@ -17,18 +17,19 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dlink.db.service.impl.SuperServiceImpl;
 import com.dlink.mapper.SavepointsMapper;
 import com.dlink.model.Savepoints;
 import com.dlink.service.SavepointsService;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 /**
  * SavepointsServiceImpl
  *

dlink-admin/src/main/java/com/dlink/service/impl/StatementServiceImpl.java

@@ -17,13 +17,13 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
 import com.dlink.db.service.impl.SuperServiceImpl;
 import com.dlink.mapper.StatementMapper;
 import com.dlink.model.Statement;
 import com.dlink.service.StatementService;
+
 import org.springframework.stereotype.Service;
 
 /**

dlink-admin/src/main/java/com/dlink/service/impl/StudioServiceImpl.java

@@ -17,20 +17,8 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.dlink.api.FlinkAPI;
 import com.dlink.assertion.Asserts;
 import com.dlink.config.Dialect;
@@ -74,6 +62,18 @@ import com.dlink.session.SessionInfo;
 import com.dlink.session.SessionPool;
 import com.dlink.sql.FlinkQuery;
 import com.dlink.utils.RunTimeUtil;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -443,8 +443,8 @@ public class StudioServiceImpl implements StudioService {
                 tables.addAll(driver.listTables(studioMetaStoreDTO.getDatabase()));
             }
         } else {
-            String baseStatement = FlinkQuery.useCatalog(studioMetaStoreDTO.getCatalog()) + FlinkQuery.separator() +
-                FlinkQuery.useDatabase(studioMetaStoreDTO.getDatabase()) + FlinkQuery.separator();
+            String baseStatement = FlinkQuery.useCatalog(studioMetaStoreDTO.getCatalog()) + FlinkQuery.separator()
+                + FlinkQuery.useDatabase(studioMetaStoreDTO.getDatabase()) + FlinkQuery.separator();
             // show tables
             String tableStatement = baseStatement + FlinkQuery.showTables();
             studioMetaStoreDTO.setStatement(tableStatement);
@@ -481,8 +481,8 @@ public class StudioServiceImpl implements StudioService {
         if (Dialect.isSql(studioMetaStoreDTO.getDialect())) {
             // nothing to do
         } else {
-            String baseStatement = FlinkQuery.useCatalog(studioMetaStoreDTO.getCatalog()) + FlinkQuery.separator() +
-                FlinkQuery.useDatabase(studioMetaStoreDTO.getDatabase()) + FlinkQuery.separator();
+            String baseStatement = FlinkQuery.useCatalog(studioMetaStoreDTO.getCatalog()) + FlinkQuery.separator()
+                + FlinkQuery.useDatabase(studioMetaStoreDTO.getDatabase()) + FlinkQuery.separator();
             // desc tables
             String tableStatement = baseStatement + FlinkQuery.descTable(studioMetaStoreDTO.getTable());
             studioMetaStoreDTO.setStatement(tableStatement);

dlink-admin/src/main/java/com/dlink/service/impl/SysConfigServiceImpl.java

@@ -17,25 +17,26 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dlink.assertion.Asserts;
 import com.dlink.db.service.impl.SuperServiceImpl;
 import com.dlink.mapper.SysConfigMapper;
 import com.dlink.model.SysConfig;
 import com.dlink.model.SystemConfiguration;
 import com.dlink.service.SysConfigService;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 /**
  * SysConfigServiceImpl
  *

dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java

@@ -17,15 +17,8 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.lang.tree.Tree;
-import cn.hutool.core.lang.tree.TreeNode;
-import cn.hutool.core.lang.tree.TreeUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dlink.alert.Alert;
 import com.dlink.alert.AlertConfig;
 import com.dlink.alert.AlertMsg;
@@ -98,19 +91,10 @@ import com.dlink.service.TaskService;
 import com.dlink.service.TaskVersionService;
 import com.dlink.utils.CustomStringJavaCompiler;
 import com.dlink.utils.JSONUtil;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -130,6 +114,26 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeNode;
+import cn.hutool.core.lang.tree.TreeUtil;
+
 /**
  * 任务 服务实现类
  *
@@ -243,7 +247,6 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
         }
     }
 
-
     private JobResult executeCommonSql(SqlDTO sqlDTO) {
         JobResult result = new JobResult();
         result.setStatement(sqlDTO.getStatement());
@@ -349,9 +352,9 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
         if (task.getId() != null) {
             Task taskInfo = getById(task.getId());
             Assert.check(taskInfo);
-            if (JobLifeCycle.RELEASE.equalsValue(taskInfo.getStep()) ||
-                JobLifeCycle.ONLINE.equalsValue(taskInfo.getStep()) ||
-                JobLifeCycle.CANCEL.equalsValue(taskInfo.getStep())) {
+            if (JobLifeCycle.RELEASE.equalsValue(taskInfo.getStep())
+                || JobLifeCycle.ONLINE.equalsValue(taskInfo.getStep())
+                || JobLifeCycle.CANCEL.equalsValue(taskInfo.getStep())) {
                 throw new BusException("该作业已" + JobLifeCycle.get(taskInfo.getStep()).getLabel() + "，禁止修改！");
             }
             task.setStep(JobLifeCycle.DEVELOP.getValue());
@@ -472,7 +475,6 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
         return Result.succeed("发布成功");
     }
 
-
     public Task createTaskVersionSnapshot(Task task) {
         List<TaskVersion> taskVersions = taskVersionService.getTaskVersionByTaskId(task.getId());
         List<Integer> versionIds = taskVersions.stream().map(TaskVersion::getVersionId).collect(Collectors.toList());
@@ -515,9 +517,9 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
         }
         Task taskInfo = getTaskInfoById(dto.getId());
 
-        if (JobLifeCycle.RELEASE.equalsValue(taskInfo.getStep()) ||
-            JobLifeCycle.ONLINE.equalsValue(taskInfo.getStep()) ||
-            JobLifeCycle.CANCEL.equalsValue(taskInfo.getStep())) {
+        if (JobLifeCycle.RELEASE.equalsValue(taskInfo.getStep())
+            || JobLifeCycle.ONLINE.equalsValue(taskInfo.getStep())
+            || JobLifeCycle.CANCEL.equalsValue(taskInfo.getStep())) {
             //throw new BusException("该作业已" + JobLifeCycle.get(taskInfo.getStep()).getLabel() + "，禁止回滚！");
             return Result.failed("该作业已" + JobLifeCycle.get(taskInfo.getStep()).getLabel() + "，禁止回滚！");
         }
@@ -892,9 +894,9 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
         tasksJson.append("[");
         for (final JsonNode item : para.get("taskIds")) {
             Integer id = item.asInt();
-            tasksJson.append(exportJsonByTaskId(id)+",");
+            tasksJson.append(exportJsonByTaskId(id) + ",");
         }
-        tasksJson.deleteCharAt(tasksJson.length()-1);
+        tasksJson.deleteCharAt(tasksJson.length() - 1);
         tasksJson.append("]");
         return tasksJson.toString();
     }
@@ -916,7 +918,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
     public Result buildTaskByJsonNode(JsonNode jsonNode,ObjectMapper mapper) throws JsonProcessingException {
         List<JsonNode> jsonNodes = new ArrayList<>();
         if (jsonNode.isArray()) {
-            for(JsonNode a: jsonNode){
+            for (JsonNode a: jsonNode) {
                 /*if(a.get("dialect").asText().equals("FlinkSqlEnv")){
                     jsonNodes.add(0,a);
                 }else{
@@ -929,30 +931,30 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
         }
         int errorNumber = 0;
         List<Task> tasks = new ArrayList<>();
-        for(JsonNode json : jsonNodes){
+        for (JsonNode json : jsonNodes) {
             Task task = mapper.treeToValue(json, Task.class);
-            if(Asserts.isNotNull(task.getClusterName())){
+            if (Asserts.isNotNull(task.getClusterName())) {
                 Cluster cluster = clusterService.getOne(new QueryWrapper<Cluster>().eq("name", task.getClusterName()));
-                if(Asserts.isNotNull(cluster)){
+                if (Asserts.isNotNull(cluster)) {
                     task.setClusterId(cluster.getId());
                 }
             }
-            if(Asserts.isNotNull(task.getClusterConfigurationName())){
+            if (Asserts.isNotNull(task.getClusterConfigurationName())) {
                 ClusterConfiguration clusterConfiguration = clusterConfigurationService
                         .getOne(new QueryWrapper<ClusterConfiguration>().eq("name", task.getClusterConfigurationName()));
-                if(Asserts.isNotNull(clusterConfiguration)){
+                if (Asserts.isNotNull(clusterConfiguration)) {
                     task.setClusterConfigurationId(clusterConfiguration.getId());
                 }
             }
-            if(Asserts.isNotNull(task.getDatabaseName())){
+            if (Asserts.isNotNull(task.getDatabaseName())) {
                 DataBase dataBase = dataBaseService.getOne(new QueryWrapper<DataBase>().eq("name", task.getDatabaseName()));
-                if(Asserts.isNotNull(dataBase)){
+                if (Asserts.isNotNull(dataBase)) {
                     task.setDatabaseId(dataBase.getId());
                 }
             }
-            if(Asserts.isNotNull(task.getJarName())){
+            if (Asserts.isNotNull(task.getJarName())) {
                 Jar jar = jarService.getOne(new QueryWrapper<Jar>().eq("name", task.getJarName()));
-                if(Asserts.isNotNull(jar)){
+                if (Asserts.isNotNull(jar)) {
                     task.setJarId(jar.getId());
                 }
             }
@@ -962,9 +964,9 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
                     task.setEnvId(task1.getId());
                 }
             }*/
-            if(Asserts.isNotNull(task.getAlertGroupName())){
+            if (Asserts.isNotNull(task.getAlertGroupName())) {
                 AlertGroup alertGroup = alertGroupService.getOne(new QueryWrapper<AlertGroup>().eq("name", task.getAlertGroupName()));
-                if(Asserts.isNotNull(alertGroup)){
+                if (Asserts.isNotNull(alertGroup)) {
                     task.setAlertGroupId(alertGroup.getId());
                 }
             }
@@ -972,38 +974,38 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
             String[] paths = task.getPath().split("/");
             Integer parentId = catalogueService.addDependCatalogue(paths);
             Task task1 = getOne(new QueryWrapper<Task>().eq("name", task.getName()));
-            if(Asserts.isNotNull(task1)){
+            if (Asserts.isNotNull(task1)) {
                 errorNumber++;
                 continue;
             }
             Integer step = task.getStep();
             this.saveOrUpdateTask(task);
-            if (!JobLifeCycle.CREATE.getValue().equals(step)){
+            if (!JobLifeCycle.CREATE.getValue().equals(step)) {
                 task.setStep(step);
                 updateById(task);
             }
-            if(Asserts.isNotNull(task.getEnvName())){
+            if (Asserts.isNotNull(task.getEnvName())) {
                 tasks.add(task);
             }
             Catalogue catalogue = new Catalogue(task.getAlias(),task.getId(),task.getDialect(),parentId,true);
             catalogueService.saveOrUpdate(catalogue);
         }
-        for(Task task: tasks){
+        for (Task task: tasks) {
             Task task1 = getOne(new QueryWrapper<Task>().eq("name", task.getEnvName()));
-            if(Asserts.isNotNull(task1)){
+            if (Asserts.isNotNull(task1)) {
                 task.setEnvId(task1.getId());
                 this.saveOrUpdateTask(task);
             }
         }
         if (errorNumber > 0 && errorNumber == jsonNodes.size()) {
             return Result.failed("一共" + jsonNodes.size() + "个作业,全部导入失败");
-        } else if(errorNumber > 0) {
+        } else if (errorNumber > 0) {
             return Result.failed("一共" + jsonNodes.size() + "个作业,其中成功导入" + (jsonNode.size() - errorNumber) + "个,失败" + errorNumber + "个");
         }
         return Result.succeed("成功导入" + jsonNodes.size() + "个作业");
     }
 
-    public String getStrByJsonFile(MultipartFile jsonFile){
+    public String getStrByJsonFile(MultipartFile jsonFile) {
         String jsonStr = "";
         try {
             Reader reader = new InputStreamReader(jsonFile.getInputStream(), StandardCharsets.UTF_8);
@@ -1021,17 +1023,17 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
         }
     }
 
-    public String getTaskPathByTaskId(Integer taskId){
+    public String getTaskPathByTaskId(Integer taskId) {
         StringBuilder path = new StringBuilder();
         path.append(getById(taskId).getAlias());
         Catalogue catalogue = catalogueService.getOne(new QueryWrapper<Catalogue>().eq("task_id", taskId));
-        if(Asserts.isNull(catalogue)){
+        if (Asserts.isNull(catalogue)) {
             return path.toString();
         }
         int catalogueId = catalogue.getParentId();
         do {
             catalogue = catalogueService.getById(catalogueId);
-            if(Asserts.isNull(catalogue)){
+            if (Asserts.isNull(catalogue)) {
                 return path.toString();
             }
             path.insert(0, catalogue.getName() + "/");
@@ -1040,7 +1042,6 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
         return path.toString();
     }
 
-
     private String getDuration(long jobStartTimeMills, long jobEndTimeMills) {
         Instant startTime = Instant.ofEpochMilli(jobStartTimeMills);
         Instant endTime = Instant.ofEpochMilli(jobEndTimeMills);
@@ -1053,7 +1054,6 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
         return duration;
     }
 
-
     private void handleJobDone(JobInstance jobInstance) {
         if (Asserts.isNull(jobInstance.getTaskId())) {
             return;
@@ -1082,7 +1082,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
         }
         String startTime = dateFormat.format(asLongStartTime);
         String endTime = dateFormat.format(asLongEndTime);
-//        Long duration = jsonNodes.get("duration").asLong();
+        // Long duration = jsonNodes.get("duration").asLong();
         String duration = getDuration(asLongStartTime, asLongEndTime); //获取任务的 duration 使用的是 start-time 和 end-time 计算 不采用 duration 字段
 
         String clusterJson = jobHistory.getClusterJson(); //获取任务历史信息的clusterJson 主要获取 jobManagerHost
@@ -1107,7 +1107,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
                 String exceptionUrl = "http://" + jobManagerHost + "/#/job/" + jobInstance.getJid() + "/exceptions";
 
                 for (AlertInstance alertInstance : alertGroup.getInstances()) {
-                    if (alertInstance == null){
+                    if (alertInstance == null) {
                         continue;
                     }
                     Map<String, String> map = JSONUtil.toMap(alertInstance.getParams());
@@ -1143,7 +1143,6 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
         alertHistoryService.save(alertHistory);
     }
 
-
     @Override
     public Result queryAllCatalogue() {
         final LambdaQueryWrapper<Catalogue> queryWrapper = new LambdaQueryWrapper<Catalogue>()
@@ -1206,19 +1205,18 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
         }
     }
 
-
     @Override
     public void selectSavepointOnLineTask(TaskOperatingResult taskOperatingResult) {
         final JobInstance jobInstanceByTaskId = jobInstanceService.getJobInstanceByTaskId(taskOperatingResult.getTask().getId());
-        if (jobInstanceByTaskId == null){
+        if (jobInstanceByTaskId == null) {
             startGoingLiveTask(taskOperatingResult, null);
             return;
         }
-        if (!JobStatus.isDone(jobInstanceByTaskId.getStatus())){
+        if (!JobStatus.isDone(jobInstanceByTaskId.getStatus())) {
             taskOperatingResult.setStatus(TaskOperatingStatus.TASK_STATUS_NO_DONE);
             return;
         }
-        if (taskOperatingResult.getTaskOperatingSavepointSelect().equals(TaskOperatingSavepointSelect.DEFAULT_CONFIG)){
+        if (taskOperatingResult.getTaskOperatingSavepointSelect().equals(TaskOperatingSavepointSelect.DEFAULT_CONFIG)) {
             startGoingLiveTask(taskOperatingResult, null);
             return;
         }
@@ -1233,7 +1231,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
         if (jobHistory != null && StringUtils.isNotBlank(jobHistory.getCheckpointsJson())) {
             final ObjectNode jsonNodes = JSONUtil.parseObject(jobHistory.getCheckpointsJson());
             final ArrayNode history = jsonNodes.withArray("history");
-            if (!history.isEmpty()){
+            if (!history.isEmpty()) {
                 startGoingLiveTask(taskOperatingResult, findTheConditionSavePoint(history));
                 return;
             }
@@ -1241,33 +1239,29 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
         startGoingLiveTask(taskOperatingResult, null);
     }
 
-
-
     private void startGoingLiveTask(TaskOperatingResult taskOperatingResult, String savepointPath) {
         taskOperatingResult.setStatus(TaskOperatingStatus.OPERATING);
         final Result result = reOnLineTask(taskOperatingResult.getTask().getId(), savepointPath);
         taskOperatingResult.parseResult(result);
     }
 
-
-    private String findTheConditionSavePoint(ArrayNode history){
+    private String findTheConditionSavePoint(ArrayNode history) {
         JsonNode  latestCompletedJsonNode = null;
         for (JsonNode item : history) {
-            if (!"COMPLETED".equals(item.get("status").asText())){
+            if (!"COMPLETED".equals(item.get("status").asText())) {
                 continue;
             }
-            if (latestCompletedJsonNode == null){
+            if (latestCompletedJsonNode == null) {
                 latestCompletedJsonNode = item;
                 continue;
             }
-            if (latestCompletedJsonNode.get("id").asInt() < item.get("id").asInt(-1)){
+            if (latestCompletedJsonNode.get("id").asInt() < item.get("id").asInt(-1)) {
                 latestCompletedJsonNode = item;
             }
         }
         return latestCompletedJsonNode == null ? null : latestCompletedJsonNode.get("external_path").asText();
     }
 
-
     @Override
     public void selectSavepointOffLineTask(TaskOperatingResult taskOperatingResult) {
         taskOperatingResult.setStatus(TaskOperatingStatus.OPERATING);

dlink-admin/src/main/java/com/dlink/service/impl/TaskVersionServiceImpl.java

@@ -17,18 +17,19 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.dlink.db.service.impl.SuperServiceImpl;
 import com.dlink.mapper.TaskVersionMapper;
 import com.dlink.model.TaskVersion;
 import com.dlink.service.TaskVersionService;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
 /**
  * @author huang
  */

dlink-admin/src/main/java/com/dlink/service/impl/UserServiceImpl.java

@@ -17,20 +17,22 @@
  *
  */
 
-
 package com.dlink.service.impl;
 
-import cn.dev33.satoken.secure.SaSecureUtil;
-import cn.dev33.satoken.stp.StpUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dlink.assertion.Asserts;
 import com.dlink.common.result.Result;
 import com.dlink.db.service.impl.SuperServiceImpl;
 import com.dlink.mapper.UserMapper;
 import com.dlink.model.User;
 import com.dlink.service.UserService;
+
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import cn.dev33.satoken.secure.SaSecureUtil;
+import cn.dev33.satoken.stp.StpUtil;
+
 /**
  * UserServiceImpl
  *

dlink-admin/src/main/java/com/dlink/utils/CopyrightUtil.java

@@ -19,14 +19,13 @@
 
 package com.dlink.utils;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 给指定类型文件，增加版权信息
@@ -38,24 +37,24 @@ public class CopyrightUtil {
     private static Logger log = LoggerFactory.getLogger(CopyrightUtil.class);
     public static String dir = "d:\\your-dir";
     public static String fileEndWithStr = ".less";
-	public  static String copyright = "/*\n" +
-			" *\n" +
-			" *  Licensed to the Apache Software Foundation (ASF) under one or more\n" +
-			" *  contributor license agreements.  See the NOTICE file distributed with\n" +
-			" *  this work for additional information regarding copyright ownership.\n" +
-			" *  The ASF licenses this file to You under the Apache License, Version 2.0\n" +
-			" *  (the \"License\"); you may not use this file except in compliance with\n" +
-			" *  the License.  You may obtain a copy of the License at\n" +
-			" *\n" +
-			" *     http://www.apache.org/licenses/LICENSE-2.0\n" +
-			" *\n" +
-			" *  Unless required by applicable law or agreed to in writing, software\n" +
-			" *  distributed under the License is distributed on an \"AS IS\" BASIS,\n" +
-			" *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" +
-			" *  See the License for the specific language governing permissions and\n" +
-			" *  limitations under the License.\n" +
-			" *\n" +
-			" */\n\n\n";
+    public static String copyright = "/*\n"
+            + " *\n"
+            + " *  Licensed to the Apache Software Foundation (ASF) under one or more\n"
+            + " *  contributor license agreements.  See the NOTICE file distributed with\n"
+            + " *  this work for additional information regarding copyright ownership.\n"
+            + " *  The ASF licenses this file to You under the Apache License, Version 2.0\n"
+            + " *  (the \"License\"); you may not use this file except in compliance with\n"
+            + " *  the License.  You may obtain a copy of the License at\n"
+            + " *\n"
+            + " *     http://www.apache.org/licenses/LICENSE-2.0\n"
+            + " *\n"
+            + " *  Unless required by applicable law or agreed to in writing, software\n"
+            + " *  distributed under the License is distributed on an \"AS IS\" BASIS,\n"
+            + " *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n"
+            + " *  See the License for the specific language governing permissions and\n"
+            + " *  limitations under the License.\n"
+            + " *\n"
+            + " */\n\n\n";
 
     public static void main(String[] args) throws Exception {
         //java文件所在目录
@@ -65,16 +64,16 @@ public class CopyrightUtil {
 
     public static void addCopyright4Directory(File file) throws Exception {
         File[] files = file.listFiles();
-		if (files == null || files.length == 0){
+        if (files == null || files.length == 0) {
             return;
         }
 
         for (File f : files) {
             if (f.isFile()) {
                 addCopyright4File(f);
-				System.out.println("文件===" + f.getName());
+                log.info("文件==={}", f.getName());
             } else {
-				System.out.println("目录==" + f.getName());
+                log.info("目录=={}", f.getName());
                 addCopyright4Directory(f);
             }
         }
@@ -84,7 +83,7 @@ public class CopyrightUtil {
         String fileName = file.getName();
         boolean endWith = fileName.endsWith(fileEndWithStr);
         if (!endWith) {
-			log.info("This file is not "+ fileEndWithStr +" source file,filaName=" + fileName);
+            log.info("This file is not " + fileEndWithStr + " source file,filaName=" + fileName);
             return;
         }
 
@@ -93,7 +92,7 @@ public class CopyrightUtil {
             BufferedReader br = new BufferedReader(new FileReader(file));
             String line;
             String content = "";
-			String lineSeperator ="\n";
+            String lineSeperator = "\n";
             while ((line = br.readLine()) != null) {
                 content += line + lineSeperator;
             }

dlink-admin/src/main/java/com/dlink/utils/CustomBanner.java

@@ -17,17 +17,16 @@
  *
  */
 
-
 package com.dlink.utils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.nepxion.banner.BannerConstant;
 import com.nepxion.banner.Description;
 import com.nepxion.banner.DescriptionBanner;
 import com.nepxion.banner.LogoBanner;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * CustomBanner
  *

dlink-admin/src/main/java/com/dlink/utils/TaskOneClickOperatingUtil.java

@@ -19,7 +19,6 @@
 
 package com.dlink.utils;
 
-import cn.hutool.core.exceptions.ExceptionUtil;
 import com.dlink.common.result.Result;
 import com.dlink.context.SpringContextUtils;
 import com.dlink.model.CodeEnum;
@@ -30,10 +29,8 @@ import com.dlink.model.TaskOperatingSavepointSelect;
 import com.dlink.model.TaskOperatingStatus;
 import com.dlink.result.TaskOperatingResult;
 import com.dlink.service.TaskService;
-import com.fasterxml.jackson.databind.JsonNode;
+
 import org.apache.commons.collections4.CollectionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -45,10 +42,16 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+import cn.hutool.core.exceptions.ExceptionUtil;
+
 /**
  * @author mydq
  * @version 1.0
- * @date 2022/7/16 20:26
  **/
 public class TaskOneClickOperatingUtil {
 
@@ -56,9 +59,9 @@ public class TaskOneClickOperatingUtil {
 
     private static List<TaskOperatingResult> oneClickOfflineCache = new ArrayList<>(0);
 
-    private final static AtomicBoolean oneClickOnlineThreadStatus = new AtomicBoolean(false);
+    private static final AtomicBoolean oneClickOnlineThreadStatus = new AtomicBoolean(false);
 
-    private final static AtomicBoolean oneClickOfflineThreadStatus = new AtomicBoolean(false);
+    private static final AtomicBoolean oneClickOfflineThreadStatus = new AtomicBoolean(false);
 
     public static synchronized Result oneClickOnline(List<Task> tasks, TaskOperatingSavepointSelect taskOperatingSavepointSelect) {
         if (oneClickOnlineThreadStatus.get() || oneClickOfflineThreadStatus.get()) {
@@ -118,7 +121,6 @@ public class TaskOneClickOperatingUtil {
         return result;
     }
 
-
     private static class OneClickOperatingThread extends Thread {
 
         private static final Logger LOGGER = LoggerFactory.getLogger(OneClickOperatingThread.class);
@@ -167,8 +169,6 @@ public class TaskOneClickOperatingUtil {
                     , taskOperatingResult.getTask().getId(), taskOperatingResult.getTask().getName(), e);
         }
 
-
     }
 
-
 }

dlink-admin/src/test/java/com/dlink/admin/AdminTest.java

@@ -17,12 +17,12 @@
  *
  */
 
-
 package com.dlink.admin;
 
-import cn.dev33.satoken.secure.SaSecureUtil;
 import org.junit.Test;
 
+import cn.dev33.satoken.secure.SaSecureUtil;
+
 /**
  * SqlParserTest
  *
@@ -34,7 +34,6 @@ public class AdminTest {
     @Test
     public void adminTest() {
         String admin = SaSecureUtil.md5("admin");
-        System.out.println(admin);
     }
 
 }

dlink-admin/src/test/java/com/dlink/admin/SecurityTest.java

@@ -17,29 +17,25 @@
  *
  */
 
-
 package com.dlink.admin;
 
-
 import com.dlink.security.SecurityAspect;
+
 import org.junit.Assert;
 import org.junit.Test;
 
 public class SecurityTest {
 
-
     @Test
     public void testMask() {
-        String sql = "stock_trade:='connector' = 'jdbc'," +
-                "useUnicode=yes&characterEncoding=UTF-8&useSSL=false',\\n   'username' = 'trade'," +
-                "\\n 'password' = 'c6634672b535f968b'\\n;\\ntidb_test:='connector' = 'jdbc'," +
-                "\\n'url' = 'jdbc:mysql://localhost:4000/test?useUnicode=yes&characterEncoding=UTF-8&useSSL=false'," +
-                "\\n   'username' = 'root',\\n 'password' = 'wwz@test'\\n;";
+        String sql = "stock_trade:='connector' = 'jdbc',"
+                + "useUnicode=yes&characterEncoding=UTF-8&useSSL=false',\\n   'username' = 'trade',"
+                + "\\n 'password' = 'c6634672b535f968b'\\n;\\ntidb_test:='connector' = 'jdbc',"
+                + "\\n'url' = 'jdbc:mysql://localhost:4000/test?useUnicode=yes&characterEncoding=UTF-8&useSSL=false',"
+                + "\\n   'username' = 'root',\\n 'password' = 'wwz@test'\\n;";
 
         String out = SecurityAspect.mask(sql, SecurityAspect.SENSITIVE, SecurityAspect.MASK);
 
-        // System.out.println(out);
-
         Assert.assertEquals(out.contains(SecurityAspect.MASK), true);
     }
 }