From 7692fa5336dc7db668306ea372a4516b5609776f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 23 十月 2023 21:21:55 +0800
Subject: [PATCH] 连接状态维护支持串口
---
service/plc.go | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/service/plc.go b/service/plc.go
index f73ec58..1d9d5e9 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -13,6 +13,7 @@
"errors"
"fmt"
"github.com/spf13/cast"
+ "sync/atomic"
)
func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, channel int32, value interface{}) (err error) {
@@ -57,6 +58,7 @@
var (
ipAddr string
)
+ defer dealErr(err)
if plcConfig.Method == constvar.PlcMethodModbusTCP {
ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
err = WriteHoldingRegister(ipAddr, address, value)
@@ -81,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)
@@ -144,11 +147,50 @@
}
func PlcIsConnect() bool {
- if conf.Conf.PLC.Package == constvar.PlcPackageApache {
- return apacheplc4x.IsConnect()
- } else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
- return false
+ 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 {
- return modbusx.IsConnect()
+ 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