From cab6eea89a0d82710369604ecb51f1cdb122e433 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 17:26:34 +0800
Subject: [PATCH] fix
---
service/plc.go | 41 +++++++++++++++--------------------------
1 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/service/plc.go b/service/plc.go
index b86c091..f73ec58 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -15,7 +15,7 @@
"github.com/spf13/cast"
)
-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 +27,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 {
@@ -70,17 +59,7 @@
)
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())
@@ -163,3 +142,13 @@
return modbusx.Write(ipAddr, uint16(address), cast.ToInt(value))
}
}
+
+func PlcIsConnect() bool {
+ if conf.Conf.PLC.Package == constvar.PlcPackageApache {
+ return apacheplc4x.IsConnect()
+ } else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
+ return false
+ } else {
+ return modbusx.IsConnect()
+ }
+}
--
Gitblit v1.8.0