|
|
@@ -76,12 +76,12 @@ func (m *SceneService) SubmitAction(args rpcs.ArgsSubmitSceneAction, reply *rpcs
|
|
|
Action: args.Action,
|
|
|
Time: args.Time,
|
|
|
}
|
|
|
+ fmt.Printf("scene---------: %s\n", gjson.New(scene).MustToJsonString())
|
|
|
srv, err := m.getServiceByType(scene.SceneType)
|
|
|
if err != nil {
|
|
|
server.Log.Errorf("不支持的场景类型: %s, 场景ID: %s", scene.SceneType, scene.Id)
|
|
|
return err
|
|
|
}
|
|
|
- fmt.Printf("scene---------: %s\n", gjson.New(scene).MustToJsonString())
|
|
|
switch scene.Action {
|
|
|
case "add":
|
|
|
err = srv.Add(scene.Config)
|
|
|
@@ -91,13 +91,11 @@ func (m *SceneService) SubmitAction(args rpcs.ArgsSubmitSceneAction, reply *rpcs
|
|
|
m.scenes.Set(scene.Id, scene)
|
|
|
return m.saveSceneRedis(scene)
|
|
|
case "remove":
|
|
|
- fmt.Printf("delete scene1---------: %s\n", scene.Id)
|
|
|
err = srv.Remove(scene.Id)
|
|
|
if err != nil {
|
|
|
server.Log.Errorf("delete scene error: Id: %s, error: %v\n", scene.Id, err)
|
|
|
}
|
|
|
m.scenes.Remove(scene.Id)
|
|
|
- fmt.Printf("delete scene2---------: %s\n", scene.Id)
|
|
|
return m.delSceneRedis(scene)
|
|
|
case "update":
|
|
|
err = srv.Update(scene.Config)
|
|
|
@@ -172,7 +170,6 @@ func (m *SceneService) delSceneRedis(scene SceneInfo) error {
|
|
|
Config: scene.Config,
|
|
|
}
|
|
|
sceneReply := rpcs.ReplyEmptyResult{}
|
|
|
- fmt.Printf("delete scene3---------: %s\n", scene.Id)
|
|
|
err := server.RPCCallByName(nil, rpcs.DeviceManagerName, "DeviceManager.DeleteScene", sceneArgs, &sceneReply)
|
|
|
if err != nil {
|
|
|
server.Log.Errorf("del scene error: Id: %s, error: %v", scene.Id, err)
|