fix: 更正用于地图更新的bag包

biz/handler/map_service/map_service.go

@@ -13,6 +13,7 @@ import (
 	"os"
 	"path/filepath"
 	"pji_desktop_http/common/config"
+	"pji_desktop_http/common/config/c_log"
 	"pji_desktop_http/common/entity"
 	"pji_desktop_http/common/util"
 )
@@ -351,10 +352,10 @@ func getRosFileById(id string) (file string, err error) {
 // 根据id生成用于地图更新的压缩包
 func generateZipById(id string) (file string, tmpDir string, err error) {
 	// 根据id获取对应的oss文件列表
-	fileList, err := getExactedMapFileById(id)
+	allFileList, err := getExactedMapFileById(id)
 
 	// 过滤特定后缀的文件列表
-	fileList = filterBySuffixes(fileList, config.MapBufFiltersuffixes...)
+	mapBuFileList := filterBySuffixes(allFileList, config.MapBufFiltersuffixes...)
 	//fmt.Println("Filtered Strings:", fileList)
 	if err != nil {
 		return
@@ -362,11 +363,13 @@ func generateZipById(id string) (file string, tmpDir string, err error) {
 
 	// 创建临时文件夹
 	tmpDir, err = os.MkdirTemp("", "temp-download-*")
+
 	fmt.Println("tmpDir:", tmpDir)
 	if err != nil {
 		fmt.Println("Error creating temporary directory:", err)
 		return "", "", err
 	}
+	c_log.GlobalLogger.Info("创建下载-临时文件夹：", tmpDir)
 
 	// 创建根文件夹（文件打包的根目录）
 	baseDir := filepath.Join(tmpDir, "data")
@@ -374,6 +377,7 @@ func generateZipById(id string) (file string, tmpDir string, err error) {
 		fmt.Println("Error creating subdirectory:", err)
 		return "", "", err
 	}
+	c_log.GlobalLogger.Info("创建文件打包根目录：", baseDir)
 
 	// 根目录创建子文件夹 bag_folder
 	bagFolderDir := filepath.Join(baseDir, "bag_folder")
@@ -381,6 +385,7 @@ func generateZipById(id string) (file string, tmpDir string, err error) {
 		fmt.Println("Error creating subdirectory:", err)
 		return "", "", err
 	}
+	c_log.GlobalLogger.Info("根目录下创建bag_folder子文件夹：", bagFolderDir)
 
 	// 根目录创建子文件夹 origin_map_folder
 	originMapFolderDir := filepath.Join(baseDir, "origin_map_folder")
@@ -388,6 +393,7 @@ func generateZipById(id string) (file string, tmpDir string, err error) {
 		fmt.Println("Error creating subdirectory:", err)
 		return "", "", err
 	}
+	c_log.GlobalLogger.Info("根目录下创建origin_map_folder子文件夹：", originMapFolderDir)
 
 	// 子文件夹 bag_folder 创建子文件夹 mapBuf
 	mapBufDir := filepath.Join(bagFolderDir, "mapBuf")
@@ -395,34 +401,40 @@ func generateZipById(id string) (file string, tmpDir string, err error) {
 		fmt.Println("Error creating subdirectory:", err)
 		return "", "", err
 	}
+	c_log.GlobalLogger.Info("bag_folder创建mapBuf子文件夹 ：", mapBufDir)
 
-	// 从oss下载bag文件到 bag_folder 文件夹
-	RosFileId, _ := getRosFileById(id)
-	err = config.OssBucket.GetObjectToFile(RosFileId, filepath.Join(bagFolderDir, filepath.Base(RosFileId)))
+	// 从oss下载build_map.bag文件到 bag_folder 文件夹
+	// 过滤特定后缀的文件列表
+	buildMapBagFileList := filterBySuffixes(allFileList, config.BuildMapBagFiltersuffixes...)
+	buildMapBagFile := buildMapBagFileList[0]
+	err = config.OssBucket.GetObjectToFile(buildMapBagFile, filepath.Join(bagFolderDir, filepath.Base(buildMapBagFile)))
 	if err != nil {
 		fmt.Println("Error downloading Bag file:", err)
 		return "", "", err
 	}
+	c_log.GlobalLogger.Info("下载文件到bag_folder文件夹 - 成功")
 
 	// 从oss下载文件到 mapBuf 文件夹
-	for _, file := range fileList {
+	for _, file := range mapBuFileList {
 		err = config.OssBucket.GetObjectToFile(file, filepath.Join(mapBufDir, filepath.Base(file)))
 		if err != nil {
 			fmt.Println("Error downloading mapBuf file:", err)
 			return "", "", err
 		}
 	}
+	c_log.GlobalLogger.Info("下载文件到mapBuf子文件夹 - 成功")
 
 	// 从oss下载bag文件到 origin_map_folder 文件夹
 	// 过滤特定后缀的文件列表
-	fileList = filterBySuffixes(fileList, config.OriginMapFiltersuffixes...)
-	for _, file := range fileList {
+	originMapFileList := filterBySuffixes(allFileList, config.OriginMapFiltersuffixes...)
+	for _, file := range originMapFileList {
 		err = config.OssBucket.GetObjectToFile(file, filepath.Join(originMapFolderDir, filepath.Base(file)))
 		if err != nil {
 			fmt.Println("Error downloading origin_map file:", err)
 			return "", "", err
 		}
 	}
+	c_log.GlobalLogger.Info("下载文件到origin_map_folder文件夹 - 成功")
 
 	// 创建压缩文件
 	zipPath := filepath.Join(tmpDir, "mapFile-"+id+".zip")
@@ -443,6 +455,8 @@ func generateZipById(id string) (file string, tmpDir string, err error) {
 	}
 	fmt.Println("ZIP file created successfully.")
 
+	c_log.GlobalLogger.Info("创建压缩文件 - 成功")
+
 	return zipPath, tmpDir, nil
 }
 

common/config/c_map.go

@@ -1,6 +1,7 @@
 package config
 
 var (
-	MapBufFiltersuffixes    = []string{"map.pgm", "map.yaml", "map.json", "forbid_area.json"}
-	OriginMapFiltersuffixes = []string{"map.pgm", "map.yaml"}
+	MapBufFiltersuffixes      = []string{"map.pgm", "map.yaml", "map.json", "forbid_area.json"}
+	BuildMapBagFiltersuffixes = []string{"build_map.bag"}
+	OriginMapFiltersuffixes   = []string{"map.pgm", "map.yaml"}
 )

router.go

@@ -16,7 +16,7 @@ func customizedRegister(r *server.Hertz) {
 
 	r.GET("/test/queryuser", user_service.TestQueryUser)
 
-	r.POST("/map/checkmapbuf", map_service.CheckMapBufConsistency)
+	r.POST("/map/checkmapbufconsistency", map_service.CheckMapBufConsistency)
 
 	r.GET("/map/downloadossfile", map_service.DownloadOSSFile)