From 7692fa5336dc7db668306ea372a4516b5609776f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 23 十月 2023 21:21:55 +0800
Subject: [PATCH] 连接状态维护支持串口

---
 api/v1/plc.go  |  196 +++++++++++++++++++--------------------
 service/plc.go |   52 +++++++++-
 2 files changed, 142 insertions(+), 106 deletions(-)

diff --git a/api/v1/plc.go b/api/v1/plc.go
index cc16206..14750bc 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -3,16 +3,10 @@
 import (
 	"apsClient/conf"
 	"apsClient/constvar"
-	"apsClient/crontask"
 	"apsClient/model/request"
 	"apsClient/model/response"
 	_ "apsClient/model/response"
-	"apsClient/nsq"
 	"apsClient/pkg/contextx"
-	"apsClient/pkg/ecode"
-	"apsClient/pkg/logx"
-	"apsClient/pkg/plc/apacheplc4x"
-	"apsClient/serf"
 	"apsClient/service"
 	"github.com/gin-gonic/gin"
 	"github.com/spf13/cast"
@@ -69,99 +63,99 @@
 	ctx.Ok()
 }
 
-// SetSerfEvent
-// @Tags      鐢熶骇鏁伴噺
-// @Summary   璁剧疆鐢熶骇鎬婚噺
-// @Produce   application/json
-// @Success   200   {object}  contextx.Response{data=response.ProductProgress}  "鎴愬姛"
-// @Router    /v1/plc/setSerfEvent [post]
-func (slf *PlcApi) SetSerfEvent(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
-	if !ok {
-		return
-	}
-	status := c.Query("status")
-	stat := cast.ToInt(status)
-	switch stat {
-	case serf.EventCreateCluster, serf.EventSlave2Master, serf.EventLeaveCluster:
-		if err := nsq.Init(); err != nil { //寮�鍚痭sq
-			logx.Errorf("nsq Init err:%v", err)
-			return
-		}
-		crontask.Once(true)
-		if err := crontask.RestartTask(true); err != nil { //浠aster鏂瑰紡閲嶅惎task
-			logx.Errorf("crontab task Init err:%v", err)
-			return
-		}
-	case serf.EventJoinCluster, serf.EventMaster2Slave:
-		nsq.Stop() //鍏抽棴nsq
-		crontask.Once(false)
-		if err := crontask.RestartTask(false); err != nil { //浠ラ潪master鏂瑰紡閲嶅惎task
-			logx.Errorf("crontab task Init err:%v", err)
-			return
-		}
-	}
+//// SetSerfEvent
+//// @Tags      鐢熶骇鏁伴噺
+//// @Summary   璁剧疆鐢熶骇鎬婚噺
+//// @Produce   application/json
+//// @Success   200   {object}  contextx.Response{data=response.ProductProgress}  "鎴愬姛"
+//// @Router    /v1/plc/setSerfEvent [post]
+//func (slf *PlcApi) SetSerfEvent(c *gin.Context) {
+//	ctx, ok := contextx.NewContext(c, nil)
+//	if !ok {
+//		return
+//	}
+//	status := c.Query("status")
+//	stat := cast.ToInt(status)
+//	switch stat {
+//	case serf.EventCreateCluster, serf.EventSlave2Master, serf.EventLeaveCluster:
+//		if err := nsq.Init(); err != nil { //寮�鍚痭sq
+//			logx.Errorf("nsq Init err:%v", err)
+//			return
+//		}
+//		crontask.Once(true)
+//		if err := crontask.RestartTask(true); err != nil { //浠aster鏂瑰紡閲嶅惎task
+//			logx.Errorf("crontab task Init err:%v", err)
+//			return
+//		}
+//	case serf.EventJoinCluster, serf.EventMaster2Slave:
+//		nsq.Stop() //鍏抽棴nsq
+//		crontask.Once(false)
+//		if err := crontask.RestartTask(false); err != nil { //浠ラ潪master鏂瑰紡閲嶅惎task
+//			logx.Errorf("crontab task Init err:%v", err)
+//			return
+//		}
+//	}
+//
+//	logx.Infof("serf cluster event: %v", stat)
+//
+//	ctx.Ok()
+//}
 
-	logx.Infof("serf cluster event: %v", stat)
-
-	ctx.Ok()
-}
-
-// GetProductProgressRealTime
-// @Tags      鐢熶骇鏁伴噺
-// @Summary   瀹炴椂鑾峰彇鐢熶骇杩涘害
-// @Produce   application/json
-// @Success   200   {object}  contextx.Response{data=response.ProductProgress}  "鎴愬姛"
-// @Router    /v1/plc/productProgressRealTime [post]
-func (slf *PlcApi) GetProductProgressRealTime(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
-	if !ok {
-		return
-	}
-	var finishNumber, totalNumber int64
-	plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
-	if code != ecode.OK {
-		return
-	}
-	for _, addressItem := range plcConfig.Details {
-		if addressItem.FieldName == constvar.PlcStartAddressTypeFinishNumber {
-			value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
-			if err != nil {
-				logx.Infof("plc read finish number err: %v", err)
-				continue
-			}
-			finishNumber = cast.ToInt64(value)
-			logx.Infof("plc read finish number: %v", finishNumber)
-			break
-		}
-	}
-
-	for _, addressItem := range plcConfig.Details {
-		if addressItem.FieldName == constvar.PlcStartAddressTypeTotalNumber {
-			value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
-			if err != nil {
-				logx.Infof("plc read total number err: %v", err)
-				continue
-			}
-			totalNumber = cast.ToInt64(value)
-			logx.Infof("plc read total number: %v", totalNumber)
-			break
-		}
-	}
-	resp := new(response.ProductProgress)
-	resp.FinishNumber = cast.ToInt(finishNumber)
-	resp.TotalNumber = cast.ToInt(totalNumber)
-
-	plcStatus := 1 //鏂紑杩炴帴
-	isConnect := apacheplc4x.IsConnect()
-	if isConnect {
-		if resp.FinishNumber > 0 { //鐢熶骇
-			plcStatus = 2
-		} else { //寰呮満
-			plcStatus = 3
-		}
-	}
-	resp.PlcStatus = plcStatus
-
-	ctx.OkWithDetailed(resp)
-}
+//// GetProductProgressRealTime
+//// @Tags      鐢熶骇鏁伴噺
+//// @Summary   瀹炴椂鑾峰彇鐢熶骇杩涘害
+//// @Produce   application/json
+//// @Success   200   {object}  contextx.Response{data=response.ProductProgress}  "鎴愬姛"
+//// @Router    /v1/plc/productProgressRealTime [post]
+//func (slf *PlcApi) GetProductProgressRealTime(c *gin.Context) {
+//	ctx, ok := contextx.NewContext(c, nil)
+//	if !ok {
+//		return
+//	}
+//	var finishNumber, totalNumber int64
+//	plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
+//	if code != ecode.OK {
+//		return
+//	}
+//	for _, addressItem := range plcConfig.Details {
+//		if addressItem.FieldName == constvar.PlcStartAddressTypeFinishNumber {
+//			value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
+//			if err != nil {
+//				logx.Infof("plc read finish number err: %v", err)
+//				continue
+//			}
+//			finishNumber = cast.ToInt64(value)
+//			logx.Infof("plc read finish number: %v", finishNumber)
+//			break
+//		}
+//	}
+//
+//	for _, addressItem := range plcConfig.Details {
+//		if addressItem.FieldName == constvar.PlcStartAddressTypeTotalNumber {
+//			value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
+//			if err != nil {
+//				logx.Infof("plc read total number err: %v", err)
+//				continue
+//			}
+//			totalNumber = cast.ToInt64(value)
+//			logx.Infof("plc read total number: %v", totalNumber)
+//			break
+//		}
+//	}
+//	resp := new(response.ProductProgress)
+//	resp.FinishNumber = cast.ToInt(finishNumber)
+//	resp.TotalNumber = cast.ToInt(totalNumber)
+//
+//	plcStatus := 1 //鏂紑杩炴帴
+//	isConnect := apacheplc4x.IsConnect()
+//	if isConnect {
+//		if resp.FinishNumber > 0 { //鐢熶骇
+//			plcStatus = 2
+//		} else { //寰呮満
+//			plcStatus = 3
+//		}
+//	}
+//	resp.PlcStatus = plcStatus
+//
+//	ctx.OkWithDetailed(resp)
+//}
diff --git a/service/plc.go b/service/plc.go
index f73ec58..1d9d5e9 100644
--- a/service/plc.go
+++ b/service/plc.go
@@ -13,6 +13,7 @@
 	"errors"
 	"fmt"
 	"github.com/spf13/cast"
+	"sync/atomic"
 )
 
 func PlcWrite(plcConfig *model.DevicePlc, fieldType constvar.PlcStartAddressType, channel int32, value interface{}) (err error) {
@@ -57,6 +58,7 @@
 	var (
 		ipAddr string
 	)
+	defer dealErr(err)
 	if plcConfig.Method == constvar.PlcMethodModbusTCP {
 		ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
 		err = WriteHoldingRegister(ipAddr, address, value)
@@ -81,6 +83,7 @@
 	var (
 		ipAddr string
 	)
+	defer dealErr(err)
 	if plcConfig.Method == constvar.PlcMethodModbusTCP {
 		ipAddr = fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
 		value, err := ReadHoldingRegister(ipAddr, address, dataLength)
@@ -144,11 +147,50 @@
 }
 
 func PlcIsConnect() bool {
-	if conf.Conf.PLC.Package == constvar.PlcPackageApache {
-		return apacheplc4x.IsConnect()
-	} else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
-		return false
+	return IsConnect()
+	//if conf.Conf.PLC.Package == constvar.PlcPackageApache {
+	//	return apacheplc4x.IsConnect()
+	//} else if conf.Conf.PLC.Package == constvar.PlcPackageApacheLongConnection {
+	//	return false
+	//} else {
+	//	return modbusx.IsConnect()
+	//}
+}
+
+func dealErr(err error) {
+	if err != nil {
+		FailureRemainingOpportunitiesDecr() //鍑忓皯澶辫触鍓╀綑鏈轰細
 	} else {
-		return modbusx.IsConnect()
+		FailureRemainingOpportunitiesReset() //閲嶇疆澶辫触鍓╀綑鏈轰細
 	}
 }
+
+var connectionStatus atomic.Bool
+
+var failureRemainingOpportunities atomic.Int64
+
+const (
+	defaultFailureRemainingOpportunities = 20
+)
+
+func IsConnect() bool {
+	return connectionStatus.Load()
+}
+
+func FailureRemainingOpportunitiesDecr() {
+	newValue := failureRemainingOpportunities.Add(-1)
+	if newValue <= 0 {
+		connectionStatus.Store(false)
+	}
+	return
+}
+
+func FailureRemainingOpportunitiesReset() {
+	if failureRemainingOpportunities.Load() < defaultFailureRemainingOpportunities {
+		failureRemainingOpportunities.Store(defaultFailureRemainingOpportunities)
+	}
+	if connectionStatus.Load() == false {
+		connectionStatus.Store(true)
+	}
+	return
+}

--
Gitblit v1.8.0