From 3ded85448091a4300c66c500b08b192d0fae0003 Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Tue, 13 Jun 2023 18:47:03 +0800
Subject: [PATCH] =?UTF-8?q?feature(web):=20=E5=A2=9E=E5=8A=A0=20hive=20?=
 =?UTF-8?q?=E8=A1=A8=E7=BB=B4=E5=BA=A6=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/OverviewController.java    | 21 ++++++++++++-------
 web/components/overview-tab.js                |  9 ++++++--
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/OverviewController.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/OverviewController.java
index 051e421..67cbd8e 100644
--- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/OverviewController.java
+++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/OverviewController.java
@@ -11,6 +11,11 @@ import com.lanyuanxiaoyao.service.forest.service.InfoService;
 import com.lanyuanxiaoyao.service.forest.service.QueueService;
 import com.lanyuanxiaoyao.service.forest.service.YarnService;
 import com.lanyuanxiaoyao.service.web.entity.JobIdAndAliasVO;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import org.eclipse.collections.api.factory.Lists;
 import org.eclipse.collections.api.factory.Maps;
 import org.eclipse.collections.api.list.ImmutableList;
@@ -22,12 +27,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-
 /**
  * 概览
  *
@@ -56,17 +55,23 @@ public class OverviewController extends BaseController {
         CompletableFuture<Long> tableFocusCountFuture = CompletableFuture.supplyAsync(infoService::tableFocusCount, ExecutorProvider.EXECUTORS);
         CompletableFuture<Long> hudiCountFuture = CompletableFuture.supplyAsync(infoService::hudiCount, ExecutorProvider.EXECUTORS);
         CompletableFuture<Long> hudiFocusCountFuture = CompletableFuture.supplyAsync(infoService::hudiFocusCount, ExecutorProvider.EXECUTORS);
+        CompletableFuture<Long> hiveCountFuture = CompletableFuture.supplyAsync(infoService::hiveCount, ExecutorProvider.EXECUTORS);
+        CompletableFuture<Long> hiveFocusCountFuture = CompletableFuture.supplyAsync(infoService::hiveFocusCount, ExecutorProvider.EXECUTORS);
         CompletableFuture.allOf(
                 tableCountFuture,
                 tableFocusCountFuture,
                 hudiCountFuture,
-                hudiFocusCountFuture
+                hudiFocusCountFuture,
+                hiveCountFuture,
+                hiveFocusCountFuture
         ).get();
         return responseData()
                 .withData("table_count", tableCountFuture.get())
                 .withData("table_focus_count", tableFocusCountFuture.get())
                 .withData("hudi_count", hudiCountFuture.get())
-                .withData("hudi_focus_count", hudiFocusCountFuture.get());
+                .withData("hudi_focus_count", hudiFocusCountFuture.get())
+                .withData("hive_count", hiveCountFuture.get())
+                .withData("hive_focus_count", hiveFocusCountFuture.get());
     }
 
     @GetMapping("yarn-job")
diff --git a/web/components/overview-tab.js b/web/components/overview-tab.js
index d3447e9..eb63c25 100644
--- a/web/components/overview-tab.js
+++ b/web/components/overview-tab.js
@@ -215,12 +215,17 @@ function overviewTab() {
                 body: [
                     {
                         type: 'tpl',
-                        tpl: '逻辑表：<span class="font-bold mr-1">${PADSTART(table_count, 4)} (<span class="text-primary">${PADSTART(table_focus_count, 4)}</span>, ${PADSTART(table_count - table_focus_count, 4)})</span>',
+                        tpl: '逻辑表：<span class="font-bold mr-1 font-mono">${PADSTART(table_count, 4)} (<span class="text-primary">${PADSTART(table_focus_count, 4)}</span>, ${PADSTART(table_count - table_focus_count, 4)})</span>',
                     },
                     '<br>',
                     {
                         type: 'tpl',
-                        tpl: '湖底表：<span class="font-bold mr-1">${PADSTART(hudi_count, 4)} (<span class="text-primary">${PADSTART(hudi_focus_count, 4)}</span>, ${PADSTART(hudi_count - hudi_focus_count, 4)})</span>',
+                        tpl: '湖底表：<span class="font-bold mr-1 font-mono">${PADSTART(hudi_count, 4)} (<span class="text-primary">${PADSTART(hudi_focus_count, 4)}</span>, ${PADSTART(hudi_count - hudi_focus_count, 4)})</span>',
+                    },
+                    '<br>',
+                    {
+                        type: 'tpl',
+                        tpl: '嗨福表：<span class="font-bold mr-1 font-mono">${PADSTART(hive_count, 4)} (<span class="text-primary">${PADSTART(hive_focus_count, 4)}</span>, ${PADSTART(hive_count - hive_focus_count, 4)})</span>',
                     },
                 ]
             },