From 72721bf221e6f90fb830bf28133c7588e30e1d30 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 26 十月 2023 17:41:19 +0800
Subject: [PATCH] fix
---
service/plc.go | 101 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 71 insertions(+), 30 deletions(-)
diff --git a/service/plc.go b/service/plc.go
index b86c091..183cb00 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -13,9 +13,10 @@
"errors"
"fmt"
"github.com/spf13/cast"
+ "sync/atomic"
)
-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
@@ -27,30 +28,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,19 +58,10 @@
var (
ipAddr string
)
+ defer dealErr(err)
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,6 +83,7 @@
var (
ipAddr string
)
+ defer dealErr(err)
if plcConfig.Method == constvar.PlcMethodModbusTCP {
ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
value, err := ReadHoldingRegister(ipAddr, address, dataLength)
@@ -115,13 +97,15 @@
if len(value) == 2 {
val = binary.BigEndian.Uint16(value)
} else if len(value) == 4 {
- val = binary.BigEndian.Uint32(value)
+ low16Val := uint32(binary.BigEndian.Uint16(value[:2]))
+ high16 := uint32(binary.BigEndian.Uint16(value[2:])) << 16
+ val = low16Val + high16
} 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, val)
+ logx.Infof("plc read ok, address: %v, result: %v, dataLength: %v, valueLength: %v", address, val, dataLength, len(value))
return val, nil
} else if plcConfig.Method == constvar.PlcMethodSerial {
ipAddr = conf.Conf.Services.Serial
@@ -136,13 +120,21 @@
func ReadHoldingRegister(ipAddr string, address, length int) ([]byte, error) {
if conf.Conf.PLC.Package == constvar.PlcPackageApache {
- return apacheplc4x.ReadHoldingRegister(ipAddr, address, length)
+ newLength := length / 2
+ if newLength == 0 {
+ newLength = 1
+ }
+ return apacheplc4x.ReadHoldingRegister(ipAddr, address, newLength)
} 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)
+ newLength := length / 2
+ if newLength == 0 {
+ newLength = 1
+ }
+ return plc.ReadHoldingRegister(conn, address, newLength)
} else {
return modbusx.Read(ipAddr, uint16(address), uint16(length))
}
@@ -163,3 +155,52 @@
return modbusx.Write(ipAddr, uint16(address), cast.ToInt(value))
}
}
+
+func PlcIsConnect() bool {
+ return IsConnect()
+ //if conf.Conf.PLC.Package == constvar.PlcPackageApache {
+ // return apacheplc4x.IsConnect()
+ //} else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
+ // return false
+ //} else {
+ // return modbusx.IsConnect()
+ //}
+}
+
+func dealErr(err error) {
+ if err != nil {
+ FailureRemainingOpportunitiesDecr() //鍑忓皯澶辫触鍓╀綑鏈轰細
+ } else {
+ FailureRemainingOpportunitiesReset() //閲嶇疆澶辫触鍓╀綑鏈轰細
+ }
+}
+
+var connectionStatus atomic.Bool
+
+var failureRemainingOpportunities atomic.Int64
+
+const (
+ defaultFailureRemainingOpportunities = 20
+)
+
+func IsConnect() bool {
+ return connectionStatus.Load()
+}
+
+func FailureRemainingOpportunitiesDecr() {
+ newValue := failureRemainingOpportunities.Add(-1)
+ if newValue <= 0 {
+ connectionStatus.Store(false)
+ }
+ return
+}
+
+func FailureRemainingOpportunitiesReset() {
+ if failureRemainingOpportunities.Load() < defaultFailureRemainingOpportunities {
+ failureRemainingOpportunities.Store(defaultFailureRemainingOpportunities)
+ }
+ if connectionStatus.Load() == false {
+ connectionStatus.Store(true)
+ }
+ return
+}
--
Gitblit v1.8.0