|
@@ -90,11 +90,13 @@ func (m *SceneService) SubmitAction(args rpcs.ArgsSubmitSceneAction, reply *rpcs
|
|
|
m.scenes.Set(scene.Id, scene)
|
|
m.scenes.Set(scene.Id, scene)
|
|
|
return m.saveSceneRedis(scene)
|
|
return m.saveSceneRedis(scene)
|
|
|
case "remove":
|
|
case "remove":
|
|
|
|
|
+ fmt.Printf("delete scene1---------: %s\n", scene.Id)
|
|
|
err = srv.Remove(scene.Id)
|
|
err = srv.Remove(scene.Id)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
server.Log.Errorf("delete scene error: Id: %s, error: %v\n", scene.Id, err)
|
|
server.Log.Errorf("delete scene error: Id: %s, error: %v\n", scene.Id, err)
|
|
|
}
|
|
}
|
|
|
m.scenes.Remove(scene.Id)
|
|
m.scenes.Remove(scene.Id)
|
|
|
|
|
+ fmt.Printf("delete scene2---------: %s\n", scene.Id)
|
|
|
return m.delSceneRedis(scene)
|
|
return m.delSceneRedis(scene)
|
|
|
case "update":
|
|
case "update":
|
|
|
err = srv.Update(scene.Config)
|
|
err = srv.Update(scene.Config)
|
|
@@ -169,6 +171,7 @@ func (m *SceneService) delSceneRedis(scene SceneInfo) error {
|
|
|
Config: scene.Config,
|
|
Config: scene.Config,
|
|
|
}
|
|
}
|
|
|
sceneReply := rpcs.ReplyEmptyResult{}
|
|
sceneReply := rpcs.ReplyEmptyResult{}
|
|
|
|
|
+ fmt.Printf("delete scene3---------: %s\n", scene.Id)
|
|
|
err := server.RPCCallByName(nil, rpcs.DeviceManagerName, "DeviceManager.DeleteScene", sceneArgs, &sceneReply)
|
|
err := server.RPCCallByName(nil, rpcs.DeviceManagerName, "DeviceManager.DeleteScene", sceneArgs, &sceneReply)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
server.Log.Errorf("del scene error: Id: %s, error: %v", scene.Id, err)
|
|
server.Log.Errorf("del scene error: Id: %s, error: %v", scene.Id, err)
|