From cffc76e87bc92dd4fb4617ba097103163adde6d4 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 20 十月 2023 15:50:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/apsClient
---
api/v1/plc.go | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index 47cf4bc..85624bd 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -31,8 +31,8 @@
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)
@@ -40,7 +40,7 @@
plcStatus := 1 //鏂紑杩炴帴
isConnect := service.PlcIsConnect()
if isConnect {
- lastUpdateTime := service.FinishUpdateTimeGet(params.Position)
+ lastUpdateTime := service.FinishUpdateTimeGet(params.Channel)
if time.Now().Unix()-cast.ToInt64(lastUpdateTime) < conf.Conf.PLC.StandbyTime { //鐢熶骇
plcStatus = 2
} else {
--
Gitblit v1.8.0