|
|
@@ -413,13 +413,19 @@ func SaveBatchDownloadEventAlarm(sn string, dateStr string, eventAlarmData []dom
|
|
|
} else {
|
|
|
id = *data.ID
|
|
|
}
|
|
|
+ // EndTime 为 *string,事件或未结束的告警其值为 null,需先判 nil 再解引用,
|
|
|
+ // 否则直接写入指针会被格式化为指针地址(如 0x1be7816885a0)
|
|
|
+ endTime := "null"
|
|
|
+ if data.EndTime != nil {
|
|
|
+ endTime = *data.EndTime
|
|
|
+ }
|
|
|
f.SetCellValue("Sheet1", "A"+strconv.Itoa(i+2), id)
|
|
|
f.SetCellValue("Sheet1", "B"+strconv.Itoa(i+2), data.LogTime)
|
|
|
f.SetCellValue("Sheet1", "C"+strconv.Itoa(i+2), data.LogType)
|
|
|
f.SetCellValue("Sheet1", "D"+strconv.Itoa(i+2), data.AlarmCode)
|
|
|
f.SetCellValue("Sheet1", "E"+strconv.Itoa(i+2), data.LogName)
|
|
|
f.SetCellValue("Sheet1", "F"+strconv.Itoa(i+2), data.StartTime)
|
|
|
- f.SetCellValue("Sheet1", "G"+strconv.Itoa(i+2), data.EndTime)
|
|
|
+ f.SetCellValue("Sheet1", "G"+strconv.Itoa(i+2), endTime)
|
|
|
f.SetCellValue("Sheet1", "H"+strconv.Itoa(i+2), data.LogData)
|
|
|
}
|
|
|
|