From 899b4ddd9790728851834062c57892f600ee4355 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 19 Jun 2018 11:23:55 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/business/entity/data.ts |   66 +++++++++++++++++++++++++++------
 1 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index 93354c3..c44c39f 100644
--- a/src/app/business/entity/data.ts
+++ b/src/app/business/entity/data.ts
@@ -1,11 +1,13 @@
 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 {
     provinceName?: string;
     cityName?: string;
     areaName?: string;
+    townName?: string;
+    villageName?: string;
 }
 // ���������
 export interface Sensor {
@@ -33,7 +35,7 @@
     provinceCode?: Column|any;
     rank?: Column|any;
     telephone?: Column|any;
-    areaNames?: AreaNames|any ;
+    areaNames?: AreaNames;
   }
 
   // ������������
@@ -46,7 +48,7 @@
     version?: Column|any;
   }
 
-  // ���������
+  // ������������
   export interface MonitorPoint {
     address?: any|Column;
     areaCode?: any|Column;
@@ -61,6 +63,9 @@
     provinceCode?: any|Column;
     areaNames?: AreaNames|any ;
     organization?: Organization;
+    townCode?: any|Column;
+    villageCode?: any|Column;
+
   }
 
  // ������������
@@ -76,13 +81,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 +104,7 @@
   mac?: any|Column;
   monitorPoint?: any|Column;
   monitorPointId?: any|Column;
+  professionId?: any|Column;
   name?: any|Column;
   operateUser?: any|Column;
   operateUserId?: any|Column;
@@ -106,6 +113,7 @@
 
 export interface AlarmMode {
   enable: boolean|any[];
+  interval: number;
   level1: AlarmStyle[]|any[];
   level2: AlarmStyle[]|any[];
   level3: AlarmStyle[]|any[];
@@ -115,13 +123,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