issues #64 mobile object mapping

e154 · Sep 13, 2019 · df8e35d · df8e35d
1 parent 5cbfb8a
commit df8e35d
Show file tree

Hide file tree

Showing 21 changed files with 503 additions and 167 deletions.
diff --git a/adaptors/adaptors.go b/adaptors/adaptors.go
@@ -20,25 +20,25 @@ type Adaptors struct {
 	DeviceAction     *DeviceAction
 	DeviceState      *DeviceState
 	Flow             *Flow
-	FlowElement      *FlowElement
-	Connection       *Connection
-	Worker           *Worker
-	Role             *Role
-	Permission       *Permission
-	User             *User
-	UserMeta         *UserMeta
-	Image            *Image
-	Variable         *Variable
-	Map              *Map
-	MapLayer         *MapLayer
-	MapText          *MapText
-	MapImage         *MapImage
-	MapDevice        *MapDevice
-	MapElement       *MapElement
-	MapDeviceState   *MapDeviceState
-	MapDeviceAction  *MapDeviceAction
-	Log              *Log
-	ZoneTag          *ZoneTag
+	FlowElement     *FlowElement
+	Connection      *Connection
+	Worker          *Worker
+	Role            *Role
+	Permission      *Permission
+	User            *User
+	UserMeta        *UserMeta
+	Image           *Image
+	Variable        *Variable
+	Map             *Map
+	MapLayer        *MapLayer
+	MapText         *MapText
+	MapImage        *MapImage
+	MapDevice       *MapDevice
+	MapElement      *MapElement
+	MapDeviceState  *MapDeviceState
+	MapDeviceAction *MapDeviceAction
+	Log             *Log
+	MapZone         *MapZone
 }
 
 func NewAdaptors(db *gorm.DB,
@@ -76,7 +76,7 @@ func NewAdaptors(db *gorm.DB,
 		MapDeviceState:   GetMapDeviceStateAdaptor(db),
 		MapDeviceAction:  GetMapDeviceActionAdaptor(db),
 		Log:              GetLogAdaptor(db),
-		ZoneTag:          GetZoneTagAdaptor(db),
+		MapZone:          GetMapZoneAdaptor(db),
 	}
 
 	return

diff --git a/adaptors/map_element.go b/adaptors/map_element.go
@@ -309,7 +309,7 @@ func (n *MapElement) fromDb(dbVer *db.MapElement) (ver *m.MapElement) {
 
 	// Zone tag
 	if dbVer.Zone != nil {
-		zoneAdaptor := GetZoneTagAdaptor(n.db)
+		zoneAdaptor := GetMapZoneAdaptor(n.db)
 		ver.Zone = zoneAdaptor.fromDb(dbVer.Zone)
 	}
 

diff --git a/adaptors/map_zone.go b/adaptors/map_zone.go
@@ -0,0 +1,76 @@
+package adaptors
+
+import (
+	"github.com/e154/smart-home/db"
+	m "github.com/e154/smart-home/models"
+	"github.com/jinzhu/gorm"
+)
+
+type MapZone struct {
+	table *db.MapZones
+	db    *gorm.DB
+}
+
+func GetMapZoneAdaptor(d *gorm.DB) *MapZone {
+	return &MapZone{
+		table: &db.MapZones{Db: d},
+		db:    d,
+	}
+}
+
+func (n *MapZone) Add(tag *m.MapZone) (id int64, err error) {
+
+	dbTag := n.toDb(tag)
+	id, err = n.table.Add(dbTag)
+
+	return
+}
+
+
+func (n *MapZone) GetByName(zoneName string) (ver *m.MapZone, err error) {
+
+	var dbVer *db.MapZone
+	if dbVer, err = n.table.GetByName(zoneName); err != nil {
+		return
+	}
+
+	ver = n.fromDb(dbVer)
+
+	return
+}
+
+func (n *MapZone) Delete(name string) (err error) {
+
+	err = n.table.Delete(name)
+
+	return
+}
+
+func (n *MapZone) Search(query string, limit, offset int) (list []*m.MapZone, total int64, err error) {
+	var dbList []*db.MapZone
+	if dbList, total, err = n.table.Search(query, limit, offset); err != nil {
+		return
+	}
+
+	list = make([]*m.MapZone, 0)
+	for _, dbTag := range dbList {
+		node := n.fromDb(dbTag)
+		list = append(list, node)
+	}
+
+	return
+}
+
+func (n *MapZone) toDb(tag *m.MapZone) *db.MapZone {
+	return &db.MapZone{
+		Id:   tag.Id,
+		Name: tag.Name,
+	}
+}
+
+func (n *MapZone) fromDb(tag *db.MapZone) *m.MapZone {
+	return &m.MapZone{
+		Id:   tag.Id,
+		Name: tag.Name,
+	}
+}
diff --git a/adaptors/zone_tag.go b/adaptors/zone_tag.go
diff --git a/api/server/routers.go b/api/server/routers.go
@@ -135,6 +135,11 @@ func (s *Server) setControllers() {
 	v1.GET("/map_elements", s.af.Auth, s.ControllersV1.MapElement.GetList)
 	v1.PUT("/map_elements/sort", s.af.Auth, s.ControllersV1.MapElement.Sort)
 
+	// map zone
+	v1.POST("/map_zone", s.af.Auth, s.ControllersV1.MapZone.Add)
+	v1.DELETE("/map_zone/:name", s.af.Auth, s.ControllersV1.MapZone.Delete)
+	v1.GET("/map_zone/search", s.af.Auth, s.ControllersV1.MapZone.Search)
+
 	// images
 	v1.POST("/image", s.af.Auth, s.ControllersV1.Image.Add)
 	v1.GET("/image/:id", s.af.Auth, s.ControllersV1.Image.GetById)

diff --git a/api/server/v1/controllers/controllers.go b/api/server/v1/controllers/controllers.go
@@ -28,6 +28,7 @@ type ControllersV1 struct {
 	Flow             *ControllerFlow
 	Log              *ControllerLog
 	Gate             *ControllerGate
+	MapZone          *ControllerMapZone
 }
 
 func NewControllersV1(adaptors *adaptors.Adaptors,
@@ -56,5 +57,6 @@ func NewControllersV1(adaptors *adaptors.Adaptors,
 		Flow:             NewControllerFlow(common),
 		Log:              NewControllerLog(common),
 		Gate:             NewControllerGate(common),
+		MapZone:          NewControllerMapZone(common),
 	}
 }