From df36657d0c013da4b3c37dfb63f67983e4daac03 Mon Sep 17 00:00:00 2001 From: lanyuanxiaoyao Date: Wed, 3 Jan 2024 18:39:28 +0800 Subject: [PATCH] =?UTF-8?q?feat(web):=20=E4=BF=AE=E5=A4=8D=E5=8D=95?= =?UTF-8?q?=E8=A1=A8=E5=8E=8B=E7=BC=A9=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/web/controller/ScheduleController.java | 11 +++++++++-- .../src/main/resources/static/components/tool-tab.js | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/ScheduleController.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/ScheduleController.java index 61e20a1..aef261d 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/ScheduleController.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/ScheduleController.java @@ -1,6 +1,7 @@ package com.lanyuanxiaoyao.service.web.controller; import cn.hutool.core.util.ReUtil; +import cn.hutool.core.util.StrUtil; import com.lanyuanxiaoyao.service.configuration.entity.info.JobIdAndAlias; import com.lanyuanxiaoyao.service.configuration.exception.TableNotFoundException; import com.lanyuanxiaoyao.service.forest.service.InfoService; @@ -57,8 +58,14 @@ public class ScheduleController extends BaseController { @RequestParam(value = "force", required = false) String forceCluster, @RequestParam(value = "recommend", required = false) String recommendCluster ) throws TableNotFoundException { - // checkTableExists(infoService, flinkJobId, alias); - // scheduleService.scheduleTable(flinkJobId, alias); + checkTableExists(infoService, flinkJobId, alias); + if (StrUtil.isNotBlank(forceCluster)) { + scheduleService.scheduleTableForce(flinkJobId, alias, forceCluster); + } else if (StrUtil.isNotBlank(recommendCluster)) { + scheduleService.scheduleTableRecommend(flinkJobId, alias, recommendCluster); + } else { + scheduleService.scheduleTable(flinkJobId, alias); + } return AmisResponse.responseSuccess(); } } diff --git a/service-web/src/main/resources/static/components/tool-tab.js b/service-web/src/main/resources/static/components/tool-tab.js index 0a7b334..ede3325 100644 --- a/service-web/src/main/resources/static/components/tool-tab.js +++ b/service-web/src/main/resources/static/components/tool-tab.js @@ -170,6 +170,7 @@ function toolTab() { selectFirst: true, options: [ {label: '无', value: 'undefined'}, + {label: 'b12', value: 'b12'}, {label: 'b1', value: 'b1'}, {label: 'b5', value: 'b5'}, {label: 'a4', value: 'a4'}, @@ -182,6 +183,7 @@ function toolTab() { selectFirst: true, options: [ {label: '无', value: 'undefined'}, + {label: 'b12', value: 'b12'}, {label: 'b1', value: 'b1'}, {label: 'b5', value: 'b5'}, {label: 'a4', value: 'a4'},