add log

pkg/deviceAlarm/deviceAlarm.go

@@ -17,41 +17,43 @@ type AlarmParams struct {
 	LastAlarmTime   int64  `json:"last_alarm_time"`
 }
 
-type Alarm struct {
+type DevAlarmManager struct {
 	redisClient *gredis.Redis
 }
 
-func NewAlarm(host string, port, db int) *Alarm {
+func NewDevAlarmManager(host string, port, db int) *DevAlarmManager {
 	red := gredis.New(&gredis.Config{
 		Host:      host,
 		Port:      port,
 		Db:        14,
 		MaxActive: 100,
 	})
-	helper := &Alarm{
+	helper := &DevAlarmManager{
 		redisClient: red,
 	}
 	return helper
 }
 
-func (a *Alarm) SetAlarm(params *AlarmParams) error {
+func (a *DevAlarmManager) SetAlarm(params *AlarmParams) error {
 	key := AlarmPrefix + params.DeviceCode
 	buffStr := gconv.String(params)
-	fmt.Printf("保存数据---------------%s", buffStr)
+
+	fmt.Printf("保存数据: key:%s value:%s \r\n", key, buffStr)
 	_, err := a.redisClient.Do("SET", key, buffStr)
 	if err != nil {
-		fmt.Printf("err---------------%s", err.Error())
+
 		return err
 	}
 	_, err = a.redisClient.Do("EXPIRE", key, dataExpires)
 	if err != nil {
 		return err
 	}
+	fmt.Println("11111111111111")
 	return nil
 
 }
 
-func (a *Alarm) GetAlarm(code string) (*AlarmParams, error) {
+func (a *DevAlarmManager) GetAlarm(code string) (*AlarmParams, error) {
 	key := AlarmPrefix + code
 	alarm := new(AlarmParams)
 	// get status from redis
@@ -68,7 +70,7 @@ func (a *Alarm) GetAlarm(code string) (*AlarmParams, error) {
 
 }
 
-func (a *Alarm) DeleteAlarm(code string) error {
+func (a *DevAlarmManager) DeleteAlarm(code string) error {
 	key := AlarmPrefix + code
 	// get status from redis
 	_, err := a.redisClient.DoVar("DEL", key)

services/devicemanager/manager.go

@@ -14,7 +14,7 @@ type DeviceManager struct {
 	tokenHelper   *token.Helper
 	otaManager    *otaUpgrade.OtaManager
 	statusManager *deviceStatus.DevStatusManager
-	alarmManager  *deviceAlarm.Alarm
+	alarmManager  *deviceAlarm.DevAlarmManager
 }
 
 func NewDeviceManager(redishost string, port, db int) *DeviceManager {
@@ -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.NewAlarm(redishost, port, db)
+	alarmMgr := deviceAlarm.NewDevAlarmManager(redishost, port, db)
 	return &DeviceManager{
 		onlineManager: mgr,
 		tokenHelper:   helper,