diff --git a/flink-platform-ui/frontend b/flink-platform-ui/frontend index a77e2df2..2d819a09 160000 --- a/flink-platform-ui/frontend +++ b/flink-platform-ui/frontend @@ -1 +1 @@ -Subproject commit a77e2df2e8ee7f95f216e92e63f3b095d1edfdbe +Subproject commit 2d819a092322c5596e264bb9e462a2d96adea7de diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/AlertController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/AlertController.java index ba4048aa..8910b99e 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/AlertController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/AlertController.java @@ -9,6 +9,7 @@ import com.flink.platform.dao.service.AlertService; import com.flink.platform.web.entity.request.AlertInfoRequest; import com.flink.platform.web.entity.response.ResultInfo; +import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -30,10 +31,10 @@ /** Alert controller. */ @RestController @RequestMapping("/alert") +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class AlertController { - @Autowired - private AlertService alertService; + private final AlertService alertService; @PostMapping(value = "/create") public ResultInfo create( diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/AttrsController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/AttrsController.java index 00ec16ef..db823294 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/AttrsController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/AttrsController.java @@ -5,12 +5,12 @@ import com.flink.platform.common.enums.ExecutionStatus; import com.flink.platform.common.enums.JobType; import com.flink.platform.dao.entity.task.DependentJob; -import com.flink.platform.dao.service.JobInfoService; -import com.flink.platform.dao.service.WorkerService; import com.flink.platform.web.config.FlinkConfig; import com.flink.platform.web.entity.response.ResultInfo; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -36,23 +36,17 @@ import static com.flink.platform.common.enums.ExecutionStatus.FAILURE; import static com.flink.platform.common.enums.ExecutionStatus.SUCCESS; import static com.flink.platform.web.entity.response.ResultInfo.success; -import static java.util.stream.Collectors.toList; /** Attrs controller. */ +@Slf4j @RestController @RequestMapping("/attr") +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class AttrsController { private static final String CLASS_PATH_PREFIX = "com.flink.platform.common.enums"; - @Autowired - private JobInfoService jobInfoService; - - @Autowired - private WorkerService workerService; - - @Autowired - private List flinkConfigs; + private final List flinkConfigs; @GetMapping(value = "/preconditions") public ResultInfo> precondition() { @@ -74,7 +68,7 @@ public ResultInfo> versions(String type) { versions.addAll(flinkConfigs.stream() .map(FlinkConfig::getVersion) .filter(Objects::nonNull) - .collect(toList())); + .toList()); } else { versions.add(FULL_VERSION); } @@ -109,7 +103,7 @@ public ResultInfo> edgeStates(Long jobId) { return success(Arrays.asList(SUCCESS, FAILURE)); } - @GetMapping(value = "/list") + @GetMapping(value = "/enums") public ResultInfo>> list( @RequestParam(name = "className", required = false) String className) { List> enums = Lists.newArrayList(); @@ -126,7 +120,7 @@ public ResultInfo>> list( enums.add(map); } } catch (Exception e) { - e.printStackTrace(); + log.error("Get enum list error", e); } return success(enums); } diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/CatalogInfoController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/CatalogInfoController.java index 9468d5c4..e7ca9857 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/CatalogInfoController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/CatalogInfoController.java @@ -10,6 +10,7 @@ import com.flink.platform.dao.service.CatalogInfoService; import com.flink.platform.web.entity.request.CatalogInfoRequest; import com.flink.platform.web.entity.response.ResultInfo; +import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -32,10 +33,10 @@ /** Catalog info controller. */ @RestController @RequestMapping("/catalog") +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class CatalogInfoController { - @Autowired - private CatalogInfoService catalogService; + private final CatalogInfoService catalogService; @PostMapping(value = "/create") public ResultInfo create( diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/DashboardController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/DashboardController.java index 53f91966..5554050f 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/DashboardController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/DashboardController.java @@ -8,6 +8,7 @@ import com.flink.platform.dao.service.JobFlowRunService; import com.flink.platform.dao.service.JobRunInfoService; import com.flink.platform.web.entity.response.ResultInfo; +import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; @@ -27,13 +28,12 @@ /** Dashboard statistics. */ @RestController @RequestMapping("/dashboard") +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class DashboardController { - @Autowired - private JobFlowRunService jobFlowRunService; + private final JobFlowRunService jobFlowRunService; - @Autowired - private JobRunInfoService jobRunService; + private final JobRunInfoService jobRunService; @GetMapping(value = "/jobRunStatusCount") public ResultInfo>> jobRunStatusCount( diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/DatasourceController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/DatasourceController.java index dbeecb05..1614123a 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/DatasourceController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/DatasourceController.java @@ -11,6 +11,7 @@ import com.flink.platform.dao.service.DatasourceService; import com.flink.platform.web.entity.request.DatasourceRequest; import com.flink.platform.web.entity.response.ResultInfo; +import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -32,10 +33,10 @@ /** datasource controller. */ @RestController @RequestMapping("/datasource") +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class DatasourceController { - @Autowired - private DatasourceService datasourceService; + private final DatasourceService datasourceService; @PostMapping(value = "/create") public ResultInfo create( diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/GrafanaWebHookController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/GrafanaWebHookController.java index d01f66bb..989d79a7 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/GrafanaWebHookController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/GrafanaWebHookController.java @@ -4,6 +4,7 @@ import com.flink.platform.common.util.JsonUtil; import com.flink.platform.dao.entity.alert.FeiShuAlert; import com.flink.platform.web.entity.response.ResultInfo; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -19,10 +20,10 @@ @Slf4j @RestController @RequestMapping("/webhook") +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class GrafanaWebHookController { - @Autowired - private AlertSender alertSender; + private final AlertSender alertSender; @PostMapping(value = "/forwardToFeiShu") public ResultInfo forwardToFeiShu(@RequestBody Map grafanaMap) { diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobFlowController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobFlowController.java index 651e6586..543f896a 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobFlowController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobFlowController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.flink.platform.common.constants.Constant; import com.flink.platform.common.enums.JobFlowStatus; +import com.flink.platform.common.enums.JobFlowType; import com.flink.platform.common.util.UuidGenerator; import com.flink.platform.dao.entity.ExecutionConfig; import com.flink.platform.dao.entity.JobFlow; @@ -163,7 +164,9 @@ public ResultInfo> page( @RequestAttribute(value = Constant.SESSION_USER) User loginUser, @RequestParam(name = "page", required = false, defaultValue = "1") Integer page, @RequestParam(name = "size", required = false, defaultValue = "20") Integer size, + @RequestParam(name = "id", required = false) Long id, @RequestParam(name = "name", required = false) String name, + @RequestParam(name = "type", required = false) JobFlowType type, @RequestParam(name = "status", required = false) JobFlowStatus status, @RequestParam(name = "tag", required = false) String tagCode, @RequestParam(name = "sort", required = false) String sort) { @@ -173,6 +176,8 @@ public ResultInfo> page( .lambda() .select(JobFlow.class, field -> !"flow".equals(field.getProperty())) .eq(JobFlow::getUserId, loginUser.getId()) + .eq(id != null, JobFlow::getId, id) + .eq(type != null, JobFlow::getType, type) .like(isNotEmpty(name), JobFlow::getName, name) .like(isNotEmpty(tagCode), JobFlow::getTags, tagCode); diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobInfoController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobInfoController.java index b0ad3ae0..74b89d2c 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobInfoController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobInfoController.java @@ -19,6 +19,7 @@ import com.flink.platform.web.entity.request.JobInfoRequest; import com.flink.platform.web.entity.response.ResultInfo; import com.flink.platform.web.service.QuartzService; +import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -58,19 +59,16 @@ /** manage job info. */ @RestController @RequestMapping("/jobInfo") +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class JobInfoController { - @Autowired - private JobInfoService jobInfoService; + private final JobInfoService jobInfoService; - @Autowired - private JobRunInfoService jobRunService; + private final JobRunInfoService jobRunService; - @Autowired - private JobFlowService jobFlowService; + private final JobFlowService jobFlowService; - @Autowired - private QuartzService quartzService; + private final QuartzService quartzService; @PostMapping(value = "/create") public ResultInfo create( diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobParamController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobParamController.java index a1802604..e4835cd7 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobParamController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobParamController.java @@ -12,6 +12,7 @@ import com.flink.platform.dao.service.JobParamService; import com.flink.platform.web.entity.request.JobParamRequest; import com.flink.platform.web.entity.response.ResultInfo; +import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -38,13 +39,12 @@ /** Alert controller. */ @RestController @RequestMapping("/jobParam") +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class JobParamController { - @Autowired - private JobParamService jobParamService; + private final JobParamService jobParamService; - @Autowired - private JobInfoService jobService; + private final JobInfoService jobService; @PostMapping(value = "/create") public ResultInfo create( diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobRunController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobRunController.java index 3b7765da..85ea4197 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobRunController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/JobRunController.java @@ -14,6 +14,7 @@ import com.flink.platform.web.entity.request.JobRunRequest; import com.flink.platform.web.entity.response.ResultInfo; import com.flink.platform.web.service.KillJobService; +import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; @@ -43,16 +44,14 @@ /** Job run info controller. */ @RestController @RequestMapping("/jobRun") +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class JobRunController { - @Autowired - private JobRunInfoService jobRunInfoService; + private final JobRunInfoService jobRunInfoService; - @Autowired - private JobInfoService jobInfoService; + private final JobInfoService jobInfoService; - @Autowired - private KillJobService killJobService; + private final KillJobService killJobService; @GetMapping(value = "/get/{runId}") public ResultInfo get(@PathVariable Long runId) { diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/LoginController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/LoginController.java index 08c83e74..2757ced0 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/LoginController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/LoginController.java @@ -10,6 +10,7 @@ import com.flink.platform.web.entity.response.ResultInfo; import com.flink.platform.web.util.HttpUtil; import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -29,13 +30,12 @@ /** user controller. */ @RestController @RequestMapping +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class LoginController { - @Autowired - private UserService userService; + private final UserService userService; - @Autowired - private SessionService sessionService; + private final SessionService sessionService; @PostMapping(value = "/login") public ResultInfo> login(@RequestBody User user, HttpServletRequest request) { diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/ReactiveController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/ReactiveController.java index 1cf7d169..b2847abf 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/ReactiveController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/ReactiveController.java @@ -14,6 +14,7 @@ import com.flink.platform.web.service.ReactiveService; import com.flink.platform.web.service.WorkerApplyService; import com.flink.platform.web.util.HttpUtil; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -48,19 +49,16 @@ @Slf4j @RestController @RequestMapping("/reactive") +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class ReactiveController { - @Autowired - private ReactiveService reactiveService; + private final ReactiveService reactiveService; - @Autowired - private DatasourceService datasourceService; + private final DatasourceService datasourceService; - @Autowired - private WorkerApplyService workerApplyService; + private final WorkerApplyService workerApplyService; - @Autowired - private RestTemplate restTemplate; + private final RestTemplate restTemplate; @GetMapping(value = "/jobToDbTypes") public ResultInfo> jobToDbTypes() { diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/ResourceController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/ResourceController.java index e6d2eb7f..3265897c 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/ResourceController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/ResourceController.java @@ -14,6 +14,7 @@ import com.flink.platform.web.service.ResourceManageService; import com.flink.platform.web.service.StorageService; import com.flink.platform.web.util.ResourceUtil; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.fs.Path; @@ -45,16 +46,14 @@ @Slf4j @RestController @RequestMapping("/resource") +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class ResourceController { - @Autowired - private ResourceManageService resourceManageService; + private final ResourceManageService resourceManageService; - @Autowired - private ResourceService resourceService; + private final ResourceService resourceService; - @Autowired - private StorageService storageService; + private final StorageService storageService; @PostMapping(value = "/create") public ResultInfo create( diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/TagInfoController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/TagInfoController.java index bdaefada..9af74f89 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/TagInfoController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/TagInfoController.java @@ -14,6 +14,7 @@ import com.flink.platform.web.config.annotation.ApiException; import com.flink.platform.web.entity.request.TagInfoRequest; import com.flink.platform.web.entity.response.ResultInfo; +import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -37,13 +38,12 @@ /** Job flow tag controller. */ @RestController @RequestMapping("/tag") +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class TagInfoController { - @Autowired - private TagInfoService tagInfoService; + private final TagInfoService tagInfoService; - @Autowired - private JobFlowService jobFlowService; + private final JobFlowService jobFlowService; @ApiException @PostMapping(value = "/create") diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/UserController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/UserController.java index 917a7b3b..fc0ec71b 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/UserController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/UserController.java @@ -8,11 +8,11 @@ import com.flink.platform.dao.entity.LongArrayList; import com.flink.platform.dao.entity.User; import com.flink.platform.dao.entity.Worker; -import com.flink.platform.dao.service.SessionService; import com.flink.platform.dao.service.UserService; import com.flink.platform.dao.service.WorkerService; import com.flink.platform.web.entity.request.UserRequest; import com.flink.platform.web.entity.response.ResultInfo; +import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -42,16 +42,12 @@ /** user controller. */ @RestController @RequestMapping("/user") +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class UserController { - @Autowired - private UserService userService; + private final UserService userService; - @Autowired - private SessionService sessionService; - - @Autowired - private WorkerService workerService; + private final WorkerService workerService; @GetMapping(value = "/get/{userId}") public ResultInfo get(@PathVariable Long userId) { diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/WorkerController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/WorkerController.java index 53a19eea..a37a7050 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/WorkerController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/WorkerController.java @@ -11,6 +11,7 @@ import com.flink.platform.dao.service.WorkerService; import com.flink.platform.web.entity.request.WorkerRequest; import com.flink.platform.web.entity.response.ResultInfo; +import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -35,10 +36,10 @@ /** Worker controller. */ @RestController @RequestMapping("/worker") +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class WorkerController { - @Autowired - private WorkerService workerService; + private final WorkerService workerService; @GetMapping(value = "/get/{workerId}") public ResultInfo get(@PathVariable Long workerId) { diff --git a/flink-platform-web/src/main/java/com/flink/platform/web/controller/extension/FlinkJobController.java b/flink-platform-web/src/main/java/com/flink/platform/web/controller/extension/FlinkJobController.java index 8ffa348f..3a927732 100644 --- a/flink-platform-web/src/main/java/com/flink/platform/web/controller/extension/FlinkJobController.java +++ b/flink-platform-web/src/main/java/com/flink/platform/web/controller/extension/FlinkJobController.java @@ -8,6 +8,7 @@ import com.flink.platform.grpc.SavepointRequest; import com.flink.platform.web.entity.response.ResultInfo; import com.flink.platform.web.grpc.JobGrpcClient; +import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -27,13 +28,12 @@ */ @RestController @RequestMapping("/flink") +@RequiredArgsConstructor(onConstructor_ = @Autowired) public class FlinkJobController { - @Autowired - private JobRunInfoService jobRunService; + private final JobRunInfoService jobRunService; - @Autowired - private JobGrpcClient jobGrpcClient; + private final JobGrpcClient jobGrpcClient; @GetMapping(value = "/savepoint/{jobRunId}") public ResultInfo savepoint(@PathVariable Long jobRunId) {