优化

base/operator.go → base/action.go

@@ -6,25 +6,26 @@ import (
 	"github.com/god-jason/bucket/pkg/calc"
 	"github.com/god-jason/bucket/types"
 	"strings"
+	"time"
 )
 
 type Executor struct {
-	Point string `json:"point,omitempty"`
-	Value any    `json:"value,omitempty"`
-	Delay int64  `json:"delay,omitempty"` //ms
+	Point string        `json:"point,omitempty"`
+	Value any           `json:"value,omitempty"`
+	Delay time.Duration `json:"delay,omitempty"` //延迟 ms
 
 	_value gval.Evaluable
 }
 
-type Operator struct {
+type Action struct {
 	Name       string              `json:"name"`
 	Label      string              `json:"label"`
 	Parameters []*types.SmartField `json:"parameters,omitempty"`
 	Return     []*types.SmartField `json:"return,omitempty"`
 	Executors  []*Executor         `json:"executors,omitempty"`
 }
 
-func (a *Operator) Init() (err error) {
+func (a *Action) Init() (err error) {
 	for _, e := range a.Executors {
 		if str, ok := e.Value.(string); ok {
 			if expr, has := strings.CutPrefix(str, "="); has {
@@ -38,7 +39,7 @@ func (a *Operator) Init() (err error) {
 	return nil
 }
 
-func (a *Operator) GetExecutors(args any) (es []*Executor, err error) {
+func (a *Action) GetExecutors(args any) (es []*Executor, err error) {
 	for _, e := range a.Executors {
 		ee := *e
 		if e._value != nil {

device/device.go

@@ -39,18 +39,18 @@ type Device struct {
 
 	adapter protocol.Adapter
 
-	operators map[string]*base.Operator
+	actions map[string]*base.Action
 }
 
 func (d *Device) Open() error {
-	operators, err := product.LoadConfig[[]*base.Operator](d.ProductId, "operators")
+	operators, err := product.LoadConfig[[]*base.Action](d.ProductId, "actions")
 	if err != nil {
 		return err
 	}
 
-	d.operators = make(map[string]*base.Operator)
+	d.actions = make(map[string]*base.Action)
 	for _, op := range *operators {
-		d.operators[op.Name] = op
+		d.actions[op.Name] = op
 		err = op.Init()
 		if err != nil {
 			return err
@@ -103,20 +103,26 @@ func (d *Device) SetAdapter(adapter protocol.Adapter) {
 }
 
 func (d *Device) Action(name string, values map[string]any) (map[string]any, error) {
-	oper := d.operators[name]
-	if oper == nil {
+	action := d.actions[name]
+	if action == nil {
 		return nil, exception.New("找不到操作")
 	}
 
-	executors, err := oper.GetExecutors(values)
+	executors, err := action.GetExecutors(values)
 	if err != nil {
 		return nil, err
 	}
 
 	for _, executor := range executors {
-		err = d.Write(executor.Point, executor.Value)
-		if err != nil {
-			return nil, err
+		if executor.Delay > 0 {
+			time.AfterFunc(executor.Delay*time.Millisecond, func() {
+				_ = d.Write(executor.Point, executor.Value)
+			})
+		} else {
+			err = d.Write(executor.Point, executor.Value)
+			if err != nil {
+				return nil, err
+			}
 		}
 	}
 

product/product.go

@@ -20,7 +20,7 @@ type Product struct {
 	Keywords    []string  `json:"keywords,omitempty"`    //关键字
 	Created     time.Time `json:"created" xorm:"created"`
 
-	operators []*base.Operator
+	operators []*base.Action
 }
 
 func (p *Product) Init() error {