xlsx

extract/aux_head.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/tealeg/xlsx"
+	"github.com/xuri/excelize/v2"
 )
 
 // 每行传感器数据帧头信息长度为24字节
@@ -99,28 +99,30 @@ func (afh AuxFrameHead) CheckFrmHead() bool {
 	return false
 }
 
-func (afh AuxFrameHead) SaveXlsx(row *xlsx.Row) error {
-	values := []string{
-		fmt.Sprintf("0x%x", afh.PkgHead),
+func (afh AuxFrameHead) SaveXlsx(f *excelize.File, col, row int) (int, error) {
+	values := []interface{}{
+		fmt.Sprintf("0x%X", afh.PkgHead),
 		"",
-		fmt.Sprintf("0x%x", afh.FrmHead),
+		fmt.Sprintf("0x%X", afh.FrmHead),
 		afh.ImageMode(),
 		afh.BandStatus(afh.B4),
 		afh.BandStatus(afh.B3),
 		afh.BandStatus(afh.B2),
 		afh.BandStatus(afh.B1),
 		afh.BandStatus(afh.B0),
-		fmt.Sprintf("%d", afh.SerialNo),
-		fmt.Sprintf("%d", afh.TimeSec),
-		fmt.Sprintf("%d", afh.TimeSecFrac),
-		fmt.Sprintf("%d", afh.FileNo),
+		afh.SerialNo,
+		afh.TimeSec,
+		afh.TimeSecFrac,
+		afh.FileNo,
 	}
 
-	for _, v := range values {
-		row.AddCell().SetString(v)
+	for i := 0; i < len(values); i++ {
+		cell, _ := excelize.CoordinatesToCellName(col, row)
+		f.SetCellValue("Sheet1", cell, values[i])
+		col++
 	}
 
-	return nil
+	return len(values), nil
 }
 
 func (afh AuxFrameHead) ImageMode() string {