临时提交

go.mod

@@ -3,9 +3,8 @@ module git.x2erp.com/qdy/go-svc-mercury
 go 1.25.4
 
 require (
-	git.x2erp.com/qdy/go-base v0.1.70
-	git.x2erp.com/qdy/go-db v0.1.70
-	go-micro.dev/v4 v4.11.0
+	git.x2erp.com/qdy/go-base v0.2.17
+	git.x2erp.com/qdy/go-db v0.2.17
 )
 
 require (
@@ -14,4 +13,23 @@ require (
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 )
 
-require gopkg.in/yaml.v2 v2.4.0 // indirect
+require (
+	filippo.io/edwards25519 v1.1.0 // indirect
+	github.com/go-resty/resty/v2 v2.17.0 // indirect
+	github.com/go-sql-driver/mysql v1.9.3 // indirect
+	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
+	github.com/golang-sql/sqlexp v0.1.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/jmoiron/sqlx v1.4.0 // indirect
+	github.com/lib/pq v1.10.9 // indirect
+	github.com/microsoft/go-mssqldb v1.9.4 // indirect
+	github.com/sijms/go-ora/v2 v2.9.0 // indirect
+	github.com/stretchr/testify v1.11.1 // indirect
+	go.uber.org/multierr v1.10.0 // indirect
+	go.uber.org/zap v1.27.1 // indirect
+	golang.org/x/crypto v0.46.0 // indirect
+	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+)

go.sum

@@ -1,14 +1,74 @@
-git.x2erp.com/qdy/go-base v0.1.44 h1:xHpMppSNj79lqdUc+lmgGXOgEvHyNotUayoe5/hHWr4=
-git.x2erp.com/qdy/go-base v0.1.44/go.mod h1:Q+YLwpCoU8CVSnzATLdz2LAzVMlz/CEGzo8DePf7cug=
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+git.x2erp.com/qdy/go-base v0.1.70 h1:P5IOfSN6CnXcBYIrs+4BULYemPyzcgrFMkI7TcCri5A=
+git.x2erp.com/qdy/go-base v0.2.17 h1:uZ/rp/j78E6k16mOe7YOZb9/Hb5vI1FQ1JQMJGXVacM=
+git.x2erp.com/qdy/go-base v0.2.17/go.mod h1:f9SWxJLOW7k4D5HHZu4qSPb04yRGqBrfCuytPnOqN1Q=
+git.x2erp.com/qdy/go-db v0.1.70 h1:5VfvFxCmQ0+9OFEaPrTODYJ99wam+4lPjz4Y024SUdc=
+git.x2erp.com/qdy/go-db v0.2.17 h1:otPqNhpu9Zt8B2R77lGdpzW9vX/2NVs7BC32Ylyi0s4=
+git.x2erp.com/qdy/go-db v0.2.17/go.mod h1:/+k/JZ/KkDtWs3sHOerhVPK0kL4bJ/aIDizAIdsYyTE=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 h1:Gt0j3wceWMwPmiazCa8MzMA0MfhmPIz0Qp0FJ6qcM0U=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 h1:B+blDbyVIG3WaikNxPnhPiJ1MThR03b3vKGtER95TP4=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 h1:FPKJS1T+clwv+OLGt13a8UjqeRuh0O4SJ3lUriThc+4=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.1 h1:Wgf5rZba3YZqeTNJPtvqZoBu1sBN/L4sry+u2U3Y75w=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 h1:bFWuoEKg+gImo7pvkiQEFAc8ocibADgXeiLAxWhWmkI=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJe7PpYPXT5A29ZkwJaPqcva7BVeemZOZs=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/go-resty/resty/v2 v2.17.0 h1:pW9DeXcaL4Rrym4EZ8v7L19zZiIlWPg5YXAcVmt+gN0=
+github.com/go-resty/resty/v2 v2.17.0/go.mod h1:kCKZ3wWmwJaNc7S29BRtUhJwy7iqmn+2mLtQrOyQlVA=
+github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
+github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
+github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
+github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
+github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/microsoft/go-mssqldb v1.9.4 h1:sHrj3GcdgkxytZ09aZ3+ys72pMeyEXJowT44j74pNgs=
+github.com/microsoft/go-mssqldb v1.9.4/go.mod h1:GBbW9ASTiDC+mpgWDGKdm3FnFLTUsLYN3iFL90lQ+PA=
+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
-go-micro.dev/v4 v4.11.0 h1:DZ2xcr0pnZJDlp6MJiCLhw4tXRxLw9xrJlPT91kubr0=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/sijms/go-ora/v2 v2.9.0 h1:+iQbUeTeCOFMb5BsOMgUhV8KWyrv9yjKpcK4x7+MFrg=
+github.com/sijms/go-ora/v2 v2.9.0/go.mod h1:QgFInVi3ZWyqAiJwzBQA+nbKYKH77tdp1PYoCqhR2dU=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
+go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
+go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
+golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
+golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

internal/cmd/sql_scheme.md

@@ -0,0 +1,92 @@
+我需要创建一个服装行业数据仓库的商品资料表，用于统计分析并为配货、补货、调拨提供决策支持。
+
+## 表信息
+- **表名**: `dw_product_master` (dw=数据仓库，product_master=商品主档)
+- **模型名称**: `DWProductMaster`
+- **表注释**: 商品资料主表 - 服装行业数据仓库核心表，存储商品基础信息与统计分析维度
+
+## 字段需求（国际化命名）
+
+### 1. 主键标识
+- **id**: 主键ID (bigint, 自增)
+
+### 2. 商品基础信息
+- **product_code**: 商品编码/货号 (varchar(50), 唯一索引)
+- **product_barcode**: 国际商品条码/EAN码 (varchar(20), 索引)
+- **product_name**: 商品名称 (varchar(200))
+- **product_name_en**: 商品英文名称 (varchar(200), 可选)
+- **product_short_name**: 商品简称/缩写 (varchar(100))
+
+### 3. 分类与品牌
+- **category_id**: 商品分类ID (bigint, 索引)
+- **category_code**: 分类代码 (varchar(20))
+- **category_name**: 分类名称 (varchar(100))
+- **brand_id**: 品牌ID (bigint, 索引)
+- **brand_code**: 品牌代码 (varchar(20))
+- **brand_name**: 品牌名称 (varchar(100))
+
+### 4. 规格属性（服装行业特性）
+- **style_code**: 款式编码 (varchar(30), 索引)
+- **color_code**: 颜色代码 (varchar(20))
+- **color_name**: 颜色名称 (varchar(50))
+- **size_code**: 尺码代码 (varchar(10))
+- **size_name**: 尺码名称 (varchar(20))
+- **season_code**: 季节代码 (varchar(10)) - SS(春夏)/FW(秋冬)
+- **year**: 年份 (smallint) - 如2024
+- **collection**: 系列/批次 (varchar(50))
+
+### 5. 供应链信息
+- **supplier_id**: 供应商ID (bigint, 索引)
+- **supplier_code**: 供应商代码 (varchar(30))
+- **supplier_name**: 供应商名称 (varchar(100))
+- **min_order_qty**: 最小起订量 (int)
+- **lead_time_days**: 采购提前期（天） (smallint)
+
+### 6. 价格信息
+- **cost_price**: 成本价 (decimal(10,2))
+- **suggested_retail_price**: 建议零售价 (decimal(10,2))
+- **current_price**: 当前售价 (decimal(10,2))
+- **currency_code**: 货币代码 (varchar(3), 默认'CNY')
+
+### 7. 库存与配补调相关
+- **safety_stock**: 安全库存水平 (int)
+- **max_stock**: 最高库存量 (int)
+- **reorder_point**: 补货点 (int)
+- **economic_order_qty**: 经济订货量 (int)
+- **abc_class**: ABC分类 (varchar(1)) - A/B/C
+- **xyz_class**: XYZ分类 (varchar(1)) - X/Y/Z (基于需求稳定性)
+
+### 8. 销售与绩效指标
+- **sales_velocity**: 销售流速（日均销量） (decimal(10,2))
+- **sell_through_rate**: 售罄率 (decimal(5,4))
+- **gross_margin**: 毛利率 (decimal(5,4))
+- **return_rate**: 退货率 (decimal(5,4))
+
+### 9. 状态与时间
+- **product_status**: 商品状态 (varchar(20)) - active/inactive/discontinued
+- **launch_date**: 上市日期 (date)
+- **discontinuation_date**: 停售日期 (date, 可选)
+- **data_date**: 数据日期 (date) - 数据仓库快照日期
+- **created_at**: 创建时间
+- **updated_at**: 更新时间
+- **deleted_at**: 删除时间
+
+## 索引要求
+1. 主键: id
+2. 唯一索引: product_code
+3. 普通索引: 
+   - product_barcode
+   - category_id
+   - brand_id
+   - supplier_id
+   - style_code
+   - 复合索引: (category_id, brand_id, season_code)
+
+## 特别要求
+1. 字段命名遵循国际化驼峰规则（snake_case英文）
+2. 所有业务字段都需中文注释说明
+3. 价格字段使用decimal精确计算
+4. 性能指标字段可为NULL，初始导入时可能无数据
+5. 参考 `/Users/kenqdy/Documents/v-bdx-workspace/svc-configure/internal/tables/config_project_skill.go` 的代码风格
+
+请生成完整的Go GORM表定义代码。

internal/services/agent_to_doris.go

@@ -0,0 +1,145 @@
+package service
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"git.x2erp.com/qdy/go-base/logger"
+	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-db/factory/doris"
+	"git.x2erp.com/qdy/go-db/factory/http"
+)
+
+// queryToCSVAndInsert 处理单次查询并将结果插入到Doris
+func queryToCSVAndInsert(queryRequest types.QueryRequest) *types.QueryResult[interface{}] {
+	// 记录查询开始时间
+	queryStartTime := time.Now()
+
+	// 1. 获取HTTP工厂实例
+	httpFactory, err := http.GetHTTPFactory()
+	if err != nil {
+		logger.Errorf("Failed to get HTTP factory: %v", err)
+		return &types.QueryResult[interface{}]{
+			Success: false,
+			Error:   fmt.Sprintf("failed to get HTTP factory: %v", err),
+		}
+	}
+	logger.Debug("HTTP factory created successfully")
+
+	// 2. 获取Doris工厂实例
+	dorisFactory, err := doris.GetDorisFactory(httpFactory)
+	if err != nil {
+		logger.Errorf("Failed to get Doris factory: %v", err)
+		return &types.QueryResult[interface{}]{
+			Success: false,
+			Error:   fmt.Sprintf("failed to get Doris factory: %v", err),
+		}
+	}
+	logger.Debug("Doris factory created successfully")
+
+	// 3. 创建HTTP客户端
+	httpClient := httpFactory.CreateClient()
+
+	agentQueryRequest := types.QueryRequest{
+		SQL:              queryRequest.SQL,
+		Params:           queryRequest.Params,
+		PositionalParams: queryRequest.PositionalParams,
+		WriterHeader:     queryRequest.WriterHeader,
+	}
+
+	// 4. 发送POST请求到 /api/query/csv 获取CSV格式数据
+	resp, err := httpClient.PostWithAuth(
+		queryRequest.AgentUrl,
+		agentQueryRequest,
+		queryRequest.AgentToken,
+		nil,
+	)
+
+	queryEndTime := time.Now()
+	queryDuration := queryEndTime.Sub(queryStartTime)
+
+	if err != nil {
+		logger.Errorf("Query request failed: %v", err)
+		return &types.QueryResult[interface{}]{
+			Success:   false,
+			Error:     fmt.Sprintf("查询失败: %v", err),
+			QueryTime: queryDuration,
+		}
+	}
+
+	if resp.StatusCode() != 200 {
+		logger.Errorf("Query request failed with status code: %d", resp.StatusCode())
+		return &types.QueryResult[interface{}]{
+			Success:   false,
+			Error:     fmt.Sprintf("查询请求失败, 状态码: %d", resp.StatusCode()),
+			QueryTime: queryDuration,
+		}
+	}
+
+	// 5. 获取CSV数据
+	csvData := string(resp.Body())
+	if len(csvData) == 0 {
+		logger.Warn("No data queried")
+		return &types.QueryResult[interface{}]{
+			Success:   true,
+			Error:     "没有查询到数据",
+			QueryTime: queryDuration,
+		}
+	}
+
+	// 估算数据行数（CSV行数）
+	var totalRows int
+	if queryRequest.WriterHeader {
+		// 如果有表头，需要减1
+		lines := strings.Count(csvData, "\n")
+		if lines > 0 {
+			totalRows = lines - 1
+		}
+	} else {
+		totalRows = strings.Count(csvData, "\n")
+	}
+
+	logger.Debug("Query successful, retrieved %d rows of data", totalRows)
+
+	// 6. 插入数据到Doris
+	database := queryRequest.DorisDatabase
+	table := queryRequest.DorisTable
+	skipHeader := !queryRequest.WriterHeader // 如果包含表头，则跳过
+
+	saveStartTime := time.Now()
+	err = dorisFactory.InsertCSV(database, table, csvData, skipHeader)
+	saveEndTime := time.Now()
+	saveDuration := saveEndTime.Sub(saveStartTime)
+
+	if err != nil {
+		logger.Errorf("Failed to insert data into Doris: %v", err)
+		return &types.QueryResult[interface{}]{
+			Success:   false,
+			Error:     fmt.Sprintf("数据插入Doris失败: %v", err),
+			QueryTime: queryDuration,
+			SaveTime:  saveDuration,
+			Count:     totalRows,
+		}
+	}
+
+	logger.Debug("Data successfully inserted into Doris: database=%s, table=%s, rows=%d",
+		database, table, totalRows)
+
+	return &types.QueryResult[interface{}]{
+		Success:   true,
+		QueryTime: queryDuration,
+		SaveTime:  saveDuration,
+		Count:     totalRows,
+	}
+}
+
+// ServiceHandler 服务处理器（供router使用）
+func ServiceAgentToDoris(queryRequest types.QueryRequest) *types.QueryResult[interface{}] {
+	// 添加调试日志，确认 queryRequest 是否有数据
+	logger.Debug("Processing query request: SQL=%s, AgentUrl=%s, Params count=%d",
+		queryRequest.SQL, queryRequest.AgentUrl, len(queryRequest.PositionalParams))
+
+	// 执行查询并插入
+	return queryToCSVAndInsert(queryRequest)
+}

internal/tables/dim_depot.go

@@ -0,0 +1,40 @@
+package tables
+
+import (
+	"time"
+
+	"git.x2erp.com/qdy/go-db/sqldef"
+)
+
+func init() {
+	sqldef.AddRegistration(func(r *sqldef.Registry) {
+		tb := sqldef.NewTable("dim_depot", "店铺档案表").
+			ID("dim_depot_id", 32).Comment("店铺编码主键").End().
+			String("depot_id", 32).Comment("店铺编码").End().
+			String("depot_name", 64).NotNull().Comment("渠道名称(如:天猫旗舰店)").End().
+			String("depot_type", 32).NotNull().Comment("渠道类型(如:线上/线下/奥莱)").End().
+			String("tenant_id", 8).NotNull().Comment("租户ID").End().
+			String("city_id", 32).NotNull().Comment("店铺所在城市").End().
+			String("depot_address", 32).NotNull().Comment("店铺地址").End().
+			String("creator", 32).NotNull().Comment("创建人").End().
+			DateTime("created_at").NotNull().Default("CURRENT_TIMESTAMP").Comment("创建时间").End()
+		r.RegisterTable(tb.Build())
+	})
+}
+
+// DimDepot 店铺档案表结构体（原ConfigChannel调整为匹配表结构）
+type DimDepot struct {
+	DimDepotID   string    `gorm:"column:dim_depot_id;type:varchar(32);primaryKey;comment:店铺编码主键"`
+	DepotID      string    `gorm:"column:depot_id;type:varchar(32);comment:店铺编码"`
+	DepotName    string    `gorm:"column:depot_name;type:varchar(64);not null;comment:渠道名称(如:天猫旗舰店)"`
+	DepotType    string    `gorm:"column:depot_type;type:varchar(32);not null;comment:渠道类型(如:线上/线下/奥莱)"`
+	TenantID     string    `gorm:"column:tenant_id;type:varchar(8);not null;comment:租户ID"`
+	CityID       string    `gorm:"column:city_id;type:varchar(32);not null;comment:店铺所在城市"`
+	DepotAddress string    `gorm:"column:depot_address;type:varchar(32);not null;comment:店铺地址"`
+	Creator      string    `gorm:"column:creator;type:varchar(32);not null;comment:创建人"`
+	CreatedAt    time.Time `gorm:"column:created_at;type:datetime;not null;default:CURRENT_TIMESTAMP;comment:创建时间"`
+}
+
+func (DimDepot) TableName() string {
+	return "dim_depot"
+}

tables/dim_season.go → internal/tables/dim_season.go

@@ -9,7 +9,7 @@ import (
 func init() {
 	sqldef.AddRegistration(func(r *sqldef.Registry) {
 		tb := sqldef.NewTable("dim_season", "季节波段档案表").
-			ID("season_id", 32).Comment("季节波段ID，主键").End().
+			ID("season_id", 32).NotNull().Comment("季节波段ID，主键").End().
 			String("season_code", 32).NotNull().Unique().Comment("季节编码(如:2024FA)").End().
 			String("season_name", 64).NotNull().Comment("季节名称(如:2024秋冬)").End().
 			Int("year").NotNull().Comment("年份").End().
@@ -17,7 +17,6 @@ func init() {
 			DateTime("plan_start").NotNull().Comment("季节计划开始日期").End().
 			DateTime("plan_end").NotNull().Comment("季节计划结束日期").End().
 			String("creator", 32).NotNull().Comment("创建人").End().
-			String("tenant_id", 8).NotNull().Comment("租户ID").End().
 			DateTime("created_at").NotNull().Default("CURRENT_TIMESTAMP").Comment("创建时间").End()
 		r.RegisterTable(tb.Build())
 	})
@@ -33,7 +32,6 @@ type DimSeason struct {
 	PlanEnd    time.Time `gorm:"column:plan_end;not null;comment:季节计划结束日期"`
 	Creator    string    `gorm:"column:creator;type:varchar(32);not null;comment:创建人"`
 	CreatedAt  time.Time `gorm:"column:created_at;not null;default:CURRENT_TIMESTAMP;comment:创建时间"`
-	TenantId   string    `gorm:"column:tenant_id;type:varchar(8);comment:租户ID"`
 }
 
 func (DimSeason) TableName() string { return "dim_season" }

main.go

@@ -3,19 +3,22 @@ package main
 import (
 	"log"
 
-	"git.x2erp.com/qdy/go-db/dbstart"
 	"git.x2erp.com/qdy/go-db/factory/database"
 
-	"git.x2erp.com/qdy/go-base/bootstraps"
+	"git.x2erp.com/qdy/go-base/config"
+	"git.x2erp.com/qdy/go-base/consul"
+	"git.x2erp.com/qdy/go-base/container"
 	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/logger"
 	"git.x2erp.com/qdy/go-base/middleware"
 	"git.x2erp.com/qdy/go-base/webx"
+	"git.x2erp.com/qdy/go-base/webx/health"
+	"git.x2erp.com/qdy/go-base/webx/router"
 )
 
 var (
-	serviceName    = "svc-ai"
-	serviceVersion = "1"
+	appName    = "svc-mercury"
+	appVersion = "1"
 )
 
 // 定义结构体
@@ -33,37 +36,60 @@ type UserResponse struct {
 }
 
 func main() {
-	// 1. 初始化基础启动器
-	boot := bootstraps.NewBootstrapper(serviceName, serviceVersion)
 
-	// 2. 初始化数据库（都在bootstraps包中）
-	dbBoot := dbstart.NewDBBootstrapper(boot.GetConfig())
-	dbBoot.Init()
+	//0.日志
+	//logger.InitBootLog()
+	logBootFactory := logger.InitBootLog()
+
+	//1.获取配置文件
+	cfg := config.GetConfig()
+	cfg.SetAppName(appName)
+	cfg.SetAppVersion(appVersion)
+
+	//2.创建关闭容器
+	ctr := container.NewContainer(cfg)
+
+	//注册日志，实现自动关闭
+	container.Reg(ctr, logBootFactory)
+
+	//3.创建数据库工厂--如果需求
+	dbFactory := container.Create(ctr, database.CreateDBFactory)
 
-	agentDB := dbBoot.GetDBFactory("agent")
 	// 赋值认证中间件参数
-	middleware.JWTAuthMiddlewareInit(boot.GetConfig())
+	middleware.JWTAuthMiddlewareInit(cfg)
+
+	//测试数据库连接
+	dbFactory.TestConnection()
+
+	//得到webservice服务工厂
+	webxFactory := webx.GetWebServiceFactory()
+
+	//建立hhtpService服务
+	webServcie, _ := webxFactory.CreateService(cfg.GetServiceConfig())
+
+	//建立路由-api
+	routerService := router.NewWebService(webServcie.GetRouter())
+
+	//注册路由--api
+	registerDorisRouter(routerService, dbFactory)
 
-	// 3. 启动服务
-	//boot.StartService("default")
+	// 注册健康检查-api
+	health.RegisterConsulHealthCheck(routerService)
 
-	router := boot.GetRouter("default")
-	// 3. 创建 WebService 并传入数据库接口
-	ws := webx.NewWebService(router)
+	//启动服务
+	webServcie.Run()
 
-	//使用默认数据库
-	registerDefaultRouter(ws, dbBoot.GetDefaultDBFactory())
+	//启用运行日志
+	container.Create(ctr, logger.InitRuntimeLogger)
 
-	//启动第2个服务
-	routerDoris := boot.GetRouter("doris")
-	wsDoris := webx.NewWebService(routerDoris)
-	registerDorisRouter(wsDoris, agentDB)
+	//注册到注册中心
+	container.Create(ctr, consul.Register)
+	//等待关闭
+	webServcie.WaitForServiceShutdown(ctr)
 
-	// 6. 运行服务
-	boot.Run(dbBoot)
 }
 
-func registerDorisRouter(ws *webx.WebService, dbFactory *database.DBFactory) {
+func registerDorisRouter(ws *router.RouterService, dbFactory *database.DBFactory) {
 	// GET示例：路径参数绑定
 	ws.GET("/app/users/{id}",
 		func(id string, reqCtx *ctx.RequestContext) (UserResponse, error) {
@@ -99,7 +125,7 @@ func registerDorisRouter(ws *webx.WebService, dbFactory *database.DBFactory) {
 
 }
 
-func registerDefaultRouter(ws *webx.WebService, dbFactory *database.DBFactory) {
+func registerDefaultRouter(ws *router.RouterService, dbFactory *database.DBFactory) {
 	// GET示例：路径参数绑定
 	ws.GET("/api/users/{id}",
 		func(id string, reqCtx *ctx.RequestContext) (UserResponse, error) {
@@ -145,7 +171,7 @@ func registerDefaultRouter(ws *webx.WebService, dbFactory *database.DBFactory) {
 
 func getUser(id string, dbFactory *database.DBFactory) (UserResponse, error) {
 	if dbFactory != nil {
-		dbFactory.TestConnection(dbFactory.GetDBType())
+		dbFactory.TestConnection()
 	}
 
 	// 查询数据库...
@@ -159,7 +185,7 @@ func getUser(id string, dbFactory *database.DBFactory) (UserResponse, error) {
 // 业务函数示例
 func getUserOracle(id string, dbFactory *database.DBFactory) (UserResponse, error) {
 	if dbFactory != nil {
-		dbFactory.TestConnection(dbFactory.GetDBType())
+		dbFactory.TestConnection()
 	}
 
 	sql, queryParams := getSQLWithPaginationSQL(0, 10)

tables/config_channel.go

@@ -1,38 +0,0 @@
-package tables
-
-import (
-	"time"
-
-	"git.x2erp.com/qdy/go-db/sqldef"
-)
-
-func init() {
-	sqldef.AddRegistration(func(r *sqldef.Registry) {
-		tb := sqldef.NewTable("config_channel", "渠道档案表").
-			ID("channel_id", 32).Comment("渠道编码，主键").End().
-			String("channel_name", 64).NotNull().Comment("渠道名称(如:天猫旗舰店)").End().
-			String("channel_type", 32).NotNull().Comment("渠道类型(如:线上/线下/奥莱)").End().
-			String("store_id", 32).Comment("关联门店/仓库ID，对应ERP编码").End().
-			String("tenant_id", 8).NotNull().Comment("租户ID").End().
-			String("store_group_id", 32).NotNull().Comment("所属店铺组").End().
-			String("creator", 32).NotNull().Comment("创建人").End().
-			DateTime("created_at").NotNull().Default("CURRENT_TIMESTAMP").Comment("创建时间").End()
-		r.RegisterTable(tb.Build())
-	})
-}
-
-// ConfigChannel 渠道档案表结构体
-type ConfigChannel struct {
-	ChannelID    string    `gorm:"column:channel_id;type:varchar(32);primaryKey;not null;comment:渠道编码，主键"`
-	ChannelName  string    `gorm:"column:channel_name;type:varchar(64);not null;comment:渠道名称(如:天猫旗舰店)"`
-	ChannelType  string    `gorm:"column:channel_type;type:varchar(32);not null;comment:渠道类型(如:线上/线下/奥莱)"`
-	StoreID      string    `gorm:"column:store_id;type:varchar(32);comment:关联门店/仓库ID，对应ERP编码"`
-	TenantId     string    `gorm:"column:tenant_id;type:varchar(8);comment:租户ID"`
-	Creator      string    `gorm:"column:creator;type:varchar(32);not null;comment:创建人"`
-	CreatedAt    time.Time `gorm:"column:created_at;not null;default:CURRENT_TIMESTAMP;comment:创建时间"`
-	StoreGroupID string    `gorm:"column:store_group_id;type:varchar(32);comment:所属店铺组"`
-}
-
-func (ConfigChannel) TableName() string {
-	return "config_channel"
-}