|
|
@@ -50,7 +50,7 @@ func (w *WeatherSceneService) Add(config string) error {
|
|
|
return errors.New("天气监控任务配置错误：判断条件不能为空")
|
|
|
}
|
|
|
// 初始化Ticker和停止通道
|
|
|
- c.ticker = time.NewTicker(time.Duration(c.Interval) * time.Minute)
|
|
|
+ c.ticker = time.NewTicker(20 * time.Second)
|
|
|
c.stopChan = make(chan struct{})
|
|
|
|
|
|
// 启动监控协程
|
|
|
@@ -99,13 +99,12 @@ func (w *WeatherSceneService) Update(config string) error {
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
-func (w *WeatherSceneService) Remove(config string) error {
|
|
|
- var c WeatherSceneConfig
|
|
|
- err := json.Unmarshal([]byte(config), &c)
|
|
|
- if err != nil {
|
|
|
- server.Log.Errorf("config to timerConfig error :%s", err.Error())
|
|
|
- }
|
|
|
-
|
|
|
+func (w *WeatherSceneService) Remove(id string) error {
|
|
|
+ fmt.Printf("task count--------------:%d", w.tasks.Size())
|
|
|
+ scene := w.tasks.Get(id)
|
|
|
+ fmt.Printf("scene-------------:%s", gjson.New(scene).MustToJsonString())
|
|
|
+ c := scene.(DeviceSceneConfig)
|
|
|
+ c.stopChan <- struct{}{}
|
|
|
w.tasks.Remove(c.SceneId)
|
|
|
server.Log.Debugf("RemoveTimeScene :%s", c.SceneId)
|
|
|
return nil
|
liuxiulin