self-tools
/
excel-export
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整输出日志信息

This commit is contained in:
Mr.Li 2023-04-23 19:01:31 +08:00
parent 6d752bdb2f
commit f676d63f06
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/cmd/csv.go
View File

@ -89,6 +89,7 @@ func (e *Csv) TaskExport(d export.DataFetcher, t config.Task, params map[string]
//todo 合并csv文件，并删除 临时目录 //todo 合并csv文件，并删除 临时目录
if err := e.mergeCsvToExcel(e.dirTemp, i, fileName); err != nil { if err := e.mergeCsvToExcel(e.dirTemp, i, fileName); err != nil {
log.Printf("合并csv文件异常：%s", err.Error()) log.Printf("合并csv文件异常：%s", err.Error())
return err
} }
//重置临时路径 //重置临时路径

12
cmd/cmd/export-all-job.go
View File

@ -2,8 +2,8 @@ package cmd
import ( import (
"excel_export/biz/config" "excel_export/biz/config"
"fmt"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"log"
"strconv" "strconv"
"time" "time"
) )
@ -45,12 +45,12 @@ func exportAllJobRun(cmd *cobra.Command, args []string) {
} }
for _, job := range sys.Jobs { for _, job := range sys.Jobs {
fmt.Printf("[%s]执行【%s】【%s】导出\n", time.Now().Format("2006-01-02 15:04:05"), sName, job.Name) log.Printf("执行【%s】【%s】导出\n", sName, job.Name)
b := time.Now() b := time.Now()
ee := NewCsv(config.DefaultConfig) ee := NewCsv(config.DefaultConfig)
ee.Export(sName, job.Name, begin, end, batch) if err := ee.Export(sName, job.Name, begin, end, batch); err != nil {
e := time.Now() CmdError(cmd, "【%s】【%s】导出错误：%s", sName, job.Name, err.Error())
fmt.Println("导出耗时：" + e.Sub(b).String()) }
log.Println("导出耗时：" + time.Now().Sub(b).String())
} }
} }

11
cmd/cmd/export-all.go
View File

@ -2,8 +2,8 @@ package cmd
import ( import (
"excel_export/biz/config" "excel_export/biz/config"
"fmt"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"log"
"strconv" "strconv"
"time" "time"
) )
@ -37,12 +37,13 @@ func exportAllRun(cmd *cobra.Command, args []string) {
} }
for _, sys := range c.Systems { for _, sys := range c.Systems {
for _, job := range sys.Jobs { for _, job := range sys.Jobs {
fmt.Printf("[%s]执行【%s】【%s】导出\n", time.Now().Format("2006-01-02 15:04:05"), sys.Name, job.Name) log.Printf("执行【%s】【%s】导出\n", sys.Name, job.Name)
b := time.Now() b := time.Now()
ee := NewCsv(config.DefaultConfig) ee := NewCsv(config.DefaultConfig)
ee.Export(sys.Name, job.Name, begin, end, batch) if err := ee.Export(sys.Name, job.Name, begin, end, batch); err != nil {
e := time.Now() CmdError(cmd, "【%s】【%s】导出错误：%s", sys.Name, job.Name, err.Error())
fmt.Println("导出耗时：" + e.Sub(b).String()) }
log.Println("导出耗时：" + time.Now().Sub(b).String())
} }
} }

11
cmd/cmd/export.go
View File

@ -2,8 +2,8 @@ package cmd
import ( import (
"excel_export/biz/config" "excel_export/biz/config"
"fmt"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"log"
"strconv" "strconv"
"time" "time"
) )
@ -43,7 +43,7 @@ func exportRun(cmd *cobra.Command, args []string) {
CmdError(cmd, "%s", err.Error()) CmdError(cmd, "%s", err.Error())
} }
fmt.Printf("[%s]执行【%s】【%s】导出\n", time.Now().Format("2006-01-02 15:04:05"), sName, jName) log.Printf("执行【%s】【%s】导出\n", sName, jName)
begin := MustFlagsDateTime(cmd, "begin") begin := MustFlagsDateTime(cmd, "begin")
end := MustFlagsDateTime(cmd, "end") end := MustFlagsDateTime(cmd, "end")
@ -55,7 +55,8 @@ func exportRun(cmd *cobra.Command, args []string) {
} }
b := time.Now() b := time.Now()
ee := NewCsv(config.DefaultConfig) ee := NewCsv(config.DefaultConfig)
ee.Export(sName, jName, begin, end, batch) if err := ee.Export(sName, jName, begin, end, batch); err != nil {
e := time.Now() CmdError(cmd, "【%s】【%s】导出错误：%s", sName, jName, err.Error())
fmt.Println("耗时：" + e.Sub(b).String()) }
log.Println("耗时：" + time.Now().Sub(b).String())
} }