commit

aarch64/pjibot_delivery/common/service/rosbag_upload.go

@@ -9,7 +9,6 @@ import (
 	"cicv-data-closedloop/common/util"
 	"fmt"
 	"os"
-	"path/filepath"
 	"strings"
 	"time"
 )
@@ -142,9 +141,6 @@ outLoop:
 		}
 		commonConfig.OssMutex.Lock()
 		err = commonConfig.OssBucket.PutObject(objectKey3+"callback.json", strings.NewReader(callBackJson))
-		for _, file := range commonConfig.CloudConfig.MapBufFiles {
-			err = commonConfig.OssBucket.PutObjectFromFile(objectKey3+filepath.Base(file), file)
-		}
 		commonConfig.OssMutex.Unlock()
 		if err != nil {
 			c_log.GlobalLogger.Error("上传 callback.json 或 mapBuf 文件失败：", err)

aarch64/pjibot_patrol/common/service/rosbag_upload.go

@@ -9,7 +9,6 @@ import (
 	"cicv-data-closedloop/common/util"
 	"fmt"
 	"os"
-	"path/filepath"
 	"strings"
 	"time"
 )
@@ -142,9 +141,6 @@ outLoop:
 		}
 		commonConfig.OssMutex.Lock()
 		err = commonConfig.OssBucket.PutObject(objectKey3+"callback.json", strings.NewReader(callBackJson))
-		for _, file := range commonConfig.CloudConfig.MapBufFiles {
-			err = commonConfig.OssBucket.PutObjectFromFile(objectKey3+filepath.Base(file), file)
-		}
 		commonConfig.OssMutex.Unlock()
 		if err != nil {
 			c_log.GlobalLogger.Error("上传 callback.json 或 mapBuf 文件失败：", err)

common/entity/time_window.go

@@ -9,21 +9,11 @@ import (
 var (
 	TimeWindowProducerQueue      []TimeWindow
 	TimeWindowProducerQueueMutex sync.RWMutex
+	TimeWindowProducerChannel    = make(chan TimeWindow)
 
 	TimeWindowConsumerQueue      []TimeWindow
 	TimeWindowConsumerQueueMutex sync.RWMutex
-	Subscriber0Time              = time.Date(2023, time.November, 23, 10, 30, 0, 0, time.UTC)
-	Subscriber0TimeMutex         sync.Mutex
-	Subscriber1Time              = time.Date(2023, time.November, 23, 10, 30, 0, 0, time.UTC)
-	Subscriber1TimeMutex         sync.Mutex
-	Subscriber2Time              = time.Date(2023, time.November, 23, 10, 30, 0, 0, time.UTC)
-	Subscriber2TimeMutex         sync.Mutex
-	Subscriber3Time              = time.Date(2023, time.November, 23, 10, 30, 0, 0, time.UTC)
-	Subscriber3TimeMutex         sync.Mutex
-	Subscriber4Time              = time.Date(2023, time.November, 23, 10, 30, 0, 0, time.UTC)
-	Subscriber4TimeMutex         sync.Mutex
-	Subscriber5Time              = time.Date(2023, time.November, 23, 10, 30, 0, 0, time.UTC)
-	Subscriber5TimeMutex         sync.Mutex
+	TimeWindowConsumerChannel    = make(chan TimeWindow)
 
 	TcpSendTime      = time.Date(2023, time.November, 23, 10, 30, 0, 0, time.UTC)
 	TcpSendTimeMutex sync.Mutex