From 39c9fe184cfd6280b096eabd434b053ff3b0a14c Mon Sep 17 00:00:00 2001 From: "insanity@loafle.com" Date: Mon, 26 Jun 2017 19:28:51 +0900 Subject: [PATCH] sensor --- proxy/meta/meta_sensor_item.go | 14 ++++++ proxy/meta/meta_sensor_item_type.go | 15 ++++++ proxy/sensor/sensor_item_service.go | 54 ++++++++++++++++++++ proxy/sensor/sensor_item_service_test.go | 64 ++++++++++++++++++++++++ proxy/sensor/sensor_service.go | 10 ++-- 5 files changed, 152 insertions(+), 5 deletions(-) create mode 100644 proxy/meta/meta_sensor_item.go create mode 100644 proxy/meta/meta_sensor_item_type.go create mode 100644 proxy/sensor/sensor_item_service.go create mode 100644 proxy/sensor/sensor_item_service_test.go diff --git a/proxy/meta/meta_sensor_item.go b/proxy/meta/meta_sensor_item.go new file mode 100644 index 0000000..31674d5 --- /dev/null +++ b/proxy/meta/meta_sensor_item.go @@ -0,0 +1,14 @@ +package meta + +import ( + "encoding/json" + "git.loafle.net/overflow/commons_go/model/timestamp" +) + +type MetaSensorItem struct { + Id json.Number `json:"id,Number,omitempty"` + MetaSensorItemType MetaSensorItemType `json:"metaSensorItemType,omitempty"` + Key string `json:"key,omitempty"` + Name string `json:"name,omitempty"` + CreateDate timestamp.Timestamp `json:"createDate,omitempty"` +} diff --git a/proxy/meta/meta_sensor_item_type.go b/proxy/meta/meta_sensor_item_type.go new file mode 100644 index 0000000..0bb4f87 --- /dev/null +++ b/proxy/meta/meta_sensor_item_type.go @@ -0,0 +1,15 @@ +package meta + +import ( + "encoding/json" + "git.loafle.net/overflow/commons_go/model/timestamp" +) + +type MetaSensorItemType struct { + Id json.Number `json:"id,Number,omitempty"` + Name string `json:"name,omitempty"` + Description string `json:"description,omitempty"` + CreateDate timestamp.Timestamp `json:"createDate,omitempty"` +} + + diff --git a/proxy/sensor/sensor_item_service.go b/proxy/sensor/sensor_item_service.go new file mode 100644 index 0000000..efecddb --- /dev/null +++ b/proxy/sensor/sensor_item_service.go @@ -0,0 +1,54 @@ +package sensor + +// +//import ( +// "encoding/json" +// "git.loafle.net/overflow/commons_go/model/timestamp" +// "git.loafle.net/overflow/overflow_service/proxy/meta" +// "git.loafle.net/overflow/overflow_service/proxy/target" +// "git.loafle.net/overflow/overflow_service/proxy/utils" +//) +// +//type sensorItem struct { +// Id json.Number `json:"id,Number,omitempty"` +// Sensor Sensor `json:"sensor,omitempty"` +// MetaSensorItem *meta.MetaSensorItem `json:"item,omitempty"` +// CreateDate timestamp.Timestamp `json:"createDate,omitempty"` +//} +// +//type sensorItemService struct { +//} +// +//func NewsensorItemService() *sensorItemService { +// return &sensorItemService{} +//} +// +//func (ss *sensorItemService) Regist(s *sensorItem) (string, error) { +// out, err := utils.InvokeDBByModel("sensor", "save", s, utils.MODEL_SENSOR) +// +// if err != nil { +// return "", err +// } +// +// return out, nil +//} +// +//func (ss *sensorItemService) ReadAllByTarget(t *target.Target) (string, error) { +// out, err := utils.InvokeDBByModel("sensor", "findAllByTarget", t, utils.MODEL_TARGET) +// +// if err != nil { +// return "", err +// } +// +// return out, err +//} +// +//func (ss *sensorItemService) Read(id string) (string, error) { +// out, err := utils.InvokeDBByModel("sensor", "findOne", id, utils.MODEL_LONG) +// +// if err != nil { +// return "", err +// } +// +// return out, nil +//} diff --git a/proxy/sensor/sensor_item_service_test.go b/proxy/sensor/sensor_item_service_test.go new file mode 100644 index 0000000..f3e5fbc --- /dev/null +++ b/proxy/sensor/sensor_item_service_test.go @@ -0,0 +1,64 @@ +package sensor + +import ( + "encoding/json" + "git.loafle.net/overflow/commons_go/model/timestamp" + "git.loafle.net/overflow/overflow_service/proxy/infra" + "git.loafle.net/overflow/overflow_service/proxy/meta" + "git.loafle.net/overflow/overflow_service/proxy/probe" + "git.loafle.net/overflow/overflow_service/proxy/target" + "testing" +) + +func TestSensorRegist(t *testing.T) { + ss := NewSensorService() + + p := &probe.Probe{} + p.Id = json.Number("1") + i := &infra.Infra{} + i.Id = json.Number("1") + status := &meta.MetaSensorStatus{ + Id: "2", + } + target := &target.Target{ + Id: "1", + } + crawler := &meta.MetaCrawler{ + Id: "2", + } + sensor := &Sensor{ + CreateDate: timestamp.Now(), + Description: "This is a Sensor", + MetaSensorStatus: status, + Target: target, + Crawler: crawler, + } + + res, err := ss.Regist(sensor) + if err != nil { + t.Fatal(err) + } + t.Log(res) + +} + +func TestSensorList(t *testing.T) { + ss := NewSensorService() + tar := &target.Target{ + Id: "1", + } + res, err := ss.ReadAllByTarget(tar) + if err != nil { + t.Fatal(err) + } + t.Log(res) +} + +func TestSensorRead(t *testing.T) { + ss := NewSensorService() + res, err := ss.Read("1") + if err != nil { + t.Fatal(err) + } + t.Log(res) +} diff --git a/proxy/sensor/sensor_service.go b/proxy/sensor/sensor_service.go index c20ad84..144cf15 100644 --- a/proxy/sensor/sensor_service.go +++ b/proxy/sensor/sensor_service.go @@ -9,13 +9,13 @@ import ( ) type Sensor struct { - Id json.Number `json:"id,Number,omitempty"` - CreateDate timestamp.Timestamp `json:"createDate,omitempty"` - Description string `json:"description,omitempty"` + Id json.Number `json:"id,Number,omitempty"` + CreateDate timestamp.Timestamp `json:"createDate,omitempty"` + Description string `json:"description,omitempty"` MetaSensorStatus *meta.MetaSensorStatus `json:"status,omitempty"` Target *target.Target `json:"target,omitempty"` Crawler *meta.MetaCrawler `json:"crawler,omitempty"` - CrawlerInputItems string `json:"crawlerInputItems,omitempty"` + CrawlerInputItems string `json:"crawlerInputItems,omitempty"` } type SensorService struct { @@ -53,4 +53,4 @@ func (ss *SensorService) Read(id string) (string, error) { } return out, nil -} \ No newline at end of file +}