diff --git a/backend/internal/device/mysql_storage.go b/backend/internal/device/mysql_storage.go index 9756ad6..d9ee73a 100644 --- a/backend/internal/device/mysql_storage.go +++ b/backend/internal/device/mysql_storage.go @@ -50,9 +50,12 @@ func (s *MySQLStorage) GetDevices() []Device { devices := make([]Device, 0) for rows.Next() { var device Device - if err := rows.Scan(&device.ID, &device.Name, &device.IP, &device.Token, &device.Status, &device.CreatedAt, &device.UpdatedAt); err != nil { + var createdAt, updatedAt int64 + if err := rows.Scan(&device.ID, &device.Name, &device.IP, &device.Token, &device.Status, &createdAt, &updatedAt); err != nil { continue } + device.CreatedAt = createdAt + device.UpdatedAt = updatedAt devices = append(devices, device) } @@ -65,10 +68,13 @@ func (s *MySQLStorage) GetDevice(id string) (Device, bool) { row := s.db.QueryRow(query, id) var device Device - err := row.Scan(&device.ID, &device.Name, &device.IP, &device.Token, &device.Status, &device.CreatedAt, &device.UpdatedAt) + var createdAt, updatedAt int64 + err := row.Scan(&device.ID, &device.Name, &device.IP, &device.Token, &device.Status, &createdAt, &updatedAt) if err != nil { return Device{}, false } + device.CreatedAt = createdAt + device.UpdatedAt = updatedAt return device, true } @@ -79,11 +85,16 @@ func (s *MySQLStorage) GetDeviceByToken(token string) (Device, bool) { row := s.db.QueryRow(query, token) var device Device - err := row.Scan(&device.ID, &device.Name, &device.IP, &device.Token, &device.Status, &device.CreatedAt, &device.UpdatedAt) + var createdAt, updatedAt int64 + + err := row.Scan(&device.ID, &device.Name, &device.IP, &device.Token, &device.Status, &createdAt, &updatedAt) if err != nil { return Device{}, false } + device.CreatedAt = createdAt + device.UpdatedAt = updatedAt + return device, true } diff --git a/backend/monitor-server b/backend/monitor-server index 46c486e..4379b25 100755 Binary files a/backend/monitor-server and b/backend/monitor-server differ