commit

pji/common/svc/disk_clean.go

@@ -6,7 +6,7 @@ import (
 	commonConfig "cicv-data-closedloop/pji/common/cfg"
 	"cicv-data-closedloop/pji/common/global"
 	"cicv-data-closedloop/pji/common/util"
-	masterConfig "cicv-data-closedloop/pji/master/pkg/cfg"
+	masterConfig "cicv-data-closedloop/pji/master/package/cfg"
 	"time"
 )
 

pji/common/svc/rosbag_upload.go

@@ -5,7 +5,7 @@ import (
 	commonConfig "cicv-data-closedloop/pji/common/cfg"
 	"cicv-data-closedloop/pji/common/global"
 	"cicv-data-closedloop/pji/common/util"
-	masterConfig "cicv-data-closedloop/pji/master/pkg/cfg"
+	masterConfig "cicv-data-closedloop/pji/master/package/cfg"
 	"fmt"
 	"os"
 	"strings"

pji/control/main/control.go

@@ -4,7 +4,7 @@ import (
 	"cicv-data-closedloop/common/config/c_log"
 	commonConfig "cicv-data-closedloop/pji/common/cfg"
 	commonService "cicv-data-closedloop/pji/common/svc"
-	controlConfig "cicv-data-closedloop/pji/control/pkg/cfg"
+	controlConfig "cicv-data-closedloop/pji/control/package/cfg"
 	"runtime"
 	"time"
 )

pji/master/main/master.go

@@ -5,8 +5,8 @@ import (
 	commonConfig "cicv-data-closedloop/pji/common/cfg"
 	commonInit "cicv-data-closedloop/pji/common/init"
 	commonService "cicv-data-closedloop/pji/common/svc"
-	masterConfig "cicv-data-closedloop/pji/master/pkg/cfg"
-	masterService "cicv-data-closedloop/pji/master/pkg/svc"
+	masterConfig "cicv-data-closedloop/pji/master/package/cfg"
+	masterService "cicv-data-closedloop/pji/master/package/svc"
 	"runtime"
 	"time"
 )

pji/master/pkg/svc/move_bag_and_send_window.go → pji/master/package/svc/move_bag_and_send_window.go

@@ -32,7 +32,7 @@ func RunTimeWindowProducerQueue() {
 		// 处理
 		time.Sleep(time.Duration(1) * time.Second)
 		if len(global.TimeWindowProducerQueue) > 0 {
-			bags := util2.ListAbsolutePathWithSuffixAndSort(commonConfig.CloudConfig.BagDataDir, ".bag")
+			bags, _ := util2.ListAbsolutePathWithSuffixAndSort(commonConfig.CloudConfig.BagDataDir, ".bag")
 			currentTimeWindow := global.TimeWindowProducerQueue[0]
 			move := false
 			bigger := false

pji/master/pkg/svc/produce_window.go → pji/master/package/svc/produce_window.go

@@ -7,7 +7,7 @@ import (
 	"cicv-data-closedloop/pji/common/global"
 	commonService "cicv-data-closedloop/pji/common/svc"
 	"cicv-data-closedloop/pji/common/util"
-	masterConfig "cicv-data-closedloop/pji/master/pkg/cfg"
+	masterConfig "cicv-data-closedloop/pji/master/package/cfg"
 	"cicv-data-closedloop/pji_msgs"
 	"github.com/bluenviron/goroslib/v2"
 	"github.com/bluenviron/goroslib/v2/pkg/msgs/diagnostic_msgs"