From 96fdfd4f4ab0276c4179b8e04ae51c45e4ba0558 Mon Sep 17 00:00:00 2001 From: snoop Date: Thu, 26 Apr 2018 18:37:14 +0900 Subject: [PATCH] fixed mode java -> ts --- src/model/commons/PageParams.ts | 7 ++++ .../meta/probe-task-type/MetaProbeTaskType.ts | 14 ++++++-- .../meta/probe-version/MetaProbeVersion.ts | 13 +++++-- .../MetaSensorDisplayItem.ts | 17 ++++++++-- .../MetaSensorDisplayMapping.ts | 8 +++++ .../meta/sensor-item-key/MetaSensorItemKey.ts | 28 ++++++++++----- .../sensor-item-type/MetaSensorItemType.ts | 10 +++++- .../sensor-item-unit/MetaSensorItemUnit.ts | 18 +++++++--- src/model/meta/sensor-item/MetaSensorItem.ts | 11 ++++-- .../meta/sensor-status/MetaSensorStatus.ts | 5 +++ .../MetaVendorCrawlerSensorItem.ts | 12 +++++++ .../meta/vendor-crawler/MetaVendorCrawler.ts | 10 ++++++ src/model/noauth/NoAuthProbe.ts | 34 +++++++++++++------ src/model/notification/Notification.ts | 13 +++++-- src/model/probe/Probe.ts | 23 ++++++++++--- src/model/probe/ProbeHost.ts | 8 ++++- src/model/probe/ProbeTask.ts | 30 +++++++++++----- src/model/sensor-item/SensorItem.ts | 8 +++++ src/model/sensor-item/SensorItemDependency.ts | 8 ++++- src/model/sensor/Sensor.ts | 13 ++++++- src/model/target/Target.ts | 11 +++++- 21 files changed, 247 insertions(+), 54 deletions(-) create mode 100644 src/model/commons/PageParams.ts create mode 100644 src/model/meta/sensor-display-mapping/MetaSensorDisplayMapping.ts create mode 100644 src/model/meta/vendor-crawler-sensor-item/MetaVendorCrawlerSensorItem.ts create mode 100644 src/model/meta/vendor-crawler/MetaVendorCrawler.ts diff --git a/src/model/commons/PageParams.ts b/src/model/commons/PageParams.ts new file mode 100644 index 0000000..fcb5c2f --- /dev/null +++ b/src/model/commons/PageParams.ts @@ -0,0 +1,7 @@ + +export interface PageParams { + pageNo: number; + countPerPage: number; + sortCol: string; + sortDirection: string; +} \ No newline at end of file diff --git a/src/model/meta/probe-task-type/MetaProbeTaskType.ts b/src/model/meta/probe-task-type/MetaProbeTaskType.ts index d6a9f4b..a46caf5 100644 --- a/src/model/meta/probe-task-type/MetaProbeTaskType.ts +++ b/src/model/meta/probe-task-type/MetaProbeTaskType.ts @@ -1,7 +1,15 @@ +// export interface MetaProbeTaskType { +// id?: number; +// name: string; +// description: string; +// createDate: Date; +// } + + export interface MetaProbeTaskType { id?: number; - name: string; - description: string; - createDate: Date; + name?: string; + description?: string; + createDate?: Date; } diff --git a/src/model/meta/probe-version/MetaProbeVersion.ts b/src/model/meta/probe-version/MetaProbeVersion.ts index dc9a2f1..9cc9142 100644 --- a/src/model/meta/probe-version/MetaProbeVersion.ts +++ b/src/model/meta/probe-version/MetaProbeVersion.ts @@ -1,5 +1,12 @@ +// export interface MetaProbeVersion { +// id?: number; +// version: string; +// createDate: Date; +// } + + export interface MetaProbeVersion { id?: number; - version: string; - createDate: Date; -} + version?: string; + createDate?: Date; +} \ No newline at end of file diff --git a/src/model/meta/sensor-display-item/MetaSensorDisplayItem.ts b/src/model/meta/sensor-display-item/MetaSensorDisplayItem.ts index c4a722a..8809a68 100644 --- a/src/model/meta/sensor-display-item/MetaSensorDisplayItem.ts +++ b/src/model/meta/sensor-display-item/MetaSensorDisplayItem.ts @@ -2,6 +2,19 @@ import { MetaCrawler } from 'model/meta/crawler/MetaCrawler'; import { MetaSensorItemUnit } from 'model/meta/sensor-item-unit/MetaSensorItemUnit'; import { MetaSensorItemType } from 'model/meta/sensor-item-type/MetaSensorItemType'; +// export interface MetaSensorDisplayItem { +// id?: number; +// key?: string; +// displayName?: string; +// description?: string; +// crawler?: MetaCrawler; +// unit?: MetaSensorItemUnit; +// createDate?: Date; +// default?: boolean; +// itemType?: MetaSensorItemType; +// } + + export interface MetaSensorDisplayItem { id?: number; key?: string; @@ -10,6 +23,6 @@ export interface MetaSensorDisplayItem { crawler?: MetaCrawler; unit?: MetaSensorItemUnit; createDate?: Date; - default?: boolean; itemType?: MetaSensorItemType; -} + default?: boolean; +} \ No newline at end of file diff --git a/src/model/meta/sensor-display-mapping/MetaSensorDisplayMapping.ts b/src/model/meta/sensor-display-mapping/MetaSensorDisplayMapping.ts new file mode 100644 index 0000000..4b3a934 --- /dev/null +++ b/src/model/meta/sensor-display-mapping/MetaSensorDisplayMapping.ts @@ -0,0 +1,8 @@ +import { MetaSensorDisplayItem } from "model/meta/sensor-display-item/MetaSensorDisplayItem"; +import { MetaSensorItemKey } from "model/meta/sensor-item-key/MetaSensorItemKey"; + +export interface MetaSensorDisplayMapping { + id?: number; + displayItem?: MetaSensorDisplayItem; + itemKey?: MetaSensorItemKey; +} \ No newline at end of file diff --git a/src/model/meta/sensor-item-key/MetaSensorItemKey.ts b/src/model/meta/sensor-item-key/MetaSensorItemKey.ts index 04c7392..459b4e4 100644 --- a/src/model/meta/sensor-item-key/MetaSensorItemKey.ts +++ b/src/model/meta/sensor-item-key/MetaSensorItemKey.ts @@ -1,12 +1,24 @@ import { MetaSensorItem } from 'model/meta/sensor-item/MetaSensorItem'; import { MetaCrawler } from 'model/meta/crawler/MetaCrawler'; +import { MetaSensorItemUnit } from 'model/meta/sensor-item-unit/MetaSensorItemUnit'; + +// export interface MetaSensorItemKey { +// id: number; +// item: MetaSensorItem; +// key: string; +// froms: string; +// option: string; +// crawler: MetaCrawler; +// createDate: Date; +// } export interface MetaSensorItemKey { - id: number; - item: MetaSensorItem; - key: string; - froms: string; - option: string; - crawler: MetaCrawler; - createDate: Date; -} + id?: number; + item?: MetaSensorItem; + key?: string; + froms?: string; + option?: string; + crawler?: MetaCrawler; + createDate?: Date; + unit?: MetaSensorItemUnit; +} \ No newline at end of file diff --git a/src/model/meta/sensor-item-type/MetaSensorItemType.ts b/src/model/meta/sensor-item-type/MetaSensorItemType.ts index 648d7db..597e186 100644 --- a/src/model/meta/sensor-item-type/MetaSensorItemType.ts +++ b/src/model/meta/sensor-item-type/MetaSensorItemType.ts @@ -1,6 +1,14 @@ +// export interface MetaSensorItemType { +// id?: number; +// name?: string; +// description?: string; +// createDate?: Date; +// } + + export interface MetaSensorItemType { id?: number; name?: string; description?: string; createDate?: Date; -} +} \ No newline at end of file diff --git a/src/model/meta/sensor-item-unit/MetaSensorItemUnit.ts b/src/model/meta/sensor-item-unit/MetaSensorItemUnit.ts index 0a48e66..d5e7c34 100644 --- a/src/model/meta/sensor-item-unit/MetaSensorItemUnit.ts +++ b/src/model/meta/sensor-item-unit/MetaSensorItemUnit.ts @@ -1,6 +1,14 @@ +// export interface MetaSensorItemUnit { +// id: number; +// unit: string; +// createDate: Date; +// mark: string; +// } + + export interface MetaSensorItemUnit { - id: number; - unit: string; - createDate: Date; - mark: string; -} + id?: number; + unit?: string; + createDate?: Date; + mark?: string; +} \ No newline at end of file diff --git a/src/model/meta/sensor-item/MetaSensorItem.ts b/src/model/meta/sensor-item/MetaSensorItem.ts index 7d12762..1e995f9 100644 --- a/src/model/meta/sensor-item/MetaSensorItem.ts +++ b/src/model/meta/sensor-item/MetaSensorItem.ts @@ -1,10 +1,17 @@ import { MetaSensorItemType } from 'model/meta/sensor-item-type/MetaSensorItemType'; +// export interface MetaSensorItem { +// id?: number; +// itemType?: MetaSensorItemType; +// key?: string; +// name?: string; +// createDate?: Date; +// } + export interface MetaSensorItem { id?: number; - itemType?: MetaSensorItemType; key?: string; name?: string; createDate?: Date; -} +} \ No newline at end of file diff --git a/src/model/meta/sensor-status/MetaSensorStatus.ts b/src/model/meta/sensor-status/MetaSensorStatus.ts index be82dac..e642c95 100644 --- a/src/model/meta/sensor-status/MetaSensorStatus.ts +++ b/src/model/meta/sensor-status/MetaSensorStatus.ts @@ -1,4 +1,9 @@ +// export interface MetaSensorStatus { +// id?: number; +// name?: string; +// } + export interface MetaSensorStatus { id?: number; name?: string; diff --git a/src/model/meta/vendor-crawler-sensor-item/MetaVendorCrawlerSensorItem.ts b/src/model/meta/vendor-crawler-sensor-item/MetaVendorCrawlerSensorItem.ts new file mode 100644 index 0000000..5399afb --- /dev/null +++ b/src/model/meta/vendor-crawler-sensor-item/MetaVendorCrawlerSensorItem.ts @@ -0,0 +1,12 @@ +import { MetaSensorItem } from "../sensor-item/MetaSensorItem"; +import { MetaInfraVendor } from "../infra-vendor/MetaInfraVendor"; + +export interface MetaVendorCrawlerSensorItem { + id?: number; + interval?: string; + warnCondition?: string; + createDate?: Date; + sensorItem?: MetaSensorItem; + vendor?: MetaInfraVendor; + crawlerId?: number; +} \ No newline at end of file diff --git a/src/model/meta/vendor-crawler/MetaVendorCrawler.ts b/src/model/meta/vendor-crawler/MetaVendorCrawler.ts new file mode 100644 index 0000000..d1cbc9a --- /dev/null +++ b/src/model/meta/vendor-crawler/MetaVendorCrawler.ts @@ -0,0 +1,10 @@ +import { MetaCrawler } from "../crawler/MetaCrawler"; +import { MetaInfraVendor } from "../infra-vendor/MetaInfraVendor"; + + +export interface MetaVendorCrawler { + id?: number; + crawler?: MetaCrawler; + infraVendor?: MetaInfraVendor; + createDate?: Date; +} \ No newline at end of file diff --git a/src/model/noauth/NoAuthProbe.ts b/src/model/noauth/NoAuthProbe.ts index db2a25a..d8adb1b 100644 --- a/src/model/noauth/NoAuthProbe.ts +++ b/src/model/noauth/NoAuthProbe.ts @@ -2,17 +2,29 @@ import { Probe } from 'model/probe'; import { Domain } from 'model/domain'; import { MetaNoAuthProbeStatus } from 'model/meta/noauth-probe-status/MetaNoAuthProbeStatus'; +// export interface NoAuthProbe { +// // id?: number; +// // hostName?: string; +// // macAddress?: number; +// // ipAddress?: number; +// // status?: MetaNoAuthProbeStatus; +// // tempProbeKey?: string; +// // createDate?: Date; +// // apiKey?: string; +// // domain?: Domain; +// // probe?: Probe; +// id?: number; +// description?: string; +// status?: MetaNoAuthProbeStatus; +// tempProbeKey?: string; +// createDate?: Date; +// apiKey?: string; +// domain?: Domain; +// probe?: Probe; +// } + + export interface NoAuthProbe { - // id?: number; - // hostName?: string; - // macAddress?: number; - // ipAddress?: number; - // status?: MetaNoAuthProbeStatus; - // tempProbeKey?: string; - // createDate?: Date; - // apiKey?: string; - // domain?: Domain; - // probe?: Probe; id?: number; description?: string; status?: MetaNoAuthProbeStatus; @@ -21,4 +33,4 @@ export interface NoAuthProbe { apiKey?: string; domain?: Domain; probe?: Probe; -} +} \ No newline at end of file diff --git a/src/model/notification/Notification.ts b/src/model/notification/Notification.ts index 91896c9..c4c64ce 100644 --- a/src/model/notification/Notification.ts +++ b/src/model/notification/Notification.ts @@ -1,6 +1,17 @@ import { Member } from 'model/member'; +// export interface Notification { +// id?: number; +// createDate?: Date; +// title?: string; +// message?: string; +// member?: Member; +// confirmDate?: Date; +// url?: string; +// } + + export interface Notification { id?: number; createDate?: Date; @@ -10,5 +21,3 @@ export interface Notification { confirmDate?: Date; url?: string; } - - diff --git a/src/model/probe/Probe.ts b/src/model/probe/Probe.ts index a23269a..7e6267a 100644 --- a/src/model/probe/Probe.ts +++ b/src/model/probe/Probe.ts @@ -3,9 +3,26 @@ import { Member } from 'model/member/'; import { Infra } from 'model/infra/'; import { MetaProbeStatus } from 'model/meta/probe-status/MetaProbeStatus'; +// export interface Probe { +// id?: number; +// status?: MetaProbeStatus; // INITIAL / NORMAL +// description?: string; +// createDate?: Date; +// domain?: Domain; +// probeKey?: string; +// encryptionKey?: string; +// displayName?: string; +// cidr?: string; +// authorizeDate?: Date; +// authorizeMember?: Member; +// // host?: InfraHost; +// targets?: Infra[]; +// } + + export interface Probe { id?: number; - status?: MetaProbeStatus; // INITIAL / NORMAL + status?: MetaProbeStatus; description?: string; createDate?: Date; domain?: Domain; @@ -15,6 +32,4 @@ export interface Probe { cidr?: string; authorizeDate?: Date; authorizeMember?: Member; - // host?: InfraHost; - targets?: Infra[]; -} +} \ No newline at end of file diff --git a/src/model/probe/ProbeHost.ts b/src/model/probe/ProbeHost.ts index e0d4eca..e0eb05f 100644 --- a/src/model/probe/ProbeHost.ts +++ b/src/model/probe/ProbeHost.ts @@ -2,8 +2,14 @@ import { Probe } from './Probe'; import { InfraHost } from 'model/infra'; +// export interface ProbeHost { +// id?: number; +// probe?: Probe; +// host?: InfraHost; +// } + export interface ProbeHost { id?: number; probe?: Probe; host?: InfraHost; -} +} \ No newline at end of file diff --git a/src/model/probe/ProbeTask.ts b/src/model/probe/ProbeTask.ts index 9605206..f90d74a 100644 --- a/src/model/probe/ProbeTask.ts +++ b/src/model/probe/ProbeTask.ts @@ -1,14 +1,26 @@ import { Probe } from './Probe'; import { MetaProbeTaskType } from 'model/meta/probe-task-type/MetaProbeTaskType'; +// export interface ProbeTask { +// id?: number; +// taskType: MetaProbeTaskType; +// probe: Probe; +// data: string; +// createDate: Date; +// sendDate: Date; +// startDate: Date; +// endDate: Date; +// succeed: boolean; +// } + export interface ProbeTask { id?: number; - taskType: MetaProbeTaskType; - probe: Probe; - data: string; - createDate: Date; - sendDate: Date; - startDate: Date; - endDate: Date; - succeed: boolean; -} + taskType?: MetaProbeTaskType; + probe?: Probe; + data?: string; + createDate?: Date; + sendDate?: Date; + startDate?: Date; + endDate?: Date; + succeed?: boolean; +} \ No newline at end of file diff --git a/src/model/sensor-item/SensorItem.ts b/src/model/sensor-item/SensorItem.ts index 2c07e0f..aba6c02 100644 --- a/src/model/sensor-item/SensorItem.ts +++ b/src/model/sensor-item/SensorItem.ts @@ -1,6 +1,14 @@ import { MetaSensorDisplayItem } from 'model/meta/sensor-display-item/MetaSensorDisplayItem'; import { Sensor } from 'model/sensor'; +// export interface SensorItem { +// id?: number; +// sensor?: Sensor; +// item?: MetaSensorDisplayItem; +// createDate?: Date; +// } + + export interface SensorItem { id?: number; sensor?: Sensor; diff --git a/src/model/sensor-item/SensorItemDependency.ts b/src/model/sensor-item/SensorItemDependency.ts index 4cef543..e11c282 100644 --- a/src/model/sensor-item/SensorItemDependency.ts +++ b/src/model/sensor-item/SensorItemDependency.ts @@ -1,8 +1,14 @@ import { MetaSensorDisplayItem } from 'model/meta/sensor-display-item/MetaSensorDisplayItem'; import { MetaSensorItemKey } from 'model/meta/sensor-item-key/MetaSensorItemKey'; +// export interface SensorItemDependency { +// id?: number; +// item?: MetaSensorDisplayItem; +// sensorItem?: MetaSensorItemKey; +// } + export interface SensorItemDependency { id?: number; - item?: MetaSensorDisplayItem; + displayItem?: MetaSensorDisplayItem; sensorItem?: MetaSensorItemKey; } diff --git a/src/model/sensor/Sensor.ts b/src/model/sensor/Sensor.ts index e88a832..851a626 100644 --- a/src/model/sensor/Sensor.ts +++ b/src/model/sensor/Sensor.ts @@ -2,6 +2,17 @@ import { Target } from 'model/target'; import { MetaSensorStatus } from 'model/meta/sensor-status/MetaSensorStatus'; import { MetaCrawler } from 'model/meta/crawler/MetaCrawler'; +// export interface Sensor { +// id?: number; +// createDate?: Date; +// description?: string; +// status?: MetaSensorStatus; +// target?: Target; +// crawler?: MetaCrawler; +// crawlerInputItems?: string; +// itemCount?: number; +// } + export interface Sensor { id?: number; createDate?: Date; @@ -11,4 +22,4 @@ export interface Sensor { crawler?: MetaCrawler; crawlerInputItems?: string; itemCount?: number; -} +} \ No newline at end of file diff --git a/src/model/target/Target.ts b/src/model/target/Target.ts index a174583..6bc6dd2 100644 --- a/src/model/target/Target.ts +++ b/src/model/target/Target.ts @@ -2,10 +2,19 @@ import { Probe } from 'model/probe'; import { Infra } from 'model/infra'; import { Sensor } from 'model/sensor'; +// export interface Target { +// id?: number; +// createDate?: Date; +// displayName?: string; +// description?: string; +// sensors?: Sensor[]; +// } + + export interface Target { id?: number; createDate?: Date; displayName?: string; description?: string; sensors?: Sensor[]; -} +} \ No newline at end of file