From cab6eea89a0d82710369604ecb51f1cdb122e433 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 17:26:34 +0800
Subject: [PATCH] fix
---
service/cache_store.go | 86 +++++++++++++++++++++++++++++--------------
1 files changed, 58 insertions(+), 28 deletions(-)
diff --git a/service/cache_store.go b/service/cache_store.go
index 4c3148b..743e4a7 100644
--- a/service/cache_store.go
+++ b/service/cache_store.go
@@ -1,10 +1,14 @@
package service
import (
+ "apsClient/conf"
+ "apsClient/constvar"
"apsClient/model"
- "apsClient/model/response"
"fmt"
+ "github.com/jinzhu/gorm"
+ "github.com/spf13/cast"
"sync"
+ "time"
)
type CacheStore struct {
@@ -44,45 +48,71 @@
}
const (
- PlcCacheKey = "plc:%v"
- CurrentTaskCacheKey = "current_task"
- CurrentProgressCacheKey = "current_progress"
+ PlcCacheKey = "plc:%v:%v" //plc:channel:key
+ CurrentTaskCacheKey = "current_task:%v" //current_task:channel
+ CurrentProgressCacheKey = "current_progress:%v" //current_progress:channel
+ PlcCacheKeyUpdateTime = "finish_number_update_time:%v" //finish_number_update_time:channel
)
-func PlcCacheGet(key string) (interface{}, bool) {
- return defaultCacheStore.Get(fmt.Sprintf(PlcCacheKey, key))
+func PlcCacheGet(channel int32, key string) (interface{}, bool) {
+ return defaultCacheStore.Get(fmt.Sprintf(PlcCacheKey, channel, key))
}
-func PlcCacheSet(key string, value interface{}) {
- defaultCacheStore.Add(fmt.Sprintf(PlcCacheKey, key), value)
-}
-
-func TaskCacheSet(value *response.TaskData) {
- defaultCacheStore.Add(CurrentTaskCacheKey, value)
-}
-
-func TaskCacheUnset() {
- defaultCacheStore.Remove(CurrentTaskCacheKey)
-}
-
-func TaskCacheGet() (*response.TaskData, bool) {
- if v, ok := defaultCacheStore.Get(CurrentTaskCacheKey); ok {
- return v.(*response.TaskData), ok
+func PlcCacheSet(channel int32, key string, value interface{}) {
+ if key == constvar.PlcCacheKeyFinishNumber {
+ oldFinishNumber, exists := PlcCacheGet(channel, key)
+ if !exists || cast.ToInt(oldFinishNumber) != cast.ToInt(value) { //finishNumber鏈変簡鍙樺寲锛岃缃洿鏂版椂闂寸紦瀛�
+ FinishUpdateTimeSet(channel, time.Now().Unix())
+ }
}
- return nil, false
+ defaultCacheStore.Add(fmt.Sprintf(PlcCacheKey, channel, key), value)
}
-func ProgressCacheGet() (*model.ProductionProgress, bool) {
- if v, ok := defaultCacheStore.Get(CurrentProgressCacheKey); ok {
+func FinishUpdateTimeGet(channel int32) interface{} {
+ val, ok := defaultCacheStore.Get(fmt.Sprintf(PlcCacheKeyUpdateTime, channel))
+ if ok {
+ return val
+ }
+ return 0
+}
+
+func FinishUpdateTimeSet(channel int32, value interface{}) {
+ defaultCacheStore.Add(fmt.Sprintf(PlcCacheKeyUpdateTime, channel), value)
+}
+
+func TaskFlagSet(channel int32) {
+ defaultCacheStore.Add(fmt.Sprintf(CurrentTaskCacheKey, channel), true)
+}
+
+func TaskFlagUnset(channel int32) {
+ defaultCacheStore.Add(fmt.Sprintf(CurrentTaskCacheKey, channel), false)
+}
+
+func TaskFlagGet(channel int32) bool {
+ if v, ok := defaultCacheStore.Get(fmt.Sprintf(CurrentTaskCacheKey, channel)); ok {
+ return v.(bool)
+ }
+ _, err := model.NewProceduresSearch(nil).SetDeviceId(conf.Conf.System.DeviceId).SetStatus(model.ProcedureStatusProcessing).SetChannels([]int32{channel}).First()
+ if err == gorm.ErrRecordNotFound {
+ defaultCacheStore.Add(fmt.Sprintf(CurrentTaskCacheKey, channel), false)
+ return false
+ } else {
+ defaultCacheStore.Add(fmt.Sprintf(CurrentTaskCacheKey, channel), true)
+ return true
+ }
+}
+
+func ProgressCacheGet(channel int32) (*model.ProductionProgress, bool) {
+ if v, ok := defaultCacheStore.Get(fmt.Sprintf(CurrentProgressCacheKey, channel)); ok {
return v.(*model.ProductionProgress), ok
}
return nil, false
}
-func ProgressCacheSet(value *model.ProductionProgress) {
- defaultCacheStore.Add(CurrentProgressCacheKey, value)
+func ProgressCacheSet(channel int32, value *model.ProductionProgress) {
+ defaultCacheStore.Add(fmt.Sprintf(CurrentProgressCacheKey, channel), value)
}
-func ProgressCacheUnset() {
- defaultCacheStore.Remove(CurrentProgressCacheKey)
+func ProgressCacheUnset(channel int32) {
+ defaultCacheStore.Remove(fmt.Sprintf(CurrentProgressCacheKey, channel))
}
--
Gitblit v1.8.0