From 6da582b887cf7ceadf1617417d7c15b239a2e008 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:45:08 +0800
Subject: [PATCH] 设备mac地址唯一性检验，查询数据行业添加
---
src/app/business/entity/data.ts | 61 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index 93354c3..81fa665 100644
--- a/src/app/business/entity/data.ts
+++ b/src/app/business/entity/data.ts
@@ -1,5 +1,5 @@
import { Column } from '@business/entity/grid';
-import { AlarmStyle } from '@business/enum/types.enum';
+import { AlarmStyle, TimeUnits, AreaRange, DeviceDimension } from '@business/enum/types.enum';
export interface AreaNames {
@@ -33,7 +33,7 @@
provinceCode?: Column|any;
rank?: Column|any;
telephone?: Column|any;
- areaNames?: AreaNames|any ;
+ areaNames?: AreaNames;
}
// ������������
@@ -46,7 +46,7 @@
version?: Column|any;
}
- // ���������
+ // ������������
export interface MonitorPoint {
address?: any|Column;
areaCode?: any|Column;
@@ -76,13 +76,14 @@
export interface AlarmConfigValue {
alarmMode: AlarmMode;
- alarmLevels:{[key: string]:AlarmSensorLevel};
+ alarmLevels: {[key: string]: AlarmSensorLevel};
}
export interface AlarmSensorLevel {
enable: boolean|any [];
increment: number []|any[];
+ degressEnable: boolean|any [];
degression: number []|any [];
}
export interface Device {
@@ -98,6 +99,7 @@
mac?: any|Column;
monitorPoint?: any|Column;
monitorPointId?: any|Column;
+ professionId?: any|Column;
name?: any|Column;
operateUser?: any|Column;
operateUserId?: any|Column;
@@ -106,6 +108,7 @@
export interface AlarmMode {
enable: boolean|any[];
+ interval: number;
level1: AlarmStyle[]|any[];
level2: AlarmStyle[]|any[];
level3: AlarmStyle[]|any[];
@@ -115,13 +118,47 @@
deviceId?: number|any[];
id?: number|any[];
updateTime?: number|any[];
- value?:{[s:string] : number}|any[];
+ value?: {[s: string]: number}|any[];
}
-export interface CoorPicker{
- longitude:number;// ������
- latitude:number;// ������
- address:string;
- describe:string;
- name:string;
-}
\ No newline at end of file
+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;
+ deviceDimension?: DeviceDimension;
+ dimensionValue?: any;
+}
+
+export interface PairData {
+ category: string;
+ value: number;
+}
--
Gitblit v1.8.0