From 3f1ef5cdf9212f912e9cad544387947d158f5d08 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 14 九月 2023 19:26:49 +0800
Subject: [PATCH] 增加plc连接状态

---
 api/v1/plc.go |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/api/v1/plc.go b/api/v1/plc.go
index 7fdf89d..3ed79a8 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -6,7 +6,10 @@
 	"apsClient/model/response"
 	_ "apsClient/model/response"
 	"apsClient/pkg/contextx"
+	"apsClient/pkg/ecode"
+	"apsClient/pkg/plc"
 	"apsClient/service"
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/spf13/cast"
 )
@@ -31,6 +34,24 @@
 	resp := new(response.ProductProgress)
 	resp.FinishNumber = cast.ToInt(finishNumber)
 	resp.TotalNumber = cast.ToInt(totalNumber)
+
+	plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
+	if code != ecode.OK {
+		return
+	}
+	plcStatus := 1 //鏂紑杩炴帴
+	ipAddr := fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
+
+	conn, err := plc.GetModbusConnection(ipAddr)
+	if err == nil && conn.IsConnected() {
+		if resp.FinishNumber > 0 { //鐢熶骇
+			plcStatus = 2
+		} else { //寰呮満
+			plcStatus = 3
+		}
+	}
+	resp.PlcStatus = plcStatus
+
 	ctx.OkWithDetailed(resp)
 }
 

--
Gitblit v1.8.0