|
@@ -64,6 +64,8 @@ type DeviceService interface {
|
|
|
SendCommand(args rpcs.ArgsSendCommand) error
|
|
SendCommand(args rpcs.ArgsSendCommand) error
|
|
|
// GetScenes 获取场景
|
|
// GetScenes 获取场景
|
|
|
GetScenes(code string, pi, ps int) ([]*scene.InfoScene, int, error)
|
|
GetScenes(code string, pi, ps int) ([]*scene.InfoScene, int, error)
|
|
|
|
|
+
|
|
|
|
|
+ GetScenesList(code string) ([]*scene.InfoScene, error)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
type deviceservice struct {
|
|
type deviceservice struct {
|
|
@@ -421,3 +423,16 @@ func (a deviceservice) GetScenes(code string, pi, ps int) ([]*scene.InfoScene, i
|
|
|
}
|
|
}
|
|
|
return reply.Result, reply.Total, nil
|
|
return reply.Result, reply.Total, nil
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+// GetScenesList 获取场景
|
|
|
|
|
+func (a deviceservice) GetScenesList(code string) ([]*scene.InfoScene, error) {
|
|
|
|
|
+ var args rpcs.ArgsGetAllScene
|
|
|
|
|
+ args.Code = code
|
|
|
|
|
+ var reply rpcs.ReplyScenes
|
|
|
|
|
+ err := server.RPCCallByName(nil, rpcs.DeviceManagerName, "DeviceManager.GetAllScenes", args, &reply)
|
|
|
|
|
+ if err != nil {
|
|
|
|
|
+ server.Log.Errorf("设备状态数据获取失败:%v", err)
|
|
|
|
|
+ return nil, err
|
|
|
|
|
+ }
|
|
|
|
|
+ return reply.Result, nil
|
|
|
|
|
+}
|