From f676d63f067e0752dcae6eec7aea2e9cb3d3c06a Mon Sep 17 00:00:00 2001 From: "Mr.Li" Date: Sun, 23 Apr 2023 19:01:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BE=93=E5=87=BA=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/cmd/csv.go | 1 + cmd/cmd/export-all-job.go | 12 ++++++------ cmd/cmd/export-all.go | 11 ++++++----- cmd/cmd/export.go | 11 ++++++----- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/cmd/cmd/csv.go b/cmd/cmd/csv.go index e9faa6e..07affe6 100644 --- a/cmd/cmd/csv.go +++ b/cmd/cmd/csv.go @@ -89,6 +89,7 @@ func (e *Csv) TaskExport(d export.DataFetcher, t config.Task, params map[string] //todo 合并csv文件，并删除 临时目录 if err := e.mergeCsvToExcel(e.dirTemp, i, fileName); err != nil { log.Printf("合并csv文件异常：%s", err.Error()) + return err } //重置临时路径 diff --git a/cmd/cmd/export-all-job.go b/cmd/cmd/export-all-job.go index 81cdddc..fd4598a 100644 --- a/cmd/cmd/export-all-job.go +++ b/cmd/cmd/export-all-job.go @@ -2,8 +2,8 @@ package cmd import ( "excel_export/biz/config" - "fmt" "github.com/spf13/cobra" + "log" "strconv" "time" ) @@ -45,12 +45,12 @@ func exportAllJobRun(cmd *cobra.Command, args []string) { } 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() ee := NewCsv(config.DefaultConfig) - ee.Export(sName, job.Name, begin, end, batch) - e := time.Now() - fmt.Println("导出耗时：" + e.Sub(b).String()) + if err := ee.Export(sName, job.Name, begin, end, batch); err != nil { + CmdError(cmd, "【%s】【%s】导出错误：%s", sName, job.Name, err.Error()) + } + log.Println("导出耗时：" + time.Now().Sub(b).String()) } - } diff --git a/cmd/cmd/export-all.go b/cmd/cmd/export-all.go index 54fdf94..2dcf317 100644 --- a/cmd/cmd/export-all.go +++ b/cmd/cmd/export-all.go @@ -2,8 +2,8 @@ package cmd import ( "excel_export/biz/config" - "fmt" "github.com/spf13/cobra" + "log" "strconv" "time" ) @@ -37,12 +37,13 @@ func exportAllRun(cmd *cobra.Command, args []string) { } for _, sys := range c.Systems { 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() ee := NewCsv(config.DefaultConfig) - ee.Export(sys.Name, job.Name, begin, end, batch) - e := time.Now() - fmt.Println("导出耗时：" + e.Sub(b).String()) + if err := ee.Export(sys.Name, job.Name, begin, end, batch); err != nil { + CmdError(cmd, "【%s】【%s】导出错误：%s", sys.Name, job.Name, err.Error()) + } + log.Println("导出耗时：" + time.Now().Sub(b).String()) } } diff --git a/cmd/cmd/export.go b/cmd/cmd/export.go index 7ac6e90..3afaf9d 100644 --- a/cmd/cmd/export.go +++ b/cmd/cmd/export.go @@ -2,8 +2,8 @@ package cmd import ( "excel_export/biz/config" - "fmt" "github.com/spf13/cobra" + "log" "strconv" "time" ) @@ -43,7 +43,7 @@ func exportRun(cmd *cobra.Command, args []string) { 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") end := MustFlagsDateTime(cmd, "end") @@ -55,7 +55,8 @@ func exportRun(cmd *cobra.Command, args []string) { } b := time.Now() ee := NewCsv(config.DefaultConfig) - ee.Export(sName, jName, begin, end, batch) - e := time.Now() - fmt.Println("耗时：" + e.Sub(b).String()) + if err := ee.Export(sName, jName, begin, end, batch); err != nil { + CmdError(cmd, "【%s】【%s】导出错误：%s", sName, jName, err.Error()) + } + log.Println("耗时：" + time.Now().Sub(b).String()) }