diff --git a/internal/pkg/reactor/monitoring.go b/internal/pkg/reactor/monitoring.go index 012dcbc..f40583d 100644 --- a/internal/pkg/reactor/monitoring.go +++ b/internal/pkg/reactor/monitoring.go @@ -22,7 +22,8 @@ type DeviceStatus struct { func (c *Coordinator) DevStatus(ch chan *DeviceStatus, a int, dm DeviceManager) { d := &DeviceStatus{Addr: a} d.Type = dm.GetType() - d.Status = dm.GetStatus() + //d.Status = dm.GetStatus() + d.Status = 0 d.Data = dm.GetData() ch <- d } diff --git a/internal/pkg/server/system.go b/internal/pkg/server/system.go index e30ade3..c8eb8b0 100644 --- a/internal/pkg/server/system.go +++ b/internal/pkg/server/system.go @@ -1,6 +1,7 @@ package server import ( + pb "FRMS/internal/pkg/grpc" _ "fmt" ) @@ -8,7 +9,7 @@ import ( type DeviceInfo struct { Id int Type string - Status string + Status pb.Status Data string Index int TransactionId uint32