fit: 原始数据已存储1秒, 所以working类的数据调整为1分钟

app/cmd/organization/internal/logic/handler/vars.go

@@ -28,13 +28,13 @@ type (
 
 var (
 	DeviceIntervalTable = map[string]time.Duration{
-		DEVICE_UF:    1 * time.Second,
-		DEVICE_MF:    1 * time.Second,
-		DEVICE_NF:    1 * time.Second,
-		DEVICE_RO:    1 * time.Second,
-		DEVICE_VALVE: 1 * time.Second,
-		DEVICE_PUMP:  1 * time.Second,
-		DEVICE_CHEST: 1 * time.Second,
+		DEVICE_UF:    60 * time.Second,
+		DEVICE_MF:    60 * time.Second,
+		DEVICE_NF:    60 * time.Second,
+		DEVICE_RO:    60 * time.Second,
+		DEVICE_VALVE: 60 * time.Second,
+		DEVICE_PUMP:  60 * time.Second,
+		DEVICE_CHEST: 60 * time.Second,
 	}
 
 	DeviceHandlerTable = map[string]func(ctx context.Context, task *job.Task, technologyName string) error{
@@ -59,22 +59,27 @@ var (
 )
 
 func (t DeviceBindCacheMap) GetCache(technologyName string) []model.DcDeviceBind {
-	return nil
-	//if cache, ok := t[technologyName]; ok {
-	//	if time.Now().After(cache.Expire) {
-	//		t[technologyName] = DeviceBindCache{}
-	//		return nil
-	//	}
-	//	return cache.Data
-	//} else {
-	//	return nil
-	//}
+	if cache, ok := t[technologyName]; ok {
+		if time.Now().After(cache.Expire) {
+			t[technologyName] = DeviceBindCache{}
+			return nil
+		}
+
+		if len(cache.Data) > 0 {
+			for _, datum := range cache.Data {
+				datum.Items.ClearValues()
+			}
+		}
+
+		return cache.Data
+	} else {
+		return nil
+	}
 }
 
 func (t DeviceBindCacheMap) SetCache(technologyName string, data []model.DcDeviceBind, expire time.Time) {
-	return
-	//t[technologyName] = DeviceBindCache{
-	//	Expire: expire,
-	//	Data:   data,
-	//}
+	t[technologyName] = DeviceBindCache{
+		Expire: expire,
+		Data:   data,
+	}
 }

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/zeromicro/go-zero v1.6.0
 	google.golang.org/grpc v1.59.0
 	google.golang.org/protobuf v1.31.0
-	metawant.greentech.com.cn/gaoyagang/gt-common v1.1.1
+	metawant.greentech.com.cn/gaoyagang/gt-common v1.2.2
 )
 
 require (

go.sum

@@ -279,8 +279,8 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-metawant.greentech.com.cn/gaoyagang/gt-common v1.1.1 h1:E2POLcmlV4pfskp6HhzhXy5dRuuzTJYtnhbB6FUuB9A=
-metawant.greentech.com.cn/gaoyagang/gt-common v1.1.1/go.mod h1:TiS/E+b6WFW/0Ei4H/djoguRTnfeBsiUnt5odj1C9n4=
+metawant.greentech.com.cn/gaoyagang/gt-common v1.2.2 h1:piC5uoDCIklKaCityR5lAD0u2KQInWhY65nCr2gqNAU=
+metawant.greentech.com.cn/gaoyagang/gt-common v1.2.2/go.mod h1:TiS/E+b6WFW/0Ei4H/djoguRTnfeBsiUnt5odj1C9n4=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=