feat:根据任务调度&采集话题

aarch64/jili/common/config/c_oss.go

@@ -46,8 +46,7 @@ func InitOssConfig() {
 	//}
 
 	ossConnectInfo := OssConnectInfoStruct{
-		Endpoint: "http://36.110.106.156:20204/",
-		//Endpoint:        "http://oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com/",
+		Endpoint:        "http://36.110.106.156:20204/",
 		AccessKeyId:     "n8glvFGS25MrLY7j",
 		AccessKeySecret: "xZ2Fozoarpfw0z28FUhtg8cu0yDc5d",
 		BucketName:      "dcl",

aarch64/jili/master/service/produce_window.go

@@ -2138,21 +2138,33 @@ func ProduceWindow() {
 func saveTimeWindow(faultLabel string, faultHappenTime string, lastTimeWindow *commonEntity.TimeWindow) {
 	var taskBeforeTime, taskAfterTime, taskMaxTime int
 	{
-		if commonConfig.PlatformConfig.TaskBeforeTime == 0 {
-			taskBeforeTime = 5
+		//if commonConfig.PlatformConfig.TaskBeforeTime == 0 {
+		//	taskBeforeTime = 5
+		//} else {
+		//	taskBeforeTime = commonConfig.PlatformConfig.TaskBeforeTime
+		//}
+		//if commonConfig.PlatformConfig.TaskAfterTime == 0 {
+		//	taskAfterTime = 4
+		//} else {
+		//	taskAfterTime = commonConfig.PlatformConfig.TaskAfterTime
+		//}
+		//if commonConfig.PlatformConfig.TaskMaxTime == 0 {
+		//	taskMaxTime = 60
+		//} else {
+		//	taskMaxTime = commonConfig.PlatformConfig.TaskMaxTime
+		//}
+
+		// todo 这里基于任务设置taskBeforeTime和taskAfterTime的做法后面需要修改为根据触发器设置
+		if len(commonConfig.CurrTask.TaskTriggers) > 0 {
+			trigger := commonConfig.CurrTask.TaskTriggers[0]
+			taskBeforeTime = trigger.CollectionPreSeconds
+			taskAfterTime = trigger.CollectionAfterSeconds
 		} else {
-			taskBeforeTime = commonConfig.PlatformConfig.TaskBeforeTime
-		}
-		if commonConfig.PlatformConfig.TaskAfterTime == 0 {
+			taskBeforeTime = 5
 			taskAfterTime = 4
-		} else {
-			taskAfterTime = commonConfig.PlatformConfig.TaskAfterTime
-		}
-		if commonConfig.PlatformConfig.TaskMaxTime == 0 {
-			taskMaxTime = 60
-		} else {
-			taskMaxTime = commonConfig.PlatformConfig.TaskMaxTime
 		}
+
+		taskMaxTime = 60
 	}
 	saveTimeWindowMutex.Lock()
 	defer saveTimeWindowMutex.Unlock()

aarch64/jili/多功能车-test-local-config.yaml

@@ -9,8 +9,8 @@ equipment-no: 1
 secret-key: stringstringstrin
 # 获取oss连接信息的接口url
 url-get-oss-config: http://36.110.106.156:18379/oss/config?token=nXonLUcMtGcrQqqKiyygIwyVbvizE0wD
-# 金龙车数据前缀
-oss-base-prefix: pjisuv/
+# 数据前缀
+oss-base-prefix: jili/
 # oss上的配置文件的名称
 cloud-config-filename: cloud-config.yaml
 # 将oss上的配置文件下载到本地的路径

test/oss_test.go

@@ -90,12 +90,16 @@ func TestDeleteDir(t *testing.T) {
 
 func TestOssConnect(t *testing.T) {
 	// 1. 上传文件到oss
-	err := commonConfig.OssBucket.PutObjectFromFile("test/cloud-config.yaml", "D:\\cloud-config.yaml")
-	if err != nil {
-		panic(err)
-	}
+	//err := commonConfig.OssBucket.PutObjectFromFile("test/cloud-config.yaml", "D:\\cloud-config.yaml")
+	//if err != nil {
+	//	panic(err)
+	//}
 	// 2. 下载oss文件到本地
-	err = commonConfig.OssBucket.GetObjectToFile("test/cloud-config.yaml", "D:\\cloud-config-1.yaml")
+	//err = commonConfig.OssBucket.GetObjectToFile("test/cloud-config.yaml", "D:\\cloud-config-2.yaml")
+	//if err != nil {
+	//	panic(err)
+	//}
+	err := commonConfig.OssBucket.GetObjectToFile("oss-accesslog/dcl2025-04-01-11-00-00-0001", "D:\\dcl2025-04-01-11-00-00-0001l")
 	if err != nil {
 		panic(err)
 	}