services/scene-service/internal/service/manager/timer.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"github.com/gogf/gf/container/gmap"
 	"github.com/gogf/gf/v2/os/gcron"
 	"sparrow/pkg/server"
@@ -45,6 +46,7 @@ func (t *TimerSceneService) Add(config string) error {
 	//	server.Log.Errorf("timer scene-manager config error")
 	//	return errors.New("timer scene-manager config error")
 	//}
+	fmt.Printf("task counts:%d \n", t.cron.Size())
 	for _, v := range c.Conditions {
 		err = t.addTask(c.SceneId, v, c.Actions)
 		if err != nil {
@@ -53,6 +55,7 @@ func (t *TimerSceneService) Add(config string) error {
 		}
 
 	}
+	fmt.Printf("task counts:%d \n", t.cron.Size())
 	t.task.Set(c.SceneId, c)
 	//server.Log.Debugf("AddTimeScene :%s", c.SceneId)
 	return nil
@@ -98,13 +101,14 @@ func (t *TimerSceneService) Update(config string) error {
 
 func (t *TimerSceneService) Remove(id string) error {
 	if !t.task.Contains(id) {
-		return errors.New("场景不存在")
+		return errors.New("场景不存在\n")
 	}
 	scene := t.task.Get(id).(TimerSceneConfig)
 	for _, v := range scene.Conditions {
 		t.cron.Remove(v.TaskId)
+		fmt.Printf("remove taskId:%s\n", v.TaskId)
 	}
-	server.Log.Debugf("RemoveTimeScene :%s", scene.SceneId)
+	server.Log.Debugf("RemoveTimeScene :%s\n", scene.SceneId)
 	t.task.Remove(id)
 	return nil
 }

services/scene-service/internal/service/scene.go

@@ -81,7 +81,7 @@ func (m *SceneService) SubmitAction(args rpcs.ArgsSubmitSceneAction, reply *rpcs
 		server.Log.Errorf("不支持的场景类型: %s, 场景ID: %s", scene.SceneType, scene.Id)
 		return err
 	}
-	fmt.Printf("提交场景任务：%s", gjson.New(scene).MustToJsonString())
+	fmt.Printf("提交场景任务：%s\n", gjson.New(scene).MustToJsonString())
 	switch scene.Action {
 	case "add":
 		err = srv.Add(scene.Config)
@@ -93,14 +93,14 @@ func (m *SceneService) SubmitAction(args rpcs.ArgsSubmitSceneAction, reply *rpcs
 	case "remove":
 		err = srv.Remove(scene.Id)
 		if err != nil {
-			server.Log.Errorf("delete scene error: Id: %s, error: %v", scene.Id, err)
+			server.Log.Errorf("delete scene error: Id: %s, error: %v\n", scene.Id, err)
 		}
 		m.scenes.Remove(scene.Id)
 		return m.delSceneRedis(scene)
 	case "update":
 		err = srv.Update(scene.Config)
 		if err != nil {
-			server.Log.Errorf("update scene error: Id: %s, error: %v", scene.Id, err)
+			server.Log.Errorf("update scene error: Id: %s, error: %v\n", scene.Id, err)
 			return err
 		}
 		m.scenes.Set(scene.Id, scene)
@@ -108,7 +108,7 @@ func (m *SceneService) SubmitAction(args rpcs.ArgsSubmitSceneAction, reply *rpcs
 	case "start":
 		err = srv.Start(scene.Config)
 		if err != nil {
-			server.Log.Errorf("start scene error: Id: %s, error: %v", scene.Id, err)
+			server.Log.Errorf("start scene error: Id: %s, error: %v\n", scene.Id, err)
 			return err
 		}
 		scene.Status = 1
@@ -117,7 +117,7 @@ func (m *SceneService) SubmitAction(args rpcs.ArgsSubmitSceneAction, reply *rpcs
 	case "stop":
 		err = srv.Stop(scene.Config)
 		if err != nil {
-			server.Log.Errorf("stop scene error: Id: %s, error: %v", scene.Id, err)
+			server.Log.Errorf("stop scene error: Id: %s, error: %v\n", scene.Id, err)
 			return err
 		}
 		scene.Status = 0