From 915253f87d4ef04d886bebb50135d75082ae0eee Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 15 九月 2023 13:37:22 +0800
Subject: [PATCH] 换一种方式检查plc连接

---
 service/plc.go |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/service/plc.go b/service/plc.go
index 0e5e49f..48292b2 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -145,12 +145,13 @@
 	return
 }
 
-func PlcReadDirect(plcConfig *model.DevicePlc, address int, dataLength int) (val interface{}, err error) {
+func PlcReadDirect(plcConfig *model.DevicePlc, address int, dataLength int, valueType constvar.PlcStartAddressValueType) (val interface{}, err error) {
 	var (
 		ipAddr string
 	)
 
 	if plcConfig.CurrentTryTimes > plcConfig.MaxTryTimes {
+		logx.Errorf("plc read try time beyond max try times, err:%v", plcConfig.CurrentErr)
 		return nil, plcConfig.CurrentErr
 	}
 	plcConfig.CurrentTryTimes++
@@ -158,15 +159,24 @@
 		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 PlcReadDirect(plcConfig, address, dataLength)
+			return PlcReadDirect(plcConfig, address, dataLength, valueType)
 		}
 		value, err := plc.ReadHoldingRegister(conn, address, dataLength)
 		if err != nil {
-			logx.Errorf("plc read failed, address: %v, err: %v", address, err.Error())
 			plcConfig.CurrentErr = err
-			return PlcReadDirect(plcConfig, address, dataLength)
+			return PlcReadDirect(plcConfig, address, dataLength, valueType)
+		}
+		switch valueType {
+		case constvar.PlcStartAddressValueTypeString:
+			return string(value), nil
+		case constvar.PlcStartAddressValueTypeInt:
+			if len(value) == 2 {
+				return int(binary.BigEndian.Uint16(value)), nil
+			} 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, value)
 	} else if plcConfig.Method == constvar.PlcMethodSerial {

--
Gitblit v1.8.0