From 30f35de47284269b475c3aa307d06c033b67aa27 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 21 十月 2023 16:46:10 +0800
Subject: [PATCH] 精简topic
---
service/plc.go | 92 ++++++++++++++++++++++++++-------------------
1 files changed, 53 insertions(+), 39 deletions(-)
diff --git a/service/plc.go b/service/plc.go
index e2a3990..f73ec58 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -5,7 +5,9 @@
"apsClient/constvar"
"apsClient/model"
"apsClient/pkg/logx"
+ "apsClient/pkg/plc"
"apsClient/pkg/plc/apacheplc4x"
+ "apsClient/pkg/plc/modbusx"
"apsClient/pkg/plccom"
"encoding/binary"
"errors"
@@ -13,7 +15,7 @@
"github.com/spf13/cast"
)
-func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, position int, value interface{}) (err error) {
+func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, channel int32, value interface{}) (err error) {
var (
startAddress int
ipAddr string
@@ -25,30 +27,19 @@
plcConfig.CurrentTryTimes++
for _, pc := range plcConfig.Details {
- if pc.FieldName == fieldType && pc.Position == position {
+ if pc.FieldName == fieldType && pc.Channel == channel {
startAddress = pc.StartAddress
}
}
if plcConfig.Method == constvar.PlcMethodModbusTCP {
ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
- //conn, err := plc.GetModbusConnection(ipAddr)
- //if err != nil {
- // logx.Errorf("plc write failed, 杩炴帴plc澶辫触: %v", err.Error())
- // plcConfig.CurrentErr = err
- // return PlcWrite(plcConfig, fieldType, position, value)
- //}
- //
- //result, err := plc.WriteHoldingRegister(conn, startAddress, value)
-
- //err = modbusx.Write(ipAddr, uint16(startAddress), value)
-
- _, err = apacheplc4x.WriteHoldingRegister(ipAddr, startAddress, value)
+ err = 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
- return PlcWrite(plcConfig, fieldType, position, value)
+ return PlcWrite(plcConfig, fieldType, channel, value)
}
logx.Infof("plc write ok, address: %v, value: %v", startAddress, value)
} else if plcConfig.Method == constvar.PlcMethodSerial {
@@ -68,17 +59,7 @@
)
if plcConfig.Method == constvar.PlcMethodModbusTCP {
ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
- //conn, err := plc.GetModbusConnection(ipAddr)
- //if err != nil {
- // logx.Errorf("plc write failed, 杩炴帴plc澶辫触: %v", err.Error())
- // plcConfig.CurrentErr = err
- // return PlcWriteDirect(plcConfig, address, value)
- //}
- //result, err := plc.WriteHoldingRegister(conn, address, value)
-
- //err = modbusx.Write(ipAddr, uint16(address), value)
-
- _, err = apacheplc4x.WriteHoldingRegister(ipAddr, address, value)
+ err = WriteHoldingRegister(ipAddr, address, value)
if err != nil {
logx.Errorf("plc write failed, address: %v, value: %v, err: %v", address, value, err.Error())
@@ -102,17 +83,7 @@
)
if plcConfig.Method == constvar.PlcMethodModbusTCP {
ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
- //conn, err := plc.GetModbusConnection(ipAddr)
- //if err != nil {
- // plcConfig.CurrentErr = err
- // return PlcReadDirect(plcConfig, address, dataLength, valueType)
- //}
- //value, err := plc.ReadHoldingRegister(conn, address, dataLength)
-
- //value, err := modbusx.Read(ipAddr, uint16(address), uint16(dataLength))
-
- value, err := apacheplc4x.ReadHoldingRegister(ipAddr, address, dataLength)
-
+ value, err := ReadHoldingRegister(ipAddr, address, dataLength)
if err != nil {
return nil, err
}
@@ -121,13 +92,16 @@
return string(value), nil
case constvar.PlcStartAddressValueTypeInt:
if len(value) == 2 {
- return int(binary.BigEndian.Uint16(value)), nil
+ val = binary.BigEndian.Uint16(value)
+ } else if len(value) == 4 {
+ val = binary.BigEndian.Uint32(value)
} else {
logx.Errorf("plc read get an unknown int value: %v, address:%v", value, address)
return nil, errors.New(fmt.Sprintf("unknown int value锛�%v", value))
}
}
- logx.Infof("plc read ok, address: %v, result: %v", address, value)
+ logx.Infof("plc read ok, address: %v, result: %v", address, val)
+ return val, nil
} else if plcConfig.Method == constvar.PlcMethodSerial {
ipAddr = conf.Conf.Services.Serial
if ipAddr == "" {
@@ -138,3 +112,43 @@
}
return
}
+
+func ReadHoldingRegister(ipAddr string, address, length int) ([]byte, error) {
+ if conf.Conf.PLC.Package == constvar.PlcPackageApache {
+ return apacheplc4x.ReadHoldingRegister(ipAddr, address, length)
+ } else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
+ conn, err := plc.GetModbusConnection(ipAddr)
+ if err != nil {
+ return nil, err
+ }
+ return plc.ReadHoldingRegister(conn, address, length)
+ } else {
+ return modbusx.Read(ipAddr, uint16(address), uint16(length))
+ }
+}
+
+func WriteHoldingRegister(ipAddr string, address int, value any) (err error) {
+ if conf.Conf.PLC.Package == constvar.PlcPackageApache {
+ _, err = apacheplc4x.WriteHoldingRegister(ipAddr, address, value)
+ return err
+ } else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
+ conn, err := plc.GetModbusConnection(ipAddr)
+ if err != nil {
+ return err
+ }
+ _, err = plc.WriteHoldingRegister(conn, address, value)
+ return err
+ } else {
+ return modbusx.Write(ipAddr, uint16(address), cast.ToInt(value))
+ }
+}
+
+func PlcIsConnect() bool {
+ if conf.Conf.PLC.Package == constvar.PlcPackageApache {
+ return apacheplc4x.IsConnect()
+ } else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
+ return false
+ } else {
+ return modbusx.IsConnect()
+ }
+}
--
Gitblit v1.8.0