commit

aarch64/pjisuv/master/service/move_bag_and_send_window.go

@@ -57,7 +57,7 @@ func RunTimeWindowProducerQueue() {
 		if !move && bigger {
 			currentTimeWindow.CanUpload = "yes"
 			// 如果第一个已经大于了timeWindowEnd，则触发上传并删除
-			domain.SupplyCopyBags(commonConfig.CloudConfig.BagDataDir, commonConfig.CloudConfig.BagCopyDir, currentTimeWindow)
+			//domain.SupplyCopyBags(commonConfig.CloudConfig.BagDataDir, commonConfig.CloudConfig.BagCopyDir, currentTimeWindow)
 			entity.RefreshTcpSendTime()
 			go sendTimeWindowByTcp(currentTimeWindow)
 			entity.RemoveHeadOfTimeWindowProducerQueue()

aarch64/pjisuv/slave/package/service/move_bag.go

@@ -62,7 +62,7 @@ func RunTimeWindowProducerQueue() {
 				// 1 timeWindow可以上传
 				c_log.GlobalLogger.Info("timeWindow可以上传：", currentTimeWindow)
 				// 补充bag包
-				domain.SupplyCopyBags(commonConfig.CloudConfig.BagDataDir, commonConfig.CloudConfig.BagCopyDir, currentTimeWindow)
+				//domain.SupplyCopyBags(commonConfig.CloudConfig.BagDataDir, commonConfig.CloudConfig.BagCopyDir, currentTimeWindow)
 				// 将时间窗口加入运行队列
 				entity.AddTimeWindowToTimeWindowConsumerQueue(currentTimeWindow)
 			}

common/domain/d_service.go

@@ -25,7 +25,7 @@ func GetCopyDir(bagDataDir string, faultTime string) string {
 	return bagDataDir + faultTime + "/"
 }
 
-// SupplyCopyBags 如果 Copy目录下的包不够，则补充一些
+// 如果 Copy目录下的包不够，则补充一些
 func SupplyCopyBags(bagDataDir string, bagCopyDir string, currentTimeWindow entity.TimeWindow) {
 	// 如果bag包没有达到length，补充几个
 	copyBags, _ := util.ListAbsolutePathWithSuffixAndSort(GetCopyDir(bagCopyDir, currentTimeWindow.FaultTime), ".bag")

common/util/u_io.go

@@ -242,25 +242,6 @@ func DeleteFile(path string) error {
 	}
 	return nil
 }
-func ListAbsolutePathAndSort(dir string) ([]string, error) {
-	var result []string
-	if !strings.HasSuffix(dir, "/") {
-		dir = dir + "/"
-	}
-	files, err := os.ReadDir(dir)
-	if err != nil {
-		return result, err
-	}
-	for _, file := range files {
-		result = append(result, dir+file.Name())
-	}
-
-	// 根据文件名进行升序排序
-	sort.Slice(result, func(i, j int) bool {
-		return filepath.Base(result[i]) < filepath.Base(result[j])
-	})
-	return result, nil
-}
 
 // WriteStringToFile 将字符串写入指定的文件路径
 func WriteStringToFile(content string, filePath string) {