From 7ca521e4267b987270f6ccbb9a6c076aeb467d96 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 04 Jul 2018 17:11:33 +0800
Subject: [PATCH] 设备，监控站 管理功能增强

---
 src/app/routes/devices/basic-info/basic-info.component.ts |   64 ++++++++++++++++++++++++++++++--
 1 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/src/app/routes/devices/basic-info/basic-info.component.ts b/src/app/routes/devices/basic-info/basic-info.component.ts
index 3dfa853..3494c41 100644
--- a/src/app/routes/devices/basic-info/basic-info.component.ts
+++ b/src/app/routes/devices/basic-info/basic-info.component.ts
@@ -11,6 +11,8 @@
 import { Subject } from 'rxjs/Subject';
 import { CoordinatesPickerComponent } from 'app/routes/map/coordinates-picker/coordinates-picker.component';
 import { CoorPickerService } from 'app/routes/map/coordinates-picker/coordinates-picker.service';
+import { OrganizationService } from '@business/services/http/organization.service';
+import { ExampleService } from '@business/services/util/example.service';
 
 @Component({
   selector: 'app-basic-info',
@@ -61,13 +63,19 @@
     }
   ];
   queryTextStream: Subject<string> = new Subject<string>();
+  private queryMap: {orgId?: number, mpointId?: number, devMacOrName?: string}
+  = {orgId: null, mpointId: null, devMacOrName: ''};
+  extraParams = { queryParams: null };
+  public orgOptions = [];
+  public monitorPoints = [];
   constructor(
     private monitorPointService: MonitorPointService,
     private deviceService: DeviceService,
     private confirmServ: NzModalService,
     public msgSrv: NzMessageService,
     private modalHelper: ModalHelper,
-    private coorPickerService: CoorPickerService
+    private coorPickerService: CoorPickerService,
+    private organizationService: OrganizationService
   ) { }
 
   ngOnInit() {
@@ -75,14 +83,14 @@
       .debounceTime(900)
       .distinctUntilChanged()
       .subscribe(value => {
-        this.extraParams.queryParams = this.deviceService.getSqlParams(value);
+        this.queryMap.devMacOrName = value;
         this.load();
       });
+      this.orgSelectChange();
   }
   get listUrl() {
     return this.deviceService.getListUrl();
   }
-  extraParams = { queryParams: null };
   queryText: string;
   selectedRows: any[] = [];
   checkboxChange(list: any[]) {
@@ -107,6 +115,7 @@
     });
   }
   load() {
+    this.extraParams.queryParams = this.deviceService.getSqlParams(this.queryMap);
     this.selectedRows = [];
     this.simpleTable.load();
   }
@@ -129,7 +138,12 @@
     if (d != null) {  
       Object.assign(data, d);
     }
-    this.modalHelper.static(DeviceEditComponent, { data }).subscribe(
+    const configMap = this.queryMap;
+    // Object.assign(configMap, this.queryMap);
+    if (!!configMap['mpointId'] && !d['monitorPoint']) {
+      data['monitorPoint'] = this.getMonitorPoint(configMap['mpointId']);
+    }
+    this.modalHelper.static(DeviceEditComponent, { data, configMap }).subscribe(
       (ret: { data: any, close: Function }) => {
         // ������������
         if (ret.data['id'] != null) {
@@ -156,6 +170,11 @@
           }
         );
       });
+  }
+  private getMonitorPoint(mpointId: number) {
+     return this.monitorPoints.find(
+        mpoint => mpoint.id === mpointId
+     );
   }
   configCoord(record: Device): void {
      // ������������������������������������������adress������������
@@ -207,4 +226,41 @@
       }
    );
   }
+  public setOrgId(orgId) {
+    this.queryMap.orgId = orgId;
+    this.queryMap.mpointId = null;
+    // this.queryMap.devMacOrName = null;
+    this.monitorPointChange();
+    this.load();
+  }
+  public setMpointId(mpointId) {
+    this.queryMap.mpointId = mpointId;
+    this.load();
+  }
+  orgSelectChange(text?: string) {
+    const pageBean: PageBean = {pageIndex: 0, pageSize: 20};
+    this.organizationService.getPagingList(pageBean, text).subscribe(
+      (res: PageBean) => {
+           if (res != null && res.data != null) {               
+               this.orgOptions = res.data;
+           }
+      }
+   );
+  }
+    monitorPointChange(text?: string) {
+      const pageBean: PageBean = {pageIndex: 0, pageSize: 20};
+      const example = new ExampleService();
+      const organizationId = !!this.queryMap.orgId ? this.queryMap.orgId : null;
+      const mpointName = !!text ? '%' + text + '%' : null;
+      example.or()
+      .andEqualTo({name: 'organizationId', value: organizationId })
+      .andLike({name: 'name', value: mpointName  });
+      this.monitorPointService.getPageByExample(pageBean, example).subscribe(
+        (res: PageBean) => {
+            if (res != null && res.data != null) {
+                this.monitorPoints = res.data;
+            }
+        }
+    );
+    }
 }

--
Gitblit v1.8.0