Merge remote-tracking branch 'origin/master'

gateway/services.go

@@ -9,16 +9,10 @@ import (
 	"log"
 	"reflect"
 
-	"git.loafle.net/overflow/overflow_service/proxy/crawler"
-	"git.loafle.net/overflow/overflow_service/proxy/crawlerInputItem"
-	"git.loafle.net/overflow/overflow_service/proxy/crawlerinputitemmapping"
 	"git.loafle.net/overflow/overflow_service/proxy/member"
 	"git.loafle.net/overflow/overflow_service/proxy/noauthprobe"
 	"git.loafle.net/overflow/overflow_service/proxy/probe"
 	"git.loafle.net/overflow/overflow_service/proxy/sensor"
-	"git.loafle.net/overflow/overflow_service/proxy/sensorItem"
-	"git.loafle.net/overflow/overflow_service/proxy/sensorItemCategory"
-	"git.loafle.net/overflow/overflow_service/proxy/sensorItemMapping"
 	"git.loafle.net/overflow/overflow_service/proxy/target"
 	//"google.golang.org/grpc/metadata"
 )
@@ -41,19 +35,11 @@ func InitServices() {
 	g_services = make(map[string]interface{}, 0)
 
 	// proxy services save
-	//AddServices("Probe", probe.NewProbeService())
 	AddServices("Member", member.NewMemberService())
 	AddServices("NoAuthProbe", noauthprobe.NewNoAuthProbeService())
 	AddServices("Probe", probe.NewProbeService())
 	AddServices("Target", target.NewTargetService())
-	AddServices("Crawler", crawler.NewCrawlerService())
-	AddServices("CrawlerInputItem", crawlerInputItem.NewCrawlerInputItemService())
-	AddServices("CrawlerInputItemMapping", crawlerinputitemmapping.NewCrawlerInputItemMappingService())
 	AddServices("Sensor", sensor.NewSensorService())
-	AddServices("SensorItem", sensorItem.NewSensorItemService())
-	AddServices("SensorItemCategory", sensorItemCategory.NewSensorItemCategoryService())
-	AddServices("SensorItemMapping", sensorItemMapping.NewSensorItemMappingService())
-
 }
 
 type ServiceImpl struct {

proxy/crawler/crawler_service.go

@@ -1,59 +0,0 @@
-package crawler
-
-//
-//import (
-//	"encoding/json"
-//	"git.loafle.net/overflow/commons_go/model/timestamp"
-//	//"git.loafle.net/overflow/overflow_service/proxy"
-//	"git.loafle.net/overflow/overflow_service/proxy/utils"
-//)
-//
-//type CrawlerService struct {
-//
-//}
-//
-//func NewCrawlerService() *CrawlerService {
-//	return &CrawlerService{}
-//}
-//
-//
-//type Crawler struct {
-//	Id	json.Number	`json:"id,Number,omitempty"`
-//	Name	string		`json:"name,omitempty"`
-//	Description	string	`json:"description,omitempty"`
-//	CrawlerType  string		`json:"crawlerType,omitempty"`
-//	CreateDate timestamp.Timestamp	`json:"createDate,omitempty"`
-//}
-//
-//
-//
-//
-//
-//func (c *CrawlerService)List() (string, error) {
-//
-//
-//	//out := proxy.InvokeDB("crawler", "findAll", nil)
-//
-//	out, err := utils.InvokeDB("crawler", "findAll", nil)
-//
-//	if err != nil {
-//		return "", err
-//	}
-//
-//	return out, nil
-//}
-//
-//
-//func (c *CrawlerService)Create(ct * Crawler) (string, error)  {
-//
-//
-//
-//	out, err := utils.InvokeDB("crawler", "create", ct)
-//
-//	if err != nil {
-//		return "", err
-//	}
-//
-//
-//	return out, nil
-//}

proxy/crawler/crawler_service_test.go

@@ -1,15 +0,0 @@
-package crawler
-
-//
-//import "testing"
-//
-//func TestList(t *testing.T) {
-//
-//	cs := NewCrawlerService()
-//
-//	out := cs.List()
-//
-//
-//	t.Log(out)
-//
-//}

proxy/crawlerInputItem/crawlerinputitem_service.go

@@ -1,38 +0,0 @@
-package crawlerInputItem
-
-//import (
-//	"git.loafle.net/overflow/commons_go/model/timestamp"
-//	"encoding/json"
-//	"git.loafle.net/overflow/overflow_service/proxy/utils"
-//)
-//
-//type CrawlerInputItem struct {
-//	Id	json.Number	`json:"id,Number,omitempty"`
-//	Name	string		`json:"name,omitempty"`
-//	Description	string	`json:"description,omitempty"`
-//	DataType string		`json:"dataType,omitempty"`
-//	CreateDate timestamp.Timestamp	`json:"createDate,omitempty"`
-//}
-//
-//type CrawlerInputItemSerivce struct {
-//
-//}
-//
-//func NewCrawlerInputItemService() *CrawlerInputItemSerivce {
-//	return &CrawlerInputItemSerivce{}
-//}
-//
-//
-//
-//func (c *CrawlerInputItemSerivce)Create(cii * CrawlerInputItem) (string, error) {
-//
-//	out, err := utils.InvokeDB("crawlerInputItem", "create", cii)
-//
-//	if err != nil {
-//		return "", err
-//	}
-//
-//
-//	return out, nil;
-//
-//}

proxy/crawlerInputItem/crawlerinputitem_service_test.go

@@ -1 +0,0 @@
-package crawlerInputItem

proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go

@@ -1,55 +0,0 @@
-package crawlerinputitemmapping
-
-//import (
-//	"git.loafle.net/overflow/commons_go/model/timestamp"
-//	"encoding/json"
-//	"git.loafle.net/overflow/overflow_service/proxy/crawler"
-//	"git.loafle.net/overflow/overflow_service/proxy/crawlerInputItem"
-//	"git.loafle.net/overflow/overflow_service/proxy/utils"
-//)
-//
-//type CrawlerInputItemMapping struct {
-//	Id	json.Number	`json:"id,Number,omitempty"`
-//	Crawler	crawler.Crawler		`json:"crawler,omitempty"`
-//	CrawlerInputItem	crawlerInputItem.CrawlerInputItem		`json:"crawlerInputItem,omitempty"`
-//
-//	Priority	json.Number		`json:"priority,Number,omitempty"`
-//	RequiredType bool	`json:"requiredType,omitempty"`
-//	CreateDate timestamp.Timestamp	`json:"createDate,omitempty"`
-//}
-//
-//
-//type CrawlerInputItemMappingService struct {
-//
-//}
-//
-//func NewCrawlerInputItemMappingService() *CrawlerInputItemMappingService {
-//	return &CrawlerInputItemMappingService{}
-//}
-//
-//func (c *CrawlerInputItemMappingService)Create(ciim *CrawlerInputItemMapping) (string, error) {
-//
-//	out, err := utils.InvokeDB("crawlerInputItemMapping", "create", ciim)
-//
-//	if err != nil {
-//		return "", err
-//	}
-//
-//
-//	return out, nil;
-//
-//}
-//
-//func (c *CrawlerInputItemMappingService)List(cr *crawler.Crawler) (string, error) {
-//
-//
-//	out, err := utils.InvokeDBByModel("crawlerInputItemMapping", "findByCrawlerId", cr, "com.loafle.overflow.crawler.model.Crawler")
-//
-//	if err != nil {
-//		return "", err
-//	}
-//
-//
-//	return out, nil;
-//
-//}

proxy/crawlerinputitemmapping/crawlerinputitemmapping_service_test.go

@@ -1,25 +0,0 @@
-package crawlerinputitemmapping
-
-//import (
-//	"testing"
-//
-//	"git.loafle.net/overflow/overflow_service/proxy/crawler"
-//)
-//
-//func TestListCrawler(t *testing.T) {
-//
-//
-//
-//	niin := NewCrawlerInputItemMappingService()
-//
-//
-//	cc := &crawler.Crawler{}
-//
-//	cc.Id = "1";
-//
-//	out := niin.List(cc)
-//
-//
-//	t.Log(out)
-//
-//}

proxy/sensor/sensor_service.go

@@ -64,3 +64,21 @@ func (ss *SensorService) Remove(s *Sensor) (string, error) {
 
 	return out, nil
 }
+
+func (ss *SensorService) Start(s *Sensor) (string, error) {
+	s.MetaSensorStatus = meta.NewMetaSensorStatus(meta.SENSOR_STATUS_RUNNING)
+	res, err := ss.Regist(s)
+	if err != nil {
+		return "", err
+	}
+	return res, nil
+}
+
+func (ss *SensorService) Stop(s *Sensor) (string, error) {
+	s.MetaSensorStatus = meta.NewMetaSensorStatus(meta.SENSOR_STATUS_STOPPED)
+	res, err := ss.Regist(s)
+	if err != nil {
+		return "", err
+	}
+	return res, nil
+}