From 948bfeb2e8abd2ec80e282bd1b17975b89d3eb74 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 23 十一月 2023 11:27:52 +0800
Subject: [PATCH] 所有的缓存都考虑上deviceID
---
api/v1/plc.go | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index 650f64b..4de07fb 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -28,8 +28,8 @@
if !ok {
return
}
- finishNumber, _ := service.PlcCacheGet(params.Channel, constvar.PlcCacheKeyFinishNumber)
- totalNumber, _ := service.PlcCacheGet(params.Channel, constvar.PlcCacheKeyTotalNumber)
+ finishNumber, _ := service.PlcCacheGet(conf.Conf.CurrentDeviceID, params.Channel, constvar.PlcCacheKeyFinishNumber)
+ totalNumber, _ := service.PlcCacheGet(conf.Conf.CurrentDeviceID, params.Channel, constvar.PlcCacheKeyTotalNumber)
resp := new(response.ProductProgress)
resp.FinishNumber = cast.ToInt(finishNumber)
resp.TotalNumber = cast.ToInt(totalNumber)
@@ -37,7 +37,7 @@
plcStatus := 1 //鏂紑杩炴帴
isConnect := service.PlcIsConnect()
if isConnect {
- lastUpdateTime := service.FinishUpdateTimeGet(params.Channel)
+ lastUpdateTime := service.FinishUpdateTimeGet(conf.Conf.CurrentDeviceID, params.Channel)
if time.Now().Unix()-cast.ToInt64(lastUpdateTime) < conf.Conf.PLC.StandbyTime { //鐢熶骇
plcStatus = 2
} else {
@@ -46,8 +46,8 @@
}
resp.PlcStatus = plcStatus
- resp.RealStartTime = service.TaskStartTimeGet(params.Channel)
- resp.RealEndTime = service.TaskEndTimeGet(params.Channel)
+ resp.RealStartTime = service.TaskStartTimeGet(conf.Conf.CurrentDeviceID, params.Channel)
+ resp.RealEndTime = service.TaskEndTimeGet(conf.Conf.CurrentDeviceID, params.Channel)
ctx.OkWithDetailed(resp)
}
--
Gitblit v1.8.0