fuzhongyun
/
ai_scheduler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: fuzhongyun:master
Branches Tags
fuzhongyun:master
fuzhongyun:test
fuzhongyun:feature/rzy/talk_advicer
fuzhongyun:feature/fzy/hyt-express
fuzhongyun:fix-config
fuzhongyun:feature/rzy/report_combine
fuzhongyun:v4-fzy
fuzhongyun:feature/rzy/bug_optimization_submit_and_order_search
fuzhongyun:v4
fuzhongyun:v3
fuzhongyun:v2
fuzhongyun:feature/wc/v2
fuzhongyun:feature/toolSelect
fuzhongyun:dev
fuzhongyun:feature/session
fuzhongyun:feature/fiber
..
compare: fuzhongyun:feature/rzy/bug_optimization_submit_and_order_search
Branches Tags
fuzhongyun:test
fuzhongyun:feature/rzy/talk_advicer
fuzhongyun:master
fuzhongyun:feature/fzy/hyt-express
fuzhongyun:fix-config
fuzhongyun:feature/rzy/report_combine
fuzhongyun:v4-fzy
fuzhongyun:feature/rzy/bug_optimization_submit_and_order_search
fuzhongyun:v4
fuzhongyun:v3
fuzhongyun:v2
fuzhongyun:feature/wc/v2
fuzhongyun:feature/toolSelect
fuzhongyun:dev
fuzhongyun:feature/session
fuzhongyun:feature/fiber

No commits in common. "master" and "feature/rzy/bug_optimization_submit_and_order_search" have entirely different histories.
master ... feature/rz

32 changed files with 134 additions and 805 deletions
Show Stats Expand all files Collapse all files

8
cmd/server/main.go
View File

@ -10,10 +10,9 @@ import (
)
func main() {
configPath := flag.String("config", "./config/config.yaml", "Path to configuration file")
configPath := flag.String("config", "./config/config_test.yaml", "Path to configuration file")
onBot := flag.String("bot", "", "bot start")
cron := flag.String("cron", "", "close")
runJob := flag.String("runJob", "", "run single job and exit")
flag.Parse()
ctx := context.Background()
bc, err := config.LoadConfig(*configPath)
@ -34,11 +33,6 @@ func main() {
if *cron == "start" {
app.Cron.Run(ctx)
}
// 运行指定任务并退出
if *runJob != "" {
app.Cron.RunOnce(ctx, *runJob)
return
}
log.Fatal(app.HttpServer.Listen(fmt.Sprintf(":%d", bc.Server.Port)))
}

29
config/config.yaml
View File

@ -4,29 +4,20 @@ server:
host: "0.0.0.0"
ollama:
base_url: "http://192.168.6.115:11434"
model: "qwen3:8b"
generate_model: "qwen3:8b"
mapping_model: "qwen3:8b"
# model: "qwen3-coder:480b-cloud"
# generate_model: "qwen3-coder:480b-cloud"
# mapping_model: "deepseek-v3.2:cloud"
base_url: "http://172.17.0.1:11434"
model: "qwen3-coder:480b-cloud"
generate_model: "qwen3-coder:480b-cloud"
mapping_model: "deepseek-v3.2:cloud"
vl_model: "qwen2.5vl:3b"
timeout: "120s"
level: "info"
format: "json"
vllm:
vl_model:
base_url: "http://192.168.6.115:8001/v1"
model: "qwen2.5-vl-3b-awq"
timeout: "120s"
level: "info"
text_model:
base_url: "http://192.168.6.115:8002/v1"
model: "qwen3-8b-fp8"
timeout: "120s"
level: "info"
base_url: "http://172.17.0.1:8001/v1"
vl_model: "qwen2.5-vl-3b-awq"
timeout: "120s"
level: "info"
coze:
base_url: "https://api.coze.cn"
@ -45,7 +36,7 @@ sys:
channel_pool_len: 100
channel_pool_size: 32
llm_pool_len: 5
heartbeat_interval: 300
heartbeat_interval: 30
key: report-api
pollSize: 5 #连接池大小，不配置，或配置为0表示不启用连接池
minIdleConns: 2 #最小空闲连接数
@ -155,7 +146,7 @@ eino_tools:
# == 通用工具 ==
# 表格转图片
excel2pic:
base_url: "http://192.168.6.115:8010/api/v1/convert"
base_url: "http://excel2pic:8000/api/v1/convert"
dingtalk:
api_key: "dingsbbntrkeiyazcfdg"

16
config/config_env.yaml
View File

@ -14,16 +14,10 @@ ollama:
format: "json"
vllm:
vl_model:
base_url: "http://192.168.6.115:8001/v1"
model: "qwen2.5-vl-3b-awq"
timeout: "120s"
level: "info"
text_model:
base_url: "http://192.168.6.115:8002/v1"
model: "qwen3-8b-fp8"
timeout: "120s"
level: "info"
base_url: "http://117.175.169.61:16001/v1"
vl_model: "qwen2.5-vl-3b-awq"
timeout: "120s"
level: "info"
coze:
base_url: "https://api.coze.cn"
@ -94,8 +88,6 @@ tools:
zltxOrderAfterSaleResellerBatch:
enabled: true
base_url: "https://gateway.dev.cdlsxd.cn/zltx_api/admin/afterSales/reseller_pre_ai"
zltxResellerAuthProductToManagerAndDefaultLossReason:
base_url: "https://revcl.1688sup.com/api/admin/reseller/resellerAuthProduct/getManagerAndDefaultLossReason"
# eino tool 配置
eino_tools:

27
config/config_test.yaml
View File

@ -14,16 +14,10 @@ ollama:
format: "json"
vllm:
vl_model:
base_url: "http://192.168.6.115:8001/v1"
model: "qwen2.5-vl-3b-awq"
timeout: "120s"
level: "info"
text_model:
base_url: "http://192.168.6.115:8002/v1"
model: "qwen3-8b-fp8"
timeout: "120s"
level: "info"
base_url: "http://host.docker.internal:8001/v1"
vl_model: "qwen2.5-vl-3b-awq"
timeout: "120s"
level: "info"
coze:
base_url: "https://api.coze.cn"
@ -32,11 +26,12 @@ coze:
lsxd:
# 统一登录
login_url: "https://api.user.1688sup.com/v1/login/phone"
phone: "ORlviZN7N06W2+WKLe76xg=="
password: "V5Uh8C4bamEM6UQZh4TCeQ=="
code: "456789"
check_token_url: "https://api.user.1688sup.com/v1/user/welcome"
login_url: "http://api.test.user.1688sup.com/v1/login/phone"
phone: "OFJ8UpqOlI7+w3Qklf36ZA=="
password: "tEbFegH/DRRh6LutFb7o3g=="
code: "123456"
check_token_url: "http://api.test.user.1688sup.com/v1/user/welcome"
sys:
session_len: 6
@ -147,7 +142,7 @@ eino_tools:
# == 通用工具 ==
# 表格转图片
excel2pic:
base_url: "http://192.168.6.115:8010/api/v1/convert"
base_url: "http://192.168.6.109:8010/api/v1/convert"
dingtalk:
api_key: "dingsbbntrkeiyazcfdg"

32
internal/biz/ding_talk_bot.go
View File

@ -312,38 +312,6 @@ func (d *DingTalkBotBiz) SendReport(ctx context.Context, groupInfo *model.AiBotG
return
}
// SendReports 发送多个报告
func (d *DingTalkBotBiz) SendReports(ctx context.Context, groupInfo *model.AiBotGroup, reports []*bbxt.ReportRes) (err error) {
if len(reports) == 0 {
return errors.New("report is empty")
}
title := fmt.Sprintf("截止%s日报", time.Now().Format("1月2日15点"))
reportChan := make(chan string, len(reports)*2)
writeCount := 0
for _, v := range reports {
if v == nil {
continue
}
reportChan <- fmt.Sprintf("**%s**", v.Title)
reportChan <- fmt.Sprintf("![图片](%s)", v.Url)
writeCount += 2
}
close(reportChan)
if writeCount == 0 {
return errors.New("report is empty")
}
err = d.HandleStreamRes(ctx, &chatbot.BotCallbackDataModel{
RobotCode: groupInfo.RobotCode,
ConversationType: constants.ConversationTypeGroup,
ConversationId: groupInfo.ConversationID,
Text: chatbot.BotCallbackDataTextModel{
Content: title,
},
}, reportChan)
return
}
func (d *DingTalkBotBiz) GetGroupInfo(ctx context.Context, groupId int) (group model.AiBotGroup, err error) {
cond := builder.NewCond()

8
internal/biz/do/handle.go
View File

@ -36,7 +36,6 @@ import (
type Handle struct {
Ollama *llm_service.OllamaService
Vllm *llm_service.VllmService
toolManager *tools.Manager
conf *config.Config
sessionImpl *impl.SessionImpl
@ -48,7 +47,6 @@ type Handle struct {
func NewHandle(
Ollama *llm_service.OllamaService,
Vllm *llm_service.VllmService,
toolManager *tools.Manager,
conf *config.Config,
sessionImpl *impl.SessionImpl,
@ -59,7 +57,6 @@ func NewHandle(
) *Handle {
return &Handle{
Ollama: Ollama,
Vllm: Vllm,
toolManager: toolManager,
conf: conf,
sessionImpl: sessionImpl,
@ -75,8 +72,7 @@ func (r *Handle) Recognize(ctx context.Context, rec *entitys.Recognize, promptPr
prompt, err := promptProcessor.CreatePrompt(ctx, rec)
//意图识别
// recognizeMsg, err := r.Ollama.IntentRecognize(ctx, &entitys.ToolSelect{
recognizeMsg, err := r.Vllm.IntentRecognize(ctx, &entitys.ToolSelect{
recognizeMsg, err := r.Ollama.IntentRecognize(ctx, &entitys.ToolSelect{
Prompt: prompt,
Tools: rec.Tasks,
})
@ -510,7 +506,7 @@ func handleCozeWorkflowEvents(ctx context.Context, resp coze.Stream[coze.Workflo
case coze.WorkflowEventTypeMessage:
entitys.ResStream(ch, index, event.Message.Content)
case coze.WorkflowEventTypeError:
entitys.ResError(ch, index, fmt.Sprintf("工作流执行错误: %v", event.Error))
entitys.ResError(ch, index, fmt.Sprintf("工作流执行错误: %s", event.Error))
case coze.WorkflowEventTypeDone:
entitys.ResEnd(ch, index, "工作流执行完成")
case coze.WorkflowEventTypeInterrupt:

5
internal/biz/do/macro.go
View File

@ -26,7 +26,6 @@ import (
type Macro struct {
botGroupImpl *impl.BotGroupImpl
botGroupConfigImpl *impl.BotGroupConfigImpl
reportDailyCacheImpl *impl.ReportDailyCacheImpl
config *config.Config
rdb *utils.Rdb
@ -37,14 +36,12 @@ func NewMacro(
reportDailyCacheImpl *impl.ReportDailyCacheImpl,
config *config.Config,
rdb *utils.Rdb,
botGroupConfigImpl *impl.BotGroupConfigImpl,
) *Macro {
return &Macro{
botGroupImpl: botGroupImpl,
reportDailyCacheImpl: reportDailyCacheImpl,
config: config,
rdb: rdb,
botGroupConfigImpl: botGroupConfigImpl,
}
}
@ -196,7 +193,7 @@ func (m *Macro) ProductModify(ctx context.Context, content string, groupConfig *
groupConfig.ProductName = itemInfo
cond := builder.NewCond()
cond = cond.And(builder.Eq{"config_id": groupConfig.ConfigID})
err = m.botGroupConfigImpl.UpdateByCond(&cond, groupConfig)
err = m.botGroupImpl.UpdateByCond(&cond, groupConfig)
if err != nil {
err = fmt.Errorf("修改失败:%v", err)
return

32
internal/biz/do/macro_test.go
View File

@ -1,32 +0,0 @@
package do
import (
"ai_scheduler/internal/config"
"ai_scheduler/internal/data/impl"
"ai_scheduler/internal/data/model"
"ai_scheduler/utils"
"context"
"testing"
)
func Test_report(t *testing.T) {
con := "[利润同比报表]商品修改：官方–优酷周卡,官方–优酷月卡,官方–优酷季卡,官方–优酷年卡,,官方–爱奇艺-月卡,官方–爱奇艺-季卡,官方–爱奇艺-年卡,官方–芒果-PC周卡,官方–芒果-PC月卡,官方–芒果-PC季卡,官方–QQ音乐-绿钻月卡,官方–饿了么超级会员月卡,官方–网易云黑胶vip月卡,官方–喜马拉雅巅峰会员月卡，剪映会员7天卡，剪映会员月卡，剪映会员年卡，剪映SVIP会员7天卡，剪映SVIP会员月卡，剪映SVIP会员年卡"
run()
chatId, err, i := ma.ProductModify(context.Background(), con, &model.AiBotGroupConfig{ConfigID: 1, ToolList: "8,9,10,11,12,13,16"})
t.Log(chatId, err, i)
}
var ma *Macro
func run() {
configConfig, _ := config.LoadConfigWithTest()
db, _ := utils.NewGormDb(configConfig)
rdb := utils.NewRdb(configConfig)
reportDailyCacheImpl := impl.NewReportDailyCacheImpl(db)
botGroupImpl := impl.NewBotGroupImpl(db)
botGroupConfigImpl := impl.NewBotGroupConfigImpl(db)
ma = NewMacro(botGroupImpl, reportDailyCacheImpl, configConfig, rdb, botGroupConfigImpl)
}

9
internal/biz/group_config.go
View File

@ -98,12 +98,14 @@ func (g *GroupConfigBiz) GetReportLists(ctx context.Context, groupConfig *model.
if err != nil {
return
}
//追加电商充值系统统计 - 返回统一使用[]*bbxt.ReportRes
rechargeReports, err := g.rechargeDailyReport(ctx, time.Now(), nil, g.ossClient)
if err != nil || len(rechargeReports) == 0 {
return
}
reports = append(rechargeReports, reports...)
reports = append(reports, rechargeReports...)
return
}
@ -173,7 +175,7 @@ func (g *GroupConfigBiz) handleReport(ctx context.Context, rec *entitys.Recogniz
if _err != nil {
return _err
}
reports = append(reports, repo)
reports = append(reports, repo...)
case "report_sales_analysis":
product := strings.Split(groupConfig.ProductName, ",")
repo, _err := rep.GetStatisOfficialProductSum(t, product)
@ -198,9 +200,8 @@ func (g *GroupConfigBiz) handleReport(ctx context.Context, rec *entitys.Recogniz
if _err != nil {
return _err
}
reports = append(reports, rechargeReport...)
reports = append(reports, repo...)
reports = append(reports, rechargeReport...)
case "report_daily_recharge":
product := strings.Split(groupConfig.ProductName, ",")
repo, _err := g.rechargeDailyReport(ctx, t, product, nil)

7
internal/biz/handle/dingtalk/send_card.go
View File

@ -115,7 +115,6 @@ func (s *SendCardClient) NewCard(ctx context.Context, cardSend *CardSend) error
s.processContentChannel(ctx, cardSend, cardInstanceId.String(), client)
}()
wg.Wait()
log.Info("处理通道结束")
}
return nil
@ -164,7 +163,7 @@ func (s *SendCardClient) processContentChannel(ctx context.Context, cardSend *Ca
var (
contentBuilder strings.Builder
lastUpdate = time.Now()
lastUpdate time.Time
)
for {
@ -174,7 +173,6 @@ func (s *SendCardClient) processContentChannel(ctx context.Context, cardSend *Ca
// 通道关闭，发送最终内容
if contentBuilder.Len() > 0 {
if err := s.updateCardContent(ctx, cardSend, cardInstanceId, contentBuilder.String(), client); err != nil {
log.Info("contentBuilder.Len()修改失败1")
s.logger.Errorf("更新卡片失败1:%s", err.Error())
}
}
@ -183,7 +181,6 @@ func (s *SendCardClient) processContentChannel(ctx context.Context, cardSend *Ca
contentBuilder.WriteString(content)
if contentBuilder.Len() > 0 {
if err := s.updateCardContent(ctx, cardSend, cardInstanceId, contentBuilder.String(), client); err != nil {
log.Info("contentBuilder.Len()修改失败2")
s.logger.Errorf("更新卡片失败2：%s", err.Error())
}
}
@ -191,12 +188,10 @@ func (s *SendCardClient) processContentChannel(ctx context.Context, cardSend *Ca
case <-heartbeatTicker.C:
if time.Now().Unix()-lastUpdate.Unix() >= HeardBeatX {
log.Infof("心跳超时,当前时间：%d,最后时间：%d", time.Now().Unix(), lastUpdate.Unix())
return
}
case <-ctx.Done():
log.Info("send_card上下文失效")
s.logger.Info("context canceled, stop channel processing")
return
}

153
internal/biz/llm_service/vllm.go
View File

@ -1,153 +0,0 @@
package llm_service
import (
"ai_scheduler/internal/config"
"ai_scheduler/internal/entitys"
"ai_scheduler/internal/pkg"
"ai_scheduler/internal/pkg/utils_vllm"
"context"
"encoding/base64"
"errors"
"fmt"
"strings"
"github.com/cloudwego/eino/schema"
"github.com/ollama/ollama/api"
)
type VllmService struct {
client *utils_vllm.Client
config *config.Config
}
func NewVllmService(
client *utils_vllm.Client,
config *config.Config,
) *VllmService {
return &VllmService{
client: client,
config: config,
}
}
func (s *VllmService) IntentRecognize(ctx context.Context, req *entitys.ToolSelect) (msg string, err error) {
msgs := s.convertMessages(req.Prompt)
tools := s.convertTools(req.Tools)
resp, err := s.client.ToolSelect(ctx, msgs, tools)
if err != nil {
return
}
if resp.Content == "" {
if len(resp.ToolCalls) > 0 {
call := resp.ToolCalls[0]
var matchFromTools = &entitys.Match{
Confidence: 1,
Index: call.Function.Name,
Parameters: call.Function.Arguments,
IsMatch: true,
}
msg = pkg.JsonStringIgonErr(matchFromTools)
} else {
err = errors.New("不太明白你想表达的意思呢，可以在仔细描述一下您所需要的内容吗，感谢感谢")
return
}
} else {
msg = resp.Content
}
return
}
func (s *VllmService) convertMessages(prompts []api.Message) []*schema.Message {
msgs := make([]*schema.Message, 0, len(prompts))
for _, p := range prompts {
msg := &schema.Message{
Role: schema.RoleType(p.Role),
Content: p.Content,
}
// 这里实际应该不会走进来
if len(p.Images) > 0 {
parts := []schema.MessageInputPart{
{Type: schema.ChatMessagePartTypeText, Text: p.Content},
}
for _, imgData := range p.Images {
b64 := base64.StdEncoding.EncodeToString(imgData)
mimeType := "image/jpeg"
parts = append(parts, schema.MessageInputPart{
Type: schema.ChatMessagePartTypeImageURL,
Image: &schema.MessageInputImage{
MessagePartCommon: schema.MessagePartCommon{
MIMEType: mimeType,
Base64Data: &b64,
},
},
})
}
msg.UserInputMultiContent = parts
}
msgs = append(msgs, msg)
}
return msgs
}
func (s *VllmService) convertTools(tasks []entitys.RegistrationTask) []*schema.ToolInfo {
tools := make([]*schema.ToolInfo, 0, len(tasks))
for _, task := range tasks {
params := make(map[string]*schema.ParameterInfo)
for k, v := range task.TaskConfigDetail.Param.Properties {
dt := schema.String
// Handle v.Type dynamically to support both string and []string (compiler suggests []string)
// Using fmt.Sprint handles both cases safely without knowing exact type structure
typeStr := fmt.Sprintf("%v", v.Type)
typeStr = strings.Trim(typeStr, "[]") // normalize "[string]" -> "string"
switch typeStr {
case "string":
dt = schema.String
case "integer", "int":
dt = schema.Integer
case "number", "float":
dt = schema.Number
case "boolean", "bool":
dt = schema.Boolean
case "object":
dt = schema.Object
case "array":
dt = schema.Array
}
required := false
for _, r := range task.TaskConfigDetail.Param.Required {
if r == k {
required = true
break
}
}
desc := v.Description
if len(v.Enum) > 0 {
var enumStrs []string
for _, e := range v.Enum {
enumStrs = append(enumStrs, fmt.Sprintf("%v", e))
}
desc += " Enum: " + strings.Join(enumStrs, ", ")
}
params[k] = &schema.ParameterInfo{
Type: dt,
Desc: desc,
Required: required,
}
}
tools = append(tools, &schema.ToolInfo{
Name: task.Name,
Desc: task.Desc,
ParamsOneOf: schema.NewParamsOneOfByParams(params),
})
}
return tools
}

3
internal/biz/provider_set.go
View File

@ -3,7 +3,6 @@ package biz
import (
"ai_scheduler/internal/biz/do"
"ai_scheduler/internal/biz/llm_service"
"ai_scheduler/internal/biz/support"
"github.com/google/wire"
)
@ -14,7 +13,6 @@ var ProviderSetBiz = wire.NewSet(
NewChatHistoryBiz,
//llm_service.NewLangChainGenerate,
llm_service.NewOllamaGenerate,
llm_service.NewVllmService,
//handle.NewHandle,
do.NewDo,
do.NewHandle,
@ -23,5 +21,4 @@ var ProviderSetBiz = wire.NewSet(
NewQywxAppBiz,
NewGroupConfigBiz,
do.NewMacro,
support.NewHytAddressIngester,
)

81
internal/biz/support/address_ingest_hyt.go
View File

@ -1,81 +0,0 @@
package support
import (
"ai_scheduler/internal/config"
"ai_scheduler/internal/data/constants"
errorcode "ai_scheduler/internal/data/error"
"ai_scheduler/internal/pkg/util"
"ai_scheduler/internal/pkg/utils_vllm"
"context"
"encoding/json"
"strings"
"time"
"github.com/cloudwego/eino/schema"
"github.com/gofiber/fiber/v2"
)
// HytAddressIngester 货易通地址提取实现
type HytAddressIngester struct {
cfg *config.Config
}
func NewHytAddressIngester(cfg *config.Config) *HytAddressIngester {
return &HytAddressIngester{cfg: cfg}
}
// Auth 鉴权逻辑
func (s *HytAddressIngester) Auth(c *fiber.Ctx) error {
// 读取头
token := strings.TrimSpace(c.Get("X-Source-Key"))
ts := strings.TrimSpace(c.Get("X-Timestamp"))
// 时间窗口校验
if ts != "" && !util.IsInTimeWindow(ts, 5*time.Minute) {
return errorcode.AuthNotFound
}
// token校验
if token == "" || token != constants.TokenAddressIngestHyt {
return errorcode.KeyNotFound
}
return nil
}
// Ingest 执行提取逻辑
func (s *HytAddressIngester) Ingest(ctx context.Context, text string) (*AddressIngestResp, error) {
// 模型调用
client, cleanup, err := utils_vllm.NewClient(s.cfg)
if err != nil {
return nil, err
}
defer cleanup()
res, err := client.Chat(ctx, []*schema.Message{
{
Role: "system",
Content: constants.SystemPromptAddressIngestHyt,
},
{
Role: "user",
Content: text,
},
})
if err != nil {
return nil, err
}
// 解析模型返回结果
var addr AddressIngestResp
// 尝试直接解析
if err := json.Unmarshal([]byte(res.Content), &addr); err != nil {
// 修复json字符串
repairedContent, err := util.JSONRepair(res.Content)
if err != nil {
return nil, errorcode.ParamErrf("invalid response body: %v", err)
}
if err := json.Unmarshal([]byte(repairedContent), &addr); err != nil {
return nil, errorcode.ParamErrf("invalid response body: %v", err)
}
}
return &addr, nil
}

22
internal/biz/support/address_ingest_interface.go
View File

@ -1,22 +0,0 @@
package support
import (
"context"
"github.com/gofiber/fiber/v2"
)
// AddressIngestResp 通用地址提取响应
type AddressIngestResp struct {
Recipient string `json:"recipient"` // 收货人
Phone string `json:"phone"` // 联系电话
Address string `json:"address"` // 收货地址
}
// AddressIngester 地址提取接口
type AddressIngester interface {
// Auth 鉴权逻辑
Auth(c *fiber.Ctx) error
// Ingest 执行提取逻辑
Ingest(ctx context.Context, text string) (*AddressIngestResp, error)
}

9
internal/config/config.go
View File

@ -122,13 +122,8 @@ type OllamaConfig struct {
}
type VllmConfig struct {
VLModel VllmModel `mapstructure:"vl_model"`
TextModel VllmModel `mapstructure:"text_model"`
}
type VllmModel struct {
BaseURL string `mapstructure:"base_url"`
Model string `mapstructure:"model"`
VlModel string `mapstructure:"vl_model"`
Timeout time.Duration `mapstructure:"timeout"`
Level string `mapstructure:"level"`
}
@ -314,7 +309,7 @@ func LoadConfigWithEnv() (*Config, error) {
if err != nil {
return nil, err
}
viper.SetConfigFile(modularDir + "/config/config.yaml")
viper.SetConfigFile(modularDir + "/config/config_env.yaml")
viper.SetConfigType("yaml")
// 读取配置文件
if err := viper.ReadInConfig(); err != nil {

25
internal/data/constants/support.go
View File

@ -1,25 +0,0 @@
package constants
// Token
const (
TokenAddressIngestHyt = "E632C7D3E60771B03264F2337CCFA014" // md5("address_ingest_hyt")
)
// 系统提示词
const (
SystemPromptAddressIngestHyt = `# 你是一个地址信息结构化解析器。
你的任务是从用户提供的非结构化文本中，准确抽取并区分以下字段：
1. 收货人 recipient （真实姓名或带掩码姓名，如“张三”）
2. 联系电话 phone （中国大陆手机号，11位数字）
3. 收货地址 address
解析规则：
- 电话号码只提取最可能的一个
- 不要编造不存在的信息
输出示例：
{\"recipient\": \"张三\",\"phone\": \"13458968095\",\"address\": \"四川省成都市武侯区天府三街88号\"}
输出格式必须为严格 JSON，不要输出任何解释性文字。`
)

2
internal/domain/workflow/recharge/statistics_ours_product.go
View File

@ -125,7 +125,7 @@ func (w *statisticsOursProduct) formatContext(ctx context.Context, input *Statis
Time: time.Now(),
StartTime: startTime,
EndTime: endTime,
Title: fmt.Sprintf("截止 %s 电商系统亏损100以上我们的商品统计", endTimeStr),
Title: fmt.Sprintf("截止 %s 亏损100以上我们的商品统计", endTimeStr),
}, nil
}

73
internal/pkg/util/string.go
View File

@ -2,8 +2,6 @@ package util
import (
"encoding/json"
"fmt"
"regexp"
"strconv"
"strings"
)
@ -44,74 +42,3 @@ func Contains[T comparable](strings []T, str T) bool {
}
return false
}
// json LLM专用字符串修复
func JSONRepair(input string) (string, error) {
s := strings.TrimSpace(input)
s = trimToJSONObject(s)
s = normalizeQuotes(s)
s = removeTrailingCommas(s)
s = quoteObjectKeys(s)
s = balanceBrackets(s)
// 最终校验
var js any
if err := json.Unmarshal([]byte(s), &js); err != nil {
return "", fmt.Errorf("json repair failed: %w", err)
}
return s, nil
}
// 裁剪前后垃圾文本
func trimToJSONObject(s string) string {
start := strings.IndexAny(s, "{[")
end := strings.LastIndexAny(s, "}]")
if start == -1 || end == -1 || start >= end {
return s
}
return s[start : end+1]
}
// 引号统一
func normalizeQuotes(s string) string {
// 只替换“看起来像字符串的单引号”
re := regexp.MustCompile(`'([^']*)'`)
return re.ReplaceAllString(s, `"$1"`)
}
// 删除尾随逗号
func removeTrailingCommas(s string) string {
re := regexp.MustCompile(`,(\s*[}\]])`)
return re.ReplaceAllString(s, `$1`)
}
// 给 object key 自动补双引号
func quoteObjectKeys(s string) string {
re := regexp.MustCompile(`([{,]\s*)([a-zA-Z0-9_]+)\s*:`)
return re.ReplaceAllString(s, `$1"$2":`)
}
// 括号补齐
func balanceBrackets(s string) string {
var stack []rune
for _, r := range s {
switch r {
case '{', '[':
stack = append(stack, r)
case '}', ']':
if len(stack) > 0 {
stack = stack[:len(stack)-1]
}
}
}
for i := len(stack) - 1; i >= 0; i-- {
switch stack[i] {
case '{':
s += "}"
case '[':
s += "]"
}
}
return s
}

12
internal/pkg/utils_ollama/client.go
View File

@ -8,7 +8,6 @@ import (
"net/url"
"os"
"sync"
"time"
"github.com/ollama/ollama/api"
)
@ -44,12 +43,11 @@ func (c *Client) ToolSelect(ctx context.Context, messages []api.Message, tools [
// 构建聊天请求
req := &api.ChatRequest{
Model: c.config.Model,
Messages: messages,
Stream: new(bool), // 设置为false，不使用流式响应
Think: &api.ThinkValue{Value: false},
Tools: tools,
KeepAlive: &api.Duration{Duration: 24 * time.Hour},
Model: c.config.Model,
Messages: messages,
Stream: new(bool), // 设置为false，不使用流式响应
Think: &api.ThinkValue{Value: false},
Tools: tools,
}
err = c.client.Chat(ctx, req, func(resp api.ChatResponse) error {
res = resp

52
internal/pkg/utils_vllm/client.go
View File

@ -7,63 +7,33 @@ import (
"encoding/base64"
"github.com/cloudwego/eino-ext/components/model/openai"
"github.com/cloudwego/eino/components/model"
"github.com/cloudwego/eino/schema"
)
type Client struct {
vlModel *openai.ChatModel
generateModel *openai.ChatModel
config *config.Config
model *openai.ChatModel
config *config.Config
}
func NewClient(config *config.Config) (*Client, func(), error) {
// 初始化视觉模型
vl, err := openai.NewChatModel(context.Background(), &openai.ChatModelConfig{
BaseURL: config.Vllm.VLModel.BaseURL,
Model: config.Vllm.VLModel.Model,
Timeout: config.Vllm.VLModel.Timeout,
m, err := openai.NewChatModel(context.Background(), &openai.ChatModelConfig{
BaseURL: config.Vllm.BaseURL,
Model: config.Vllm.VlModel,
Timeout: config.Vllm.Timeout,
})
if err != nil {
return nil, nil, err
}
// 初始化生成模型
gen, err := openai.NewChatModel(context.Background(), &openai.ChatModelConfig{
BaseURL: config.Vllm.TextModel.BaseURL,
Model: config.Vllm.TextModel.Model,
Timeout: config.Vllm.TextModel.Timeout,
ExtraFields: map[string]any{
"chat_template_kwargs": map[string]any{
"enable_thinking": false,
},
},
})
if err != nil {
return nil, nil, err
}
c := &Client{
vlModel: vl,
generateModel: gen,
config: config,
}
c := &Client{model: m, config: config}
cleanup := func() {}
return c, cleanup, nil
}
func (c *Client) Chat(ctx context.Context, msgs []*schema.Message) (*schema.Message, error) {
// 默认聊天使用生成模型
return c.generateModel.Generate(ctx, msgs)
}
func (c *Client) ToolSelect(ctx context.Context, msgs []*schema.Message, tools []*schema.ToolInfo) (*schema.Message, error) {
// 工具选择使用生成模型
return c.generateModel.Generate(ctx, msgs, model.WithTools(tools))
return c.model.Generate(ctx, msgs)
}
func (c *Client) RecognizeWithImg(ctx context.Context, systemPrompt, userPrompt string, imgURLs []string) (*schema.Message, error) {
// 图片识别使用视觉模型
in := []*schema.Message{
{
Role: schema.System,
@ -88,12 +58,11 @@ func (c *Client) RecognizeWithImg(ctx context.Context, systemPrompt, userPrompt
}
in[1].UserInputMultiContent = parts
return c.vlModel.Generate(ctx, in)
return c.model.Generate(ctx, in)
}
// 识别图片by二进制文件
func (c *Client) RecognizeWithImgBytes(ctx context.Context, systemPrompt, userPrompt string, imgBytes []byte, imgType string) (*schema.Message, error) {
// 图片识别使用视觉模型
in := []*schema.Message{
{
Role: schema.System,
@ -113,10 +82,9 @@ func (c *Client) RecognizeWithImgBytes(ctx context.Context, systemPrompt, userPr
MIMEType: imgType,
Base64Data: util.AnyToPoint(base64.StdEncoding.EncodeToString(imgBytes)),
},
Detail: schema.ImageURLDetailHigh,
},
})
in[1].UserInputMultiContent = parts
return c.vlModel.Generate(ctx, in)
return c.model.Generate(ctx, in)
}

40
internal/server/cron.go
View File

@ -3,7 +3,6 @@ package server
import (
"ai_scheduler/internal/services"
"context"
"fmt"
"github.com/gofiber/fiber/v2/log"
"github.com/robfig/cron/v3"
@ -21,7 +20,6 @@ type cronJob struct {
EntryId int32
Func func(context.Context) error
Name string
Key string
Schedule string
}
@ -44,13 +42,11 @@ func (c *CronServer) InitJobs(ctx context.Context) {
{
Func: c.cronService.CronReportSendDingTalk,
Name: "直连天下报表推送（钉钉）",
Key: "ding_report_dingtalk",
Schedule: "20 12,18,23 * * *",
},
{
Func: c.cronService.CronReportSendQywx,
Name: "直连天下报表推送（微信）",
Key: "ding_report_qywx",
Schedule: "20 12,18,23 * * *",
},
}
@ -100,39 +96,3 @@ func (c *CronServer) Stop() {
c.log.Info("Cron调度器已停止")
}
}
func (c *CronServer) RunOnce(ctx context.Context, key string) error {
if c.jobs == nil {
c.InitJobs(ctx)
}
// 获取key对应的任务
var job *cronJob
for _, j := range c.jobs {
if j.Key == key {
job = j
break
}
}
if job == nil {
return fmt.Errorf("unknown job key: %s\n", key)
}
defer func() {
if r := recover(); r != nil {
fmt.Printf("任务[once]:%s执行时发生panic: %v\n", job.Name, r)
}
fmt.Printf("任务[once]:%s执行结束\n", job.Name)
}()
fmt.Printf("任务[once]:%s开始执行\n", job.Name)
err := job.Func(ctx)
if err != nil {
return fmt.Errorf("任务[once]:%s执行失败: %s\n", job.Name, err.Error())
}
fmt.Printf("任务[once]:%s执行成功\n", job.Name)
return nil
}

4
internal/server/http.go
View File

@ -18,7 +18,6 @@ type HTTPServer struct {
callback *services.CallbackService
chatHis *services.HistoryService
capabilityService *services.CapabilityService
supportService *services.SupportService
}
func NewHTTPServer(
@ -29,11 +28,10 @@ func NewHTTPServer(
callback *services.CallbackService,
chatHis *services.HistoryService,
capabilityService *services.CapabilityService,
supportService *services.SupportService,
) *fiber.App {
//构建 server
app := initRoute()
router.SetupRoutes(app, service, session, task, gateway, callback, chatHis, capabilityService, supportService)
router.SetupRoutes(app, service, session, task, gateway, callback, chatHis, capabilityService)
return app
}

5
internal/server/router/router.go
View File

@ -26,7 +26,7 @@ type RouterServer struct {
// SetupRoutes 设置路由
func SetupRoutes(app *fiber.App, ChatService *services.ChatService, sessionService *services.SessionService, task *services.TaskService,
gateway *gateway.Gateway, callbackService *services.CallbackService, chatHist *services.HistoryService,
capabilityService *services.CapabilityService, supportService *services.SupportService,
capabilityService *services.CapabilityService,
) {
app.Use(func(c *fiber.Ctx) error {
// 设置 CORS 头
@ -98,9 +98,6 @@ func SetupRoutes(app *fiber.App, ChatService *services.ChatService, sessionServi
// 能力
r.Post("/capability/product/ingest", capabilityService.ProductIngest) // 商品数据提取
r.Post("/capability/product/ingest/:thread_id/confirm", capabilityService.ProductIngestConfirm) // 商品数据提取确认
// 外部系统支持
r.Post("/support/address/ingest/:platform", supportService.AddressIngest) // 通用收获地址提取
}
func routerSocket(app *fiber.App, chatService *services.ChatService) {

18
internal/services/cron.go
View File

@ -50,18 +50,12 @@ func (d *CronService) CronReportSendDingTalk(ctx context.Context) error {
return err
}
// for _, report := range reports {
// err = d.dingTalkBotBiz.SendReport(ctx, &groupInfo, report)
// if err != nil {
// log.Error(err)
// continue
// }
// }
err = d.dingTalkBotBiz.SendReports(ctx, &groupInfo, reports)
if err != nil {
log.Error(err)
return err
for _, report := range reports {
err = d.dingTalkBotBiz.SendReport(ctx, &groupInfo, report)
if err != nil {
log.Error(err)
continue
}
}
return nil
}

8
internal/services/dtalk_bot.go
View File

@ -64,15 +64,9 @@ func (d *DingBotService) runBackgroundTasks(ctx context.Context, data *chatbot.B
g.Go(func() error {
defer func() {
// 确保通道最终关闭
log.Println("流式处理协程关闭")
close(resChan)
}()
err := d.dingTalkBotBiz.HandleStreamRes(ctx, data, resChan)
if err != nil {
log.Println("流式回复产生错误，错误：", err.Error())
}
return err
return d.dingTalkBotBiz.HandleStreamRes(ctx, data, resChan)
})
// 2. 业务处理协程（负责关闭requireData.Ch）

8
internal/services/dtalk_bot_test.go
View File

@ -92,7 +92,7 @@ func run() {
// 初始化Ollama服务
ollamaService := llm_service.NewOllamaGenerate(client, utils_vllmClient, configConfig, chatHisImpl)
// 初始化工具管理器
manager := tools.NewManager(configConfig, client, rdb)
manager := tools.NewManager(configConfig, client)
// 初始化钉钉联系人客户端
contactClient, _ := dingtalk.NewContactClient(configConfig)
// 初始化钉钉记事本客户端
@ -120,10 +120,8 @@ func run() {
group := qywx.NewGroup(botGroupQywxImpl, qywxAuth)
other := qywx.NewOther(qywxAuth)
qywxAppBiz := biz.NewQywxAppBiz(configConfig, botGroupQywxImpl, group, other)
reportDailyCacheImpl := impl.NewReportDailyCacheImpl(db)
macro := do.NewMacro(botGroupImpl, reportDailyCacheImpl, configConfig, rdb)
groupConfigBiz := biz.NewGroupConfigBiz(toolRegis, utils_ossClient, botGroupConfigImpl, registry, configConfig, impl.NewReportDailyCacheImpl(db), rdb, macro, manager, handle)
dingTalkBotBiz := biz.NewDingTalkBotBiz(doDo, handle, botConfigImpl, botGroupImpl, user, botChatHisImpl, reportDailyCacheImpl, manager, configConfig, sendCardClient, groupConfigBiz, macro)
groupConfigBiz := biz.NewGroupConfigBiz(toolRegis, utils_ossClient, botGroupConfigImpl, registry, configConfig, impl.NewReportDailyCacheImpl(db), rdb)
dingTalkBotBiz := biz.NewDingTalkBotBiz(doDo, handle, botConfigImpl, botGroupImpl, user, botChatHisImpl, impl.NewReportDailyCacheImpl(db), manager, configConfig, sendCardClient, groupConfigBiz)
// 初始化钉钉机器人服务
cronService = NewCronService(configConfig, dingTalkBotBiz, qywxAppBiz, groupConfigBiz)
}

1
internal/services/provider_set.go
View File

@ -15,5 +15,4 @@ var ProviderSetServices = wire.NewSet(
NewHistoryService,
NewCapabilityService,
NewCronService,
NewSupportService,
)

61
internal/services/support.go
View File

@ -1,61 +0,0 @@
package services
import (
"ai_scheduler/internal/biz/support"
"ai_scheduler/internal/config"
errorcode "ai_scheduler/internal/data/error"
"github.com/gofiber/fiber/v2"
)
type SupportService struct {
cfg *config.Config
addressIngester map[string]support.AddressIngester
addressIngestHyt *support.HytAddressIngester
}
func NewSupportService(cfg *config.Config, addressIngestHyt *support.HytAddressIngester) *SupportService {
s := &SupportService{
cfg: cfg,
addressIngester: map[string]support.AddressIngester{
"hyt": addressIngestHyt,
},
}
return s
}
type AddressIngestReq struct {
Text string `json:"text"` // 待提取文本
}
// AddressIngest 收获地址提取
func (s *SupportService) AddressIngest(c *fiber.Ctx) error {
platform := c.Params("platform")
ingester, ok := s.addressIngester[platform]
if !ok {
return errorcode.ParamErrf("unsupported platform: %s", platform)
}
// 鉴权
if err := ingester.Auth(c); err != nil {
return err
}
// 解析请求参数 body
req := AddressIngestReq{}
if err := c.BodyParser(&req); err != nil {
return errorcode.ParamErrf("invalid request body: %v", err)
}
// 必要参数校验
if req.Text == "" {
return errorcode.ParamErrf("missing required fields")
}
// 执行提取
res, err := ingester.Ingest(c.Context(), req.Text)
if err != nil {
return err
}
return c.JSON(res)
}

140
internal/tools/bbxt/bbxt.go
View File

@ -13,8 +13,6 @@ import (
"sort"
"time"
"github.com/shopspring/decimal"
)
const (
@ -39,8 +37,6 @@ var ResellerBlackListProduct = []string{
"蓝星严选连续包月",
"通钱-2025年12月",
"彦浩同行",
"运营部测试专用",
"彦浩直客商户",
}
type BbxtTools struct {
@ -95,7 +91,9 @@ func (b *BbxtTools) DailyReport(
if err != nil {
return
}
reports = append(reports, profitRankingSum, statisOfficialProductSum, statisOfficialProductSumDecline, productLossReport)
reports = append(reports, productLossReport...)
reports = append(reports, profitRankingSum, statisOfficialProductSum, statisOfficialProductSumDecline)
if ossClient != nil {
uploader := NewUploader(ossClient, b.config)
for _, report := range reports {
@ -137,9 +135,7 @@ func (b *BbxtTools) ResellerLossSort(ctx context.Context, now time.Time) ([]*Res
reseller := resellerMap[info.ResellerId]
// 累加经销商总亏损
num1 := decimal.NewFromFloat(reseller.Total)
num2 := decimal.NewFromFloat(info.Loss)
reseller.Total, _ = num1.Add(num2).Round(2).Float64()
reseller.Total += info.Loss
// 检查产品是否已存在
if _, ok := reseller.ProductLoss[info.OursProductId]; !ok {
@ -213,66 +209,61 @@ func (b *BbxtTools) ResellerLossToMapResellerLossSumProductRelation(totalDetail
}
// StatisOursProductLossSum 负利润分析
func (b *BbxtTools) StatisOursProductLossSum(ctx context.Context, now time.Time, initFunc LossSumInitFunc) (report *ReportRes, err error) {
func (b *BbxtTools) StatisOursProductLossSum(ctx context.Context, now time.Time, initFunc LossSumInitFunc) (report []*ReportRes, err error) {
resellers, err := b.ResellerLossSort(ctx, now)
var (
total [][]string
//gt []*ResellerLoss
total [][]string
gt []*ResellerLoss
totalDetail []*ResellerLoss
totalSum = decimal.NewFromFloat(0)
//totalSum500 float64
totalSum float64
totalSum500 float64
)
// 构建分组
for _, v := range resellers {
if slices.Contains(ResellerBlackListProduct, v.ResellerName) {
continue
}
if v.Total <= -100 {
if v.Total <= -100 && !slices.Contains(ResellerBlackListProduct, v.ResellerName) {
total = append(total, []string{
fmt.Sprintf("%s", v.ResellerName),
fmt.Sprintf("%.2f", v.Total),
})
totalSum += v.Total
totalDetail = append(totalDetail, v)
}
num := decimal.NewFromFloat(v.Total)
totalSum = totalSum.Add(num).Round(2)
//if v.Total <= -500 && !slices.Contains(ResellerBlackListProduct, v.ResellerName) {
// gt = append(gt, v)
// totalSum500 += v.Total
//}
if v.Total <= -500 && !slices.Contains(ResellerBlackListProduct, v.ResellerName) {
gt = append(gt, v)
totalSum500 += v.Total
}
}
//report = make([]*ReportRes, 3)
report = make([]*ReportRes, 3)
timeCh := now.Format("1月2日15点")
//总量生成excel
//if len(total) > 0 {
// filePath := b.cacheDir + "/kshj_total" + fmt.Sprintf("%d%d", time.Now().Unix(), rand.Intn(1000)) + ".xlsx"
// err = b.SimpleFillExcelWithTitle(b.excelTempDir+"/"+"kshj_total.xlsx", filePath, total, "")
// if err != nil {
// return
// }
// report[0] = &ReportRes{
// ReportName: "分销商负利润统计",
// Title: "截至" + timeCh + "利润累计亏损" + fmt.Sprintf("%.2f", totalSum),
// Path: filePath,
// Data: total,
// }
//}
//
//if len(gt) > 0 {
// filePath := b.cacheDir + "/kshj_gt" + fmt.Sprintf("%d%d", time.Now().Unix(), rand.Intn(1000)) + ".xlsx"
// title := "截至" + timeCh + "亏损500以上的分销商和产品"
// err = b.resellerDetailFillExcelV2(b.excelTempDir+"/"+"kshj_gt.xlsx", filePath, gt, title)
// if err != nil {
// return
// }
// report[1] = &ReportRes{
// ReportName: "负利润分析(亏损500以上)",
// Title: "截至" + timeCh + "亏损500以上利润累计亏损" + fmt.Sprintf("%.2f", totalSum500),
// Path: filePath,
// Data: total,
// }
//}
if len(total) > 0 {
filePath := b.cacheDir + "/kshj_total" + fmt.Sprintf("%d%d", time.Now().Unix(), rand.Intn(1000)) + ".xlsx"
err = b.SimpleFillExcelWithTitle(b.excelTempDir+"/"+"kshj_total.xlsx", filePath, total, "")
if err != nil {
return
}
report[0] = &ReportRes{
ReportName: "分销商负利润统计",
Title: "截至" + timeCh + "利润累计亏损" + fmt.Sprintf("%.2f", totalSum),
Path: filePath,
Data: total,
}
}
if len(gt) > 0 {
filePath := b.cacheDir + "/kshj_gt" + fmt.Sprintf("%d%d", time.Now().Unix(), rand.Intn(1000)) + ".xlsx"
title := "截至" + timeCh + "亏损500以上的分销商和产品"
err = b.resellerDetailFillExcelV2(b.excelTempDir+"/"+"kshj_gt.xlsx", filePath, gt, title)
if err != nil {
return
}
report[1] = &ReportRes{
ReportName: "负利润分析(亏损500以上)",
Title: "截至" + timeCh + "亏损500以上利润累计亏损" + fmt.Sprintf("%.2f", totalSum500),
Path: filePath,
Data: total,
}
}
if len(totalDetail) > 0 {
err = initFunc(ctx, now, totalDetail, b)
@ -280,15 +271,14 @@ func (b *BbxtTools) StatisOursProductLossSum(ctx context.Context, now time.Time,
return
}
filePath := b.cacheDir + "/kshj_total_ana" + fmt.Sprintf("%d%d", time.Now().Unix(), rand.Intn(1000)) + ".xlsx"
totalSumFloat64, _ := totalSum.Float64()
title := "截至" + timeCh + "利润累计亏损" + fmt.Sprintf("%.2f", totalSumFloat64) + ",亏损100以上利润原因如下"
title := "截至" + timeCh + "亏损100以上的分销商&产品负利润原因"
err = b.resellerDetailFillExcelAna(b.excelTempDir+"/"+"kshj_total_ana.xlsx", filePath, totalDetail, title)
if err != nil {
return
}
report = &ReportRes{
report[2] = &ReportRes{
ReportName: "负利润分析(亏损100以上)",
Title: title,
Title: "截至" + timeCh + "亏损100以上利润原因",
Path: filePath,
Data: total,
}
@ -368,13 +358,7 @@ func (b *BbxtTools) GetProfitRankingSum(now time.Time) (report *ReportRes, err e
if err != nil {
return
}
if len(data.List) == 0 {
return nil, nil
}
maxLen := 20
if len(data.List) < maxLen {
maxLen = len(data.List)
}
//排序
sort.Slice(data.List, func(i, j int) bool {
return data.List[i].HistoryOneDiff > data.List[j].HistoryOneDiff
@ -382,7 +366,7 @@ func (b *BbxtTools) GetProfitRankingSum(now time.Time) (report *ReportRes, err e
//取前20和后20
var (
total [][]string
top = data.List[:maxLen]
top = data.List[:20]
bottom = data.List[len(data.List)-20:]
)
//合并前20和后20
@ -419,6 +403,10 @@ func (b *BbxtTools) GetProfitRankingSum(now time.Time) (report *ReportRes, err e
// GetStatisOfficialProductSum 销量同比分析
func (b *BbxtTools) GetStatisOfficialProductSum(now time.Time, productName []string) (report *ReportRes, err error) {
var productMap = make(map[string]int)
for k, v := range productName {
productMap[v] = k
}
ct := []string{
time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()).Format("2006-01-02 15:04:05"),
adjustedTime(now),
@ -440,11 +428,7 @@ func (b *BbxtTools) GetStatisOfficialProductSum(now time.Time, productName []str
if err != nil {
return
}
// 创建临时map存储产品数据
productDataMap := make(map[string][]string)
var productNamesInResult []string
var total = make([][]string, len(ids))
for _, v := range data.OfficialProductSum {
var (
yeterDatyDiff string
@ -460,8 +444,7 @@ func (b *BbxtTools) GetStatisOfficialProductSum(now time.Time, productName []str
} else {
lastWeekDiff = fmt.Sprintf("%s↓%d", GreenStyle, v.HistoryTwoDiff)
}
rowData := []string{
total[productMap[v.OfficialProductName]] = []string{
fmt.Sprintf("%s", v.OfficialProductName),
fmt.Sprintf("%d", v.CurrentNum),
fmt.Sprintf("%d", v.HistoryOneNum),
@ -470,20 +453,7 @@ func (b *BbxtTools) GetStatisOfficialProductSum(now time.Time, productName []str
lastWeekDiff,
}
// 存储到map中，key为产品名
productDataMap[v.OfficialProductName] = rowData
productNamesInResult = append(productNamesInResult, v.OfficialProductName)
}
// 按照productName的顺序构建total
var total [][]string
for _, name := range productName {
if rowData, exists := productDataMap[name]; exists {
total = append(total, rowData)
}
}
timeCh := now.Format("1月2日15点")
title := "截至" + timeCh + "销售同比分析"
//总量生成excel

16
internal/tools/bbxt/bbxt_test.go
View File

@ -79,22 +79,14 @@ func Test_GetStatisOfficialProductSumDecline(t *testing.T) {
}
func Test_GetStatisOfficialProductSum(t *testing.T) {
run()
configs := configConfig
o, err := NewBbxtTools(nil, lsxd.NewLogin(configs, utils.NewRdb(configConfig)))
if err != nil {
panic(err)
}
s := "官方--腾讯-周卡,官方--腾讯-月卡,官方--腾讯-季卡,官方--腾讯-年卡,官方--优酷周卡,官方--优酷月卡,官方--优酷季卡,官方--优酷年卡,官方--爱奇艺-周卡,官方--爱奇艺-月卡,官方--爱奇艺-季卡,官方--爱奇艺-年卡,官方--芒果-PC周卡,官方--芒果-PC月卡,官方--芒果-PC季卡,官方--美团外卖红包5元,官方--美团外卖红包10元,官方--QQ音乐-绿钻月卡,官方--饿了么超级会员月卡,官方--网易云黑胶vip月卡,官方--喜马拉雅巅峰会员月卡"
now := time.Now()
noon := time.Date(
now.Year(),
now.Month(),
now.Day(),
12, 0, 0, 0,
now.Location(),
)
report, err := o.GetStatisOfficialProductSum(noon, strings.Split(s, ","))
s := "官方--美团外卖红包5元,官方--美团外卖红包10元,官方--饿了么超级会员月卡,官方--网易云黑胶vip月卡,官方--喜马拉雅巅峰会员月卡,官方--芒果-PC季卡,官方--芒果-PC月卡,官方--芒果-PC周卡,官方--腾讯-周卡,官方--优酷周卡,官方--QQ音乐-绿钻月卡,官方--爱奇艺-周卡,官方--腾讯-月卡,官方--腾讯-季卡,官方--腾讯-年卡,官方--优酷月卡,官方--优酷季卡,官方--优酷年卡,官方--爱奇艺-月卡,官方--爱奇艺-季卡,官方--爱奇艺-年卡"
report, err := o.GetStatisOfficialProductSum(time.Now(), strings.Split(s, ","))
t.Log(report, err)
@ -106,7 +98,7 @@ var (
)
func run() {
configConfig, _ = config.LoadConfigWithEnv()
configConfig, _ = config.LoadConfigWithTest()
// 初始化数据库连接
db, _ := utils.NewGormDb(configConfig)
reportDailyCacheImpl = impl.NewReportDailyCacheImpl(db)

33
internal/tools/bbxt/excel.go
View File

@ -343,17 +343,14 @@ func (b *BbxtTools) resellerDetailFillExcelAna(templatePath, outputPath string,
styleD3, err := f.GetCellStyle(sheet, fmt.Sprintf("D%d", tplRowData))
if err != nil {
styleD3 = 0
styleC3 = 0
}
styleE3, err := f.GetCellStyle(sheet, fmt.Sprintf("E%d", tplRowData))
if err != nil {
styleE3 = 0
}
styleF3, err := f.GetCellStyle(sheet, fmt.Sprintf("F%d", tplRowData))
if err != nil {
styleF3 = 0
styleC3 = 0
}
rowHeightData, err := f.GetRowHeight(sheet, tplRowData)
if err != nil {
rowHeightData = 20
@ -375,15 +372,11 @@ func (b *BbxtTools) resellerDetailFillExcelAna(templatePath, outputPath string,
}
styleTotalD, err := f.GetCellStyle(sheet, fmt.Sprintf("D%d", tplRowTotal))
if err != nil {
styleTotalD = 0
styleTotalC = 0
}
styleTotalE, err := f.GetCellStyle(sheet, fmt.Sprintf("E%d", tplRowTotal))
if err != nil {
styleTotalE = 0
}
styleTotalF, err := f.GetCellStyle(sheet, fmt.Sprintf("F%d", tplRowTotal))
if err != nil {
styleTotalF = 0
styleTotalC = 0
}
rowHeightTotal, err := f.GetRowHeight(sheet, tplRowTotal)
if err != nil {
@ -415,9 +408,8 @@ func (b *BbxtTools) resellerDetailFillExcelAna(templatePath, outputPath string,
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)
f.SetCellValue(sheet, fmt.Sprintf("D%d", currentRow), reseller.Total)
f.SetCellValue(sheet, fmt.Sprintf("E%d", currentRow), reseller.Manager)
f.SetCellValue(sheet, fmt.Sprintf("F%d", currentRow), p.LossReason)
f.SetCellValue(sheet, fmt.Sprintf("D%d", currentRow), reseller.Manager)
f.SetCellValue(sheet, fmt.Sprintf("E%d", currentRow), p.LossReason)
// 设置样式
if styleA3 != 0 {
f.SetCellStyle(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("A%d", currentRow), styleA3)
@ -434,9 +426,7 @@ func (b *BbxtTools) resellerDetailFillExcelAna(templatePath, outputPath string,
if styleE3 != 0 {
f.SetCellStyle(sheet, fmt.Sprintf("E%d", currentRow), fmt.Sprintf("E%d", currentRow), styleE3)
}
if styleF3 != 0 {
f.SetCellStyle(sheet, fmt.Sprintf("F%d", currentRow), fmt.Sprintf("F%d", currentRow), styleF3)
}
totalLoss += p.Loss
currentRow++
}
@ -446,7 +436,6 @@ func (b *BbxtTools) resellerDetailFillExcelAna(templatePath, outputPath string,
if endRow > startRow {
f.MergeCell(sheet, fmt.Sprintf("A%d", startRow), fmt.Sprintf("A%d", endRow))
f.MergeCell(sheet, fmt.Sprintf("D%d", startRow), fmt.Sprintf("D%d", endRow))
f.MergeCell(sheet, fmt.Sprintf("E%d", startRow), fmt.Sprintf("E%d", endRow))
}
}
@ -458,7 +447,7 @@ func (b *BbxtTools) resellerDetailFillExcelAna(templatePath, outputPath string,
f.SetCellValue(sheet, fmt.Sprintf("A%d", currentRow), "合计")
// B列留空，C列填充总亏损
f.SetCellValue(sheet, fmt.Sprintf("D%d", currentRow), totalLoss)
f.SetCellValue(sheet, fmt.Sprintf("C%d", currentRow), totalLoss)
// 设置合计行样式
if styleTotalA != 0 {
@ -476,9 +465,7 @@ func (b *BbxtTools) resellerDetailFillExcelAna(templatePath, outputPath string,
if styleTotalE != 0 {
f.SetCellStyle(sheet, fmt.Sprintf("E%d", currentRow), fmt.Sprintf("E%d", currentRow), styleTotalE)
}
if styleTotalF != 0 {
f.SetCellStyle(sheet, fmt.Sprintf("F%d", currentRow), fmt.Sprintf("F%d", currentRow), styleTotalF)
}
// 取消合并合计行的A、B列
// f.MergeCell(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("B%d", currentRow))

BIN
tmpl/excel_temp/kshj_total_ana.xlsx
View File

Binary file not shown.