From 2d6875c93b25d0b7336c7fa11e066d213259fe2e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 25 四月 2024 10:02:01 +0800
Subject: [PATCH] 更改定时任务时区设置
---
service/plc.go | 233 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 152 insertions(+), 81 deletions(-)
diff --git a/service/plc.go b/service/plc.go
index 2af5f40..98efc26 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,114 +14,109 @@
"errors"
"fmt"
"github.com/spf13/cast"
- "sync/atomic"
+ "sync"
)
-func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, channel int32, value interface{}) (err error) {
- var (
- startAddress int
- ipAddr string
- )
+// 涓插彛涓嶆敮鎸佸苟琛岃鍐欙紝鎵�浠ラ渶瑕佸姞涓攣锛岄槻姝imeout鍜岃祫婧愪笉鍙敤鎶ラ敊
+var lock sync.Mutex
+func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, channel int32, value interface{}) (err error) {
if plcConfig.CurrentTryTimes > plcConfig.MaxTryTimes {
return plcConfig.CurrentErr
}
plcConfig.CurrentTryTimes++
-
+ var targetConfig *model.DevicePlcAddress
for _, pc := range plcConfig.Details {
if pc.FieldName == fieldType && pc.Channel == channel {
- startAddress = pc.StartAddress
+ targetConfig = pc
}
}
-
- 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, value, targetConfig)
}
-func PlcWriteDirect(plcConfig *model.DevicePlc, address int, value interface{}) (err error) {
+func PlcWriteDirect(plcConfig *model.DevicePlc, value interface{}, c *model.DevicePlcAddress) (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, c.StartAddress, value, c.Endian, c.Length)
if err != nil {
- logx.Errorf("plc write failed, address: %v, value: %v, err: %v", address, value, err.Error())
+ logx.Errorf("plc write failed, address: %v, value: %v, err: %v", c.StartAddress, value, err.Error())
return err
}
- logx.Infof("plc write ok, address: %v, value: %v", address, value)
+ logx.Infof("plc write ok, address: %v, value: %v", c.StartAddress, value)
+ } else if plcConfig.Method == constvar.PlcMethodModbusRTU {
+ ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
+ err = WriteByModbusRTU(plcConfig, c.StartAddress, value, c.Endian, c.Length)
+
+ if err != nil {
+ logx.Errorf("plc write failed, address: %v, value: %v, err: %v", c.StartAddress, value, err.Error())
+ return err
+ }
+ logx.Infof("plc write ok, address: %v, value: %v", c.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", address)
+ label := fmt.Sprintf("D%d", c.StartAddress)
return plccom.WritePLC(plccom.DeviceTypeMitsubishi, ipAddr, label, cast.ToInt(value))
}
return
}
-func PlcReadDirect(plcConfig *model.DevicePlc, address int, dataLength int, valueType constvar.PlcStartAddressValueType) (val interface{}, err error) {
+func PlcReadDirect(plcConfig *model.DevicePlc, addressConfig *model.DevicePlcAddress) (val interface{}, err error) {
+ address, dataLength, endian := addressConfig.StartAddress, addressConfig.Length, addressConfig.Endian
+ 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
- }
- switch valueType {
- case constvar.PlcStartAddressValueTypeString:
- return string(value), nil
- case constvar.PlcStartAddressValueTypeInt:
- if len(value) == 2 {
- val = binary.BigEndian.Uint16(value)
- } else if len(value) == 4 {
- low16Val := binary.BigEndian.Uint32(value[:2])
- high16 := binary.BigEndian.Uint32(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))
+ 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, endian)
+ if err != nil {
+ return nil, err
+ }
+ } else {
+ value, err = ReadByModbusRTU(plcConfig, address, dataLength)
+ if err != nil {
+ return nil, err
}
}
- logx.Infof("plc read ok, address: %v, result: %v, dataLength: %v, valueLength: %v", address, val, dataLength, len(value))
- return val, nil
+ return Convert(value, addressConfig)
} 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 plccom.ReadPLC(plccom.DeviceTypeMitsubishi, ipAddr, label, dataLength)
}
return
}
-func ReadHoldingRegister(ipAddr string, address, length int) ([]byte, error) {
+func ReadByModbusTCP(ipAddr string, address, length int, endian constvar.EndianType) ([]byte, error) {
if conf.Conf.PLC.Package == constvar.PlcPackageApache {
- return apacheplc4x.ReadHoldingRegister(ipAddr, address, length)
+ var intType string
+ if endian == constvar.EndianTypeMix {
+ intType = "UINT"
+ } else {
+ intType = "DINT"
+ }
+ return apacheplc4x.ReadHoldingRegister(ipAddr, address, length, intType)
} else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
conn, err := plc.GetModbusConnection(ipAddr)
if err != nil {
@@ -132,9 +128,23 @@
}
}
-func WriteHoldingRegister(ipAddr string, address int, value any) (err error) {
+func WriteByModbusTCP(ipAddr string, address int, value any, endian constvar.EndianType, length int) (err error) {
if conf.Conf.PLC.Package == constvar.PlcPackageApache {
- _, err = apacheplc4x.WriteHoldingRegister(ipAddr, address, value)
+ var intType string
+ if endian == constvar.EndianTypeMix {
+ intType = "UINT"
+ int32Value := cast.ToInt32(value)
+ highVal := int32Value / (1 << 16)
+ lowValue := int32Value % (1 << 16)
+ _, err = apacheplc4x.WriteHoldingRegister(ipAddr, address, lowValue, intType)
+ if err != nil {
+ return err
+ }
+ _, err = apacheplc4x.WriteHoldingRegister(ipAddr, address+1, highVal, intType)
+ } else {
+ intType = "DINT"
+ _, err = apacheplc4x.WriteHoldingRegister(ipAddr, address, value, intType)
+ }
return err
} else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
conn, err := plc.GetModbusConnection(ipAddr)
@@ -144,19 +154,34 @@
_, err = plc.WriteHoldingRegister(conn, address, value)
return err
} else {
- return modbusx.Write(ipAddr, uint16(address), cast.ToInt(value))
+ return modbusx.Write(ipAddr, uint16(address), cast.ToInt(value), string(endian), length)
}
+}
+
+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,
+ }
+ return modbusx.ReadByRTU(rtuConfig, uint16(address), uint16(length))
+}
+
+func WriteByModbusRTU(plcConfig *model.DevicePlc, address int, value any, endian constvar.EndianType, length int) (err error) {
+ rtuConfig := &common.RTUConfig{
+ BaudRate: plcConfig.BaudRate,
+ SerialName: plcConfig.SerialName,
+ DataBit: plcConfig.DataBit,
+ StopBit: plcConfig.StopBit,
+ Parity: plcConfig.Parity,
+ }
+ return modbusx.WriteByRTU(rtuConfig, uint16(address), cast.ToInt(value), string(endian), length)
}
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) {
@@ -167,32 +192,78 @@
}
}
-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)
+ val, ok := connectionStatus.Load(conf.Conf.CurrentDeviceID)
+ if !ok || val.(int) < defaultFailureRemainingOpportunities {
+ connectionStatus.Store(conf.Conf.CurrentDeviceID, defaultFailureRemainingOpportunities)
+ return
}
- if connectionStatus.Load() == false {
- connectionStatus.Store(true)
+ return
+}
+
+func Convert(rawValue []byte, c *model.DevicePlcAddress) (value interface{}, err error) {
+ switch c.Type {
+ case constvar.PlcStartAddressValueTypeString:
+ return string(rawValue), nil
+ case constvar.PlcStartAddressValueTypeInt16:
+ if c.Endian == constvar.EndianTypeLittle {
+ value = binary.LittleEndian.Uint16(rawValue)
+ } else {
+ value = binary.BigEndian.Uint16(rawValue)
+ }
+ default:
+ if len(rawValue) == 2 {
+ if c.Endian == constvar.EndianTypeLittle {
+ value = binary.LittleEndian.Uint16(rawValue)
+ } else {
+ value = binary.BigEndian.Uint16(rawValue)
+ }
+ } else if len(rawValue) == 4 {
+ if c.Endian == constvar.EndianTypeBig {
+ value = binary.BigEndian.Uint32(rawValue)
+ } else if c.Endian == constvar.EndianTypeLittle {
+ value = binary.LittleEndian.Uint32(rawValue)
+ } else {
+ highBts := rawValue[2:]
+ lowBts := rawValue[:2]
+ highVal := uint32(binary.BigEndian.Uint16(highBts)) << 16
+ lowVal := uint32(binary.BigEndian.Uint16(lowBts))
+ value = highVal + lowVal
+ }
+ } else {
+ logx.Errorf("plc read get an unknown int value: %v, address:%v", rawValue, c.StartAddress)
+ return nil, errors.New(fmt.Sprintf("unknown value锛�%v", rawValue))
+ }
}
+
+ logx.Infof("plc read ok, address: %v, result: %v, value: %v, c:%+v", c.StartAddress, rawValue, value, c)
return
}
--
Gitblit v1.8.0