From 190982ec535101dc84e3d7b4ce51ca8ff2bddeaa Mon Sep 17 00:00:00 2001 From: lanyuanxiaoyao Date: Tue, 23 May 2023 17:43:24 +0800 Subject: [PATCH] =?UTF-8?q?refactor(web):=20=E8=B7=9F=E9=9A=8F=E4=B8=8A?= =?UTF-8?q?=E6=B8=B8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/RunningController.java | 34 ++++++++----------- .../web/controller/TableController.java | 4 +-- .../service/web/entity/ZookeeperNodeVO.java | 2 +- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/RunningController.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/RunningController.java index 1f53fd1..178dd96 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/RunningController.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/RunningController.java @@ -5,6 +5,7 @@ import com.eshore.odcp.hudi.connector.utils.NameHelper; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.lanyuanxiaoyao.service.configuration.entity.AmisResponse; +import com.lanyuanxiaoyao.service.configuration.entity.zookeeper.ZookeeperNode; import com.lanyuanxiaoyao.service.forest.service.ZookeeperService; import com.lanyuanxiaoyao.service.web.entity.ZookeeperNodeVO; import org.slf4j.Logger; @@ -43,16 +44,7 @@ public class RunningController extends BaseController { return responseCrudData( zookeeperService.getChildren(NameHelper.ZK_SYNC_RUNNING_LOCK_PATH) .asParallel(EXECUTOR, 1) - .collect(node -> { - RunMeta.SyncRunMeta meta = null; - try { - String data = zookeeperService.getData(node.getPath()); - meta = mapper.readValue(data, RunMeta.SyncRunMeta.class); - } catch (JsonProcessingException e) { - logger.warn("Json parse failure for" + node.getPath(), e); - } - return new ZookeeperNodeVO(node, meta); - }) + .collect(this::parseRunMeta) .toSortedListBy(ZookeeperNodeVO::getCreateTime) .toReversed() .toImmutable() @@ -64,19 +56,21 @@ public class RunningController extends BaseController { return responseCrudData( zookeeperService.getChildren(NameHelper.ZK_COMPACTION_RUNNING_LOCK_PATH) .asParallel(EXECUTOR, 1) - .collect(node -> { - RunMeta.CompactionRunMeta meta = null; - try { - String data = zookeeperService.getData(node.getPath()); - meta = mapper.readValue(data, RunMeta.CompactionRunMeta.class); - } catch (JsonProcessingException e) { - logger.warn("Json parse failure for" + node.getPath(), e); - } - return new ZookeeperNodeVO(node, meta); - }) + .collect(this::parseRunMeta) .toSortedListBy(ZookeeperNodeVO::getCreateTime) .toReversed() .toImmutable() ); } + + private ZookeeperNodeVO parseRunMeta(ZookeeperNode node) { + RunMeta meta = null; + try { + String data = zookeeperService.getData(node.getPath()); + meta = mapper.readValue(data, RunMeta.class); + } catch (JsonProcessingException e) { + logger.warn("Json parse failure for" + node.getPath(), e); + } + return new ZookeeperNodeVO(node, meta); + } } diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/TableController.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/TableController.java index 88bec54..cd50f1e 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/TableController.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/TableController.java @@ -93,11 +93,11 @@ public class TableController extends BaseController { CompletableFuture tableMetaFuture = CompletableFuture.supplyAsync(() -> infoService.tableMetaDetail(item.getId(), item.getAlias()), EXECUTOR); CompletableFuture syncStateFuture = CompletableFuture.supplyAsync(() -> infoService.syncStateDetail(item.getId(), item.getAlias()), EXECUTOR); CompletableFuture syncRuntime = CompletableFuture - .supplyAsync(() -> zookeeperService.existsPath(NameHelper.syncRunningLockPath(item.getId())), EXECUTOR) + .supplyAsync(() -> zookeeperService.existsPath(NameHelper.syncRunningLockPath(item.getId(), item.getAlias())), EXECUTOR) .thenApply(running -> { if (running) { try { - String data = zookeeperService.getData(NameHelper.syncRunningLockPath(item.getId())); + String data = zookeeperService.getData(NameHelper.syncRunningLockPath(item.getId(), item.getAlias())); if (StrUtil.isNotBlank(data)) { return mapper.readValue(data, RunMeta.class); } diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/ZookeeperNodeVO.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/ZookeeperNodeVO.java index 1f95bd2..3837c58 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/ZookeeperNodeVO.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/ZookeeperNodeVO.java @@ -55,7 +55,7 @@ public class ZookeeperNodeVO { return Optional.of(runMeta).map(RunMeta::getCluster).orElse(null); } - public String getFlinkJobId() { + public Long getFlinkJobId() { return Optional.of(runMeta).map(RunMeta::getFlinkJobId).orElse(null); }