From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
service/plc.go | 160 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 106 insertions(+), 54 deletions(-)
diff --git a/service/plc.go b/service/plc.go
index 1d9d5e9..c577998 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -4,6 +4,7 @@
"apsClient/conf"
"apsClient/constvar"
"apsClient/model"
+ "apsClient/model/common"
"apsClient/pkg/logx"
"apsClient/pkg/plc"
"apsClient/pkg/plc/apacheplc4x"
@@ -13,13 +14,15 @@
"errors"
"fmt"
"github.com/spf13/cast"
- "sync/atomic"
+ "sync"
)
+
+// 涓插彛涓嶆敮鎸佸苟琛岃鍐欙紝鎵�浠ラ渶瑕佸姞涓攣锛岄槻姝imeout鍜岃祫婧愪笉鍙敤鎶ラ敊
+var lock sync.Mutex
func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, channel int32, value interface{}) (err error) {
var (
startAddress int
- ipAddr string
)
if plcConfig.CurrentTryTimes > plcConfig.MaxTryTimes {
@@ -32,36 +35,30 @@
startAddress = pc.StartAddress
}
}
-
- if plcConfig.Method == constvar.PlcMethodModbusTCP {
- ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
- 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, channel, value)
- }
- logx.Infof("plc write ok, address: %v, value: %v", startAddress, value)
- } else if plcConfig.Method == constvar.PlcMethodSerial {
- ipAddr = conf.Conf.Services.Serial
- if ipAddr == "" {
- return errors.New("conf.Conf.Services.Serial config not set yet")
- }
- label := fmt.Sprintf("D%d", startAddress)
- return plccom.WritePLC(plccom.DeviceTypeMitsubishi, ipAddr, label, cast.ToInt(value))
- }
- return
+ return PlcWriteDirect(plcConfig, startAddress, value)
}
func PlcWriteDirect(plcConfig *model.DevicePlc, address int, value interface{}) (err error) {
+ lock.Lock()
+ defer lock.Unlock()
var (
ipAddr string
)
- defer dealErr(err)
+ defer func() {
+ dealErr(err)
+ }()
if plcConfig.Method == constvar.PlcMethodModbusTCP {
ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
- err = WriteHoldingRegister(ipAddr, address, value)
+ err = WriteByModbusTCP(ipAddr, address, value)
+
+ if err != nil {
+ logx.Errorf("plc write failed, address: %v, value: %v, err: %v", address, value, err.Error())
+ return err
+ }
+ logx.Infof("plc write ok, address: %v, value: %v", address, value)
+ } else if plcConfig.Method == constvar.PlcMethodModbusRTU {
+ ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
+ err = WriteByModbusRTU(plcConfig, address, value)
if err != nil {
logx.Errorf("plc write failed, address: %v, value: %v, err: %v", address, value, err.Error())
@@ -80,20 +77,33 @@
}
func PlcReadDirect(plcConfig *model.DevicePlc, address int, dataLength int, valueType constvar.PlcStartAddressValueType) (val interface{}, err error) {
+ lock.Lock()
+ defer lock.Unlock()
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)
- if err != nil {
- return nil, err
+ defer func() {
+ dealErr(err)
+ }()
+ if plcConfig.Method == constvar.PlcMethodModbusTCP || plcConfig.Method == constvar.PlcMethodModbusRTU {
+ var value []byte
+ if plcConfig.Method == constvar.PlcMethodModbusTCP {
+ ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
+ value, err = ReadByModbusTCP(ipAddr, address, dataLength)
+ if err != nil {
+ return nil, err
+ }
+ } else {
+ value, err = ReadByModbusRTU(plcConfig, address, dataLength)
+ if err != nil {
+ return nil, err
+ }
}
+
switch valueType {
case constvar.PlcStartAddressValueTypeString:
return string(value), nil
- case constvar.PlcStartAddressValueTypeInt:
+ case constvar.PlcStartAddressValueTypeInt32:
if len(value) == 2 {
val = binary.BigEndian.Uint16(value)
} else if len(value) == 4 {
@@ -102,8 +112,19 @@
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))
}
+ default:
+ if len(value) == 2 {
+ val = binary.BigEndian.Uint16(value)
+ } else if len(value) == 4 {
+ 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, value: %v", address, val, dataLength, value)
return val, nil
} else if plcConfig.Method == constvar.PlcMethodSerial {
ipAddr = conf.Conf.Services.Serial
@@ -111,12 +132,12 @@
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 plccom.ReadPLC(plccom.DeviceTypeMitsubishi, ipAddr, label, dataLength)
}
return
}
-func ReadHoldingRegister(ipAddr string, address, length int) ([]byte, error) {
+func ReadByModbusTCP(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 {
@@ -130,7 +151,7 @@
}
}
-func WriteHoldingRegister(ipAddr string, address int, value any) (err error) {
+func WriteByModbusTCP(ipAddr string, address int, value any) (err error) {
if conf.Conf.PLC.Package == constvar.PlcPackageApache {
_, err = apacheplc4x.WriteHoldingRegister(ipAddr, address, value)
return err
@@ -146,15 +167,39 @@
}
}
+func ReadByModbusRTU(plcConfig *model.DevicePlc, address, length int) ([]byte, error) {
+ rtuConfig := &common.RTUConfig{
+ BaudRate: plcConfig.BaudRate,
+ SerialName: plcConfig.SerialName,
+ DataBit: plcConfig.DataBit,
+ StopBit: plcConfig.StopBit,
+ Parity: plcConfig.Parity,
+ }
+ if conf.Conf.PLC.Package == constvar.PlcPackageApache {
+ return apacheplc4x.ReadHoldingRegisterByRTU(rtuConfig, address, length)
+ } else {
+ return modbusx.ReadByRTU(rtuConfig, uint16(address), uint16(length))
+ }
+}
+
+func WriteByModbusRTU(plcConfig *model.DevicePlc, address int, value any) (err error) {
+ rtuConfig := &common.RTUConfig{
+ BaudRate: plcConfig.BaudRate,
+ SerialName: plcConfig.SerialName,
+ DataBit: plcConfig.DataBit,
+ StopBit: plcConfig.StopBit,
+ Parity: plcConfig.Parity,
+ }
+ if conf.Conf.PLC.Package == constvar.PlcPackageApache {
+ _, err = apacheplc4x.WriteHoldingRegisterByRTU(rtuConfig, address, value)
+ return err
+ } else {
+ return modbusx.WriteByRTU(rtuConfig, 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) {
@@ -165,32 +210,39 @@
}
}
-var connectionStatus atomic.Bool
-
-var failureRemainingOpportunities atomic.Int64
+var connectionStatus sync.Map
const (
defaultFailureRemainingOpportunities = 20
)
func IsConnect() bool {
- return connectionStatus.Load()
+ val, ok := connectionStatus.Load(conf.Conf.CurrentDeviceID)
+ if !ok {
+ return false
+ }
+ failureRemainingOpportunities := val.(int)
+ return failureRemainingOpportunities > 0
}
func FailureRemainingOpportunitiesDecr() {
- newValue := failureRemainingOpportunities.Add(-1)
- if newValue <= 0 {
- connectionStatus.Store(false)
+ val, ok := connectionStatus.Load(conf.Conf.CurrentDeviceID)
+ if !ok {
+ return
}
+ failureRemainingOpportunities := val.(int)
+ if failureRemainingOpportunities > 0 {
+ failureRemainingOpportunities--
+ }
+ connectionStatus.Store(conf.Conf.CurrentDeviceID, failureRemainingOpportunities)
return
}
func FailureRemainingOpportunitiesReset() {
- if failureRemainingOpportunities.Load() < defaultFailureRemainingOpportunities {
- failureRemainingOpportunities.Store(defaultFailureRemainingOpportunities)
- }
- if connectionStatus.Load() == false {
- connectionStatus.Store(true)
+ val, ok := connectionStatus.Load(conf.Conf.CurrentDeviceID)
+ if !ok || val.(int) < defaultFailureRemainingOpportunities {
+ connectionStatus.Store(conf.Conf.CurrentDeviceID, defaultFailureRemainingOpportunities)
+ return
}
return
}
--
Gitblit v1.8.0