|
@@ -1,6 +1,7 @@
|
|
|
package services
|
|
package services
|
|
|
|
|
|
|
|
import (
|
|
import (
|
|
|
|
|
+ "fmt"
|
|
|
"github.com/gogf/gf/encoding/gjson"
|
|
"github.com/gogf/gf/encoding/gjson"
|
|
|
"math/rand"
|
|
"math/rand"
|
|
|
"sparrow/pkg/models"
|
|
"sparrow/pkg/models"
|
|
@@ -409,11 +410,9 @@ func (a deviceservice) SendCommand(args rpcs.ArgsSendCommand) error {
|
|
|
|
|
|
|
|
// GetScenes 获取场景
|
|
// GetScenes 获取场景
|
|
|
func (a deviceservice) GetScenes(params scene.GetSceneParams) (*gjson.Json, error) {
|
|
func (a deviceservice) GetScenes(params scene.GetSceneParams) (*gjson.Json, error) {
|
|
|
-
|
|
|
|
|
|
|
+ fmt.Println("1111111111111111")
|
|
|
var newArgs rpcs.ArgsScene
|
|
var newArgs rpcs.ArgsScene
|
|
|
- newArgs.Key = "scene-manager:*"
|
|
|
|
|
var reply rpcs.ReplyScenes
|
|
var reply rpcs.ReplyScenes
|
|
|
-
|
|
|
|
|
err := server.RPCCallByName(nil, rpcs.DeviceManagerName, "DeviceManager.GetAllScenes", newArgs, &reply)
|
|
err := server.RPCCallByName(nil, rpcs.DeviceManagerName, "DeviceManager.GetAllScenes", newArgs, &reply)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
server.Log.Errorf("设备状态数据获取失败:%v", err)
|
|
server.Log.Errorf("设备状态数据获取失败:%v", err)
|