commit

aarch64/pjisuv/common/service/rosbag_upload.go

@@ -113,37 +113,39 @@ outLoop:
 			}
 		}
 		c_log.GlobalLogger.Info("上传完成，花费时间：", time.Since(start))
-		// 在上传完成的包目录同级下添加一个目录同名的json
-		var triggerIds []string
-		for _, label := range currentTimeWindow.Labels {
-			if triggerId, ok := masterConfig.LabelMapTriggerId.Load(label); !ok {
-				c_log.GlobalLogger.Errorf("【label】=%v 没有对应的【triggerId】", label)
-			} else {
-				c_log.GlobalLogger.Info("添加一个【triggerId】=", triggerId)
-				triggerIds = append(triggerIds, commonUtil.ToString(triggerId))
+		if commonConfig.LocalConfig.Node.Name == "master" {
+			// 在上传完成的包目录同级下添加一个目录同名的json
+			var triggerIds []string
+			for _, label := range currentTimeWindow.Labels {
+				if triggerId, ok := masterConfig.LabelMapTriggerId.Load(label); !ok {
+					c_log.GlobalLogger.Errorf("【label】=%v 没有对应的【triggerId】", label)
+				} else {
+					c_log.GlobalLogger.Info("添加一个【triggerId】=", triggerId)
+					triggerIds = append(triggerIds, commonUtil.ToString(triggerId))
+				}
+			}
+			c_log.GlobalLogger.Info("json 中添加【triggerIds】=", triggerIds)
+			callBackJsonBytes, _ := json.MarshalIndent(&entity.CallBack{
+				DataName:    currentTimeWindow.FaultTime,
+				DataSize:    "", // 由合并程序补充
+				EquipmentNo: commonConfig.LocalConfig.EquipmentNo,
+				SecretKey:   commonConfig.LocalConfig.SecretKey,
+				RosBagPath:  objectKey2,
+				FilePath:    objectKey3,
+				TaskId:      commonConfig.PlatformConfig.TaskConfigId,
+				TriggerId:   triggerIds,
+			}, "", "    ")
+			callBackJson := string(callBackJsonBytes)
+			c_log.GlobalLogger.Info("【callBackJson】=", callBackJson)
+			err := commonConfig.OssBucket.PutObject(objectKey3+"callback.json", strings.NewReader(callBackJson))
+			if err != nil {
+				c_log.GlobalLogger.Error("上传 callback.json", callBackJson, "失败：", err)
 			}
 		}
-		c_log.GlobalLogger.Info("json 中添加【triggerIds】=", triggerIds)
-		callBackJsonBytes, _ := json.MarshalIndent(&entity.CallBack{
-			DataName:    currentTimeWindow.FaultTime,
-			DataSize:    "", // 由合并程序补充
-			EquipmentNo: commonConfig.LocalConfig.EquipmentNo,
-			SecretKey:   commonConfig.LocalConfig.SecretKey,
-			RosBagPath:  objectKey2,
-			FilePath:    objectKey3,
-			TaskId:      commonConfig.PlatformConfig.TaskConfigId,
-			TriggerId:   triggerIds,
-		}, "", "    ")
-		callBackJson := string(callBackJsonBytes)
-		c_log.GlobalLogger.Info("【callBackJson】=", callBackJson)
-		// TODO 如果还是会丢失trigger数组，考虑将数组转成序列，到云端去处理成数组
-		err := commonConfig.OssBucket.PutObject(objectKey3+"callback.json", strings.NewReader(callBackJson))
-		if err != nil {
-			c_log.GlobalLogger.Error("上传 callback.json", callBackJson, "失败：", err)
-		}
+
 		// 删除本地所有已上传的bag文件
 		c_log.GlobalLogger.Infof("结束处理窗口，【Label】=%v，【TriggerIds】=%v，【FaultTime】=%v，【Length】=%v", currentTimeWindow.Labels, currentTimeWindow.TriggerIds, currentTimeWindow.FaultTime, currentTimeWindow.Length)
-		if err = commonUtil.RemoveDir(dir); err != nil {
+		if err := commonUtil.RemoveDir(dir); err != nil {
 			continue outLoop
 		}
 	}