|
@@ -22,6 +22,7 @@ type DevAlarmManager struct {
|
|
|
}
|
|
|
|
|
|
func NewDevAlarmManager(host string, port int) *DevAlarmManager {
|
|
|
+ fmt.Printf("redis---------------%s:%d\n", host, port)
|
|
|
red := gredis.New(&gredis.Config{
|
|
|
Host: host,
|
|
|
Port: port,
|
|
@@ -41,7 +42,7 @@ func (a *DevAlarmManager) SetAlarm(params *AlarmParams) error {
|
|
|
return err
|
|
|
}
|
|
|
fmt.Printf("params--------------%s\nres--------------%s\n", gjson.New(params).MustToJsonString(), res.String())
|
|
|
- r, err := a.redisClient.DoVar("GET", key)
|
|
|
+ r, err := a.GetAlarm(params.DeviceCode)
|
|
|
if err != nil {
|
|
|
fmt.Printf("err------------%s\n", err.Error())
|
|
|
}
|
|
@@ -50,11 +51,11 @@ func (a *DevAlarmManager) SetAlarm(params *AlarmParams) error {
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
- fmt.Printf("r---------------------%s\n", r.String())
|
|
|
- _, err = a.redisClient.Do("EXPIRE", key, dataExpires)
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
+ fmt.Printf("r---------------------%s\n", gjson.New(r).MustToJsonString())
|
|
|
+ //_, err = a.redisClient.Do("EXPIRE", key, dataExpires)
|
|
|
+ //if err != nil {
|
|
|
+ // return err
|
|
|
+ //}
|
|
|
return nil
|
|
|
|
|
|
}
|