liuxiulin 1 day ago
parent
commit
4ff520a9dc
2 changed files with 5 additions and 3 deletions
  1. 3 1
      pkg/deviceAlarm/deviceAlarm.go
  2. 2 2
      pkg/ruleEngine/nodes/temp_alarm_node.go

+ 3 - 1
pkg/deviceAlarm/deviceAlarm.go

@@ -2,6 +2,7 @@ package deviceAlarm
 
 import (
 	"github.com/gogf/gf/database/gredis"
+	"github.com/gogf/gf/util/gconv"
 )
 
 const (
@@ -34,7 +35,8 @@ func NewAlarm(host string, port, db int) *Alarm {
 
 func (a *Alarm) SetAlarm(params *AlarmParams) error {
 	key := AlarmPrefix + params.DeviceCode
-	_, err := a.redisClient.Do("SET", key, params)
+	buffStr := gconv.String(params)
+	_, err := a.redisClient.Do("SET", key, buffStr)
 	if err != nil {
 		return err
 	}

+ 2 - 2
pkg/ruleEngine/nodes/temp_alarm_node.go

@@ -158,7 +158,6 @@ func (t *TempAlarmNode) evaluateConditions(message *protocol.Message) bool {
 	data := make(map[string]interface{})
 	var ok bool
 	j := gjson.New(message.Data)
-	fmt.Printf("Data------------------:%s\r\n", j.MustToJsonString())
 	status := j.Get("status")
 	if data, ok = status.(map[string]interface{}); !ok {
 		return false
@@ -203,8 +202,9 @@ func (t *TempAlarmNode) evaluateConditions(message *protocol.Message) bool {
 	if err != nil {
 		server.Log.Errorf("device offline error. deviceid: %v, error: %v", reply.AlarmParams.DeviceCode, err)
 	}
-	fmt.Printf("reply------------------:%s\r\n", gjson.New(reply).MustToJsonString())
+
 	if reply.AlarmParams.FirstReportTime == 0 {
+		fmt.Printf("请求rpc接口保存数据------------------\r\n")
 		setArgs := rpcs.ArgsAlarmInfo{
 			DeviceCode:      deviceId,
 			FirstReportTime: time.Now().Unix(),