diff --git a/model/sensorconfig/SensorConfig.go b/model/sensorconfig/SensorConfig.go index aaeaafe..12991c6 100644 --- a/model/sensorconfig/SensorConfig.go +++ b/model/sensorconfig/SensorConfig.go @@ -1,12 +1,16 @@ package sensorconfig -import "encoding/json" +import ( + "encoding/json" + + "git.loafle.net/overflow/commons-go/model/meta" +) type SensorConfig struct { SensorID json.Number `json:"sensorID,omitempty"` - Schedule *SensorConfigSchedule `json:"schedule,omitempty"` - Crawler *SensorConfigCrawler `json:"crawler,omitempty"` - Connection *SensorConfigConnection `json:"connection,omitempty"` - Items *SensorConfigItems `json:"items,omitempty"` + Schedule *SensorConfigSchedule `json:"schedule,omitempty"` + Crawler *SensorConfigCrawler `json:"crawler,omitempty"` + Connection *SensorConfigConnection `json:"connection,omitempty"` + MetaCollectionItems []*meta.MetaCollectionItem `json:"metaCollectionItems,omitempty"` } diff --git a/model/sensorconfig/SensorConfigItems.go b/model/sensorconfig/SensorConfigItems.go deleted file mode 100644 index e8a108f..0000000 --- a/model/sensorconfig/SensorConfigItems.go +++ /dev/null @@ -1,7 +0,0 @@ -package sensorconfig - -import "git.loafle.net/overflow/commons-go/model/meta" - -type SensorConfigItems struct { - MetaCollectionItems []*meta.MetaCollectionItem `json:"metaCollectionItems,omitempty"` -}