优化

Author: zgwit

modbus/adapter.go

@@ -18,37 +18,40 @@ type Adapter struct {
 	pollers map[string]*[]*Poller
 }
 
-func (adapter *Adapter) Mount(id string, product_id string, station types.Options) (err error) {
-	adapter.devices[id] = product_id
-	adapter.stations[id] = station
+func (adapter *Adapter) Mount(deviceId string, productId string, station types.Options) (err error) {
+	adapter.devices[deviceId] = productId
+	adapter.stations[deviceId] = station
 
 	//加载映射表
-	adapter.mappers[product_id], err = product.LoadConfig[Mapper](product_id, "mapper")
+	adapter.mappers[productId], err = product.LoadConfig[Mapper](productId, "mapper")
 	if err != nil {
 		return err
 	}
 
 	//加载轮询表
-	adapter.pollers[product_id], err = product.LoadConfig[[]*Poller](product_id, "poller")
+	adapter.pollers[productId], err = product.LoadConfig[[]*Poller](productId, "poller")
 	if err != nil {
 		return err
 	}
 
 	return nil
 }
 
-func (adapter *Adapter) Unmount(id string) error {
-	delete(adapter.devices, id)
-	delete(adapter.stations, id)
+func (adapter *Adapter) Unmount(deviceId string) error {
+	delete(adapter.devices, deviceId)
+	delete(adapter.stations, deviceId)
 	return nil
 }
 
-func (adapter *Adapter) Get(id, name string) (any, error) {
-	product_id := adapter.devices[id]
-	station := adapter.stations[id]
+func (adapter *Adapter) Get(deviceId, name string) (any, error) {
+	productId, has := adapter.devices[deviceId]
+	if !has {
+		return nil, errors.New("设备未注册")
+	}
+	station := adapter.stations[deviceId]
 	slave := station.Int("slave", 1)
 
-	mapper := adapter.mappers[product_id]
+	mapper := adapter.mappers[productId]
 	if mapper == nil {
 		return nil, errors.New("没有地址映射")
 	}
@@ -66,12 +69,15 @@ func (adapter *Adapter) Get(id, name string) (any, error) {
 	return point.Parse(address, data)
 }
 
-func (adapter *Adapter) Set(id, name string, value any) error {
-	product_id := adapter.devices[id]
-	station := adapter.stations[id]
+func (adapter *Adapter) Set(deviceId, name string, value any) error {
+	productId, has := adapter.devices[deviceId]
+	if !has {
+		return errors.New("设备未注册")
+	}
+	station := adapter.stations[deviceId]
 	slave := station.Int("slave", 1)
 
-	mapper := adapter.mappers[product_id]
+	mapper := adapter.mappers[productId]
 	if mapper == nil {
 		return errors.New("没有地址映射")
 	}
@@ -87,22 +93,25 @@ func (adapter *Adapter) Set(id, name string, value any) error {
 	return adapter.modbus.Write(uint8(slave), code, address, data)
 }
 
-func (adapter *Adapter) Sync(id string) (map[string]any, error) {
-	product_id := adapter.devices[id]
-	station := adapter.stations[id]
+func (adapter *Adapter) Poll(deviceId string) (map[string]any, error) {
+	productId, has := adapter.devices[deviceId]
+	if !has {
+		return nil, errors.New("设备未注册")
+	}
+	station := adapter.stations[deviceId]
 	slave := station.Int("slave", 1)
 
 	//没有地址表和轮询器，则跳过
 	//if d.pollers == nil || d.mappers == nil {
 	//	return nil, nil
 	//}
-	mapper := adapter.mappers[product_id]
+	mapper := adapter.mappers[productId]
 	if mapper == nil {
 		return nil, errors.New("没有地址映射")
 	}
 
 	values := make(map[string]any)
-	for _, poller := range *adapter.pollers[product_id] {
+	for _, poller := range *adapter.pollers[productId] {
 		if poller == nil {
 			continue
 		}
@@ -116,6 +125,5 @@ func (adapter *Adapter) Sync(id string) (map[string]any, error) {
 		}
 	}
 
-
 	return values, nil
 }

protocol/adapter.go

@@ -4,15 +4,21 @@ import (
 	"github.com/god-jason/bucket/types"
 )
 
+// Adapter 设备驱动
 type Adapter interface {
-	//Tunnel() connect.Tunnel
 
-	//设备动态添加
-	Mount(device string, product string, station types.Options) error
-	Unmount(device string) error
+	//Mount 挂载设备
+	Mount(deviceId string, productId string, station types.Options) error
 
-	//设备数据操作
-	Get(device, point string) (any, error)
-	Set(device, point string, value any) error
-	Sync(device string) (map[string]any, error)
+	//Unmount 卸载设备
+	Unmount(deviceId string) error
+
+	//Get 读数据
+	Get(deviceId, point string) (any, error)
+
+	//Set 写数据
+	Set(deviceId, point string, value any) error
+
+	//Poll 读取所有数据
+	Poll(deviceId string) (map[string]any, error)
 }

tunnel/tunnel.go

@@ -256,7 +256,7 @@ func (l *Tunnel) Poll() {
 	for {
 		start := time.Now().UnixMilli()
 		for _, dev := range l.devices {
-			values, err := l.Adapter.Sync(dev.Id)
+			values, err := l.Adapter.Poll(dev.Id)
 			if err != nil {
 				log.Error(err)
 				continue