From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/routes/devices/basic-info/basic-info.component.ts | 210 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 161 insertions(+), 49 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 b468826..3833c79 100644
--- a/src/app/routes/devices/basic-info/basic-info.component.ts
+++ b/src/app/routes/devices/basic-info/basic-info.component.ts
@@ -2,15 +2,17 @@
import { CoorPicker, Device } from '@business/entity/data';
import { AdjustConfigComponent } from './adjust-config/adjust-config.component';
import { DeviceEditComponent } from './device-edit/device-edit.component';
-import { ModalHelper } from '@delon/theme';
+import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService, NzMessageService } from 'ng-zorro-antd';
import { PageBean, ResultBean } from '@business/entity/grid';
import { DeviceService } from '@business/services/http/device.service';
import { Component, OnInit, ElementRef, ViewChild } from '@angular/core';
-import { SimpleTableColumn } from '@delon/abc';
+import { SimpleTableColumn, SimpleTableComponent } from '@delon/abc';
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, Criteria } from '@business/services/util/example.service';
@Component({
selector: 'app-basic-info',
@@ -23,10 +25,10 @@
{ title: '������', index: 'name' },
{ title: 'mac', index: 'mac' },
{ title: '������', index: 'deviceVersion.name' },
- { title: '���������', index: 'monitorPoint.name' },
+ { title: '������������', index: 'monitorPoint.name' },
{ title: '���������', index: 'operateUser.name' },
- { title: '������������',width: '100px', type: 'date', index: 'createTime' },
- { title: '������������', width: '100px',type: 'date', index: 'installTime' },
+ { title: '������������', width: '100px', type: 'date', index: 'createTime' },
+ { title: '������������', width: '100px', type: 'date', index: 'installTime' },
{
title: '���������',
buttons: [
@@ -46,7 +48,7 @@
{
text: `���������������`,
type: 'static',
- component:AdjustConfigComponent,
+ component: AdjustConfigComponent,
format: (record: any) => `<i class="anticon anticon-setting"></i>���������������`
},
{
@@ -61,13 +63,20 @@
}
];
queryTextStream: Subject<string> = new Subject<string>();
+ public queryMap: {orgId?: number, mpointId?: number, devMacOrName?: string}
+ = {orgId: null, mpointId: null, devMacOrName: ''};
+ extraParams = { queryParams: null };
+ public orgOptions = [];
+ public monitorPoints = [];
constructor(
- private monitorPointService:MonitorPointService,
+ private monitorPointService: MonitorPointService,
private deviceService: DeviceService,
private confirmServ: NzModalService,
public msgSrv: NzMessageService,
private modalHelper: ModalHelper,
- private coorPickerService:CoorPickerService
+ private coorPickerService: CoorPickerService,
+ private organizationService: OrganizationService,
+ private http: _HttpClient
) { }
ngOnInit() {
@@ -75,14 +84,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();;
+ return this.deviceService.getListUrl();
}
- extraParams = { queryParams: null };
queryText: string;
selectedRows: any[] = [];
checkboxChange(list: any[]) {
@@ -107,8 +116,48 @@
});
}
load() {
+ const example = this.initQueryExample();
+ this.extraParams.queryParams = example.getSqlParam();
this.selectedRows = [];
- this.simpleTable.load();
+ this.deviceService.countByExample(example).subscribe(
+ res => {
+ if (!!res && !!res.code) {
+ const count = res.data;
+ const pages = Math.ceil(count / this.simpleTable.ps);
+ const pi = this.simpleTable.pi > pages ? pages : this.simpleTable.pi;
+ this.simpleTable.load(pi);
+ }
+ }
+ );
+
+ }
+ private initQueryExample() {
+ const example = new ExampleService();
+ const orgId = !!this.queryMap.orgId ? this.queryMap.orgId : null;
+ const mpointId = !!this.queryMap.mpointId ? this.queryMap.mpointId : null;
+ const devMacOrName = !!this.queryMap.devMacOrName && !!(<string>this.queryMap.devMacOrName).trim() ? this.queryMap.devMacOrName : null;
+ let criWithMac: Criteria = null;
+ let criWithName: Criteria = null;
+ if (!!devMacOrName) {
+ criWithName = example.or().andLike({name: 'name', value: '%' + devMacOrName + '%'});
+ criWithMac = example.or().andLike({name: 'mac', value: '%' + devMacOrName + '%'});
+ }
+ if (!!mpointId) {
+ if (!!devMacOrName) {
+ criWithName.andEqualTo({name: 'monitorPointId', value: mpointId});
+ criWithMac.andEqualTo({name: 'monitorPointId', value: mpointId});
+ }else {
+ example.or().andEqualTo({name: 'monitorPointId', value: mpointId});
+ }
+ } else if (!!orgId) {
+ if (!!devMacOrName) {
+ criWithName.andCondition(`monitor_point_id in (select id from monitor_point where organization_id = ${orgId})`);
+ criWithMac.andCondition(`monitor_point_id in (select id from monitor_point where organization_id = ${orgId})`);
+ }else {
+ example.or().andCondition(`monitor_point_id in (select id from monitor_point where organization_id = ${orgId})`);
+ }
+ }
+ return example;
}
delete(...id: number[]) {
this.deviceService.delete(...id).subscribe(
@@ -120,16 +169,22 @@
}
);
}
- @ViewChild('simpleTable') simpleTable: { load: Function };
+ @ViewChild('simpleTable') simpleTable: SimpleTableComponent;
queryTextChanged(event) {
this.queryTextStream.next(this.queryText);
}
addOrModify(d) {
const data = {};
- if (d != null) {
+ if (d != null) {
Object.assign(data, d);
}
- this.modalHelper.static(DeviceEditComponent, { data }).subscribe(
+ let configMap = {};
+ configMap = Object.assign(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) {
@@ -157,39 +212,96 @@
);
});
}
- configCoord(record:Device):void {
- Object.assign(this.coorPickerService.data,record);
- let _data = this.coorPickerService.data;
- this.monitorPointService.getEntity(record.monitorPointId).subscribe(
- res => {
- if(res!=null && res.code==1 && res.data!=null){
- const areaNames = res.data.areaNames;
- let adress = null;
- if(areaNames != null){
- adress = areaNames.provinceName+areaNames.cityName+areaNames.areaName+res.data.address;
- }
- this.coorPickerService.data.address = adress;
- this.coorPickerService.data['describe'] = '������������';
- }
- this.modalHelper.static(CoordinatesPickerComponent).subscribe(
- (staticComp) => {
- const data:Device = {
- id:record.id,
- longitude:_data.longitude,
- latitude:_data.latitude,
- }
- this.deviceService.save(data).subscribe(
- (res: any) => {
- if (res.code === 1) {
- this.load();
- this.msgSrv.success('���������������������');
- }
- }
- );
-
- }
- );
- }
- )
+ private getMonitorPoint(mpointId: number) {
+ return this.monitorPoints.find(
+ mpoint => mpoint.id === mpointId
+ );
}
+ configCoord(record: Device): void {
+ // ������������������������������������������adress������������
+ Object.assign(this.coorPickerService.data, record);
+ this.coorPickerService.data['describe'] = '������������';
+ // ������ ��������������� ������������������
+ if ((!record.latitude || !record.longitude) && !!record.monitorPointId) {
+ this.monitorPointService.getEntity(record.monitorPointId).subscribe(
+ res => {
+ if (res != null && res.code === 1 && res.data != null) {
+ const areaNames = res.data.areaNames;
+ let adress = '';
+ if (areaNames != null) {
+ adress += !!areaNames.provinceName ? areaNames.provinceName : '';
+ adress += ' ';
+ adress += !!areaNames.cityName ? areaNames.cityName : '';
+ adress += ' ';
+ adress += !!areaNames.areaName ? areaNames.areaName : '';
+ adress += ' ';
+ adress += !!res.data.address ? res.data.address : '';
+ }
+ this.coorPickerService.data.address = adress;
+ this.openMap(record);
+ }
+ }
+ );
+ } else {
+ this.openMap(record);
+ }
+ }
+ private openMap(record: Device) {
+ const _data = this.coorPickerService.data;
+ this.modalHelper.static(CoordinatesPickerComponent).subscribe(
+ (staticComp) => {
+ const data: Device = {
+ id: record.id,
+ mac: record.mac,
+ longitude: _data.longitude,
+ latitude: _data.latitude,
+ };
+ this.deviceService.save(data).subscribe(
+ (resp: any) => {
+ if (resp.code === 1) {
+ this.load();
+ this.msgSrv.success('���������������������');
+ }
+ }
+ );
+ }
+ );
+ }
+ 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