From 27cd36be226ca2434f06b1ae9e4d43f1fea639ab Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 25 Jun 2018 16:40:28 +0800
Subject: [PATCH] 组织配置单位和页面显示

---
 src/app/business/entity/data.ts |   68 ++++++++++++++++++++++++++--------
 1 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index b963553..2cd044c 100644
--- a/src/app/business/entity/data.ts
+++ b/src/app/business/entity/data.ts
@@ -1,12 +1,13 @@
-import { LineChartCriteria } from './data';
 import { Column } from '@business/entity/grid';
-import { AlarmStyle, TimeUnits, AreaRange } from '@business/enum/types.enum';
+import { AlarmStyle, TimeUnits, AreaRange, DeviceDimension, Operator } from '@business/enum/types.enum';
 
 
 export interface AreaNames {
     provinceName?: string;
     cityName?: string;
     areaName?: string;
+    townName?: string;
+    villageName?: string;
 }
 // ���������
 export interface Sensor {
@@ -47,7 +48,7 @@
     version?: Column|any;
   }
 
-  // ���������
+  // ������������
   export interface MonitorPoint {
     address?: any|Column;
     areaCode?: any|Column;
@@ -62,6 +63,9 @@
     provinceCode?: any|Column;
     areaNames?: AreaNames|any ;
     organization?: Organization;
+    townCode?: any|Column;
+    villageCode?: any|Column;
+
   }
 
  // ������������
@@ -100,6 +104,7 @@
   mac?: any|Column;
   monitorPoint?: any|Column;
   monitorPointId?: any|Column;
+  professionId?: any|Column;
   name?: any|Column;
   operateUser?: any|Column;
   operateUserId?: any|Column;
@@ -108,6 +113,7 @@
 
 export interface AlarmMode {
   enable: boolean|any[];
+  interval: number;
   level1: AlarmStyle[]|any[];
   level2: AlarmStyle[]|any[];
   level3: AlarmStyle[]|any[];
@@ -134,18 +140,48 @@
   organizationId: number;
   username: string;
 }
-export interface TimePeriod {
-  startTime: Date; // ������������
-  endTime: Date; // ������������
-}
-export interface DataCondition {
-  timeUnits?: TimeUnits; // ������
-  actualTime?: Date; // ������������
-  areaRange?: AreaRange; // ������������
-  areaRangeId?: number; // ���������������ID
-}
+
+
 export interface LineChartCriteria {
-  sensorKey: String;
-  timePeriod: TimePeriod;
-  dataConditions: DataCondition[];
+  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;
+}
+export interface OperatorRule {
+  operator: Operator;
+  value: number;
+}
+export interface SensorUnit {
+  id?: number|any;
+  originalUnitName?: string;
+  name?: string|any;
+  rules?: OperatorRule[]|any;
+  sensorId?: number|any;
+}
+export interface OrganizationSensorUnit {
+  id?: number|any;
+  sensorUnitId?: number|any;
+  sensorUnit?: SensorUnit|any;
+  sensor?: Sensor|any;
+  organizationId?: number|any;
 }

--
Gitblit v1.8.0