From 75a11542196800fb61335edf0e09623149c8f36b Mon Sep 17 00:00:00 2001 From: crusader Date: Tue, 5 Jun 2018 18:18:38 +0900 Subject: [PATCH] ing --- src/model/auth/AuthCrawler.ts | 6 ++--- src/model/history/History.ts | 8 +++---- src/model/infra/Infra.ts | 8 +++---- src/model/infra/InfraOS.ts | 4 ++-- src/model/infra/InfraOSPort.ts | 4 ++-- src/model/infra/InfraService.ts | 4 ++-- src/model/member/Member.ts | 4 ++-- src/model/meta/MetaCrawlerInputItem.ts | 8 +++---- src/model/meta/MetaInfraVendor.ts | 4 ++-- src/model/meta/MetaProbePackage.ts | 12 +++++----- src/model/meta/MetaProbeStatus.ts | 1 - src/model/meta/MetaSensorDisplayItem.ts | 12 +++++----- src/model/meta/MetaSensorDisplayMapping.ts | 8 +++---- src/model/meta/MetaSensorItemKey.ts | 22 +++++++++---------- src/model/meta/MetaSensorItemUnit.ts | 8 +++---- src/model/meta/MetaVendorCrawler.ts | 8 +++---- src/model/meta/MetaVendorCrawlerSensorItem.ts | 8 +++---- src/model/noauth/NoAuthProbe.ts | 8 +++---- src/model/probe/Probe.ts | 8 +++---- src/model/probe/ProbeTask.ts | 4 ++-- src/model/sensor-item/SensorItem.ts | 6 ++--- src/model/sensor-item/SensorItemDependency.ts | 6 ++--- src/model/sensor/Sensor.ts | 8 +++---- src/model/sensor/SensorRegistInfo.ts | 6 ++--- 24 files changed, 87 insertions(+), 88 deletions(-) diff --git a/src/model/auth/AuthCrawler.ts b/src/model/auth/AuthCrawler.ts index 775e833..f4b487b 100644 --- a/src/model/auth/AuthCrawler.ts +++ b/src/model/auth/AuthCrawler.ts @@ -1,9 +1,9 @@ -import {Target} from '../target'; -import {MetaCrawler} from '../meta'; +import { Target } from '../target'; +import { MetaCrawler } from '../meta'; export interface AuthCrawler { id?: number; - crawler?: MetaCrawler; + metaCrawler?: MetaCrawler; target?: Target; authJson?: string; createDate?: Date; diff --git a/src/model/history/History.ts b/src/model/history/History.ts index 850a105..7d62dd2 100644 --- a/src/model/history/History.ts +++ b/src/model/history/History.ts @@ -1,12 +1,12 @@ import { MetaHistoryType } from '../meta'; -import {Probe} from '../probe'; -import {Member} from '../member'; -import {Domain} from '../domain'; +import { Probe } from '../probe'; +import { Member } from '../member'; +import { Domain } from '../domain'; export interface History { id?: number; createDate?: Date; - type?: MetaHistoryType; + metaHistoryType?: MetaHistoryType; message?: string; probe?: Probe; member?: Member; diff --git a/src/model/infra/Infra.ts b/src/model/infra/Infra.ts index 7c82c9e..c0a6615 100644 --- a/src/model/infra/Infra.ts +++ b/src/model/infra/Infra.ts @@ -1,10 +1,10 @@ -import {MetaInfraType} from '../meta'; -import {Probe} from '../probe'; -import {Target} from '../target'; +import { MetaInfraType } from '../meta'; +import { Probe } from '../probe'; +import { Target } from '../target'; export interface Infra { id?: number; - infraType?: MetaInfraType; + metaInfraType?: MetaInfraType; createDate?: Date; probe?: Probe; target?: Target; diff --git a/src/model/infra/InfraOS.ts b/src/model/infra/InfraOS.ts index 6efee9b..1fba9bd 100644 --- a/src/model/infra/InfraOS.ts +++ b/src/model/infra/InfraOS.ts @@ -1,9 +1,9 @@ import { InfraMachine } from './InfraMachine'; import { Infra } from './Infra'; -import {MetaInfraVendor} from '../meta'; +import { MetaInfraVendor } from '../meta'; export interface InfraOS extends Infra { machine?: InfraMachine; meta?: string; - vendor?: MetaInfraVendor; + metaInfraVendor?: MetaInfraVendor; } \ No newline at end of file diff --git a/src/model/infra/InfraOSPort.ts b/src/model/infra/InfraOSPort.ts index 894215d..ec57e78 100644 --- a/src/model/infra/InfraOSPort.ts +++ b/src/model/infra/InfraOSPort.ts @@ -1,11 +1,11 @@ import { InfraOS } from './InfraOS'; import { Infra } from './Infra'; -import {MetaInfraVendor} from '../meta'; +import { MetaInfraVendor } from '../meta'; export interface InfraOSPort extends Infra { os?: InfraOS; port?: number; portType?: string; - vendor?: MetaInfraVendor; + metaInfraVendor?: MetaInfraVendor; tlsType?: boolean; } \ No newline at end of file diff --git a/src/model/infra/InfraService.ts b/src/model/infra/InfraService.ts index bdb7f2b..7950b71 100644 --- a/src/model/infra/InfraService.ts +++ b/src/model/infra/InfraService.ts @@ -1,11 +1,11 @@ import { InfraHost } from './InfraHost'; import { Infra } from './Infra'; -import {MetaInfraVendor} from '../meta'; +import { MetaInfraVendor } from '../meta'; export interface InfraService extends Infra { host?: InfraHost; portType?: string; port?: number; - vendor?: MetaInfraVendor; + metaInfraVendor?: MetaInfraVendor; tlsType?: boolean; } \ No newline at end of file diff --git a/src/model/member/Member.ts b/src/model/member/Member.ts index 4ee26a1..c08f680 100644 --- a/src/model/member/Member.ts +++ b/src/model/member/Member.ts @@ -1,4 +1,4 @@ -import {MetaMemberStatus} from '../meta'; +import { MetaMemberStatus } from '../meta'; export interface Member { id?: number; @@ -8,7 +8,7 @@ export interface Member { phone?: string; companyName?: string; createDate?: Date; - status?: MetaMemberStatus; + metaMemberStatus?: MetaMemberStatus; signinFailCount?: number; totpType?: boolean; } \ No newline at end of file diff --git a/src/model/meta/MetaCrawlerInputItem.ts b/src/model/meta/MetaCrawlerInputItem.ts index a948e16..b91a887 100644 --- a/src/model/meta/MetaCrawlerInputItem.ts +++ b/src/model/meta/MetaCrawlerInputItem.ts @@ -1,10 +1,10 @@ -import {MetaInputType} from './MetaInputType'; -import {MetaCrawler} from './MetaCrawler'; +import { MetaInputType } from './MetaInputType'; +import { MetaCrawler } from './MetaCrawler'; export interface MetaCrawlerInputItem { id?: number; - inputType?: MetaInputType; - crawler?: MetaCrawler; + metaInputType?: MetaInputType; + metaCrawler?: MetaCrawler; description?: string; name?: string; createDate?: Date; diff --git a/src/model/meta/MetaInfraVendor.ts b/src/model/meta/MetaInfraVendor.ts index 44308e0..414c22f 100644 --- a/src/model/meta/MetaInfraVendor.ts +++ b/src/model/meta/MetaInfraVendor.ts @@ -1,10 +1,10 @@ -import {MetaInfraType} from './MetaInfraType'; +import { MetaInfraType } from './MetaInfraType'; export interface MetaInfraVendor { id?: number; name?: string; createDate?: Date; - infraType?: MetaInfraType; + metaInfraType?: MetaInfraType; } diff --git a/src/model/meta/MetaProbePackage.ts b/src/model/meta/MetaProbePackage.ts index 3127561..56c29d4 100644 --- a/src/model/meta/MetaProbePackage.ts +++ b/src/model/meta/MetaProbePackage.ts @@ -1,11 +1,11 @@ -import {MetaProbeVersion} from './MetaProbeVersion'; -import {MetaProbeOs} from './MetaProbeOs'; -import {MetaProbeArchitecture} from './MetaProbeArchitecture'; +import { MetaProbeVersion } from './MetaProbeVersion'; +import { MetaProbeOs } from './MetaProbeOs'; +import { MetaProbeArchitecture } from './MetaProbeArchitecture'; export interface MetaProbePackage { id?: number; - version?: MetaProbeVersion; - os?: MetaProbeOs; - architecture?: MetaProbeArchitecture; + metaProbeVersion?: MetaProbeVersion; + metaProbeOs?: MetaProbeOs; + metaProbeArchitecture?: MetaProbeArchitecture; createDate?: Date; } \ No newline at end of file diff --git a/src/model/meta/MetaProbeStatus.ts b/src/model/meta/MetaProbeStatus.ts index fbd2d3b..1b01f1d 100644 --- a/src/model/meta/MetaProbeStatus.ts +++ b/src/model/meta/MetaProbeStatus.ts @@ -4,7 +4,6 @@ export interface MetaProbeStatus { name?: string; } - export enum MetaProbeStatus_ID { INITIAL = 1, NORMAL = 2, diff --git a/src/model/meta/MetaSensorDisplayItem.ts b/src/model/meta/MetaSensorDisplayItem.ts index 2f7fa00..e53da31 100644 --- a/src/model/meta/MetaSensorDisplayItem.ts +++ b/src/model/meta/MetaSensorDisplayItem.ts @@ -1,6 +1,6 @@ -import {MetaCrawler} from './MetaCrawler'; -import {MetaSensorItemUnit} from './MetaSensorItemUnit'; -import {MetaSensorItemType} from './MetaSensorItemType'; +import { MetaCrawler } from './MetaCrawler'; +import { MetaSensorItemUnit } from './MetaSensorItemUnit'; +import { MetaSensorItemType } from './MetaSensorItemType'; export interface MetaSensorDisplayItem { @@ -8,9 +8,9 @@ export interface MetaSensorDisplayItem { key?: string; displayName?: string; description?: string; - crawler?: MetaCrawler; - unit?: MetaSensorItemUnit; + metaCrawler?: MetaCrawler; + metaSensorItemUnit?: MetaSensorItemUnit; createDate?: Date; - itemType?: MetaSensorItemType; + metaSensorItemType?: MetaSensorItemType; default?: boolean; } \ No newline at end of file diff --git a/src/model/meta/MetaSensorDisplayMapping.ts b/src/model/meta/MetaSensorDisplayMapping.ts index 876919d..22afe0d 100644 --- a/src/model/meta/MetaSensorDisplayMapping.ts +++ b/src/model/meta/MetaSensorDisplayMapping.ts @@ -1,8 +1,8 @@ -import {MetaSensorDisplayItem} from './MetaSensorDisplayItem'; -import {MetaSensorItemKey} from './MetaSensorItemKey'; +import { MetaSensorDisplayItem } from './MetaSensorDisplayItem'; +import { MetaSensorItemKey } from './MetaSensorItemKey'; export interface MetaSensorDisplayMapping { id?: number; - displayItem?: MetaSensorDisplayItem; - itemKey?: MetaSensorItemKey; + metaSensorDisplayItem?: MetaSensorDisplayItem; + metaSensorItemKey?: MetaSensorItemKey; } \ No newline at end of file diff --git a/src/model/meta/MetaSensorItemKey.ts b/src/model/meta/MetaSensorItemKey.ts index a26a299..4b53abe 100644 --- a/src/model/meta/MetaSensorItemKey.ts +++ b/src/model/meta/MetaSensorItemKey.ts @@ -1,14 +1,14 @@ -import {MetaSensorItem} from './MetaSensorItem'; -import {MetaCrawler} from './MetaCrawler'; -import {MetaSensorItemUnit} from './MetaSensorItemUnit'; +import { MetaSensorItem } from './MetaSensorItem'; +import { MetaCrawler } from './MetaCrawler'; +import { MetaSensorItemUnit } from './MetaSensorItemUnit'; export interface MetaSensorItemKey { - id?: number; - item?: MetaSensorItem; - key?: string; - froms?: string; - option?: string; - crawler?: MetaCrawler; - createDate?: Date; - unit?: MetaSensorItemUnit; + id?: number; + metaSensorItem?: MetaSensorItem; + key?: string; + froms?: string; + option?: string; + metaCrawler?: MetaCrawler; + createDate?: Date; + metaSensorItemUnit?: MetaSensorItemUnit; } \ No newline at end of file diff --git a/src/model/meta/MetaSensorItemUnit.ts b/src/model/meta/MetaSensorItemUnit.ts index dc7e663..5aa8899 100644 --- a/src/model/meta/MetaSensorItemUnit.ts +++ b/src/model/meta/MetaSensorItemUnit.ts @@ -1,7 +1,7 @@ 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/MetaVendorCrawler.ts b/src/model/meta/MetaVendorCrawler.ts index 68e3d71..81106f1 100644 --- a/src/model/meta/MetaVendorCrawler.ts +++ b/src/model/meta/MetaVendorCrawler.ts @@ -1,9 +1,9 @@ -import {MetaCrawler} from './MetaCrawler'; -import {MetaInfraVendor} from './MetaInfraVendor'; +import { MetaCrawler } from './MetaCrawler'; +import { MetaInfraVendor } from './MetaInfraVendor'; export interface MetaVendorCrawler { id?: number; - crawler: MetaCrawler; - infraVendor: MetaInfraVendor; + metaCrawler: MetaCrawler; + metaInfraVendor: MetaInfraVendor; createDate: Date; } diff --git a/src/model/meta/MetaVendorCrawlerSensorItem.ts b/src/model/meta/MetaVendorCrawlerSensorItem.ts index 6175ed8..c7277bb 100644 --- a/src/model/meta/MetaVendorCrawlerSensorItem.ts +++ b/src/model/meta/MetaVendorCrawlerSensorItem.ts @@ -1,12 +1,12 @@ -import {MetaSensorItem} from './MetaSensorItem'; -import {MetaInfraVendor} from './MetaInfraVendor'; +import { MetaSensorItem } from './MetaSensorItem'; +import { MetaInfraVendor } from './MetaInfraVendor'; export interface MetaVendorCrawlerSensorItem { id?: number; interval: string; warnCondition: string; createDate: Date; - sensorItem: MetaSensorItem; - vendor: MetaInfraVendor; + metaSensorItem: MetaSensorItem; + metaInfraVendor: MetaInfraVendor; crawlerId: number; } diff --git a/src/model/noauth/NoAuthProbe.ts b/src/model/noauth/NoAuthProbe.ts index ec34c90..9c37d98 100644 --- a/src/model/noauth/NoAuthProbe.ts +++ b/src/model/noauth/NoAuthProbe.ts @@ -1,13 +1,13 @@ -import {MetaNoAuthProbeStatus} from '../meta'; -import {Domain} from '../domain'; -import {Probe} from '../probe'; +import { MetaNoAuthProbeStatus } from '../meta'; +import { Domain } from '../domain'; +import { Probe } from '../probe'; import { NoAuthProbeDescription } from './NoAuthProbeDescription'; export interface NoAuthProbe { id?: number; description?: string; descriptions?: NoAuthProbeDescription; - status?: MetaNoAuthProbeStatus; + metaNoAuthProbeStatus?: MetaNoAuthProbeStatus; tempProbeKey?: string; createDate?: Date; apiKey?: string; diff --git a/src/model/probe/Probe.ts b/src/model/probe/Probe.ts index 7e3dd07..cafff06 100644 --- a/src/model/probe/Probe.ts +++ b/src/model/probe/Probe.ts @@ -1,10 +1,10 @@ -import {MetaProbeStatus} from '../meta'; -import {Domain} from '../domain'; -import {Member} from '../member'; +import { MetaProbeStatus } from '../meta'; +import { Domain } from '../domain'; +import { Member } from '../member'; export interface Probe { id?: number; - status?: MetaProbeStatus; + metaProbeStatus?: MetaProbeStatus; description?: string; createDate?: Date; domain?: Domain; diff --git a/src/model/probe/ProbeTask.ts b/src/model/probe/ProbeTask.ts index 77002d9..4403a3c 100644 --- a/src/model/probe/ProbeTask.ts +++ b/src/model/probe/ProbeTask.ts @@ -1,9 +1,9 @@ import { Probe } from './Probe'; -import {MetaProbeTaskType} from '../meta'; +import { MetaProbeTaskType } from '../meta'; export interface ProbeTask { id?: number; - taskType?: MetaProbeTaskType; + metaProbeTaskType?: MetaProbeTaskType; probe?: Probe; data?: string; createDate?: Date; diff --git a/src/model/sensor-item/SensorItem.ts b/src/model/sensor-item/SensorItem.ts index cd26698..aef6056 100644 --- a/src/model/sensor-item/SensorItem.ts +++ b/src/model/sensor-item/SensorItem.ts @@ -1,9 +1,9 @@ -import {Sensor} from '../sensor'; -import {MetaSensorDisplayItem} from '../meta'; +import { Sensor } from '../sensor'; +import { MetaSensorDisplayItem } from '../meta'; export interface SensorItem { id?: number; sensor?: Sensor; - item?: MetaSensorDisplayItem; + metaSensorDisplayItem?: MetaSensorDisplayItem; createDate?: Date; } diff --git a/src/model/sensor-item/SensorItemDependency.ts b/src/model/sensor-item/SensorItemDependency.ts index 1cf5c45..13e64da 100644 --- a/src/model/sensor-item/SensorItemDependency.ts +++ b/src/model/sensor-item/SensorItemDependency.ts @@ -1,7 +1,7 @@ -import {MetaSensorDisplayItem, MetaSensorItemKey} from '../meta'; +import { MetaSensorDisplayItem, MetaSensorItemKey } from '../meta'; export interface SensorItemDependency { id?: number; - displayItem?: MetaSensorDisplayItem; - sensorItem?: MetaSensorItemKey; + metaSensorDisplayItem?: MetaSensorDisplayItem; + metaSensorItemKey?: MetaSensorItemKey; } diff --git a/src/model/sensor/Sensor.ts b/src/model/sensor/Sensor.ts index 1e3f5a7..d3f0ae4 100644 --- a/src/model/sensor/Sensor.ts +++ b/src/model/sensor/Sensor.ts @@ -1,13 +1,13 @@ -import {MetaCrawler, MetaSensorStatus} from '../meta'; -import {Target} from '../target'; +import { MetaCrawler, MetaSensorStatus } from '../meta'; +import { Target } from '../target'; export interface Sensor { id?: number; createDate?: Date; description?: string; - status?: MetaSensorStatus; + metaSensorStatus?: MetaSensorStatus; target?: Target; - crawler?: MetaCrawler; + metaCrawler?: MetaCrawler; crawlerInputItems?: string; itemCount?: number; } \ No newline at end of file diff --git a/src/model/sensor/SensorRegistInfo.ts b/src/model/sensor/SensorRegistInfo.ts index 96c585a..16a5a73 100644 --- a/src/model/sensor/SensorRegistInfo.ts +++ b/src/model/sensor/SensorRegistInfo.ts @@ -1,9 +1,9 @@ -import {MetaCrawler, MetaSensorDisplayItem} from '../meta'; -import {Infra} from '../infra'; +import { MetaCrawler, MetaSensorDisplayItem } from '../meta'; +import { Infra } from '../infra'; export interface SensorRegistInfo { sensorItemMap: Map>; - crawler: MetaCrawler; + metaCrawler: MetaCrawler; // targetId: number; interval: number; // type: string;