overflow_backup_2018_0455/overflow_service
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sensorItem

Browse Source
This commit is contained in:
insanity@loafle.com 2017-06-26 20:26:43 +09:00
parent 39c9fe184c
commit 91dd79edc3
3 changed files with 67 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/meta/meta_sensor_item_type.go
View File

@ -11,5 +11,3 @@ type MetaSensorItemType struct {
Description string `json:"description,omitempty"` Description string `json:"description,omitempty"`
CreateDate timestamp.Timestamp `json:"createDate,omitempty"` CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
} }

102
proxy/sensor/sensor_item_service.go
View File

@ -1,54 +1,52 @@
package sensor package sensor
// import (
//import ( "encoding/json"
// "encoding/json" "git.loafle.net/overflow/commons_go/model/timestamp"
// "git.loafle.net/overflow/commons_go/model/timestamp" "git.loafle.net/overflow/overflow_service/proxy/meta"
// "git.loafle.net/overflow/overflow_service/proxy/meta" "git.loafle.net/overflow/overflow_service/proxy/utils"
// "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"`
//type sensorItem struct { Sensor *Sensor `json:"sensor,omitempty"`
// Id json.Number `json:"id,Number,omitempty"` MetaSensorItem *meta.MetaSensorItem `json:"item,omitempty"`
// Sensor Sensor `json:"sensor,omitempty"` CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
// MetaSensorItem *meta.MetaSensorItem `json:"item,omitempty"` }
// CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
//} type SensorItemService struct {
// }
//type sensorItemService struct {
//} func NewSensorItemService() *SensorItemService {
// return &SensorItemService{}
//func NewsensorItemService() *sensorItemService { }
// return &sensorItemService{}
//} func (ss *SensorItemService) Regist(s *SensorItem) (string, error) {
// out, err := utils.InvokeDBByModel("sensorItem", "save", s, utils.MODEL_SENSOR_ITEM)
//func (ss *sensorItemService) Regist(s *sensorItem) (string, error) {
// out, err := utils.InvokeDBByModel("sensor", "save", s, utils.MODEL_SENSOR) if err != nil {
// return "", err
// if err != nil { }
// return "", err
// } return out, nil
// }
// return out, nil
//} func (ss *SensorItemService) ReadAllBySensor(s *Sensor) (string, error) {
// out, err := utils.InvokeDBByModel("sensorItem", "findAllBySensor", s, utils.MODEL_SENSOR)
//func (ss *sensorItemService) ReadAllByTarget(t *target.Target) (string, error) {
// out, err := utils.InvokeDBByModel("sensor", "findAllByTarget", t, utils.MODEL_TARGET) if err != nil {
// return "", err
// if err != nil { }
// return "", err
// } return out, err
// }
// return out, err
//} func (ss *SensorItemService) Read(id string) (string, error) {
// out, err := utils.InvokeDBByModel("sensorItem", "findOne", id, utils.MODEL_LONG)
//func (ss *sensorItemService) Read(id string) (string, error) {
// out, err := utils.InvokeDBByModel("sensor", "findOne", id, utils.MODEL_LONG) if err != nil {
// return "", err
// if err != nil { }
// return "", err
// } return out, nil
// }
// return out, nil
//}

46
proxy/sensor/sensor_item_service_test.go
View File

@ -1,40 +1,28 @@
package sensor package sensor
import ( import (
"encoding/json"
"git.loafle.net/overflow/commons_go/model/timestamp" "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/meta"
"git.loafle.net/overflow/overflow_service/proxy/probe"
"git.loafle.net/overflow/overflow_service/proxy/target"
"testing" "testing"
) )
func TestSensorRegist(t *testing.T) { func TestSensorItemRegist(t *testing.T) {
ss := NewSensorService() ss := NewSensorItemService()
p := &probe.Probe{} s := &Sensor{
p.Id = json.Number("1")
i := &infra.Infra{}
i.Id = json.Number("1")
status := &meta.MetaSensorStatus{
Id: "2", Id: "2",
} }
target := &target.Target{ metaItem := &meta.MetaSensorItem{
Id: "1",
}
crawler := &meta.MetaCrawler{
Id: "2", Id: "2",
} }
sensor := &Sensor{
CreateDate: timestamp.Now(), item := &SensorItem{
Description: "This is a Sensor", CreateDate: timestamp.Now(),
MetaSensorStatus: status, Sensor: s,
Target: target, MetaSensorItem: metaItem,
Crawler: crawler,
} }
res, err := ss.Regist(sensor) res, err := ss.Regist(item)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -42,21 +30,21 @@ func TestSensorRegist(t *testing.T) {
} }
func TestSensorList(t *testing.T) { func TestSensorItemList(t *testing.T) {
ss := NewSensorService() ss := NewSensorItemService()
tar := &target.Target{ s := &Sensor{
Id: "1", Id: "1",
} }
res, err := ss.ReadAllByTarget(tar) res, err := ss.ReadAllBySensor(s)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
t.Log(res) t.Log(res)
} }
func TestSensorRead(t *testing.T) { func TestSensorItemRead(t *testing.T) {
ss := NewSensorService() ss := NewSensorItemService()
res, err := ss.Read("1") res, err := ss.Read("2")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }