From d4272e1b692515af9c47799a658e395703d13555 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 07 九月 2023 21:22:49 +0800
Subject: [PATCH] 支持串口读写

---
 service/plc.go |  127 +++++++++++++++++++++++++++++++-----------
 1 files changed, 93 insertions(+), 34 deletions(-)

diff --git a/service/plc.go b/service/plc.go
index 090b4bc..f2bbd0b 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -1,13 +1,16 @@
 package service
 
 import (
+	"apsClient/conf"
 	"apsClient/constvar"
 	"apsClient/model"
 	"apsClient/pkg/logx"
 	"apsClient/pkg/plc"
+	"apsClient/pkg/plccom"
 	"encoding/binary"
 	"errors"
 	"fmt"
+	"github.com/spf13/cast"
 )
 
 func PlcRead(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType) (val interface{}, err error) {
@@ -25,31 +28,42 @@
 			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
-	}
+	if plcConfig.Method == constvar.PlcMethodModbusTCP {
+		ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
 
-	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))
+		conn, err := plc.GetModbusConnection(ipAddr)
+		if err != nil {
+			logx.Errorf("PlcRead 杩炴帴plc澶辫触: %v", err.Error())
+			return nil, err
 		}
+
+		rawData, err := plc.ReadHoldingRegister(conn, startAddress, dataLength)
+		if err != nil {
+			logx.Errorf("PlcRead 鑾峰彇plc鏁版嵁澶辫触: %v", err.Error())
+			return nil, err
+		}
+		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")
+	} 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", startAddress)
+		return plccom.ReadPLC(plccom.DeviceTypeMitsubishi, ipAddr, label)
 	}
-	return nil, errors.New("undefined value type")
+	return nil, errors.New("interface type not support")
 }
 
 func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, value interface{}) (err error) {
@@ -68,20 +82,65 @@
 			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)
+		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)
+		}
+		logx.Infof("plc write ok, address: %v, value: %v, result: %v", startAddress, value, result)
+	} 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.CurrentTryTimes > plcConfig.MaxTryTimes {
+		return plcConfig.CurrentErr
+	}
+	plcConfig.CurrentTryTimes++
+	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)
+		if err != nil {
+			logx.Errorf("plc write failed, address: %v, value: %v, err: %v", address, value, err.Error())
+			plcConfig.CurrentErr = err
+			return PlcWriteDirect(plcConfig, address, value)
+		}
+		logx.Infof("plc write ok, address: %v, value: %v, result: %v", address, value, result)
+	} 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
 }

--
Gitblit v1.8.0