From 040cd381f2e8475e9b4eb336b704ad878f56f4fa Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 14 九月 2023 20:42:01 +0800
Subject: [PATCH] 适应性改动
---
service/plc.go | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/service/plc.go b/service/plc.go
index f2bbd0b..0e5e49f 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -13,7 +13,7 @@
"github.com/spf13/cast"
)
-func PlcRead(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType) (val interface{}, err error) {
+func PlcRead(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, position int) (val interface{}, err error) {
var (
startAddress int
valueType constvar.PlcStartAddressValueType
@@ -22,7 +22,7 @@
)
for _, pc := range plcConfig.Details {
- if pc.FieldName == fieldType {
+ if pc.FieldName == fieldType && pc.Position == position {
startAddress = pc.StartAddress
valueType = pc.Type
dataLength = pc.Length
@@ -66,7 +66,7 @@
return nil, errors.New("interface type not support")
}
-func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, value interface{}) (err error) {
+func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, position int, value interface{}) (err error) {
var (
startAddress int
ipAddr string
@@ -78,7 +78,7 @@
plcConfig.CurrentTryTimes++
for _, pc := range plcConfig.Details {
- if pc.FieldName == fieldType {
+ if pc.FieldName == fieldType && pc.Position == position {
startAddress = pc.StartAddress
}
}
@@ -89,14 +89,14 @@
if err != nil {
logx.Errorf("plc write failed, 杩炴帴plc澶辫触: %v", err.Error())
plcConfig.CurrentErr = err
- return PlcWrite(plcConfig, fieldType, value)
+ return PlcWrite(plcConfig, fieldType, position, value)
}
result, err := plc.WriteHoldingRegister(conn, 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, value)
+ return PlcWrite(plcConfig, fieldType, position, value)
}
logx.Infof("plc write ok, address: %v, value: %v, result: %v", startAddress, value, result)
} else if plcConfig.Method == constvar.PlcMethodSerial {
@@ -144,3 +144,38 @@
}
return
}
+
+func PlcReadDirect(plcConfig *model.DevicePlc, address int, dataLength int) (val interface{}, err error) {
+ var (
+ ipAddr string
+ )
+
+ if plcConfig.CurrentTryTimes > plcConfig.MaxTryTimes {
+ return nil, plcConfig.CurrentErr
+ }
+ plcConfig.CurrentTryTimes++
+ 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 PlcReadDirect(plcConfig, address, dataLength)
+ }
+ value, err := plc.ReadHoldingRegister(conn, address, dataLength)
+ if err != nil {
+ logx.Errorf("plc read failed, address: %v, err: %v", address, err.Error())
+ plcConfig.CurrentErr = err
+ return PlcReadDirect(plcConfig, address, dataLength)
+ }
+ logx.Infof("plc read ok, address: %v, result: %v", address, value)
+ } 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", address)
+ return plccom.ReadPLC(plccom.DeviceTypeMitsubishi, ipAddr, label)
+ }
+ return
+}
--
Gitblit v1.8.0