add log

pkg/deviceAlarm/deviceAlarm.go

@@ -3,6 +3,7 @@ package deviceAlarm
 import (
 	"fmt"
 	"github.com/gogf/gf/database/gredis"
+	"github.com/gogf/gf/encoding/gjson"
 )
 
 const (
@@ -20,11 +21,11 @@ type DevAlarmManager struct {
 	redisClient *gredis.Redis
 }
 
-func NewDevAlarmManager(host string, port, db int) *DevAlarmManager {
+func NewDevAlarmManager(host string, port int) *DevAlarmManager {
 	red := gredis.New(&gredis.Config{
 		Host:      host,
 		Port:      port,
-		Db:        db,
+		Db:        14,
 		MaxActive: 100,
 	})
 	helper := &DevAlarmManager{
@@ -35,14 +36,14 @@ func NewDevAlarmManager(host string, port, db int) *DevAlarmManager {
 
 func (a *DevAlarmManager) SetAlarm(params *AlarmParams) error {
 	key := AlarmPrefix + params.DeviceCode
+	fmt.Printf("key---------------%s\r\n", key)
+	fmt.Printf("params---------------%s\n", gjson.New(params).MustToJsonString())
 	res, err := a.redisClient.DoVar("SET", key, params)
 	if err != nil {
 		fmt.Printf("set alarm failed1: %s", err.Error())
 		return err
 	}
-	if res.String() != "OK" {
-		fmt.Printf("set alarm failed2: %s", res.String())
-	}
+	fmt.Printf("res--------------%s\n", res.String())
 	//_, err = a.redisClient.Do("EXPIRE", key, dataExpires)
 	//if err != nil {
 	//	return err
@@ -71,7 +72,7 @@ func (a *DevAlarmManager) GetAlarm(code string) (*AlarmParams, error) {
 func (a *DevAlarmManager) DeleteAlarm(code string) error {
 	key := AlarmPrefix + code
 	// get status from redis
-	_, err := a.redisClient.DoVar("DEL", key)
+	_, err := a.redisClient.Do("DEL", key)
 	if err != nil {
 		return err
 	}

services/devicemanager/manager.go

@@ -22,7 +22,7 @@ func NewDeviceManager(redishost string, port, db int) *DeviceManager {
 	helper := token.NewHelper(redishost, port, db)
 	otaMgr := otaUpgrade.NewOtaManager(redishost, port, db)
 	statusMgr := deviceStatus.NewDevStatusManager(redishost, port)
-	alarmMgr := deviceAlarm.NewDevAlarmManager(redishost, port, db)
+	alarmMgr := deviceAlarm.NewDevAlarmManager(redishost, port)
 	return &DeviceManager{
 		onlineManager: mgr,
 		tokenHelper:   helper,