From 64112c0a154031fbfe2c8750b2d82947e8428f2d Mon Sep 17 00:00:00 2001
From: tomsun28 <tomsun28@outlook.com>
Date: Mon, 20 Dec 2021 10:31:55 +0800
Subject: [PATCH] =?UTF-8?q?[manager,webapp]=20bugfix-=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/usthe/warehouse/controller/MetricsDataController.java | 4 ++--
 .../monitor-data-chart/monitor-data-chart.component.html      | 2 +-
 .../monitor-data-chart/monitor-data-chart.component.ts        | 4 ++--
 .../monitor/monitor-detail/monitor-detail.component.html      | 2 +-
 web-app/src/app/service/monitor.service.ts                    | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/warehouse/src/main/java/com/usthe/warehouse/controller/MetricsDataController.java b/warehouse/src/main/java/com/usthe/warehouse/controller/MetricsDataController.java
index 8c71c89..0f02219 100644
--- a/warehouse/src/main/java/com/usthe/warehouse/controller/MetricsDataController.java
+++ b/warehouse/src/main/java/com/usthe/warehouse/controller/MetricsDataController.java
@@ -36,7 +36,7 @@ public class MetricsDataController {
     @Autowired
     private RedisDataStorage redisDataStorage;
 
-    @GetMapping("/monitors/{monitorId}/metrics/{metrics}")
+    @GetMapping("/monitor/{monitorId}/metrics/{metrics}")
     @ApiOperation(value = "查询监控指标组的指标数据", notes = "查询监控指标组的指标数据")
     public ResponseEntity<Message<MetricsData>> getMetricsData(
             @ApiParam(value = "监控ID", example = "343254354")
@@ -66,7 +66,7 @@ public class MetricsDataController {
         }
     }
 
-    @GetMapping("/monitors/{monitorId}/metrics/{metricFull}")
+    @GetMapping("/monitor/{monitorId}/metric/{metricFull}")
     @ApiOperation(value = "查询监控指标组的指定指标的历史数据", notes = "查询监控指标组下的指定指标的历史数据")
     public ResponseEntity<Message<Void>> getMetricHistoryData(
             @ApiParam(value = "监控ID", example = "343254354")
diff --git a/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.html b/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.html
index 366bf7f..a1570a9 100644
--- a/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.html
+++ b/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.html
@@ -33,7 +33,7 @@
 </nz-card>
 
 <ng-template #monitor_metrics_card_title>
-  <p style="font-size: small; text-align: center; margin-bottom: 3px; color: #0c0c0c">{{metric}}</p>
+  <p style="font-size: small; text-align: center; margin-bottom: 3px; color: #0c0c0c">{{metrics}}</p>
   <div>
     <a nz-popover [nzPopoverContent]="'最近采集时间 ' + (time | _date: 'yyyy-MM-dd HH:mm:ss')"> <i nz-icon nzType="field-time" nzTheme="outline"></i></a>
     <i style="font-size: 0.3px; font-weight: normal;color: rgba(84,83,83,0.89)">采集时间:{{time | _date: "HH:mm:ss"}}</i>
diff --git a/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.ts b/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.ts
index 0bb76b5..632a097 100644
--- a/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.ts
+++ b/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.ts
@@ -16,7 +16,7 @@ export class MonitorDataChartComponent implements OnInit {
   }
   private _monitorId!: number;
   @Input()
-  metric!: string;
+  metrics!: string;
 
   time!: any;
   fields!: any[];
@@ -29,7 +29,7 @@ export class MonitorDataChartComponent implements OnInit {
 
   loadData() {
     // 读取实时指标数据
-    let metricData$ = this.monitorSvc.getMonitorMetricData(this.monitorId, this.metric)
+    let metricData$ = this.monitorSvc.getMonitorMetricsData(this.monitorId, this.metrics)
       .subscribe(message => {
         metricData$.unsubscribe();
         if (message.code === 0) {
diff --git a/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html b/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html
index fc2aab2..0539135 100644
--- a/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html
+++ b/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html
@@ -91,7 +91,7 @@
           </ng-template>
           <div style="display: flex;justify-content:flex-start;flex-wrap: wrap;">
             <div *ngFor="let metric of metrics; let i = index">
-              <app-monitor-data-chart [metric]="metric" [monitorId]="monitorId"></app-monitor-data-chart>
+              <app-monitor-data-chart [metrics]="metric" [monitorId]="monitorId"></app-monitor-data-chart>
             </div>
           </div>
         </nz-tab>
diff --git a/web-app/src/app/service/monitor.service.ts b/web-app/src/app/service/monitor.service.ts
index 5b5f422..2759926 100644
--- a/web-app/src/app/service/monitor.service.ts
+++ b/web-app/src/app/service/monitor.service.ts
@@ -104,8 +104,8 @@ export class MonitorService {
     return this.http.get<Message<Page<Monitor>>>(monitors_uri, options);
   }
 
-  public getMonitorMetricData(monitorId: number, metric: string) : Observable<Message<any>> {
-    return this.http.get<Message<any>>(`/monitors/${monitorId}/metrics/${metric}`);
+  public getMonitorMetricsData(monitorId: number, metrics: string) : Observable<Message<any>> {
+    return this.http.get<Message<any>>(`/monitor/${monitorId}/metrics/${metrics}`);
   }
 
   public getAppsMonitorSummary() : Observable<Message<any>> {