From 163d9e7f1fbf65b9a0e63baac017555b47a28bc4 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 九月 2023 21:11:29 +0800
Subject: [PATCH] fix
---
service/plc.go | 76 +++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 14 deletions(-)
diff --git a/service/plc.go b/service/plc.go
index 00fa70f..74ed5dc 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -8,6 +8,7 @@
"encoding/binary"
"errors"
"fmt"
+ "sync"
)
func PlcRead(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType) (val interface{}, err error) {
@@ -24,26 +25,30 @@
valueType = pc.Type
dataLength = pc.Length
}
- ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
}
+ ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
- conn, err := plc.NewModbusConnection(ipAddr)
+ conn, err := plc.GetModbusConnection(ipAddr)
if err != nil {
- logx.Errorf("GetProductProgress 杩炴帴plc澶辫触: %v", err.Error())
+ logx.Errorf("PlcRead 杩炴帴plc澶辫触: %v", err.Error())
return
}
- defer conn.Close()
rawData, err := plc.ReadHoldingRegister(conn, startAddress, dataLength)
if err != nil {
- logx.Errorf("GetProductProgress 鑾峰彇plc鏁版嵁澶辫触: %v", err.Error())
+ logx.Errorf("PlcRead 鑾峰彇plc鏁版嵁澶辫触: %v", err.Error())
return
}
switch valueType {
case constvar.PlcStartAddressValueTypeString:
return string(rawData), nil
case constvar.PlcStartAddressValueTypeInt:
- return int(binary.BigEndian.Uint16(rawData)), nil
+ 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")
}
@@ -54,25 +59,68 @@
ipAddr string
)
+ if plcConfig.CurrentTryTimes > plcConfig.MaxTryTimes {
+ return plcConfig.CurrentErr
+ }
+ plcConfig.CurrentTryTimes++
+
for _, pc := range plcConfig.Details {
if pc.FieldName == fieldType {
startAddress = pc.StartAddress
}
- ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
}
-
- conn, err := plc.NewModbusConnection(ipAddr)
+ ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
+ conn, err := plc.GetModbusConnection(ipAddr)
if err != nil {
- logx.Errorf("GetProductProgress 杩炴帴plc澶辫触: %v", err.Error())
- return
+ logx.Errorf("plc write failed, 杩炴帴plc澶辫触: %v", err.Error())
+ plcConfig.CurrentErr = err
+ return PlcWrite(plcConfig, fieldType, value)
}
- defer conn.Close()
result, err := plc.WriteHoldingRegister(conn, startAddress, value)
if err != nil {
- logx.Infof("plc write failed, address: %v, value: %v, err: %v", startAddress, value, err.Error())
- return
+ 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)
return
}
+
+type CacheStore struct {
+ cache map[string]interface{}
+ mu sync.Mutex
+}
+
+var defaultCacheStore *CacheStore
+
+func init() {
+ defaultCacheStore = newCacheManager()
+}
+func newCacheManager() *CacheStore {
+ return &CacheStore{
+ cache: make(map[string]interface{}),
+ }
+}
+
+func (cm *CacheStore) Get(key string) (interface{}, bool) {
+ cm.mu.Lock()
+ defer cm.mu.Unlock()
+
+ conn, ok := cm.cache[key]
+ return conn, ok
+}
+
+func (cm *CacheStore) Add(key string, value interface{}) {
+ cm.mu.Lock()
+ defer cm.mu.Unlock()
+ cm.cache[key] = value
+}
+
+func PlcCacheGet(key string) (interface{}, bool) {
+ return defaultCacheStore.Get(key)
+}
+
+func PlcCacheSet(key string, value interface{}) {
+ defaultCacheStore.Add(key, value)
+}
--
Gitblit v1.8.0