From d457b47a702857cdefb56a0a518201ba8ad2505f Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期六, 16 九月 2023 19:07:01 +0800 Subject: [PATCH] apache plc4x短连接 --- service/plc.go | 73 +++++++----------------------------- 1 files changed, 15 insertions(+), 58 deletions(-) diff --git a/service/plc.go b/service/plc.go index 8b00c7d..e2a3990 100644 --- a/service/plc.go +++ b/service/plc.go @@ -5,67 +5,13 @@ "apsClient/constvar" "apsClient/model" "apsClient/pkg/logx" - "apsClient/pkg/plc" - "apsClient/pkg/plc/modbusx" + "apsClient/pkg/plc/apacheplc4x" "apsClient/pkg/plccom" "encoding/binary" "errors" "fmt" "github.com/spf13/cast" ) - -func PlcRead(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, position int) (val interface{}, err error) { - var ( - startAddress int - valueType constvar.PlcStartAddressValueType - dataLength int - ipAddr string - ) - - for _, pc := range plcConfig.Details { - if pc.FieldName == fieldType && pc.Position == position { - startAddress = pc.StartAddress - valueType = pc.Type - dataLength = pc.Length - } - } - - if plcConfig.Method == constvar.PlcMethodModbusTCP { - ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port) - - conn, err := plc.GetModbusConnection(ipAddr) - if err != nil { - logx.Errorf("PlcRead 杩炴帴plc澶辫触: %v", err.Error()) - return nil, err - } - - rawData, err := plc.ReadHoldingRegister(conn, startAddress, dataLength) - if err != nil { - logx.Errorf("PlcRead 鑾峰彇plc鏁版嵁澶辫触: %v", err.Error()) - return nil, err - } - switch valueType { - case constvar.PlcStartAddressValueTypeString: - return string(rawData), nil - case constvar.PlcStartAddressValueTypeInt: - if len(rawData) == 2 { - return int(binary.BigEndian.Uint16(rawData)), nil - } else { - logx.Errorf("plc read get an unknown int value: %v, address:%v", rawData, startAddress) - return nil, errors.New(fmt.Sprintf("unknown int value锛�%v", rawData)) - } - } - return nil, errors.New("undefined value type") - } else if plcConfig.Method == constvar.PlcMethodSerial { - ipAddr = conf.Conf.Services.Serial - if ipAddr == "" { - return nil, errors.New("conf.Conf.Services.Serial config not set yet") - } - label := fmt.Sprintf("D%d", startAddress) - return plccom.ReadPLC(plccom.DeviceTypeMitsubishi, ipAddr, label) - } - return nil, errors.New("interface type not support") -} func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, position int, value interface{}) (err error) { var ( @@ -94,7 +40,11 @@ //} // //result, err := plc.WriteHoldingRegister(conn, startAddress, value) - err = modbusx.Write(ipAddr, uint16(startAddress), value) + + //err = modbusx.Write(ipAddr, uint16(startAddress), value) + + _, err = apacheplc4x.WriteHoldingRegister(ipAddr, startAddress, value) + if err != nil { logx.Errorf("plc write failed, address: %v, value: %v, err: %v", startAddress, value, err.Error()) plcConfig.CurrentErr = err @@ -126,7 +76,10 @@ //} //result, err := plc.WriteHoldingRegister(conn, address, value) - err = modbusx.Write(ipAddr, uint16(address), value) + //err = modbusx.Write(ipAddr, uint16(address), value) + + _, err = apacheplc4x.WriteHoldingRegister(ipAddr, address, value) + if err != nil { logx.Errorf("plc write failed, address: %v, value: %v, err: %v", address, value, err.Error()) return err @@ -155,7 +108,11 @@ // return PlcReadDirect(plcConfig, address, dataLength, valueType) //} //value, err := plc.ReadHoldingRegister(conn, address, dataLength) - value, err := modbusx.Read(ipAddr, uint16(address), uint16(dataLength)) + + //value, err := modbusx.Read(ipAddr, uint16(address), uint16(dataLength)) + + value, err := apacheplc4x.ReadHoldingRegister(ipAddr, address, dataLength) + if err != nil { return nil, err } -- Gitblit v1.8.0