From f73f610cdf4b0666dc139a51e72353b88f8f25ab Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 19 十月 2023 17:27:17 +0800
Subject: [PATCH] 为保证正确获取集群状态, 添加程序启动时读取system-service运行状态

---
 api/v1/plc.go |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/api/v1/plc.go b/api/v1/plc.go
index 1d528fb..85624bd 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -1,6 +1,7 @@
 package v1
 
 import (
+	"apsClient/conf"
 	"apsClient/constvar"
 	"apsClient/model/request"
 	"apsClient/model/response"
@@ -12,6 +13,7 @@
 	"apsClient/service"
 	"github.com/gin-gonic/gin"
 	"github.com/spf13/cast"
+	"time"
 )
 
 type PlcApi struct{}
@@ -29,19 +31,20 @@
 	if !ok {
 		return
 	}
-	finishNumber, _ := service.PlcCacheGet(params.Position, constvar.PlcCacheKeyFinishNumber)
-	totalNumber, _ := service.PlcCacheGet(params.Position, constvar.PlcCacheKeyTotalNumber)
+	finishNumber, _ := service.PlcCacheGet(params.Channel, constvar.PlcCacheKeyFinishNumber)
+	totalNumber, _ := service.PlcCacheGet(params.Channel, constvar.PlcCacheKeyTotalNumber)
 	resp := new(response.ProductProgress)
 	resp.FinishNumber = cast.ToInt(finishNumber)
 	resp.TotalNumber = cast.ToInt(totalNumber)
 
 	plcStatus := 1 //鏂紑杩炴帴
-	isConnect := apacheplc4x.IsConnect()
+	isConnect := service.PlcIsConnect()
 	if isConnect {
-		if resp.FinishNumber > 0 { //鐢熶骇
+		lastUpdateTime := service.FinishUpdateTimeGet(params.Channel)
+		if time.Now().Unix()-cast.ToInt64(lastUpdateTime) < conf.Conf.PLC.StandbyTime { //鐢熶骇
 			plcStatus = 2
-		} else { //寰呮満
-			plcStatus = 3
+		} else {
+			plcStatus = 3 //寰呮満
 		}
 	}
 	resp.PlcStatus = plcStatus
@@ -67,12 +70,10 @@
 // @Tags      鐢熶骇鏁伴噺
 // @Summary   瀹炴椂鑾峰彇鐢熶骇杩涘害
 // @Produce   application/json
-// @Param     object  body    request.SendProcessParams true  "鏌ヨ鍙傛暟"
 // @Success   200   {object}  contextx.Response{data=response.ProductProgress}  "鎴愬姛"
 // @Router    /v1/plc/productProgressRealTime [post]
 func (slf *PlcApi) GetProductProgressRealTime(c *gin.Context) {
-	var params request.GetProductProgress
-	ctx, ok := contextx.NewContext(c, &params)
+	ctx, ok := contextx.NewContext(c, nil)
 	if !ok {
 		return
 	}

--
Gitblit v1.8.0