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 | 181 +++++++++++++++++++++++++++++++--------------
1 files changed, 124 insertions(+), 57 deletions(-)
diff --git a/service/plc.go b/service/plc.go
index 090b4bc..f73ec58 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -1,58 +1,21 @@
package service
import (
+ "apsClient/conf"
"apsClient/constvar"
"apsClient/model"
"apsClient/pkg/logx"
"apsClient/pkg/plc"
+ "apsClient/pkg/plc/apacheplc4x"
+ "apsClient/pkg/plc/modbusx"
+ "apsClient/pkg/plccom"
"encoding/binary"
"errors"
"fmt"
+ "github.com/spf13/cast"
)
-func PlcRead(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType) (val interface{}, err error) {
- var (
- startAddress int
- valueType constvar.PlcStartAddressValueType
- dataLength int
- ipAddr string
- )
-
- for _, pc := range plcConfig.Details {
- if pc.FieldName == fieldType {
- startAddress = pc.StartAddress
- valueType = pc.Type
- dataLength = pc.Length
- }
- }
- ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
-
- conn, err := plc.GetModbusConnection(ipAddr)
- if err != nil {
- logx.Errorf("PlcRead 杩炴帴plc澶辫触: %v", err.Error())
- return
- }
-
- rawData, err := plc.ReadHoldingRegister(conn, startAddress, dataLength)
- if err != nil {
- logx.Errorf("PlcRead 鑾峰彇plc鏁版嵁澶辫触: %v", err.Error())
- return
- }
- switch valueType {
- case constvar.PlcStartAddressValueTypeString:
- return string(rawData), nil
- case constvar.PlcStartAddressValueTypeInt:
- if len(rawData) == 2 {
- return int(binary.BigEndian.Uint16(rawData)), nil
- } else {
- logx.Errorf("plc read get an unknown int value: %v, address:%v", rawData, startAddress)
- return nil, errors.New(fmt.Sprintf("unknown int value锛�%v", rawData))
- }
- }
- return nil, errors.New("undefined value type")
-}
-
-func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, value interface{}) (err error) {
+func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, channel int32, value interface{}) (err error) {
var (
startAddress int
ipAddr string
@@ -64,24 +27,128 @@
plcConfig.CurrentTryTimes++
for _, pc := range plcConfig.Details {
- if pc.FieldName == fieldType {
+ if pc.FieldName == fieldType && pc.Channel == channel {
startAddress = pc.StartAddress
}
}
- 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, value)
- }
- result, err := plc.WriteHoldingRegister(conn, 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, value)
+ 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))
}
- logx.Infof("plc write ok, address: %v, value: %v, result: %v", startAddress, value, result)
return
}
+
+func PlcWriteDirect(plcConfig *model.DevicePlc, address int, value interface{}) (err error) {
+ var (
+ ipAddr string
+ )
+ if plcConfig.Method == constvar.PlcMethodModbusTCP {
+ ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
+ err = WriteHoldingRegister(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.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)
+ 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) {
+ var (
+ ipAddr string
+ )
+ 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 {
+ val = binary.BigEndian.Uint32(value)
+ } 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)
+ return val, nil
+ } 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
+}
+
+func ReadHoldingRegister(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 {
+ conn, err := plc.GetModbusConnection(ipAddr)
+ if err != nil {
+ return nil, err
+ }
+ return plc.ReadHoldingRegister(conn, address, length)
+ } else {
+ return modbusx.Read(ipAddr, uint16(address), uint16(length))
+ }
+}
+
+func WriteHoldingRegister(ipAddr string, address int, value any) (err error) {
+ if conf.Conf.PLC.Package == constvar.PlcPackageApache {
+ _, err = apacheplc4x.WriteHoldingRegister(ipAddr, address, value)
+ return err
+ } else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
+ conn, err := plc.GetModbusConnection(ipAddr)
+ if err != nil {
+ return err
+ }
+ _, err = plc.WriteHoldingRegister(conn, address, value)
+ return err
+ } else {
+ 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