From 43e7ed40c26afa535aba24b1c9ddc1b87b607d8d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Mar 2018 09:26:26 +0800
Subject: [PATCH] 报表查看

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

diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index d6f454c..38e3557 100644
--- a/src/app/business/entity/data.ts
+++ b/src/app/business/entity/data.ts
@@ -1,4 +1,6 @@
+import { LineChartCriteria } from './data';
 import { Column } from '@business/entity/grid';
+import { AlarmStyle, TimeUnits, AreaRange } from '@business/enum/types.enum';
 
 
 export interface AreaNames {
@@ -10,7 +12,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 +65,87 @@
   }
 
  // ������������
+
+
  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;
+}
+
+export interface UserContext {
+  authorities: any[];
+  mode: string;
+  organizationId: number;
+  username: string;
+}
+export interface TimePeriod{
+  startTime:number;//������������
+  endTime:number;//������������
+}
+export interface DataCondition{
+  timeUnits:TimeUnits;//������
+  actualTime:number;//������������
+  areaRange:AreaRange;//������������
+  areaRangeId:number;//���������������ID
+}
+export interface LineChartCriteria{
+  sensorKey:String;
+  timePeriod:TimePeriod;
+  dataConditions:DataCondition[];
+}
\ No newline at end of file

--
Gitblit v1.8.0