From 39ea49edce74ae063ca0afd9b2966f861e256a3e Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Tue, 17 Apr 2018 13:18:36 +0800 Subject: [PATCH] ts fix,组织报警间隔时间设置 --- src/app/business/entity/data.ts | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 100 insertions(+), 2 deletions(-) diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts index 2ea1eba..6cc45a1 100644 --- a/src/app/business/entity/data.ts +++ b/src/app/business/entity/data.ts @@ -1,4 +1,5 @@ import { Column } from '@business/entity/grid'; +import { AlarmStyle, TimeUnits, AreaRange } from '@business/enum/types.enum'; export interface AreaNames { @@ -10,7 +11,7 @@ export interface Sensor { description?: any|Column; id?: any|Column; - key?: any|Column; + sensorKey?: any|Column; lower?: any|Column; name?: any|Column; unit?: any|Column; @@ -32,7 +33,7 @@ provinceCode?: Column|any; rank?: Column|any; telephone?: Column|any; - areaNames?: AreaNames|any ; + areaNames?: AreaNames; } // ������������ @@ -61,3 +62,100 @@ areaNames?: AreaNames|any ; organization?: Organization; } + + // ������������ + + + export interface AlarmConfig { + id?: number; + organizationId?: number; + createTime?: number; + updateTime?: number; + value: AlarmConfigValue; +} + +export interface AlarmConfigValue { + alarmMode: AlarmMode; + alarmLevels: {[key: string]: AlarmSensorLevel}; +} + + +export interface AlarmSensorLevel { + enable: boolean|any []; + increment: number []|any[]; + degressEnable: boolean|any []; + degression: number []|any []; +} +export interface Device { + address?: any|Column; + createTime?: any|Column; + deviceVersion?: any|Column; + deviceVersionId?: any|Column; + id?: any|Column; + installTime?: any|Column; + isDelete?: any|Column; + latitude?: any|Column; + longitude?: any|Column; + mac?: any|Column; + monitorPoint?: any|Column; + monitorPointId?: any|Column; + name?: any|Column; + operateUser?: any|Column; + operateUserId?: any|Column; + state?: any|Column; +} + +export interface AlarmMode { + enable: boolean|any[]; + interval: number; + level1: AlarmStyle[]|any[]; + level2: AlarmStyle[]|any[]; + level3: AlarmStyle[]|any[]; +} +export interface DeviceAdjustValue { + createTime?: number|any[]; + deviceId?: number|any[]; + id?: number|any[]; + updateTime?: number|any[]; + value?: {[s: string]: number}|any[]; +} + +export interface CoorPicker { + longitude: number; // ������ + latitude: number; // ������ + address: string; + describe: string; + name: string; +} + +export interface UserContext { + authorities: any[]; + mode: string; + organizationId: number; + username: string; +} + + +export interface LineChartCriteria { + dataConditions?: DataCondition[]; + sensorKeys?: string[]; + timePeriod?: TimePeriod; +} + +export interface TimePeriod { + endTime?: Date; + startTime?: Date; + timeUnits?: TimeUnits; +} + +export interface DataCondition { + actualTime?: number; + areaRange?: AreaRange; + areaRangeId?: number; + timeUnits?: TimeUnits; +} + +export interface PairData { + category: string; + value: number; +} -- Gitblit v1.8.0