|
@@ -124,7 +124,7 @@ outLoop:
|
|
|
}
|
|
|
}
|
|
|
c_log.GlobalLogger.Info("json 中添加【triggerIds】=", triggerIds)
|
|
|
- callBackJsonBytes, _ := json.Marshal(&entity.CallBack{
|
|
|
+ callBackJsonBytes, _ := json.MarshalIndent(&entity.CallBack{
|
|
|
DataName: currentTimeWindow.FaultTime,
|
|
|
DataSize: "", // 由合并程序补充
|
|
|
EquipmentNo: commonConfig.LocalConfig.EquipmentNo,
|
|
@@ -133,9 +133,10 @@ outLoop:
|
|
|
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)
|