From 9e18b2e7fb793b52df36c5fd5d3e2f799823eb8d Mon Sep 17 00:00:00 2001 From: Aalron <1263998932@qq.com> Date: Sat, 22 Mar 2025 18:33:58 +0800 Subject: [PATCH 1/4] Solve the problem of error when opening the job details page and error when editing the SQL task and submitting it again --- .../src/main/assembly/script/schema/mysql-schema.sql | 2 ++ .../src/main/assembly/script/schema/pgsql-schema.sql | 2 ++ .../streampark/console/core/entity/ApplicationLog.java | 3 +++ .../impl/FlinkApplicationActionServiceImpl.java | 2 ++ .../impl/FlinkApplicationManageServiceImpl.java | 7 ++++++- .../src/main/resources/db/schema-h2.sql | 1 + 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql b/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql index 76cdecc7d7..530f236ea4 100644 --- a/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql +++ b/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql @@ -180,10 +180,12 @@ drop table if exists `t_app_log`; create table `t_app_log` ( `id` bigint not null auto_increment, `app_id` bigint default null, + `job_type` tinyint default null, `cluster_id` varchar(64) collate utf8mb4_general_ci default null, `tracking_url` varchar(255) collate utf8mb4_general_ci default null, `success` tinyint default null, `exception` text collate utf8mb4_general_ci, + `create_time` datetime default null, `option_time` datetime default null, `option_name` tinyint default null, `user_id` bigint default null, diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql b/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql index f002b8f703..08cc76d606 100644 --- a/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql +++ b/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql @@ -411,10 +411,12 @@ create sequence "public"."streampark_t_app_log_id_seq" create table "public"."t_app_log" ( "id" int8 not null default nextval('streampark_t_app_log_id_seq'::regclass), "app_id" int8, + "job_type" int2, "cluster_id" varchar(64) collate "pg_catalog"."default", "tracking_url" varchar(255) collate "pg_catalog"."default", "success" boolean, "exception" text collate "pg_catalog"."default", + "create_time" timestamp(6), "option_time" timestamp(6), "option_name" int2, "user_id" int8 diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java index fc217c2572..c35fc01ebe 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java @@ -53,6 +53,9 @@ public class ApplicationLog { /** start status */ private Boolean success; + /** create time */ + private Date createTime; + /** option name */ private Integer optionName; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java index 3c6c43b6dd..aeac878ff7 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java @@ -534,6 +534,8 @@ private ApplicationLog constructAppLog(FlinkApplication application) { applicationLog.setAppId(application.getId()); applicationLog.setOptionTime(new Date()); applicationLog.setUserId(ServiceHelper.getUserId()); + Date date = new Date(); + applicationLog.setCreateTime(date); return applicationLog; } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java index 359e64f2a0..1f12ed5605 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java @@ -724,7 +724,12 @@ public boolean checkBuildAndUpdate(FlinkApplication appParam) { .set(FlinkApplication::getRelease, ReleaseStateEnum.DONE.get()) .set(FlinkApplication::getOptionState, OptionStateEnum.NONE.getValue()); } - this.update(update); + + boolean updateResult = update.update(); + + if (!updateResult) { + return false; + } // backup if (appParam.isJobTypeFlinkSqlOrCDC()) { diff --git a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql index d857cad663..d68e6ac71b 100644 --- a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql +++ b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql @@ -168,6 +168,7 @@ create table if not exists `t_app_log` ( `tracking_url` varchar(255) default null, `success` tinyint default null, `exception` text , + `create_time` datetime default null, `option_time` datetime default null, `option_name` tinyint default null, `user_id` bigint default null comment 'operator user id', From 63c2baccb5fe0119aaf6159c108626a9a7b86996 Mon Sep 17 00:00:00 2001 From: Aalron <1263998932@qq.com> Date: Sun, 30 Mar 2025 17:19:11 +0800 Subject: [PATCH 2/4] Solve the problem of error when opening the job details page and error when editing the SQL task and submitting it again --- .../src/main/assembly/script/schema/mysql-schema.sql | 1 - .../src/main/assembly/script/schema/pgsql-schema.sql | 1 - .../src/main/assembly/script/upgrade/mysql/2.2.0.sql | 1 + .../src/main/assembly/script/upgrade/pgsql/2.2.2.sql | 3 +++ .../streampark/console/core/entity/ApplicationLog.java | 5 +---- .../service/application/impl/ApplicationLogServiceImpl.java | 2 +- .../application/impl/FlinkApplicationActionServiceImpl.java | 6 ++---- .../impl/FlinkApplicationBuildPipelineServiceImpl.java | 2 +- .../application/impl/FlinkApplicationManageServiceImpl.java | 6 +----- .../application/impl/SparkApplicationActionServiceImpl.java | 4 ++-- .../impl/SparkApplicationBuildPipelineServiceImpl.java | 2 +- .../core/service/impl/FlinkSavepointServiceImpl.java | 2 +- .../src/main/resources/db/schema-h2.sql | 1 - 13 files changed, 14 insertions(+), 22 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql b/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql index 530f236ea4..05a134f60f 100644 --- a/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql +++ b/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql @@ -186,7 +186,6 @@ create table `t_app_log` ( `success` tinyint default null, `exception` text collate utf8mb4_general_ci, `create_time` datetime default null, - `option_time` datetime default null, `option_name` tinyint default null, `user_id` bigint default null, primary key (`id`) using btree diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql b/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql index 08cc76d606..8a5a884752 100644 --- a/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql +++ b/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql @@ -417,7 +417,6 @@ create table "public"."t_app_log" ( "success" boolean, "exception" text collate "pg_catalog"."default", "create_time" timestamp(6), - "option_time" timestamp(6), "option_name" int2, "user_id" int8 ) diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.2.0.sql b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.2.0.sql index 3d7b8ac03e..755b7d7311 100644 --- a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.2.0.sql +++ b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.2.0.sql @@ -46,6 +46,7 @@ alter table t_flink_log rename to t_app_log; alter table `t_app_log` change column `yarn_app_id` `cluster_id` varchar(64) default null, change column `job_manager_url` `tracking_url` varchar(255) default null, + change column `option_time` `create_time` datetime default null, add column `job_type` tinyint default null, add column `user_id` bigint default null comment 'operator user id'; diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.2.2.sql b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.2.2.sql index b48af8148e..d97733b5af 100644 --- a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.2.2.sql +++ b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.2.2.sql @@ -36,3 +36,6 @@ ALTER TABLE "public"."t_flink_project" ALTER TABLE "public"."t_flink_project" rename column "branches" to "refs"; + +ALTER TABLE "public"."t_app_log" + rename column "option_time" to "create_time"; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java index c35fc01ebe..fc051c6f31 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java @@ -53,14 +53,11 @@ public class ApplicationLog { /** start status */ private Boolean success; - /** create time */ - private Date createTime; - /** option name */ private Integer optionName; /** option time */ - private Date optionTime; + private Date createTime; /** exception at the start */ private String exception; /** The user who operates the application */ diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationLogServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationLogServiceImpl.java index 3034f87f02..d63079f77f 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationLogServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationLogServiceImpl.java @@ -43,7 +43,7 @@ public IPage getPage(ApplicationLog applicationLog, RestRequest Page page = MybatisPager.getPage(request); return this.lambdaQuery() .eq(ApplicationLog::getAppId, applicationLog.getAppId()) - .orderByDesc(ApplicationLog::getOptionTime).page(page); + .page(page); } @Override diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java index aeac878ff7..e40c75e2ef 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java @@ -279,7 +279,7 @@ public void cancel(FlinkApplication appParam) throws Exception { applicationLog.setOptionName(OperationEnum.CANCEL.getValue()); applicationLog.setAppId(application.getId()); applicationLog.setTrackingUrl(application.getJobManagerUrl()); - applicationLog.setOptionTime(new Date()); + applicationLog.setCreateTime(new Date()); applicationLog.setClusterId(application.getClusterId()); applicationLog.setUserId(ServiceHelper.getUserId()); @@ -532,10 +532,8 @@ private ApplicationLog constructAppLog(FlinkApplication application) { applicationLog.setJobType(EngineTypeEnum.FLINK.getCode()); applicationLog.setOptionName(OperationEnum.START.getValue()); applicationLog.setAppId(application.getId()); - applicationLog.setOptionTime(new Date()); + applicationLog.setCreateTime(new Date()); applicationLog.setUserId(ServiceHelper.getUserId()); - Date date = new Date(); - applicationLog.setCreateTime(date); return applicationLog; } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java index 066aea6364..4fd369c51d 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java @@ -416,7 +416,7 @@ private ApplicationLog getApplicationLog(FlinkApplication app) { ApplicationLog applicationLog = new ApplicationLog(); applicationLog.setOptionName(RELEASE.getValue()); applicationLog.setAppId(app.getId()); - applicationLog.setOptionTime(new Date()); + applicationLog.setCreateTime(new Date()); applicationLog.setUserId(ServiceHelper.getUserId()); return applicationLog; } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java index 1f12ed5605..2c3129fbea 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java @@ -725,11 +725,7 @@ public boolean checkBuildAndUpdate(FlinkApplication appParam) { .set(FlinkApplication::getOptionState, OptionStateEnum.NONE.getValue()); } - boolean updateResult = update.update(); - - if (!updateResult) { - return false; - } + update.update(); // backup if (appParam.isJobTypeFlinkSqlOrCDC()) { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationActionServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationActionServiceImpl.java index 4c5114abd3..f116f94377 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationActionServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationActionServiceImpl.java @@ -217,7 +217,7 @@ public void cancel(SparkApplication appParam) throws Exception { applicationLog.setJobType(EngineTypeEnum.SPARK.getCode()); applicationLog.setOptionName(SparkOperationEnum.CANCEL.getValue()); applicationLog.setAppId(application.getId()); - applicationLog.setOptionTime(new Date()); + applicationLog.setCreateTime(new Date()); applicationLog.setClusterId(application.getClusterId()); applicationLog.setUserId(ServiceHelper.getUserId()); application.setOptionTime(new Date()); @@ -310,7 +310,7 @@ public void start(SparkApplication appParam, boolean auto) throws Exception { applicationLog.setJobType(EngineTypeEnum.SPARK.getCode()); applicationLog.setOptionName(SparkOperationEnum.START.getValue()); applicationLog.setAppId(application.getId()); - applicationLog.setOptionTime(new Date()); + applicationLog.setCreateTime(new Date()); applicationLog.setUserId(ServiceHelper.getUserId()); // set the latest to Effective, (it will only become the current effective at this time) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBuildPipelineServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBuildPipelineServiceImpl.java index 7764d08cba..2a690908ab 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBuildPipelineServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBuildPipelineServiceImpl.java @@ -157,7 +157,7 @@ public boolean buildApplication(@Nonnull Long appId, boolean forceBuild) { applicationLog.setJobType(EngineTypeEnum.SPARK.getCode()); applicationLog.setOptionName(RELEASE.getValue()); applicationLog.setAppId(app.getId()); - applicationLog.setOptionTime(new Date()); + applicationLog.setCreateTime(new Date()); applicationLog.setUserId(ServiceHelper.getUserId()); // check if you need to go through the build process (if the jar and pom have changed, diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java index 277f9dc87c..523d862f4c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java @@ -191,7 +191,7 @@ private ApplicationLog getApplicationLog(FlinkApplication application) { applicationLog.setOptionName(OperationEnum.SAVEPOINT.getValue()); applicationLog.setAppId(application.getId()); applicationLog.setTrackingUrl(application.getJobManagerUrl()); - applicationLog.setOptionTime(new Date()); + applicationLog.setCreateTime(new Date()); applicationLog.setClusterId(application.getClusterId()); applicationLog.setUserId(ServiceHelper.getUserId()); return applicationLog; diff --git a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql index d68e6ac71b..b415785b20 100644 --- a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql +++ b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql @@ -169,7 +169,6 @@ create table if not exists `t_app_log` ( `success` tinyint default null, `exception` text , `create_time` datetime default null, - `option_time` datetime default null, `option_name` tinyint default null, `user_id` bigint default null comment 'operator user id', primary key(`id`) From 5cc7e5c82723cb5d677ab8db05f4d090a6566da2 Mon Sep 17 00:00:00 2001 From: Aalron <1263998932@qq.com> Date: Mon, 31 Mar 2025 16:53:39 +0800 Subject: [PATCH 3/4] Fix when the task is running, the web UI button is gray and cannot be clicked --- .../FlinkApplicationManageServiceImpl.java | 1 + .../SparkApplicationManageServiceImpl.java | 33 ++++++++++--------- .../src/api/flink/app.type.ts | 1 + .../src/api/spark/app.type.ts | 1 + 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java index 2c3129fbea..18036f198a 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java @@ -782,6 +782,7 @@ public FlinkApplication getApp(Long id) { setAppDurationIfNeeded(application, now); } + application.setAppControl(getAppControl(application)); application.setYarnQueueByHotParams(); return application; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationManageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationManageServiceImpl.java index e2e00b4220..84be85eb12 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationManageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationManageServiceImpl.java @@ -228,20 +228,7 @@ record -> { if (pipeStates.containsKey(record.getId())) { record.setBuildStatus(pipeStates.get(record.getId()).getCode()); } - - AppControl appControl = new AppControl() - .setAllowBuild( - record.getBuildStatus() == null - || !PipelineStatusEnum.running - .getCode() - .equals(record.getBuildStatus())) - .setAllowStart( - !record.shouldTracking() - && PipelineStatusEnum.success - .getCode() - .equals(record.getBuildStatus())) - .setAllowStop(record.isRunning()) - .setAllowView(record.shouldTracking()); + AppControl appControl = getAppControl(record); record.setAppControl(appControl); }) .collect(Collectors.toList()); @@ -249,6 +236,22 @@ record -> { return page; } + private AppControl getAppControl(SparkApplication record){ + return new AppControl() + .setAllowBuild( + record.getBuildStatus() == null + || !PipelineStatusEnum.running + .getCode() + .equals(record.getBuildStatus())) + .setAllowStart( + !record.shouldTracking() + && PipelineStatusEnum.success + .getCode() + .equals(record.getBuildStatus())) + .setAllowStop(record.isRunning()) + .setAllowView(record.shouldTracking()); + } + @Override public void changeOwnership(Long userId, Long targetUserId) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper() @@ -645,7 +648,7 @@ public SparkApplication getApp(Long id) { application.setConfPath(path); } } - + application.setAppControl(getAppControl(application)); application.resolveYarnQueue(); return application; diff --git a/streampark-console/streampark-console-webapp/src/api/flink/app.type.ts b/streampark-console/streampark-console-webapp/src/api/flink/app.type.ts index df6d96132c..65d6b1374b 100644 --- a/streampark-console/streampark-console-webapp/src/api/flink/app.type.ts +++ b/streampark-console/streampark-console-webapp/src/api/flink/app.type.ts @@ -145,6 +145,7 @@ interface AppControl { allowStart: boolean; allowStop: boolean; allowBuild: boolean; + allowView: boolean; } /* cancel params */ export interface CancelParam { diff --git a/streampark-console/streampark-console-webapp/src/api/spark/app.type.ts b/streampark-console/streampark-console-webapp/src/api/spark/app.type.ts index 41704111b6..809a30e7cb 100644 --- a/streampark-console/streampark-console-webapp/src/api/spark/app.type.ts +++ b/streampark-console/streampark-console-webapp/src/api/spark/app.type.ts @@ -112,6 +112,7 @@ interface AppControl { allowStart: boolean; allowStop: boolean; allowBuild: boolean; + allowView: boolean; } // create Params From 1c47e6e7f5cc7dc61691f84598f8b6a18ebf2df9 Mon Sep 17 00:00:00 2001 From: Aalron <1263998932@qq.com> Date: Mon, 31 Mar 2025 17:10:59 +0800 Subject: [PATCH 4/4] Fix when the task is running, the web UI button is gray and cannot be clicked --- .../impl/SparkApplicationManageServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationManageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationManageServiceImpl.java index 84be85eb12..86a9f9c2c6 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationManageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationManageServiceImpl.java @@ -236,18 +236,18 @@ record -> { return page; } - private AppControl getAppControl(SparkApplication record){ + private AppControl getAppControl(SparkApplication record) { return new AppControl() .setAllowBuild( record.getBuildStatus() == null || !PipelineStatusEnum.running - .getCode() - .equals(record.getBuildStatus())) + .getCode() + .equals(record.getBuildStatus())) .setAllowStart( !record.shouldTracking() && PipelineStatusEnum.success - .getCode() - .equals(record.getBuildStatus())) + .getCode() + .equals(record.getBuildStatus())) .setAllowStop(record.isRunning()) .setAllowView(record.shouldTracking()); }