Skip to content

D
dlink
Unverified Commit 2d481f48 authored by Kerwin's avatar Kerwin Committed by GitHub
Browse files
Options

Added dlink-admin module code style (#889)

parent d10005ba
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 833 additions and 712 deletions
dlink-admin/src/main/java/com/dlink/Dlink.java
View file @ 2d481f48
......@@ -17,7 +17,6 @@
*
*/
package com.dlink;
import org.springframework.boot.SpringApplication;
......
dlink-admin/src/main/java/com/dlink/assertion/Assert.java
View file @ 2d481f48
......@@ -17,7 +17,6 @@
*
*/
package com.dlink.assertion;
import com.dlink.exception.BusException;
......
dlink-admin/src/main/java/com/dlink/assertion/Tips.java
View file @ 2d481f48
......@@ -17,7 +17,6 @@
*
*/
package com.dlink.assertion;
/**
......
dlink-admin/src/main/java/com/dlink/common/banner/BannerInitializer.java
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -17,7 +17,6 @@
*
*/
package com.dlink.context;
import org.springframework.beans.BeansException;
......
dlink-admin/src/main/java/com/dlink/controller/APIController.java
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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,11 +166,10 @@ public class TaskController {
return taskService.releaseTask(id);
}
@PostMapping("/rollbackTask")
public Result rollbackTask(@RequestBody TaskRollbackVersionDTO dto) throws Exception {
return taskService.rollbackTask(dto);
return taskService.rollbackTask(dto);
}
/**
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -17,7 +17,6 @@
*
*/
package com.dlink.db.annotation;
/**
......
dlink-admin/src/main/java/com/dlink/db/config/MybatisPlusConfigure.java
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -17,7 +17,6 @@
*
*/
package com.dlink.dto;
import lombok.Getter;
......
dlink-admin/src/main/java/com/dlink/dto/ModifyPasswordDTO.java
View file @ 2d481f48
......@@ -17,7 +17,6 @@
*
*/
package com.dlink.dto;
import lombok.Getter;
......
dlink-admin/src/main/java/com/dlink/dto/SessionDTO.java
View file @ 2d481f48
......@@ -17,7 +17,6 @@
*
*/
package com.dlink.dto;
import lombok.Getter;
......
dlink-admin/src/main/java/com/dlink/dto/SqlDTO.java
View file @ 2d481f48
......@@ -17,7 +17,6 @@
*
*/
package com.dlink.dto;
import lombok.Getter;
......
dlink-admin/src/main/java/com/dlink/dto/StudioCADTO.java
View file @ 2d481f48
......@@ -17,7 +17,6 @@
*
*/
package com.dlink.dto;
import lombok.Getter;
......
dlink-admin/src/main/java/com/dlink/dto/StudioDDLDTO.java
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -17,7 +17,6 @@
*
*/
package com.dlink.dto;
import com.dlink.gateway.GatewayType;
......
dlink-admin/src/main/java/com/dlink/dto/TaskRollbackVersionDTO.java
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -17,7 +17,6 @@
*
*/
package com.dlink.exception;
/**
......
dlink-admin/src/main/java/com/dlink/exception/WebExceptionHandler.java
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -17,7 +17,6 @@
*
*/
package com.dlink.model;
/**
......
dlink-admin/src/main/java/com/dlink/model/DataBase.java
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -17,7 +17,6 @@
*
*/
package com.dlink.model;
/**
......
dlink-admin/src/main/java/com/dlink/model/JobInstanceStatus.java
View file @ 2d481f48
......@@ -17,7 +17,6 @@
*
*/
package com.dlink.model;
/**
......
dlink-admin/src/main/java/com/dlink/model/JobManagerConfiguration.java
View file @ 2d481f48
......@@ -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
View file @ 2d481f48
......@@ -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
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment