From 61d4759357106feb7a3494dad19369a2147ddc6a Mon Sep 17 00:00:00 2001 From: tomsun28 Date: Fri, 3 Dec 2021 15:26:00 +0800 Subject: [PATCH] =?UTF-8?q?[web-app]=20bugfix-=E7=9B=91=E6=8E=A7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/controller/MonitorController.java | 4 ++-- .../usthe/manager/pojo/dto/MonitorDto.java | 2 +- .../monitor-edit/monitor-edit.component.ts | 6 +++-- .../monitor-list/monitor-list.component.html | 11 +++++---- .../monitor-list/monitor-list.component.ts | 23 +++++++++++++++---- .../monitor-new/monitor-new.component.ts | 6 +++-- web-app/src/app/service/monitor.service.ts | 4 ++-- .../app/service/my-service.service.spec.ts | 16 ------------- web-app/src/app/service/my-service.service.ts | 9 -------- 9 files changed, 37 insertions(+), 44 deletions(-) delete mode 100644 web-app/src/app/service/my-service.service.spec.ts delete mode 100644 web-app/src/app/service/my-service.service.ts diff --git a/manager/src/main/java/com/usthe/manager/controller/MonitorController.java b/manager/src/main/java/com/usthe/manager/controller/MonitorController.java index 6191058..755b2b1 100644 --- a/manager/src/main/java/com/usthe/manager/controller/MonitorController.java +++ b/manager/src/main/java/com/usthe/manager/controller/MonitorController.java @@ -40,7 +40,7 @@ public class MonitorController { public ResponseEntity> addNewMonitor(@Valid @RequestBody MonitorDto monitorDto) { // 校验请求数据 monitorService.validate(monitorDto, false); - if (monitorDto.getDetected()) { + if (monitorDto.isDetected()) { // 进行探测 monitorService.detectMonitor(monitorDto.getMonitor(), monitorDto.getParams()); } @@ -53,7 +53,7 @@ public class MonitorController { public ResponseEntity> modifyMonitor(@Valid @RequestBody MonitorDto monitorDto) { // 校验请求数据 monitorService.validate(monitorDto, true); - if (monitorDto.getDetected()) { + if (monitorDto.isDetected()) { // 进行探测 monitorService.detectMonitor(monitorDto.getMonitor(), monitorDto.getParams()); } diff --git a/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java b/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java index 1d204a8..58803a9 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java +++ b/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java @@ -41,5 +41,5 @@ public class MonitorDto { * 是否探测 */ @ApiModelProperty(value = "是否进行探测", accessMode = READ_WRITE, position = 2) - private Boolean detected; + private boolean detected; } diff --git a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts index b558bf1..1b96e8c 100644 --- a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts +++ b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts @@ -37,6 +37,8 @@ export class MonitorEditComponent implements OnInit { ngOnInit(): void { this.route.paramMap.pipe( switchMap((paramMap: ParamMap) => { + this.isSpinning = false; + this.passwordVisible = false; let id = paramMap.get("monitorId"); this.monitor.id = Number(id); // 查询监控信息 @@ -51,7 +53,7 @@ export class MonitorEditComponent implements OnInit { }); } this.params = message.data.params; - this.detected = message.data.detected; + this.detected = message.data.detected? message.data.detected : true; } else { console.warn(message.msg); this.notifySvc.error("查询异常，此监控不存在", message.msg); @@ -132,7 +134,7 @@ export class MonitorEditComponent implements OnInit { "params": this.params }; this.isSpinning = true; - this.monitorSvc.editMonitor(detectMonitor) + this.monitorSvc.detectMonitor(detectMonitor) .subscribe(message => { this.isSpinning = false; if (message.code === 0) { diff --git a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html index 4d45890..e2e701c 100644 --- a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html +++ b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html @@ -7,7 +7,7 @@ - 监控列表 {{app?app.toUpperCase() : ""}} + {{app?app.toUpperCase() : ""}} 监控列表 @@ -36,16 +36,17 @@ - + 监控名称 监控状态 监控主机Host @@ -81,5 +82,5 @@ - 总量 {{ pageTotal }} + 总量 {{ total }} diff --git a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts index 8edff5c..e532c39 100644 --- a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts +++ b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts @@ -6,6 +6,7 @@ import {Page} from "../../../pojo/Page"; import {NzModalService} from "ng-zorro-antd/modal"; import {NzNotificationService} from "ng-zorro-antd/notification"; import {NzMessageService} from "ng-zorro-antd/message"; +import {NzTableQueryParams} from "ng-zorro-antd/table"; @Component({ selector: 'app-monitor-list', @@ -25,7 +26,7 @@ export class MonitorListComponent implements OnInit { app!: string; pageIndex: number = 1; pageSize: number = 8; - pageTotal: number = 0; + total: number = 0; monitors!: Monitor[]; pageMonitors!: Page; tableLoading: boolean = true; @@ -35,11 +36,13 @@ export class MonitorListComponent implements OnInit { this.route.queryParamMap .subscribe(paramMap => { this.app = paramMap.get("app") || ''; - this.initMonitorTable(); + this.pageIndex = 1; + this.pageSize = 8; + this.loadMonitorTable(); }); } - initMonitorTable() { + loadMonitorTable() { let monitorInit$ = this.monitorSvc.getMonitors(this.app, this.pageIndex - 1, this.pageSize) .subscribe(message => { this.tableLoading = false; @@ -47,7 +50,7 @@ export class MonitorListComponent implements OnInit { this.pageMonitors = message.data; this.monitors = this.pageMonitors.content; this.pageIndex = this.pageMonitors.number + 1; - this.pageTotal = this.pageMonitors.totalElements; + this.total = this.pageMonitors.totalElements; } else { console.warn(message.msg); } @@ -123,7 +126,7 @@ export class MonitorListComponent implements OnInit { deleteMonitors$.unsubscribe(); if (message.code === 0) { this.notifySvc.success("删除成功！", ""); - this.initMonitorTable(); + this.loadMonitorTable(); } else { this.notifySvc.error("删除失败！", message.msg); } @@ -154,5 +157,15 @@ export class MonitorListComponent implements OnInit { } // end: 列表多选逻辑 + /** + * 分页回调 + * @param params 页码信息 + */ + onTablePageChange(params: NzTableQueryParams) { + const { pageSize, pageIndex, sort, filter } = params; + this.pageIndex = pageIndex; + this.pageSize = pageSize; + this.loadMonitorTable(); + } } diff --git a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts index 2cdf668..f6e1db7 100644 --- a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts +++ b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts @@ -36,9 +36,12 @@ export class MonitorNewComponent implements OnInit { } ngOnInit(): void { - const paramDefine$ = this.route.queryParamMap.pipe( + this.route.queryParamMap.pipe( switchMap((paramMap: ParamMap) => { this.monitor.app = paramMap.get("app") || ''; + this.detected = true; + this.passwordVisible = false; + this.isSpinning = false; return this.appDefineSvc.getAppParamsDefine(this.monitor.app); }) ).subscribe(message => { @@ -57,7 +60,6 @@ export class MonitorNewComponent implements OnInit { } else { console.warn(message.msg); } - paramDefine$.unsubscribe(); }); } diff --git a/web-app/src/app/service/monitor.service.ts b/web-app/src/app/service/monitor.service.ts index faa57cc..e1bc5f0 100644 --- a/web-app/src/app/service/monitor.service.ts +++ b/web-app/src/app/service/monitor.service.ts @@ -48,8 +48,8 @@ export class MonitorService { public getMonitors(app: string, pageIndex: number, pageSize: number) : Observable>> { app = app.trim(); - pageIndex = pageIndex ? 1 : pageIndex; - pageSize = pageSize ? 10 : pageSize; + pageIndex = pageIndex ? pageIndex : 0; + pageSize = pageSize ? pageSize : 8; // 注意HttpParams是不可变对象 需要保存set后返回的对象为最新对象 let httpParams = new HttpParams(); httpParams = httpParams.appendAll({ diff --git a/web-app/src/app/service/my-service.service.spec.ts b/web-app/src/app/service/my-service.service.spec.ts deleted file mode 100644 index 05fd85b..0000000 --- a/web-app/src/app/service/my-service.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MyServiceService } from './my-service.service'; - -describe('MyServiceService', () => { - let service: MyServiceService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MyServiceService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/web-app/src/app/service/my-service.service.ts b/web-app/src/app/service/my-service.service.ts deleted file mode 100644 index 683e3b3..0000000 --- a/web-app/src/app/service/my-service.service.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Injectable } from '@angular/core'; - -@Injectable({ - providedIn: 'root' -}) -export class MyServiceService { - - constructor() { } -}