|
|
@@ -58,10 +58,10 @@ func (d *DeviceSceneService) Add(config string) error {
|
|
|
|
|
|
// 启动监控协程
|
|
|
go d.monitorTask(c)
|
|
|
- fmt.Printf("保存设备状态监控任务成功：%s", gjson.New(c).MustToJsonString())
|
|
|
+ fmt.Printf("保存设备状态监控任务成功：%s\n", gjson.New(c).MustToJsonString())
|
|
|
d.tasks.Set(c.SceneId, c)
|
|
|
p := d.tasks.Get(c.SceneId)
|
|
|
- fmt.Printf("pppppppppppppp:%s", gjson.New(p).MustToJsonString())
|
|
|
+ fmt.Printf("pppppppppppppp:%s\n", gjson.New(p).MustToJsonString())
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
@@ -141,7 +141,7 @@ func (d *DeviceSceneService) monitorTask(config DeviceSceneConfig) {
|
|
|
func (d *DeviceSceneService) checkDeviceCondition(config DeviceSceneConfig) (bool, error) {
|
|
|
var results []bool
|
|
|
for _, v := range config.Conditions {
|
|
|
- fmt.Printf("检查设备状态：%s\n", v.DeviceId)
|
|
|
+
|
|
|
var args rpcs.ArgsGetStatus
|
|
|
args.Key = v.Key
|
|
|
var reply rpcs.ReplyStatus
|
|
|
@@ -153,7 +153,10 @@ func (d *DeviceSceneService) checkDeviceCondition(config DeviceSceneConfig) (boo
|
|
|
j := gjson.New(reply.Status)
|
|
|
// 判断是否满足条件并填入到result
|
|
|
fmt.Printf("判断条件：target_value:%s,value:%s,type:%d,operator:%d\n", v.TargetValue, j.Get(v.Field), v.FieldType, v.Operator)
|
|
|
- results = append(results, utils.CheckValue(v.TargetValue, j.Get(v.Field), v.FieldType, v.Operator))
|
|
|
+ result := utils.CheckValue(v.TargetValue, j.Get(v.Field), v.FieldType, v.Operator)
|
|
|
+ fmt.Printf("判断结果：%v\n", result)
|
|
|
+ results = append(results, result)
|
|
|
+ fmt.Printf("总判断结果：%v\n", result)
|
|
|
}
|
|
|
switch config.DecisionExpr {
|
|
|
case "and":
|
liuxiulin