From 7b089c913a281a3286b3c72456e3aab67f402720 Mon Sep 17 00:00:00 2001 From: crusader Date: Wed, 4 Jul 2018 21:13:30 +0900 Subject: [PATCH] ing --- model/sensor/Sensor.go | 18 +++++++++--------- model/sensor/SensorItem.go | 8 ++++---- model/sensor/SensorItemDependency.go | 13 ------------- 3 files changed, 13 insertions(+), 26 deletions(-) delete mode 100644 model/sensor/SensorItemDependency.go diff --git a/model/sensor/Sensor.go b/model/sensor/Sensor.go index 383f716..e235e79 100644 --- a/model/sensor/Sensor.go +++ b/model/sensor/Sensor.go @@ -9,13 +9,13 @@ import ( ) type Sensor struct { - ID json.Number `json:"id,Number,omitempty"` - Target *target.Target `json:"target,omitempty"` - Name string `json:"name,omitempty"` - Description string `json:"description,omitempty"` - MetaSensorStatus *meta.MetaSensorStatus `json:"metaSensorStatus,omitempty"` - MetaCrawler *meta.MetaCrawler `json:"metaCrawler,omitempty"` - CrawlerInputItems string `json:"crawlerInputItems,omitempty"` - ItemCount json.Number `json:"itemCount,omitempty"` - CreateDate *util.Timestamp `json:"createDate,omitempty"` + ID json.Number `json:"id,Number,omitempty"` + Target *target.Target `json:"target,omitempty"` + Name string `json:"name,omitempty"` + MetaSensorStatus *meta.MetaSensorStatus `json:"metaSensorStatus,omitempty"` + MetaCrawlerMapping *meta.MetaCrawlerMapping `json:"metaCrawlerMapping,omitempty"` + CrawlerInputItems string `json:"crawlerInputItems,omitempty"` + ItemCount json.Number `json:"itemCount,omitempty"` + CreateDate *util.Timestamp `json:"createDate,omitempty"` + Interval json.Number `json:"interval,Number,omitempty"` } diff --git a/model/sensor/SensorItem.go b/model/sensor/SensorItem.go index 89e1b74..f0d02f0 100644 --- a/model/sensor/SensorItem.go +++ b/model/sensor/SensorItem.go @@ -8,8 +8,8 @@ import ( ) type SensorItem struct { - ID json.Number `json:"id,Number,omitempty"` - Sensor *Sensor `json:"sensor,omitempty"` - MetaSensorItem *meta.MetaSensorItem `json:"metaSensorItem,omitempty"` - CreateDate *util.Timestamp `json:"createDate,omitempty"` + ID json.Number `json:"id,Number,omitempty"` + Sensor *Sensor `json:"sensor,omitempty"` + MetaDisplayItemMapping *meta.MetaDisplayItemMapping `json:"metaDisplayItemMapping,omitempty"` + CreateDate *util.Timestamp `json:"createDate,omitempty"` } diff --git a/model/sensor/SensorItemDependency.go b/model/sensor/SensorItemDependency.go deleted file mode 100644 index ead3969..0000000 --- a/model/sensor/SensorItemDependency.go +++ /dev/null @@ -1,13 +0,0 @@ -package sensor - -import ( - "encoding/json" - - "git.loafle.net/overflow/commons-go/model/meta" -) - -type SensorItemDependency struct { - ID json.Number `json:"id,Number,omitempty"` - MetaSensorDisplayItem *meta.MetaSensorDisplayItem `json:"metaSensorDisplayItem,omitempty"` - MetaSensorItemKey *meta.MetaSensorItemKey `json:"metaSensorItemKey,omitempty"` -}