孟令鑫 1 gadu atpakaļ
vecāks
revīzija
276a906196
1 mainītis faili ar 3 papildinājumiem un 7 dzēšanām
  1. 3 7
      aarch64/pjisuv/common/service/rosbag_upload.go

+ 3 - 7
aarch64/pjisuv/common/service/rosbag_upload.go

@@ -123,7 +123,7 @@ outLoop:
 			triggerIds = append(triggerIds, triggerIdToAppend)
 		}
 		c_log.GlobalLogger.Info("json 中添加【triggerIds】=", triggerIds)
-		callBackMap := map[string]interface{}{
+		callBackJson, _ := commonUtil.MapToJsonString(map[string]interface{}{
 			"dataName":    currentTimeWindow.FaultTime,
 			"dataSize":    "", // 由合并程序补充
 			"equipmentNo": commonConfig.LocalConfig.EquipmentNo,
@@ -132,13 +132,9 @@ outLoop:
 			"filePath":    objectKey3,
 			"taskId":      commonConfig.PlatformConfig.TaskConfigId,
 			"triggerId":   triggerIds,
-		}
-		callBackJson, err := commonUtil.MapToJsonString(callBackMap)
+		})
 		c_log.GlobalLogger.Info("【callBackJson】=", callBackJson)
-		if err != nil {
-			c_log.GlobalLogger.Error("callBackMap", callBackMap, "转 json 失败:", err)
-		}
-		err = commonConfig.OssBucket.PutObject(objectKey3+"callback.json", strings.NewReader(callBackJson))
+		err := commonConfig.OssBucket.PutObject(objectKey3+"callback.json", strings.NewReader(callBackJson))
 		if err != nil {
 			c_log.GlobalLogger.Error("上传 callback.json", callBackJson, "失败:", err)
 		}