From 1ab8d21d1cbd047426deb4acf9bb8e30199d9887 Mon Sep 17 00:00:00 2001 From: renzhiyuan <465386466@qq.com> Date: Sat, 27 Dec 2025 11:43:51 +0800 Subject: [PATCH 01/18] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=E4=B8=BA?= =?UTF-8?q?interface?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/tools/zltx/excute_test.go | 19 +++++++++++++++++++ internal/tools/zltx/zltx_order_detail.go | 12 +++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 internal/tools/zltx/excute_test.go diff --git a/internal/tools/zltx/excute_test.go b/internal/tools/zltx/excute_test.go new file mode 100644 index 0000000..3f8460d --- /dev/null +++ b/internal/tools/zltx/excute_test.go @@ -0,0 +1,19 @@ +package zltx + +import ( + config2 "ai_scheduler/internal/config" + "ai_scheduler/internal/entitys" + "context" + "testing" +) + +func Test_task(t *testing.T) { + c := NewZltxOrderDetailTool(config2.ToolConfig{}, nil) + err := + c.Execute(context.Background(), &entitys.Recognize{ + Match: &entitys.Match{ + Parameters: `{"order_number": 859393216068067329}`, + }, + }) + t.Log(err) +} diff --git a/internal/tools/zltx/zltx_order_detail.go b/internal/tools/zltx/zltx_order_detail.go index 235d40c..47574a3 100644 --- a/internal/tools/zltx/zltx_order_detail.go +++ b/internal/tools/zltx/zltx_order_detail.go @@ -98,11 +98,17 @@ func (w *ZltxOrderDetailTool) Execute(ctx context.Context, rec *entitys.Recogniz // getMockZltxOrderDetail 获取模拟直连天下订单详情数据 func (w *ZltxOrderDetailTool) getZltxOrderDetail(rec *entitys.Recognize, number interface{}) (err error) { - log.Infof("订单编号：%v", number) + log.Infof("订单编号：%v,类型：%v") + var orderNum string switch number.(type) { case int, int32, int64: - number = fmt.Sprintf("%d", number) + orderNum = fmt.Sprintf("%d", number) + case float64: + orderNum = fmt.Sprintf("%d", int(number.(float64))) + case string: + orderNum = number.(string) default: + orderNum = fmt.Sprintf("%v", number) } ext, err := rec_extra.GetTaskRecExt(rec) @@ -111,7 +117,7 @@ func (w *ZltxOrderDetailTool) getZltxOrderDetail(rec *entitys.Recognize, number } //查询订单详情 req := l_request.Request{ - Url: fmt.Sprintf(w.config.BaseURL, number), + Url: fmt.Sprintf(w.config.BaseURL, orderNum), Headers: map[string]string{ "Authorization": fmt.Sprintf("Bearer %s", ext.Auth), }, From 41e128683d10fc755df34497809bbb3733f4fc27 Mon Sep 17 00:00:00 2001 From: renzhiyuan <465386466@qq.com> Date: Sat, 27 Dec 2025 15:27:49 +0800 Subject: [PATCH 02/18] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=E4=B8=BA?= =?UTF-8?q?interface?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/biz/do/prompt.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/biz/do/prompt.go b/internal/biz/do/prompt.go index cada763..cfd5ef1 100644 --- a/internal/biz/do/prompt.go +++ b/internal/biz/do/prompt.go @@ -84,6 +84,7 @@ func (f *WithSys) getUserContent(ctx context.Context, rec *entitys.Recognize) (c // 解析结果回写到file file.FileRec = imageContent + content.WriteString(file.FileRec) default: content.WriteString(file.FileRec) } From b02b988c5de2d6b2874bae81cd083b2cf485e61e Mon Sep 17 00:00:00 2001 From: renzhiyuan <465386466@qq.com> Date: Sat, 27 Dec 2025 15:33:11 +0800 Subject: [PATCH 03/18] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=E4=B8=BA?= =?UTF-8?q?interface?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/biz/do/prompt.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/biz/do/prompt.go b/internal/biz/do/prompt.go index cfd5ef1..91722ae 100644 --- a/internal/biz/do/prompt.go +++ b/internal/biz/do/prompt.go @@ -10,6 +10,7 @@ import ( "context" "strings" + "github.com/gofiber/fiber/v2/log" "github.com/ollama/ollama/api" ) @@ -27,6 +28,7 @@ func (f *WithSys) CreatePrompt(ctx context.Context, rec *entitys.Recognize) (mes ) // 获取用户内容，如果出错则直接返回错误 content, err := f.getUserContent(ctx, rec) + log.Infof("生成prompt:%s", content) if err != nil { return nil, err } From d52fd23eccd80b4c7224e754d161e9e8085afa8b Mon Sep 17 00:00:00 2001 From: renzhiyuan <465386466@qq.com> Date: Sat, 27 Dec 2025 15:33:34 +0800 Subject: [PATCH 04/18] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=E4=B8=BA?= =?UTF-8?q?interface?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/biz/do/prompt.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/biz/do/prompt.go b/internal/biz/do/prompt.go index 91722ae..1e69e33 100644 --- a/internal/biz/do/prompt.go +++ b/internal/biz/do/prompt.go @@ -28,10 +28,10 @@ func (f *WithSys) CreatePrompt(ctx context.Context, rec *entitys.Recognize) (mes ) // 获取用户内容，如果出错则直接返回错误 content, err := f.getUserContent(ctx, rec) - log.Infof("生成prompt:%s", content) if err != nil { return nil, err } + log.Infof("生成prompt:%s", content) // 构建提示消息列表，包含系统提示、助手回复和用户内容 mes = append(prompt, api.Message{ Role: "system", // 系统角色 From 965719774a09e80fa93791ec9f1443b6634c2c64 Mon Sep 17 00:00:00 2001 From: renzhiyuan <465386466@qq.com> Date: Sat, 27 Dec 2025 15:35:06 +0800 Subject: [PATCH 05/18] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=E4=B8=BA?= =?UTF-8?q?interface?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/biz/do/prompt.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/biz/do/prompt.go b/internal/biz/do/prompt.go index 1e69e33..b216db5 100644 --- a/internal/biz/do/prompt.go +++ b/internal/biz/do/prompt.go @@ -31,7 +31,7 @@ func (f *WithSys) CreatePrompt(ctx context.Context, rec *entitys.Recognize) (mes if err != nil { return nil, err } - log.Infof("生成prompt:%s", content) + log.Infof("生成prompt:%s", content.String()) // 构建提示消息列表，包含系统提示、助手回复和用户内容 mes = append(prompt, api.Message{ Role: "system", // 系统角色 From a9a05c19e95fc2cc4fd0bc95f875573a56194213 Mon Sep 17 00:00:00 2001 From: renzhiyuan <465386466@qq.com> Date: Sat, 27 Dec 2025 15:41:57 +0800 Subject: [PATCH 06/18] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=E4=B8=BA?= =?UTF-8?q?interface?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/biz/do/prompt.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/biz/do/prompt.go b/internal/biz/do/prompt.go index b216db5..a27d698 100644 --- a/internal/biz/do/prompt.go +++ b/internal/biz/do/prompt.go @@ -8,9 +8,9 @@ import ( "ai_scheduler/internal/pkg" "ai_scheduler/internal/pkg/utils_vllm" "context" + "fmt" "strings" - "github.com/gofiber/fiber/v2/log" "github.com/ollama/ollama/api" ) @@ -31,7 +31,7 @@ func (f *WithSys) CreatePrompt(ctx context.Context, rec *entitys.Recognize) (mes if err != nil { return nil, err } - log.Infof("生成prompt:%s", content.String()) + // 构建提示消息列表，包含系统提示、助手回复和用户内容 mes = append(prompt, api.Message{ Role: "system", // 系统角色 @@ -43,7 +43,7 @@ func (f *WithSys) CreatePrompt(ctx context.Context, rec *entitys.Recognize) (mes Role: "user", // 用户角色 Content: content.String(), // 用户输入内容 }) - + fmt.Printf("[意图识别]最终prompt:%v", mes) return } From 0d8ef7056ca6342abc9ffbe3a41a4dfadfb9a87c Mon Sep 17 00:00:00 2001 From: renzhiyuan <465386466@qq.com> Date: Mon, 29 Dec 2025 17:11:42 +0800 Subject: [PATCH 07/18] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0bbxt=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E5=8C=85=E5=92=8C=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 19 +-- go.sum | 39 ++++-- internal/pkg/func.go | 193 ++++++++++++++++++++++++++++ internal/tools/bbxt/api.go | 210 +++++++++++++++++++++++++++++++ internal/tools/bbxt/bbxt.go | 133 ++++++++++++++++++++ internal/tools/bbxt/bbxt_test.go | 14 +++ tmpl/excel_temp/kshj_total.xlsx | Bin 0 -> 10313 bytes 7 files changed, 589 insertions(+), 19 deletions(-) create mode 100644 internal/tools/bbxt/api.go create mode 100644 internal/tools/bbxt/bbxt.go create mode 100644 internal/tools/bbxt/bbxt_test.go create mode 100644 tmpl/excel_temp/kshj_total.xlsx diff --git a/go.mod b/go.mod index 76bed20..694ee17 100644 --- a/go.mod +++ b/go.mod @@ -25,11 +25,13 @@ require ( github.com/gofiber/websocket/v2 v2.2.1 github.com/google/uuid v1.6.0 github.com/google/wire v0.7.0 + github.com/json-iterator/go v1.1.12 github.com/ollama/ollama v0.12.7 github.com/redis/go-redis/v9 v9.16.0 github.com/spf13/viper v1.17.0 github.com/tmc/langchaingo v0.1.13 - golang.org/x/sync v0.15.0 + github.com/xuri/excelize/v2 v2.10.0 + golang.org/x/sync v0.17.0 google.golang.org/grpc v1.64.0 gorm.io/driver/mysql v1.6.0 gorm.io/gorm v1.31.0 @@ -69,7 +71,6 @@ require ( github.com/hashicorp/hcl v1.0.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.9 // indirect github.com/leodido/go-urn v1.4.0 // indirect @@ -86,6 +87,8 @@ require ( github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pkoukk/tiktoken-go v0.1.6 // indirect + github.com/richardlehane/mscfb v1.0.4 // indirect + github.com/richardlehane/msoleps v1.0.4 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/sagikazarmark/locafero v0.3.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect @@ -96,23 +99,25 @@ require ( github.com/spf13/afero v1.10.0 // indirect github.com/spf13/cast v1.5.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/testify v1.11.1 // indirect github.com/subosito/gotenv v1.6.0 // indirect + github.com/tiendc/go-deepcopy v1.7.1 // indirect github.com/tjfoc/gmsm v1.4.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.51.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect + github.com/xuri/efp v0.0.1 // indirect + github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 // indirect github.com/yargevad/filepathx v1.0.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect golang.org/x/arch v0.11.0 // indirect - golang.org/x/crypto v0.39.0 // indirect + golang.org/x/crypto v0.43.0 // indirect golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect - golang.org/x/net v0.38.0 // indirect - golang.org/x/sys v0.33.0 // indirect - golang.org/x/text v0.26.0 // indirect + golang.org/x/net v0.46.0 // indirect + golang.org/x/sys v0.37.0 // indirect + golang.org/x/text v0.30.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect google.golang.org/protobuf v1.34.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index a6e9a9c..b753e6a 100644 --- a/go.sum +++ b/go.sum @@ -368,6 +368,11 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/redis/go-redis/v9 v9.16.0 h1:OotgqgLSRCmzfqChbQyG1PHC3tLNR89DG4jdOERSEP4= github.com/redis/go-redis/v9 v9.16.0/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370= +github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM= +github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk= +github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg= +github.com/richardlehane/msoleps v1.0.4 h1:WuESlvhX3gH2IHcd8UqyCuFY5yiq/GR/yqaSM/9/g00= +github.com/richardlehane/msoleps v1.0.4/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -423,6 +428,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +github.com/tiendc/go-deepcopy v1.7.1 h1:LnubftI6nYaaMOcaz0LphzwraqN8jiWTwm416sitff4= +github.com/tiendc/go-deepcopy v1.7.1/go.mod h1:4bKjNC2r7boYOkD2IOuZpYjmlDdzjbpTRyCx+goBCJQ= github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w= github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho= github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= @@ -440,6 +447,12 @@ github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/ github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw= github.com/x-cray/logrus-prefixed-formatter v0.5.2 h1:00txxvfBM9muc0jiLIEAkAcIMJzfthRT6usrui8uGmg= github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE= +github.com/xuri/efp v0.0.1 h1:fws5Rv3myXyYni8uwj2qKjVaRP30PdjeYe2Y6FDsCL8= +github.com/xuri/efp v0.0.1/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI= +github.com/xuri/excelize/v2 v2.10.0 h1:8aKsP7JD39iKLc6dH5Tw3dgV3sPRh8uRVXu/fMstfW4= +github.com/xuri/excelize/v2 v2.10.0/go.mod h1:SC5TzhQkaOsTWpANfm+7bJCldzcnU/jrhqkTi/iBHBU= +github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 h1:+C0TIdyyYmzadGaL/HBLbf3WdLgC29pgyhTjAT/0nuE= +github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ= github.com/yargevad/filepathx v1.0.0 h1:SYcT+N3tYGi+NvazubCNlvgIPbzAk7i7y2dwg3I5FYc= github.com/yargevad/filepathx v1.0.0/go.mod h1:BprfX/gpYNJHJfc35GjRRpVcwWXS89gGulUIU5tK3tA= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -479,8 +492,8 @@ golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM= -golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= +golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04= +golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -495,6 +508,8 @@ golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa h1:t2QcU6V556bFjYgu4L6C+6VrC golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa/go.mod h1:BHOTPb3L19zxehTsLoJXVaTktb06DFgmdW6Wb9s8jqk= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ= +golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -561,8 +576,8 @@ golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= -golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4= +golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -584,8 +599,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8= -golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -640,8 +655,8 @@ golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= -golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= +golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -650,8 +665,8 @@ golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= -golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= -golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= +golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q= +golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -664,8 +679,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= -golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= +golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= +golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/internal/pkg/func.go b/internal/pkg/func.go index 32c404b..d07b202 100644 --- a/internal/pkg/func.go +++ b/internal/pkg/func.go @@ -6,8 +6,14 @@ import ( "errors" "fmt" "net/url" + "os" + "path/filepath" + "reflect" "strconv" "strings" + "time" + + jsoniter "github.com/json-iterator/go" ) func JsonStringIgonErr(data interface{}) string { @@ -165,3 +171,190 @@ func SafeReplace(template string, replaceTag string, replacements ...string) (st return template, nil } + +func StructToMapUsingJsoniter(obj interface{}) (map[string]string, error) { + var json = jsoniter.ConfigCompatibleWithStandardLibrary + + // 转换为JSON + jsonBytes, err := json.Marshal(obj) + if err != nil { + return nil, err + } + + // 解析为map[string]interface{} + var tempMap map[string]interface{} + err = json.Unmarshal(jsonBytes, &tempMap) + if err != nil { + return nil, err + } + + // 转换为map[string]string + result := make(map[string]string) + for k, v := range tempMap { + result[k] = fmt.Sprintf("%v", v) + } + + return result, nil +} + +func GetModuleDir() (string, error) { + dir, err := os.Getwd() + if err != nil { + return "", err + } + + for { + modPath := filepath.Join(dir, "go.mod") + if _, err := os.Stat(modPath); err == nil { + return dir, nil // 找到 go.mod + } + + // 向上查找父目录 + parent := filepath.Dir(dir) + if parent == dir { + break // 到达根目录，未找到 + } + dir = parent + } + + return "", fmt.Errorf("go.mod not found in current directory or parents") +} + +// GetCacheDir 用于获取缓存目录路径 +// 如果缓存目录不存在，则会自动创建 +// 返回值: +// - string: 缓存目录的路径 +// - error: 如果获取模块目录失败或创建缓存目录失败，则返回错误信息 +func GetCacheDir() (string, error) { + // 获取模块目录 + modDir, err := GetModuleDir() + if err != nil { + return "", err + } + // 拼接缓存目录路径 + path := fmt.Sprintf("%s/cache", modDir) + // 创建目录（包括所有必要的父目录），权限设置为0755 + err = os.MkdirAll(path, 0755) + if err != nil { + return "", fmt.Errorf("创建目录失败: %w", err) + } + // 返回成功创建的缓存目录路径 + return path, nil +} + +func GetTmplDir() (string, error) { + modDir, err := GetModuleDir() + if err != nil { + return "", err + } + path := fmt.Sprintf("%s/tmpl", modDir) + err = os.MkdirAll(path, 0755) + if err != nil { + return "", fmt.Errorf("创建目录失败: %w", err) + } + return path, nil +} + +// 通用结构体转 Query 参数 +func StructToQuery(obj interface{}) (url.Values, error) { + values := url.Values{} + v := reflect.ValueOf(obj) + t := reflect.TypeOf(obj) + + // 如果是指针，获取指向的值 + if v.Kind() == reflect.Ptr { + v = v.Elem() + t = t.Elem() + } + + // 确保是结构体 + if v.Kind() != reflect.Struct { + return values, fmt.Errorf("expected struct, got %v", v.Kind()) + } + + for i := 0; i < v.NumField(); i++ { + field := v.Field(i) + fieldType := t.Field(i) + + // 跳过零值字段（omitempty） + tag := fieldType.Tag.Get("json") + if strings.Contains(tag, "omitempty") && field.IsZero() { + continue + } + + // 获取字段名 + fieldName := getFieldName(fieldType) + if fieldName == "" { + continue + } + + // 处理不同类型的字段 + addFieldToValues(values, fieldName, field) + } + + return values, nil +} + +func getFieldName(field reflect.StructField) string { + tag := field.Tag.Get("json") + if tag != "" { + parts := strings.Split(tag, ",") + if parts[0] != "-" && parts[0] != "" { + return parts[0] + } + if parts[0] == "-" { + return "" // 跳过该字段 + } + } + return field.Name +} + +func addFieldToValues(values url.Values, name string, field reflect.Value) { + if !field.IsValid() || field.IsZero() { + return + } + + switch field.Kind() { + case reflect.String: + values.Add(name, field.String()) + + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + values.Add(name, strconv.FormatInt(field.Int(), 10)) + + case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64: + values.Add(name, strconv.FormatUint(field.Uint(), 10)) + + case reflect.Float32, reflect.Float64: + values.Add(name, strconv.FormatFloat(field.Float(), 'f', -1, 64)) + + case reflect.Bool: + values.Add(name, strconv.FormatBool(field.Bool())) + + case reflect.Slice: + // 处理切片，特别是 []string + if field.Type().Elem().Kind() == reflect.String { + for i := 0; i < field.Len(); i++ { + item := field.Index(i).String() + // 特殊处理 ct 字段 + if name == "ct" { + formatted := strings.Replace(item, " ", "+", 1) + if i == 1 && field.Len() >= 2 { + formatted = formatted + ".999" + } + values.Add("ct[]", formatted) + } else { + values.Add(fmt.Sprintf("%s[]", name), item) + } + } + } + + case reflect.Struct: + // 处理 time.Time + if t, ok := field.Interface().(time.Time); ok { + values.Add(name, t.Format("2006-01-02+15:04:05")) + } + + default: + values.Add(name, fmt.Sprintf("%v", field.Interface())) + } +} diff --git a/internal/tools/bbxt/api.go b/internal/tools/bbxt/api.go new file mode 100644 index 0000000..2f62a56 --- /dev/null +++ b/internal/tools/bbxt/api.go @@ -0,0 +1,210 @@ +package bbxt + +import ( + "ai_scheduler/internal/pkg" + "ai_scheduler/internal/pkg/l_request" + "encoding/json" + "fmt" + "net/http" + "net/url" + "strings" + "time" +) + +type StatisOursProductLossSumReq struct { + ResellerId int `json:"reseller_id,omitempty"` + Ct []string `json:"ct,omitempty"` +} + +type StatisOursProductLossSumRes struct { + List []*StatisOursProductLossSumResponse `protobuf:"bytes,1,rep,name=list,proto3" json:"list,omitempty"` +} + +type StatisOursProductLossSumResponse struct { + OursProductId int32 `json:"oursProductId,omitempty"` + OursProductName string `json:"oursProductName,omitempty"` + ResellerName string `json:"resellerName,omitempty"` + ResellerId int32 `json:"resellerId,omitempty"` + Loss float64 `json:"loss,omitempty"` +} + +const Base = "https://reportapi.1688sup.com/api" + +// StatisOursProductLossSumApi 负利润分析 +func StatisOursProductLossSumApi(param *StatisOursProductLossSumReq) (*StatisOursProductLossSumRes, error) { + url := "/dataanalytics/statisOursProductLossSum" + var res StatisOursProductLossSumRes + if err := request(url, param, &res); err != nil { + return nil, err + } + return &res, nil +} + +type GetProfitRankingSumRequest struct { + Ct []string `protobuf:"bytes,1,rep,name=ct,proto3" json:"ct,omitempty"` + Page int32 `protobuf:"varint,3,opt,name=page,proto3" json:"page,omitempty"` + Limit int32 `protobuf:"varint,4,opt,name=limit,proto3" json:"limit,omitempty"` + ResellerIds []int32 `protobuf:"varint,5,rep,packed,name=reseller_ids,json=resellerIds,proto3" json:"reseller_ids,omitempty"` +} + +type GetProfitRankingSumResponse struct { + List []*ProfitRankingSumResponse `protobuf:"bytes,1,rep,name=list,proto3" json:"list,omitempty"` + DataCount int32 `protobuf:"varint,2,opt,name=data_count,json=dataCount,proto3" json:"data_count,omitempty"` +} + +type ProfitRankingSumResponse struct { + // 分销商ID + ResellerId string `protobuf:"bytes,1,opt,name=reseller_id,json=resellerId,proto3" json:"reseller_id,omitempty"` + // 分销商名称 + ResellerName string `protobuf:"bytes,2,opt,name=reseller_name,json=resellerName,proto3" json:"reseller_name,omitempty"` + // 当前利润 + CurrentProfit float64 `protobuf:"fixed64,3,opt,name=current_profit,json=currentProfit,proto3" json:"current_profit,omitempty"` + // 昨日同比利润 + HistoryOneProfit float64 `protobuf:"fixed64,4,opt,name=history_one_profit,json=historyOneProfit,proto3" json:"history_one_profit,omitempty"` + // 上周同比利润 + HistoryTwoProfit float64 `protobuf:"fixed64,5,opt,name=history_two_profit,json=historyTwoProfit,proto3" json:"history_two_profit,omitempty"` + // 昨日同比利润差值 + HistoryOneDiff float64 `protobuf:"fixed64,6,opt,name=history_one_diff,json=historyOneDiff,proto3" json:"history_one_diff,omitempty"` + // 上周同比利润差值 + HistoryTwoDiff float64 `protobuf:"fixed64,7,opt,name=history_two_diff,json=historyTwoDiff,proto3" json:"history_two_diff,omitempty"` +} + +// GetProfitRankingSumApi 利润同比分销商排行榜 +func GetProfitRankingSumApi(param *GetProfitRankingSumRequest) (*GetProfitRankingSumResponse, error) { + url := "/dataanalytics/profitRankingSum" + var res GetProfitRankingSumResponse + if err := request(url, param, &res); err != nil { + return nil, err + } + return &res, nil +} + +type GetStatisOfficialProductSumRequest struct { + Ct []string `protobuf:"bytes,1,rep,name=ct,proto3" json:"ct,omitempty"` + DownwardValue int32 `protobuf:"varint,4,opt,name=downward_value,json=downwardValue,proto3" json:"downward_value,omitempty"` + Page int32 `protobuf:"varint,5,opt,name=page,proto3" json:"page,omitempty"` + Limit int32 `protobuf:"varint,6,opt,name=limit,proto3" json:"limit,omitempty"` + OfficialProductId []int32 `protobuf:"varint,7,rep,packed,name=official_product_id,json=officialProductId,proto3" json:"official_product_id,omitempty"` +} + +type GetStatisOfficialProductSumResponse struct { + OfficialProductSum []*GetStatisOfficialProductSum `protobuf:"bytes,1,rep,name=official_product_sum,json=officialProductSum,proto3" json:"official_product_sum,omitempty"` + DataCount int32 `protobuf:"varint,2,opt,name=data_count,json=dataCount,proto3" json:"data_count,omitempty"` +} + +type GetStatisOfficialProductSum struct { + OfficialProductId int32 `protobuf:"varint,1,opt,name=official_product_id,json=officialProductId,proto3" json:"official_product_id,omitempty"` + OfficialProductName string `protobuf:"bytes,2,opt,name=official_product_name,json=officialProductName,proto3" json:"official_product_name,omitempty"` + CurrentNum int32 `protobuf:"varint,3,opt,name=current_num,json=currentNum,proto3" json:"current_num,omitempty"` + HistoryOneNum int32 `protobuf:"varint,4,opt,name=history_one_num,json=historyOneNum,proto3" json:"history_one_num,omitempty"` + HistoryTwoNum int32 `protobuf:"varint,5,opt,name=history_two_num,json=historyTwoNum,proto3" json:"history_two_num,omitempty"` + HistoryOneDiff int32 `protobuf:"varint,6,opt,name=history_one_diff,json=historyOneDiff,proto3" json:"history_one_diff,omitempty"` + HistoryTwoDiff int32 `protobuf:"varint,7,opt,name=history_two_diff,json=historyTwoDiff,proto3" json:"history_two_diff,omitempty"` +} + +// GetStatisOfficialProductSumApi 销量同比分析 +func GetStatisOfficialProductSumApi(param *GetStatisOfficialProductSumRequest) (*GetStatisOfficialProductSumResponse, error) { + url := "/dataanalytics/statisOfficialProduct" + var res GetStatisOfficialProductSumResponse + if err := request(url, param, &res); err != nil { + return nil, err + } + return &res, nil +} + +type GetStatisOfficialProductSumDeclineResponse struct { + OfficialProductSumDecline []*GetStatisOfficialProductSumDecline `protobuf:"bytes,1,rep,name=official_product_sum_decline,json=officialProductSumDecline,proto3" json:"official_product_sum_decline,omitempty"` + DataCount int32 `protobuf:"varint,2,opt,name=data_count,json=dataCount,proto3" json:"data_count,omitempty"` +} + +type GetStatisOfficialProductSumDecline struct { + ResellerId int32 `protobuf:"varint,1,opt,name=reseller_id,json=resellerId,proto3" json:"reseller_id,omitempty"` + OfficialProductId int32 `protobuf:"varint,2,opt,name=official_product_id,json=officialProductId,proto3" json:"official_product_id,omitempty"` + OfficialProductName string `protobuf:"bytes,3,opt,name=official_product_name,json=officialProductName,proto3" json:"official_product_name,omitempty"` + ResellerName string `protobuf:"bytes,4,opt,name=reseller_name,json=resellerName,proto3" json:"reseller_name,omitempty"` + CurrentNum int32 `protobuf:"varint,5,opt,name=current_num,json=currentNum,proto3" json:"current_num,omitempty"` + HistoryOneNum int32 `protobuf:"varint,6,opt,name=history_one_num,json=historyOneNum,proto3" json:"history_one_num,omitempty"` + HistoryTwoNum int32 `protobuf:"varint,7,opt,name=history_two_num,json=historyTwoNum,proto3" json:"history_two_num,omitempty"` + HistoryOneDiff int32 `protobuf:"varint,8,opt,name=history_one_diff,json=historyOneDiff,proto3" json:"history_one_diff,omitempty"` + HistoryTwoDiff int32 `protobuf:"varint,9,opt,name=history_two_diff,json=historyTwoDiff,proto3" json:"history_two_diff,omitempty"` +} + +// GetStatisOfficialProductSumDeclineApi 销量同比分析 +func GetStatisOfficialProductSumDeclineApi(param *GetStatisOfficialProductSumRequest) (*GetStatisOfficialProductSumDeclineResponse, error) { + url := "/dataanalytics/statisOfficialProductDecline" + var res GetStatisOfficialProductSumDeclineResponse + if err := request(url, param, &res); err != nil { + return nil, err + } + return &res, nil +} + +type resCode struct { + Code int `json:"code"` + Data json.RawMessage `json:"data"` + Error string `json:"error"` +} + +func request(url string, reqData interface{}, resData interface{}) error { + + reqParam, err := pkg.StructToQuery(reqData) + if err != nil { + return err + } + + req := &l_request.Request{ + Url: Base + url + "?" + customEncode(reqParam), + Method: http.MethodGet, + } + res, err := req.Send() + if res.StatusCode != http.StatusOK { + return fmt.Errorf("request failed, status code: %d,resion: %s", res.StatusCode, res.Reason) + } + var code resCode + if err = json.Unmarshal(res.Content, &code); err != nil { + return fmt.Errorf("返回结构异常：%s", string(res.Content)) + } + if code.Code != 200 { + return fmt.Errorf("返回状态异常：%s", string(code.Error)) + } + if err = json.Unmarshal(code.Data, resData); err != nil { + return fmt.Errorf("返回数据异常：%s", string(res.Content)) + } + return nil +} + +func formatCtToQueryString(ct []string) string { + if len(ct) != 2 { + return "" + } + + values := url.Values{} + + // 第一个时间（开始时间） + startTime, err := time.Parse("2006-01-02 15:04:05", ct[0]) + if err == nil { + // 保持原样 + values.Add("ct[]", startTime.Format("2006-01-02+15:04:05")) + } + + // 第二个时间（结束时间） + endTime, err := time.Parse("2006-01-02 15:04:05", ct[1]) + if err == nil { + // 添加毫秒 + endTimeWithMs := endTime.Add(999 * time.Millisecond) + values.Add("ct[]", endTimeWithMs.Format("2006-01-02+15:04:05.000")) + } + + return values.Encode() +} + +func customEncode(params url.Values) string { + encoded := params.Encode() + + // 解码我们想要保留的字符 + encoded = strings.ReplaceAll(encoded, "%5B", "[") // 恢复 [ + encoded = strings.ReplaceAll(encoded, "%5D", "]") // 恢复 ] + encoded = strings.ReplaceAll(encoded, "%2B", "+") // 恢复 + + + return encoded +} diff --git a/internal/tools/bbxt/bbxt.go b/internal/tools/bbxt/bbxt.go new file mode 100644 index 0000000..1cc5f42 --- /dev/null +++ b/internal/tools/bbxt/bbxt.go @@ -0,0 +1,133 @@ +package bbxt + +import ( + "ai_scheduler/internal/pkg" + "fmt" + "reflect" + "time" + + "github.com/xuri/excelize/v2" +) + +type BbxtTools struct { + cacheDir string + excelTempDir string + ct []string +} + +func NewBbxtTools() (*BbxtTools, error) { + cache, err := pkg.GetCacheDir() + if err != nil { + return nil, err + } + tempDir, err := pkg.GetTmplDir() + if err != nil { + return nil, err + } + now := time.Now() + return &BbxtTools{ + cacheDir: cache, + excelTempDir: fmt.Sprintf("%s/excel_temp", tempDir), + ct: []string{ + time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()).Format("2006-01-02 15:04:05"), + time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 0, now.Location()).Format("2006-01-02 15:04:05"), + }, + }, nil +} + +func (b *BbxtTools) DailyReport() (err error) { + err = b.StatisOursProductLossSumTotal() + if err != nil { + return + } + return +} + +// OursProductLossSum 负利润分析 +func (b *BbxtTools) StatisOursProductLossSumTotal() (err error) { + data, err := StatisOursProductLossSumApi(&StatisOursProductLossSumReq{ + Ct: b.ct, + }) + if err != nil { + return + } + var ( + total [][]string + gt [][]string + ) + + for _, v := range data.List { + if v.Loss <= -100 { + total = append(total, []string{ + v.OursProductName, + fmt.Sprintf("%.2f", v.Loss), + }) + } + if v.Loss <= -500 { + gt = append(gt, []string{ + v.OursProductName, + fmt.Sprintf("%.2f", v.Loss), + }) + } + } + //总量生成excel + if len(total) > 0 { + filePath := b.cacheDir + "/kshj_total" + fmt.Sprintf("%d", time.Now().Unix()) + ".xlsx" + err = b.SimpleFillExcel(b.excelTempDir+"/"+"kshj_total.xlsx", filePath, total) + } + return err +} + +// 最简单的通用函数 +func (b *BbxtTools) SimpleFillExcel(templatePath, outputPath string, dataSlice interface{}) error { + // 1. 打开模板 + f, err := excelize.OpenFile(templatePath) + if err != nil { + return err + } + defer f.Close() + + sheet := f.GetSheetName(0) + + // 2. 反射获取切片数据 + v := reflect.ValueOf(dataSlice) + if v.Kind() != reflect.Slice { + return fmt.Errorf("dataSlice must be a slice") + } + + // 3. 从第2行开始填充 + row := 2 + for i := 0; i < v.Len(); i++ { + item := v.Index(i).Interface() + currentRow := row + i + + // 4. 将item转换为一行数据 + var rowData []interface{} + + // 如果是切片 + if reflect.TypeOf(item).Kind() == reflect.Slice { + itemV := reflect.ValueOf(item) + for j := 0; j < itemV.Len(); j++ { + rowData = append(rowData, itemV.Index(j).Interface()) + } + } else if reflect.TypeOf(item).Kind() == reflect.Struct { + itemV := reflect.ValueOf(item) + for j := 0; j < itemV.NumField(); j++ { + if itemV.Field(j).CanInterface() { + rowData = append(rowData, itemV.Field(j).Interface()) + } + } + } else { + rowData = []interface{}{item} + } + + // 5. 填充到Excel + for col, value := range rowData { + cell := fmt.Sprintf("%c%d", 'A'+col, currentRow) + f.SetCellValue(sheet, cell, value) + } + } + + // 6. 保存 + return f.SaveAs(outputPath) +} diff --git a/internal/tools/bbxt/bbxt_test.go b/internal/tools/bbxt/bbxt_test.go new file mode 100644 index 0000000..80e6b29 --- /dev/null +++ b/internal/tools/bbxt/bbxt_test.go @@ -0,0 +1,14 @@ +package bbxt + +import "testing" + +func Test_StatisOursProductLossSumApiTotal(t *testing.T) { + o, err := NewBbxtTools() + if err != nil { + panic(err) + } + err = o.StatisOursProductLossSumTotal() + + t.Log(err) + +} diff --git a/tmpl/excel_temp/kshj_total.xlsx b/tmpl/excel_temp/kshj_total.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..2035ef939d202a1570c39cb8884ac4a456927e40 GIT binary patch literal 10313 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 M;6ZY96kxso2YYrJCjbBd literal 0 HcmV?d00001 From 1fbfe8eae29d88c39c6fc9abb4c16f36569d8405 Mon Sep 17 00:00:00 2001 From: renzhiyuan <465386466@qq.com> Date: Mon, 29 Dec 2025 17:58:13 +0800 Subject: [PATCH 08/18] =?UTF-8?q?fix:=20=E9=87=8D=E6=9E=84bbxt=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/tools/bbxt/api.go | 26 ------------ internal/tools/bbxt/bbxt.go | 77 ++++++++++++++++++++++++---------- internal/tools/bbxt/entitys.go | 14 +++++++ 3 files changed, 70 insertions(+), 47 deletions(-) create mode 100644 internal/tools/bbxt/entitys.go diff --git a/internal/tools/bbxt/api.go b/internal/tools/bbxt/api.go index 2f62a56..64632cb 100644 --- a/internal/tools/bbxt/api.go +++ b/internal/tools/bbxt/api.go @@ -8,7 +8,6 @@ import ( "net/http" "net/url" "strings" - "time" ) type StatisOursProductLossSumReq struct { @@ -173,31 +172,6 @@ func request(url string, reqData interface{}, resData interface{}) error { return nil } -func formatCtToQueryString(ct []string) string { - if len(ct) != 2 { - return "" - } - - values := url.Values{} - - // 第一个时间（开始时间） - startTime, err := time.Parse("2006-01-02 15:04:05", ct[0]) - if err == nil { - // 保持原样 - values.Add("ct[]", startTime.Format("2006-01-02+15:04:05")) - } - - // 第二个时间（结束时间） - endTime, err := time.Parse("2006-01-02 15:04:05", ct[1]) - if err == nil { - // 添加毫秒 - endTimeWithMs := endTime.Add(999 * time.Millisecond) - values.Add("ct[]", endTimeWithMs.Format("2006-01-02+15:04:05.000")) - } - - return values.Encode() -} - func customEncode(params url.Values) string { encoded := params.Encode() diff --git a/internal/tools/bbxt/bbxt.go b/internal/tools/bbxt/bbxt.go index 1cc5f42..8fe2885 100644 --- a/internal/tools/bbxt/bbxt.go +++ b/internal/tools/bbxt/bbxt.go @@ -12,7 +12,6 @@ import ( type BbxtTools struct { cacheDir string excelTempDir string - ct []string } func NewBbxtTools() (*BbxtTools, error) { @@ -24,19 +23,19 @@ func NewBbxtTools() (*BbxtTools, error) { if err != nil { return nil, err } - now := time.Now() + return &BbxtTools{ cacheDir: cache, excelTempDir: fmt.Sprintf("%s/excel_temp", tempDir), - ct: []string{ - time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()).Format("2006-01-02 15:04:05"), - time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 0, now.Location()).Format("2006-01-02 15:04:05"), - }, }, nil } -func (b *BbxtTools) DailyReport() (err error) { - err = b.StatisOursProductLossSumTotal() +func (b *BbxtTools) DailyReport(today time.Time) (err error) { + + err = b.StatisOursProductLossSumTotal([]string{ + time.Date(today.Year(), today.Month(), today.Day(), 0, 0, 0, 0, today.Location()).Format("2006-01-02 15:04:05"), + time.Date(today.Year(), today.Month(), today.Day(), 23, 59, 59, 0, today.Location()).Format("2006-01-02 15:04:05"), + }) if err != nil { return } @@ -44,30 +43,61 @@ func (b *BbxtTools) DailyReport() (err error) { } // OursProductLossSum 负利润分析 -func (b *BbxtTools) StatisOursProductLossSumTotal() (err error) { +func (b *BbxtTools) StatisOursProductLossSumTotal(ct []string) (err error) { data, err := StatisOursProductLossSumApi(&StatisOursProductLossSumReq{ - Ct: b.ct, + Ct: ct, }) if err != nil { return } var ( - total [][]string - gt [][]string + resellerMap = make(map[int32]*ResellerLoss) + total [][]string + gt []*ResellerLoss ) - for _, v := range data.List { - if v.Loss <= -100 { + for _, info := range data.List { + // 检查经销商是否已存在 + if _, ok := resellerMap[info.ResellerId]; !ok { + // 创建新的经销商记录 + resellerMap[info.ResellerId] = &ResellerLoss{ + ResellerId: info.ResellerId, + ResellerName: info.ResellerName, + Total: 0, // 初始化为0，后续累加 + ProductLoss: make(map[int32]ProductLoss), // 初始化map + } + } + + // 获取当前经销商 + reseller := resellerMap[info.ResellerId] + + // 累加经销商总亏损 + reseller.Total += info.Loss + + // 检查产品是否已存在 + if _, ok := reseller.ProductLoss[info.OursProductId]; !ok { + // 创建新的产品亏损记录 + reseller.ProductLoss[info.OursProductId] = ProductLoss{ + ProductId: info.OursProductId, + ProductName: info.OursProductName, + Loss: info.Loss, // 初始化为当前产品的亏损 + } + } else { + // 已存在产品记录，累加亏损 + productLoss := reseller.ProductLoss[info.OursProductId] + productLoss.Loss += info.Loss + reseller.ProductLoss[info.OursProductId] = productLoss + } + } + for _, v := range resellerMap { + if v.Total <= -100 { total = append(total, []string{ - v.OursProductName, - fmt.Sprintf("%.2f", v.Loss), + fmt.Sprintf("%d", v.ResellerName), + fmt.Sprintf("%.2f", v.Total), }) } - if v.Loss <= -500 { - gt = append(gt, []string{ - v.OursProductName, - fmt.Sprintf("%.2f", v.Loss), - }) + if v.Total <= -500 { + gt = append(gt, v) } } //总量生成excel @@ -75,6 +105,11 @@ func (b *BbxtTools) StatisOursProductLossSumTotal() (err error) { filePath := b.cacheDir + "/kshj_total" + fmt.Sprintf("%d", time.Now().Unix()) + ".xlsx" err = b.SimpleFillExcel(b.excelTempDir+"/"+"kshj_total.xlsx", filePath, total) } + + if len(gt) > 0 { + filePath := b.cacheDir + "/kshj_gt" + fmt.Sprintf("%d", time.Now().Unix()) + ".xlsx" + err = b.SimpleFillExcel(b.excelTempDir+"/"+"kshj_gt.xlsx", filePath, total) + } return err } diff --git a/internal/tools/bbxt/entitys.go b/internal/tools/bbxt/entitys.go new file mode 100644 index 0000000..a3dc743 --- /dev/null +++ b/internal/tools/bbxt/entitys.go @@ -0,0 +1,14 @@ +package bbxt + +type ResellerLoss struct { + ResellerId int32 + ResellerName string + Total float64 + ProductLoss map[int32]ProductLoss +} + +type ProductLoss struct { + ProductId int32 + ProductName string + Loss float64 +} From f6b5d71a05dcbd82872a396478d5f4cee51949ce Mon Sep 17 00:00:00 2001 From: renzhiyuan <465386466@qq.com> Date: Mon, 29 Dec 2025 21:11:34 +0800 Subject: [PATCH 09/18] =?UTF-8?q?fix:=20=E9=87=8D=E6=9E=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84=EF=BC=8C=E4=BC=98=E5=8C=96=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/server/main.go | 7 +- go.mod | 4 +- go.sum | 6 + internal/biz/ding_talk_bot.go | 18 ++ .../biz/handle/dingtalk/send_card.go.bak1 | 280 ------------------ internal/config/config.go | 32 +- internal/pkg/channel_pool.go | 75 ----- internal/pkg/func.go | 60 ---- internal/pkg/provider_set.go | 2 +- internal/server/cron.go | 93 ++++++ internal/server/provider_set.go | 1 + internal/server/server.go | 10 +- internal/services/cron.go | 43 +++ internal/services/dtalk_bot.go | 22 ++ internal/services/dtalk_bot.go.bak | 130 -------- internal/services/dtalk_bot_test.go | 105 +++++++ internal/services/provider_set.go | 1 + internal/tools/bbxt/bbxt.go | 4 +- internal/tools/bbxt/bbxt_test.go | 11 +- pkg/func.go | 65 ++++ 20 files changed, 404 insertions(+), 565 deletions(-) delete mode 100644 internal/biz/handle/dingtalk/send_card.go.bak1 delete mode 100644 internal/pkg/channel_pool.go create mode 100644 internal/server/cron.go create mode 100644 internal/services/cron.go delete mode 100644 internal/services/dtalk_bot.go.bak create mode 100644 internal/services/dtalk_bot_test.go create mode 100644 pkg/func.go diff --git a/cmd/server/main.go b/cmd/server/main.go index d765735..baca30d 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -13,6 +13,7 @@ func main() { configPath := flag.String("config", "./config/config_test.yaml", "Path to configuration file") onBot := flag.String("bot", "", "bot start") flag.Parse() + ctx := context.Background() bc, err := config.LoadConfig(*configPath) if err != nil { log.Fatalf("加载配置失败: %v", err) @@ -25,7 +26,9 @@ func main() { defer func() { cleanup() }() - app.DingBotServer.Run(context.Background(), *onBot) - + //钉钉机器人 + app.DingBotServer.Run(ctx, *onBot) + //定时任务 + app.Cron.Run(ctx) log.Fatal(app.HttpServer.Listen(fmt.Sprintf(":%d", bc.Server.Port))) } diff --git a/go.mod b/go.mod index 694ee17..fa8498d 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/faabiosr/cachego v0.26.0 github.com/fastwego/dingding v1.0.0-beta.4 github.com/gabriel-vasile/mimetype v1.4.11 - github.com/go-kratos/kratos/v2 v2.9.1 + github.com/go-kratos/kratos/v2 v2.9.2 github.com/go-playground/locales v0.14.1 github.com/go-playground/universal-translator v0.18.1 github.com/go-playground/validator/v10 v10.20.0 @@ -39,6 +39,7 @@ require ( ) require ( + dario.cat/mergo v1.0.0 // indirect filippo.io/edwards25519 v1.1.0 // indirect github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5 // indirect github.com/alibabacloud-go/debug v1.0.1 // indirect @@ -90,6 +91,7 @@ require ( github.com/richardlehane/mscfb v1.0.4 // indirect github.com/richardlehane/msoleps v1.0.4 // indirect github.com/rivo/uniseg v0.2.0 // indirect + github.com/robfig/cron/v3 v3.0.1 // indirect github.com/sagikazarmark/locafero v0.3.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect diff --git a/go.sum b/go.sum index b753e6a..b0d2c51 100644 --- a/go.sum +++ b/go.sum @@ -35,6 +35,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= @@ -193,6 +195,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kratos/kratos/v2 v2.9.1 h1:EGif6/S/aK/RCR5clIbyhioTNyoSrii3FC118jG40Z0= github.com/go-kratos/kratos/v2 v2.9.1/go.mod h1:a1MQLjMhIh7R0kcJS9SzJYR43BRI7EPzzN0J1Ksu2bA= +github.com/go-kratos/kratos/v2 v2.9.2 h1:px8GJQBeLpquDKQWQ9zohEWiLA8n4D/pv7aH3asvUvo= +github.com/go-kratos/kratos/v2 v2.9.2/go.mod h1:Jc7jaeYd4RAPjetun2C+oFAOO7HNMHTT/Z4LxpuEDJM= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= @@ -375,6 +379,8 @@ github.com/richardlehane/msoleps v1.0.4 h1:WuESlvhX3gH2IHcd8UqyCuFY5yiq/GR/yqaSM github.com/richardlehane/msoleps v1.0.4/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= +github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= diff --git a/internal/biz/ding_talk_bot.go b/internal/biz/ding_talk_bot.go index b8976df..0cc4090 100644 --- a/internal/biz/ding_talk_bot.go +++ b/internal/biz/ding_talk_bot.go @@ -470,6 +470,24 @@ func (d *DingTalkBotBiz) HandleStreamRes(ctx context.Context, data *chatbot.BotC SenderStaffId: data.SenderStaffId, Title: data.Text.Content, }) + return +} + +func (d *DingTalkBotBiz) GetReportLists(ctx context.Context) (contentChan chan string, err error) { + contentChan = make(chan string, 10) + defer close(contentChan) + contentChan <- "截止今日23点利润亏损合计：127917.0866元，亏损500元以上的分销商和产品金额如下图：" + contentChan <- "![图片](https://lsxdmgoss.oss-cn-chengdu.aliyuncs.com/MarketingSaaS/image/V2/other/shanghu.png)" + + return +} + +func (d *DingTalkBotBiz) GetGroupInfo(ctx context.Context, groupId int) (group model.AiBotGroup, err error) { + + cond := builder.NewCond() + cond = cond.And(builder.Eq{"group_id": groupId}) + cond = cond.And(builder.Eq{"status": constants.Enable}) + err = d.botGroupImpl.GetOneBySearchToStrut(&cond, &group) return } diff --git a/internal/biz/handle/dingtalk/send_card.go.bak1 b/internal/biz/handle/dingtalk/send_card.go.bak1 deleted file mode 100644 index 9fb1e8d..0000000 --- a/internal/biz/handle/dingtalk/send_card.go.bak1 +++ /dev/null @@ -1,280 +0,0 @@ -package dingtalk - -import ( - "ai_scheduler/internal/data/constants" - "context" - "encoding/json" - "errors" - "fmt" - "strings" - "sync" - "time" - - openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" - dingtalkcard_1_0 "github.com/alibabacloud-go/dingtalk/card_1_0" - dingtalkim_1_0 "github.com/alibabacloud-go/dingtalk/im_1_0" - util "github.com/alibabacloud-go/tea-utils/v2/service" - "github.com/alibabacloud-go/tea/tea" - "github.com/gofiber/fiber/v2/log" - "github.com/google/uuid" -) - -const DefaultInterval = 100 * time.Millisecond -const HeardBeatX = 50 - -type SendCardClient struct { - Auth *Auth - CardClient *sync.Map - mu sync.RWMutex // 保护 CardClient 的并发访问 - logger log.AllLogger // 日志记录 - botOption *Bot -} - -func NewSendCardClient(auth *Auth, logger log.AllLogger) *SendCardClient { - return &SendCardClient{ - Auth: auth, - CardClient: &sync.Map{}, - logger: logger, - botOption: &Bot{}, - } -} - -// initClient 初始化或复用 DingTalk 客户端 -func (s *SendCardClient) initClient(robotCode string) (*dingtalkcard_1_0.Client, error) { - if client, ok := s.CardClient.Load(robotCode); ok { - return client.(*dingtalkcard_1_0.Client), nil - } - s.botOption.BotCode = robotCode - config := &openapi.Config{ - Protocol: tea.String("https"), - RegionId: tea.String("central"), - } - client, err := dingtalkcard_1_0.NewClient(config) - if err != nil { - s.logger.Error("failed to init DingTalk client") - return nil, fmt.Errorf("init client failed: %w", err) - } - - s.CardClient.Store(robotCode, client) - return client, nil -} - -func (s *SendCardClient) NewCard(ctx context.Context, cardSend *CardSend) error { - // 参数校验 - if (len(cardSend.ContentSlice) == 0 || cardSend.ContentSlice == nil) && cardSend.ContentChannel == nil { - return errors.New("卡片内容不能为空") - } - if cardSend.UpdateInterval == 0 { - cardSend.UpdateInterval = DefaultInterval // 默认更新间隔 - } - if cardSend.Title == "" { - cardSend.Title = "钉钉卡片" - } - //替换标题 - cardSend.Template = constants.CardTemp(strings.Replace(string(cardSend.Template), "${title}", cardSend.Title, 1)) - // 初始化客户端 - client, err := s.initClient(cardSend.RobotCode) - if err != nil { - return fmt.Errorf("初始化client失败: %w", err) - } - - // 生成卡片实例ID - cardInstanceId, err := uuid.NewUUID() - if err != nil { - return fmt.Errorf("创建uuid失败: %w", err) - } - - // 构建初始请求 - request, err := s.buildBaseRequest(cardSend, cardInstanceId.String()) - if err != nil { - return fmt.Errorf("请求失败: %w", err) - } - - // 发送初始卡片 - if _, err := s.SendInteractiveCard(ctx, request, cardSend.RobotCode, client); err != nil { - return fmt.Errorf("发送初始卡片失败: %w", err) - } - - // 处理切片内容（同步） - if len(cardSend.ContentSlice) > 0 { - if err := s.processContentSlice(ctx, cardSend, cardInstanceId.String(), client); err != nil { - return fmt.Errorf("内容同步失败: %w", err) - } - } - - // 处理通道内容（异步） - if cardSend.ContentChannel != nil { - var wg sync.WaitGroup - wg.Add(1) - go func() { - defer wg.Done() - s.processContentChannel(ctx, cardSend, cardInstanceId.String(), client) - }() - wg.Wait() - } - - return nil -} - -// buildBaseRequest 构建基础请求 -func (s *SendCardClient) buildBaseRequest(cardSend *CardSend, cardInstanceId string) (*dingtalkcard_1_0.StreamingUpdateRequest, error) { - cardData := fmt.Sprintf(string(cardSend.Template), "") // 初始空内容 - request := &dingtalkcard_1_0.StreamingUpdateRequest{ - OutTrackId: tea.String("your-out-track-id"), - Guid: tea.String("0F714542-0AFC-2B0E-CF14-E2D39F5BFFE8"), - Key: tea.String("your-ai-param"), - Content: tea.String("test"), - IsFull: tea.Bool(false), - IsFinalize: tea.Bool(false), - IsError: tea.Bool(false), - } - - switch cardSend.ConversationType { - case constants.ConversationTypeGroup: - request.SetOpenConversationId(cardSend.ConversationId) - case constants.ConversationTypeSingle: - receiver, err := json.Marshal(map[string]string{"userId": cardSend.SenderStaffId}) - if err != nil { - return nil, fmt.Errorf("数据整理失败: %w", err) - } - request.SetSingleChatReceiver(string(receiver)) - default: - return nil, errors.New("未知的聊天场景") - } - - return request, nil -} - -// processContentChannel 处理通道内容（异步更新） -func (s *SendCardClient) processContentChannel(ctx context.Context, cardSend *CardSend, cardInstanceId string, client *dingtalkim_1_0.Client) { - defer func() { - if r := recover(); r != nil { - s.logger.Error("panic in processContentChannel") - } - }() - - ticker := time.NewTicker(cardSend.UpdateInterval) - defer ticker.Stop() - heartbeatTicker := time.NewTicker(time.Duration(HeardBeatX) * DefaultInterval) - defer heartbeatTicker.Stop() - - var ( - contentBuilder strings.Builder - lastUpdate time.Time - ) - for { - - select { - case content, ok := <-cardSend.ContentChannel: - if !ok { - // 通道关闭，发送最终内容 - if contentBuilder.Len() > 0 { - if err := s.updateCardContent(ctx, cardSend, cardInstanceId, contentBuilder.String(), client); err != nil { - s.logger.Errorf("更新卡片失败1:%s", err.Error()) - } - } - return - } - contentBuilder.WriteString(content) - if contentBuilder.Len() > 0 { - if err := s.updateCardContent(ctx, cardSend, cardInstanceId, contentBuilder.String(), client); err != nil { - s.logger.Errorf("更新卡片失败2：%s", err.Error()) - } - } - lastUpdate = time.Now() - - case <-heartbeatTicker.C: - if time.Now().Unix()-lastUpdate.Unix() >= HeardBeatX { - return - } - - case <-ctx.Done(): - s.logger.Info("context canceled, stop channel processing") - return - } - } - -} - -// processContentSlice 处理切片内容（同步更新） -func (s *SendCardClient) processContentSlice(ctx context.Context, cardSend *CardSend, cardInstanceId string, client *dingtalkim_1_0.Client) error { - var contentBuilder strings.Builder - for _, content := range cardSend.ContentSlice { - contentBuilder.WriteString(content) - err := s.updateCardRequest(ctx, &UpdateCardRequest{ - Template: string(cardSend.Template), - Content: contentBuilder.String(), - Client: client, - RobotCode: cardSend.RobotCode, - CardInstanceId: cardInstanceId, - }) - if err != nil { - return fmt.Errorf("更新卡片失败: %w", err) - } - time.Sleep(cardSend.UpdateInterval) // 控制更新频率 - } - return nil -} - -// updateCardContent 封装卡片更新逻辑 -func (s *SendCardClient) updateCardContent(ctx context.Context, cardSend *CardSend, cardInstanceId, content string, client *dingtalkim_1_0.Client) error { - err := s.updateCardRequest(ctx, &UpdateCardRequest{ - Template: string(cardSend.Template), - Content: content, - Client: client, - RobotCode: cardSend.RobotCode, - CardInstanceId: cardInstanceId, - }) - - return err -} - -func (s *SendCardClient) updateCardRequest(ctx context.Context, updateCardRequest *UpdateCardRequest) error { - - updateRequest := &dingtalkim_1_0.UpdateRobotInteractiveCardRequest{ - CardBizId: tea.String(updateCardRequest.CardInstanceId), - CardData: tea.String(fmt.Sprintf(updateCardRequest.Template, updateCardRequest.Content)), - } - _, err := s.UpdateInteractiveCard(ctx, updateRequest, updateCardRequest.RobotCode, updateCardRequest.Client) - return err -} - -// UpdateInteractiveCard 更新交互卡片（封装错误处理） -func (s *SendCardClient) UpdateInteractiveCard(ctx context.Context, request *dingtalkim_1_0.UpdateRobotInteractiveCardRequest, robotCode string, client *dingtalkim_1_0.Client) (*dingtalkim_1_0.UpdateRobotInteractiveCardResponse, error) { - authInfo, err := s.Auth.GetTokenFromBotOption(ctx, WithBot(s.botOption)) - if err != nil { - return nil, fmt.Errorf("get token failed: %w", err) - } - - headers := &dingtalkim_1_0.UpdateRobotInteractiveCardHeaders{ - XAcsDingtalkAccessToken: tea.String(authInfo.AccessToken), - } - - response, err := client.UpdateRobotInteractiveCardWithOptions(request, headers, &util.RuntimeOptions{}) - if err != nil { - return nil, fmt.Errorf("API call failed: %w,request:%v", err, request.String()) - } - return response, nil -} - -// SendInteractiveCard 发送交互卡片（封装错误处理） -func (s *SendCardClient) SendInteractiveCard(ctx context.Context, request *dingtalkim_1_0.SendRobotInteractiveCardRequest, robotCode string, client *dingtalkim_1_0.Client) (res *dingtalkim_1_0.SendRobotInteractiveCardResponse, err error) { - err = s.Auth.GetBotConfigFromModel(s.botOption) - if err != nil { - return nil, fmt.Errorf("初始化bot失败: %w", err) - } - authInfo, err := s.Auth.GetTokenFromBotOption(ctx, WithBot(s.botOption)) - if err != nil { - return nil, fmt.Errorf("get token failed: %w", err) - } - - headers := &dingtalkim_1_0.SendRobotInteractiveCardHeaders{ - XAcsDingtalkAccessToken: tea.String(authInfo.AccessToken), - } - - response, err := client.SendRobotInteractiveCardWithOptions(request, headers, &util.RuntimeOptions{}) - if err != nil { - return nil, fmt.Errorf("API call failed: %w", err) - } - return response, nil -} diff --git a/internal/config/config.go b/internal/config/config.go index 441d09d..35f2115 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -1,10 +1,10 @@ package config import ( + "ai_scheduler/pkg" "fmt" - "time" - "github.com/spf13/viper" + "time" ) // Config 应用配置 @@ -222,10 +222,32 @@ func LoadConfig(configPath string) (*Config, error) { } // 解析配置 - var config Config - if err := viper.Unmarshal(&config); err != nil { + var bc Config + if err := viper.Unmarshal(&bc); err != nil { return nil, fmt.Errorf("failed to unmarshal config: %w", err) } - return &config, nil + return &bc, nil +} + +func LoadConfigWithTest() (*Config, error) { + var bc Config + modularDir, err := pkg.GetModuleDir() + if err != nil { + return nil, err + } + viper.SetConfigFile(modularDir + "/config/config_test.yaml") + viper.SetConfigType("yaml") + // 读取配置文件 + if err := viper.ReadInConfig(); err != nil { + return nil, fmt.Errorf("failed to read config file: %w", err) + } + // 解析配置 + + if err := viper.Unmarshal(&bc); err != nil { + return nil, fmt.Errorf("failed to unmarshal config: %w", err) + } + + return &bc, nil + } diff --git a/internal/pkg/channel_pool.go b/internal/pkg/channel_pool.go deleted file mode 100644 index eda85fa..0000000 --- a/internal/pkg/channel_pool.go +++ /dev/null @@ -1,75 +0,0 @@ -package pkg - -import ( - "ai_scheduler/internal/config" - "ai_scheduler/internal/entitys" - "sync" -) - -type SafeChannelPool struct { - pool chan chan entitys.ResponseData // 存储空闲 channel 的队列 - bufSize int // channel 缓冲大小 - mu sync.Mutex - closed bool -} - -func NewSafeChannelPool(c *config.Config) (*SafeChannelPool, func()) { - pool := &SafeChannelPool{ - pool: make(chan chan entitys.ResponseData, c.Sys.ChannelPoolLen), - bufSize: c.Sys.ChannelPoolSize, - } - - cleanup := pool.Close - return pool, cleanup -} - -// 从池中获取 channel（若无空闲则创建新 channel） -func (p *SafeChannelPool) Get() chan entitys.ResponseData { - p.mu.Lock() - defer p.mu.Unlock() - - if p.closed { - return make(chan entitys.ResponseData, p.bufSize) - } - - select { - case ch := <-p.pool: // 从池中取 - return ch - default: // 池为空，创建新 channel - return make(chan entitys.ResponseData, p.bufSize) - } -} - -// 将 channel 放回池中（必须确保 channel 已清空！） -func (p *SafeChannelPool) Put(ch chan entitys.ResponseData) { - p.mu.Lock() - defer p.mu.Unlock() - - if p.closed { - return - } - - // 清空 channel（防止复用时读取旧数据） - go func() { - for range ch { - // 丢弃所有数据（或根据业务需求处理） - } - }() - - select { - case p.pool <- ch: // 尝试放回池中 - default: // 池已满，直接关闭 channel（避免泄漏） - close(ch) - } - return -} - -// 关闭池（释放所有资源） -func (p *SafeChannelPool) Close() { - p.mu.Lock() - defer p.mu.Unlock() - - p.closed = true - close(p.pool) // 关闭池队列 - // 需额外逻辑关闭所有内部 channel（此处简化） -} diff --git a/internal/pkg/func.go b/internal/pkg/func.go index d07b202..4d9232b 100644 --- a/internal/pkg/func.go +++ b/internal/pkg/func.go @@ -6,8 +6,6 @@ import ( "errors" "fmt" "net/url" - "os" - "path/filepath" "reflect" "strconv" "strings" @@ -197,64 +195,6 @@ func StructToMapUsingJsoniter(obj interface{}) (map[string]string, error) { return result, nil } -func GetModuleDir() (string, error) { - dir, err := os.Getwd() - if err != nil { - return "", err - } - - for { - modPath := filepath.Join(dir, "go.mod") - if _, err := os.Stat(modPath); err == nil { - return dir, nil // 找到 go.mod - } - - // 向上查找父目录 - parent := filepath.Dir(dir) - if parent == dir { - break // 到达根目录，未找到 - } - dir = parent - } - - return "", fmt.Errorf("go.mod not found in current directory or parents") -} - -// GetCacheDir 用于获取缓存目录路径 -// 如果缓存目录不存在，则会自动创建 -// 返回值: -// - string: 缓存目录的路径 -// - error: 如果获取模块目录失败或创建缓存目录失败，则返回错误信息 -func GetCacheDir() (string, error) { - // 获取模块目录 - modDir, err := GetModuleDir() - if err != nil { - return "", err - } - // 拼接缓存目录路径 - path := fmt.Sprintf("%s/cache", modDir) - // 创建目录（包括所有必要的父目录），权限设置为0755 - err = os.MkdirAll(path, 0755) - if err != nil { - return "", fmt.Errorf("创建目录失败: %w", err) - } - // 返回成功创建的缓存目录路径 - return path, nil -} - -func GetTmplDir() (string, error) { - modDir, err := GetModuleDir() - if err != nil { - return "", err - } - path := fmt.Sprintf("%s/tmpl", modDir) - err = os.MkdirAll(path, 0755) - if err != nil { - return "", fmt.Errorf("创建目录失败: %w", err) - } - return path, nil -} - // 通用结构体转 Query 参数 func StructToQuery(obj interface{}) (url.Values, error) { values := url.Values{} diff --git a/internal/pkg/provider_set.go b/internal/pkg/provider_set.go index f8fadac..603dedc 100644 --- a/internal/pkg/provider_set.go +++ b/internal/pkg/provider_set.go @@ -15,7 +15,7 @@ var ProviderSetClient = wire.NewSet( utils_langchain.NewUtilLangChain, utils_ollama.NewClient, utils_vllm.NewClient, - NewSafeChannelPool, + dingtalk.NewOldClient, dingtalk.NewContactClient, dingtalk.NewNotableClient, diff --git a/internal/server/cron.go b/internal/server/cron.go new file mode 100644 index 0000000..76c5739 --- /dev/null +++ b/internal/server/cron.go @@ -0,0 +1,93 @@ +package server + +import ( + "ai_scheduler/internal/services" + "context" + + "github.com/gofiber/fiber/v2/log" + "github.com/robfig/cron/v3" +) + +type CronServer struct { + Cron *cron.Cron + jobs []*cronJob + log log.AllLogger + cronService *services.CronService + ctx context.Context +} + +type cronJob struct { + EntryId int32 + Func func(context.Context) error + Name string + Schedule string +} + +func NewCronServer( + log log.AllLogger, + cronService *services.CronService, +) *CronServer { + return &CronServer{ + Cron: cron.New(), + log: log, + cronService: cronService, + ctx: context.Background(), + } +} + +func (c *CronServer) InitJobs(ctx context.Context) { + // 创建一个可用于所有定时任务的上下文（可以取消的上下文） + c.ctx = ctx + c.jobs = []*cronJob{ + { + Func: c.cronService.CronReportSend, + Name: "直连天下报表推送", + Schedule: "@every 60s", + }, + } +} + +func (c *CronServer) Run(ctx context.Context) { + // 先初始化任务 + if c.jobs == nil { + c.InitJobs(ctx) + } + + for i, job := range c.jobs { + // 复制变量到闭包内，避免闭包变量捕获问题 + job := job + jobID := i + 1 + _, err := c.Cron.AddFunc(job.Schedule, func() { + c.log.Infof("任务[%d]:%s开始执行", jobID, job.Name) + + defer func() { + if r := recover(); r != nil { + c.log.Errorf("任务[%d]:%s执行时发生panic: %v", jobID, job.Name, r) + } + c.log.Infof("任务[%d]:%s执行结束", jobID, job.Name) + }() + + // 为每次执行创建新的上下文 + ctx := context.Background() + err := job.Func(ctx) + if err != nil { + c.log.Errorf("任务[%d]:%s执行失败: %s", jobID, job.Name, err.Error()) + } + }) + if err != nil { + c.log.Errorf("添加任务失败：%s", err.Error()) + } + } + + // 启动cron调度器 + c.Cron.Start() + c.log.Info("Cron调度器已启动") +} + +// Stop 停止cron调度器 +func (c *CronServer) Stop() { + if c.Cron != nil { + c.Cron.Stop() + c.log.Info("Cron调度器已停止") + } +} diff --git a/internal/server/provider_set.go b/internal/server/provider_set.go index d5cef3d..08bc37b 100644 --- a/internal/server/provider_set.go +++ b/internal/server/provider_set.go @@ -9,4 +9,5 @@ var ProviderSetServer = wire.NewSet( NewHTTPServer, ProvideAllDingBotServices, NewDingTalkBotServer, + NewCronServer, ) diff --git a/internal/server/server.go b/internal/server/server.go index 02c8f84..b455eb4 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -10,18 +10,14 @@ type Servers struct { cfg *config.Config HttpServer *fiber.App DingBotServer *DingTalkBotServer + Cron *CronServer } -func NewServers(cfg *config.Config, fiber *fiber.App, DingBotServer *DingTalkBotServer) *Servers { +func NewServers(cfg *config.Config, fiber *fiber.App, DingBotServer *DingTalkBotServer, cron *CronServer) *Servers { return &Servers{ HttpServer: fiber, cfg: cfg, DingBotServer: DingBotServer, + Cron: cron, } } - -//func DingBotServerInit(clientId string, clientSecret string, cfg *config.Config, handler *do.Handle, do *do.Do) (cli *client.StreamClient) { -// cli = client.NewStreamClient(client.WithAppCredential(client.NewAppCredentialConfig(clientId, clientSecret))) -// cli.RegisterChatBotCallbackRouter(services.NewDingBotService(cfg, handler, do).OnChatBotMessageReceived) -// return -//} diff --git a/internal/services/cron.go b/internal/services/cron.go new file mode 100644 index 0000000..5f624d1 --- /dev/null +++ b/internal/services/cron.go @@ -0,0 +1,43 @@ +package services + +import ( + "ai_scheduler/internal/biz" + "ai_scheduler/internal/config" + "ai_scheduler/internal/data/constants" + "context" + + "gitea.cdlsxd.cn/self-tools/l-dingtalk-stream-sdk-go/chatbot" +) + +type CronService struct { + config *config.Config + dingTalkBotBiz *biz.DingTalkBotBiz +} + +func NewCronService(config *config.Config, dingTalkBotBiz *biz.DingTalkBotBiz) *CronService { + return &CronService{ + config: config, + dingTalkBotBiz: dingTalkBotBiz, + } +} + +func (d *CronService) CronReportSend(ctx context.Context) error { + reportChan, err := d.dingTalkBotBiz.GetReportLists(ctx) + if err != nil { + return err + } + groupId := 23 + groupInfo, err := d.dingTalkBotBiz.GetGroupInfo(ctx, groupId) + if err != nil { + return err + } + err = d.dingTalkBotBiz.HandleStreamRes(ctx, &chatbot.BotCallbackDataModel{ + RobotCode: groupInfo.RobotCode, + ConversationType: constants.ConversationTypeGroup, + ConversationId: groupInfo.ConversationID, + Text: chatbot.BotCallbackDataTextModel{ + Content: "报表", + }, + }, reportChan) + return nil +} diff --git a/internal/services/dtalk_bot.go b/internal/services/dtalk_bot.go index b71e40b..4635b63 100644 --- a/internal/services/dtalk_bot.go +++ b/internal/services/dtalk_bot.go @@ -3,6 +3,7 @@ package services import ( "ai_scheduler/internal/biz" "ai_scheduler/internal/config" + "ai_scheduler/internal/data/constants" "ai_scheduler/internal/entitys" "context" "log" @@ -135,3 +136,24 @@ func (d *DingBotService) runBackgroundTasks(ctx context.Context, data *chatbot.B return nil } + +func (d *DingBotService) CronReportSend(ctx context.Context) error { + reportChan, err := d.dingTalkBotBiz.GetReportLists(ctx) + if err != nil { + return err + } + groupId := 23 + groupInfo, err := d.dingTalkBotBiz.GetGroupInfo(ctx, groupId) + if err != nil { + return err + } + err = d.dingTalkBotBiz.HandleStreamRes(ctx, &chatbot.BotCallbackDataModel{ + RobotCode: groupInfo.RobotCode, + ConversationType: constants.ConversationTypeGroup, + ConversationId: groupInfo.ConversationID, + Text: chatbot.BotCallbackDataTextModel{ + Content: "报表", + }, + }, reportChan) + return nil +} diff --git a/internal/services/dtalk_bot.go.bak b/internal/services/dtalk_bot.go.bak deleted file mode 100644 index 75c2c7f..0000000 --- a/internal/services/dtalk_bot.go.bak +++ /dev/null @@ -1,130 +0,0 @@ -package services - -import ( - "ai_scheduler/internal/biz" - "log" - "sync" - "time" - - "ai_scheduler/internal/config" - "ai_scheduler/internal/entitys" - "context" - - "gitea.cdlsxd.cn/self-tools/l-dingtalk-stream-sdk-go/chatbot" -) - -type DingBotService struct { - config *config.Config - dingTalkBotBiz *biz.DingTalkBotBiz -} - -func NewDingBotService(config *config.Config, DingTalkBotBiz *biz.DingTalkBotBiz) *DingBotService { - return &DingBotService{config: config, dingTalkBotBiz: DingTalkBotBiz} -} - -func (d *DingBotService) GetServiceCfg() ([]entitys.DingTalkBot, error) { - return d.dingTalkBotBiz.GetDingTalkBotCfgList() -} - -func (d *DingBotService) OnChatBotMessageReceived(ctx context.Context, data *chatbot.BotCallbackDataModel) ([]byte, error) { - var ( - lastErr error - chat []string - streamWG sync.WaitGroup - resChan = make(chan string, 100) // 缓冲通道防止阻塞 - ) - - // 初始化请求 - requireData, err := d.dingTalkBotBiz.InitRequire(ctx, data) - if err != nil { - return nil, err - } - - // 创建子上下文用于控制goroutine生命周期 - subCtx, cancel := context.WithCancel(ctx) - defer cancel() - - // 启动流式处理goroutine - streamWG.Add(1) - go func() { - defer streamWG.Done() - err = d.dingTalkBotBiz.HandleStreamRes(subCtx, data, resChan) - if err != nil { - return - } - }() - - // 启动业务处理goroutine - done := make(chan error, 1) - go func() { - done <- d.dingTalkBotBiz.Do(subCtx, requireData) - }() - - // 主处理循环 - for { - select { - case <-ctx.Done(): - lastErr = ctx.Err() - goto cleanup - - case resp, ok := <-requireData.Ch: - if !ok { - goto cleanup - } - - // 处理不同类型响应 - switch resp.Type { - case entitys.ResponseLog: - // 忽略日志类型 - continue - - //case entitys.ResponseText, entitys.ResponseJson: - // chat = append(chat, resp.Content) - // if err := d.dingTalkBotBiz.ReplyText(ctx, data.SessionWebhook, resp.Content); err != nil { - // log.Printf("处理非流响应失败: %v", err) - // lastErr = err - // } - - default: - chat = append(chat, resp.Content) - select { - case resChan <- resp.Content: - case <-ctx.Done(): - lastErr = ctx.Err() - goto cleanup - } - } - } - } - -cleanup: - streamWG.Wait() - // 关闭流式通道 - close(resChan) - - // 保存历史记录 - if saveErr := d.dingTalkBotBiz.SaveHis(ctx, requireData, chat); saveErr != nil { - log.Printf("保存历史记录失败: %v", saveErr) - if lastErr == nil { - lastErr = saveErr - } - } - - // 等待业务处理完成（带超时） - select { - case err := <-done: - if err != nil { - log.Printf("业务处理失败: %v", err) - if lastErr == nil { - lastErr = err - } - } - case <-time.After(3 * time.Second): // 增加超时时间 - log.Println("警告：等待业务处理超时，可能发生goroutine泄漏") - } - - if lastErr != nil { - return nil, lastErr - } - return []byte("success"), nil -} diff --git a/internal/services/dtalk_bot_test.go b/internal/services/dtalk_bot_test.go new file mode 100644 index 0000000..2b8223f --- /dev/null +++ b/internal/services/dtalk_bot_test.go @@ -0,0 +1,105 @@ +package services + +import ( + "ai_scheduler/internal/biz" + "ai_scheduler/internal/biz/do" + dingtalk2 "ai_scheduler/internal/biz/handle/dingtalk" + "ai_scheduler/internal/biz/llm_service" + "ai_scheduler/internal/biz/tools_regis" + "ai_scheduler/internal/config" + "ai_scheduler/internal/data/impl" + "ai_scheduler/internal/domain/component" + "ai_scheduler/internal/domain/component/callback" + "ai_scheduler/internal/domain/repo" + "ai_scheduler/internal/domain/workflow" + "ai_scheduler/internal/pkg" + "ai_scheduler/internal/pkg/dingtalk" + "ai_scheduler/internal/pkg/utils_ollama" + "ai_scheduler/internal/pkg/utils_vllm" + + "ai_scheduler/internal/tools" + "ai_scheduler/utils" + "context" + "testing" + + "github.com/gofiber/fiber/v2/log" +) + +func Test_Report(t *testing.T) { + run() + a := dingBotService.CronReportSend(context.Background()) + t.Log(a) +} + +var ( + configConfig *config.Config + err error + dingBotService *DingBotService +) + +// run 函数是程序的入口函数，负责初始化和配置各个组件 +func run() { + // 加载测试配置 + configConfig, err = config.LoadConfigWithTest() + // 初始化数据库连接 + db, _ := utils.NewGormDb(configConfig) + // 初始化各种实现层组件 + sysImpl := impl.NewSysImpl(db) + taskImpl := impl.NewTaskImpl(db) + chatHisImpl := impl.NewChatHisImpl(db) + sessionImpl := impl.NewSessionImpl(db) + botConfigImpl := impl.NewBotConfigImpl(db) + botGroupImpl := impl.NewBotGroupImpl(db) + botUserImpl := impl.NewBotUserImpl(db) + // 初始化Do业务对象 + doDo := do.NewDo(sysImpl, taskImpl, chatHisImpl, configConfig) + // 初始化Ollama客户端 + client, _, _ := utils_ollama.NewClient(configConfig) + // 初始化vLLM客户端 + utils_vllmClient, _, _ := utils_vllm.NewClient(configConfig) + // 初始化Redis数据库连接 + rdb := utils.NewRdb(configConfig) + // 初始化仓库层 + repos := repo.NewRepos(sessionImpl, rdb) + // 初始化包级别的Redis连接 + pkgRdb := pkg.NewRdb(configConfig) + + // 初始化机器人工具实现层 + botToolsImpl := impl.NewBotToolsImpl(db) + // 初始化机器人部门实现层 + botDeptImpl := impl.NewBotDeptImpl(db) + // 初始化Redis管理器 + redisManager := callback.NewRedisManager(pkgRdb) + // 初始化组件 + components := component.NewComponents(redisManager) + // 初始化工作流注册表 + registry := workflow.NewRegistry(configConfig, client, repos, components) + // 初始化钉钉旧版客户端 + oldClient := dingtalk.NewOldClient(configConfig) + // 初始化Ollama服务 + ollamaService := llm_service.NewOllamaGenerate(client, utils_vllmClient, configConfig, chatHisImpl) + // 初始化工具管理器 + manager := tools.NewManager(configConfig, client) + // 初始化钉钉联系人客户端 + contactClient, _ := dingtalk.NewContactClient(configConfig) + // 初始化钉钉记事本客户端 + notableClient, _ := dingtalk.NewNotableClient(configConfig) + // 初始化工具注册 + toolRegis := tools_regis.NewToolsRegis(botToolsImpl) + // 初始化机器人聊天历史实现层 + botChatHisImpl := impl.NewBotChatHisImpl(db) + // 初始化钉钉认证 + auth := dingtalk2.NewAuth(configConfig, rdb, botConfigImpl) + // 初始化部门服务 + dept := dingtalk2.NewDept(botDeptImpl, auth) + // 初始化用户服务 + user := dingtalk2.NewUser(botUserImpl, auth, dept) + // 初始化发送卡片客户端 + sendCardClient := dingtalk2.NewSendCardClient(auth, log.DefaultLogger()) + // 初始化处理器 + handle := do.NewHandle(ollamaService, manager, configConfig, sessionImpl, registry, oldClient, contactClient, notableClient) + // 初始化钉钉机器人业务逻辑 + dingTalkBotBiz := biz.NewDingTalkBotBiz(doDo, handle, botConfigImpl, botGroupImpl, user, toolRegis, botChatHisImpl, manager, configConfig, sendCardClient) + // 初始化钉钉机器人服务 + dingBotService = NewDingBotService(configConfig, dingTalkBotBiz) +} diff --git a/internal/services/provider_set.go b/internal/services/provider_set.go index 375a886..55eed7a 100644 --- a/internal/services/provider_set.go +++ b/internal/services/provider_set.go @@ -14,4 +14,5 @@ var ProviderSetServices = wire.NewSet( NewDingBotService, NewHistoryService, NewCapabilityService, + NewCronService, ) diff --git a/internal/tools/bbxt/bbxt.go b/internal/tools/bbxt/bbxt.go index 8fe2885..7675d64 100644 --- a/internal/tools/bbxt/bbxt.go +++ b/internal/tools/bbxt/bbxt.go @@ -1,7 +1,7 @@ package bbxt import ( - "ai_scheduler/internal/pkg" + "ai_scheduler/pkg" "fmt" "reflect" "time" @@ -92,7 +92,7 @@ func (b *BbxtTools) StatisOursProductLossSumTotal(ct []string) (err error) { for _, v := range resellerMap { if v.Total <= -100 { total = append(total, []string{ - fmt.Sprintf("%d", v.ResellerName), + fmt.Sprintf("%s", v.ResellerName), fmt.Sprintf("%.2f", v.Total), }) } diff --git a/internal/tools/bbxt/bbxt_test.go b/internal/tools/bbxt/bbxt_test.go index 80e6b29..2770488 100644 --- a/internal/tools/bbxt/bbxt_test.go +++ b/internal/tools/bbxt/bbxt_test.go @@ -1,13 +1,20 @@ package bbxt -import "testing" +import ( + "testing" + "time" +) func Test_StatisOursProductLossSumApiTotal(t *testing.T) { o, err := NewBbxtTools() if err != nil { panic(err) } - err = o.StatisOursProductLossSumTotal() + today := time.Now() + err = o.StatisOursProductLossSumTotal([]string{ + time.Date(today.Year(), today.Month(), today.Day(), 0, 0, 0, 0, today.Location()).Format("2006-01-02 15:04:05"), + time.Date(today.Year(), today.Month(), today.Day(), 23, 59, 59, 0, today.Location()).Format("2006-01-02 15:04:05"), + }) t.Log(err) diff --git a/pkg/func.go b/pkg/func.go new file mode 100644 index 0000000..006f16f --- /dev/null +++ b/pkg/func.go @@ -0,0 +1,65 @@ +package pkg + +import ( + "fmt" + "os" + "path/filepath" +) + +func GetModuleDir() (string, error) { + dir, err := os.Getwd() + if err != nil { + return "", err + } + + for { + modPath := filepath.Join(dir, "go.mod") + if _, err := os.Stat(modPath); err == nil { + return dir, nil // 找到 go.mod + } + + // 向上查找父目录 + parent := filepath.Dir(dir) + if parent == dir { + break // 到达根目录，未找到 + } + dir = parent + } + + return "", fmt.Errorf("go.mod not found in current directory or parents") +} + +// GetCacheDir 用于获取缓存目录路径 +// 如果缓存目录不存在，则会自动创建 +// 返回值: +// - string: 缓存目录的路径 +// - error: 如果获取模块目录失败或创建缓存目录失败，则返回错误信息 +func GetCacheDir() (string, error) { + // 获取模块目录 + modDir, err := GetModuleDir() + if err != nil { + return "", err + } + // 拼接缓存目录路径 + path := fmt.Sprintf("%s/cache", modDir) + // 创建目录（包括所有必要的父目录），权限设置为0755 + err = os.MkdirAll(path, 0755) + if err != nil { + return "", fmt.Errorf("创建目录失败: %w", err) + } + // 返回成功创建的缓存目录路径 + return path, nil +} + +func GetTmplDir() (string, error) { + modDir, err := GetModuleDir() + if err != nil { + return "", err + } + path := fmt.Sprintf("%s/tmpl", modDir) + err = os.MkdirAll(path, 0755) + if err != nil { + return "", fmt.Errorf("创建目录失败: %w", err) + } + return path, nil +} From 8deb91dea93030eafe563d385531c0cf72d10ea8 Mon Sep 17 00:00:00 2001 From: fuzhongyun <15339891972@163.com> Date: Tue, 30 Dec 2025 09:15:58 +0800 Subject: [PATCH 10/18] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E9=94=80=E5=95=86=E8=B4=9F=E5=88=A9=E6=B6=A6=E8=AF=A6=E6=83=85?= =?UTF-8?q?excel=E5=A1=AB=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/tools/bbxt/bbxt.go | 96 ++++++++++++++++++++++++++++++- internal/tools/bbxt/bbxt_test.go | 2 +- tmpl/excel_temp/kshj_gt.xlsx | Bin 0 -> 9469 bytes 3 files changed, 94 insertions(+), 4 deletions(-) create mode 100755 tmpl/excel_temp/kshj_gt.xlsx diff --git a/internal/tools/bbxt/bbxt.go b/internal/tools/bbxt/bbxt.go index 8fe2885..cd1024f 100644 --- a/internal/tools/bbxt/bbxt.go +++ b/internal/tools/bbxt/bbxt.go @@ -4,6 +4,7 @@ import ( "ai_scheduler/internal/pkg" "fmt" "reflect" + "sort" "time" "github.com/xuri/excelize/v2" @@ -92,7 +93,7 @@ func (b *BbxtTools) StatisOursProductLossSumTotal(ct []string) (err error) { for _, v := range resellerMap { if v.Total <= -100 { total = append(total, []string{ - fmt.Sprintf("%d", v.ResellerName), + fmt.Sprintf("%s", v.ResellerName), fmt.Sprintf("%.2f", v.Total), }) } @@ -103,12 +104,13 @@ func (b *BbxtTools) StatisOursProductLossSumTotal(ct []string) (err error) { //总量生成excel if len(total) > 0 { filePath := b.cacheDir + "/kshj_total" + fmt.Sprintf("%d", time.Now().Unix()) + ".xlsx" - err = b.SimpleFillExcel(b.excelTempDir+"/"+"kshj_total.xlsx", filePath, total) + err = b.SimpleFillExcel(b.excelTempDir+"/"+"kshj_total_v2.xlsx", filePath, total) } if len(gt) > 0 { filePath := b.cacheDir + "/kshj_gt" + fmt.Sprintf("%d", time.Now().Unix()) + ".xlsx" - err = b.SimpleFillExcel(b.excelTempDir+"/"+"kshj_gt.xlsx", filePath, total) + // err = b.SimpleFillExcel(b.excelTempDir+"/"+"kshj_gt.xlsx", filePath, total) + err = b.resellerDetailFillExcel(b.excelTempDir+"/"+"kshj_gt.xlsx", filePath, gt) } return err } @@ -166,3 +168,91 @@ func (b *BbxtTools) SimpleFillExcel(templatePath, outputPath string, dataSlice i // 6. 保存 return f.SaveAs(outputPath) } + +// 分销商负利润详情填充excel +// 1.使用模板文件作为输出文件 +// 2.分销商总计使用第二行样式（宽高、背景、颜色等） +// 3.商品详情使用第三行样式（宽高、背景、颜色等） +// 4.保存为新文件 +func (b *BbxtTools) resellerDetailFillExcel(templatePath, outputPath string, dataSlice []*ResellerLoss) error { + // 1. 读取模板 + f, err := excelize.OpenFile(templatePath) + if err != nil { + return err + } + defer f.Close() + + sheet := f.GetSheetName(0) + + // 获取模板样式1：第二行-分销商总计 + resellerTplRow := 2 + styleIDReseller, err := f.GetCellStyle(sheet, fmt.Sprintf("A%d", resellerTplRow)) + if err != nil { + // 如果获取失败，就不应用样式，或者记录日志，这里选择忽略错误继续 + styleIDReseller = 0 + } + rowHeightReseller, err := f.GetRowHeight(sheet, resellerTplRow) + if err != nil { + rowHeightReseller = 31 // 默认高度 + } + // 获取模板样式2：第三行-产品亏损明细 + productTplRow := 3 + styleIDProduct, err := f.GetCellStyle(sheet, fmt.Sprintf("A%d", productTplRow)) + if err != nil { + // 如果获取失败，就不应用样式，或者记录日志，这里选择忽略错误继续 + styleIDProduct = 0 + } + rowHeightProduct, err := f.GetRowHeight(sheet, productTplRow) + if err != nil { + rowHeightProduct = 25 // 默认高度 + } + + currentRow := 2 + + for _, reseller := range dataSlice { + // 3. 填充经销商数据 (ResellerName, Total) + // 设置行高 + f.SetRowHeight(sheet, currentRow, rowHeightReseller) + + // 设置单元格值 + f.SetCellValue(sheet, fmt.Sprintf("A%d", currentRow), reseller.ResellerName) + f.SetCellValue(sheet, fmt.Sprintf("B%d", currentRow), reseller.Total) + + // 应用样式 + if styleIDReseller != 0 { + f.SetCellStyle(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("B%d", currentRow), styleIDReseller) + } + + currentRow++ + + // 4. 填充产品亏损明细 + // 先对 ProductLoss 进行排序 + var products []ProductLoss + for _, p := range reseller.ProductLoss { + products = append(products, p) + } + // 按 Loss 升序排序 (亏损越多越靠前，负数越小) + sort.Slice(products, func(i, j int) bool { + return products[i].Loss < products[j].Loss + }) + + for _, p := range products { + // 设置行高 + f.SetRowHeight(sheet, currentRow, rowHeightProduct) + + // 设置单元格值 + f.SetCellValue(sheet, fmt.Sprintf("A%d", currentRow), p.ProductName) + f.SetCellValue(sheet, fmt.Sprintf("B%d", currentRow), p.Loss) + + // 应用样式 + if styleIDProduct != 0 { + f.SetCellStyle(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("B%d", currentRow), styleIDProduct) + } + + currentRow++ + } + } + + // 6. 保存 + return f.SaveAs(outputPath) +} diff --git a/internal/tools/bbxt/bbxt_test.go b/internal/tools/bbxt/bbxt_test.go index 80e6b29..628c675 100644 --- a/internal/tools/bbxt/bbxt_test.go +++ b/internal/tools/bbxt/bbxt_test.go @@ -7,7 +7,7 @@ func Test_StatisOursProductLossSumApiTotal(t *testing.T) { if err != nil { panic(err) } - err = o.StatisOursProductLossSumTotal() + err = o.StatisOursProductLossSumTotal([]string{"2025-12-28+00:00:00", "2025-12-28+23:59:59.999"}) t.Log(err) diff --git a/tmpl/excel_temp/kshj_gt.xlsx b/tmpl/excel_temp/kshj_gt.xlsx new file mode 100755 index 0000000000000000000000000000000000000000..9ab76f5e450a7e10ea61eded595909e5f46182a2 GIT binary patch literal 9469 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 Date: Tue, 30 Dec 2025 09:36:37 +0800 Subject: [PATCH 11/18] =?UTF-8?q?fix=EF=BC=9A1.=E4=BB=85=E5=88=86=E9=94=80?= =?UTF-8?q?=E5=95=86=E5=AF=BC=E5=87=BA=E4=B9=9F=E4=BD=BF=E7=94=A8=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=202.=E4=BF=AE=E6=94=B9=E5=88=86=E9=94=80=E5=95=86?= =?UTF-8?q?=E3=80=81=E5=88=86=E9=94=80=E5=95=86=E8=AF=A6=E6=83=85=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=203.=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/tools/bbxt/bbxt.go | 31 +++++++++++++++++++++++++++---- tmpl/excel_temp/kshj_gt.xlsx | Bin 9469 -> 9473 bytes tmpl/excel_temp/kshj_total.xlsx | Bin 10313 -> 9414 bytes 3 files changed, 27 insertions(+), 4 deletions(-) mode change 100644 => 100755 tmpl/excel_temp/kshj_total.xlsx diff --git a/internal/tools/bbxt/bbxt.go b/internal/tools/bbxt/bbxt.go index cd1024f..d7d00ef 100644 --- a/internal/tools/bbxt/bbxt.go +++ b/internal/tools/bbxt/bbxt.go @@ -7,6 +7,7 @@ import ( "sort" "time" + "github.com/gofiber/fiber/v2/log" "github.com/xuri/excelize/v2" ) @@ -104,12 +105,11 @@ func (b *BbxtTools) StatisOursProductLossSumTotal(ct []string) (err error) { //总量生成excel if len(total) > 0 { filePath := b.cacheDir + "/kshj_total" + fmt.Sprintf("%d", time.Now().Unix()) + ".xlsx" - err = b.SimpleFillExcel(b.excelTempDir+"/"+"kshj_total_v2.xlsx", filePath, total) + err = b.SimpleFillExcel(b.excelTempDir+"/"+"kshj_total.xlsx", filePath, total) } if len(gt) > 0 { filePath := b.cacheDir + "/kshj_gt" + fmt.Sprintf("%d", time.Now().Unix()) + ".xlsx" - // err = b.SimpleFillExcel(b.excelTempDir+"/"+"kshj_gt.xlsx", filePath, total) err = b.resellerDetailFillExcel(b.excelTempDir+"/"+"kshj_gt.xlsx", filePath, gt) } return err @@ -126,6 +126,20 @@ func (b *BbxtTools) SimpleFillExcel(templatePath, outputPath string, dataSlice i sheet := f.GetSheetName(0) + // 1.1 获取第二行模板样式 + resellerTplRow := 2 + styleIDReseller, err := f.GetCellStyle(sheet, fmt.Sprintf("A%d", resellerTplRow)) + if err != nil { + log.Errorf("获取分销商总计样式失败: %v", err) + styleIDReseller = 0 + } + // 1.2 获取分销商总计行高 + rowHeightReseller, err := f.GetRowHeight(sheet, resellerTplRow) + if err != nil { + log.Errorf("获取分销商总计行高失败: %v", err) + rowHeightReseller = 31 // 默认高度 + } + // 2. 反射获取切片数据 v := reflect.ValueOf(dataSlice) if v.Kind() != reflect.Slice { @@ -157,12 +171,19 @@ func (b *BbxtTools) SimpleFillExcel(templatePath, outputPath string, dataSlice i } else { rowData = []interface{}{item} } + // 4.1 设置行高 + f.SetRowHeight(sheet, currentRow, rowHeightReseller) // 5. 填充到Excel for col, value := range rowData { cell := fmt.Sprintf("%c%d", 'A'+col, currentRow) f.SetCellValue(sheet, cell, value) } + + // 5.1 使用第二行模板样式 + if styleIDReseller != 0 { + f.SetCellStyle(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("B%d", currentRow), styleIDReseller) + } } // 6. 保存 @@ -188,22 +209,24 @@ func (b *BbxtTools) resellerDetailFillExcel(templatePath, outputPath string, dat resellerTplRow := 2 styleIDReseller, err := f.GetCellStyle(sheet, fmt.Sprintf("A%d", resellerTplRow)) if err != nil { - // 如果获取失败，就不应用样式，或者记录日志，这里选择忽略错误继续 + log.Errorf("获取分销商总计样式失败: %v", err) styleIDReseller = 0 } rowHeightReseller, err := f.GetRowHeight(sheet, resellerTplRow) if err != nil { + log.Errorf("获取分销商总计行高失败: %v", err) rowHeightReseller = 31 // 默认高度 } // 获取模板样式2：第三行-产品亏损明细 productTplRow := 3 styleIDProduct, err := f.GetCellStyle(sheet, fmt.Sprintf("A%d", productTplRow)) if err != nil { - // 如果获取失败，就不应用样式，或者记录日志，这里选择忽略错误继续 + log.Errorf("获取商品详情样式失败: %v", err) styleIDProduct = 0 } rowHeightProduct, err := f.GetRowHeight(sheet, productTplRow) if err != nil { + log.Errorf("获取商品详情行高失败: %v", err) rowHeightProduct = 25 // 默认高度 } diff --git a/tmpl/excel_temp/kshj_gt.xlsx b/tmpl/excel_temp/kshj_gt.xlsx index 9ab76f5e450a7e10ea61eded595909e5f46182a2..c826635797dcc5b89a8eb2b89a85592c445b16c9 100755 GIT binary patch delta 1709 zcmV;e22%O`Nr6hRr2z%X6x`W2ld1t8f5}e6Fcd}iNc=WWH81cBID z_G@bq53&tu{~k9@LlG=kTKD+)zUOMTQC;#0&P$_flxGAbpt%uJuWIz%&eJQD_`tMa zozYOEEqF9*PERUsDK`!tow4A81fN8c_LSQitwXRBW6#&1n9m}iW4JU?+x8VD5qBmYnVBhyyUk){5{~W(A9-f9#Q>k~m;((gnemdsEBCc{NLELVe8=<6@ zJ~$SPtMG525`3sgxdRqJB=J$YH?Md|Udp@sc8;2Y6z6GPq{VehE@?q1A#W8vP~-h( z5~{JqKa3@5Nlwc%njaevf@bLb^W&Q@v-|?k0S*Ic%-Vqh006iJ000;Olg%U=e~naK zZ`&XgeV?@dfOxO5ois_KI8~FX+N4dY_W4Zkb&QIQ2PE$P{Vou@sWMf4u??Ji&bc3W zb^F{Xas*?gZVQ?vDJ9SfUCMS}(4RjZt`?M7$J>%C-9kbCf~B|Xj~`aOHcz$&a0D4z zThQ9MZpoMxH8k8Nx`P%^Ds39>e{gB`%ytHN8G;(c@-&^XhRc>lhNXEAhps9q;9iSE z1FefB1{8Pb-`29T1KV@?F22(69&;W1oLRh&CnH}rz3|saVYJniON4G%w04>04ZC@j zXCp3%{!^@mo2Nr}g~S~ux06b`zaibh5V#kfzVDO1vx#U=F3t*+%^A4uf5AH4+;hk2 zdKEhGXxMsHO01%9Juy%f^e$U&CKUGr;+KTpo_!O?ci%yQa8Tl?P~t~mr}dKue#WiT za|eKD+}92qPCeT9C758%W7Jp_Y(mHVWzCj3HcNQ)9m4$%B^YCI_qa}1f9!}Y5hujv5|NDv zhN7b~W*n3;;62I+M`e7D%K69}yln=AcXfq-jA=5Pj*wTr-DTB4vr+BBJC-%OmxxNy1)mELKG*D-bqe~Ex?zyYJA z(%KCR9LqYKJ%mkv24BX1?)o2-aReHZ&>{r0kOx`_2|s~;BoG1s05y~I4<&yjZHBaJ zI%=kk7->2}rL?d@Zt~Jtlh~2%k|Kn}3b9}@i>~wFouL6t zdMHsUA7U)S1TrGKJO`$~#9V)5MCq;AVwnpdkxT$omSWp9FK|XELp5P2+Aw$=(-5XS z+-1O24H1wMrQ4SY&1FN2Hq}LEW&xXSk;`t#FqG$P3!fxtJc?-wtJ(vDs9b-a{3=DIZz~Fg zeAJg)qo6F}#hOMc@sRDhrcR@-JqNl?ln%(Y9j8R#-x$?PHLF?;R(1dL@acH?e!Tzs z@Z)g&^7-N0z0R?;{#rL{>CT5#{}9)aRnZzmNYb!uT`!ezV43!yRKQ-{NL8)IPEZeh z@EzATdjq@E53Hcmw+4S^$M-M#9cLQ!oM+bbYUTtVn>h9*F+Qi!Oi4yV!6lDXH{=;0;pd&f~c9Yv9HUXWJ5+o)YKY@NE5CQ-IH3R?v4*&oF000000RSKX z007{VQzSeAlar7nAsYi}%-Vqh006iJ000;O0000000031AOHXWzmv=)D+c5s00000 D-T@zK delta 1702 zcmV;X23h%mO8rT&r2z#-9D=Vlld1t8e_c<)FcgOGP5ci_@3(dXQJQVUk8mZ4i4cu< zO?!aG^&@R{@b4{SOpIQ5*}PAmzUQ=@?NpO|g7ebo3gsC=321JF)SC*emhdT9gTgr`tCuc0UAi*cmq&?-fLfa55#n|&LDCV%@C?RhpK2iPs zdJw9<#XpTxI-XE6J~N&Kb=Ujn$Jbx8{Q}Sd4j{Y=wtfNt0I&rB02lz1(IgswjZ|H4 z+AtJ-pS1sA`JFfk6et3!eyG}{O{%)DXXD%u3n$KOL)w48Ynucrrm8PaVxN1?xgXB* z=A~BT0LDt)tZ0^`lt3eNA)D=r{`&binp0vOZwjt-11tIpmfoyCe_D3h>}&<#2r@Kw zMJwmp1!GoJP;;B;78*P$wW+y(!%wqiwl%G~(xD!v;bxGISL^MYiX9db;4BY*H-a1`BaL4I- z89MM}*m_w=tfFr{F;K4PZML`@Q``@T-x4}|_D&q%`~U^QL4l(}i64QD);kaUid(7Y z4gk-{g_8%k2c?ks3a99A)VT5jY*09V@6{f|&^#GZK*{&Y-D~wn7Oq0oG|A^zvuqOA zG3_DGy88lhTRFs_nBF^oB^&q#2T*vlqWRlBWb`SZ6QLE#;!0}iZvZ7Ve+kbnO3u^d zB$&^ql!#Ew-qDdHhNDaf$LBG8I!lgbqvdzQF`p2QBFFF?leyGm(RC=IZ|Zt!bVqRD z(Y`Oi7_V`R8j6AqXt}?q*&@e236H)-xZj}!V=V3-*6ETRuqEPuh`75%WCMbs=%9=l z2W1TSh%&-a8P`EMA9#beyB^_PjqqnNNv4wl@FmyZ#500UjZK7PLUb$qeUQtKTENjdY7)3%WXEaVYoTMxZj1+4+H zq#`ULDQDoJ_aM>5aWAD z-9dPAw&jJew2M%oRtc4xlV3(;d|Oi}L}%gjY@J3`dk%D)C=d1A zzHJEjH-AL=P>m{AiL21Na!Oi_ z2uT{6&h=6XhmPGD8U^gtwN&M5?F9AE2j3m|c6Zom^#Uho^_-#I^8J3V<<5ex`^=eL z&fVZ+oyOh}<8v7GkYqFzT=H18L!RL(+rP%d8Cu}-G!V5Ddio~giZ(LU;8Z;qGc1EFZJ}N&`=z#8wxLP7OO==?e%>1b`vxePZ$1d+FUlh7j$0dkYyBQ^n w0g{uHBq19hyb88{0ssK81pojT000000000103ZMW0KSvZBr68sAOHXW09#!SRR910 diff --git a/tmpl/excel_temp/kshj_total.xlsx b/tmpl/excel_temp/kshj_total.xlsx old mode 100644 new mode 100755 index 2035ef939d202a1570c39cb8884ac4a456927e40..b29ae47efc9514fb4d9a8dabfbee8e2afc199b5f GIT binary patch delta 4030 zcmYjUcQhQ__MK6pm(dBL_crQ?7NU+ah7ny5pB4;0BBG2EqZiI@7IxZ?!3d9BNqha@G6^od^F1Z1UuX7mD z>#x5F?Yd>Tln4AwTctKQ{$571d#St=o2$7CJJ>l~abc1%ar`0-{IG~C-cS}<6EY=T z->Ym(vS8i_U(5ZQ_l6?Hh@3vdvmL*WM|psf9@DSu<+mhan2o&><|_1m`&4c{dE+(c z@X0E-%wiRPF1zJbmsuj(@QGpCh(Vl|s?zbz#lZ<<-3{I-kW_J%_Q)O&0FWWXP7|=B z;t_KmYaG-;PhD<-2R6@|-xR=;OWhHB&}O5CDW|Yrun?1Y;-~9Nw)Piw1EoL7&~}?y zQj9Gv{@-I*+aJ2j(u>w+(KttxI5b<1<*2X^Z>B&-=3;~=I%C>G^5u3g57Js|V3ojM z1R#sXy!f+)Ffc#M==@(r;S5OEXEJA~m-Pyp56N0$R4r;GN2<~{YYR#2?3Tjqep--D zGu2Fu{wASMmWklNQ}B_bZvCc=Uoo+?K^COXvr2;a;v98mUDBp@ zf9EJRK!CqtHPVf+%YE`t1w9Yp)MIh*0-XBXG^-6)*Y!DBrgd)AnLJ;Z6E4(W@Gy7k>TRZAcqeP3a!Ym!Wt2KX zwJvfAw$9^>zai+{9`$x9h%)e=>JZ>8eW)0q5Fc$EU8#=Yl zg=@ScQ*5(IhJ8t`l>P<-APW^ODv<5L5V6MbEh?!$OP~G`*?2>i$Xrb$HNMyC_f z2LJ%}v2dFEsJ{|ap!un)P~oyg zONeFoR!zqG-@F)Y@?l>f({gR2G-IlHUC+BWx%=EpP#wN-uzl>mBm|8O=(I&=Hal5+hOtD%8#&F$hFy z7V6w)OwU|*e`)`GHaw&>)%FZVtK!%XJ!l!e^c(qHmC;((8)W+VuS@RU``-}m#qWhq z-|zWmsa6#QpP^IBJ`4yrQ$Ez6x<4&*(#>9CdiLdaYAf7xb#@BlreGNI)fQol3A6o# z${fMWYQ6X(KYM^a1?>AMeOV%3{)XGodc5TELi6FKhX+o8$~o$$8ehvc>(3YQjxTIGISISvw4lg(`8VTAB z34x#sf7b+Hr8$h@`ES?^PjCzm-7pw!`+u;DgBXS3rjn%@Yx*}LIhA);md&h z#uQ6^#<$U$+~0QRc3Z}LveR&hv3vPNDq*r6@1*p+MMpl&+=_mpJ{l8@-g?!xdS)Rr zNqU0D+mad08;9}N0o z>vGf~Y`HF;+LzKsHzZs+r>M%}yYMhuQ2X()6>OW~{dhHbnHATtwF#}Zq^MrF`uiH? zERLs|{$~~!w()xgT!}@$O`3dEugc@i&kCVx1AJ}m65DF7WfXIGc9Zu|1)HfK!y-DN zUr#I<(9a7AwH&{>+Nm~^ac`%}SKjyQiRb!J+>v^%#Kc7KQKfoWodko-BF`ABuCl?0GLt8r5oPyL$%U4`8kx9=lPAtozEXpi;;!Bbw+! zU6=9Mrh?YK4KoIjx8pKY+Ed~aVuhj_&bUE$2KJ`~nr24t)f(KVS`DE6XH8xilKnlH zHL=-fV1PrPh4RddXJjvp5Yr6-Lj}}!)O|?R(lA7#q0)tF9J7@fef4(nbn(Io(^_kwNnQRxR z=k_%j|M>V`cLjmnmu{jf%`4J=)cgS+=HN2^eMAg z0YI*ALZZwtKEp!8a44uJV=bA3>MZZ)onYbvh-LH?==FKyFZ+W$BIc`Y<~wa6M?%S@ zd`DabVdXEuIvT$`TU>0RVp-$U`&}U zEj9#2>J2Lq^3NS1jObqvwLTJjj=c~o*;Oqaj*0m&+`&n;x9VW@^cFyYDyBlrE=y!W zf2yxY^d_mjfs4WqLfCH1Cut_hj1(k)>X!4;VdGq*xy8txYrl2-mKTm{^rfUhR@MB6 z%hS|ahyU~$qDpvTb(R6tVmfRC&U~E~j*X`rRzKf+X$D0%40-HzfJW}ppXqXxQ{$y+cavuqn}`;a)n&+@?3#JE&HB%vYv=f7(v||ULygHI5cZiB zgXnPw$c5e#rG9Pb>dVPIQ;OgQQ19IXorQIyJWcurM`e5u*ZVK>{XotZ&w3*&^1*;D z;{65xo8!gxEtTe%w{jrn>Da#M%#AU}6vN?*FYNm7TG&9;ectlN4e!n6#czI*zt+2D zAmb#7o*4DBa&+O-Zp1MLGwE>agc*-d@i_`+yoy5mFv?RbgsW&B;hGuGa`aIr63LHI z50P2upbFa_3M@=TUgdIiwPPmsY)L7nkbgnQ0Om(JGLUt1B+gij)4ah zD1@M{w)(4>Mes?_OemK7M$Y=L@pIN{7!8@D4@(Z;J*kDQ3)llbB-vfDL_A>kRDw;Z#Eh0!cV=a?4*%#MTjkqoYWewxQZZ50>8D9IUJ_ zBKiGrdMa0nMf6_4rG%tW$-a@X@fi|!aqHQl;#)}e;th-^L9c^@sn##mDF_AeKbH=+ z8DeRoqrt*PR<|^yw~eH&=7YB`u)TNMgw`<;{aZQNx7U=mfrsZEU$q`&-LBG7T1u!@ z>&!--bWWvY)h5PA(QgOqa@mPFaj*6!t`^s4#YYKlw?pfb(rFuYtqIaN37_Pd+ROUT zb%J}^eoB(1t5V2X=X%GaPTcn26YXWk zgzwa>9>>i8o8zr7=*?>uEmg*8&!DW$7j2Md3b_xes}?rw6VyPcX&@d+3? zo8qVyZOXw{zL(CZFYO+?m zatVAv$3N4kbWtccGm3s#Q{4mpzb}ZT`y7}~VtpAB$d$N%oN##>QkAgap0Kd28CX|z zxQ3i~0|N}L7$YAxwuIDvD7i{k(&%t`K!l824&pvH>1i`IMtPfwn^IAVDw&!HeiN3T zsE+;YS`(Zo{5Jk~N2rPDc0>=1Q*u2Zrn&d+h4+$(2;#`()LLVDsv@JAo3YJpJF*8o z@N{d+Rp_CAcneCS^&L^eif>+D)Rn-^;@ZtEAd#hxkwb+55A*pm z!F&wZ8XgwBcdXcdc#{8XQ+DR<#Oq}`w%lPxgh1`V%GYr*N>i<`FbClr0+W0*yfo|GUJ_BX5&L5z ziG&H+o`PBHp^G-59Aen} z#EqhV7VG9<9PI&}a3-Y`&8X^cICs&evCdN1jpRqc={d$Zu=Mfyv%okW!+Xy>GpQVf zEMVMxc(+$8d+f{JjpF9-J^wu+Sz>#CV7CiOSzU!5eP?e`caAxRK_GB;A+d)80ugb+ zK4UWishMV)vntfe-wb9hEKfQf?Mj|2C_FKK()O`R54F+Y$vE_e!18|6>KX!V#=khJ)+B~&=QC{YmKw58Y-k}SR=27!#SUho8pg&$9XJV^fk|E}SuSa;Gov-t<*Tq*v=LKl}9qcu3W#KgWFS*kMGyx4@~a2%)vi zhKPL{T`zFVgn!piCcRLv>rWEyJP^hL&VzGMhew}-x1LshN!1+wS>t?O*|cJAXU4Z2 z40|x}+m|6H=J$AZsL+q@&=euK;AYN;V!2m~$U4VWhc?rUhHcu6`yIHhuDNJIhatoS zdZJ>~;5k)5R*99CditJh8w?rKx94%PN1|C5W%Bv$TP8++=Ult=M{`RxymPtkfD|II z)$*8f!5lr$o!n=V=C0|_H$L*vj6ckD*T%6tzRJ3VGnL`2b0K1jS;~&=S8!Xax!lki zVh*oG1o2QQ9jumdBwUwOlYIhdm(MYZ9zyQ>?CwWswVz$AS#C7E-9$rWb>_XRy(Ml?vZdN&g{O6a+j0A zn#pYJ`X)08dxgFo)jhijM3~H_nMQTbQG+;gYVap(>~Lv#wegqSGfSv1-KCXbi9OKr z1k0+SwhOP!+ljeCKbra;^p7(oo5N^nc(SzqCkLSK&{e6+36fA_z(%gm;~d{k`=Z*| z$c6|tJWY#Vo+|cXEJybWqI^nsFy)GUdT)9FUx zdfj;9#%%1B*R*+pieY7iCu-{dyb_~^o51+MWs0h+s4KAZU)~Ds%pbv@nxl`iXz~7W zxxcMsRKPGQ#(F8|Lr*#QN*>2GTxj3vPZe?3RXomXKf%9ug~YGlm{hpTE)@Qk#PPSD z57<{Z3V{VK=lYcv<;z}vYW@qML;Sz54(_2plP{}Y!Tm?&KWw+WtMa$?{#7}7t+M#9 z${*J%OaH38>@{%JzU}MI=w6bm{&b%Jb=}X$fBL!o_+KFM8ff;WuZws{dVvMJaZ&zm4-PV4p{0+*koG|nDVaJ;Q_-IYA;JfrQ#SrR<54*PA z!%kKg&D$HU8i&toWHjJ`du`f{&|!FlEj;^$t9WfXH<6#2M2 z;HC>KEj27`0?-Rw>N>w0$~S-s;^w;dAQ0&D+LCl7+@uzmDVFnH@d(a+Q9hY zv5#wLAox4{M6F^{M4X=7h&oAFOC{hAW+h)m+VeIVE=tWP1bIFridYyqk4mtj6szx{ zRDJQw+<8PTKIdVnGA+`^>2*2=ykWido`pvoSItKlFMN9wD|}E_&DsjHtmymXayOGq zcPEW!?tI6$)}4UaZwm>O_D7@VJ93FVA^1mpx{Z|-OtM|}_H)gnt!g`JDk)Sbow z;oje}GlHr@`f@lzk#YtEuOuE#d|pdjB}LWb@Br2k=HzSbZbKB54j_d7+2KK`YC!MS2ph58XQ{N7Qj z>SmUfdD%zzZygJC(9pWIh_b#=v1Otd?}}56S+ugb#Agis0K}~C%yCw;< zvetJJ)ac4kL7kZeC_px;C(=<^Eram?`nvcIax;1wL(J{YqE1!t>0oM?`kI*6?*e+c z({&RY0VrQz=;qDEmeMyTDirJGqX!VBi_-%ZnfKP~ZdRq<5?`Y9RH^G!BX#@f`{$UD11ldix^*G!hLHsGAh0@kzOd=Krauv7_j(*p z>{MLFUDT{(O=i{l^vzaMo_h5L5zKT*#OW9y|mERO>Zqwp3(%O&?psFkM{3!Z$ z5xmuyiRD`QfSTef!=B({vdHw!R-8AYyxn)wW4#TguwOnVoL~k!RFHD^r)w{?>&qG1 zw88KSOG8un&B)}PZ9at*y-co+6A&b7O`dV;Zd5RAzyL}EiYhJht93lj(xR4(9Xnsp zG#DF>?RDV=LK1gAWP28<{Brbw0HnCM;V4pGN$su`I!?vSQX)$t#Z1$jyG^TGIg7I6 zKE}Eq!SS-wTV#BJ#B+xq8)~g|=IXoXM)GW!W(5toYDidhBrCn}YYlI_{M<}ql<=Y0 zR*ZIPI~uUvqWtZu{HcNUWH!D+d27sx-c30TA~pzz`5Gds=whsJ3sAlZ>O7PM*d!U& zT)QddQ%(?-b98{GTVS6&DbV5D%2T$Q*UD~M1nsX`*XT@^wU$=O;6xrs*xG5& zyS;kxyE2kyU{Uqev{{OxXlf(99Xr5drF_stz78B@I-66kAEb51ue#qxs+{Y0J?3os zWC6E&U|ZhsC+I3VK+z0jC_Cfy7X|bRPIQV8O`GH_hNmjuHoZGRAgE_IeT+73qkEq> z?MdI=}6;IXMC_2-H!AL+Y|oEgjm+>gjnXH%egYaGK>i01?Q<> z9}Rj1)MtZ(OBj*5<`(=2?8z@U;DO|YN7Wilsv$QVhoA2zccviX3yE1?t5DrnN*0cc zwZ0{OV02b5&ic$poHYVSxikl^tU1-zuv zaGn?Y3}b!#F;uVSs0N-n^@2zBQI&$zDBftf&iW!?ItNePOp71a?yodI_p^S_NK>1p zDIS!p_zFToYV^pO^Q%O7f1wN~^)0CsUGCwfvAZ>4GHb&lU$ucy{gMYMxfb5p3wiD~ z5fUK+)w3A$d^BTE25XRiU#X#6m>Vj=FEwR0e-d87%8LbZLhyZ3}C@I+Gxep3C9Ss^s$JC&MdW`u)qH0)Y5A zlRj&HF+cOPA#x?&&X>XyD^Vc)3Lv>`g18&-c6;R0*YN|HfKzirl^8z?zLS@VUm`_K z<@W~Dm%w6P5n-IojM{ajT#fXk>03P%@Y~NvwwGKqeG=CpVpdyc{fF62RxCt(9VMoT z5AUpqhrtza^@_D4oAcEvmMNbBl7j>RG0nvqIkHl~5#xcc^KNtXig4mAeP_GOXzl|1 z_woi6({FKBtZpz(5R1%AH+WF$0$nfw^Jl{(cjS-hP#59Z=w-?cPu^OzVJT$rrv2sA z&pV90b==*R#O7G&>Z$sxv6J_Nt0w6)MV3zTasco9TU4cM5A0 zl75f9>r0I@^csh~B)3mTN$I_og|gT229-UjH97dEpj=AwWBHc5XA|86?ThMr3mKtD z4<7R@W6HI#=0lQm3yPiwG76Z@6qj7cW-pw(vnL`=nW<|Hg6%^9$$+1tq2@^1Rtj?1 z=*aTM1JO+#QPa8eFNd5-HsoN!RtiFxfSmkAAH(~ftNTx%C&|lRtd-C=T1HyJ>cKlv z?p#t37CJD`m~*O9m+6RdPZCS7rlS-cSa<9j%z;ga(=ELfk5`ePLJ861;;@lz6CXkZ zp%jcWUvg2J>!bsA$i2ziyS}^!M<7^YR%G>;d$8Qds8#keHg8?RDp-15UK>c#fm@;} zTK>eWX6me}R+HQ7EB5dP_o+ ztL~BoAGZJuh_>#DP|&l82|1Dl>P~0r@8$6!CB^4Q)#g=<^u~czdOB|myo#-;yr-efemuo0Hy$HQ@MjiY6^U%?%RKSQ{l%kq_~cmXKDCF_`d)t&Ddw;In*4+5lZMP^ z8Vk$_K5fLtJy$3pr!cGhGkI9^1&~ZzmqIU(jhVs1A=dQZ2$lO From 3a77e0e32b66e825ede5f54728e6db2e5fa0f946 Mon Sep 17 00:00:00 2001 From: fuzhongyun <15339891972@163.com> Date: Tue, 30 Dec 2025 10:22:19 +0800 Subject: [PATCH 12/18] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8=E9=A2=9D?= =?UTF-8?q?=E5=A4=96=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/tools/bbxt/bbxt.go | 180 ++-------------------------- internal/tools/bbxt/bbxt_test.go | 7 +- internal/tools/bbxt/excel.go | 194 +++++++++++++++++++++++++++++++ tmpl/excel_temp/kshj_gt.xlsx | Bin 9473 -> 9491 bytes 4 files changed, 210 insertions(+), 171 deletions(-) create mode 100644 internal/tools/bbxt/excel.go diff --git a/internal/tools/bbxt/bbxt.go b/internal/tools/bbxt/bbxt.go index d7d00ef..6d593db 100644 --- a/internal/tools/bbxt/bbxt.go +++ b/internal/tools/bbxt/bbxt.go @@ -3,12 +3,8 @@ package bbxt import ( "ai_scheduler/internal/pkg" "fmt" - "reflect" "sort" "time" - - "github.com/gofiber/fiber/v2/log" - "github.com/xuri/excelize/v2" ) type BbxtTools struct { @@ -91,7 +87,18 @@ func (b *BbxtTools) StatisOursProductLossSumTotal(ct []string) (err error) { reseller.ProductLoss[info.OursProductId] = productLoss } } + + // 按经销商总亏损排序 + resellers := make([]*ResellerLoss, 0, len(resellerMap)) for _, v := range resellerMap { + resellers = append(resellers, v) + } + sort.Slice(resellers, func(i, j int) bool { + return resellers[i].Total < resellers[j].Total + }) + + // 构建分组 + for _, v := range resellers { if v.Total <= -100 { total = append(total, []string{ fmt.Sprintf("%s", v.ResellerName), @@ -114,168 +121,3 @@ func (b *BbxtTools) StatisOursProductLossSumTotal(ct []string) (err error) { } return err } - -// 最简单的通用函数 -func (b *BbxtTools) SimpleFillExcel(templatePath, outputPath string, dataSlice interface{}) error { - // 1. 打开模板 - f, err := excelize.OpenFile(templatePath) - if err != nil { - return err - } - defer f.Close() - - sheet := f.GetSheetName(0) - - // 1.1 获取第二行模板样式 - resellerTplRow := 2 - styleIDReseller, err := f.GetCellStyle(sheet, fmt.Sprintf("A%d", resellerTplRow)) - if err != nil { - log.Errorf("获取分销商总计样式失败: %v", err) - styleIDReseller = 0 - } - // 1.2 获取分销商总计行高 - rowHeightReseller, err := f.GetRowHeight(sheet, resellerTplRow) - if err != nil { - log.Errorf("获取分销商总计行高失败: %v", err) - rowHeightReseller = 31 // 默认高度 - } - - // 2. 反射获取切片数据 - v := reflect.ValueOf(dataSlice) - if v.Kind() != reflect.Slice { - return fmt.Errorf("dataSlice must be a slice") - } - - // 3. 从第2行开始填充 - row := 2 - for i := 0; i < v.Len(); i++ { - item := v.Index(i).Interface() - currentRow := row + i - - // 4. 将item转换为一行数据 - var rowData []interface{} - - // 如果是切片 - if reflect.TypeOf(item).Kind() == reflect.Slice { - itemV := reflect.ValueOf(item) - for j := 0; j < itemV.Len(); j++ { - rowData = append(rowData, itemV.Index(j).Interface()) - } - } else if reflect.TypeOf(item).Kind() == reflect.Struct { - itemV := reflect.ValueOf(item) - for j := 0; j < itemV.NumField(); j++ { - if itemV.Field(j).CanInterface() { - rowData = append(rowData, itemV.Field(j).Interface()) - } - } - } else { - rowData = []interface{}{item} - } - // 4.1 设置行高 - f.SetRowHeight(sheet, currentRow, rowHeightReseller) - - // 5. 填充到Excel - for col, value := range rowData { - cell := fmt.Sprintf("%c%d", 'A'+col, currentRow) - f.SetCellValue(sheet, cell, value) - } - - // 5.1 使用第二行模板样式 - if styleIDReseller != 0 { - f.SetCellStyle(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("B%d", currentRow), styleIDReseller) - } - } - - // 6. 保存 - return f.SaveAs(outputPath) -} - -// 分销商负利润详情填充excel -// 1.使用模板文件作为输出文件 -// 2.分销商总计使用第二行样式（宽高、背景、颜色等） -// 3.商品详情使用第三行样式（宽高、背景、颜色等） -// 4.保存为新文件 -func (b *BbxtTools) resellerDetailFillExcel(templatePath, outputPath string, dataSlice []*ResellerLoss) error { - // 1. 读取模板 - f, err := excelize.OpenFile(templatePath) - if err != nil { - return err - } - defer f.Close() - - sheet := f.GetSheetName(0) - - // 获取模板样式1：第二行-分销商总计 - resellerTplRow := 2 - styleIDReseller, err := f.GetCellStyle(sheet, fmt.Sprintf("A%d", resellerTplRow)) - if err != nil { - log.Errorf("获取分销商总计样式失败: %v", err) - styleIDReseller = 0 - } - rowHeightReseller, err := f.GetRowHeight(sheet, resellerTplRow) - if err != nil { - log.Errorf("获取分销商总计行高失败: %v", err) - rowHeightReseller = 31 // 默认高度 - } - // 获取模板样式2：第三行-产品亏损明细 - productTplRow := 3 - styleIDProduct, err := f.GetCellStyle(sheet, fmt.Sprintf("A%d", productTplRow)) - if err != nil { - log.Errorf("获取商品详情样式失败: %v", err) - styleIDProduct = 0 - } - rowHeightProduct, err := f.GetRowHeight(sheet, productTplRow) - if err != nil { - log.Errorf("获取商品详情行高失败: %v", err) - rowHeightProduct = 25 // 默认高度 - } - - currentRow := 2 - - for _, reseller := range dataSlice { - // 3. 填充经销商数据 (ResellerName, Total) - // 设置行高 - f.SetRowHeight(sheet, currentRow, rowHeightReseller) - - // 设置单元格值 - f.SetCellValue(sheet, fmt.Sprintf("A%d", currentRow), reseller.ResellerName) - f.SetCellValue(sheet, fmt.Sprintf("B%d", currentRow), reseller.Total) - - // 应用样式 - if styleIDReseller != 0 { - f.SetCellStyle(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("B%d", currentRow), styleIDReseller) - } - - currentRow++ - - // 4. 填充产品亏损明细 - // 先对 ProductLoss 进行排序 - var products []ProductLoss - for _, p := range reseller.ProductLoss { - products = append(products, p) - } - // 按 Loss 升序排序 (亏损越多越靠前，负数越小) - sort.Slice(products, func(i, j int) bool { - return products[i].Loss < products[j].Loss - }) - - for _, p := range products { - // 设置行高 - f.SetRowHeight(sheet, currentRow, rowHeightProduct) - - // 设置单元格值 - f.SetCellValue(sheet, fmt.Sprintf("A%d", currentRow), p.ProductName) - f.SetCellValue(sheet, fmt.Sprintf("B%d", currentRow), p.Loss) - - // 应用样式 - if styleIDProduct != 0 { - f.SetCellStyle(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("B%d", currentRow), styleIDProduct) - } - - currentRow++ - } - } - - // 6. 保存 - return f.SaveAs(outputPath) -} diff --git a/internal/tools/bbxt/bbxt_test.go b/internal/tools/bbxt/bbxt_test.go index 628c675..b6b2275 100644 --- a/internal/tools/bbxt/bbxt_test.go +++ b/internal/tools/bbxt/bbxt_test.go @@ -1,13 +1,16 @@ package bbxt -import "testing" +import ( + "testing" + "time" +) func Test_StatisOursProductLossSumApiTotal(t *testing.T) { o, err := NewBbxtTools() if err != nil { panic(err) } - err = o.StatisOursProductLossSumTotal([]string{"2025-12-28+00:00:00", "2025-12-28+23:59:59.999"}) + err = o.DailyReport(time.Date(2025, 12, 30, 0, 0, 0, 0, time.Local)) t.Log(err) diff --git a/internal/tools/bbxt/excel.go b/internal/tools/bbxt/excel.go new file mode 100644 index 0000000..3711aa0 --- /dev/null +++ b/internal/tools/bbxt/excel.go @@ -0,0 +1,194 @@ +package bbxt + +import ( + "fmt" + "reflect" + "sort" + + "github.com/go-kratos/kratos/v2/log" + "github.com/xuri/excelize/v2" +) + +// 最简单的通用函数 +func (b *BbxtTools) SimpleFillExcel(templatePath, outputPath string, dataSlice interface{}) error { + // 1. 打开模板 + f, err := excelize.OpenFile(templatePath) + if err != nil { + return err + } + defer f.Close() + + sheet := f.GetSheetName(0) + + // 1.1 获取第二行模板样式 + resellerTplRow := 2 + styleIDReseller, err := f.GetCellStyle(sheet, fmt.Sprintf("A%d", resellerTplRow)) + if err != nil { + log.Errorf("获取分销商总计样式失败: %v", err) + styleIDReseller = 0 + } + // 1.2 获取分销商总计行高 + rowHeightReseller, err := f.GetRowHeight(sheet, resellerTplRow) + if err != nil { + log.Errorf("获取分销商总计行高失败: %v", err) + rowHeightReseller = 31 // 默认高度 + } + + // 2. 反射获取切片数据 + v := reflect.ValueOf(dataSlice) + if v.Kind() != reflect.Slice { + return fmt.Errorf("dataSlice must be a slice") + } + + // 3. 从第2行开始填充 + row := 2 + for i := 0; i < v.Len(); i++ { + item := v.Index(i).Interface() + currentRow := row + i + + // 4. 将item转换为一行数据 + var rowData []interface{} + + // 如果是切片 + if reflect.TypeOf(item).Kind() == reflect.Slice { + itemV := reflect.ValueOf(item) + for j := 0; j < itemV.Len(); j++ { + rowData = append(rowData, itemV.Index(j).Interface()) + } + } else if reflect.TypeOf(item).Kind() == reflect.Struct { + itemV := reflect.ValueOf(item) + for j := 0; j < itemV.NumField(); j++ { + if itemV.Field(j).CanInterface() { + rowData = append(rowData, itemV.Field(j).Interface()) + } + } + } else { + rowData = []interface{}{item} + } + // 4.1 设置行高 + f.SetRowHeight(sheet, currentRow, rowHeightReseller) + + // 5. 填充到Excel + for col, value := range rowData { + cell := fmt.Sprintf("%c%d", 'A'+col, currentRow) + f.SetCellValue(sheet, cell, value) + } + + // 5.1 使用第二行模板样式 + if styleIDReseller != 0 { + f.SetCellStyle(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("B%d", currentRow), styleIDReseller) + } + } + + // 6. 保存 + return f.SaveAs(outputPath) +} + +// 分销商负利润详情填充excel +// 1.使用模板文件作为输出文件 +// 2.分销商总计使用第二行样式（宽高、背景、颜色等） +// 3.商品详情使用第三行样式（宽高、背景、颜色等） +// 4.保存为新文件 +func (b *BbxtTools) resellerDetailFillExcel(templatePath, outputPath string, dataSlice []*ResellerLoss) error { + // 1. 读取模板 + f, err := excelize.OpenFile(templatePath) + if err != nil { + return err + } + defer f.Close() + + sheet := f.GetSheetName(0) + + // 获取模板样式1：第二行-分销商总计 + resellerTplRow := 2 + styleIDReseller, err := f.GetCellStyle(sheet, fmt.Sprintf("A%d", resellerTplRow)) + if err != nil { + log.Errorf("获取分销商总计样式失败: %v", err) + styleIDReseller = 0 + } + rowHeightReseller, err := f.GetRowHeight(sheet, resellerTplRow) + if err != nil { + log.Errorf("获取分销商总计行高失败: %v", err) + rowHeightReseller = 31 // 默认高度 + } + // 获取模板样式2：第三行-产品亏损明细 + productTplRow := 3 + styleIDProduct, err := f.GetCellStyle(sheet, fmt.Sprintf("A%d", productTplRow)) + if err != nil { + log.Errorf("获取商品详情样式失败: %v", err) + styleIDProduct = 0 + } + rowHeightProduct, err := f.GetRowHeight(sheet, productTplRow) + if err != nil { + log.Errorf("获取商品详情行高失败: %v", err) + rowHeightProduct = 25 // 默认高度 + } + + currentRow := 2 + + for _, reseller := range dataSlice { + // 3. 填充经销商数据 (ResellerName, Total) + // 设置行高 + f.SetRowHeight(sheet, currentRow, rowHeightReseller) + + // 设置单元格值 + f.SetCellValue(sheet, fmt.Sprintf("A%d", currentRow), reseller.ResellerName) + f.SetCellValue(sheet, fmt.Sprintf("B%d", currentRow), reseller.Total) + + // 应用样式 + if styleIDReseller != 0 { + f.SetCellStyle(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("B%d", currentRow), styleIDReseller) + } + + currentRow++ + + // 4. 填充产品亏损明细 + // 先对 ProductLoss 进行排序 + var products []ProductLoss + for _, p := range reseller.ProductLoss { + products = append(products, p) + } + // 按 Loss 升序排序 (亏损越多越靠前，负数越小) + sort.Slice(products, func(i, j int) bool { + return products[i].Loss < products[j].Loss + }) + + for _, p := range products { + // 设置行高 + f.SetRowHeight(sheet, currentRow, rowHeightProduct) + + // 设置单元格值 + f.SetCellValue(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("·%s", p.ProductName)) + f.SetCellValue(sheet, fmt.Sprintf("B%d", currentRow), p.Loss) + + // 应用样式 + if styleIDProduct != 0 { + f.SetCellStyle(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("B%d", currentRow), styleIDProduct) + } + + currentRow++ + } + } + + // buffer, err := f.WriteToBuffer() + // if err != nil { + // return err + // } + + // return buffer.Bytes(), nil + + // 6. 保存 + return f.SaveAs(outputPath) +} + +// excel2picPy 将excel转换为图片python +// python 接口如下： +// curl --location --request POST 'http://192.168.6.109:8010/api/v1/convert' \ +// --header 'Content-Type: multipart/form-data; boundary=--------------------------952147881043913664015069' \ +// --form 'file=@"C:\\Users\\Administrator\\Downloads\\销售同比分析2025-12-29 0-12点.xlsx"' \ +// --form 'sheet_name="销售同比分析"' +func (b *BbxtTools) excel2picPy(templatePath string, excelBytes []byte) ([]byte, error) { + + return nil, nil + // return picBytes, nil +} diff --git a/tmpl/excel_temp/kshj_gt.xlsx b/tmpl/excel_temp/kshj_gt.xlsx index c826635797dcc5b89a8eb2b89a85592c445b16c9..6933f633648e61451b2be2ea5d6371174a19dcf2 100755 GIT binary patch delta 4202 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 MK={HA&p*t60ON@J%>V!Z delta 4159 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 Date: Tue, 30 Dec 2025 10:52:30 +0800 Subject: [PATCH 13/18] =?UTF-8?q?feat:=20=20=E5=A2=9E=E5=8A=A0=E8=B4=9F?= =?UTF-8?q?=E5=88=A9=E6=B6=A6=E5=AF=BC=E5=87=BAV2=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/tools/bbxt/bbxt.go | 3 +- internal/tools/bbxt/excel.go | 131 ++++++++++++++++++++++++++++++++ tmpl/excel_temp/kshj_gt.xlsx | Bin 9491 -> 9905 bytes tmpl/excel_temp/kshj_gt.xlsx.v1 | Bin 0 -> 9491 bytes 4 files changed, 133 insertions(+), 1 deletion(-) create mode 100755 tmpl/excel_temp/kshj_gt.xlsx.v1 diff --git a/internal/tools/bbxt/bbxt.go b/internal/tools/bbxt/bbxt.go index f7d1e68..77a5f29 100644 --- a/internal/tools/bbxt/bbxt.go +++ b/internal/tools/bbxt/bbxt.go @@ -117,7 +117,8 @@ func (b *BbxtTools) StatisOursProductLossSumTotal(ct []string) (err error) { if len(gt) > 0 { filePath := b.cacheDir + "/kshj_gt" + fmt.Sprintf("%d", time.Now().Unix()) + ".xlsx" - err = b.resellerDetailFillExcel(b.excelTempDir+"/"+"kshj_gt.xlsx", filePath, gt) + // err = b.resellerDetailFillExcel(b.excelTempDir+"/"+"kshj_gt.xlsx", filePath, gt) + err = b.resellerDetailFillExcelV2(b.excelTempDir+"/"+"kshj_gt.xlsx", filePath, gt) } return err } diff --git a/internal/tools/bbxt/excel.go b/internal/tools/bbxt/excel.go index 3711aa0..807680b 100644 --- a/internal/tools/bbxt/excel.go +++ b/internal/tools/bbxt/excel.go @@ -181,6 +181,137 @@ func (b *BbxtTools) resellerDetailFillExcel(templatePath, outputPath string, dat return f.SaveAs(outputPath) } +// 分销商负利润详情填充excel-V2 +// 1.使用模板文件作为输出文件，从第二行开始填充 +// 2.整体为3列：1.分销商名称（以ResellerName为分组，分销商名称列使用的样式为） 2.商品名称（p.ProductName） 3.亏损金额（p.Loss） +// 3.分销商名称列使用的样式为 A2；商品名称、亏损金额使用的样式为 B2、C2；样式包括宽高、背景、颜色等 +// 4.以ResellerName分组，合并单元格 +// 5.在文件末尾使用“合计”，合计行样式为模板第四行 +// 6.保存为新文件 +func (b *BbxtTools) resellerDetailFillExcelV2(templatePath, outputPath string, dataSlice []*ResellerLoss) error { + // 1. 读取模板 + f, err := excelize.OpenFile(templatePath) + if err != nil { + return err + } + defer f.Close() + + sheet := f.GetSheetName(0) + + // ---------------- 样式获取 ---------------- + // 模板第2行：数据行样式 + tplRowData := 2 + styleA2, err := f.GetCellStyle(sheet, fmt.Sprintf("A%d", tplRowData)) + if err != nil { + styleA2 = 0 + } + // B2和C2通常样式一致，这里取B2作为明细列样式 + styleB2, err := f.GetCellStyle(sheet, fmt.Sprintf("B%d", tplRowData)) + if err != nil { + styleB2 = 0 + } + styleC2, err := f.GetCellStyle(sheet, fmt.Sprintf("C%d", tplRowData)) + if err != nil { + styleC2 = 0 + } + + rowHeightData, err := f.GetRowHeight(sheet, tplRowData) + if err != nil { + rowHeightData = 20 + } + + // 模板第4行：合计行样式 + tplRowTotal := 4 + styleTotalA, err := f.GetCellStyle(sheet, fmt.Sprintf("A%d", tplRowTotal)) + if err != nil { + styleTotalA = 0 + } + styleTotalB, err := f.GetCellStyle(sheet, fmt.Sprintf("B%d", tplRowTotal)) + if err != nil { + styleTotalB = 0 + } + styleTotalC, err := f.GetCellStyle(sheet, fmt.Sprintf("C%d", tplRowTotal)) + if err != nil { + styleTotalC = 0 + } + rowHeightTotal, err := f.GetRowHeight(sheet, tplRowTotal) + if err != nil { + rowHeightTotal = 30 + } + // ---------------------------------------- + + currentRow := 2 + totalLoss := 0.0 + + for _, reseller := range dataSlice { + // 排序 ProductLoss + var products []ProductLoss + for _, p := range reseller.ProductLoss { + products = append(products, p) + } + sort.Slice(products, func(i, j int) bool { + return products[i].Loss < products[j].Loss + }) + + startRow := currentRow + + // 填充该经销商的所有产品 + for _, p := range products { + // 设置行高 + f.SetRowHeight(sheet, currentRow, rowHeightData) + + // 设置值 + f.SetCellValue(sheet, fmt.Sprintf("A%d", currentRow), reseller.ResellerName) + f.SetCellValue(sheet, fmt.Sprintf("B%d", currentRow), p.ProductName) + f.SetCellValue(sheet, fmt.Sprintf("C%d", currentRow), p.Loss) + + // 设置样式 + if styleA2 != 0 { + f.SetCellStyle(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("A%d", currentRow), styleA2) + } + if styleB2 != 0 { + f.SetCellStyle(sheet, fmt.Sprintf("B%d", currentRow), fmt.Sprintf("B%d", currentRow), styleB2) + } + if styleC2 != 0 { + f.SetCellStyle(sheet, fmt.Sprintf("C%d", currentRow), fmt.Sprintf("C%d", currentRow), styleC2) + } + + totalLoss += p.Loss + currentRow++ + } + + endRow := currentRow - 1 + // 合并单元格 (如果多于1行) + if endRow > startRow { + f.MergeCell(sheet, fmt.Sprintf("A%d", startRow), fmt.Sprintf("A%d", endRow)) + } + } + + // ---------------- 填充合计行 ---------------- + // 设置行高 + f.SetRowHeight(sheet, currentRow, rowHeightTotal) + + f.SetCellValue(sheet, fmt.Sprintf("A%d", currentRow), "合计") + // B列留空，C列填充总亏损 + f.SetCellValue(sheet, fmt.Sprintf("C%d", currentRow), totalLoss) + + // 设置合计行样式 + if styleTotalA != 0 { + f.SetCellStyle(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("A%d", currentRow), styleTotalA) + } + if styleTotalB != 0 { + f.SetCellStyle(sheet, fmt.Sprintf("B%d", currentRow), fmt.Sprintf("B%d", currentRow), styleTotalB) + } + if styleTotalC != 0 { + f.SetCellStyle(sheet, fmt.Sprintf("C%d", currentRow), fmt.Sprintf("C%d", currentRow), styleTotalC) + } + // 取消合并合计行的A、B列 + // f.MergeCell(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("B%d", currentRow)) + + // 6. 保存 + return f.SaveAs(outputPath) +} + // excel2picPy 将excel转换为图片python // python 接口如下： // curl --location --request POST 'http://192.168.6.109:8010/api/v1/convert' \ diff --git a/tmpl/excel_temp/kshj_gt.xlsx b/tmpl/excel_temp/kshj_gt.xlsx index 6933f633648e61451b2be2ea5d6371174a19dcf2..e270a67aaa52be82e3c03c824e02b53b180b36d8 100755 GIT binary patch delta 7919 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

;^J9-Az?fkgaVmvkfJ?!dvnoj-%K!EOSwq+S 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 F{U5~S37G%@ diff --git a/tmpl/excel_temp/kshj_gt.xlsx.v1 b/tmpl/excel_temp/kshj_gt.xlsx.v1 new file mode 100755 index 0000000000000000000000000000000000000000..6933f633648e61451b2be2ea5d6371174a19dcf2 GIT binary patch literal 9491 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 fKWDA=KX`uy0mw?g{@ASOkf<7X2;Dj11K Date: Tue, 30 Dec 2025 12:00:22 +0800 Subject: [PATCH 14/18] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0excel2picPy?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=9B=BE=E7=89=87=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/tools/bbxt/excel.go | 94 +++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 2 deletions(-) diff --git a/internal/tools/bbxt/excel.go b/internal/tools/bbxt/excel.go index 807680b..4ba932d 100644 --- a/internal/tools/bbxt/excel.go +++ b/internal/tools/bbxt/excel.go @@ -1,7 +1,13 @@ package bbxt import ( + "bytes" "fmt" + "io" + "mime/multipart" + "net/http" + "os" + "path/filepath" "reflect" "sort" @@ -308,6 +314,17 @@ func (b *BbxtTools) resellerDetailFillExcelV2(templatePath, outputPath string, d // 取消合并合计行的A、B列 // f.MergeCell(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("B%d", currentRow)) + excelBytes, err := f.WriteToBuffer() + if err != nil { + return fmt.Errorf("write to bytes failed: %v", err) + } + + picBytes, err := b.excel2picPy(templatePath, excelBytes.Bytes()) + if err != nil { + return fmt.Errorf("excel2picPy failed: %v", err) + } + b.SavePic("temp.png", picBytes) + // 6. 保存 return f.SaveAs(outputPath) } @@ -319,7 +336,80 @@ func (b *BbxtTools) resellerDetailFillExcelV2(templatePath, outputPath string, d // --form 'file=@"C:\\Users\\Administrator\\Downloads\\销售同比分析2025-12-29 0-12点.xlsx"' \ // --form 'sheet_name="销售同比分析"' func (b *BbxtTools) excel2picPy(templatePath string, excelBytes []byte) ([]byte, error) { + // 1. 获取 Sheet Name + // 尝试从 excelBytes 解析，如果失败则使用默认值 "Sheet1" + sheetName := "Sheet1" + f, err := excelize.OpenReader(bytes.NewReader(excelBytes)) + if err == nil { + sheetName = f.GetSheetName(0) + if sheetName == "" { + sheetName = "Sheet1" + } + f.Close() + } - return nil, nil - // return picBytes, nil + // 2. 构造 Multipart 请求 + body := &bytes.Buffer{} + writer := multipart.NewWriter(body) + + // 添加文件字段 + // 使用 templatePath 的文件名作为上传文件名，如果没有则用 default.xlsx + filename := "default.xlsx" + if templatePath != "" { + filename = filepath.Base(templatePath) + } + + part, err := writer.CreateFormFile("file", filename) + if err != nil { + return nil, fmt.Errorf("create form file failed: %v", err) + } + if _, err = part.Write(excelBytes); err != nil { + return nil, fmt.Errorf("write file part failed: %v", err) + } + + // 添加 sheet_name 字段 + if err = writer.WriteField("sheet_name", sheetName); err != nil { + return nil, fmt.Errorf("write field sheet_name failed: %v", err) + } + + if err = writer.Close(); err != nil { + return nil, fmt.Errorf("close writer failed: %v", err) + } + + // 3. 发送 HTTP POST 请求 + url := "http://192.168.6.109:8010/api/v1/convert" + req, err := http.NewRequest("POST", url, body) + if err != nil { + return nil, fmt.Errorf("create request failed: %v", err) + } + req.Header.Set("Content-Type", writer.FormDataContentType()) + + client := &http.Client{} + resp, err := client.Do(req) + if err != nil { + return nil, fmt.Errorf("send request failed: %v", err) + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + respBody, _ := io.ReadAll(resp.Body) + return nil, fmt.Errorf("api request failed with status: %d, body: %s", resp.StatusCode, string(respBody)) + } + + // 4. 读取响应 Body (图片内容) + picBytes, err := io.ReadAll(resp.Body) + if err != nil { + return nil, fmt.Errorf("read response body failed: %v", err) + } + + return picBytes, nil +} + +// SavePic 保存图片到本地 +func (b *BbxtTools) SavePic(outputPath string, picBytes []byte) error { + dir := filepath.Dir(outputPath) + if err := os.MkdirAll(dir, 0755); err != nil { + return fmt.Errorf("create directory failed: %v", err) + } + return os.WriteFile(outputPath, picBytes, 0644) } From 1db689bcd1c81a422c2c042d0a09ee8dab198d43 Mon Sep 17 00:00:00 2001 From: wuchao <1272174216@qq.com> Date: Tue, 30 Dec 2025 14:44:36 +0800 Subject: [PATCH 15/18] =?UTF-8?q?fix(zltx):=20=E4=BF=AE=E6=94=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=BB=9F=E8=AE=A1=E5=B7=A5=E5=85=B7=E4=B8=ADnumber?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=B8=BAinterface{}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- internal/tools/zltx/zltx_statistics.go | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ea6e235..4dd0345 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ docs cmd/server/wire_gen.go __debug* -.bin/ \ No newline at end of file +.bin/ +.idea/ diff --git a/internal/tools/zltx/zltx_statistics.go b/internal/tools/zltx/zltx_statistics.go index 5d71a9b..29e143a 100644 --- a/internal/tools/zltx/zltx_statistics.go +++ b/internal/tools/zltx/zltx_statistics.go @@ -45,7 +45,7 @@ func (z ZltxOrderStatisticsTool) Definition() entitys.ToolDefinition { } type ZltxOrderStatisticsRequest struct { - Number string `json:"number"` + Number interface{} `json:"number"` } func (z ZltxOrderStatisticsTool) Execute(ctx context.Context, rec *entitys.Recognize) error { @@ -53,7 +53,7 @@ func (z ZltxOrderStatisticsTool) Execute(ctx context.Context, rec *entitys.Recog if err := json.Unmarshal([]byte(rec.Match.Parameters), &req); err != nil { return err } - if req.Number == "" { + if req.Number == nil { return fmt.Errorf("number is required") } return z.getZltxOrderStatistics(req.Number, rec) @@ -76,14 +76,13 @@ type ZltxOrderStatisticsData struct { Total int `json:"total"` } -func (z ZltxOrderStatisticsTool) getZltxOrderStatistics(number string, rec *entitys.Recognize) error { +func (z ZltxOrderStatisticsTool) getZltxOrderStatistics(number interface{}, rec *entitys.Recognize) error { ext, err := rec_extra.GetTaskRecExt(rec) if err != nil { return err } //查询订单详情 - - url := fmt.Sprintf("%s%s", z.config.BaseURL, number) + url := fmt.Sprintf("%s%s", z.config.BaseURL, fmt.Sprintf("%v", number)) req := l_request.Request{ Url: url, Headers: map[string]string{ From 87b9599ef89c34450eaabfdc830cc8a99573ca2c Mon Sep 17 00:00:00 2001 From: fuzhongyun <15339891972@163.com> Date: Tue, 30 Dec 2025 16:17:35 +0800 Subject: [PATCH 16/18] =?UTF-8?q?feat:=201.=E5=A2=9E=E5=8A=A0oss=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=B9=E6=B3=95=202.=E6=8A=A5=E8=A1=A8=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=88=AA=E5=9B=BE=E4=B8=8A=E4=BC=A0oss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config_env.yaml | 6 ++++ config/config_test.yaml | 6 ++++ go.mod | 3 ++ go.sum | 6 ++++ internal/config/config.go | 13 ++++++- internal/pkg/oss/client.go | 57 +++++++++++++++++++++++++++++++ internal/pkg/provider_set.go | 3 ++ internal/tools/bbxt/bbxt.go | 10 ++++-- internal/tools/bbxt/bbxt_test.go | 15 +++++++- internal/tools/bbxt/excel.go | 49 ++++++++++++++++++++------ tmpl/excel_temp/kshj_gt.xlsx | Bin 9905 -> 9938 bytes 11 files changed, 153 insertions(+), 15 deletions(-) create mode 100644 internal/pkg/oss/client.go diff --git a/config/config_env.yaml b/config/config_env.yaml index 21c1faa..28030b6 100644 --- a/config/config_env.yaml +++ b/config/config_env.yaml @@ -43,6 +43,12 @@ redis: db: driver: mysql source: root:SD###sdf323r343@tcp(121.199.38.107:3306)/sys_ai_test?charset=utf8mb4&parseTime=true&loc=Asia%2FShanghai +oss: + access_key: "LTAI5tGGZzjf3tvqWk8SQj2G" + secret_key: "S0NKOAUaYWoK4EGSxrMFmYDzllhvpq" + bucket: "attachment-public" + domain: "https://attachment-public.oss-cn-hangzhou.aliyuncs.com" + endpoint: "https://oss-cn-hangzhou.aliyuncs.com" tools: zltxOrderDetail: diff --git a/config/config_test.yaml b/config/config_test.yaml index 7ad9e71..63b4b66 100644 --- a/config/config_test.yaml +++ b/config/config_test.yaml @@ -43,6 +43,12 @@ redis: db: driver: mysql source: root:SD###sdf323r343@tcp(121.199.38.107:3306)/sys_ai_test?charset=utf8mb4&parseTime=true&loc=Asia%2FShanghai +oss: + access_key: "LTAI5tGGZzjf3tvqWk8SQj2G" + secret_key: "S0NKOAUaYWoK4EGSxrMFmYDzllhvpq" + bucket: "attachment-public" + domain: "https://attachment-public.oss-cn-hangzhou.aliyuncs.com" + endpoint: "https://oss-cn-hangzhou.aliyuncs.com" tools: zltxOrderDetail: diff --git a/go.mod b/go.mod index fa8498d..374a7f3 100644 --- a/go.mod +++ b/go.mod @@ -46,6 +46,7 @@ require ( github.com/alibabacloud-go/gateway-dingtalk v1.0.2 // indirect github.com/alibabacloud-go/openapi-util v0.1.1 // indirect github.com/alibabacloud-go/tea-xml v1.1.3 // indirect + github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible // indirect github.com/aliyun/credentials-go v1.4.6 // indirect github.com/andybalholm/brotli v1.1.0 // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect @@ -95,6 +96,7 @@ require ( github.com/sagikazarmark/locafero v0.3.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect + github.com/shopspring/decimal v1.4.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/slongfield/pyfmt v0.0.0-20220222012616-ea85ff4c361f // indirect github.com/sourcegraph/conc v0.3.0 // indirect @@ -120,6 +122,7 @@ require ( golang.org/x/net v0.46.0 // indirect golang.org/x/sys v0.37.0 // indirect golang.org/x/text v0.30.0 // indirect + golang.org/x/time v0.5.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect google.golang.org/protobuf v1.34.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index b0d2c51..f101537 100644 --- a/go.sum +++ b/go.sum @@ -94,6 +94,8 @@ github.com/alibabacloud-go/tea-utils/v2 v2.0.6 h1:ZkmUlhlQbaDC+Eba/GARMPy6hKdCLi github.com/alibabacloud-go/tea-utils/v2 v2.0.6/go.mod h1:qxn986l+q33J5VkialKMqT/TTs3E+U9MJpd001iWQ9I= github.com/alibabacloud-go/tea-xml v1.1.3 h1:7LYnm+JbOq2B+T/B0fHC4Ies4/FofC4zHzYtqw7dgt0= github.com/alibabacloud-go/tea-xml v1.1.3/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8= +github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible h1:8psS8a+wKfiLt1iVDX79F7Y6wUM49Lcha2FMXt4UM8g= +github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= github.com/aliyun/credentials-go v1.1.2/go.mod h1:ozcZaMR5kLM7pwtCMEpVmQ242suV6qTJya2bDq4X1Tw= github.com/aliyun/credentials-go v1.3.1/go.mod h1:8jKYhQuDawt8x2+fusqa1Y6mPxemTsBEN04dgcAcYz0= github.com/aliyun/credentials-go v1.3.6/go.mod h1:1LxUuX7L5YrZUWzBrRyk0SwSdH4OmPrib8NVePL3fxM= @@ -392,6 +394,8 @@ github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWR github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee h1:8Iv5m6xEo1NR1AvpV+7XmhI4r39LGNzwUL4YpMuL5vk= github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee/go.mod h1:qwtSXrKuJh/zsFQ12yEE89xfCrGKK63Rr7ctU/uCo4g= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= +github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= +github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= @@ -690,6 +694,8 @@ golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= diff --git a/internal/config/config.go b/internal/config/config.go index 35f2115..8c3a6d2 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -3,8 +3,9 @@ package config import ( "ai_scheduler/pkg" "fmt" - "github.com/spf13/viper" "time" + + "github.com/spf13/viper" ) // Config 应用配置 @@ -19,6 +20,7 @@ type Config struct { Logging LoggingConfig `mapstructure:"logging"` Redis Redis `mapstructure:"redis"` DB DB `mapstructure:"db"` + Oss Oss `mapstructure:"oss"` DefaultPrompt SysPrompt `mapstructure:"default_prompt"` PermissionConfig PermissionConfig `mapstructure:"permissionConfig"` LLM LLM `mapstructure:"llm"` @@ -136,6 +138,15 @@ type DB struct { IsDebug bool `mapstructure:"isDebug"` } +// Oss 阿里云OSS配置 +type Oss struct { + AccessKey string `mapstructure:"access_key"` + SecretKey string `mapstructure:"secret_key"` + Bucket string `mapstructure:"bucket"` + Domain string `mapstructure:"domain"` + Endpoint string `mapstructure:"endpoint"` +} + // ToolsConfig 工具配置 type ToolsConfig struct { Weather ToolConfig `mapstructure:"weather"` diff --git a/internal/pkg/oss/client.go b/internal/pkg/oss/client.go new file mode 100644 index 0000000..225e8d9 --- /dev/null +++ b/internal/pkg/oss/client.go @@ -0,0 +1,57 @@ +package oss + +import ( + "ai_scheduler/internal/config" + "bytes" + "fmt" + + "github.com/aliyun/aliyun-oss-go-sdk/oss" + "github.com/go-kratos/kratos/v2/log" +) + +type Client struct { + config config.Oss + client *oss.Client + bucket *oss.Bucket +} + +// NewClient 初始化 OSS 客户端 +func NewClient(cfg config.Oss) (*Client, error) { + client, err := oss.New(cfg.Endpoint, cfg.AccessKey, cfg.SecretKey) + if err != nil { + return nil, fmt.Errorf("oss new client failed: %v", err) + } + + bucket, err := client.Bucket(cfg.Bucket) + if err != nil { + return nil, fmt.Errorf("oss get bucket failed: %v", err) + } + + return &Client{ + config: cfg, + client: client, + bucket: bucket, + }, nil +} + +// UploadBytes 上传字节数组到 OSS +// objectKey: OSS 中的文件路径，例如 "ai_scheduler/test.png" +// fileBytes: 文件内容 +// 返回: 文件的访问 URL +func (c *Client) UploadBytes(objectKey string, fileBytes []byte) (string, error) { + err := c.bucket.PutObject(objectKey, bytes.NewReader(fileBytes)) + if err != nil { + log.Errorf("oss PutObject failed: %v", err) + return "", err + } + + // 构造返回 URL + var url string + if c.config.Domain != "" { + url = fmt.Sprintf("%s/%s", c.config.Domain, objectKey) + } else { + // 这里简单处理协议头 + url = fmt.Sprintf("https://%s.%s/%s", c.config.Bucket, c.config.Endpoint, objectKey) + } + return url, nil +} diff --git a/internal/pkg/provider_set.go b/internal/pkg/provider_set.go index 603dedc..1e8bdb4 100644 --- a/internal/pkg/provider_set.go +++ b/internal/pkg/provider_set.go @@ -2,6 +2,7 @@ package pkg import ( "ai_scheduler/internal/pkg/dingtalk" + "ai_scheduler/internal/pkg/oss" "ai_scheduler/internal/pkg/utils_langchain" "ai_scheduler/internal/pkg/utils_ollama" "ai_scheduler/internal/pkg/utils_vllm" @@ -19,4 +20,6 @@ var ProviderSetClient = wire.NewSet( dingtalk.NewOldClient, dingtalk.NewContactClient, dingtalk.NewNotableClient, + + oss.NewClient, ) diff --git a/internal/tools/bbxt/bbxt.go b/internal/tools/bbxt/bbxt.go index 77a5f29..9934944 100644 --- a/internal/tools/bbxt/bbxt.go +++ b/internal/tools/bbxt/bbxt.go @@ -1,8 +1,10 @@ package bbxt import ( + "ai_scheduler/internal/pkg/oss" "ai_scheduler/pkg" "fmt" + "math/rand" "sort" "time" ) @@ -10,9 +12,10 @@ import ( type BbxtTools struct { cacheDir string excelTempDir string + ossClient *oss.Client } -func NewBbxtTools() (*BbxtTools, error) { +func NewBbxtTools(ossClient *oss.Client) (*BbxtTools, error) { cache, err := pkg.GetCacheDir() if err != nil { return nil, err @@ -25,6 +28,7 @@ func NewBbxtTools() (*BbxtTools, error) { return &BbxtTools{ cacheDir: cache, excelTempDir: fmt.Sprintf("%s/excel_temp", tempDir), + ossClient: ossClient, }, nil } @@ -111,12 +115,12 @@ func (b *BbxtTools) StatisOursProductLossSumTotal(ct []string) (err error) { } //总量生成excel if len(total) > 0 { - filePath := b.cacheDir + "/kshj_total" + fmt.Sprintf("%d", time.Now().Unix()) + ".xlsx" + filePath := b.cacheDir + "/kshj_total" + fmt.Sprintf("%d%d", time.Now().Unix(), rand.Intn(1000)) + ".xlsx" err = b.SimpleFillExcel(b.excelTempDir+"/"+"kshj_total.xlsx", filePath, total) } if len(gt) > 0 { - filePath := b.cacheDir + "/kshj_gt" + fmt.Sprintf("%d", time.Now().Unix()) + ".xlsx" + filePath := b.cacheDir + "/kshj_gt" + fmt.Sprintf("%d%d", time.Now().Unix(), rand.Intn(1000)) + ".xlsx" // err = b.resellerDetailFillExcel(b.excelTempDir+"/"+"kshj_gt.xlsx", filePath, gt) err = b.resellerDetailFillExcelV2(b.excelTempDir+"/"+"kshj_gt.xlsx", filePath, gt) } diff --git a/internal/tools/bbxt/bbxt_test.go b/internal/tools/bbxt/bbxt_test.go index b6b2275..ad52bb0 100644 --- a/internal/tools/bbxt/bbxt_test.go +++ b/internal/tools/bbxt/bbxt_test.go @@ -1,12 +1,25 @@ package bbxt import ( + "ai_scheduler/internal/config" + "ai_scheduler/internal/pkg/oss" "testing" "time" ) func Test_StatisOursProductLossSumApiTotal(t *testing.T) { - o, err := NewBbxtTools() + ossClient, err := oss.NewClient(config.Oss{ + AccessKey: "LTAI5tGGZzjf3tvqWk8SQj2G", + SecretKey: "S0NKOAUaYWoK4EGSxrMFmYDzllhvpq", + Bucket: "attachment-public", + Domain: "https://attachment-public.oss-cn-hangzhou.aliyuncs.com", + Endpoint: "https://oss-cn-hangzhou.aliyuncs.com", + }) + if err != nil { + panic(err) + } + + o, err := NewBbxtTools(ossClient) if err != nil { panic(err) } diff --git a/internal/tools/bbxt/excel.go b/internal/tools/bbxt/excel.go index 4ba932d..f5b52bf 100644 --- a/internal/tools/bbxt/excel.go +++ b/internal/tools/bbxt/excel.go @@ -10,8 +10,10 @@ import ( "path/filepath" "reflect" "sort" + "strings" "github.com/go-kratos/kratos/v2/log" + "github.com/shopspring/decimal" "github.com/xuri/excelize/v2" ) @@ -86,6 +88,22 @@ func (b *BbxtTools) SimpleFillExcel(templatePath, outputPath string, dataSlice i } } + excelBytes, err := f.WriteToBuffer() + if err != nil { + return fmt.Errorf("write to bytes failed: %v", err) + } + + picBytes, err := b.excel2picPy(templatePath, excelBytes.Bytes()) + if err != nil { + return fmt.Errorf("excel2picPy failed: %v", err) + } + // b.savePic("temp.png", picBytes) // 本地生成图片，仅测试 + // outputPath 提取文件名（不包含扩展名） + filename := filepath.Base(outputPath) + filename = strings.TrimSuffix(filename, filepath.Ext(filename)) + imgUrl := b.uploadToOSS(filename, picBytes) + log.Infof("imgUrl: %s", imgUrl) + // 6. 保存 return f.SaveAs(outputPath) } @@ -176,13 +194,6 @@ func (b *BbxtTools) resellerDetailFillExcel(templatePath, outputPath string, dat } } - // buffer, err := f.WriteToBuffer() - // if err != nil { - // return err - // } - - // return buffer.Bytes(), nil - // 6. 保存 return f.SaveAs(outputPath) } @@ -294,6 +305,8 @@ func (b *BbxtTools) resellerDetailFillExcelV2(templatePath, outputPath string, d } // ---------------- 填充合计行 ---------------- + // 四舍五入保留四位小数 + totalLoss, _ = decimal.NewFromFloat(totalLoss).Round(4).Float64() // 设置行高 f.SetRowHeight(sheet, currentRow, rowHeightTotal) @@ -323,7 +336,12 @@ func (b *BbxtTools) resellerDetailFillExcelV2(templatePath, outputPath string, d if err != nil { return fmt.Errorf("excel2picPy failed: %v", err) } - b.SavePic("temp.png", picBytes) + // b.savePic("temp.png", picBytes) // 本地生成图片，仅测试 + // outputPath 提取文件名（不包含扩展名） + filename := filepath.Base(outputPath) + filename = strings.TrimSuffix(filename, filepath.Ext(filename)) + imgUrl := b.uploadToOSS(filename, picBytes) + log.Infof("imgUrl: %s", imgUrl) // 6. 保存 return f.SaveAs(outputPath) @@ -405,11 +423,22 @@ func (b *BbxtTools) excel2picPy(templatePath string, excelBytes []byte) ([]byte, return picBytes, nil } -// SavePic 保存图片到本地 -func (b *BbxtTools) SavePic(outputPath string, picBytes []byte) error { +// savePic 保存图片到本地 +func (b *BbxtTools) savePic(outputPath string, picBytes []byte) error { dir := filepath.Dir(outputPath) if err := os.MkdirAll(dir, 0755); err != nil { return fmt.Errorf("create directory failed: %v", err) } return os.WriteFile(outputPath, picBytes, 0644) } + +// uploadToOSS 上传至 oss 返回图片url +func (b *BbxtTools) uploadToOSS(fileName string, fileBytes []byte) string { + objectKey := fmt.Sprintf("ai-scheduler/data-analytics/images/%s.png", fileName) + url, err := b.ossClient.UploadBytes(objectKey, fileBytes) + if err != nil { + log.Errorf("oss upload failed: %v", err) + return "" + } + return url +} diff --git a/tmpl/excel_temp/kshj_gt.xlsx b/tmpl/excel_temp/kshj_gt.xlsx index e270a67aaa52be82e3c03c824e02b53b180b36d8..a74a6f3d90b40ffc765862613bcf47aa2d7f2a4d 100755 GIT binary patch delta 5118 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 IZ2#u}0fXh0#{d8T delta 5055 zcmZ9QXD}S#x5jl=TP1`@lx1~UEr{M(CD{ow;-8z8`+`%sJ2d<$O8woN3KE&Ds=fybG*@_bD0JtZ)jY3)LHiP5*T^nsP-b zH{+jZHPuH!iw5V7=t!n|!s$DyS6cFgyonw3s}e(=%FiGB&M7ke>=14P86+nY35&}A zaaPKoAN6_#O3)ygrz4|z8ORZHbyKz3^mDK`M2PmO+Tj~!d$SKlNzaP;IM4hDqc7RS z+$lr{xx$OwjU3?ga7&{??`%^o{9!x=WeIa970^o%K2y>;=7p5(2VyeLZ`=0iR;SA` zKU41;iuBlDfsf4lHHKQWn|_9fwOyFT4>mccc+3wGT?$>*x54*R;t+p527+c0Kk+?# zzO`H#a#kQz7IeUQoETb$t&cRcT}jL?wpCYav~ccqSdv#}lA9SF9|G>0 zR{EM?(*=`OPuN*&G!rX~^VnsQTM_c*r)s?z`w2&W4{OuzAnl5`hS-ACb75um$?@jYq$?6SV6lIVt0x%>0%+m>(a{1L3DSndKPI zcPm*`#+rU(IoCWdklo`Bv6(i174;*>u<;O%PY$z`SElCqVjWlY5BkKyHa9t3%IiK~ zASzfXc<0B99ZqT{ZGSCSjlP2w4n&>K&1+)XJ@>=wOsdI{UzbQ|(Z#m-JBWRQZas%s zkKKHF#=4y?HlzkA;s>|>ia7T!Nb{d1 z#mm>kTn2uSPNp|KT?e?X;~T7O;ID043)uJWy}kO*I-$~hNl|M$?MdW9-V}n;*jGeC$-r95 zLC<`CJ)Y~PTWS@+sD;R=2aFw|unz-3?Yf9m8!x%FuX&iZ!fMN#gQXk%M8<|8!dyZ? zyJ&^v1~wKJMT!#;3}<5@;VdQA{Kox4C#`JfT=?Y&Jfu16GJRIr?Zpzs^s5~9{P^n| zjP0uD(9M=H?Y4yK03NVT!kr%{KQi^mGP1z)$UHo0I`wlS#Z&nk+(%soemDH6Fh41x zqv%*HJ(dY{4UYWVWCiFP>}}6Dl-&x7hW<(_SHscNAuk*ahQ~g&Ra5&a=0bzBq@rL& zuWk-b)&>|igQ$or$4_)7xaTSm5nIJb8?p!slM0JIz+zjH`twH}nYLAd{=3-4I%l%# zGdrz4<%Mb}?J^d!qs7wVaM7NA)%?osFT`$t67ne7V~~6a(`@qvQXz(&Ya&W7HY&=^ z^ef#qTHjaoz#s1k)mqlX6kN#jBLs?FX=t~hxrRNQOZ0vlB3Dt9HogxCNlOq1|WOQ0co+FIK3CrYtP?R zuh|iDH}}%NDSByc+XY)KUA0KDEFy{%D$(4n+mn}627gj64Q()p@kY|>3wIUj@jC{o z@4}5Kob;N~)X(lCU)wa0Y(wKOq@tREIhZnzi-6ASbE*q4M0Cnwsi6CZONN=}E(Alf zSrASo~1L>bQ81u&}U*up(Zq%NoYsaZi(CVg0ef!XkU9dO1Pd+`XNw z-JYi;P~yXl5*VN~0V?Y;U8j3qeX+KNhFtQL03rZvQ{A^rX?fqdxj`sK zm)J_d{7oV(u*U(MZW4AVOQ27|z?XxOp_UMOeS`l>$LvpP`&DujWPe<;6jS4N|0lPm zvgY_aZ6gSb5zMW#2j<{ky0$XY_t#*AA|l57JmK%R2bATWwC`J>oR<_z48#Nm!+0dj zZoi%{O4Y^gs)Vnp^}G{vp^Z28Y}Db7YgZX8lUpMa;w$K$ga4uf z?7iBt5|ZO8cO2`oBn8_jJ0;th7KNB_ucn%^F39k%zczzgzH3L(bl%&=yvL*xBV-?K zA;(V6BJVB+SPyVwqWr=T%3Y@}R$9e^D0nF3%+-5B+9PBm;Fnr`(jUqD$og4d?2F;% zuDrTc4o>aklJ*8na|G|O8h)|H-#w><)npem-!{8o6l|f%NyQa=pTgS5c9D_JG-hW9 zl`rEfYxE4AC*V$%P+Oer+ZgkYkB}WJ{RgkN;1=7|`Dp4a%N3pn*V_%9MIF#FfPT6D0N7J&D_*P&^qO+;w(a`yGHQ zSEm)vpqjSsBTc;_pQcd~uTn(!-0=76}jIx@v?u5=9`wCTkszQtWuMM?LiIpBU|HOt3&S#-~Y$h<~E=!`Y9lw8SPWI+_VPI2` z)U4B2VmW=v(}H;?GeTt(zQCAdf!J@W{nONd5n7IbpVvC~T5}Z=-EpMW{v+Cr9S`=! z+YRl_R`*^1ewVBsC4Aiaxd|Z-qtVI<&JIeiaF()sZWkldwyHhMRAEy=tHhWFlTo#E65V8k}-;>XUwLDaq5sbjUO$Oe$>mU`NDlJZ1J!o$zgOjfKGibmU)v z46h2e_ot1PgcU?!v+=OFgttkEai4Gvd?yXgc+fxLu`CFTz_lboUW9LCo7A7Lh9!h6 zP@jE-$5*SZ#;b1dpjB9R6$vljwp{?;nirhgy|gay#FbjCc8uSDVv^B?R;b)pN2-}M zE)waieFRJCUw+{BKeJ`ct(r3wr^J^@pt0?;))D4?vH--|uaCfSjT3v5_zA3(sY>l)ie)!`!N>I?q!N z>pPlN6Xt(Inj|65E+B2MfKtr*Zf#DISQ|M|M-inSZGX2~ngDEOyW(6`BxPIq48;;j3#!-pgm*t`rz_4WpsWC&Rr zx+COO*WL-c@6LB5a!v0O{$j$P9+nM%GmViwNzM0(3@7EGBf}U{6#V{5!4 zS^spt37J{#fJ^0WYnU(&A^^`wr3e+f~`8d0O&p@*0{REaBzEP;lu3;-%BYgjwN-QdK|F%)ND)TUu6!`lkI)mjU}x14XW-Gk_%`3j>Ecv_+lpawpRW^oJs7kfr**>Bkd`r=fj zN5>#tq7ynC_n#809t}t@Fpa-K*K4c~0QZ4}&2-?CV(UsV0ds7^u?hmL89|Kv1I=U8z@0~KWPFp z4`|H8=!yQjA3o%y6S<_1;un#0Mapju`aJwiGC~Ynr?4N|txDKj!|8w0N35ty`PkgK zXMB)RYI)4PMii|P7iK$=D!UZ-hQh|uyrcjw$-2Ljv;n+Lp|3L-EjwnXX|0ZSyLRt8 zly&8vsuo_m8`+E2nk6KB-8U?}_N_#pH|WOPR^)Taws3Kz4MxnCkUSED`*nnBZ+hKh z`(s?ma>M#E@j2&!D4g7bv(BJvQxj$Zd9>HZC%|rJ%X_|x-%mqqqP76++iG2>83X!d zk+)%OQw+kTx3qWK0-k)yMjN=Hd$`rzOcoJM>P7EtGYz_A8QkB?)Uxr!Svqd zz4lwRt4jztp-Gpwl@UQ2xw2P3MBFFV5svrynqk6oPqcr_eeB7?53~i#qvkS&&6aup z8Txj<+W-$$29Whre z5=b~H;(%#DIRw^;RQ44VM9GkzXpBJBN6z?Hd8JhTC}+)|q7uQ33ZI?TVxvhJ`*{g2 zC&WDLQSlavr1$F7L!oT0wR#KZKzGC<=fR6;hk!&D8moyRMqFG}m2cERIXc z#A-`}&PAYeDmr=VmX0X5f*EOKNfHp>e?*NckVQ54j^kW?NPEhs7@~`V?k(<#oEE!D zO3u5-O?=W&$S8w{bHkjn29m+HPGMmc!j4MOVNLm;+u0uL5O!TkBbx~JV#+R?3ieHk z5SWAE|EH&i0ELB(#r#0KluuxB?5dPnun6`{%5N|`!~ceBJS;5We~b_Bf4urBob0Cm Q=eCr Date: Tue, 30 Dec 2025 16:49:53 +0800 Subject: [PATCH 17/18] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=88=A9?= =?UTF-8?q?=E6=B6=A6=E6=8E=92=E8=A1=8C=E5=92=8C=E5=95=86=E5=93=81=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/tools/bbxt/api.go | 37 +++- internal/tools/bbxt/bbxt.go | 294 ++++++++++++++++++++++++++++++- internal/tools/bbxt/bbxt_test.go | 22 +++ pkg/func.go | 8 + tmpl/excel_temp/lrtb_rank.xlsx | Bin 0 -> 9572 bytes tmpl/excel_temp/xstb_ana.xlsx | Bin 0 -> 9602 bytes 6 files changed, 348 insertions(+), 13 deletions(-) create mode 100644 tmpl/excel_temp/lrtb_rank.xlsx create mode 100644 tmpl/excel_temp/xstb_ana.xlsx diff --git a/internal/tools/bbxt/api.go b/internal/tools/bbxt/api.go index 64632cb..b07ce1e 100644 --- a/internal/tools/bbxt/api.go +++ b/internal/tools/bbxt/api.go @@ -53,19 +53,19 @@ type GetProfitRankingSumResponse struct { type ProfitRankingSumResponse struct { // 分销商ID - ResellerId string `protobuf:"bytes,1,opt,name=reseller_id,json=resellerId,proto3" json:"reseller_id,omitempty"` + ResellerId string `protobuf:"bytes,1,opt,name=reseller_id,json=resellerId,proto3" json:"ResellerId,omitempty"` // 分销商名称 - ResellerName string `protobuf:"bytes,2,opt,name=reseller_name,json=resellerName,proto3" json:"reseller_name,omitempty"` + ResellerName string `protobuf:"bytes,2,opt,name=reseller_name,json=resellerName,proto3" json:"ResellerName,omitempty"` // 当前利润 - CurrentProfit float64 `protobuf:"fixed64,3,opt,name=current_profit,json=currentProfit,proto3" json:"current_profit,omitempty"` + CurrentProfit float64 `protobuf:"fixed64,3,opt,name=current_profit,json=currentProfit,proto3" json:"CurrentProfit,omitempty"` // 昨日同比利润 - HistoryOneProfit float64 `protobuf:"fixed64,4,opt,name=history_one_profit,json=historyOneProfit,proto3" json:"history_one_profit,omitempty"` + HistoryOneProfit float64 `protobuf:"fixed64,4,opt,name=history_one_profit,json=historyOneProfit,proto3" json:"HistoryOneProfit,omitempty"` // 上周同比利润 - HistoryTwoProfit float64 `protobuf:"fixed64,5,opt,name=history_two_profit,json=historyTwoProfit,proto3" json:"history_two_profit,omitempty"` + HistoryTwoProfit float64 `protobuf:"fixed64,5,opt,name=history_two_profit,json=historyTwoProfit,proto3" json:"HistoryTwoProfit,omitempty"` // 昨日同比利润差值 - HistoryOneDiff float64 `protobuf:"fixed64,6,opt,name=history_one_diff,json=historyOneDiff,proto3" json:"history_one_diff,omitempty"` + HistoryOneDiff float64 `protobuf:"fixed64,6,opt,name=history_one_diff,json=historyOneDiff,proto3" json:"HistoryOneDiff,omitempty"` // 上周同比利润差值 - HistoryTwoDiff float64 `protobuf:"fixed64,7,opt,name=history_two_diff,json=historyTwoDiff,proto3" json:"history_two_diff,omitempty"` + HistoryTwoDiff float64 `protobuf:"fixed64,7,opt,name=history_two_diff,json=historyTwoDiff,proto3" json:"HistoryTwoDiff,omitempty"` } // GetProfitRankingSumApi 利润同比分销商排行榜 @@ -144,6 +144,29 @@ type resCode struct { Error string `json:"error"` } +type GetStatisFilterOfficialProductRequest struct { + OfficialProductId int32 `protobuf:"varint,1,opt,name=official_product_id,json=officialProductId,proto3" json:"official_product_id,omitempty"` +} + +type GetStatisFilterOfficialProductResponse struct { + List []*StatisFilterOfficialProductResponse `protobuf:"bytes,1,rep,name=list,proto3" json:"list,omitempty"` +} + +type StatisFilterOfficialProductResponse struct { + OfficialProductId int32 `protobuf:"varint,1,opt,name=official_product_id,json=officialProductId,proto3" json:"OfficialProductId,omitempty"` + OfficialProductName string `protobuf:"bytes,2,opt,name=official_product_name,json=officialProductName,proto3" json:"OfficialProductName,omitempty"` +} + +// GetStatisFilterOfficialProductApi 官方商品列表 +func GetStatisFilterOfficialProductApi(param *GetStatisFilterOfficialProductRequest) (*GetStatisFilterOfficialProductResponse, error) { + url := "/dataanalytics/statisFilterOfficialProduct" + var res GetStatisFilterOfficialProductResponse + if err := request(url, param, &res); err != nil { + return nil, err + } + return &res, nil +} + func request(url string, reqData interface{}, resData interface{}) error { reqParam, err := pkg.StructToQuery(reqData) diff --git a/internal/tools/bbxt/bbxt.go b/internal/tools/bbxt/bbxt.go index f7d1e68..bfee143 100644 --- a/internal/tools/bbxt/bbxt.go +++ b/internal/tools/bbxt/bbxt.go @@ -3,8 +3,14 @@ package bbxt import ( "ai_scheduler/pkg" "fmt" + "reflect" + "regexp" "sort" + "strings" "time" + + "github.com/go-kratos/kratos/v2/log" + "github.com/xuri/excelize/v2" ) type BbxtTools struct { @@ -28,11 +34,11 @@ func NewBbxtTools() (*BbxtTools, error) { }, nil } -func (b *BbxtTools) DailyReport(today time.Time) (err error) { +func (b *BbxtTools) DailyReport(now time.Time) (err error) { - err = b.StatisOursProductLossSumTotal([]string{ - time.Date(today.Year(), today.Month(), today.Day(), 0, 0, 0, 0, today.Location()).Format("2006-01-02 15:04:05"), - time.Date(today.Year(), today.Month(), today.Day(), 23, 59, 59, 0, today.Location()).Format("2006-01-02 15:04:05"), + err = b.StatisOursProductLossSum([]string{ + time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()).Format("2006-01-02 15:04:05"), + time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 0, now.Location()).Format("2006-01-02 15:04:05"), }) if err != nil { return @@ -40,8 +46,8 @@ func (b *BbxtTools) DailyReport(today time.Time) (err error) { return } -// OursProductLossSum 负利润分析 -func (b *BbxtTools) StatisOursProductLossSumTotal(ct []string) (err error) { +// StatisOursProductLossSumTotal 负利润分析 +func (b *BbxtTools) StatisOursProductLossSum(ct []string) (err error) { data, err := StatisOursProductLossSumApi(&StatisOursProductLossSumReq{ Ct: ct, }) @@ -121,3 +127,279 @@ func (b *BbxtTools) StatisOursProductLossSumTotal(ct []string) (err error) { } return err } + +// GetProfitRankingSum 利润同比分销商排行榜 +func (b *BbxtTools) GetProfitRankingSum(now time.Time) (err error) { + ct := []string{ + time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()).Format("2006-01-02 15:04:05"), + now.Format(time.DateTime), + } + + data, err := GetProfitRankingSumApi(&GetProfitRankingSumRequest{ + Ct: ct, + }) + timeCh := now.Format("1月2日15点") + title := "截至" + timeCh + "利润同比分销商排行榜" + if err != nil { + return + } + + //排序 + sort.Slice(data.List, func(i, j int) bool { + return data.List[i].HistoryOneDiff > data.List[j].HistoryOneDiff + }) + //取前20和后20 + var ( + total [][]string + top = data.List[:20] + bottom = data.List[len(data.List)-20:] + ) + //合并前20和后20 + top = append(top, bottom...) + + // 构建分组 + for _, v := range top { + var diff string + if v.HistoryOneDiff > 0 { + diff = fmt.Sprintf("${color: FF0000;horizontal:center;vertical:center}↑%.4f", v.HistoryOneDiff) + } else { + diff = fmt.Sprintf("${color: 00B050;horizontal:center;vertical:center}↓%.4f", v.HistoryOneDiff) + } + total = append(total, []string{ + fmt.Sprintf("%s", v.ResellerName), + fmt.Sprintf("%.4f", v.CurrentProfit), + fmt.Sprintf("%.4f", v.HistoryOneProfit), + diff, + }) + } + //总量生成excel + if len(total) > 0 { + filePath := b.cacheDir + "/lrtb_rank" + fmt.Sprintf("%d", time.Now().Unix()) + ".xlsx" + err = b.SimpleFillExcelWithTitle(b.excelTempDir+"/"+"lrtb_rank.xlsx", filePath, total, title) + } + return err +} + +// GetStatisOfficialProductSum 利润同比分销商排行榜 +func (b *BbxtTools) GetStatisOfficialProductSum(now time.Time, productName []string) (err error) { + ct := []string{ + time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()).Format("2006-01-02 15:04:05"), + now.Format(time.DateTime), + } + var ids []int32 + if len(productName) > 0 { + ids, err = b.getProductIdFromProductName(productName) + if err != nil { + return + } + } + reqParam := &GetStatisOfficialProductSumRequest{ + Ct: ct, + } + if len(ids) > 0 { + reqParam.OfficialProductId = ids + } + data, err := GetStatisOfficialProductSumApi(reqParam) + if err != nil { + return + } + var total [][]string + for _, v := range data.OfficialProductSum { + var ( + yeterDatyDiff string + lastWeekDiff string + ) + if v.HistoryOneDiff > 0 { + yeterDatyDiff = fmt.Sprintf("${color: FF0000;horizontal:center;vertical:center}↑%d", v.HistoryOneDiff) + } else { + yeterDatyDiff = fmt.Sprintf("${color: 00B050;horizontal:center;vertical:center}↓%d", v.HistoryOneDiff) + } + if v.HistoryTwoDiff > 0 { + lastWeekDiff = fmt.Sprintf("${color: FF0000;horizontal:center;vertical:center}↑%d", v.HistoryTwoDiff) + } else { + lastWeekDiff = fmt.Sprintf("${color: 00B050;horizontal:center;vertical:center}↓%d", v.HistoryTwoDiff) + } + total = append(total, []string{ + fmt.Sprintf("%s", v.OfficialProductName), + fmt.Sprintf("%d", v.CurrentNum), + fmt.Sprintf("%d", v.HistoryOneNum), + yeterDatyDiff, + fmt.Sprintf("%d", v.HistoryTwoNum), + lastWeekDiff, + }) + } + + timeCh := now.Format("1月2日15点") + title := "截至" + timeCh + "销售同比分析" + //总量生成excel + if len(total) > 0 { + filePath := b.cacheDir + "/xstb_ana" + fmt.Sprintf("%d", time.Now().Unix()) + ".xlsx" + err = b.SimpleFillExcelWithTitle(b.excelTempDir+"/"+"xstb_ana.xlsx", filePath, total, title) + } + return err +} + +func (b *BbxtTools) getProductIdFromProductName(productNames []string) ([]int32, error) { + data, err := GetStatisFilterOfficialProductApi(&GetStatisFilterOfficialProductRequest{}) + if err != nil { + return nil, err + } + var product2IdMap = make(map[string]int32) + for _, v := range data.List { + product2IdMap[v.OfficialProductName] = v.OfficialProductId + } + var ids []int32 + for _, v := range productNames { + if id, ok := product2IdMap[v]; ok { + ids = append(ids, id) + } + } + return ids, nil +} + +func (b *BbxtTools) SimpleFillExcelWithTitle(templatePath, outputPath string, dataSlice interface{}, title string) error { + // 1. 打开模板 + f, err := excelize.OpenFile(templatePath) + if err != nil { + return err + } + defer f.Close() + + sheet := f.GetSheetName(0) + + // 1.1 获取第三行模板样式 + templateRow := 3 + styleID, err := f.GetCellStyle(sheet, fmt.Sprintf("A%d", templateRow)) + if err != nil { + log.Errorf("获取模板样式失败: %v", err) + styleID = 0 + } + + // 1.2 获取模板行高 + rowHeight, err := f.GetRowHeight(sheet, templateRow) + if err != nil { + log.Errorf("获取模板行高失败: %v", err) + rowHeight = 31 // 默认高度 + } + + // 2. 写入标题到第一行 + f.SetCellValue(sheet, "A1", title) + + // 3. 反射获取切片数据 + v := reflect.ValueOf(dataSlice) + if v.Kind() != reflect.Slice { + return fmt.Errorf("dataSlice must be a slice") + } + + if v.Len() == 0 { + return nil + } + + // 4. 从第三行开始填充数据（第二行留空或作为标题行） + startRow := 3 + pattern := `\$\{(.*?)\}` + re := regexp.MustCompile(pattern) + for i := 0; i < v.Len(); i++ { + currentRow := startRow + i + + // 获取当前行数据 + item := v.Index(i) + + // 处理不同类型的切片 + var rowData []interface{} + + if item.Kind() == reflect.Slice || item.Kind() == reflect.Array { + // 处理 []string 或 [][]string 中的一行 + for j := 0; j < item.Len(); j++ { + if item.Index(j).CanInterface() { + rowData = append(rowData, item.Index(j).Interface()) + } + } + } else if item.Kind() == reflect.Interface { + // 处理 interface{} 类型 + if actualValue, ok := item.Interface().([]string); ok { + for _, val := range actualValue { + rowData = append(rowData, val) + } + } else { + rowData = []interface{}{item.Interface()} + } + } else { + rowData = []interface{}{item.Interface()} + } + + // 4.1 设置行高 + f.SetRowHeight(sheet, currentRow, rowHeight) + + // 5. 填充数据到Excel + for col, value := range rowData { + cell := fmt.Sprintf("%c%d", 'A'+col, currentRow) + // 5.1 应用模板样式到整行（根据实际列数） + if styleID != 0 && len(rowData) > 0 { + startCol := "A" + endCol := fmt.Sprintf("%c", 'A'+len(rowData)-1) + endCell := fmt.Sprintf("%s%d", endCol, currentRow) + + f.SetCellStyle(sheet, fmt.Sprintf("%s%d", startCol, currentRow), + endCell, styleID) + } + switch value.(type) { + case string: + var style = value.(string) + if re.MatchString(style) { + matches := re.FindStringSubmatch(style) + styleMap := make(map[string]string) + //matches = strings.Replace(matches, "$", "", 1) + if len(matches) != 2 { + continue + } + for _, kv := range strings.Split(matches[1], ";") { + kvParts := strings.Split(kv, ":") + if len(kvParts) == 2 { + styleMap[strings.TrimSpace(kvParts[0])] = strings.TrimSpace(kvParts[1]) + } + } + fontStyleID, _err := SetStyle(styleMap, f) + if _err == nil { + f.SetCellStyle(sheet, cell, cell, fontStyleID) + } + + value = re.ReplaceAllString(style, "") + + } + f.SetCellValue(sheet, cell, value) + default: + + } + } + + } + + // 6. 保存 + return f.SaveAs(outputPath) +} + +func SetStyle(styleMap map[string]string, f *excelize.File) (int, error) { + + var style = &excelize.Style{} + if colorHex, exists := styleMap["color"]; exists { + style.Font = &excelize.Font{ + Color: colorHex, + } + } + if horizontal, exists := styleMap["horizontal"]; exists { + if style.Alignment == nil { + style.Alignment = &excelize.Alignment{} + } + style.Alignment.Horizontal = horizontal + } + + if vertical, exists := styleMap["vertical"]; exists { + if style.Alignment == nil { + style.Alignment = &excelize.Alignment{} + } + style.Alignment.Vertical = vertical + } + + return f.NewStyle(style) +} diff --git a/internal/tools/bbxt/bbxt_test.go b/internal/tools/bbxt/bbxt_test.go index b6b2275..066bb2d 100644 --- a/internal/tools/bbxt/bbxt_test.go +++ b/internal/tools/bbxt/bbxt_test.go @@ -15,3 +15,25 @@ func Test_StatisOursProductLossSumApiTotal(t *testing.T) { t.Log(err) } + +func Test_GetProfitRankingSum(t *testing.T) { + o, err := NewBbxtTools() + if err != nil { + panic(err) + } + err = o.GetProfitRankingSum(time.Now()) + + t.Log(err) + +} + +func Test_GetStatisOfficialProductSum(t *testing.T) { + o, err := NewBbxtTools() + if err != nil { + panic(err) + } + err = o.GetStatisOfficialProductSum(time.Now(), []string{"官方-爱奇艺-星钻季卡", "官方-爱奇艺-星钻半年卡", "官方--腾讯-年卡", "官方--爱奇艺-月卡"}) + + t.Log(err) + +} diff --git a/pkg/func.go b/pkg/func.go index 006f16f..9b4f89b 100644 --- a/pkg/func.go +++ b/pkg/func.go @@ -63,3 +63,11 @@ func GetTmplDir() (string, error) { } return path, nil } + +func ReverseSliceNew[T any](s []T) []T { + result := make([]T, len(s)) + for i := 0; i < len(s); i++ { + result[i] = s[len(s)-1-i] + } + return result +} diff --git a/tmpl/excel_temp/lrtb_rank.xlsx b/tmpl/excel_temp/lrtb_rank.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..d3ed4849de61f5ef80f449a8121956e38359a068 GIT binary patch literal 9572 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 JE3!wv{|DYYpJo66 literal 0 HcmV?d00001 diff --git a/tmpl/excel_temp/xstb_ana.xlsx b/tmpl/excel_temp/xstb_ana.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..54fb05616e5819703af3787cfeda33ee4c490927 GIT binary patch literal 9602 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 Date: Tue, 30 Dec 2025 17:34:51 +0800 Subject: [PATCH 18/18] =?UTF-8?q?fix:=20=E6=A8=A1=E6=9D=BF=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + tmpl/excel_temp/kshj_gt.xlsx | Bin 9938 -> 9942 bytes tmpl/excel_temp/kshj_gt.xlsx.v1 | Bin 9491 -> 0 bytes 3 files changed, 1 insertion(+) delete mode 100755 tmpl/excel_temp/kshj_gt.xlsx.v1 diff --git a/.gitignore b/.gitignore index 4dd0345..c953a6c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ cmd/server/wire_gen.go __debug* .bin/ .idea/ +cache/ \ No newline at end of file diff --git a/tmpl/excel_temp/kshj_gt.xlsx b/tmpl/excel_temp/kshj_gt.xlsx index a74a6f3d90b40ffc765862613bcf47aa2d7f2a4d..2b27bfa07c042ba158bc3229982c9138797ccee1 100755 GIT binary patch delta 1195 zcmV;c1XTOdP1a4YlK};W(2ajSlb8V>e_v0-AQZ*lP5cfG?=7^;bdt7(wHjp~!ir z1*>We1v-F3^YZc{=Z5my!jr8HSTDgvfutSfra(LI4aL~;9Vq6K;Lt(b)K)Pce~xyG z4dd@@3pgX>3M=qTFwbxcjLkqqN2K5b(tOye0|<_x0tMPToF*y$_Ij|&{W;JnBd3!7 zU_z&3+%a45UL4$eCkJEGG)Xh*VubuDeqBC3cU5Dl+g))$WiB}77MQPXc`KCE(s|pS zay(MnEmq9=Wmxz|g19^UHlG^;KDjH><3U6r8tsdml$XiO1-2%qNX3)G1Tug10#r>A z6tTO~u7vjb>^hUi!ilrC+rZy5wwsUwtA&@e8J{`l%y_0_Ho$nw+LlLJ2fn z6{6YZ^w-aulQT+;Wlh1PY9OZ%VCco_#)||&&c9+I2riT=?j0g;940~+K8(<4%S{)c^;o1)mifwM6WcfX8LZ|o*;3H z#chNX_Q99i8v^^p({)|cwI<@t!NsUS>1hmhy)#zT*UU1yTKXHf)$xC7SqSW+yLzIb z%;{yiSf^8p2OjcUKxanZiDjD~Ac0#ba8@XBGq6$W&H=w*C~@Q-;3yflVh?MOGN+#= zI7WZH2!2I@cu*LB@6~Sn)ZA)PK*@H}u9f^F3R~s$oc6Krs{0ILTUoR+iDs0jot2`2 zudoM+2|3N25LXge@kxJb;U=7tn%xKYfiX*>d4}oSx9A{~9#TV6c1Xg{E+oy8=s!7F zuouG5Lryx2&Q4zyii1ht5_d5KwR|**BFrKS7SXOyB1P;phdQLkp(I z(pLd7^TX$_rw=$UlUWue|FVK>`|3mlg1KKgf4^bz!j#pZw|+ql;cC~o`^KpmqN5)L zm;XGTEiS_<4+lHAXf4~qH>S6uF+@U%lu6`m)}3{gX2#K>=%%btO6ht&^}N zHUZR==OsV^S(7LxJOPH2WhNmTwkD@Y#R32TzXkvR7ytkO000000RSKX006R+p(ZN^ Jxgr1n005dcK70TG delta 1204 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 fKWDA=KX`uy0mw?g{@ASOkf<7X2;Dj11K