From 7bf2bad48aa20d9200d66d386b8e46c22d542e35 Mon Sep 17 00:00:00 2001
From: catdrink <2738035238@qq.com>
Date: Sat, 28 Dec 2024 01:35:00 +0800
Subject: [PATCH] fix method params error and api

---
 .../bigtop/manager/server/controller/MetricsController.java | 6 +++---
 .../apache/bigtop/manager/server/proxy/PrometheusProxy.java | 2 +-
 .../org/apache/bigtop/manager/server/utils/ProxyUtils.java  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/controller/MetricsController.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/controller/MetricsController.java
index 03b6e76d..15870b57 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/controller/MetricsController.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/controller/MetricsController.java
@@ -42,7 +42,7 @@ public class MetricsController {
     private MetricsService metricsService;
 
     @Operation(summary = "hosts healthy", description = "hosts healthy check")
-    @GetMapping("hosts/healthy")
+    @GetMapping("hostshealthy")
     public ResponseEntity<JsonNode> agentHostsHealthyStatus() {
         return ResponseEntity.success(metricsService.queryAgentsHealthyStatus());
     }
@@ -50,14 +50,14 @@ public ResponseEntity<JsonNode> agentHostsHealthyStatus() {
     @Operation(summary = "host info", description = "host info query")
     @GetMapping("hosts/{id}")
     public ResponseEntity<JsonNode> queryAgentInfo(
-            @RequestParam(value = "interval", defaultValue = "1") String interval, @PathVariable String id) {
+            @RequestParam(value = "interval", defaultValue = "1m") String interval, @PathVariable String id) {
         return ResponseEntity.success(metricsService.queryAgentsInfo(Long.valueOf(id), interval));
     }
 
     @Operation(summary = "cluster info", description = "cluster info query")
     @GetMapping("clusters/{id}")
     public ResponseEntity<JsonNode> queryCluster(
-            @RequestParam(value = "interval", defaultValue = "1") String interval, @PathVariable String id) {
+            @RequestParam(value = "interval", defaultValue = "1m") String interval, @PathVariable String id) {
         return ResponseEntity.success(metricsService.queryClustersInfo(Long.valueOf(id), interval));
     }
 }
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/proxy/PrometheusProxy.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/proxy/PrometheusProxy.java
index 9eeb27bb..30920a27 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/proxy/PrometheusProxy.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/proxy/PrometheusProxy.java
@@ -230,8 +230,8 @@ public JsonNode queryClustersInfo(Long clusterId, String interval) {
         hostQuery.setClusterId(clusterId);
         PageVO<HostVO> hostPage = hostService.list(hostQuery); // query host list
         List<HostVO> hostList = hostPage.getContent();
-        ObjectMapper objectMapper = new ObjectMapper();
         int agentsNum = Math.toIntExact(hostPage.getTotal()); // change to agentsNum
+        ObjectMapper objectMapper = new ObjectMapper();
         if (agentsNum > 0) {
             int totalPhysicalCores = 0;
             long totalMemSpace = 0L, totalMemIdle = 0L;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/utils/ProxyUtils.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/utils/ProxyUtils.java
index bbcd324a..46b95d40 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/utils/ProxyUtils.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/utils/ProxyUtils.java
@@ -45,7 +45,7 @@ public static Long getLongSafely(JsonNode parentNode, String key, int index) {
         return 0L;
     }
 
-    public static JsonNode array2node(double[][] array, int num, int cores) {
+    public static JsonNode array2node(double[][] array, int cores, int num) {
         ObjectMapper mapper = new ObjectMapper();
         double[] cache = new double[6];
         for (int i = 0; i < num; i++) for (int j = 0; j < 6; j++) cache[j] += array[i][j];