commit

aarch64/pjisuv/common/config/yaml/pjisuv-006-cloud-config.yaml

@@ -11,10 +11,10 @@ config-refresh-interval: 60
 disk:
   name: /dev/vdb # 磁盘名称
   used: 800000000000 # 磁盘占用阈值，单位bytes
-bag-data-dir: /mnt/media/sda1/cicv-data-closedloop/data/
-bag-copy-dir: /mnt/media/sda1/cicv-data-closedloop/copy/
-time-to-label-json-path: /mnt/media/sda1/cicv-data-closedloop/timeToLabel.json
-triggers-dir: /mnt/media/sda1/cicv-data-closedloop/triggers/
+bag-data-dir: /userdata/cicv-data-closedloop/data/
+bag-copy-dir: /userdata/cicv-data-closedloop/copy/
+time-to-label-json-path: /userdata/cicv-data-closedloop/timeToLabel.json
+triggers-dir: /userdata/cicv-data-closedloop/triggers/
 time-window-send-gap: 6
 tcp-port: 12340
 rpc-port: 12341

aarch64/pjisuv/common/config/yaml/pjisuv-006-soc1-local-config.yaml

@@ -11,9 +11,9 @@ oss-base-prefix: pjisuv/
 # oss上的配置文件的名称
 cloud-config-filename: cloud-config.yaml
 # 将oss上的配置文件下载到本地的路径
-cloud-config-local-path: /mnt/media/sda1/cicv-data-closedloop/config/cloud-config.yaml
+cloud-config-local-path: /userdata/cicv-data-closedloop/config/cloud-config.yaml
 restart-cmd:
-  dir: "/mnt/media/sda1/cicv-data-closedloop/"
+  dir: "/userdata/cicv-data-closedloop/"
   name: "sh"
   args:
     - "start-soc1.sh"

aarch64/pjisuv/master/service/for_competition.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"cicv-data-closedloop/aarch64/pjisuv/common/config"
 	commonConfig "cicv-data-closedloop/aarch64/pjisuv/common/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
@@ -16,6 +17,7 @@ import (
 var (
 	dir                    = "/userdata/competition/"
 	dirBak                 = "/userdata/competition-bak/"
+	ossPrefix              = "competition/"
 	commandArgs            = []string{"record", "--split", "--duration=1", "/pji_gps", "/data_read"}
 	topic                  = "/team_name"
 	urlExamTick            = "http://36.110.106.142:12341/web_server/exam/tick"
@@ -64,7 +66,7 @@ func dataCollection() {
 				c_log.GlobalLogger.Debug("上传实车算法比赛全量数据包", files[i])
 				bagSlice := strings.Split(files[i], "/")
 				commonConfig.OssMutex.Lock()
-				_ = commonConfig.OssBucket.PutObjectFromFile("competition/"+bagSlice[len(bagSlice)-1], files[i])
+				_ = commonConfig.OssBucket.PutObjectFromFile(ossPrefix+config.LocalConfig.EquipmentNo+"/"+bagSlice[len(bagSlice)-1], files[i])
 				commonConfig.OssMutex.Unlock()
 				_ = util.DeleteFile(files[i])
 			}