From 0d8b1828eea6bb027bbf71ddcd9c28a7bcf0ca3b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 26 Jan 2018 14:38:12 +0800
Subject: [PATCH] 组织配置

---
 src/app/business/entity/data.ts |   62 +++++++++++++++++++++++++++++-
 1 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index d6f454c..2aa99c6 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 } 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;
@@ -63,10 +64,65 @@
   }
 
  // ������������
+
+
  export interface AlarmConfig {
-  createTime?: number;
   id?: number;
   organizationId?: number;
+  createTime?: number;
   updateTime?: number;
-  value?: object;
+  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[];
+  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;
+}
\ No newline at end of file

--
Gitblit v1.8.0