Merge branch 'dm' of http://8.136.199.33:3000/eta_gn_server/eta_index_lib into dm

controllers/base_from_jiayue.go

@@ -90,7 +90,7 @@ func (this *JiaYueController) Add() {
 	}
 
 	// 新增指标数据
-	e = models.AddEdbDataFromJiaYue(sourceItem.TableName, req.EdbCode, indexData.IndexData)
+	e = models.AddEdbDataFromJiaYue(sourceItem.TableName1, req.EdbCode, indexData.IndexData)
 	if e != nil {
 		br.Msg = "操作失败"
 		br.ErrMsg = "新增指标数据失败, Err: " + e.Error()
@@ -191,7 +191,7 @@ func (this *JiaYueController) Refresh() {
 	}
 
 	// 刷新指标数据
-	e = models.RefreshEdbDataFromJiaYue(req.Source, edbInfo.SubSource, req.EdbInfoId, sourceItem.TableName, req.EdbCode, startDate, indexData.IndexData)
+	e = models.RefreshEdbDataFromJiaYue(req.Source, edbInfo.SubSource, req.EdbInfoId, sourceItem.TableName1, req.EdbCode, startDate, indexData.IndexData)
 	if e != nil {
 		br.Msg = "刷新失败"
 		br.ErrMsg = "刷新嘉悦指标失败, Err: " + e.Error()

models/ccf_stock_excel.go

@@ -11,12 +11,12 @@ import (
 // CCFStockExcel CCF化纤装置表格
 type CCFStockExcel struct {
 	CcfStockExcelId int       `gorm:"primaryKey;autoIncrement;column:ccf_stock_excel_id"`
-	ClassifyId      int       `description:"分类ID"`
-	ExcelDate       time.Time `description:"表格日期"`
-	ExcelContent    string    `description:"表格HTML"`
-	FromPage        string    `description:"表格来源"`
-	CreateTime      time.Time `description:"创建时间"`
-	ModifyTime      time.Time `description:"修改时间"`
+	ClassifyId      int       `gorm:"column:classify_id" description:"分类ID"`
+	ExcelDate       time.Time `gorm:"column:excel_date" description:"表格日期"`
+	ExcelContent    string    `gorm:"column:excel_content" description:"表格HTML"`
+	FromPage        string    `gorm:"column:from_page" description:"表格来源"`
+	CreateTime      time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime      time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 func (m *CCFStockExcel) TableName() string {

models/chart.go

@@ -41,34 +41,34 @@ func GetChartInfoDataKey(chartInfoId int) string {
 }
 
 type ChartInfo struct {
-	ChartInfoId     int    `gorm:"primaryKey;autoIncrement;column:chart_info_id"`
-	ChartName       string `description:"来源名称"`
-	ChartNameEn     string `description:"英文图表名称"`
-	ChartClassifyId int    `description:"图表分类id"`
-	SysUserId       int
-	SysUserRealName string
-	UniqueCode      string `description:"图表唯一编码"`
-	CreateTime      time.Time
-	ModifyTime      time.Time
-	DateType        int    `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间"`
-	StartDate       string `description:"自定义开始日期"`
-	EndDate         string `description:"自定义结束日期"`
-	IsSetName       int    `description:"设置名称"`
-	EdbInfoIds      string `description:"指标id"`
-	ChartType       int    `description:"生成样式:1:曲线图,2:季节性图,3:面积图，4：柱状图，5：散点图，6：组合图，7：柱方图，8：商品价格曲线图，9：相关性图"`
-	Calendar        string `description:"公历/农历"`
-	SeasonStartDate string `description:"季节性图开始日期"`
-	SeasonEndDate   string `description:"季节性图开始日期"`
-	ChartImage      string `description:"图表图片"`
-	Sort            int    `description:"排序字段，数字越小越排前面"`
-	LeftMin         string `description:"图表左侧最小值"`
-	LeftMax         string `description:"图表左侧最大值"`
-	RightMin        string `description:"图表右侧最小值"`
-	RightMax        string `description:"图表右侧最大值"`
-	Disabled        int    `description:"是否禁用，0：启用，1：禁用，默认：0"`
-	BarConfig       string `description:"柱方图的配置，json数据"`
-	Source          int    `description:"1：ETA图库；2：商品价格曲线"`
-	ExtraConfig     string `description:"图表额外配置,json数据"`
+	ChartInfoId     int       `gorm:"primaryKey;autoIncrement;column:chart_info_id"`
+	ChartName       string    `gorm:"column:chart_name" description:"来源名称"`
+	ChartNameEn     string    `gorm:"column:chart_name_en" description:"英文图表名称"`
+	ChartClassifyId int       `gorm:"column:chart_classify_id" description:"图表分类id"`
+	SysUserId       int       `gorm:"column:sys_user_id"`
+	SysUserRealName string    `gorm:"column:sys_user_real_name"`
+	UniqueCode      string    `gorm:"column:unique_code" description:"图表唯一编码"`
+	CreateTime      time.Time `gorm:"column:create_time"`
+	ModifyTime      time.Time `gorm:"column:modify_time"`
+	DateType        int       `gorm:"column:date_type" description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间"`
+	StartDate       string    `gorm:"column:start_date" description:"自定义开始日期"`
+	EndDate         string    `gorm:"column:end_date" description:"自定义结束日期"`
+	IsSetName       int       `gorm:"column:is_set_name" description:"设置名称"`
+	EdbInfoIds      string    `gorm:"column:edb_info_ids" description:"指标id"`
+	ChartType       int       `gorm:"column:chart_type" description:"生成样式:1:曲线图,2:季节性图,3:面积图，4：柱状图，5：散点图，6：组合图，7：柱方图，8：商品价格曲线图，9：相关性图"`
+	Calendar        string    `gorm:"column:calendar" description:"公历/农历"`
+	SeasonStartDate string    `gorm:"column:season_start_date" description:"季节性图开始日期"`
+	SeasonEndDate   string    `gorm:"column:season_end_date" description:"季节性图开始日期（注意：这里可能是个错误，应该是结束日期）"`
+	ChartImage      string    `gorm:"column:chart_image" description:"图表图片"`
+	Sort            int       `gorm:"column:sort" description:"排序字段，数字越小越排前面"`
+	LeftMin         string    `gorm:"column:left_min" description:"图表左侧最小值"`
+	LeftMax         string    `gorm:"column:left_max" description:"图表左侧最大值"`
+	RightMin        string    `gorm:"column:right_min" description:"图表右侧最小值"`
+	RightMax        string    `gorm:"column:right_max" description:"图表右侧最大值"`
+	Disabled        int       `gorm:"column:disabled" description:"是否禁用，0：启用，1：禁用，默认：0"`
+	BarConfig       string    `gorm:"column:bar_config" description:"柱方图的配置，json数据"`
+	Source          int       `gorm:"column:source" description:"1：ETA图库；2：商品价格曲线"`
+	ExtraConfig     string    `gorm:"column:extra_config" description:"图表额外配置,json数据"`
 }
 
 // GetChartInfoById 通过id获取图表信息

models/chart_edb_mapping.go

@@ -7,22 +7,22 @@ import (
 
 type ChartEdbMapping struct {
 	ChartEdbMappingId int       `gorm:"primaryKey;autoIncrement;column:chart_edb_mapping_id"`
-	ChartInfoId       int       `description:"图表id"`
-	EdbInfoId         int       `description:"指标id"`
-	CreateTime        time.Time `description:"创建时间"`
-	ModifyTime        time.Time `description:"修改时间"`
-	UniqueCode        string    `description:"唯一编码"`
-	MaxData           float64   `description:"上限"`
-	MinData           float64   `description:"下限"`
-	IsOrder           bool      `description:"true:正序,false:逆序"`
-	IsAxis            int       `description:"true:左轴,false:右轴"`
-	EdbInfoType       int       `description:"true:标准指标,false:领先指标"`
-	LeadValue         int       `description:"领先值"`
-	LeadUnit          string    `description:"领先单位"`
-	ChartStyle        string    `description:"图表类型"`
-	ChartColor        string    `description:"颜色"`
-	ChartWidth        float64   `description:"线条大小"`
-	Source            int       `description:"1：ETA图库；2：商品价格曲线"`
+	ChartInfoId       int       `gorm:"column:chart_info_id" description:"图表id"`
+	EdbInfoId         int       `gorm:"column:edb_info_id" description:"指标id"`
+	CreateTime        time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime        time.Time `gorm:"column:modify_time" description:"修改时间"`
+	UniqueCode        string    `gorm:"column:unique_code" description:"唯一编码"`
+	MaxData           float64   `gorm:"column:max_data" description:"上限"`
+	MinData           float64   `gorm:"column:min_data" description:"下限"`
+	IsOrder           bool      `gorm:"column:is_order" description:"true:正序,false:逆序"`
+	IsAxis            int       `gorm:"column:is_axis" description:"true:左轴,false:右轴"`
+	EdbInfoType       int       `gorm:"column:edb_info_type" description:"true:标准指标,false:领先指标"`
+	LeadValue         int       `gorm:"column:lead_value" description:"领先值"`
+	LeadUnit          string    `gorm:"column:lead_unit" description:"领先单位"`
+	ChartStyle        string    `gorm:"column:chart_style" description:"图表类型"`
+	ChartColor        string    `gorm:"column:chart_color" description:"颜色"`
+	ChartWidth        float64   `gorm:"column:chart_width" description:"线条大小"`
+	Source            int       `gorm:"column:source" description:"1：ETA图库；2：商品价格曲线"`
 }
 
 // GetChartEdbMappingListByEdbInfoId 根据指标id获取关联图表列表

models/data_stat/edb_info_delete_log.go

@@ -1,49 +1,49 @@
 package data_stat
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 )
 
 // EdbInfoDeleteLog 指标删除日志表
 type EdbInfoDeleteLog struct {
-	Id                 uint64  `orm:"column(id);pk"`
-	EdbInfoId          int     `description:"指标ID"`
-	EdbInfoType        int     `description:"指标类型，0：普通指标，1：预测指标"`
-	SourceName         string  `description:"来源名称"`
-	Source             int     `description:"来源id"`
-	EdbCode            string  `description:"指标编码"`
-	EdbName            string  `description:"指标名称"`
-	EdbNameEn          string  `description:"英文指标名称"`
-	EdbNameSource      string  `description:"指标名称来源"`
-	Frequency          string  `description:"频率"`
-	Unit               string  `description:"单位"`
-	UnitEn             string  `description:"英文单位"`
-	StartDate          string  `description:"起始日期"`
-	EndDate            string  `description:"终止日期"`
-	SysUserId          int     `description:"创建人ID"`
-	SysUserRealName    string  `description:"创建人姓名"`
-	UniqueCode         string  `description:"指标唯一编码"`
-	EdbCreateTime      string  `description:"指标创建时间"`
-	EdbModifyTime      string  `description:"指标修改时间"`
-	CreateTime         string  `description:"创建时间即删除时间"`
-	MinValue           float64 `description:"指标最小值"`
-	MaxValue           float64 `description:"指标最大值"`
-	CalculateFormula   string  `description:"计算公式"`
-	EdbType            int     `description:"指标类型:1:基础指标,2:计算指标"`
-	LatestDate         string  `description:"数据最新日期"`
-	LatestValue        float64 `description:"数据最新值"`
-	MoveType           int     `description:"移动方式:1:领先(默认),2:滞后"`
-	MoveFrequency      string  `description:"移动频度"`
-	NoUpdate           int8    `description:"是否停止更新，0：继续更新；1：停止更新"`
-	ChartImage         string  `description:"图表图片"`
-	Calendar           string  `description:"公历/农历" orm:"default(公历);"`
-	DataDateType       string  `orm:"column(data_date_type);size(255);null;default(交易日)"`
-	ManualSave         int     `description:"是否有手动保存过上下限: 0-否; 1-是"`
-	TerminalCode       string  `description:"终端编码，用于配置在机器上"`
-	DelSysUserId       int     `description:"删除人ID"`
-	DelSysUserRealName string  `description:"删除人姓名"`
-	DataUpdateTime     string  `description:"最近一次数据发生变化的时间"`
-	ErDataUpdateDate   string  `description:"本次更新，数据发生变化的最早日期"`
+	Id                 uint64  `gorm:"primaryKey;autoIncrement;column:id"             description:"记录ID"`
+	EdbInfoId          int     `gorm:"column:edb_info_id"                           description:"指标ID"`
+	EdbInfoType        int     `gorm:"column:edb_info_type"                         description:"指标类型，0：普通指标，1：预测指标"`
+	SourceName         string  `gorm:"column:source_name"                           description:"来源名称"`
+	Source             int     `gorm:"column:source"                               description:"来源id"`
+	EdbCode            string  `gorm:"column:edb_code"                             description:"指标编码"`
+	EdbName            string  `gorm:"column:edb_name"                             description:"指标名称"`
+	EdbNameEn          string  `gorm:"column:edb_name_en"                          description:"英文指标名称"`
+	EdbNameSource      string  `gorm:"column:edb_name_source"                      description:"指标名称来源"`
+	Frequency          string  `gorm:"column:frequency"                           description:"频率"`
+	Unit               string  `gorm:"column:unit"                                description:"单位"`
+	UnitEn             string  `gorm:"column:unit_en"                             description:"英文单位"`
+	StartDate          string  `gorm:"column:start_date"                          description:"起始日期"`
+	EndDate            string  `gorm:"column:end_date"                            description:"终止日期"`
+	SysUserId          int     `gorm:"column:sys_user_id"                         description:"创建人ID"`
+	SysUserRealName    string  `gorm:"column:sys_user_real_name"                  description:"创建人姓名"`
+	UniqueCode         string  `gorm:"column:unique_code"                         description:"指标唯一编码"`
+	EdbCreateTime      string  `gorm:"column:edb_create_time"                     description:"指标创建时间"`
+	EdbModifyTime      string  `gorm:"column:edb_modify_time"                     description:"指标修改时间"`
+	CreateTime         string  `gorm:"column:create_time"                         description:"创建时间即删除时间"`
+	MinValue           float64 `gorm:"column:min_value"                           description:"指标最小值"`
+	MaxValue           float64 `gorm:"column:max_value"                           description:"指标最大值"`
+	CalculateFormula   string  `gorm:"column:calculate_formula"                   description:"计算公式"`
+	EdbType            int     `gorm:"column:edb_type"                            description:"指标类型:1:基础指标,2:计算指标"`
+	LatestDate         string  `gorm:"column:latest_date"                         description:"数据最新日期"`
+	LatestValue        float64 `gorm:"column:latest_value"                        description:"数据最新值"`
+	MoveType           int     `gorm:"column:move_type"                           description:"移动方式:1:领先(默认),2:滞后"`
+	MoveFrequency      string  `gorm:"column:move_frequency"                      description:"移动频度"`
+	NoUpdate           int8    `gorm:"column:no_update"                           description:"是否停止更新，0：继续更新；1：停止更新"`
+	ChartImage         string  `gorm:"column:chart_image"                         description:"图表图片"`
+	Calendar           string  `gorm:"column:calendar;default:公历"               description:"公历/农历"`
+	DataDateType       string  `gorm:"column:data_date_type;size:255;null;default:交易日" description:"数据日期类型"`
+	ManualSave         int     `gorm:"column:manual_save"                         description:"是否有手动保存过上下限: 0-否; 1-是"`
+	TerminalCode       string  `gorm:"column:terminal_code"                       description:"终端编码，用于配置在机器上"`
+	DelSysUserId       int     `gorm:"column:del_sys_user_id"                     description:"删除人ID"`
+	DelSysUserRealName string  `gorm:"column:del_sys_user_real_name"              description:"删除人姓名"`
+	DataUpdateTime     string  `gorm:"column:data_update_time"                    description:"最近一次数据发生变化的时间"`
+	ErDataUpdateDate   string  `gorm:"column:er_data_update_date"                 description:"本次更新，数据发生变化的最早日期"`
 }
 
 type EdbInfoDeleteLogNum struct {
@@ -53,8 +53,7 @@ type EdbInfoDeleteLogNum struct {
 }
 
 func GetEdbDeleteLogNumByCreateTime(startDate, endDate string) (item []*EdbInfoDeleteLogNum, err error) {
-	o := orm.NewOrm()
 	sql := ` SELECT source, terminal_code, count(*) as num FROM edb_info_delete_log WHERE create_time >= ? and create_time < ? group by source, terminal_code `
-	_, err = o.Raw(sql, startDate, endDate).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, startDate, endDate).Scan(&item).Error
 	return
 }

models/data_stat/edb_info_update_log.go

@@ -1,65 +1,65 @@
 package data_stat
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
 // EdbInfoUpdateLog 指标更新/刷新日志列表
 type EdbInfoUpdateLog struct {
-	Id                     uint64    `orm:"column(id);pk"`
-	EdbInfoId              int       `description:"指标ID"`
-	SourceName             string    `description:"来源名称"`
-	Source                 int       `description:"来源id"`
-	EdbCode                string    `description:"指标编码"`
-	EdbName                string    `description:"指标名称"`
-	EdbNameSource          string    `description:"指标名称来源"`
-	Frequency              string    `description:"频率"`
-	Unit                   string    `description:"单位"`
-	StartDate              string    `description:"起始日期"`
-	EndDate                string    `description:"终止日期"`
-	SysUserId              int       `description:"创建人ID"`
-	SysUserRealName        string    `description:"创建人姓名"`
-	UniqueCode             string    `description:"指标唯一编码"`
-	EdbCreateTime          time.Time `description:"指标创建时间"`
-	EdbModifyTime          time.Time `description:"指标修改时间"`
-	CreateTime             time.Time `description:"创建时间"`
-	UpdateSysUserId        int       `description:"变更人ID"`
-	UpdateSysUserRealName  string    `description:"变更人姓名"`
-	LatestDate             string    `description:"数据最新日期"`
-	LatestValue            float64   `description:"数据最新值"`
-	TerminalCode           string    `description:"终端编码，用于配置在机器上"`
-	ErDataUpdateDate       string    `description:"本次更新，数据发生变化的最早日期"`
-	UpdateResult           int       `description:"本次刷新操作结果：1成功，2失败"`
-	UpdateFailedReason     string    `description:"刷新失败原因"`
-	DataUpdateResult       int       `description:"数据更新结果：1成功，2失败"`
-	DataUpdateFailedReason string    `description:"数据未正常更新原因"`
-	DataUpdateTime         string    `description:"数据更新时间"`
-	IsSourceRefresh        int       `description:"是否为终端刷新到数据源的刷新操作：0否，1是"`
-	UpdateType             int       `description:"变更类型，0:数据明细变更，1:基础信息变更, 2:新增指标"`
+	Id                     uint64    `gorm:"primaryKey;autoIncrement;column:id"                        description:"记录ID"`
+	EdbInfoId              int       `gorm:"column:edb_info_id"                                      description:"指标ID"`
+	SourceName             string    `gorm:"column:source_name"                                     description:"来源名称"`
+	Source                 int       `gorm:"column:source"                                          description:"来源id"`
+	EdbCode                string    `gorm:"column:edb_code"                                        description:"指标编码"`
+	EdbName                string    `gorm:"column:edb_name"                                        description:"指标名称"`
+	EdbNameSource          string    `gorm:"column:edb_name_source"                                 description:"指标名称来源"`
+	Frequency              string    `gorm:"column:frequency"                                       description:"频率"`
+	Unit                   string    `gorm:"column:unit"                                            description:"单位"`
+	StartDate              string    `gorm:"column:start_date"                                      description:"起始日期"`
+	EndDate                string    `gorm:"column:end_date"                                        description:"终止日期"`
+	SysUserId              int       `gorm:"column:sys_user_id"                                     description:"创建人ID"`
+	SysUserRealName        string    `gorm:"column:sys_user_real_name"                              description:"创建人姓名"`
+	UniqueCode             string    `gorm:"column:unique_code"                                     description:"指标唯一编码"`
+	EdbCreateTime          time.Time `gorm:"column:edb_create_time"                                 description:"指标创建时间"`
+	EdbModifyTime          time.Time `gorm:"column:edb_modify_time"                                 description:"指标修改时间"`
+	CreateTime             time.Time `gorm:"column:create_time"                                     description:"创建时间"`
+	UpdateSysUserId        int       `gorm:"column:update_sys_user_id"                              description:"变更人ID"`
+	UpdateSysUserRealName  string    `gorm:"column:update_sys_user_real_name"                       description:"变更人姓名"`
+	LatestDate             string    `gorm:"column:latest_date"                                     description:"数据最新日期"`
+	LatestValue            float64   `gorm:"column:latest_value"                                    description:"数据最新值"`
+	TerminalCode           string    `gorm:"column:terminal_code"                                   description:"终端编码，用于配置在机器上"`
+	ErDataUpdateDate       string    `gorm:"column:er_data_update_date"                             description:"本次更新，数据发生变化的最早日期"`
+	UpdateResult           int       `gorm:"column:update_result"                                   description:"本次刷新操作结果：1成功，2失败"`
+	UpdateFailedReason     string    `gorm:"column:update_failed_reason"                            description:"刷新失败原因"`
+	DataUpdateResult       int       `gorm:"column:data_update_result"                              description:"数据更新结果：1成功，2失败"`
+	DataUpdateFailedReason string    `gorm:"column:data_update_failed_reason"                       description:"数据未正常更新原因"`
+	DataUpdateTime         string    `gorm:"column:data_update_time"                                description:"数据更新时间"`
+	IsSourceRefresh        int       `gorm:"column:is_source_refresh"                               description:"是否为终端刷新到数据源的刷新操作：0否，1是"`
+	UpdateType             int       `gorm:"column:update_type"                                     description:"变更类型，0:数据明细变更，1:基础信息变更, 2:新增指标"`
 }
 
 func AddEdbUpdateLog(item *EdbInfoUpdateLog) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
 // GetEdbUpdateLogByCondition 获取指标更新记录
 func GetEdbUpdateLogByCondition(condition string, pars []interface{}) (item []*EdbInfoUpdateLog, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM edb_info_update_log WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
 	return
 }
 
 // GetEdbUpdateSourceLogByCreateDate 获取指标终端更新记录
 func GetEdbUpdateSourceLogByCreateDate(source int, startDate, endDate string) (item []*EdbInfoUpdateLog, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM edb_info_update_log WHERE source = ? and create_time >= ? and create_time < ? and is_source_refresh =1 order by data_update_result asc, id desc`
-	_, err = o.Raw(sql, source, startDate, endDate).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, source, startDate, endDate).Scan(&item).Error
 	return
 }

models/data_stat/edb_info_update_stat.go

@@ -1,43 +1,44 @@
 package data_stat
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // EdbInfoUpdateStat 指标更新/刷新 汇总表（数据源明细表）
 type EdbInfoUpdateStat struct {
-	Id                     uint64    `orm:"column(id);pk"`
-	EdbInfoId              int       `description:"指标ID"`
-	SourceName             string    `description:"来源名称"`
-	Source                 int       `description:"来源id"`
-	EdbCode                string    `description:"指标编码"`
-	EdbName                string    `description:"指标名称"`
-	EdbNameSource          string    `description:"指标名称来源"`
-	Frequency              string    `description:"频率"`
-	Unit                   string    `description:"单位"`
-	StartDate              string    `description:"起始日期"`
-	EndDate                string    `description:"终止日期"`
-	SysUserId              int       `description:"创建人ID"`
-	SysUserRealName        string    `description:"创建人姓名"`
-	UniqueCode             string    `description:"指标唯一编码"`
-	EdbCreateTime          time.Time `description:"指标创建时间"`
-	EdbModifyTime          time.Time `description:"指标修改时间"`
-	CreateTime             time.Time `description:"记录创建时间"`
-	LatestDate             string    `description:"数据最新日期"`
-	LatestValue            float64   `description:"数据最新值"`
-	TerminalCode           string    `description:"终端编码，用于配置在机器上"`
-	ErDataUpdateDate       string    `description:"本次更新，数据发生变化的最早日期"`
-	DataUpdateResult       int       `description:"数据更新结果：1成功，2失败"`
-	DataUpdateFailedReason string    `description:"数据未正常更新原因"`
-	DataUpdateTime         string    `description:"数据更新时间"`
-	UpdateResult           int       `description:"本次刷新操作结果：1成功，2失败"`
-	UpdateFailedReason     string    `description:"刷新失败原因"`
-	UpdateTime             string    `description:"刷新时间"`
-	ModifyTime             time.Time `description:"修改时间"`
-	IsAdd                  int       `description:"是否是当日新增的指标：1是，2否"`
-	NeedRefresh            int       `description:"今日是否需要定时刷新，1需要，0不需要"`
-	HasRefresh             int       `description:"今日是否发起刷新服务，1是，0否"`
+	Id                     uint64    `gorm:"primaryKey;autoIncrement;column:id" description:"ID"`
+	EdbInfoId              int       `gorm:"column:edb_info_id" description:"指标ID"`
+	SourceName             string    `gorm:"column:source_name" description:"来源名称"`
+	Source                 int       `gorm:"column:source" description:"来源id"`
+	EdbCode                string    `gorm:"column:edb_code" description:"指标编码"`
+	EdbName                string    `gorm:"column:edb_name" description:"指标名称"`
+	EdbNameSource          string    `gorm:"column:edb_name_source" description:"指标名称来源"`
+	Frequency              string    `gorm:"column:frequency" description:"频率"`
+	Unit                   string    `gorm:"column:unit" description:"单位"`
+	StartDate              string    `gorm:"column:start_date" description:"起始日期"`
+	EndDate                string    `gorm:"column:end_date" description:"终止日期"`
+	SysUserId              int       `gorm:"column:sys_user_id" description:"创建人ID"`
+	SysUserRealName        string    `gorm:"column:sys_user_real_name" description:"创建人姓名"`
+	UniqueCode             string    `gorm:"column:unique_code" description:"指标唯一编码"`
+	EdbCreateTime          time.Time `gorm:"column:edb_create_time" description:"指标创建时间"`
+	EdbModifyTime          time.Time `gorm:"column:edb_modify_time" description:"指标修改时间"`
+	CreateTime             time.Time `gorm:"column:create_time" description:"记录创建时间"`
+	LatestDate             string    `gorm:"column:latest_date" description:"数据最新日期"`
+	LatestValue            float64   `gorm:"column:latest_value" description:"数据最新值"`
+	TerminalCode           string    `gorm:"column:terminal_code" description:"终端编码，用于配置在机器上"`
+	ErDataUpdateDate       string    `gorm:"column:er_data_update_date" description:"本次更新，数据发生变化的最早日期"`
+	DataUpdateResult       int       `gorm:"column:data_update_result" description:"数据更新结果：1成功，2失败"`
+	DataUpdateFailedReason string    `gorm:"column:data_update_failed_reason" description:"数据未正常更新原因"`
+	DataUpdateTime         string    `gorm:"column:data_update_time" description:"数据更新时间"`
+	UpdateResult           int       `gorm:"column:update_result" description:"本次刷新操作结果：1成功，2失败"`
+	UpdateFailedReason     string    `gorm:"column:update_failed_reason" description:"刷新失败原因"`
+	UpdateTime             string    `gorm:"column:update_time" description:"刷新时间"`
+	ModifyTime             time.Time `gorm:"column:modify_time" description:"修改时间"`
+	IsAdd                  int       `gorm:"column:is_add" description:"是否是当日新增的指标：1是，2否"`
+	NeedRefresh            int       `gorm:"column:need_refresh" description:"今日是否需要定时刷新，1需要，0不需要"`
+	HasRefresh             int       `gorm:"column:has_refresh" description:"今日是否发起刷新服务，1是，0否"`
 }
 
 // Add 新增
@@ -93,11 +94,10 @@ WHERE
 
 // GetEdbUpdateStatByCondition 获取指标更新汇总记录
 func GetEdbUpdateStatByCondition(condition string, pars []interface{}) (item []*EdbInfoUpdateStat, err error) {
-	o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info_update_stat WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
 	return
 }

models/data_stat/edb_source_stat.go

@@ -1,36 +1,36 @@
 package data_stat
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // EdbSourceStat 数据源统计表
 type EdbSourceStat struct {
-	Id                int       `orm:"column(id);pk"`
-	SourceName        string    `description:"来源名称"`
-	Source            int       `description:"来源id"`
-	TerminalCode      string    `description:"终端编码，用于配置在机器上"`
-	EdbNum            int       `description:"指标总数"`
-	EdbNewNum         int       `description:"今日新增指标数"`
-	EdbDelNum         int       `description:"今日删除指标数"`
-	NeedRefreshNum    int       `description:"今日需刷新指标"`
-	HasRefreshNum     int       `description:"今日发起刷新任务指标数"`
-	UpdateSuccessNum  int       `description:"今日已更新成功指标数"`
-	UpdateFailedNum   int       `description:"今日已更新失败指标数"`
-	RefreshSuccessNum int       `description:"今日已刷新成功指标数"`
-	RefreshFailedNum  int       `description:"今日已刷新失败指标数"`
-	CreateTime        time.Time `description:"创建时间"`
-	ModifyTime        time.Time `description:"修改时间"`
+	Id                int       `gorm:"primaryKey;autoIncrement;column:id" description:"ID"`
+	SourceName        string    `gorm:"column:source_name" description:"来源名称"`
+	Source            int       `gorm:"column:source" description:"来源id"`
+	TerminalCode      string    `gorm:"column:terminal_code" description:"终端编码，用于配置在机器上"`
+	EdbNum            int       `gorm:"column:edb_num" description:"指标总数"`
+	EdbNewNum         int       `gorm:"column:edb_new_num" description:"今日新增指标数"`
+	EdbDelNum         int       `gorm:"column:edb_del_num" description:"今日删除指标数"`
+	NeedRefreshNum    int       `gorm:"column:need_refresh_num" description:"今日需刷新指标"`
+	HasRefreshNum     int       `gorm:"column:has_refresh_num" description:"今日发起刷新任务指标数"`
+	UpdateSuccessNum  int       `gorm:"column:update_success_num" description:"今日已更新成功指标数"`
+	UpdateFailedNum   int       `gorm:"column:update_failed_num" description:"今日已更新失败指标数"`
+	RefreshSuccessNum int       `gorm:"column:refresh_success_num" description:"今日已刷新成功指标数"`
+	RefreshFailedNum  int       `gorm:"column:refresh_failed_num" description:"今日已刷新失败指标数"`
+	CreateTime        time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime        time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 func GetEdbSourceStatByCondition(condition string, pars []interface{}) (item []*EdbSourceStat, err error) {
-	o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_source_stat WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
 	return
 }
 

models/edb_adjust_conf.go

@@ -7,7 +7,7 @@ import (
 // EdbAdjustConf 计算指标于基础指标，关系表
 type EdbAdjustConf struct {
 	EdbInfoId     int       `gorm:"primaryKey;autoIncrement;column:edb_info_id" description:"计算指标id"`
-	SourceEndDate time.Time `description:"来源指标的实际数据日期"`
-	ModifyTime    time.Time `description:"修改时间"`
-	CreateTime    time.Time `description:"创建时间"`
+	SourceEndDate time.Time `gorm:"column:source_end_date" description:"来源指标的实际数据日期"`
+	ModifyTime    time.Time `gorm:"column:modify_time" description:"修改时间"`
+	CreateTime    time.Time `gorm:"column:create_time" description:"创建时间"`
 }

models/edb_classify.go

@@ -10,18 +10,18 @@ import (
 
 type EdbClassify struct {
 	ClassifyId      int       `gorm:"primaryKey;autoIncrement;column:classify_id"`
-	ClassifyType    uint8     `description:"分类类型，0：普通指标分类，1：预测指标分类"`
-	ClassifyName    string    `description:"分类名称"`
-	ParentId        int       `description:"父级id"`
-	RootId          int       `description:"顶级id"`
-	HasData         int       `description:"是否含有指标数据"`
-	CreateTime      time.Time `description:"创建时间"`
-	ModifyTime      time.Time `description:"修改时间"`
-	SysUserId       int       `description:"创建人id"`
-	SysUserRealName string    `description:"创建人姓名"`
-	Level           int       `description:"层级"`
-	UniqueCode      string    `description:"唯一编码"`
-	Sort            int       `description:"排序字段，越小越靠前，默认值：10"`
+	ClassifyType    uint8     `gorm:"column:classify_type" description:"分类类型，0：普通指标分类，1：预测指标分类"`
+	ClassifyName    string    `gorm:"column:classify_name" description:"分类名称"`
+	ParentId        int       `gorm:"column:parent_id" description:"父级id"`
+	RootId          int       `gorm:"column:root_id" description:"顶级id"`
+	HasData         int       `gorm:"column:has_data" description:"是否含有指标数据"`
+	CreateTime      time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime      time.Time `gorm:"column:modify_time" description:"修改时间"`
+	SysUserId       int       `gorm:"column:sys_user_id" description:"创建人id"`
+	SysUserRealName string    `gorm:"column:sys_user_real_name" description:"创建人姓名"`
+	Level           int       `gorm:"column:level" description:"层级"`
+	UniqueCode      string    `gorm:"column:unique_code" description:"唯一编码"`
+	Sort            int       `gorm:"column:sort" description:"排序字段，越小越靠前，默认值：10"`
 }
 
 func AddEdbClassify(item *EdbClassify) (lastId int64, err error) {

models/edb_config.go

@@ -1,6 +1,8 @@
 package models
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta_gn/eta_index_lib/global"
+)
 
 type EdbConfig struct {
 	ConfigValue string `description:"详情"`
@@ -8,16 +10,16 @@ type EdbConfig struct {
 
 // EdbConfigUpdate 修改配置
 func EdbConfigUpdate(newValue, configCode string) (err error) {
-	o := orm.NewOrm()
+
 	sql := `UPDATE edb_config SET  config_value=?   WHERE config_code=  ?`
-	_, err = o.Raw(sql, newValue, configCode).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, newValue, configCode).Error
 	return
 }
 
 // GetConfigDetailByCode 根据配置编码获取配置的值
 func GetConfigDetailByCode(configCode string) (item *EdbConfig, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT config_value FROM edb_config WHERE config_code=? `
-	err = o.Raw(sql, configCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, configCode).First(&item).Error
 	return
 }

models/edb_data_base.go

@@ -21,15 +21,15 @@ type EdbDataItem struct {
 }
 
 type EdbData struct {
-	EdbDataId     int `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         string
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
+	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
+	EdbInfoId     int       `gorm:"column:edb_info_id"`
+	EdbCode       string    `gorm:"column:edb_code"`
+	DataTime      string    `gorm:"column:data_time"`
+	Value         string    `gorm:"column:value"`
+	Status        int       `gorm:"column:status"`
+	CreateTime    time.Time `gorm:"column:create_time"`
+	ModifyTime    time.Time `gorm:"column:modify_time"`
+	DataTimestamp int64     `gorm:"column:data_timestamp"`
 }
 
 func GetAddSql(edbInfoId, edbCode, dataTime, timestampStr string, value string) (addSql string) {
@@ -159,15 +159,15 @@ func GetFinalLastByTo(to *gorm.DB, edbInfoId, source, subSource int, latestDate
 
 // 新版本
 type EdbDataV1 struct {
-	EdbDataId     int `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         string
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
+	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
+	EdbInfoId     int       `gorm:"column:edb_info_id"`
+	EdbCode       string    `gorm:"column:edb_code"`
+	DataTime      string    `gorm:"column:data_time"`
+	Value         string    `gorm:"column:value"`
+	Status        int       `gorm:"column:status"`
+	CreateTime    time.Time `gorm:"column:create_time"`
+	ModifyTime    time.Time `gorm:"column:modify_time"`
+	DataTimestamp int64     `gorm:"column:data_timestamp"`
 }
 
 type EdbDataList struct {

models/edb_data_calculate_ljztbpj.go

@@ -15,15 +15,15 @@ import (
 
 // EdbDataCalculateLjztbpj 累计值同比拼接数据结构体
 type EdbDataCalculateLjztbpj struct {
-	EdbDataId     int `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
+	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
+	EdbInfoId     int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode       string    `gorm:"column:edb_code" description:"指标编码"`
+	DataTime      string    `gorm:"column:data_time" description:"数据日期"`
+	Value         float64   `gorm:"column:value" description:"数据值"`
+	Status        int       `gorm:"column:status" description:"状态"`
+	CreateTime    time.Time `gorm:"column:status" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:create_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
 // AddCalculateLjztbpj 新增累计值同比拼接数据

models/edb_data_calculate_nhcc.go

@@ -14,15 +14,15 @@ import (
 
 // EdbDataCalculateNhcc 拟合残差数据结构体
 type EdbDataCalculateNhcc struct {
-	EdbDataId     int `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
+	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
+	EdbInfoId     int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode       string    `gorm:"column:edb_code" description:"指标编码"`
+	DataTime      string    `gorm:"column:data_time" description:"数据日期"`
+	Value         float64   `gorm:"column:value" description:"数据值"`
+	Status        int       `gorm:"column:status" description:"状态"`
+	CreateTime    time.Time `gorm:"column:status" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:create_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
 // NhccDate 拟合残差的开始、结束日期
@@ -592,7 +592,7 @@ func refreshAllCalculateNhcc(to *gorm.DB, edbInfo *EdbInfo, existItemA, existIte
 			// 如果有的话，还需要判断值是否一致，一致则不处理，不一致则修改
 			if existData.Value != val {
 				existData.Value = val
-				_ = to.Model(existData).Select( []string{"Value"}).Updates(existData).Error
+				_ = to.Model(existData).Select([]string{"Value"}).Updates(existData).Error
 				if err != nil {
 					return
 				}

models/edb_data_calculate_zjpj.go

@@ -12,15 +12,15 @@ import (
 
 // EdbDataCalculateZjpj 直接拼接数据结构体
 type EdbDataCalculateZjpj struct {
-	EdbDataId     int `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
+	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
+	EdbInfoId     int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode       string    `gorm:"column:edb_code" description:"指标编码"`
+	DataTime      string    `gorm:"column:data_time" description:"数据日期"`
+	Value         float64   `gorm:"column:value" description:"数据值"`
+	Status        int       `gorm:"column:status" description:"状态"`
+	CreateTime    time.Time `gorm:"column:status" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:create_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
 // AddCalculateZjpj 新增直接拼接数据

models/edb_data_insert_config.go

@@ -8,7 +8,7 @@ import (
 
 // EdbDataInsertConfig 指标数据插入配置表
 type EdbDataInsertConfig struct {
-	EdbInfoId  int       `orm:"column(edb_info_id);pk" description:"指标id"`
+	EdbInfoId  int       `gorm:"primaryKey;autoIncrement;column:edb_info_id" description:"指标id"`
 	Date       time.Time `description:"插入的日期"`
 	Value      string    `description:"插入的值"`
 	RealDate   time.Time `description:"实际数据的日期"`

models/edb_data_ly.go

@@ -13,13 +13,13 @@ import (
 
 type EdbDataLy struct {
 	edbDataId     int     `gorm:"primaryKey;autoIncrement;column:edb_data_id"` // 数据ID
-	CreateTime    string  `orm:"column(create_time)"`                          // 创建时间
-	ModifyTime    string  `orm:"column(modify_time)"`                          // 修改时间
-	EdbInfoId     int     `orm:"column(edb_info_id)"`                          // 指标id
-	EdbCode       string  `orm:"column(edb_code)"`                             // 指标编码
-	DataTime      string  `orm:"column(data_time)"`                            // 数据日期
-	Value         float64 `orm:"column(value)"`                                // 数据值
-	DataTimestamp uint64  `orm:"column(data_timestamp)"`                       // 数据日期时间戳
+	EdbInfoId     int     `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode       string  `gorm:"column:edb_code" description:"指标编码"`
+	DataTime      string  `gorm:"column:data_time" description:"数据日期"`
+	Value         float64 `gorm:"column:value" description:"数据值"`
+	CreateTime    string  `gorm:"column:status" description:"创建时间"`
+	ModifyTime    string  `gorm:"column:create_time" description:"修改时间"`
+	DataTimestamp int64   `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
 /*func init() {

models/edb_data_ths_hf.go

@@ -12,13 +12,13 @@ import (
 // EdbDataThsHf 同花顺高频指标数据
 type EdbDataThsHf struct {
 	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int       `description:"指标ID"`
-	EdbCode       string    `description:"指标编码"`
-	DataTime      time.Time `description:"数据日期"`
-	Value         float64   `description:"数据值"`
-	CreateTime    time.Time `description:"创建时间"`
-	ModifyTime    time.Time `description:"修改时间"`
-	DataTimestamp int64     `description:"数据日期时间戳"`
+	EdbInfoId     int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode       string    `gorm:"column:edb_code" description:"指标编码"`
+	DataTime      time.Time `gorm:"column:data_time" description:"数据日期"`
+	Value         float64   `gorm:"column:value" description:"数据值"`
+	CreateTime    time.Time `gorm:"column:status" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:create_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
 func (m *EdbDataThsHf) TableName() string {

models/edb_data_trade_analysis.go

@@ -12,13 +12,13 @@ import (
 // EdbDataTradeAnalysis 持仓分析指标数据
 type EdbDataTradeAnalysis struct {
 	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int       `description:"指标ID"`
-	EdbCode       string    `description:"指标编码"`
-	DataTime      time.Time `description:"数据日期"`
-	Value         float64   `description:"数据值"`
-	CreateTime    time.Time `description:"创建时间"`
-	ModifyTime    time.Time `description:"修改时间"`
-	DataTimestamp int64     `description:"数据日期时间戳"`
+	EdbInfoId     int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode       string    `gorm:"column:edb_code" description:"指标编码"`
+	DataTime      time.Time `gorm:"column:data_time" description:"数据日期"`
+	Value         float64   `gorm:"column:value" description:"数据值"`
+	CreateTime    time.Time `gorm:"column:status" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:create_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
 func (m *EdbDataTradeAnalysis) TableName() string {

models/edb_info.go

@@ -3,6 +3,7 @@ package models
 import (
 	"encoding/json"
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/models/mgo"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
@@ -17,110 +18,128 @@ import (
 )
 
 type EdbInfo struct {
-	EdbInfoId        int    `orm:"column(edb_info_id);pk"`
-	EdbInfoType      int    `description:"指标类型，0：普通指标，1：预测指标"`
-	SourceName       string `description:"来源名称"`
-	Source           int    `description:"来源id"`
-	EdbCode          string `description:"指标编码"`
-	EdbName          string `description:"指标名称"`
-	EdbNameEn        string `description:"英文指标名称"`
-	EdbNameSource    string `description:"指标名称来源"`
-	Frequency        string `description:"频率"`
-	Unit             string `description:"单位"`
-	UnitEn           string `description:"英文单位"`
-	StartDate        string `description:"起始日期"`
-	EndDate          string `description:"终止日期"`
-	ClassifyId       int    `description:"分类id"`
-	SysUserId        int
-	SysUserRealName  string
-	UniqueCode       string `description:"指标唯一编码"`
-	CreateTime       time.Time
-	ModifyTime       time.Time
-	BaseModifyTime   time.Time
-	MinValue         float64 `description:"指标最小值"`
-	MaxValue         float64 `description:"指标最大值"`
-	CalculateFormula string  `description:"计算公式"`
-	EdbType          int     `description:"指标类型:1:基础指标,2:计算指标"`
-	IsUpdate         int     `description:"当天是否已更新，1:未更新,2:已更新"`
-	Sort             int     `description:"排序字段"`
-	LatestDate       string  `description:"数据最新日期（实际日期）"`
-	LatestValue      float64 `description:"数据最新值（实际值）"`
-	EndValue         float64 `description:"数据的最新值（预测日期的最新值）"`
-	MoveType         int     `description:"移动方式:1:领先(默认),2:滞后"`
-	MoveFrequency    string  `description:"移动频度"`
-	NoUpdate         int8    `description:"是否停止更新，0：继续更新；1：停止更新"`
-	ServerUrl        string  `description:"服务器地址"`
-	ChartImage       string  `description:"图表图片"`
-	Calendar         string  `description:"公历/农历" orm:"default(公历);"`
-	EmptyType        int     `description:"空值处理类型（0查找前后35天，1不计算，2前值填充，3后值填充，4等于0）"`
-	MaxEmptyType     int     `description:"MAX、MIN公式空值处理类型（1、等于0；2、跳过空值）"`
-	DataDateType     string  `orm:"column(data_date_type);size(255);null;default(交易日)"`
-	ManualSave       int     `description:"是否有手动保存过上下限: 0-否; 1-是"`
-	TerminalCode     string  `description:"终端编码，用于配置在机器上"`
-	DataUpdateTime   string  `description:"最近一次数据发生变化的时间"`
-	ErDataUpdateDate string  `description:"本次更新，数据发生变化的最早日期"`
-	SourceIndexName  string  `description:"数据源中的指标名称"`
-	SubSource        int     `description:"子数据来源:0:经济数据库,1:日期序列"`
-	SubSourceName    string  `description:"子数据来源名称"`
-	IndicatorCode    string  `description:"指标代码"`
-	StockCode        string  `description:"证券代码"`
-	Extra            string  `description:"指标的额外配置"`
+	EdbInfoId        int       `gorm:"primaryKey;autoIncrement;column:edb_info_id" description:"唯一标识"`
+	EdbInfoType      int       `gorm:"column:edb_info_type" description:"指标类型，0：普通指标，1：预测指标"`
+	SourceName       string    `gorm:"column:source_name" description:"来源名称"`
+	Source           int       `gorm:"column:source" description:"来源id"`
+	EdbCode          string    `gorm:"column:edb_code" description:"指标编码"`
+	EdbName          string    `gorm:"column:edb_name" description:"指标名称"`
+	EdbNameEn        string    `gorm:"column:edb_name_en" description:"英文指标名称"`
+	EdbNameSource    string    `gorm:"column:edb_name_source" description:"指标名称来源"`
+	Frequency        string    `gorm:"column:frequency" description:"频率"`
+	Unit             string    `gorm:"column:unit" description:"单位"`
+	UnitEn           string    `gorm:"column:unit_en" description:"英文单位"`
+	StartDate        string    `gorm:"column:start_date" description:"起始日期"`
+	EndDate          string    `gorm:"column:end_date" description:"终止日期"`
+	ClassifyId       int       `gorm:"column:classify_id" description:"分类id"`
+	SysUserId        int       `gorm:"column:sys_user_id" description:"系统用户ID"`
+	SysUserRealName  string    `gorm:"column:sys_user_real_name" description:"系统用户真实姓名"`
+	UniqueCode       string    `gorm:"column:unique_code" description:"指标唯一编码"`
+	CreateTime       time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime       time.Time `gorm:"column:modify_time" description:"修改时间"`
+	BaseModifyTime   time.Time `gorm:"column:base_modify_time" description:"基础修改时间"`
+	MinValue         float64   `gorm:"column:min_value" description:"指标最小值"`
+	MaxValue         float64   `gorm:"column:max_value" description:"指标最大值"`
+	CalculateFormula string    `gorm:"column:calculate_formula" description:"计算公式"`
+	EdbType          int       `gorm:"column:edb_type" description:"指标类型:1:基础指标,2:计算指标"`
+	IsUpdate         int       `gorm:"column:is_update" description:"当天是否已更新，1:未更新,2:已更新"`
+	Sort             int       `gorm:"column:sort" description:"排序字段"`
+	LatestDate       string    `gorm:"column:latest_date" description:"数据最新日期（实际日期）"`
+	LatestValue      float64   `gorm:"column:latest_value" description:"数据最新值（实际值）"`
+	EndValue         float64   `gorm:"column:end_value" description:"数据的最新值（预测日期的最新值）"`
+	MoveType         int       `gorm:"column:move_type" description:"移动方式:1:领先(默认),2:滞后"`
+	MoveFrequency    string    `gorm:"column:move_frequency" description:"移动频度"`
+	NoUpdate         int8      `gorm:"column:no_update" description:"是否停止更新，0：继续更新；1：停止更新"`
+	ServerUrl        string    `gorm:"column:server_url" description:"服务器地址"`
+	ChartImage       string    `gorm:"column:chart_image" description:"图表图片"`
+	Calendar         string    `gorm:"column:calendar;default:公历" description:"公历/农历"`
+	EmptyType        int       `gorm:"column:empty_type" description:"空值处理类型（0查找前后35天，1不计算，2前值填充，3后值填充，4等于0）"`
+	MaxEmptyType     int       `gorm:"column:max_empty_type" description:"MAX、MIN公式空值处理类型（1、等于0；2、跳过空值）"`
+	DataDateType     string    `gorm:"column:data_date_type;size:255;default:交易日" description:"数据日期类型"`
+	ManualSave       int       `gorm:"column:manual_save" description:"是否有手动保存过上下限: 0-否; 1-是"`
+	TerminalCode     string    `gorm:"column:terminal_code" description:"终端编码，用于配置在机器上"`
+	DataUpdateTime   string    `gorm:"column:data_update_time" description:"最近一次数据发生变化的时间"`
+	ErDataUpdateDate string    `gorm:"column:er_data_update_date" description:"本次更新，数据发生变化的最早日期"`
+	SourceIndexName  string    `gorm:"column:source_index_name" description:"数据源中的指标名称"`
+	SubSource        int       `gorm:"column:sub_source" description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName    string    `gorm:"column:sub_source_name" description:"子数据来源名称"`
+	IndicatorCode    string    `gorm:"column:indicator_code" description:"指标代码"`
+	StockCode        string    `gorm:"column:stock_code" description:"证券代码"`
+	Extra            string    `gorm:"column:extra" description:"指标的额外配置"`
 }
 
 func (e *EdbInfo) Add() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(e)
+
+	err = global.DEFAULT_DmSQL.Create(e).Error
 	return
 }
 
 // AddEdbInfo 添加指标
 func AddEdbInfo(item *EdbInfo) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
 // EdbInfoList 指标数据列表
 type EdbInfoList struct {
-	EdbInfoId       int                    `orm:"column(edb_info_id);pk"`
-	EdbInfoType     int                    `description:"指标类型，0：普通指标，1：预测指标"`
-	SourceName      string                 `description:"来源名称"`
-	Source          int                    `description:"来源id"`
-	EdbCode         string                 `description:"指标编码"`
-	EdbNameEn       string                 `description:"英文指标名称"`
-	EdbName         string                 `description:"指标名称"`
-	Frequency       string                 `description:"频率"`
 	FrequencyEn     string                 `description:"英文频率"`
-	Unit            string                 `description:"单位"`
-	UnitEn          string                 `description:"英文单位"`
-	StartDate       string                 `description:"起始日期"`
-	EndDate         string                 `description:"终止日期"`
-	LatestDate      string                 `description:"数据最新日期（实际日期）"`
-	LatestValue     float64                `description:"数据最新值（实际值）"`
-	EndValue        float64                `description:"数据的最新值（预测日期的最新值）"`
-	ClassifyId      int                    `description:"分类id"`
-	UniqueCode      string                 `description:"指标唯一编码"`
-	SysUserId       int                    `description:"创建人id"`
-	SysUserRealName string                 `description:"创建人姓名"`
-	ModifyTime      string                 `description:"最新修改时间"`
-	CreateTime      string                 `description:"创建时间"`
 	EdbNameAlias    string                 `json:"-" description:"指标名称,别名"`
-	EdbType         int                    `description:"指标类型:1:基础指标,2:计算指标"`
-	ChartImage      string                 `description:"图表图片"`
 	RuleType        int                    `description:"预测规则，1：最新，2：固定值"`
 	FixedValue      float64                `description:"固定值"`
 	DataList        []*EdbData             `description:"实际指标数据"`
 	PredictDataList []*EdbData             `description:"预测指标数据"`
 	Button          EdbClassifyItemsButton `description:"操作权限"`
 	IsEnEdb         bool                   `description:"是否展示英文标识"`
-	DataDateType    string                 `description:"数据日期类型，枚举值：交易日、自然日"`
-	EmptyType       int                    `description:"空值处理类型（0查找前后35天，1不计算，2前值填充，3后值填充，4等于0）"`
-	MaxEmptyType    int                    `description:"MAX、MIN公式空值处理类型（1、等于0；2、跳过空值）"`
-	SubSource       int                    `description:"子数据来源:0:经济数据库,1:日期序列"`
-	SubSourceName   string                 `description:"子数据来源名称"`
-	IndicatorCode   string                 `description:"指标代码"`
-	StockCode       string                 `description:"证券代码"`
-	NoUpdate        int8                   `description:"是否停止更新，0：继续更新；1：停止更新"`
+
+	EdbInfoId   int    `gorm:"primaryKey;autoIncrement;column:edb_info_id" description:"唯一标识"`
+	EdbInfoType int    `gorm:"column:edb_info_type" description:"指标类型，0：普通指标，1：预测指标"`
+	SourceName  string `gorm:"column:source_name" description:"来源名称"`
+	Source      int    `gorm:"column:source" description:"来源id"`
+	EdbCode     string `gorm:"column:edb_code" description:"指标编码"`
+	EdbName     string `gorm:"column:edb_name" description:"指标名称"`
+	EdbNameEn   string `gorm:"column:edb_name_en" description:"英文指标名称"`
+	//EdbNameSource    string    `gorm:"column:edb_name_source" description:"指标名称来源"`
+	Frequency       string    `gorm:"column:frequency" description:"频率"`
+	Unit            string    `gorm:"column:unit" description:"单位"`
+	UnitEn          string    `gorm:"column:unit_en" description:"英文单位"`
+	StartDate       string    `gorm:"column:start_date" description:"起始日期"`
+	EndDate         string    `gorm:"column:end_date" description:"终止日期"`
+	ClassifyId      int       `gorm:"column:classify_id" description:"分类id"`
+	SysUserId       int       `gorm:"column:sys_user_id" description:"系统用户ID"`
+	SysUserRealName string    `gorm:"column:sys_user_real_name" description:"系统用户真实姓名"`
+	UniqueCode      string    `gorm:"column:unique_code" description:"指标唯一编码"`
+	CreateTime      time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime      time.Time `gorm:"column:modify_time" description:"修改时间"`
+	//BaseModifyTime   time.Time `gorm:"column:base_modify_time" description:"基础修改时间"`
+	//MinValue         float64   `gorm:"column:min_value" description:"指标最小值"`
+	/*MaxValue         float64   `gorm:"column:max_value" description:"指标最大值"`
+	CalculateFormula string    `gorm:"column:calculate_formula" description:"计算公式"`*/
+	EdbType int `gorm:"column:edb_type" description:"指标类型:1:基础指标,2:计算指标"`
+	//IsUpdate         int       `gorm:"column:is_update" description:"当天是否已更新，1:未更新,2:已更新"`
+	//Sort             int       `gorm:"column:sort" description:"排序字段"`
+	LatestDate  string  `gorm:"column:latest_date" description:"数据最新日期（实际日期）"`
+	LatestValue float64 `gorm:"column:latest_value" description:"数据最新值（实际值）"`
+	EndValue    float64 `gorm:"column:end_value" description:"数据的最新值（预测日期的最新值）"`
+	//MoveType         int       `gorm:"column:move_type" description:"移动方式:1:领先(默认),2:滞后"`
+	//MoveFrequency    string    `gorm:"column:move_frequency" description:"移动频度"`
+	NoUpdate int8 `gorm:"column:no_update" description:"是否停止更新，0：继续更新；1：停止更新"`
+	//ServerUrl        string    `gorm:"column:server_url" description:"服务器地址"`
+	ChartImage string `gorm:"column:chart_image" description:"图表图片"`
+	//Calendar         string    `gorm:"column:calendar;default:公历" description:"公历/农历"`
+	EmptyType    int    `gorm:"column:empty_type" description:"空值处理类型（0查找前后35天，1不计算，2前值填充，3后值填充，4等于0）"`
+	MaxEmptyType int    `gorm:"column:max_empty_type" description:"MAX、MIN公式空值处理类型（1、等于0；2、跳过空值）"`
+	DataDateType string `gorm:"column:data_date_type;size:255;default:交易日" description:"数据日期类型"`
+	/*ManualSave       int       `gorm:"column:manual_save" description:"是否有手动保存过上下限: 0-否; 1-是"`
+	TerminalCode     string    `gorm:"column:terminal_code" description:"终端编码，用于配置在机器上"`
+	DataUpdateTime   string    `gorm:"column:data_update_time" description:"最近一次数据发生变化的时间"`
+	ErDataUpdateDate string    `gorm:"column:er_data_update_date" description:"本次更新，数据发生变化的最早日期"`
+	SourceIndexName  string    `gorm:"column:source_index_name" description:"数据源中的指标名称"`*/
+	SubSource     int    `gorm:"column:sub_source" description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName string `gorm:"column:sub_source_name" description:"子数据来源名称"`
+	IndicatorCode string `gorm:"column:indicator_code" description:"指标代码"`
+	StockCode     string `gorm:"column:stock_code" description:"证券代码"`
+	//Extra            string    `gorm:"column:extra" description:"指标的额外配置"`
 }
 
 // EdbClassifyItemsButton 操作按钮
@@ -135,33 +154,33 @@ type EdbClassifyItemsButton struct {
 
 // GetEdbInfoByName 根据指标名称获取所有的指标数据列表
 func GetEdbInfoByName(edbName string) (items []*EdbInfoList, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM edb_info WHERE edb_name=? `
-	_, err = o.Raw(sql, edbName).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbName).Scan(&items).Error
 	return
 }
 
 // ModifyEdbInfoNameSource 根据来源修改指标名称
 func ModifyEdbInfoNameSource(edbNameSource string, edbInfoId int) (err error) {
-	o := orm.NewOrm()
+
 	sql := ` UPDATE  edb_info SET edb_name_source=? WHERE edb_info_id = ? `
-	_, err = o.Raw(sql, edbNameSource, edbInfoId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, edbNameSource, edbInfoId).Error
 	return
 }
 
 // GetEdbInfoById 根据指标id获取指标信息
 func GetEdbInfoById(edbInfoId int) (item *EdbInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM edb_info WHERE edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&item).Error
 	return
 }
 
 // GetEdbInfoByUniqueCode 根据指标唯一编码获取指标信息
 func GetEdbInfoByUniqueCode(uniqueCode string) (item *EdbInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM edb_info WHERE unique_code=? `
-	err = o.Raw(sql, uniqueCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, uniqueCode).First(&item).Error
 	return
 }
 
@@ -171,16 +190,16 @@ func GetEdbInfoByIdList(edbInfoIdList []int) (items []*EdbInfo, err error) {
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM edb_info WHERE edb_info_id in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, edbInfoIdList).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoIdList).Scan(&items).Error
 	return
 }
 
 // Update 更新EdbInfo信息
 func (edbInfo *EdbInfo) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(edbInfo, cols...)
+
+	err = global.DEFAULT_DmSQL.Model(edbInfo).Select(cols).Updates(edbInfo).Error
 	return
 }
 
@@ -234,7 +253,6 @@ func GetEdbDataListAllByMysql(source, subSource int, findEdbDataListAllCond Find
 	if findEdbDataListAllCond.EdbInfoId <= 0 {
 		return
 	}
-	to := orm.NewOrm()
 
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
@@ -265,7 +283,8 @@ func GetEdbDataListAllByMysql(source, subSource int, findEdbDataListAllCond Find
 	} else {
 		sql += ` ORDER BY data_time DESC `
 	}
-	_, err = to.Raw(sql, pars).QueryRows(&item)
+	// todo
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
 	return
 }
 
@@ -402,17 +421,18 @@ type EdbInfoMaxAndMinInfo struct {
 
 // GetEdbInfoMaxAndMinInfo 获取指标的最新数据记录信息
 func GetEdbInfoMaxAndMinInfo(source, subSource int, edbCode string) (item *EdbInfoMaxAndMinInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date,MIN(value) AS min_value,MAX(value) AS max_value FROM %s WHERE edb_code=? `
 	sql = fmt.Sprintf(sql, tableName)
-	err = o.Raw(sql, edbCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&item).Error
 
 	var latest_value float64
 	sql = ` SELECT value AS latest_value FROM %s WHERE edb_code=? ORDER BY data_time DESC LIMIT 1 `
 	sql = fmt.Sprintf(sql, tableName)
-	err = o.Raw(sql, edbCode).QueryRow(&latest_value)
+	// todo 测试查询单个字段
+	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).Scan(&latest_value).Error
 	item.LatestValue = latest_value
 	return
 }
@@ -423,36 +443,36 @@ type EdbIndoDataUpdateTime struct {
 
 // GetEdbDataUpdateTimeByModify 获取指标的刷新时间获取最早的一条记录
 func GetEdbDataUpdateTimeByModify(source, subSource int, edbCode string, dataUpdateTime string) (item *EdbIndoDataUpdateTime, err error) {
-	o := orm.NewOrm()
+
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` SELECT MIN(data_time) AS min_date FROM %s WHERE edb_code=? and modify_time>=?`
 	sql = fmt.Sprintf(sql, tableName)
-	err = o.Raw(sql, edbCode, dataUpdateTime).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, dataUpdateTime).First(&item).Error
 	return
 }
 
 // ModifyEdbInfoMaxAndMinInfo 修改指标的最新数据信息
 func ModifyEdbInfoMaxAndMinInfo(edbInfoId int, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+
 	sql := ` UPDATE edb_info SET start_date=?,end_date=?,min_value=?,max_value=?,is_update=2,latest_date=?,latest_value=?, end_value = ?,modify_time=NOW() WHERE edb_info_id=? `
-	_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.MinValue, item.MaxValue, item.MaxDate, item.LatestValue, item.LatestValue, edbInfoId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, item.MinValue, item.MaxValue, item.MaxDate, item.LatestValue, item.LatestValue, edbInfoId).Error
 	return
 }
 
 // ModifyEdbTimeAndLastInfo 修改指标的最新数据信息(除上下限)
 func ModifyEdbTimeAndLastInfo(edbInfoId int, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+
 	sql := `UPDATE edb_info SET start_date = ?, end_date = ?, is_update = 2,latest_date = ?, latest_value = ?, end_value = ?, modify_time = NOW() WHERE edb_info_id = ?`
-	_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.MaxDate, item.LatestValue, item.LatestValue, edbInfoId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, item.MaxDate, item.LatestValue, item.LatestValue, edbInfoId).Error
 	return
 }
 
 // ModifyEdbDataUpdateTime 修改指标刷新，本次数据刷新的最早日期
 func ModifyEdbDataUpdateTime(edbInfoId int, dataUpdateTime, erDataUpdateDate string) (err error) {
-	o := orm.NewOrm()
+
 	sql := `UPDATE edb_info SET data_update_time = ?, er_data_update_date = ?, modify_time = NOW() WHERE edb_info_id = ?`
-	_, err = o.Raw(sql, dataUpdateTime, erDataUpdateDate, edbInfoId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, dataUpdateTime, erDataUpdateDate, edbInfoId).Error
 	return
 }
 
@@ -510,18 +530,18 @@ func GetLteZeroEdbDataCountByMongo(source, subSource, edbInfoId int) (count int,
 // @return count int
 // @return err error
 func GetLteZeroEdbDataCountByMysql(source, subSource, edbInfoId int) (count int, err error) {
-	o := orm.NewOrm()
+
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` SELECT COUNT(1) AS count FROM %s WHERE 1=1 AND edb_info_id =?  AND value <=0 `
 	sql = fmt.Sprintf(sql, tableName)
-	err = o.Raw(sql, edbInfoId).QueryRow(&count)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Scan(&count).Error
 	return
 }
 
 // GetLastEdbData 获取最近的一条指标数据
 func GetLastEdbData(condition string, pars []interface{}, source, subSource int) (item *EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
+
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` SELECT * FROM %s WHERE 1=1 `
@@ -531,15 +551,15 @@ func GetLastEdbData(condition string, pars []interface{}, source, subSource int)
 		sql += condition
 	}
 	sql += ` ORDER BY data_time DESC `
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
 	return
 }
 
 // GetEdbInfoByEdbCode 根据指标code获取指标信息
 func GetEdbInfoByEdbCode(source int, edbCode string) (item *EdbInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM edb_info WHERE source=? AND edb_code=? `
-	err = o.Raw(sql, source, edbCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, source, edbCode).First(&item).Error
 
 	if errors.Is(err, orm.ErrNoRows) {
 		err = nil
@@ -550,33 +570,31 @@ func GetEdbInfoByEdbCode(source int, edbCode string) (item *EdbInfo, err error)
 
 // GetEdbInfoOnlyByEdbCode 仅根据指标code获取指标信息
 func GetEdbInfoOnlyByEdbCode(edbCode string) (item *EdbInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM edb_info WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&item).Error
 	return
 }
 
 // GetEdbInfoCalculateListByCondition 获取指标关系列表
 func GetEdbInfoCalculateListByCondition(condition string, pars []interface{}) (items []*EdbInfoCalculateMapping, err error) {
-	o := orm.NewOrm()
 
 	sql := ` SELECT * FROM edb_info_calculate_mapping WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
 	return
 }
 
 // GetEdbInfoCalculateCountByCondition 获取关联指标数量
 func GetEdbInfoCalculateCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
 
 	sql := ` SELECT COUNT(1) AS count FROM edb_info_calculate_mapping WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
 	return
 }
 
@@ -589,7 +607,7 @@ type EdbInfoSearchDataV1 struct {
 
 // 优化版本-处理数据精度问题
 func GetEdbDataListAllV1(condition string, pars []interface{}, source, subSource, order int) (item []*EdbInfoSearchDataV1, err error) {
-	o := orm.NewOrm()
+
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` SELECT * FROM %s WHERE 1=1 `
@@ -603,7 +621,7 @@ func GetEdbDataListAllV1(condition string, pars []interface{}, source, subSource
 	} else {
 		sql += ` ORDER BY data_time DESC `
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
 	return
 }
 
@@ -628,7 +646,7 @@ func GetEdbDataListAllV1ByTo(to *gorm.DB, condition string, pars []interface{},
 
 // GetEdbInfoByCondition 获取指标列表
 func GetEdbInfoByCondition(condition string, pars []interface{}, order int) (item []*EdbInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -638,7 +656,7 @@ func GetEdbInfoByCondition(condition string, pars []interface{}, order int) (ite
 	} else {
 		sql += ` ORDER BY edb_info_id ASC `
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
 	return
 }
 
@@ -1220,15 +1238,15 @@ func GetPredictEdbDataListAllByStartDate(edbInfo *EdbInfo, order int, startDate
 
 // ModifyPredictEdbInfoMaxAndMinInfo 修改预测指标的最新数据信息
 func ModifyPredictEdbInfoMaxAndMinInfo(edbInfoId int, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+
 	sql := ` UPDATE edb_info SET start_date=?,end_date=?,min_value=?,max_value=?,is_update=2,latest_date=?,latest_value=?,end_value=?,modify_time=NOW() WHERE edb_info_id=? `
-	_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.MinValue, item.MaxValue, item.LatestDate, item.LatestValue, item.EndValue, edbInfoId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, item.MinValue, item.MaxValue, item.LatestDate, item.LatestValue, item.EndValue, edbInfoId).Error
 	return
 }
 
 // ModifyCalculateEdbInfo 修改计算指标信息
 func ModifyCalculateEdbInfo(edbName, frequency, unit, calculateFormula string, classifyId, edbInfoId int) (err error) {
-	o := orm.NewOrm()
+
 	sql := ` UPDATE  edb_info
 			SET
 			  edb_name =?,
@@ -1239,24 +1257,24 @@ func ModifyCalculateEdbInfo(edbName, frequency, unit, calculateFormula string, c
 			  calculate_formula=?,
 			  modify_time = NOW()
 			WHERE edb_info_id = ?`
-	_, err = o.Raw(sql, edbName, edbName, frequency, unit, classifyId, calculateFormula, edbInfoId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, edbName, edbName, frequency, unit, classifyId, calculateFormula, edbInfoId).Error
 	return
 }
 
 func GetEdbInfoItemByCondition(condition string, pars []interface{}) (item *EdbInfoList, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
 	return
 }
 
 func GetEdbInfoItemListByCondition() (items []*EdbInfoList, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM edb_info WHERE 1=1 `
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&items).Error
 	return
 }
 
@@ -1321,8 +1339,8 @@ func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserR
 
 	if len(items) > 0 {
 		sql := ` UPDATE edb_info SET classify_id=?,modify_time=NOW() WHERE edb_code=? `
-		o := orm.NewOrm()
-		_, err = o.Raw(sql, req.ClassifyId, req.EdbCode).Exec()
+
+		err = global.DEFAULT_DmSQL.Exec(sql, req.ClassifyId, req.EdbCode).Error
 		if err != nil {
 			err = errors.New("更新指标分类信息失败,Err:" + err.Error())
 			return
@@ -1440,10 +1458,10 @@ func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserR
 }
 
 func ModifyEdbInfoBaseTimeById(edbInfoId int, cTime time.Time) (err error) {
-	o := orm.NewOrm()
+
 	// 更新修改时间
 	sql := ` UPDATE edb_info SET base_modify_time = ? WHERE edb_info_id = ? `
-	_, err = o.Raw(sql, cTime, edbInfoId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, cTime, edbInfoId).Error
 	return
 }
 
@@ -1470,9 +1488,9 @@ type ResetEdbClassifyReq struct {
 
 // GetEdbInfoMaxSortByClassifyId 获取分类下指标的最大的排序数
 func GetEdbInfoMaxSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT Max(sort) AS sort FROM edb_info WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
+	err = global.DEFAULT_DmSQL.Raw(sql, classifyId).Scan(&sort).Error
 	return
 }
 
@@ -1527,9 +1545,9 @@ func GetEdbInfoByEdbCodeList(source int, edbCodeList []string) (items []*EdbInfo
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM edb_info WHERE source=? AND edb_code IN (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, source, edbCodeList).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, source, edbCodeList).Scan(&items).Error
 
 	return
 }
@@ -1559,9 +1577,9 @@ func GetEdbInfoNoUpdateTotalByIdList(edbInfoIdList []int) (total int, err error)
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := ` SELECT count(*) FROM edb_info WHERE edb_info_id in (` + utils.GetOrmInReplace(num) + `)  and no_update=1`
-	err = o.Raw(sql, edbInfoIdList).QueryRow(&total)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoIdList).Scan(&total).Error
 	return
 }
 

models/edb_info_calculate_mapping.go

@@ -1,49 +1,49 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // EdbInfoCalculateMapping 计算指标于基础指标，关系表
 type EdbInfoCalculateMapping struct {
-	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk"`
-	EdbInfoId                 int       `description:"计算指标id"`
-	Source                    int       `description:"计算指标来源"`
-	SourceName                string    `description:"计算指标来源名称"`
-	EdbCode                   string    `description:"计算指标编码"`
-	FromEdbInfoId             int       `description:"基础指标id"`
-	FromEdbCode               string    `description:"基础指标编码"`
-	FromEdbName               string    `description:"基础指标名称"`
-	FromSource                int       `description:"基础指标来源"`
-	FromSourceName            string    `description:"基础指标来源名称"`
-	MoveValue                 int       `description:"移动的值，小于0是提前，0是不变，大于0是滞后"`
-	Sort                      int       `description:"计算指标名称排序"`
-	CreateTime                time.Time `description:"创建时间"`
-	ModifyTime                time.Time `description:"修改时间"`
-	FromTag                   string    `description:"来源指标标签"`
-	FromSubSource             int       `description:"渠道子数据库来源"`
+	EdbInfoCalculateMappingId int       `gorm:"primaryKey;autoIncrement;column:edb_info_calculate_mapping_id"`
+	EdbInfoId                 int       `gorm:"column:edb_info_id" description:"计算指标id"`
+	Source                    int       `gorm:"column:source" description:"计算指标来源"`
+	SourceName                string    `gorm:"column:source_name" description:"计算指标来源名称"`
+	EdbCode                   string    `gorm:"column:edb_code" description:"计算指标编码"`
+	FromEdbInfoId             int       `gorm:"column:from_edb_info_id" description:"基础指标id"`
+	FromEdbCode               string    `gorm:"column:from_edb_code" description:"基础指标编码"`
+	FromEdbName               string    `gorm:"column:from_edb_name" description:"基础指标名称"`
+	FromSource                int       `gorm:"column:from_source" description:"基础指标来源"`
+	FromSourceName            string    `gorm:"column:from_source_name" description:"基础指标来源名称"`
+	MoveValue                 int       `gorm:"column:move_value" description:"移动的值，小于0是提前，0是不变，大于0是滞后"`
+	Sort                      int       `gorm:"column:sort" description:"计算指标名称排序"`
+	CreateTime                time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                time.Time `gorm:"column:modify_time" description:"修改时间"`
+	FromTag                   string    `gorm:"column:from_tag" description:"来源指标标签"`
+	FromSubSource             int       `gorm:"column:from_sub_source" description:"渠道子数据库来源"`
 }
 
 // EdbInfoCalculateMappingInfo
 // @Description: 计算指标与基础指标关系表
 type EdbInfoCalculateMappingInfo struct {
-	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk"`
-	EdbInfoId                 int       `description:"计算指标id"`
-	Source                    int       `description:"计算指标来源"`
-	SourceName                string    `description:"计算指标来源名称"`
-	EdbCode                   string    `description:"计算指标编码"`
-	FromEdbInfoId             int       `description:"基础指标id"`
-	FromEdbCode               string    `description:"基础指标编码"`
-	FromEdbName               string    `description:"基础指标名称"`
-	FromSource                int       `description:"基础指标来源"`
-	FromSourceName            string    `description:"基础指标来源名称"`
-	MoveValue                 int       `description:"领先值"`
-	FromTag                   string    `description:"来源指标标签"`
-	Sort                      int       `description:"计算指标名称排序"`
-	CreateTime                time.Time `description:"创建时间"`
-	ModifyTime                time.Time `description:"修改时间"`
+	EdbInfoCalculateMappingId int       `gorm:"primaryKey;autoIncrement;column:edb_info_calculate_mapping_id"`
+	EdbInfoId                 int       `gorm:"column:edb_info_id" description:"计算指标id"`
+	Source                    int       `gorm:"column:source" description:"计算指标来源"`
+	SourceName                string    `gorm:"column:source_name" description:"计算指标来源名称"`
+	EdbCode                   string    `gorm:"column:edb_code" description:"计算指标编码"`
+	FromEdbInfoId             int       `gorm:"column:from_edb_info_id" description:"基础指标id"`
+	FromEdbCode               string    `gorm:"column:from_edb_code" description:"基础指标编码"`
+	FromEdbName               string    `gorm:"column:from_edb_name" description:"基础指标名称"`
+	FromSource                int       `gorm:"column:from_source" description:"基础指标来源"`
+	FromSourceName            string    `gorm:"column:from_source_name" description:"基础指标来源名称"`
+	MoveValue                 int       `gorm:"column:move_value" description:"移动的值，小于0是提前，0是不变，大于0是滞后"`
+	Sort                      int       `gorm:"column:sort" description:"计算指标名称排序"`
+	CreateTime                time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                time.Time `gorm:"column:modify_time" description:"修改时间"`
+	FromTag                   string    `gorm:"column:from_tag" description:"来源指标标签"`
 	FromEdbType               int       `description:"来源指标类型:1:基础指标,2:计算指标"`
 	FromEdbInfoType           int       `description:"来源指标类型: 0-基础指标; 1-预测指标"`
 	FromClassifyId            int       `description:"来源指标分类ID"`
@@ -53,34 +53,34 @@ type EdbInfoCalculateMappingInfo struct {
 
 // AddEdbInfoCalculateMappingMulti 批量添加指标关系表
 func AddEdbInfoCalculateMappingMulti(items []*EdbInfoCalculateMapping) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
 	return
 }
 
 // AddEdbInfoCalculateMappingMulti 批量添加指标关系表
 func (e *EdbInfoCalculateMapping) Add() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(e)
+
+	err = global.DEFAULT_DmSQL.Create(e).Error
 	return
 }
 
 // EdbInfoCalculateMappingView
 type EdbInfoCalculateMappingView struct {
-	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk"`
-	EdbInfoId                 int       `description:"计算指标id"`
-	Source                    int       `description:"计算指标来源"`
-	SourceName                string    `description:"计算指标来源名称"`
-	EdbCode                   string    `description:"计算指标编码"`
-	FromEdbInfoId             int       `description:"基础指标id"`
-	FromEdbCode               string    `description:"基础指标编码"`
-	FromEdbName               string    `description:"基础指标名称"`
-	FromSource                int       `description:"基础指标来源"`
-	FromSourceName            string    `description:"基础指标来源名称"`
-	FromTag                   string    `description:"来源指标标签"`
-	Sort                      int       `description:"计算指标名称排序"`
-	CreateTime                time.Time `description:"创建时间"`
-	ModifyTime                time.Time `description:"修改时间"`
+	EdbInfoCalculateMappingId int       `gorm:"primaryKey;autoIncrement;column:edb_info_calculate_mapping_id"`
+	EdbInfoId                 int       `gorm:"column:edb_info_id" description:"计算指标id"`
+	Source                    int       `gorm:"column:source" description:"计算指标来源"`
+	SourceName                string    `gorm:"column:source_name" description:"计算指标来源名称"`
+	EdbCode                   string    `gorm:"column:edb_code" description:"计算指标编码"`
+	FromEdbInfoId             int       `gorm:"column:from_edb_info_id" description:"基础指标id"`
+	FromEdbCode               string    `gorm:"column:from_edb_code" description:"基础指标编码"`
+	FromEdbName               string    `gorm:"column:from_edb_name" description:"基础指标名称"`
+	FromSource                int       `gorm:"column:from_source" description:"基础指标来源"`
+	FromSourceName            string    `gorm:"column:from_source_name" description:"基础指标来源名称"`
+	Sort                      int       `gorm:"column:sort" description:"计算指标名称排序"`
+	CreateTime                time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                time.Time `gorm:"column:modify_time" description:"修改时间"`
+	FromTag                   string    `gorm:"column:from_tag" description:"来源指标标签"`
 	StartDate                 string    `description:"开始日期"`
 	EndDate                   string    `description:"结束日期"`
 	CalculateFormula          string    `description:"N值"`
@@ -90,38 +90,38 @@ type EdbInfoCalculateMappingView struct {
 
 // GetEdbInfoCalculateMappingDetail 获取单条关联指标
 func GetEdbInfoCalculateMappingDetail(edbInfoId int) (item *EdbInfoCalculateMappingView, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT a.*,b.start_date,b.end_date,b.calculate_formula,b.move_type,b.move_frequency FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&item).Error
 	return
 }
 
 // GetEdbInfoCalculateMappingDetailByFromTag 获取单条关联指标
 func GetEdbInfoCalculateMappingDetailByFromTag(edbInfoId int, fromTag string) (item *EdbInfoCalculateMappingView, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT a.*,b.start_date,b.end_date,b.calculate_formula,b.move_type,b.move_frequency FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? and a.from_tag=? `
-	err = o.Raw(sql, edbInfoId, fromTag).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId, fromTag).First(&item).Error
 	return
 }
 
 // EdbInfoCalculateDetail
 type EdbInfoCalculateDetail struct {
-	EdbInfoCalculateId int       `orm:"column(edb_info_calculate_id);pk"`
-	EdbInfoId          int       `description:"指标id"`
-	EdbCode            string    `description:"指标编码"`
-	FromEdbInfoId      int       `description:"计算指标id"`
-	FromEdbCode        string    `description:"计算指标编码"`
-	FromEdbName        string    `description:"计算指标名称"`
-	FromSource         int       `description:"计算指标来源"`
-	FromSourceName     string    `description:"计算指标来源名称"`
-	FromTag            string    `description:"来源指标标签"`
-	Sort               int       `description:"计算指标名称排序"`
-	CreateTime         time.Time `description:"创建时间"`
-	ModifyTime         time.Time `description:"修改时间"`
+	EdbInfoCalculateId int       `gorm:"primaryKey;autoIncrement;column:edb_info_calculate_mapping_id"`
+	EdbInfoId          int       `gorm:"column:edb_info_id" description:"计算指标id"`
+	EdbCode            string    `gorm:"column:edb_code" description:"计算指标编码"`
+	FromEdbInfoId      int       `gorm:"column:from_edb_info_id" description:"基础指标id"`
+	FromEdbCode        string    `gorm:"column:from_edb_code" description:"基础指标编码"`
+	FromEdbName        string    `gorm:"column:from_edb_name" description:"基础指标名称"`
+	FromSource         int       `gorm:"column:from_source" description:"基础指标来源"`
+	FromSourceName     string    `gorm:"column:from_source_name" description:"基础指标来源名称"`
+	Sort               int       `gorm:"column:sort" description:"计算指标名称排序"`
+	CreateTime         time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime         time.Time `gorm:"column:modify_time" description:"修改时间"`
+	FromTag            string    `gorm:"column:from_tag" description:"来源指标标签"`
 	StartDate          string    `description:"开始日期"`
 	EndDate            string    `description:"结束日期"`
 	EdbType            int       `description:"指标类型:1:基础指标,2:计算指标"`
@@ -129,39 +129,39 @@ type EdbInfoCalculateDetail struct {
 
 // GetEdbInfoCalculateDetailList 获取关联指标列表
 func GetEdbInfoCalculateDetailList(edbInfoId int) (list []*EdbInfoCalculateDetail, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT a.*,b.start_date,b.end_date,b.edb_type FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? ORDER BY sort ASC `
 
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Scan(&list).Error
 	return
 }
 
 // GetEdbInfoByEdbCode 根据指标code获取指标信息
 func GetEdbInfoCalculateByEdbCode(edbCode, fromEdbCode string) (item *EdbInfoCalculateMapping, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM edb_info_calculate_mapping WHERE edb_code=? AND from_edb_code=? `
-	err = o.Raw(sql, edbCode, fromEdbCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, fromEdbCode).First(&item).Error
 	return
 }
 
 // GetEdbInfoCalculateMappingListByEdbInfoIds 根据生成的指标id获取来源的指标id列表
 func GetEdbInfoCalculateMappingListByEdbInfoIds(edbInfoIds []int) (items []*EdbInfoCalculateMappingInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT a.*,b.edb_type as from_edb_type,b.edb_info_type as from_edb_info_type, b.unique_code AS from_unique_code, b.classify_id AS from_classify_id,b.no_update FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id in (` + utils.GetOrmInReplace(len(edbInfoIds)) + `) `
-	_, err = o.Raw(sql, edbInfoIds).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoIds).Scan(&items).Error
 	return
 }
 
 // GetEdbInfoCalculateMappingListByEdbInfoId 根据生成的指标id获取来源的指标id列表
 func GetEdbInfoCalculateMappingListByEdbInfoId(edbInfoId int) (items []*EdbInfoCalculateMappingInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT a.*,b.edb_type as from_edb_type,b.edb_info_type as from_edb_info_type, b.unique_code AS from_unique_code, b.classify_id AS from_classify_id,b.no_update FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Scan(&items).Error
 	return
 }

models/edb_info_record.go

@@ -1,28 +1,27 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type EdbInfoRecord struct {
-	EdbInfoRecordId     int       `orm:"column(edb_info_record_id);pk"`
-	EdbInfoId           int       `orm:"column(edb_info_id)"`
-	OldEdbName          string    `description:"旧的指标名称"`
-	OldFrequency        string    `description:"旧的频率"`
-	OldUnit             string    `description:"旧的单位"`
-	NewEdbName          string    `description:"新的指标名称"`
-	NewFrequency        string    `description:"新的频率"`
-	NewUnit             string    `description:"新的单位"`
-	OperateUserId       int       `description:"执行人id"`
-	OperateUserRealName string    `description:"执行人名称"`
-	CreateTime          time.Time `description:"记录的生成时间"`
-	Timestamp           int64     `description:"时间戳"`
+	EdbInfoRecordId     int       `gorm:"primaryKey;autoIncrement;column:edb_info_record_id" description:"唯一记录ID"`
+	EdbInfoId           int       `gorm:"column:edb_info_id" description:"指标ID"`
+	OldEdbName          string    `gorm:"column:old_edb_name" description:"旧的指标名称"`
+	OldFrequency        string    `gorm:"column:old_frequency" description:"旧的频率"`
+	OldUnit             string    `gorm:"column:old_unit" description:"旧的单位"`
+	NewEdbName          string    `gorm:"column:new_edb_name" description:"新的指标名称"`
+	NewFrequency        string    `gorm:"column:new_frequency" description:"新的频率"`
+	NewUnit             string    `gorm:"column:new_unit" description:"新的单位"`
+	OperateUserId       int       `gorm:"column:operate_user_id" description:"执行人id"`
+	OperateUserRealName string    `gorm:"column:operate_user_real_name" description:"执行人名称"`
+	CreateTime          time.Time `gorm:"column:create_time" description:"记录的生成时间"`
+	Timestamp           int64     `gorm:"column:timestamp" description:"时间戳"`
 }
 
 func AddEditEdbInfoRcord(edbRecord *EdbInfoRecord) (e error) {
-	o := orm.NewOrm()
-	_, e = o.Insert(edbRecord)
+
+	e = global.DEFAULT_DmSQL.Create(edbRecord).Error
 	return
 }

models/edb_info_relation.go

@@ -1,28 +1,29 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 type EdbInfoRelation struct {
-	EdbInfoRelationId  int       `orm:"column(edb_info_relation_id);pk"`
-	EdbInfoId          int       `description:"指标id"`
-	Source             int       `description:"来源:1:同花顺,2:wind,3:彭博,4:指标运算,5:累计值转月,6:同比值,7:同差值,8:N数值移动平均计算,9:手工指标,10:隆众"`
-	EdbName            string    `description:"指标名称"`
-	EdbCode            string    `description:"指标编码"`
-	ReferObjectId      int       `description:"引用对象ID（图表ID，ETA逻辑ID等）"`
-	ReferObjectType    int       `description:"引用对象ID类型（1.图表，2.ETA逻辑）"`
-	ReferObjectSubType int       `description:"引用对象子类"`
-	CreateTime         time.Time `description:"创建时间"`
-	ModifyTime         time.Time `description:"修改时间"`
-	RelationTime       time.Time `description:"引用时间"`
-	RelationType       int       `description:"引用类型，0:直接饮用，1间接引用"`
-	RootEdbInfoId      int       `description:"间接引用时，关联的直接引用的指标ID"`
-	ChildEdbInfoId     int       `description:"间接引用时，计算指标直接关联的指标ID"`
-	RelationCode       string    `description:"引用标识"`
-	ParentRelationId   int       `description:"间接引用关联的直接引用的ID"`
+	EdbInfoRelationId  int       `gorm:"primaryKey;autoIncrement;column:edb_info_relation_id"`
+	EdbInfoId          int       `gorm:"column:edb_info_id" description:"指标id"`
+	Source             int       `gorm:"column:source" description:"来源:1:同花顺,2:wind,3:彭博,4:指标运算,5:累计值转月,6:同比值,7:同差值,8:N数值移动平均计算,9:手工指标,10:隆众"`
+	EdbName            string    `gorm:"column:edb_name" description:"指标名称"`
+	EdbCode            string    `gorm:"column:edb_code" description:"指标编码"`
+	ReferObjectId      int       `gorm:"column:refer_object_id" description:"引用对象ID（图表ID，ETA逻辑ID等）"`
+	ReferObjectType    int       `gorm:"column:refer_object_type" description:"引用对象ID类型（1.图表，2.ETA逻辑）"`
+	ReferObjectSubType int       `gorm:"column:refer_object_sub_type" description:"引用对象子类"`
+	CreateTime         time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime         time.Time `gorm:"column:modify_time" description:"修改时间"`
+	RelationTime       time.Time `gorm:"column:relation_time" description:"引用时间"`
+	RelationType       int       `gorm:"column:relation_type" description:"引用类型，0:直接引用，1间接引用"`
+	RootEdbInfoId      int       `gorm:"column:root_edb_info_id" description:"间接引用时，关联的直接引用的指标ID"`
+	ChildEdbInfoId     int       `gorm:"column:child_edb_info_id" description:"间接引用时，计算指标直接关联的指标ID"`
+	RelationCode       string    `gorm:"column:relation_code" description:"引用标识"`
+	ParentRelationId   int       `gorm:"column:parent_relation_id" description:"间接引用关联的直接引用的ID"`
 }
 
 func (e *EdbInfoRelation) TableName() string {
@@ -31,33 +32,33 @@ func (e *EdbInfoRelation) TableName() string {
 
 // GetEdbInfoRelationByChildEdbInfoId 查询引用的指标ID
 func GetEdbInfoRelationByChildEdbInfoId(edbInfoId int) (item *EdbInfoRelation, err error) {
-	o := orm.NewOrm()
+
 	msql := ` SELECT * FROM edb_info_relation WHERE child_edb_info_id = ? or edb_info_id=?`
-	err = o.Raw(msql, edbInfoId, edbInfoId).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(msql, edbInfoId, edbInfoId).First(&item).Error
 	return
 }
 
 // GetEdbInfoRelationListByChildEdbInfoId 根据间接引用中的的计算指标ID查询引用列表
 func GetEdbInfoRelationListByChildEdbInfoId(edbInfoId int) (items []*EdbInfoRelation, err error) {
-	o := orm.NewOrm()
+
 	msql := ` SELECT * FROM edb_info_relation WHERE relation_type=1 AND child_edb_info_id=?`
-	_, err = o.Raw(msql, edbInfoId).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(msql, edbInfoId).Scan(&items).Error
 	return
 }
 
 // GetEdbInfoRelationListByParentRelationId 根据间接引用中的的父级ID查询
 func GetEdbInfoRelationEdbIdsByParentRelationId(relationId, edbInfoId int) (items []int, err error) {
-	o := orm.NewOrm()
+
 	msql := ` SELECT edb_info_id FROM edb_info_relation WHERE parent_relation_id=? AND child_edb_info_id=?`
-	_, err = o.Raw(msql, relationId, edbInfoId).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(msql, relationId, edbInfoId).Scan(&items).Error
 	return
 }
 
 // GetEdbInfoRelationByRelationIds 查询引用的指标ID
 func GetEdbInfoRelationByRelationIds(ids []int) (items []*EdbInfoRelation, err error) {
-	o := orm.NewOrm()
+
 	msql := ` SELECT * FROM edb_info_relation WHERE edb_info_relation_id in (` + utils.GetOrmInReplace(len(ids)) + `) `
-	_, err = o.Raw(msql, ids).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(msql, ids).Scan(&items).Error
 	return
 }
 
@@ -76,7 +77,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 	}()
 	// 删除相关的间接引用
 	sql := ` DELETE FROM edb_info_relation WHERE relation_type=1 and parent_relation_id in (` + utils.GetOrmInReplace(len(edbRelationIds)) + `)`
-	_, err = o.Raw(sql, edbRelationIds).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, edbRelationIds).Error
 	if err != nil {
 		return
 	}
@@ -98,7 +99,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 	if len(refreshEdbInfoIds) > 0 {
 		// todo 更新指标的刷新状态
 		sql = ` UPDATE edb_info SET no_update = 0 WHERE  edb_info_id IN (` + utils.GetOrmInReplace(len(refreshEdbInfoIds)) + `) AND no_update = 1`
-		_, err = o.Raw(sql, refreshEdbInfoIds).Exec()
+		err = global.DEFAULT_DmSQL.Exec(sql, refreshEdbInfoIds).Error
 		if err != nil {
 			return
 		}
@@ -108,7 +109,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 	if len(indexCodeList) > 0 {
 		// 更改数据源的更新状态
 		sql = ` UPDATE base_from_mysteel_chemical_index SET is_stop = 0 WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodeList)) + `) and is_stop=1`
-		_, err = o.Raw(sql, indexCodeList).Exec()
+		err = global.DEFAULT_DmSQL.Exec(sql, indexCodeList).Error
 		if err != nil {
 			return
 		}
@@ -126,7 +127,7 @@ SET e1.parent_relation_id = e2.edb_info_relation_id
 WHERE  
     e1.relation_type = 1   
     AND e2.relation_type = 0 AND e1.parent_relation_id !=e2.edb_info_relation_id AND e1.relation_code in (` + utils.GetOrmInReplace(len(relationCodes)) + `)`
-			_, err = o.Raw(sql, relationCodes).Exec()
+			err = global.DEFAULT_DmSQL.Exec(sql, relationCodes).Error
 			if err != nil {
 				return
 			}

models/edb_python_code.go

@@ -1,38 +1,37 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
 // EdbPythonCode python指标运算代码
 type EdbPythonCode struct {
-	EdbPythonCodeId int    `orm:"column(edb_python_code_id);pk"`
-	EdbInfoId       int    `description:"指标id"`
-	EdbCode         string `description:"指标编码"`
-	PythonCode      string `description:"python代码"`
-	ModifyTime      time.Time
-	CreateTime      time.Time
+	EdbPythonCodeId int       `gorm:"primaryKey;autoIncrement;column:edb_python_code_id"`
+	EdbInfoId       int       `gorm:"column:edb_info_id" description:"指标id"`
+	EdbCode         string    `gorm:"column:edb_code" description:"指标编码"`
+	PythonCode      string    `gorm:"column:python_code" description:"python代码"`
+	ModifyTime      time.Time `gorm:"column:modify_time"`
+	CreateTime      time.Time `gorm:"column:create_time"`
 }
 
 // Update 更新EdbPythonCode信息
 func (edbPythonCode *EdbPythonCode) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(edbPythonCode, cols...)
+	err = global.DEFAULT_DmSQL.Model(edbPythonCode).Select(cols).Updates(edbPythonCode).Error
 	return
 }
 
 // AddEdbPythonCode python指标运算代码
 func AddEdbPythonCode(item *EdbPythonCode) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
 // GetEdbPythonCodeById 根据指标id获取python代码
 func GetEdbPythonCodeById(edbInfoId int) (item *EdbPythonCode, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM edb_python_code WHERE edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&item).Error
 	return
 }

models/edb_refresh/edb_refresh_config.go

@@ -2,21 +2,21 @@ package edb_refresh
 
 import (
 	"errors"
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
 // EdbRefreshConfig
 // @Description: 指标的刷新时间配置表
 type EdbRefreshConfig struct {
-	EdbRefreshConfigId  int       `orm:"column(edb_refresh_config_id);pk"`
-	RefreshFrequency    string    `description:"刷新频率"`
-	RefreshFrequencyDay int       `description:"具体刷新的日期"`
-	RefreshTime         string    `description:"刷新时间"`
-	RefreshAllData      int       `description:"是否刷新所有数据，0：否，1：刷新所有数据"`
-	RefreshDataNum      int       `description:"刷新单元格数"`
-	ModifyTime          time.Time `description:"最晚一次的更新时间"`
-	CreateTime          time.Time `description:"添加时间"`
+	EdbRefreshConfigId  int       `gorm:"primaryKey;autoIncrement;column:edb_refresh_config_id"`
+	RefreshFrequency    string    `gorm:"column:refresh_frequency" description:"刷新频率"`
+	RefreshFrequencyDay int       `gorm:"column:refresh_frequency_day" description:"具体刷新的日期"`
+	RefreshTime         string    `gorm:"column:refresh_time" description:"刷新时间"`
+	RefreshAllData      int       `gorm:"column:refresh_all_data" description:"是否刷新所有数据，0：否，1：刷新所有数据"`
+	RefreshDataNum      int       `gorm:"column:refresh_data_num" description:"刷新单元格数"`
+	ModifyTime          time.Time `gorm:"column:modify_time" description:"最晚一次的更新时间"`
+	CreateTime          time.Time `gorm:"column:create_time" description:"添加时间"`
 }
 
 // Add
@@ -31,12 +31,7 @@ func (m *EdbRefreshConfig) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	o := orm.NewOrm()
-	lastId, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.EdbRefreshConfigId = int(lastId)
+	err = global.DEFAULT_DmSQL.Create(m).Error
 
 	return
 }
@@ -49,8 +44,8 @@ func (m *EdbRefreshConfig) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *EdbRefreshConfig) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+
+	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
@@ -61,8 +56,8 @@ func (m *EdbRefreshConfig) Update(cols []string) (err error) {
 // @datetime 2023-12-14 16:11:10
 // @return err error
 func (m *EdbRefreshConfig) Delete() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Delete(m)
+	//todo 删除前判断
+	err = global.DEFAULT_DmSQL.Delete(m).Error
 	return
 }
 
@@ -75,7 +70,7 @@ func (m *EdbRefreshConfig) Delete() (err error) {
 // @return list []*EdbRefreshDefaultConfig
 // @return err error
 func GetEdbRefreshConfigListByCondition(condition string, pars []interface{}) (list []*EdbRefreshConfig, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM edb_refresh_config
          WHERE 1 = 1 `
 
@@ -83,7 +78,7 @@ func GetEdbRefreshConfigListByCondition(condition string, pars []interface{}) (l
 		sql += condition
 	}
 	sql += ` ORDER BY edb_refresh_config_id ASC `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
 
 	return
 }

models/edb_refresh/edb_refresh_default_config.go

@@ -2,25 +2,25 @@ package edb_refresh
 
 import (
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // EdbRefreshDefaultConfig
 // @Description: 指标的默认刷新时间配置表
 type EdbRefreshDefaultConfig struct {
-	Id                  int       `orm:"column(id);pk"`
-	Source              int       `description:"来源"`
-	SubSource           int       `description:"来源名称"`
-	Frequency           string    `description:"频度"`
-	RefreshFrequency    string    `description:"刷新频率"`
-	RefreshFrequencyDay int       `description:"具体刷新的日期"`
-	RefreshTime         string    `description:"刷新时间"`
-	RefreshAllData      int       `description:"是否刷新所有数据，0：否，1：刷新所有数据"`
-	RefreshDataNum      int       `description:"刷新单元格数"`
-	ModifyTime          time.Time `description:"最晚一次的更新时间"`
-	CreateTime          time.Time `description:"添加时间"`
+	Id                  int       `gorm:"primaryKey;autoIncrement;column:id" description:"唯一ID"`
+	Source              int       `gorm:"column:source" description:"来源"`
+	SubSource           int       `gorm:"column:sub_source" description:"来源名称"`
+	Frequency           string    `gorm:"column:frequency" description:"频度"`
+	RefreshFrequency    string    `gorm:"column:refresh_frequency" description:"刷新频率"`
+	RefreshFrequencyDay int       `gorm:"column:refresh_frequency_day" description:"具体刷新的日期"`
+	RefreshTime         string    `gorm:"column:refresh_time" description:"刷新时间"`
+	RefreshAllData      int       `gorm:"column:refresh_all_data" description:"是否刷新所有数据，0：否，1：刷新所有数据"`
+	RefreshDataNum      int       `gorm:"column:refresh_data_num" description:"刷新单元格数"`
+	ModifyTime          time.Time `gorm:"column:modify_time" description:"最晚一次的更新时间"`
+	CreateTime          time.Time `gorm:"column:create_time" description:"添加时间"`
 }
 
 // Add
@@ -35,12 +35,8 @@ func (m *EdbRefreshDefaultConfig) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	o := orm.NewOrm()
-	lastId, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.Id = int(lastId)
+
+	err = global.DEFAULT_DmSQL.Create(m).Error
 
 	return
 }
@@ -53,8 +49,8 @@ func (m *EdbRefreshDefaultConfig) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *EdbRefreshDefaultConfig) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+
+	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
@@ -65,8 +61,7 @@ func (m *EdbRefreshDefaultConfig) Update(cols []string) (err error) {
 // @datetime 2023-12-14 16:11:10
 // @return err error
 func (m *EdbRefreshDefaultConfig) Delete() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Delete(m)
+	err = global.DEFAULT_DmSQL.Delete(m).Error
 	return
 }
 
@@ -80,10 +75,10 @@ func (m *EdbRefreshDefaultConfig) Delete() (err error) {
 // @return list []*EdbRefreshDefaultConfig
 // @return err error
 func GetListBySourceAndFrequency(source, subSource int, frequency string) (list []*EdbRefreshDefaultConfig, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM edb_refresh_default_config
          WHERE source = ? AND sub_source = ? AND frequency = ? ORDER BY id ASC `
-	_, err = o.Raw(sql, source, subSource, frequency).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, source, subSource, frequency).Scan(&list).Error
 
 	return
 }
@@ -97,7 +92,7 @@ func GetListBySourceAndFrequency(source, subSource int, frequency string) (list
 // @return list []*EdbRefreshDefaultConfig
 // @return err error
 func GetListByCondition(condition string, pars []interface{}) (list []*EdbRefreshDefaultConfig, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM edb_refresh_default_config
          WHERE 1 = 1 `
 
@@ -105,7 +100,7 @@ func GetListByCondition(condition string, pars []interface{}) (list []*EdbRefres
 		sql += condition
 	}
 	sql += ` ORDER BY id ASC `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
 
 	return
 }
@@ -124,11 +119,10 @@ func GetDefaultRefreshEdbInfoListBySourceAndSubSource(source, subSource int, fre
 		return
 	}
 
-	o := orm.NewOrm()
 	sql := `SELECT a.* FROM edb_info a 
 LEFT JOIN edb_refresh_mapping b ON a.edb_info_id = b.edb_info_id
 WHERE a.source = ? AND a.sub_source = ? AND a.frequency IN (` + utils.GetOrmInReplace(num) + `)  AND b.edb_info_id is null`
-	_, err = o.Raw(sql, source, subSource, frequencyList).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, source, subSource, frequencyList).Scan(&list).Error
 
 	return
 }

models/edb_refresh/edb_refresh_mapping.go

@@ -2,23 +2,23 @@ package edb_refresh
 
 import (
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // EdbRefreshMapping
 // @Description: 指标刷新时间配置关系表
 type EdbRefreshMapping struct {
-	EdbRefreshMappingId int       `orm:"column(edb_refresh_mapping_id);pk"`
-	Source              int       `description:"来源"`
-	SubSource           int       `description:"来源名称"`
-	EdbInfoId           int       `description:"指标id，如果是数据源（钢联、有色）的，那么就是数据源里面的id"`
-	EdbRefreshConfigId  int       `description:"刷新配置id"`
-	SysUserId           int       `description:"操作人id"`
-	SysUserRealName     string    `description:"操作人真实姓名"`
-	ModifyTime          time.Time `description:"最晚一次的更新时间"`
-	CreateTime          time.Time `description:"添加时间"`
+	EdbRefreshMappingId int       `gorm:"primaryKey;autoIncrement;column:edb_refresh_mapping_id" description:"映射ID"`
+	Source              int       `gorm:"column:source" description:"来源"`
+	SubSource           int       `gorm:"column:sub_source" description:"来源名称"`
+	EdbInfoId           int       `gorm:"column:edb_info_id" description:"指标id，如果是数据源（钢联、有色）的，那么就是数据源里面的id"`
+	EdbRefreshConfigId  int       `gorm:"column:edb_refresh_config_id" description:"刷新配置id"`
+	SysUserId           int       `gorm:"column:sys_user_id" description:"操作人id"`
+	SysUserRealName     string    `gorm:"column:sys_user_real_name" description:"操作人真实姓名"`
+	ModifyTime          time.Time `gorm:"column:modify_time" description:"最晚一次的更新时间"`
+	CreateTime          time.Time `gorm:"column:create_time" description:"添加时间"`
 }
 
 // Add
@@ -33,12 +33,7 @@ func (m *EdbRefreshMapping) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	o := orm.NewOrm()
-	lastId, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.EdbRefreshMappingId = int(lastId)
+	err = global.DEFAULT_DmSQL.Create(m).Error
 
 	return
 }
@@ -51,8 +46,7 @@ func (m *EdbRefreshMapping) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *EdbRefreshMapping) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
@@ -63,30 +57,29 @@ func (m *EdbRefreshMapping) Update(cols []string) (err error) {
 // @datetime 2023-12-14 16:11:10
 // @return err error
 func (m *EdbRefreshMapping) Delete() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Delete(m)
+	err = global.DEFAULT_DmSQL.Delete(m).Error
 	return
 }
 
 type EdbInfoListAndRefreshConfig struct {
-	EdbInfoId          int       `orm:"column(edb_info_id);pk"`
-	SourceName         string    `description:"来源名称"`
-	Source             int       `description:"来源id"`
-	SubSource          int       `description:"子数据来源:0:经济数据库,1:日期序列"`
-	SubSourceName      string    `description:"子数据来源名称"`
-	EdbCode            string    `description:"指标编码"`
-	EdbName            string    `description:"指标名称"`
-	Frequency          string    `description:"频率"`
-	Unit               string    `description:"单位"`
-	StartDate          time.Time `description:"起始日期"`
-	EndDate            time.Time `description:"终止日期"`
-	ClassifyId         int       `description:"分类id"`
-	UniqueCode         string    `description:"指标唯一编码"`
-	CalculateFormula   string    `description:"计算公式"`
-	ModifyTime         string    `description:"更新时间"`
-	NoUpdate           int8      `description:"是否停止更新，0：继续更新；1：停止更新"`
-	EdbRefreshConfigId int       `description:"刷新配置id"`
-	DataRefreshNum     int       `description:"刷新的期数"`
+	EdbInfoId          int       `gorm:"primaryKey;autoIncrement;column:edb_info_id"`
+	SourceName         string    `gorm:"column:source_name" description:"来源名称"`
+	Source             int       `gorm:"column:source" description:"来源id"`
+	SubSource          int       `gorm:"column:sub_source" description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName      string    `gorm:"column:sub_source_name" description:"子数据来源名称"`
+	EdbCode            string    `gorm:"column:edb_code" description:"指标编码"`
+	EdbName            string    `gorm:"column:edb_name" description:"指标名称"`
+	Frequency          string    `gorm:"column:frequency" description:"频率"`
+	Unit               string    `gorm:"column:unit" description:"单位"`
+	StartDate          time.Time `gorm:"column:start_date" description:"起始日期"`
+	EndDate            time.Time `gorm:"column:end_date" description:"终止日期"`
+	ClassifyId         int       `gorm:"column:classify_id" description:"分类id"`
+	UniqueCode         string    `gorm:"column:unique_code" description:"指标唯一编码"`
+	CalculateFormula   string    `gorm:"column:calculate_formula" description:"计算公式"`
+	ModifyTime         string    `gorm:"column:modify_time" description:"更新时间"`
+	NoUpdate           int8      `gorm:"column:no_update" description:"是否停止更新，0：继续更新；1：停止更新"`
+	EdbRefreshConfigId int       `gorm:"column:edb_refresh_config_id" description:"刷新配置id"`
+	DataRefreshNum     int       `gorm:"column:data_refresh_num" description:"刷新的期数"`
 }
 
 // GetConfigRefreshEdbInfoListBySourceAndSubSource
@@ -105,7 +98,6 @@ func GetConfigRefreshEdbInfoListBySourceAndSubSource(sourceList, configIdList []
 
 	var pars []interface{}
 
-	o := orm.NewOrm()
 	sql := `SELECT a.*,b.edb_refresh_config_id FROM edb_info a 
  JOIN edb_refresh_mapping b ON a.edb_info_id = b.edb_info_id
 WHERE b.edb_refresh_config_id IN (` + utils.GetOrmInReplace(num) + `) `
@@ -116,7 +108,7 @@ WHERE b.edb_refresh_config_id IN (` + utils.GetOrmInReplace(num) + `) `
 		sql += ` AND b.source not in (` + utils.GetOrmInReplace(sourceNum) + `) `
 		pars = append(pars, sourceList)
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
 
 	return
 }

models/edb_refresh/edb_refresh_source.go

@@ -1,27 +1,27 @@
 package edb_refresh
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
 // EdbRefreshSource
 // @Description: 刷新的数据源表
 type EdbRefreshSource struct {
-	Id            int       `orm:"column(id);pk"`
-	Source        int       `orm:"column(source)" description:"来源"`
-	SourceName    string    `description:"来源名称"`
-	SubSource     int       `description:"子数据来源:0:经济数据库,1:日期序列"`
-	SubSourceName string    `description:"子来源名称"`
-	HasChild      int       `description:"是否有子来源，0：否，1：是"`
-	ModifyTime    time.Time `description:"修改时间"`
-	CreateTime    time.Time `description:"创建时间"`
+	Id            int       `gorm:"primaryKey;autoIncrement;column:id" description:"ID"`
+	Source        int       `gorm:"column:source" description:"来源"`
+	SourceName    string    `gorm:"column:source_name" description:"来源名称"`
+	SubSource     int       `gorm:"column:sub_source" description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName string    `gorm:"column:sub_source_name" description:"子来源名称"`
+	HasChild      int       `gorm:"column:has_child" description:"是否有子来源，0：否，1：是"`
+	ModifyTime    time.Time `gorm:"column:modify_time" description:"修改时间"`
+	CreateTime    time.Time `gorm:"column:create_time" description:"创建时间"`
 }
 
 // EdbRefreshSourceList
 // @Description: 获取刷新的数据源列表
 type EdbRefreshSourceList struct {
-	Source        int                    `orm:"column(source)" description:"来源"`
+	Source        int                    `description:"来源"`
 	SourceName    string                 `description:"来源名称"`
 	SubSource     int                    `description:"子数据来源:0:经济数据库,1:日期序列"`
 	SubSourceName string                 `description:"子来源名称"`
@@ -36,9 +36,9 @@ type EdbRefreshSourceList struct {
 // @return items []*EdbRefreshSource
 // @return err error
 func (m EdbRefreshSource) GetAllList() (items []*EdbRefreshSource, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT *  FROM edb_refresh_source ORDER BY id ASC `
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&items).Error
 	return
 }
 

models/edb_terminal.go

@@ -1,38 +1,38 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // EdbTerminal 指标终端
 type EdbTerminal struct {
-	TerminalId   int       `orm:"column(terminal_id);pk"`
-	Source       int       `orm:"column(source)" description:"指标来源类型"`
-	Name         string    `description:"终端别名"`
-	TerminalCode string    `description:"终端编码，用于配置在机器上"`
-	ServerUrl    string    `description:"终端地址"`
-	Num          int       `description:"终端最大指标数"`
-	Status       int       `description:"状态，1启用，2禁用"`
-	Value        string    `description:"终端相关的凭证"`
-	ModifyTime   time.Time `description:"修改时间"`
-	CreateTime   time.Time `description:"创建时间"`
+	TerminalId   int       `gorm:"primaryKey;autoIncrement;column:terminal_id" description:"终端ID"`
+	Source       int       `gorm:"column:source" description:"指标来源类型"`
+	Name         string    `gorm:"column:name" description:"终端别名"`
+	TerminalCode string    `gorm:"column:terminal_code" description:"终端编码，用于配置在机器上"`
+	ServerUrl    string    `gorm:"column:server_url" description:"终端地址"`
+	Num          int       `gorm:"column:num" description:"终端最大指标数"`
+	Status       int       `gorm:"column:status" description:"状态，1启用，2禁用"`
+	Value        string    `gorm:"column:value" description:"终端相关的凭证"`
+	ModifyTime   time.Time `gorm:"column:modify_time" description:"修改时间"`
+	CreateTime   time.Time `gorm:"column:create_time" description:"创建时间"`
 }
 
 // GetEdbTerminalListBySource 根据指标来源类型获取所有的终端列表
 func GetEdbTerminalListBySource(source int) (items []*EdbTerminal, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT *  FROM edb_terminal WHERE source = ? and status=1 ORDER BY terminal_id ASC `
-	_, err = o.Raw(sql, source).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, source).Scan(&items).Error
 	return
 }
 
 // GetEdbTerminalFirstBySource 根据指标来源类型获取配置的首个终端信息
 func GetEdbTerminalFirstBySource(source int) (item *EdbTerminal, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT *  FROM edb_terminal WHERE source = ? and status=1 ORDER BY terminal_id ASC Limit 1 `
-	err = o.Raw(sql, source).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, source).First(&item).Error
 	return
 }
 
@@ -43,17 +43,17 @@ type TerminalCodeCountGroup struct {
 
 // GetEdbTerminalByCode 根据终端编码获取终端信息
 func GetEdbTerminalByCode(terminalCode string) (item *EdbTerminal, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT *  FROM edb_terminal WHERE terminal_code = ? `
-	err = o.Raw(sql, terminalCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, terminalCode).First(&item).Error
 	return
 }
 
 // GetEdbCountGroupByTerminal 获取终端code分组总数
 func GetEdbCountGroupByTerminal(source int) (list []TerminalCodeCountGroup, err error) {
-	o := orm.NewOrm()
+
 	sql := `select terminal_code,count(1) total from edb_info where source = ? AND no_update=0 AND terminal_code != "" group by terminal_code; `
-	_, err = o.Raw(sql, source).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, source).Scan(&list).Error
 	return
 }
 
@@ -64,8 +64,8 @@ type BaseIndexTerminalCode struct {
 
 // GetBaseIndexTerminalCode 获取数据源的终端code
 func GetBaseIndexTerminalCode(edbCode, tableName string) (item BaseIndexTerminalCode, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`select terminal_code, index_name from %s where index_code = ? `, tableName)
-	err = o.Raw(sql, edbCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&item).Error
 	return
 }

models/edb_ths_hf.go

@@ -2,13 +2,12 @@ package models
 
 import (
 	"encoding/json"
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/models/mgo"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/shopspring/decimal"
 	"go.mongodb.org/mongo-driver/bson"
-	"reflect"
 	"sort"
 	"time"
 )
@@ -76,19 +75,14 @@ type ThsHfRefreshBaseParams struct {
 // Add
 // @Description: 添加指标
 func (obj EdbThsHf) Add(params ThsHfAddBaseParams, baseIndex *BaseFromThsHfIndex) (edbInfo *EdbInfo, err error) {
-	o := orm.NewOrm()
-	tx, e := o.Begin()
-	if e != nil {
-		err = fmt.Errorf("orm begin err: %v", e)
-		return
-	}
+
+	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
-			_ = tx.Rollback()
-			utils.FileLog.Info(fmt.Sprintf("%s err: %v", reflect.TypeOf(obj).Name(), err))
-			return
+			to.Rollback()
+		} else {
+			to.Commit()
 		}
-		_ = tx.Commit()
 	}()
 
 	// 新增指标
@@ -114,12 +108,11 @@ func (obj EdbThsHf) Add(params ThsHfAddBaseParams, baseIndex *BaseFromThsHfIndex
 	edbInfo.UniqueCode = params.UniqueCode
 	edbInfo.CreateTime = time.Now()
 	edbInfo.ModifyTime = time.Now()
-	edbInfoId, e := tx.Insert(edbInfo)
+	e := to.Create(edbInfo).Error
 	if e != nil {
 		err = fmt.Errorf("insert edb err: %v", e)
 		return
 	}
-	edbInfo.EdbInfoId = int(edbInfoId)
 
 	// 新增指标关联
 	edbMapping := new(BaseFromEdbMapping)
@@ -132,12 +125,11 @@ func (obj EdbThsHf) Add(params ThsHfAddBaseParams, baseIndex *BaseFromThsHfIndex
 	edbMapping.ConvertRule = params.ConvertRule
 	edbMapping.CreateTime = time.Now().Local()
 	edbMapping.ModifyTime = time.Now().Local()
-	edbMappingId, e := tx.Insert(edbMapping)
+	e = to.Create(edbMapping).Error
 	if e != nil {
 		err = fmt.Errorf("insert base edb mapping err: %v", e)
 		return
 	}
-	edbMapping.Id = int(edbMappingId)
 
 	// 刷新数据
 	err = obj.Refresh(edbInfo, edbMapping, "")
@@ -855,9 +847,10 @@ func (obj EdbThsHf) HandleConfigInsertEdbDataByMongo(realDataMaxDate time.Time,
 			mogDataObj.RemoveManyByColl(coll, bson.M{"_id": item.ID})
 		}
 	} else {
-		o := orm.NewOrm()
+
 		edbDataInsertConfig.RealDate = realDataMaxDate
-		_, err = o.Update(edbDataInsertConfig, "RealDate")
+		//_, err = o.Update(edbDataInsertConfig, "RealDate")
+		err = global.DEFAULT_DmSQL.Model(edbDataInsertConfig).Select([]string{"RealDate"}).Updates(edbDataInsertConfig).Error
 	}
 	return
 }

models/excel/excel_classify.go

@@ -1,30 +1,30 @@
 package excel
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
 // ExcelClassify excel表格分类
 type ExcelClassify struct {
-	ExcelClassifyId   int       `orm:"column(excel_classify_id);pk"`
-	Source            int       `description:"表格来源，1：excel插件的表格，2：自定义表格，3：混合表格，4：自定义分析，默认：1"`
-	ExcelClassifyName string    `description:"分类名称"`
-	ParentId          int       `description:"父级id"`
-	SysUserId         int       `description:"创建人id"`
-	SysUserRealName   string    `description:"创建人姓名"`
-	Level             int       `description:"层级"`
-	UniqueCode        string    `description:"唯一编码"`
-	Sort              int       `description:"排序字段，越小越靠前，默认值：10"`
-	IsDelete          int       `description:"排序字段，越小越靠前，默认值：10"`
-	CreateTime        time.Time `description:"创建时间"`
-	ModifyTime        time.Time `description:"修改时间"`
+	ExcelClassifyId   int       `gorm:"primaryKey;autoIncrement;column:excel_classify_id" description:"表格分类ID"`
+	Source            int       `gorm:"column:source" description:"表格来源，1：excel插件的表格，2：自定义表格，3：混合表格，4：自定义分析，默认：1"`
+	ExcelClassifyName string    `gorm:"column:excel_classify_name" description:"分类名称"`
+	ParentId          int       `gorm:"column:parent_id" description:"父级id"`
+	SysUserId         int       `gorm:"column:sys_user_id" description:"创建人id"`
+	SysUserRealName   string    `gorm:"column:sys_user_real_name" description:"创建人姓名"`
+	Level             int       `gorm:"column:level" description:"层级"`
+	UniqueCode        string    `gorm:"column:unique_code" description:"唯一编码"`
+	Sort              int       `gorm:"column:sort" description:"排序字段，越小越靠前，默认值：10"`
+	IsDelete          int       `gorm:"column:is_delete" description:"是否删除，0：未删除，1：已删除（注意：这里的描述可能与原字段名IsDelete的注释不完全一致，已根据常见用法调整）"`
+	CreateTime        time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime        time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 // AddExcelClassify 添加excel分类
 func AddExcelClassify(item *ExcelClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	if err != nil {
 		return
 	}
@@ -56,8 +56,8 @@ type ExcelClassifyItems struct {
 // @return items []*ExcelClassifyItems
 // @return err error
 func GetExcelClassifyByParentId(parentId, source int) (items []*ExcelClassifyItems, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM excel_classify WHERE parent_id=? AND source = ? AND is_delete=0 order by sort asc,excel_classify_id asc`
-	_, err = o.Raw(sql, parentId, source).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, parentId, source).Scan(&items).Error
 	return
 }

models/excel/excel_edb_mapping.go

@@ -1,31 +1,31 @@
 package excel
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
 // ExcelEdbMapping excel与指标的关系表
 type ExcelEdbMapping struct {
-	ExcelEdbMappingId int       `orm:"column(excel_edb_mapping_id);pk"`
-	ExcelInfoId       int       `description:"excel的id"`
-	Source            int       `description:"表格来源，1：excel插件的表格，2：自定义表格，3：混合表格，4：自定义分析，默认：1"`
-	EdbInfoId         int       `description:"计算指标id"`
-	CreateTime        time.Time `description:"创建时间"`
-	ModifyTime        time.Time `description:"修改时间"`
+	ExcelEdbMappingId int       `gorm:"primaryKey;autoIncrement;column:excel_edb_mapping_id"`
+	ExcelInfoId       int       `gorm:"column:excel_info_id" description:"excel的id"`
+	Source            int       `gorm:"column:source" description:"表格来源，1：excel插件的表格，2：自定义表格，3：混合表格，4：自定义分析，默认：1"`
+	EdbInfoId         int       `gorm:"column:edb_info_id" description:"计算指标id"`
+	CreateTime        time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime        time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 // AddExcelEdbMappingMulti 批量添加excel与指标的关系
 func AddExcelEdbMappingMulti(items []*ExcelEdbMapping) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
 	return
 }
 
 // Add 添加excel与指标的关系
 func (e *ExcelEdbMapping) Add() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(e)
+
+	err = global.DEFAULT_DmSQL.Create(e).Error
 	return
 }
 
@@ -49,9 +49,9 @@ type CalculateFormula struct {
 
 // GetExcelEdbMappingByEdbInfoId 根据指标id获取配置关系
 func GetExcelEdbMappingByEdbInfoId(edbInfoId int) (item *ExcelEdbMapping, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT *  FROM excel_edb_mapping WHERE 1=1 AND edb_info_id = ? `
 
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&item).Error
 	return
 }

models/excel/excel_info.go

@@ -1,32 +1,32 @@
 package excel
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
 // ExcelInfo excel表格详情表
 type ExcelInfo struct {
-	ExcelInfoId     int       `orm:"column(excel_info_id);pk"`
-	Source          int       `description:"表格来源，1：excel插件的表格，2：自定义表格，3：混合表格，4：自定义分析，默认：1"`
-	ExcelType       int       `description:"表格类型，1：指标列，2：日期列，默认：1"`
-	ExcelName       string    `description:"表格名称"`
-	UniqueCode      string    `description:"表格唯一编码"`
-	ExcelClassifyId int       `description:"表格分类id"`
-	SysUserId       int       `description:"操作人id"`
-	SysUserRealName string    `description:"操作人真实姓名"`
-	Content         string    `description:"表格内容"`
-	ExcelImage      string    `description:"表格图片"`
-	FileUrl         string    `description:"表格下载地址"`
-	Sort            int       `description:"排序字段，数字越小越排前面"`
-	IsDelete        int       `description:"是否删除，0：未删除，1：已删除"`
-	ModifyTime      time.Time `description:"最近修改日期"`
-	CreateTime      time.Time `description:"创建日期"`
+	ExcelInfoId     int       `gorm:"primaryKey;autoIncrement;column:excel_info_id"`
+	Source          int       `gorm:"column:source" description:"表格来源，1：excel插件的表格，2：自定义表格，3：混合表格，4：自定义分析，默认：1"`
+	ExcelType       int       `gorm:"column:excel_type" description:"表格类型，1：指标列，2：日期列，默认：1"`
+	ExcelName       string    `gorm:"column:excel_name" description:"表格名称"`
+	UniqueCode      string    `gorm:"column:unique_code" description:"表格唯一编码"`
+	ExcelClassifyId int       `gorm:"column:excel_classify_id" description:"表格分类id"`
+	SysUserId       int       `gorm:"column:sys_user_id" description:"操作人id"`
+	SysUserRealName string    `gorm:"column:sys_user_real_name" description:"操作人真实姓名"`
+	Content         string    `gorm:"column:content" description:"表格内容"`
+	ExcelImage      string    `gorm:"column:excel_image" description:"表格图片"`
+	FileUrl         string    `gorm:"column:file_url" description:"表格下载地址"`
+	Sort            int       `gorm:"column:sort" description:"排序字段，数字越小越排前面"`
+	IsDelete        int       `gorm:"column:is_delete" description:"是否删除，0：未删除，1：已删除"`
+	ModifyTime      time.Time `gorm:"column:modify_time" description:"最近修改日期"`
+	CreateTime      time.Time `gorm:"column:create_time" description:"创建日期"`
 }
 
 // GetNoContentExcelInfoAll 获取不含content的表格列表 用于分类展示
 func GetNoContentExcelInfoAll(source, userId int) (items []*ExcelClassifyItems, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT excel_info_id,excel_classify_id,excel_name AS excel_classify_name,
              unique_code,sys_user_id,sys_user_real_name
             FROM excel_info where is_delete=0 AND source = ?  `
@@ -38,24 +38,24 @@ func GetNoContentExcelInfoAll(source, userId int) (items []*ExcelClassifyItems,
 		pars = append(pars, userId)
 	}
 	sql += `  ORDER BY sort asc,create_time desc `
-	_, err = o.Raw(sql, pars...).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
 	return
 }
 
 // UpdateExcelInfoClassifyId 更改表格分类
 func UpdateExcelInfoClassifyId(classifyId, excelInfoId int) (err error) {
-	o := orm.NewOrm()
+
 	sql := ` update excel_info set excel_classify_id = ? WHERE excel_info_id=? `
-	_, err = o.Raw(sql, classifyId, excelInfoId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, classifyId, excelInfoId).Error
 
 	return
 }
 
 // GetAllExcelInfoBySource 根据来源获取包含content的表格列表
 func GetAllExcelInfoBySource(source int) (items []*ExcelInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM excel_info where is_delete=0  AND source = ?  ORDER BY sort asc,create_time desc `
-	_, err = o.Raw(sql, source).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, source).Scan(&items).Error
 	return
 }
 

models/factor_edb_series.go

@@ -2,9 +2,9 @@ package models
 
 import (
 	"encoding/json"
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -17,13 +17,13 @@ const (
 
 // FactorEdbSeries 因子指标系列表
 type FactorEdbSeries struct {
-	FactorEdbSeriesId int       `orm:"column(factor_edb_series_id);pk"`
-	SeriesName        string    `description:"系列名称"`
-	EdbInfoType       int       `description:"关联指标类型：0-普通指标；1-预测指标"`
-	CalculateStep     string    `description:"计算步骤-JSON"`
-	CalculateState    int       `description:"计算状态: 0-无计算; 1-计算中; 2-计算完成"`
-	CreateTime        time.Time `description:"创建时间"`
-	ModifyTime        time.Time `description:"修改时间"`
+	FactorEdbSeriesId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_id"`
+	SeriesName        string    `gorm:"column:series_name" description:"系列名称"`
+	EdbInfoType       int       `gorm:"column:edb_info_type" description:"关联指标类型：0-普通指标；1-预测指标"`
+	CalculateStep     string    `gorm:"column:calculate_step" description:"计算步骤-JSON"`
+	CalculateState    int       `gorm:"column:calculate_state" description:"计算状态: 0-无计算; 1-计算中; 2-计算完成"`
+	CreateTime        time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime        time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 func (m *FactorEdbSeries) TableName() string {
@@ -53,12 +53,8 @@ func (m *FactorEdbSeries) Cols() FactorEdbSeriesCols {
 }
 
 func (m *FactorEdbSeries) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.FactorEdbSeriesId = int(id)
+
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
@@ -66,21 +62,22 @@ func (m *FactorEdbSeries) CreateMulti(items []*FactorEdbSeries) (err error) {
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
 	return
 }
 
 func (m *FactorEdbSeries) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+
+	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *FactorEdbSeries) Remove() (err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.FactorEdbSeriesId).Exec()
+	err = global.DEFAULT_DmSQL.Raw(sql, m.FactorEdbSeriesId).Error
 	return
 }
 
@@ -88,39 +85,39 @@ func (m *FactorEdbSeries) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
 	return
 }
 
 func (m *FactorEdbSeries) GetItemById(id int) (item *FactorEdbSeries, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeries) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeries, err error) {
-	o := orm.NewOrm()
+
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeries) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func (m *FactorEdbSeries) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeries, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -130,12 +127,12 @@ func (m *FactorEdbSeries) GetItemsByCondition(condition string, pars []interface
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
 	return
 }
 
 func (m *FactorEdbSeries) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeries, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -145,7 +142,7 @@ func (m *FactorEdbSeries) GetPageItemsByCondition(condition string, pars []inter
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
 	return
 }
 
@@ -190,33 +187,29 @@ func (m *FactorEdbSeries) CreateSeriesAndMapping(item *FactorEdbSeries, mappings
 		err = fmt.Errorf("series is nil")
 		return
 	}
-	o := orm.NewOrm()
-	tx, e := o.Begin()
-	if e != nil {
-		err = fmt.Errorf("orm begin err: %v", e)
-		return
-	}
+
+	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
-			_ = tx.Rollback()
-			return
+			to.Rollback()
+		} else {
+			to.Commit()
 		}
-		_ = tx.Commit()
 	}()
 
-	id, e := tx.Insert(item)
+	e := to.Create(item).Error
 	if e != nil {
 		err = fmt.Errorf("insert series err: %v", e)
 		return
 	}
-	seriesId = int(id)
-	item.FactorEdbSeriesId = seriesId
+	seriesId = item.FactorEdbSeriesId
+	//item.FactorEdbSeriesId = seriesId
 
 	if len(mappings) > 0 {
 		for _, v := range mappings {
 			v.FactorEdbSeriesId = seriesId
 		}
-		_, e = tx.InsertMulti(200, mappings)
+		e = to.CreateInBatches(mappings, 200).Error
 		if e != nil {
 			err = fmt.Errorf("insert multi mapping err: %v", e)
 			return
@@ -231,21 +224,17 @@ func (m *FactorEdbSeries) EditSeriesAndMapping(item *FactorEdbSeries, mappings [
 		err = fmt.Errorf("series is nil")
 		return
 	}
-	o := orm.NewOrm()
-	tx, e := o.Begin()
-	if e != nil {
-		err = fmt.Errorf("orm begin err: %v", e)
-		return
-	}
+
+	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
-			_ = tx.Rollback()
-			return
+			to.Rollback()
+		} else {
+			to.Commit()
 		}
-		_ = tx.Commit()
 	}()
 
-	_, e = tx.Update(item, updateCols...)
+	e := to.Model(item).Select(updateCols).Updates(item).Error
 	if e != nil {
 		err = fmt.Errorf("update series err: %v", e)
 		return
@@ -257,7 +246,7 @@ func (m *FactorEdbSeries) EditSeriesAndMapping(item *FactorEdbSeries, mappings [
 	pars := make([]interface{}, 0)
 	pars = append(pars, item.FactorEdbSeriesId)
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, mappingOb.TableName(), cond)
-	_, e = tx.Raw(sql, pars).Exec()
+	e = to.Exec(sql, pars).Error
 	if e != nil {
 		err = fmt.Errorf("remove mapping err: %v", e)
 		return
@@ -267,7 +256,7 @@ func (m *FactorEdbSeries) EditSeriesAndMapping(item *FactorEdbSeries, mappings [
 		for _, v := range mappings {
 			v.FactorEdbSeriesId = item.FactorEdbSeriesId
 		}
-		_, e = tx.InsertMulti(200, mappings)
+		e = to.CreateInBatches(mappings, 200).Error
 		if e != nil {
 			err = fmt.Errorf("insert multi mapping err: %v", e)
 			return

models/factor_edb_series_calculate_data.go

@@ -1,24 +1,24 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
 
 // FactorEdbSeriesCalculateData 因子指标系列-指标计算数据表
 type FactorEdbSeriesCalculateData struct {
-	FactorEdbSeriesCalculateDataId int       `orm:"column(factor_edb_series_calculate_data_id);pk"`
-	FactorEdbSeriesId              int       `description:"因子指标系列ID"`
-	EdbInfoId                      int       `description:"指标ID"`
-	EdbCode                        string    `description:"指标编码"`
-	DataTime                       time.Time `description:"数据日期"`
-	Value                          float64   `description:"数据值"`
-	CreateTime                     time.Time `description:"创建时间"`
-	ModifyTime                     time.Time `description:"修改时间"`
-	DataTimestamp                  int64     `description:"数据日期时间戳"`
+	FactorEdbSeriesCalculateDataId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_calculate_data_id" description:"因子指标系列计算数据ID"`
+	FactorEdbSeriesId              int       `gorm:"column:factor_edb_series_id" description:"因子指标系列ID"`
+	EdbInfoId                      int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode                        string    `gorm:"column:edb_code" description:"指标编码"`
+	DataTime                       time.Time `gorm:"column:data_time" description:"数据日期"`
+	Value                          float64   `gorm:"column:value" description:"数据值"`
+	CreateTime                     time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                     time.Time `gorm:"column:modify_time" description:"修改时间"`
+	DataTimestamp                  int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
 }
 
 func (m *FactorEdbSeriesCalculateData) TableName() string {
@@ -52,12 +52,11 @@ func (m *FactorEdbSeriesCalculateData) Cols() FactorEdbSeriesCalculateDataCols {
 }
 
 func (m *FactorEdbSeriesCalculateData) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
+
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	if err != nil {
 		return
 	}
-	m.FactorEdbSeriesCalculateDataId = int(id)
 	return
 }
 
@@ -65,21 +64,22 @@ func (m *FactorEdbSeriesCalculateData) CreateMulti(items []*FactorEdbSeriesCalcu
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(500, items)
+
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+
+	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) Remove() (err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.FactorEdbSeriesCalculateDataId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, m.FactorEdbSeriesCalculateDataId).Error
 	return
 }
 
@@ -87,9 +87,9 @@ func (m *FactorEdbSeriesCalculateData) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
 	return
 }
 
@@ -97,39 +97,39 @@ func (m *FactorEdbSeriesCalculateData) RemoveByCondition(condition string, pars
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetItemById(id int) (item *FactorEdbSeriesCalculateData, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeriesCalculateData, err error) {
-	o := orm.NewOrm()
+
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeriesCalculateData, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -139,12 +139,12 @@ func (m *FactorEdbSeriesCalculateData) GetItemsByCondition(condition string, par
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeriesCalculateData, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -154,7 +154,7 @@ func (m *FactorEdbSeriesCalculateData) GetPageItemsByCondition(condition string,
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
 	return
 }
 

models/factor_edb_series_calculate_data_qjjs.go

@@ -1,24 +1,24 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
 
 // FactorEdbSeriesCalculateDataQjjs 因子指标系列-区间计算数据表
 type FactorEdbSeriesCalculateDataQjjs struct {
-	FactorEdbSeriesCalculateDataId int       `orm:"column(factor_edb_series_calculate_data_id);pk"`
-	FactorEdbSeriesId              int       `description:"因子指标系列ID"`
-	EdbInfoId                      int       `description:"指标ID"`
-	EdbCode                        string    `description:"指标编码"`
-	DataTime                       time.Time `description:"数据日期"`
-	Value                          float64   `description:"数据值"`
-	CreateTime                     time.Time `description:"创建时间"`
-	ModifyTime                     time.Time `description:"修改时间"`
-	DataTimestamp                  int64     `description:"数据日期时间戳"`
+	FactorEdbSeriesCalculateDataId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_calculate_data_id_qjjs" description:"因子指标系列区间计算数据ID"`
+	FactorEdbSeriesId              int       `gorm:"column:factor_edb_series_id_qjjs" description:"因子指标系列ID"`
+	EdbInfoId                      int       `gorm:"column:edb_info_id_qjjs" description:"指标ID"`
+	EdbCode                        string    `gorm:"column:edb_code_qjjs" description:"指标编码"`
+	DataTime                       time.Time `gorm:"column:data_time_qjjs" description:"数据日期"`
+	Value                          float64   `gorm:"column:value_qjjs" description:"数据值"`
+	CreateTime                     time.Time `gorm:"column:create_time_qjjs" description:"创建时间"`
+	ModifyTime                     time.Time `gorm:"column:modify_time_qjjs" description:"修改时间"`
+	DataTimestamp                  int64     `gorm:"column:data_timestamp_qjjs" description:"数据日期时间戳"`
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) TableName() string {
@@ -52,12 +52,8 @@ func (m *FactorEdbSeriesCalculateDataQjjs) Cols() FactorEdbSeriesCalculateDataQj
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.FactorEdbSeriesCalculateDataId = int(id)
+
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
@@ -65,21 +61,21 @@ func (m *FactorEdbSeriesCalculateDataQjjs) CreateMulti(items []*FactorEdbSeriesC
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(500, items)
+
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+
+	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) Remove() (err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.FactorEdbSeriesCalculateDataId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, m.FactorEdbSeriesCalculateDataId).Error
 	return
 }
 
@@ -87,9 +83,9 @@ func (m *FactorEdbSeriesCalculateDataQjjs) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
 	return
 }
 
@@ -97,39 +93,39 @@ func (m *FactorEdbSeriesCalculateDataQjjs) RemoveByCondition(condition string, p
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetItemById(id int) (item *FactorEdbSeriesCalculateDataQjjs, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeriesCalculateDataQjjs, err error) {
-	o := orm.NewOrm()
+
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeriesCalculateDataQjjs, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -139,12 +135,12 @@ func (m *FactorEdbSeriesCalculateDataQjjs) GetItemsByCondition(condition string,
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeriesCalculateDataQjjs, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -154,7 +150,7 @@ func (m *FactorEdbSeriesCalculateDataQjjs) GetPageItemsByCondition(condition str
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
 	return
 }
 
@@ -204,7 +200,7 @@ func (m *FactorEdbSeriesCalculateDataQjjs) GetEdbDataList(seriesId int, edbInfoI
 
 	sql += ` ORDER BY data_time ASC `
 	sql = fmt.Sprintf(sql, m.TableName())
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
 	return
 }

models/factor_edb_series_calculate_func.go

@@ -1,21 +1,21 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
 
 // FactorEdbSeriesCalculateFunc 多因子系列-计算方式表
 type FactorEdbSeriesCalculateFunc struct {
-	FactorEdbSeriesCalculateFuncId int       `orm:"column(factor_edb_series_calculate_func_id);pk"`
-	CalculateName                  string    `description:"计算方式名称"`
-	Source                         int       `description:"计算方式来源"`
-	EdbInfoType                    int       `description:"指标计算类型：0-普通指标；1-预测指标"`
-	CreateTime                     time.Time `description:"创建时间"`
-	ModifyTime                     time.Time `description:"修改时间"`
+	FactorEdbSeriesCalculateFuncId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_calculate_func_id" description:"多因子系列计算方式ID"`
+	CalculateName                  string    `gorm:"column:calculate_name" description:"计算方式名称"`
+	Source                         int       `gorm:"column:source" description:"计算方式来源"`
+	EdbInfoType                    int       `gorm:"column:edb_info_type" description:"指标计算类型：0-普通指标；1-预测指标"`
+	CreateTime                     time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                     time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 func (m *FactorEdbSeriesCalculateFunc) TableName() string {
@@ -43,12 +43,8 @@ func (m *FactorEdbSeriesCalculateFunc) Cols() FactorEdbSeriesCalculateFuncCols {
 }
 
 func (m *FactorEdbSeriesCalculateFunc) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.FactorEdbSeriesCalculateFuncId = int(id)
+
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
@@ -56,21 +52,21 @@ func (m *FactorEdbSeriesCalculateFunc) CreateMulti(items []*FactorEdbSeriesCalcu
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+
+	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) Remove() (err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.FactorEdbSeriesCalculateFuncId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, m.FactorEdbSeriesCalculateFuncId).Error
 	return
 }
 
@@ -78,39 +74,39 @@ func (m *FactorEdbSeriesCalculateFunc) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) GetItemById(id int) (item *FactorEdbSeriesCalculateFunc, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeriesCalculateFunc, err error) {
-	o := orm.NewOrm()
+
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeriesCalculateFunc, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -120,12 +116,12 @@ func (m *FactorEdbSeriesCalculateFunc) GetItemsByCondition(condition string, par
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeriesCalculateFunc, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -135,7 +131,7 @@ func (m *FactorEdbSeriesCalculateFunc) GetPageItemsByCondition(condition string,
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
 	return
 }
 

models/factor_edb_series_chart_mapping.go

@@ -1,9 +1,9 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -15,17 +15,17 @@ const (
 
 // FactorEdbSeriesChartMapping 因子指标系列-图表关联
 type FactorEdbSeriesChartMapping struct {
-	FactorEdbSeriesChartMappingId int       `orm:"column(factor_edb_series_chart_mapping_id);pk"`
-	ChartInfoId                   int       `description:"图表ID"`
-	Source                        int       `description:"图表来源, 同chart_info表source"`
-	CalculateType                 int       `description:"计算方式: 1-相关性"`
-	CalculatePars                 string    `description:"计算参数-JSON(如计算窗口等)"`
-	CalculateData                 string    `description:"计算数据-JSON(如相关性矩阵等)"`
-	FactorEdbSeriesId             int       `description:"因子指标系列ID"`
-	EdbInfoId                     int       `description:"指标ID"`
-	EdbUsed                       int       `description:"指标是否使用: 0-否; 1-是"`
-	CreateTime                    time.Time `description:"创建时间"`
-	ModifyTime                    time.Time `description:"修改时间"`
+	FactorEdbSeriesChartMappingId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_chart_mapping_id" description:"因子指标系列图表映射ID"`
+	ChartInfoId                   int       `gorm:"column:chart_info_id" description:"图表ID"`
+	Source                        int       `gorm:"column:source" description:"图表来源, 同chart_info表source"`
+	CalculateType                 int       `gorm:"column:calculate_type" description:"计算方式: 1-相关性"`
+	CalculatePars                 string    `gorm:"column:calculate_pars" description:"计算参数-JSON(如计算窗口等)"`
+	CalculateData                 string    `gorm:"column:calculate_data" description:"计算数据-JSON(如相关性矩阵等)"`
+	FactorEdbSeriesId             int       `gorm:"column:factor_edb_series_id" description:"因子指标系列ID"`
+	EdbInfoId                     int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbUsed                       int       `gorm:"column:edb_used" description:"指标是否使用: 0-否; 1-是"`
+	CreateTime                    time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                    time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 func (m *FactorEdbSeriesChartMapping) TableName() string {
@@ -63,12 +63,7 @@ func (m *FactorEdbSeriesChartMapping) Cols() MultipleFactorSeriesChartMappingCol
 }
 
 func (m *FactorEdbSeriesChartMapping) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.FactorEdbSeriesChartMappingId = int(id)
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
@@ -76,21 +71,21 @@ func (m *FactorEdbSeriesChartMapping) CreateMulti(items []*FactorEdbSeriesChartM
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+
+	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) Remove() (err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.FactorEdbSeriesChartMappingId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, m.FactorEdbSeriesChartMappingId).Error
 	return
 }
 
@@ -98,39 +93,39 @@ func (m *FactorEdbSeriesChartMapping) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetItemById(id int) (item *FactorEdbSeriesChartMapping, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeriesChartMapping, err error) {
-	o := orm.NewOrm()
+
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeriesChartMapping, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -140,12 +135,12 @@ func (m *FactorEdbSeriesChartMapping) GetItemsByCondition(condition string, pars
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeriesChartMapping, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -155,15 +150,15 @@ func (m *FactorEdbSeriesChartMapping) GetPageItemsByCondition(condition string,
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
 	return
 }
 
 // GetDistinctSeriesIdByChartId 获取图表关联的系列ID
 func (m *FactorEdbSeriesChartMapping) GetDistinctSeriesIdByChartId(chartId int) (seriesIds []int, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT DISTINCT %s FROM %s WHERE %s = ?`, m.Cols().FactorEdbSeriesId, m.TableName(), m.Cols().ChartInfoId)
-	_, err = o.Raw(sql, chartId).QueryRows(&seriesIds)
+	err = global.DEFAULT_DmSQL.Raw(sql, chartId).Scan(&seriesIds).Error
 	return
 }
 

models/factor_edb_series_mapping.go

@@ -1,21 +1,21 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
 
 // FactorEdbSeriesMapping 因子指标系列-指标关联表
 type FactorEdbSeriesMapping struct {
-	FactorEdbSeriesMappingId int       `orm:"column(factor_edb_series_mapping_id);pk"`
-	FactorEdbSeriesId        int       `description:"因子指标系列ID"`
-	EdbInfoId                int       `description:"指标ID"`
-	EdbCode                  string    `description:"指标编码"`
-	CreateTime               time.Time `description:"创建时间"`
-	ModifyTime               time.Time `description:"修改时间"`
+	FactorEdbSeriesMappingId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_mapping_id" description:"因子指标系列映射ID"`
+	FactorEdbSeriesId        int       `gorm:"column:factor_edb_series_id" description:"因子指标系列ID"`
+	EdbInfoId                int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode                  string    `gorm:"column:edb_code" description:"指标编码"`
+	CreateTime               time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime               time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 func (m *FactorEdbSeriesMapping) TableName() string {
@@ -43,12 +43,8 @@ func (m *FactorEdbSeriesMapping) Cols() FactorEdbSeriesMappingCols {
 }
 
 func (m *FactorEdbSeriesMapping) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.FactorEdbSeriesMappingId = int(id)
+
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
@@ -56,21 +52,20 @@ func (m *FactorEdbSeriesMapping) CreateMulti(items []*FactorEdbSeriesMapping) (e
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
 	return
 }
 
 func (m *FactorEdbSeriesMapping) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+
+	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
 func (m *FactorEdbSeriesMapping) Remove() (err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.FactorEdbSeriesMappingId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, m.FactorEdbSeriesMappingId).Error
 	return
 }
 
@@ -78,9 +73,9 @@ func (m *FactorEdbSeriesMapping) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
 	return
 }
 
@@ -88,39 +83,39 @@ func (m *FactorEdbSeriesMapping) RemoveByCondition(condition string, pars []inte
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetItemById(id int) (item *FactorEdbSeriesMapping, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeriesMapping, err error) {
-	o := orm.NewOrm()
+
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeriesMapping, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -130,12 +125,12 @@ func (m *FactorEdbSeriesMapping) GetItemsByCondition(condition string, pars []in
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeriesMapping, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -145,7 +140,7 @@ func (m *FactorEdbSeriesMapping) GetPageItemsByCondition(condition string, pars
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
 	return
 }
 
@@ -167,8 +162,8 @@ func (m *FactorEdbSeriesMapping) Format2Item() (item *FactorEdbSeriesMappingItem
 }
 
 func (m *FactorEdbSeriesMapping) GetItemBySeriesId(seriesId int) (items []*FactorEdbSeriesMapping, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? `, m.TableName(), m.Cols().FactorEdbSeriesId)
-	_, err = o.Raw(sql, seriesId).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, seriesId).Scan(&items).Error
 	return
 }

models/future_good/chart_info_future_good_profit.go

@@ -1,21 +1,21 @@
 package future_good
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
 
 // ChartInfoFutureGoodProfit 商品利润图表-扩展信息
 type ChartInfoFutureGoodProfit struct {
-	ChartInfoId  int       `orm:"column(chart_info_id);pk" description:"商品利润图表ID(chart_info表source=5的)"`
-	ProfitName   string    `description:"利润名称"`
-	ProfitNameEn string    `description:"利润英文名称"`
-	XValue       string    `description:"X轴数据值"`
-	YValue       string    `description:"Y轴数据值"`
-	CreateTime   time.Time `description:"创建时间"`
-	ModifyTime   time.Time `description:"更新时间"`
+	ChartInfoId  int       `gorm:"primaryKey;autoIncrement;column:chart_info_id" description:"商品利润图表ID(chart_info表source=5的)"`
+	ProfitName   string    `gorm:"column:profit_name" description:"利润名称"`
+	ProfitNameEn string    `gorm:"column:profit_name_en" description:"利润英文名称"`
+	XValue       string    `gorm:"column:x_value" description:"X轴数据值"`
+	YValue       string    `gorm:"column:y_value" description:"Y轴数据值"`
+	CreateTime   time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime   time.Time `gorm:"column:modify_time" description:"更新时间"`
 }
 
 type CorrelationInfo struct {
@@ -36,8 +36,7 @@ func (m *ChartInfoFutureGoodProfit) TableName() string {
 }
 
 func (m *ChartInfoFutureGoodProfit) Create() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(m)
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	if err != nil {
 		return
 	}
@@ -46,34 +45,34 @@ func (m *ChartInfoFutureGoodProfit) Create() (err error) {
 }
 
 func (m *ChartInfoFutureGoodProfit) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+
+	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
 func (m *ChartInfoFutureGoodProfit) Delete() (err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE chart_info_id = ? LIMIT 1`, m.TableName())
-	_, err = o.Raw(sql, m.ChartInfoId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, m.ChartInfoId).Error
 	return
 }
 
 func (m *ChartInfoFutureGoodProfit) GetItemById(id int) (err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE chart_info_id = ? LIMIT 1`, m.TableName())
-	err = o.Raw(sql, id).QueryRow(&m)
+	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&m).Error
 	return
 }
 
 func (m *ChartInfoFutureGoodProfit) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&m)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&m).Error
 	return
 }
 
 func (m *ChartInfoFutureGoodProfit) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*ChartInfoFutureGoodProfit, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -83,6 +82,6 @@ func (m *ChartInfoFutureGoodProfit) GetItemsByCondition(condition string, pars [
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
 	return
 }

models/future_good/future_good_edb_data.go

@@ -1,9 +1,9 @@
 package future_good
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
@@ -11,42 +11,42 @@ import (
 
 // FutureGoodEdbData 期货指标数据的表
 type FutureGoodEdbData struct {
-	FutureGoodEdbDataId int       `orm:"column(future_good_edb_data_id);pk"`
-	FutureGoodEdbInfoId int       `description:"期货指标id"`
-	FutureGoodEdbCode   string    `description:"期货指标code"`
-	DataTime            time.Time `description:"数据日期"`
-	TradeCode           string    `description:"证券代码"`
-	Open                float64   `description:"开盘价"`
-	High                float64   `description:"最高价"`
-	Low                 float64   `description:"最低价"`
-	Close               float64   `description:"收盘价"`
-	Volume              float64   `description:"成交量"`
-	Amt                 float64   `description:"成交额"`
-	Oi                  float64   `description:"持仓量"`
-	Settle              float64   `description:"结算价"`
-	DataTimestamp       int64     `description:"数据日期时间戳"`
-	ModifyTime          time.Time
-	CreateTime          time.Time
+	FutureGoodEdbDataId int       `gorm:"primaryKey;autoIncrement;column:future_good_edb_data_id"`
+	FutureGoodEdbInfoId int       `gorm:"column:future_good_edb_info_id" description:"期货指标id"`
+	FutureGoodEdbCode   string    `gorm:"column:future_good_edb_code" description:"期货指标code"`
+	DataTime            time.Time `gorm:"column:data_time" description:"数据日期"`
+	TradeCode           string    `gorm:"column:trade_code" description:"证券代码"`
+	Open                float64   `gorm:"column:open" description:"开盘价"`
+	High                float64   `gorm:"column:high" description:"最高价"`
+	Low                 float64   `gorm:"column:low" description:"最低价"`
+	Close               float64   `gorm:"column:close" description:"收盘价"`
+	Volume              float64   `gorm:"column:volume" description:"成交量"`
+	Amt                 float64   `gorm:"column:amt" description:"成交额"`
+	Oi                  float64   `gorm:"column:oi" description:"持仓量"`
+	Settle              float64   `gorm:"column:settle" description:"结算价"`
+	DataTimestamp       int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
+	ModifyTime          time.Time `gorm:"column:modify_time"`
+	CreateTime          time.Time `gorm:"column:create_time"`
 }
 
 // FutureGoodEdbDataItem 期货指标数据的表
 type FutureGoodEdbDataItem struct {
-	FutureGoodEdbDataId int     `orm:"column(future_good_edb_data_id);pk"`
-	FutureGoodEdbInfoId int     `description:"期货指标id"`
-	FutureGoodEdbCode   string  `description:"期货指标code"`
-	DataTime            string  `description:"数据日期"`
-	TradeCode           string  `description:"证券代码"`
-	Open                float64 `description:"开盘价"`
-	High                float64 `description:"最高价"`
-	Low                 float64 `description:"最低价"`
-	Close               float64 `description:"收盘价"`
-	Volume              float64 `description:"成交量"`
-	Amt                 float64 `description:"成交额"`
-	Oi                  float64 `description:"持仓量"`
-	Settle              float64 `description:"结算价"`
-	DataTimestamp       int64   `description:"数据日期时间戳"`
-	ModifyTime          time.Time
-	CreateTime          time.Time
+	FutureGoodEdbDataId int       `gorm:"primaryKey;autoIncrement;column:future_good_edb_data_id"`
+	FutureGoodEdbInfoId int       `gorm:"column:future_good_edb_info_id" description:"期货指标id"`
+	FutureGoodEdbCode   string    `gorm:"column:future_good_edb_code" description:"期货指标code"`
+	DataTime            string    `gorm:"column:data_time" description:"数据日期"`
+	TradeCode           string    `gorm:"column:trade_code" description:"证券代码"`
+	Open                float64   `gorm:"column:open" description:"开盘价"`
+	High                float64   `gorm:"column:high" description:"最高价"`
+	Low                 float64   `gorm:"column:low" description:"最低价"`
+	Close               float64   `gorm:"column:close" description:"收盘价"`
+	Volume              float64   `gorm:"column:volume" description:"成交量"`
+	Amt                 float64   `gorm:"column:amt" description:"成交额"`
+	Oi                  float64   `gorm:"column:oi" description:"持仓量"`
+	Settle              float64   `gorm:"column:settle" description:"结算价"`
+	DataTimestamp       int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
+	ModifyTime          time.Time `gorm:"column:modify_time"`
+	CreateTime          time.Time `gorm:"column:create_time"`
 }
 
 // FutureGoodDataFromThs 同花顺期货数据
@@ -74,19 +74,17 @@ type FutureGoodDataTables struct {
 
 // GetFutureGoodEdbDataList 获取期货指标数据列表
 func GetFutureGoodEdbDataList(condition string, pars []interface{}) (list []*FutureGoodEdbDataItem, err error) {
-	o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_data WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY data_time asc `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
 	return
 }
 
 // AddEdbDataFromThs 添加Ths商品指标数据
 func AddEdbDataFromThs(futureGoodEdbInfoId int, edbCode string, item FutureGoodDataFromThs) (err error) {
-	o := orm.NewOrm()
 
 	var isAdd bool
 	addSql := ` INSERT INTO future_good_edb_data(future_good_edb_info_id,future_good_edb_code,data_time,trade_code,open,high,low,close,volume,amt,oi,settle,create_time,modify_time,data_timestamp) values `
@@ -119,7 +117,7 @@ func AddEdbDataFromThs(futureGoodEdbInfoId int, edbCode string, item FutureGoodD
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return
 		}
@@ -136,17 +134,13 @@ type RefreshFutureEdbEdbInfoReq struct {
 
 // RefreshFutureGoodEdbDataFromThs 刷新wind期货指标数据
 func RefreshFutureGoodEdbDataFromThs(futureGoodEdbInfoId int, edbCode, startDate string, item FutureGoodDataFromThs) (err error) {
-	o := orm.NewOrm()
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+
+	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
-			fmt.Println("RefreshAllCalculateTbz,Err:" + err.Error())
-			_ = to.Rollback()
+			to.Rollback()
 		} else {
-			_ = to.Commit()
+			to.Commit()
 		}
 	}()
 
@@ -169,7 +163,7 @@ func RefreshFutureGoodEdbDataFromThs(futureGoodEdbInfoId int, edbCode, startDate
 			sql += condition
 		}
 		sql += `ORDER BY data_time asc `
-		_, err = to.Raw(sql, pars).QueryRows(&existList)
+		err = to.Raw(sql, pars).Scan(&existList).Error
 	}
 
 	existMap := make(map[string]*FutureGoodEdbData)
@@ -250,7 +244,8 @@ func RefreshFutureGoodEdbDataFromThs(futureGoodEdbInfoId int, edbCode, startDate
 				}
 
 				if len(updateCol) > 0 {
-					_, err = to.Update(findItem, updateCol...)
+					//_, err = to.Update(findItem, updateCol...)
+					err = global.DEFAULT_DmSQL.Model(findItem).Select(updateCol).Updates(findItem).Error
 					if err != nil {
 						return
 					}
@@ -262,7 +257,7 @@ func RefreshFutureGoodEdbDataFromThs(futureGoodEdbInfoId int, edbCode, startDate
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = to.Raw(addSql).Exec()
+		err = to.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshEdbDataFromWind add Err", err.Error())
 			return
@@ -297,7 +292,7 @@ func GetFutureGoodEdbDataListByDate(futureGoodEdbInfoId int, startDate, endDate
 	}
 
 	sql += ` ORDER BY data_time ASC `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, futureGoodEdbInfoId, pars).QueryRows(&list)
+
+	err = global.DEFAULT_DmSQL.Raw(sql, futureGoodEdbInfoId, pars).Scan(&list).Error
 	return
 }

models/future_good/future_good_edb_info.go

@@ -2,95 +2,91 @@ package future_good
 
 import (
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 type FutureGoodEdbInfo struct {
-	FutureGoodEdbInfoId int       `orm:"column(future_good_edb_info_id);pk"`
-	FutureGoodEdbCode   string    `description:"期货指标code"`
-	FutureGoodEdbName   string    `description:"期货指标名称"`
-	FutureGoodEdbNameEn string    `description:"期货指标英文名称"`
-	ParentId            int       `description:"上级期货id"`
-	RegionType          string    `description:"交易所来源，海外还是国内"`
-	Exchange            string    `description:"所属交易所"`
-	FutureGoodEdbType   int       `description:"指标类型,1:年月是固定的合约；2：只有M+N期的合约，未固定年月"`
-	DateSourceId        int       `description:"画图时，日期来源的指标id"`
-	Year                int       `description:"所属年份"`
-	Month               int       `description:"所属月份"`
-	StartDate           string    `description:"起始日期"`
-	EndDate             string    `description:"终止日期"`
-	MinValue            float64   `description:"最小值"`
-	MaxValue            float64   `description:"最大值"`
-	LatestValue         float64   `description:"数据最新的值"`
-	LatestDate          time.Time `description:"数据最新的日期"`
-	ServerUrl           string    `description:"服务器地址"`
-	TerminalCode        string    `description:"终端编码，用于配置在机器上"`
-	CreateTime          time.Time
-	ModifyTime          time.Time
+	FutureGoodEdbInfoId int       `gorm:"primaryKey;autoIncrement;column:future_good_edb_info_id"`
+	FutureGoodEdbCode   string    `gorm:"column:future_good_edb_code" description:"期货指标code"`
+	FutureGoodEdbName   string    `gorm:"column:future_good_edb_name" description:"期货指标名称"`
+	FutureGoodEdbNameEn string    `gorm:"column:future_good_edb_name_en" description:"期货指标英文名称"`
+	ParentId            int       `gorm:"column:parent_id" description:"上级期货id"`
+	RegionType          string    `gorm:"column:region_type" description:"交易所来源，海外还是国内"`
+	Exchange            string    `gorm:"column:exchange" description:"所属交易所"`
+	FutureGoodEdbType   int       `gorm:"column:future_good_edb_type" description:"指标类型,1:年月是固定的合约；2：只有M+N期的合约，未固定年月"`
+	DateSourceId        int       `gorm:"column:date_source_id" description:"画图时，日期来源的指标id"`
+	Year                int       `gorm:"column:year" description:"所属年份"`
+	Month               int       `gorm:"column:month" description:"所属月份"`
+	StartDate           string    `gorm:"column:start_date" description:"起始日期"`
+	EndDate             string    `gorm:"column:end_date" description:"终止日期"`
+	MinValue            float64   `gorm:"column:min_value" description:"最小值"`
+	MaxValue            float64   `gorm:"column:max_value" description:"最大值"`
+	LatestValue         float64   `gorm:"column:latest_value" description:"数据最新的值"`
+	LatestDate          time.Time `gorm:"column:latest_date" description:"数据最新的日期"`
+	ServerUrl           string    `gorm:"column:server_url" description:"服务器地址"`
+	TerminalCode        string    `gorm:"column:terminal_code" description:"终端编码，用于配置在机器上"`
+	CreateTime          time.Time `gorm:"column:create_time"`
+	ModifyTime          time.Time `gorm:"column:modify_time"`
 }
 
 // GetFutureGoodEdbInfo 期货指标
 func GetFutureGoodEdbInfo(edbInfoId int) (item *FutureGoodEdbInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM future_good_edb_info WHERE future_good_edb_info_id = ? `
 	sql += ` ORDER BY future_good_edb_info_id DESC `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&item).Error
 	return
 }
 
 // GetFutureGoodEdbInfoByCode 根据指标code获取指标信息
 func GetFutureGoodEdbInfoByCode(edbCode string) (item *FutureGoodEdbInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM future_good_edb_info  WHERE future_good_edb_code = ? limit 1 `
-	err = o.Raw(sql, edbCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&item).Error
 	return
 }
 
 // GetFutureGoodEdbInfoList 获取指标数据列表
 func GetFutureGoodEdbInfoList(condition string, pars []interface{}) (list []*FutureGoodEdbInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM future_good_edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY future_good_edb_info_id DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
 	return
 }
 
 // GetAllFutureGoodEdbInfoList 获取指标数据列表
 func GetAllFutureGoodEdbInfoList() (list []*FutureGoodEdbInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM future_good_edb_info  ORDER BY future_good_edb_info_id DESC `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&list).Error
 	return
 }
 
 // AddFutureGoodEdbInfo 添加期货数据库指标
 func AddFutureGoodEdbInfo(item *FutureGoodEdbInfo) (err error) {
-	o := orm.NewOrm()
-	lastId, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.FutureGoodEdbInfoId = int(lastId)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
 // GetChildFutureGoodEdbInfoListByParentId 根据父级ID获取下面所有的指标数据列表
 func GetChildFutureGoodEdbInfoListByParentId(parentId int) (list []*FutureGoodEdbInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM future_good_edb_info WHERE parent_id = ? ORDER BY future_good_edb_info_id ASC `
-	_, err = o.Raw(sql, parentId).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Scan(&list).Error
 	return
 }
 
 // Update 更新指标基础信息
 func (FutureGoodEdbInfo *FutureGoodEdbInfo) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(FutureGoodEdbInfo, cols...)
+	//err = o.Update(FutureGoodEdbInfo, cols...)
+	err = global.DEFAULT_DmSQL.Model(FutureGoodEdbInfo).Select(cols).Updates(FutureGoodEdbInfo).Error
 	return
 }
 
@@ -110,9 +106,9 @@ func UnifiedModifyEdbInfoMaxAndMinInfo(futureGoodEdbInfo *FutureGoodEdbInfo) (er
 	}
 
 	if maxAndMinItem != nil {
-		o := orm.NewOrm()
+
 		sql := ` UPDATE future_good_edb_info SET start_date=?,end_date=?,min_value=?,max_value=?,latest_date=?,latest_value=?,modify_time=NOW() WHERE future_good_edb_info_id=? `
-		_, err = o.Raw(sql, maxAndMinItem.MinDate, maxAndMinItem.MaxDate, maxAndMinItem.MinValue, maxAndMinItem.MaxValue, maxAndMinItem.MaxDate, maxAndMinItem.LatestValue, futureGoodEdbInfo.FutureGoodEdbInfoId).Exec()
+		err = global.DEFAULT_DmSQL.Exec(sql, maxAndMinItem.MinDate, maxAndMinItem.MaxDate, maxAndMinItem.MinValue, maxAndMinItem.MaxValue, maxAndMinItem.MaxDate, maxAndMinItem.LatestValue, futureGoodEdbInfo.FutureGoodEdbInfoId).Error
 		if err != nil {
 			errMsg = "刷新指标失败！"
 			err = errors.New("修改指标最大最小值失败，err:" + err.Error())
@@ -134,14 +130,14 @@ type FutureGoodEdbInfoMaxAndMinInfo struct {
 
 // GetEdbInfoMaxAndMinInfo 获取指标的最新数据记录信息
 func GetEdbInfoMaxAndMinInfo(futureGoodEdbCode string) (item *FutureGoodEdbInfoMaxAndMinInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := ``
 	sql = ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date,MIN(close) AS min_value,MAX(close) AS max_value FROM future_good_edb_data WHERE future_good_edb_code=? `
-	err = o.Raw(sql, futureGoodEdbCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, futureGoodEdbCode).First(&item).Error
 
 	var latest_value float64
 	sql = ` SELECT close AS latest_value FROM future_good_edb_data WHERE future_good_edb_code=? ORDER BY data_time DESC LIMIT 1 `
-	err = o.Raw(sql, futureGoodEdbCode).QueryRow(&latest_value)
+	err = global.DEFAULT_DmSQL.Raw(sql, futureGoodEdbCode).Scan(&latest_value).Error
 	item.LatestValue = latest_value
 	return
 }

models/predict_edb_conf.go

@@ -1,8 +1,8 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -39,8 +39,8 @@ type EditPredictEdbInfoReq struct {
 }
 
 type PredictEdbConf struct {
-	ConfigId         int       `orm:"column(config_id);pk" description:"规则id"`
-	PredictEdbInfoId int       `orm:"column(predict_edb_info_id)" description:"预测指标id"`
+	ConfigId         int       `gorm:"primaryKey;autoIncrement;column:config_id" description:"规则id"`
+	PredictEdbInfoId int       `description:"预测指标id"`
 	SourceEdbInfoId  int       `description:"来源指标id"`
 	RuleType         int       `description:"预测规则，1：最新，2：固定值，3：同比，4：同差，5：环比，6：环差，7：N期移动均值，8：N期段线性外推值"`
 	FixedValue       float64   `description:"固定值"`
@@ -54,7 +54,7 @@ type PredictEdbConf struct {
 
 // PredictEdbConfAndData 预测规则和其对应的动态数据
 type PredictEdbConfAndData struct {
-	ConfigId         int                  `orm:"column(config_id);pk" description:"规则id"`
+	ConfigId         int                  `gorm:"primaryKey;autoIncrement;column:config_id" description:"规则id"`
 	PredictEdbInfoId int                  `orm:"column(predict_edb_info_id)" description:"预测指标id"`
 	SourceEdbInfoId  int                  `description:"来源指标id"`
 	RuleType         int                  `description:"预测规则，1：最新，2：固定值，3：同比，4：同差，5：环比，6：环差，7：N期移动均值，8：N期段线性外推值，9：动态环差"`
@@ -70,33 +70,33 @@ type PredictEdbConfAndData struct {
 
 // GetPredictEdbConfById 根据预测指标id获取预测指标配置信息
 func GetPredictEdbConfById(edbInfoId int) (item *PredictEdbConf, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM predict_edb_conf WHERE predict_edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&item).Error
 	return
 }
 
 // GetPredictEdbConfCount 根据来源指标id获取被引用的次数
 func GetPredictEdbConfCount(sourceEdbInfoId int) (count int, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT COUNT(1) AS count FROM predict_edb_conf WHERE source_edb_info_id=? `
-	err = o.Raw(sql, sourceEdbInfoId).QueryRow(&count)
+	err = global.DEFAULT_DmSQL.Raw(sql, sourceEdbInfoId).Scan(&count).Error
 	return
 }
 
 // GetPredictEdbConfListById 根据预测指标id获取预测指标配置信息列表
 func GetPredictEdbConfListById(edbInfoId int) (items []*PredictEdbConf, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM predict_edb_conf WHERE predict_edb_info_id=? ORDER BY config_id ASC`
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Scan(&items).Error
 	return
 }
 
 // GetPredictEdbConfAndDataListById 根据预测指标id获取预测指标配置信息列表
 func GetPredictEdbConfAndDataListById(edbInfoId int) (items []*PredictEdbConfAndData, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM predict_edb_conf WHERE predict_edb_info_id=? ORDER BY config_id ASC`
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Scan(&items).Error
 	return
 }
 
@@ -106,23 +106,23 @@ func GetPredictEdbConfListByConfigIdList(configIdList []int) (items []*PredictEd
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM predict_edb_conf WHERE config_id in (` + utils.GetOrmInReplace(num) + `) ORDER BY config_id ASC`
-	_, err = o.Raw(sql, configIdList).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, configIdList).Scan(&items).Error
 	return
 }
 
 // ModifyPredictEdbInfoMaxAndMinInfoBySourceEdbInfoId 根据来源指标修改预测指标的最新数据信息
 func ModifyPredictEdbInfoMaxAndMinInfoBySourceEdbInfoId(sourceEdbInfoId int, item *EdbInfoMaxAndMinInfo) (err error) {
 	//return
-	o := orm.NewOrm()
+
 	var list []*PredictEdbConf
 	sql := ` SELECT * FROM predict_edb_conf WHERE source_edb_info_id=? `
-	total, err := o.Raw(sql, sourceEdbInfoId).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, sourceEdbInfoId).Scan(&list).Error
 	if err != nil {
 		return
 	}
-
+	total := len(list)
 	if total > 0 {
 		idList := make([]int, 0)
 		for _, v := range list {
@@ -130,25 +130,25 @@ func ModifyPredictEdbInfoMaxAndMinInfoBySourceEdbInfoId(sourceEdbInfoId int, ite
 		}
 
 		//sql := ` UPDATE edb_info SET start_date=?,min_value=?,max_value=?,is_update=2,latest_date=?,latest_value=?,modify_time=NOW() WHERE edb_info_id in (` + utils.GetOrmInReplace(int(total)) + `) `
-		//_, err = o.Raw(sql, item.MinDate, item.MinValue, item.MaxValue, item.MaxDate, item.LatestValue, idList).Exec()
+		//err = global.DEFAULT_DmSQL.Raw(sql, item.MinDate, item.MinValue, item.MaxValue, item.MaxDate, item.LatestValue, idList).Error
 		sql := ` UPDATE edb_info SET start_date=?,is_update=2,latest_date=?,latest_value=?,end_value=?,modify_time=NOW() WHERE edb_info_id in (` + utils.GetOrmInReplace(int(total)) + `) `
-		_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, item.LatestValue, idList).Exec()
+		err = global.DEFAULT_DmSQL.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, item.LatestValue, idList).Error
 	}
 	return
 }
 
 // GetPredictEdbConfBySourceEdbInfoId 根据来源指标id获取配置
 func GetPredictEdbConfBySourceEdbInfoId(sourceEdbInfoId int) (item *PredictEdbConf, err error) {
-	o := orm.NewOrm()
+
 	sql := ` SELECT * FROM predict_edb_conf WHERE source_edb_info_id=? `
-	err = o.Raw(sql, sourceEdbInfoId).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, sourceEdbInfoId).First(&item).Error
 	return
 }
 
 // AddPredictEdbConf 添加预测指标规则
 func AddPredictEdbConf(item *PredictEdbConf) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
@@ -158,12 +158,12 @@ func GetPredictEdbInfoAllCalculate(edbInfoIdList []int) (list []*EdbInfo, err er
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := ` SELECT b.* FROM predict_edb_conf AS a
 			 INNER JOIN edb_info AS b ON a.source_edb_info_id=b.edb_info_id
              WHERE a.predict_edb_info_id in (` + utils.GetOrmInReplace(num) + `)
 			 GROUP BY a.source_edb_info_id
 			 ORDER BY a.source_edb_info_id ASC `
-	_, err = o.Raw(sql, edbInfoIdList).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoIdList).Scan(&list).Error
 	return
 }

models/predict_edb_conf_calculate_mapping.go

@@ -7,7 +7,7 @@ import (
 
 // PredictEdbConfCalculateMapping 预测基础指标规则 与 计算预测指标关联关系表
 type PredictEdbConfCalculateMapping struct {
-	PredictEdbConfCalculateMappingId int       `orm:"column(predict_edb_conf_calculate_mapping_id);pk"`
+	PredictEdbConfCalculateMappingId int       `gorm:"primaryKey;autoIncrement;column:predict_edb_conf_calculate_mapping_id"`
 	EdbInfoId                        int       `description:"指标id"`
 	ConfigId                         int       `description:"配置id"`
 	FromEdbInfoId                    int       `description:"基础指标id"`

models/predict_edb_data_calculate_ljztbpj.go

@@ -14,15 +14,15 @@ import (
 
 // EdbDataPredictCalculateLjztbpj 累计值同比拼接数据结构体
 type EdbDataPredictCalculateLjztbpj struct {
-	EdbDataId     int `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
+	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
+	EdbInfoId     int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode       string    `gorm:"column:edb_code" description:"指标编码"`
+	DataTime      string    `gorm:"column:data_time" description:"数据日期"`
+	Value         float64   `gorm:"column:value" description:"数据值"`
+	Status        int       `gorm:"column:status" description:"状态"`
+	CreateTime    time.Time `gorm:"column:status" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:create_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
 // SavePredictCalculateLjztbpj 新增累计值同比拼接数据

models/predict_edb_data_calculate_nhcc.go

@@ -14,15 +14,15 @@ import (
 
 // EdbDataPredictCalculateNhcc 拟合残差数据结构体
 type EdbDataPredictCalculateNhcc struct {
-	EdbDataId     int `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
+	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
+	EdbInfoId     int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode       string    `gorm:"column:edb_code" description:"指标编码"`
+	DataTime      string    `gorm:"column:data_time" description:"数据日期"`
+	Value         float64   `gorm:"column:value" description:"数据值"`
+	Status        int       `gorm:"column:status" description:"状态"`
+	CreateTime    time.Time `gorm:"column:status" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:create_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
 // SavePredictCalculateNhcc 新增拟合残差数据

models/predict_edb_rule_data.go

@@ -7,7 +7,7 @@ import (
 
 // PredictEdbRuleData 预测指标，动态规则的计算数据
 type PredictEdbRuleData struct {
-	PredictEdbRuleDataId int `orm:"column(predict_edb_rule_data_id);pk"`
+	PredictEdbRuleDataId int `gorm:"primaryKey;autoIncrement;column:predict_edb_rule_data_id"`
 	EdbInfoId            int
 	ConfigId             int
 	DataTime             string

models/supply_analysis/base_from_stock_plant_data.go

@@ -2,22 +2,22 @@ package supply_analysis
 
 import (
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
-	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/shopspring/decimal"
+	"gorm.io/gorm"
 	"time"
 )
 
 // BaseFromStockPlantData base_from_stock_plant_data 存量装置的指标的计算数据
 type BaseFromStockPlantData struct {
-	StockPlantDataId int       `orm:"column(stock_plant_data_id);pk"`
-	VarietyEdbId     int       `description:"指标id"`
-	DataTime         time.Time `description:"数据日期"`
-	Value            float64   `description:"数据值"`
-	ModifyTime       time.Time `description:"修改时间"`
-	CreateTime       time.Time `description:"创建时间"`
-	DataTimestamp    int64     `description:"数据日期时间戳"`
+	StockPlantDataId int       `gorm:"primaryKey;autoIncrement;column:stock_plant_data_id" description:"指标数据ID"`
+	VarietyEdbId     int       `gorm:"column:variety_edb_id" description:"指标id"`
+	DataTime         time.Time `gorm:"column:data_time" description:"数据日期"`
+	Value            float64   `gorm:"column:value" description:"数据值"`
+	ModifyTime       time.Time `gorm:"column:modify_time" description:"修改时间"`
+	CreateTime       time.Time `gorm:"column:create_time" description:"创建时间"`
+	DataTimestamp    int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
 }
 
 // CalculateVarietyReq 重新计算请求
@@ -115,17 +115,12 @@ func Calculate(varietyId int, sysUserId int, sysUserName string) (err error) {
 		dataMap[tmpDate] = calculateVal
 	}
 
-	to, err := orm.NewOrm().Begin()
-	if err != nil {
-		return
-	}
-
+	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
-			fmt.Println("Calculate,Err:" + err.Error())
-			_ = to.Rollback()
+			to.Rollback()
 		} else {
-			_ = to.Commit()
+			to.Commit()
 		}
 	}()
 
@@ -143,15 +138,15 @@ func Calculate(varietyId int, sysUserId int, sysUserName string) (err error) {
 	varietyInfo.LastUpdateSysUserId = sysUserId
 	varietyInfo.LastUpdateSysUserRealName = sysUserName
 	varietyInfo.ModifyTime = time.Now()
-	_, err = to.Update(varietyInfo, "LastUpdateSysUserId", "LastUpdateSysUserRealName", "ModifyTime")
+	err = to.Model(varietyInfo).Select([]string{"LastUpdateSysUserId", "LastUpdateSysUserRealName", "ModifyTime"}).Updates(varietyInfo).Error
 
 	return
 }
 
-func calculateEdb(to orm.TxOrmer, varietyEdbInfo *VarietyEdbInfo, dataMap map[time.Time]float64, startDate, lastDate time.Time) (err error) {
+func calculateEdb(to *gorm.DB, varietyEdbInfo *VarietyEdbInfo, dataMap map[time.Time]float64, startDate, lastDate time.Time) (err error) {
 	sql := `SELECT * FROM base_from_stock_plant_data WHERE variety_edb_id = ? `
 	var list []*BaseFromStockPlantData
-	_, err = to.Raw(sql, varietyEdbInfo.VarietyEdbId).QueryRows(&list)
+	err = to.Raw(sql, varietyEdbInfo.VarietyEdbId).Scan(&list).Error
 	if err != nil {
 		return
 	}
@@ -218,7 +213,8 @@ func calculateEdb(to orm.TxOrmer, varietyEdbInfo *VarietyEdbInfo, dataMap map[ti
 				if existItem.Value != currVal {
 					existItem.Value = currVal
 					existItem.ModifyTime = time.Now()
-					_, err = to.Update(existItem, "Value", "ModifyTime")
+					//err = to.Model(existItem).Select([]string{"Value", "ModifyTime"}).Updates(existItem).Error
+					err = to.Model(existItem).Select([]string{"Value", "ModifyTime"}).Updates(existItem).Error
 					if err != nil {
 						return
 					}
@@ -279,7 +275,8 @@ func calculateEdb(to orm.TxOrmer, varietyEdbInfo *VarietyEdbInfo, dataMap map[ti
 				if existItem.Value != currVal {
 					existItem.Value = currVal
 					existItem.ModifyTime = time.Now()
-					_, err = to.Update(existItem, "Value", "ModifyTime")
+					//err = to.Model(existItem).Select([]string{"Value", "ModifyTime"}).Updates(existItem).Error
+					err = to.Model(existItem).Select([]string{"Value", "ModifyTime"}).Updates(existItem).Error
 					if err != nil {
 						return
 					}
@@ -329,7 +326,7 @@ func calculateEdb(to orm.TxOrmer, varietyEdbInfo *VarietyEdbInfo, dataMap map[ti
 				if existItem.Value != currVal {
 					existItem.Value = currVal
 					existItem.ModifyTime = time.Now()
-					_, err = to.Update(existItem, "Value", "ModifyTime")
+					err = to.Model(existItem).Select([]string{"Value", "ModifyTime"}).Updates(existItem).Error
 					if err != nil {
 						return
 					}
@@ -347,7 +344,7 @@ func calculateEdb(to orm.TxOrmer, varietyEdbInfo *VarietyEdbInfo, dataMap map[ti
 	// 需要添加的指标数据
 	lenAddList := len(addList)
 	if lenAddList > 0 {
-		_, err = to.InsertMulti(lenAddList, addList)
+		err = to.CreateInBatches(addList, 500).Error
 		if err != nil {
 			return
 		}
@@ -361,7 +358,7 @@ func calculateEdb(to orm.TxOrmer, varietyEdbInfo *VarietyEdbInfo, dataMap map[ti
 			deleteIdList = append(deleteIdList, v)
 		}
 		sql = ` DELETE FROM base_from_stock_plant_data WHERE stock_plant_data_id in (` + utils.GetOrmInReplace(lenDeleteIdMap) + `) `
-		_, err = to.Raw(sql, deleteIdList).Exec()
+		err = to.Exec(sql, deleteIdList).Error
 		if err != nil {
 			return
 		}
@@ -371,7 +368,7 @@ func calculateEdb(to orm.TxOrmer, varietyEdbInfo *VarietyEdbInfo, dataMap map[ti
 	varietyEdbInfo.EndDate = endDate
 	varietyEdbInfo.LatestValue = latestValue
 	varietyEdbInfo.ModifyTime = time.Now()
-	_, err = to.Update(varietyEdbInfo, "StartDate", "EndDate", "LatestValue", "ModifyTime")
-
+	//_, err = to.Update(varietyEdbInfo, "StartDate", "EndDate", "LatestValue", "ModifyTime")
+	err = to.Model(varietyEdbInfo).Select([]string{"StartDate", "EndDate", "LatestValue", "ModifyTime"}).Updates(varietyEdbInfo).Error
 	return
 }

models/supply_analysis/variety.go

@@ -1,67 +1,60 @@
 package supply_analysis
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
 // Variety variety 品种表
 type Variety struct {
-	VarietyId                 int       `orm:"column(variety_id);pk"`
-	VarietyName               string    `description:"品种名称"`
-	LastUpdateSysUserId       int       `description:"最后更新人id"`
-	LastUpdateSysUserRealName string    `description:"最后更新人名称"`
-	ProductionDay             int       `description:"生产天数"`
-	SysUserId                 int       `description:"创建人id"`
-	SysUserRealName           string    `description:"创建人姓名"`
-	ModifyTime                time.Time `description:"修改时间"`
-	CreateTime                time.Time `description:"创建时间"`
+	VarietyId                 int       `gorm:"primaryKey;autoIncrement;column:variety_id" description:"品种ID"`
+	VarietyName               string    `gorm:"column:variety_name" description:"品种名称"`
+	LastUpdateSysUserId       int       `gorm:"column:last_update_sys_user_id" description:"最后更新人id"`
+	LastUpdateSysUserRealName string    `gorm:"column:last_update_sys_user_real_name" description:"最后更新人名称"`
+	ProductionDay             int       `gorm:"column:production_day" description:"生产天数"`
+	SysUserId                 int       `gorm:"column:sys_user_id" description:"创建人id"`
+	SysUserRealName           string    `gorm:"column:sys_user_real_name" description:"创建人姓名"`
+	ModifyTime                time.Time `gorm:"column:modify_time" description:"修改时间"`
+	CreateTime                time.Time `gorm:"column:create_time" description:"创建时间"`
 }
 
 // GetVarietyById 根据品种id获取品种详情
 func GetVarietyById(id int) (item *Variety, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM variety WHERE variety_id = ?`
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 // GetVarietyByName 根据品种名称获取品种详情
 func GetVarietyByName(name string) (item *Variety, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM variety WHERE variety_name = ?`
-	err = o.Raw(sql, name).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, name).First(&item).Error
 	return
 }
 
 // AddVariety 添加品种
 func AddVariety(item *Variety) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
 // CreateVariety 添加品种
 func CreateVariety(item *Variety, adminIdList []int) (err error) {
-	to, err := orm.NewOrm().Begin()
-	if err != nil {
-		return
-	}
-
+	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
-			_ = to.Rollback()
+			to.Rollback()
 		} else {
-			_ = to.Commit()
+			to.Commit()
 		}
 	}()
-	lastId, err := to.Insert(item)
+	err = to.Create(item).Error
 	if err != nil {
 		return
 	}
-
-	item.VarietyId = int(lastId)
-
 	varietyAdminPermissionList := make([]*VarietyAdminPermission, 0)
 	for _, adminId := range adminIdList {
 		varietyAdminPermissionList = append(varietyAdminPermissionList, &VarietyAdminPermission{
@@ -72,7 +65,7 @@ func CreateVariety(item *Variety, adminIdList []int) (err error) {
 		})
 	}
 	if len(varietyAdminPermissionList) > 0 {
-		_, err = to.InsertMulti(len(varietyAdminPermissionList), varietyAdminPermissionList)
+		err = to.CreateInBatches(varietyAdminPermissionList, 500).Error
 	}
 
 	return
@@ -80,27 +73,22 @@ func CreateVariety(item *Variety, adminIdList []int) (err error) {
 
 // EditVariety 编辑品种
 func EditVariety(item *Variety, adminIdList []int) (err error) {
-	to, err := orm.NewOrm().Begin()
-	if err != nil {
-		return
-	}
-
+	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
-			_ = to.Rollback()
+			to.Rollback()
 		} else {
-			_ = to.Commit()
+			to.Commit()
 		}
 	}()
-
-	_, err = to.Update(item, "VarietyName", "LastUpdateSysUserId", "LastUpdateSysUserRealName", "ModifyTime")
+	err = to.Model(item).Select([]string{"VarietyName", "LastUpdateSysUserId", "LastUpdateSysUserRealName", "ModifyTime"}).Updates(item).Error
 	if err != nil {
 		return
 	}
 
 	// 删除历史的权限配置
 	sql := `DELETE FROM variety_admin_permission where variety_id = ? `
-	_, err = to.Raw(sql, item.VarietyId).Exec()
+	err = to.Exec(sql, item.VarietyId).Error
 	if err != nil {
 		return
 	}
@@ -116,7 +104,7 @@ func EditVariety(item *Variety, adminIdList []int) (err error) {
 		})
 	}
 	if len(varietyAdminPermissionList) > 0 {
-		_, err = to.InsertMulti(len(varietyAdminPermissionList), varietyAdminPermissionList)
+		err = to.CreateInBatches(varietyAdminPermissionList, 500).Error
 	}
 
 	return
@@ -124,7 +112,7 @@ func EditVariety(item *Variety, adminIdList []int) (err error) {
 
 // VarietyItem 列表页返回的数据结构
 type VarietyItem struct {
-	VarietyId                 int           `orm:"column(variety_id);pk"`
+	VarietyId                 int           `gorm:"primaryKey;autoIncrement;column:variety_id"`
 	VarietyName               string        `description:"品种名称"`
 	LastUpdateSysUserId       int           `description:"最后更新人id"`
 	LastUpdateSysUserRealName string        `description:"最后更新人名称"`
@@ -142,7 +130,7 @@ type VarietyButton struct {
 
 // GetListBySuperAdminPage 不区分是否有分析权限的获取分页数据
 func (item Variety) GetListBySuperAdminPage(condition string, pars []interface{}, startSize, pageSize int) (total int, items []*VarietyItem, err error) {
-	o := orm.NewOrm()
+
 	baseSql := ` FROM ( SELECT a.*, GROUP_CONCAT(DISTINCT b.sys_user_id ORDER BY b.sys_user_id ASC SEPARATOR ',') AS permission_user_id FROM variety a 
 				LEFT JOIN variety_admin_permission b on a.variety_id=b.variety_id 
 				LEFT JOIN variety_edb_info c on a.variety_id=c.variety_id WHERE 1=1 `
@@ -152,20 +140,20 @@ func (item Variety) GetListBySuperAdminPage(condition string, pars []interface{}
 	baseSql += ` GROUP BY a.variety_id ) d `
 	// 数据总数
 	totalSql := `SELECT COUNT(1) total ` + baseSql
-	err = o.Raw(totalSql, pars).QueryRow(&total)
+	err = global.DEFAULT_DmSQL.Raw(totalSql, pars).Scan(&total).Error
 	if err != nil {
 		return
 	}
 
 	// 列表页数据
 	listSql := `SELECT * ` + baseSql + ` ORDER BY modify_time DESC,variety_id DESC LIMIT ?,?`
-	_, err = o.Raw(listSql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(listSql, pars, startSize, pageSize).Scan(&items).Error
 	return
 }
 
 // GetListByPage 获取分页数据
 func (item Variety) GetListByPage(condition string, pars []interface{}, startSize, pageSize int) (total int, items []*VarietyItem, err error) {
-	o := orm.NewOrm()
+
 	baseSql := ` FROM ( SELECT a.*, GROUP_CONCAT(DISTINCT b.sys_user_id ORDER BY b.sys_user_id ASC SEPARATOR ',') AS permission_user_id FROM variety a 
 				JOIN variety_admin_permission b on a.variety_id=b.variety_id 
 				JOIN variety_edb_info c on a.variety_id=c.variety_id WHERE 1=1 `
@@ -175,41 +163,40 @@ func (item Variety) GetListByPage(condition string, pars []interface{}, startSiz
 	baseSql += ` GROUP BY a.variety_id ) d `
 	// 数据总数
 	totalSql := `SELECT COUNT(1) total ` + baseSql
-	err = o.Raw(totalSql, pars).QueryRow(&total)
+	err = global.DEFAULT_DmSQL.Raw(totalSql, pars).Scan(&total).Error
 	if err != nil {
 		return
 	}
 
 	// 列表页数据
 	listSql := `SELECT * ` + baseSql + ` ORDER BY modify_time DESC,variety_id DESC LIMIT ?,?`
-	_, err = o.Raw(listSql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(listSql, pars, startSize, pageSize).Scan(&items).Error
 	return
 }
 
 // Update 更基础信息
 func (variety *Variety) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(variety, cols...)
+	err = global.DEFAULT_DmSQL.Model(variety).Select(cols).Updates(variety).Error
 	return
 }
 
 // GetVarietyMaxSort 获取图表分类下最大的排序数
 func GetVarietyMaxSort(parentId int) (sort int, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT Max(sort) AS sort FROM future_good_chart_classify WHERE parent_id=? AND is_delete=0 `
-	err = o.Raw(sql, parentId).QueryRow(&sort)
+	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Scan(&sort).Error
 	return
 }
 
 type VarietyView struct {
-	VarietyId   int    `orm:"column(future_good_chart_classify_id);pk"`
+	VarietyId   int    `gorm:"primaryKey;autoIncrement;column:future_good_chart_classify_id"`
 	VarietyName string `description:"分类名称"`
 	ParentId    int    `description:"父级id"`
 }
 
 func GetVarietyViewById(classifyId int) (item *VarietyView, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM future_good_chart_classify WHERE future_good_chart_classify_id=? AND is_delete=0 `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, classifyId).First(&item).Error
 	return
 }

models/supply_analysis/variety_admin_permission.go

@@ -1,22 +1,22 @@
 package supply_analysis
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
 // VarietyAdminPermission variety_admin_permission 品种权限表
 type VarietyAdminPermission struct {
-	Id         int       `orm:"column(id);pk"`
-	VarietyId  int       `description:"品种id"`
-	SysUserId  int       `description:"用户id"`
-	CreateTime time.Time `description:"添加时间"`
+	Id         int       `gorm:"primaryKey;autoIncrement;column:id" description:"ID"`
+	VarietyId  int       `gorm:"column:variety_id" description:"品种id"`
+	SysUserId  int       `gorm:"column:sys_user_id" description:"用户id"`
+	CreateTime time.Time `gorm:"column:create_time" description:"添加时间"`
 }
 
 // GetVarietyPermissionByVarietyIdAndUserId 根据品种id和用户id获取权限记录表
 func GetVarietyPermissionByVarietyIdAndUserId(varietyId, sysUserId int) (item *VarietyAdminPermission, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM variety_admin_permission a  WHERE variety_id = ? AND sys_user_id = ? ORDER BY id desc `
-	err = o.Raw(sql, varietyId, sysUserId).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, varietyId, sysUserId).First(&item).Error
 	return
 }

models/supply_analysis/variety_edb_info.go

@@ -1,39 +1,39 @@
 package supply_analysis
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
 // VarietyEdbInfo variety_edb_info 品种指标表
 type VarietyEdbInfo struct {
-	VarietyEdbId int       `orm:"column(variety_edb_id);pk"`
-	VarietyId    int       `description:"品种id"`
-	EdbName      string    `description:"品种指标名称"`
-	Frequency    string    `description:"频度"`
-	StartDate    time.Time `description:"开始日期"`
-	EndDate      time.Time `description:"结束日期"`
-	LatestValue  float64   `description:"最新值"`
-	EdbInfoId    int       `description:"指标id"`
-	EdbCode      string    `description:"品种编码"`
-	Source       int       `description:"来源，1：影响周度产量；2：周度产量变动；3：影响月度产量；4：月度产量变动"`
-	ModifyTime   time.Time `description:"更新时间"`
-	CreateTime   time.Time `description:"添加时间"`
+	VarietyEdbId int       `gorm:"primaryKey;autoIncrement;column:variety_edb_id" description:"品种指标ID"`
+	VarietyId    int       `gorm:"column:variety_id" description:"品种id"`
+	EdbName      string    `gorm:"column:edb_name" description:"品种指标名称"`
+	Frequency    string    `gorm:"column:frequency" description:"频度"`
+	StartDate    time.Time `gorm:"column:start_date" description:"开始日期"`
+	EndDate      time.Time `gorm:"column:end_date" description:"结束日期"`
+	LatestValue  float64   `gorm:"column:latest_value" description:"最新值"`
+	EdbInfoId    int       `gorm:"column:edb_info_id" description:"指标id"`
+	EdbCode      string    `gorm:"column:edb_code" description:"品种编码"`
+	Source       int       `gorm:"column:source" description:"来源，1：影响周度产量；2：周度产量变动；3：影响月度产量；4：月度产量变动"`
+	ModifyTime   time.Time `gorm:"column:modify_time" description:"更新时间"`
+	CreateTime   time.Time `gorm:"column:create_time" description:"添加时间"`
 }
 
 // GetAllVarietyEdbInfoByVarietyId 根据品种id获取所有的指标
 func GetAllVarietyEdbInfoByVarietyId(varietyId int) (items []*VarietyEdbInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM variety_edb_info AS a WHERE a.variety_id = ? ORDER BY a.variety_edb_id ASC `
-	_, err = o.Raw(sql, varietyId).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, varietyId).Scan(&items).Error
 	return
 }
 
 // GetVarietyEdbInfoByEdbInfoId 根据ETA指标库中的指标id获取指标
 func GetVarietyEdbInfoByEdbInfoId(varietyId int) (item *VarietyEdbInfo, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM variety_edb_info AS a WHERE a.edb_info_id = ? ORDER BY a.variety_edb_id ASC `
-	err = o.Raw(sql, varietyId).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, varietyId).First(&item).Error
 
 	return
 }
@@ -45,33 +45,32 @@ func BatchCreateVarietyEdbInfo(list []*VarietyEdbInfo) (err error) {
 		return
 	}
 
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(num, list)
+	err = global.DEFAULT_DmSQL.CreateInBatches(list, 500).Error
 
 	return
 }
 
 // GetCountVarietyEdbByVarietyId 根据品种id获取添加到已经生成的指标数量（不管是否加入到ETA指标库）
 func GetCountVarietyEdbByVarietyId(varietyId int) (total int, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT count(1) total FROM variety_edb_info AS a WHERE a.variety_id = ?`
-	err = o.Raw(sql, varietyId).QueryRow(&total)
+	err = global.DEFAULT_DmSQL.Raw(sql, varietyId).Scan(&total).Error
 	return
 }
 
 // GetCountVarietyEdbInfoByVarietyId 根据品种id获取添加到ETA指标库的指标数量
 func GetCountVarietyEdbInfoByVarietyId(varietyId int) (total int, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT count(1) total FROM variety_edb_info AS a
 			JOIN edb_info b on a.edb_info_id=b.edb_info_id
 			WHERE a.variety_id = ? and a.edb_info_id >0`
-	err = o.Raw(sql, varietyId).QueryRow(&total)
+	err = global.DEFAULT_DmSQL.Raw(sql, varietyId).Scan(&total).Error
 	return
 }
 
 // VarietyEdbInfoItem 品种指标表（展示使用）
 type VarietyEdbInfoItem struct {
-	VarietyEdbId int                  `orm:"column(variety_edb_id);pk"`
+	VarietyEdbId int                  `gorm:"primaryKey;autoIncrement;column:variety_edb_id"`
 	VarietyId    int                  `description:"品种id"`
 	EdbName      string               `description:"品种指标名称"`
 	Frequency    string               `description:"频度"`
@@ -94,8 +93,8 @@ type VarietyEdbInfoButton struct {
 
 // GetAllVarietyEdbInfoItemByVarietyId 根据品种id获取所有的指标
 func GetAllVarietyEdbInfoItemByVarietyId(varietyId int) (items []*VarietyEdbInfoItem, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM variety_edb_info AS a WHERE a.variety_id = ? ORDER BY a.variety_edb_id ASC `
-	_, err = o.Raw(sql, varietyId).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, varietyId).Scan(&items).Error
 	return
 }

models/supply_analysis/variety_plant.go

@@ -1,69 +1,65 @@
 package supply_analysis
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
 // VarietyPlant variety_plant 品种装置表
 type VarietyPlant struct {
-	VarietyPlantId                int       `orm:"column(variety_plant_id);pk"`
-	VarietyId                     int       `description:"品种id"`
-	Province                      string    `description:"所属省份"`
-	City                          string    `description:"所属城市"`
-	FactoryName                   string    `description:"工厂名称"`
-	PlantName                     string    `description:"装置/产线名称"`
-	MaintenanceDate               time.Time `description:"检修日期"`
-	ResumptionDate                time.Time `description:"复产日期"`
-	AnnualCapacity                float64   `description:"年产能"`
-	Coefficient                   float64   `description:"降负系数"`
-	AverageDailyCapacityReduction float64   `description:"日均产量减量"`
-	IsStop                        int       `description:"是否停产，0：未停产；1：停产；默认未停产"`
-	Sort                          int       `description:"排序字段，越小越靠前"`
-	SysUserId                     int       `description:"添加人id"`
-	SysUserRealName               string    `description:"添加人真实姓名"`
-	ModifyTime                    time.Time `description:"最近一次更新时间"`
-	CreateTime                    time.Time `description:"添加时间"`
+	VarietyPlantId                int       `gorm:"primaryKey;autoIncrement;column:variety_plant_id" description:"品种装置ID"`
+	VarietyId                     int       `gorm:"column:variety_id" description:"品种id"`
+	Province                      string    `gorm:"column:province" description:"所属省份"`
+	City                          string    `gorm:"column:city" description:"所属城市"`
+	FactoryName                   string    `gorm:"column:factory_name" description:"工厂名称"`
+	PlantName                     string    `gorm:"column:plant_name" description:"装置/产线名称"`
+	MaintenanceDate               time.Time `gorm:"column:maintenance_date" description:"检修日期"`
+	ResumptionDate                time.Time `gorm:"column:resumption_date" description:"复产日期"`
+	AnnualCapacity                float64   `gorm:"column:annual_capacity" description:"年产能"`
+	Coefficient                   float64   `gorm:"column:coefficient" description:"降负系数"`
+	AverageDailyCapacityReduction float64   `gorm:"column:average_daily_capacity_reduction" description:"日均产量减量"`
+	IsStop                        int       `gorm:"column:is_stop" description:"是否停产，0：未停产；1：停产；默认未停产"`
+	Sort                          int       `gorm:"column:sort" description:"排序字段，越小越靠前"`
+	SysUserId                     int       `gorm:"column:sys_user_id" description:"添加人id"`
+	SysUserRealName               string    `gorm:"column:sys_user_real_name" description:"添加人真实姓名"`
+	ModifyTime                    time.Time `gorm:"column:modify_time" description:"最近一次更新时间"`
+	CreateTime                    time.Time `gorm:"column:create_time" description:"添加时间"`
 }
 
 // GetAllVarietyPlantByVarietyId 根据品种id获取所有的装置
 func GetAllVarietyPlantByVarietyId(varietyId int) (items []*VarietyPlant, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM variety_plant a  WHERE variety_id = ? ORDER BY variety_plant_id desc `
-	_, err = o.Raw(sql, varietyId).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, varietyId).Scan(&items).Error
 	return
 }
 
 // AddVarietyPlant 添加future_good_chart分类
 func AddVarietyPlant(item *VarietyPlant) (err error) {
-	o := orm.NewOrm()
-	lastId, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.VarietyPlantId = int(lastId)
+	err = global.DEFAULT_DmSQL.Create(item).Error
 
 	return
 }
 
 // Update 更新基础信息
 func (varietyPlant *VarietyPlant) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(varietyPlant, cols...)
+
+	//_, err = o.Update(varietyPlant, cols...)
+	err = global.DEFAULT_DmSQL.Model(varietyPlant).Select(cols).Updates(varietyPlant).Error
 	return
 }
 
 // GetVarietyPlantById 根据品种装置id获取品种装置详情
 func GetVarietyPlantById(id int) (item *VarietyPlant, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM variety_plant WHERE variety_plant_id = ?`
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 // VarietyPlantItem 品种装置数据（展示使用）
 type VarietyPlantItem struct {
-	VarietyPlantId                int                `orm:"column(variety_plant_id);pk"`
+	VarietyPlantId                int                `gorm:"primaryKey;autoIncrement;column:variety_plant_id"`
 	VarietyId                     int                `description:"品种id"`
 	Province                      string             `description:"所属省份"`
 	City                          string             `description:"所属城市"`
@@ -90,24 +86,24 @@ type VarietyPlantButton struct {
 
 // GetAllVarietyPlantItemByVarietyId 根据品种id获取所有的装置
 func GetAllVarietyPlantItemByVarietyId(varietyId int) (items []*VarietyPlantItem, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM variety_plant a  WHERE variety_id = ? ORDER BY variety_plant_id desc `
-	_, err = o.Raw(sql, varietyId).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, varietyId).Scan(&items).Error
 	return
 }
 
 // GetCountVarietyPlantByVarietyId 根据品种id获取所有的装置数量
 func GetCountVarietyPlantByVarietyId(varietyId int) (total int, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT count(1) total FROM variety_plant a  WHERE variety_id = ? `
-	err = o.Raw(sql, varietyId).QueryRow(&total)
+	err = global.DEFAULT_DmSQL.Raw(sql, varietyId).Scan(&total).Error
 	return
 }
 
 // DeleteVarietyPlantById 根据装置id删除
 func DeleteVarietyPlantById(id int) (err error) {
-	o := orm.NewOrm()
+
 	sql := `DELETE FROM variety_plant WHERE variety_plant_id = ?`
-	_, err = o.Raw(sql, id).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, id).Error
 	return
 }

models/trade_analysis/trade_analysis.go

@@ -1,9 +1,9 @@
 package trade_analysis
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -99,8 +99,7 @@ func GetExchangeClassify(exchange string) (list []TradeClassifyName, err error)
 	sql := "SELECT classify_name, classify_type FROM " + tableName + " WHERE `rank` <=20 and `rank` > 0 GROUP BY classify_name, classify_type  "
 	sql += ` ORDER BY ` + orderStr
 
-	o := orm.NewOrm()
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&list).Error
 
 	return
 }
@@ -113,8 +112,8 @@ type LastTimeItem struct {
 func GetExchangeLastTime(exchange string) (item LastTimeItem, err error) {
 	tableName := "base_from_trade_" + exchange + "_index"
 	sql := `SELECT create_time FROM ` + tableName + ` ORDER BY create_time desc`
-	o := orm.NewOrm()
-	err = o.Raw(sql).QueryRow(&item)
+
+	err = global.DEFAULT_DmSQL.Raw(sql).First(&item).Error
 
 	return
 }
@@ -156,8 +155,7 @@ func GetTradePositionTop(exchange string, classifyName, classifyType, dataTime s
 	tableName := "trade_position_" + exchange + "_top"
 	sql := `SELECT * FROM ` + tableName + " WHERE classify_name=? and classify_type=? and data_time=? and `rank` <=20 and `rank` > 0 ORDER BY deal_value desc"
 
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, classifyName, classifyType, dataTime).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, classifyName, classifyType, dataTime).Scan(&list).Error
 
 	return
 }
@@ -213,8 +211,8 @@ func GetTradeDataByClassifyAndCompany(exchange, classifyName string, contracts,
 			classify_name = ? AND classify_type IN (%s) AND sold_short_name IN (%s)
 		)`
 	sql = fmt.Sprintf(sql, tableName, utils.GetOrmInReplace(len(contracts)), utils.GetOrmInReplace(len(companies)), tableName, utils.GetOrmInReplace(len(contracts)), utils.GetOrmInReplace(len(companies)))
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, classifyName, contracts, companies, classifyName, contracts, companies).QueryRows(&items)
+
+	err = global.DEFAULT_DmSQL.Raw(sql, classifyName, contracts, companies, classifyName, contracts, companies).Scan(&items).Error
 	return
 }
 
@@ -256,8 +254,8 @@ func GetTradeZhengzhouDataByClassifyAndCompany(exchange string, contracts, compa
 			classify_name IN (%s) AND sold_short_name IN (%s)
 		)`
 	sql = fmt.Sprintf(sql, tableName, utils.GetOrmInReplace(len(contracts)), utils.GetOrmInReplace(len(companies)), tableName, utils.GetOrmInReplace(len(contracts)), utils.GetOrmInReplace(len(companies)))
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, contracts, companies, contracts, companies).QueryRows(&items)
+
+	err = global.DEFAULT_DmSQL.Raw(sql, contracts, companies, contracts, companies).Scan(&items).Error
 	return
 }
 
@@ -387,8 +385,8 @@ func GetLastTradeDataByClassify(exchange, classifyName string, contracts []strin
 			tpt.classify_name = ? AND tpt.classify_type IN (%s)
 		)`
 	sql = fmt.Sprintf(sql, tableName, tableName, contractReplacer, contractReplacer, tableName, tableName, contractReplacer, contractReplacer)
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, classifyName, contracts, classifyName, contracts, classifyName, contracts, classifyName, contracts).QueryRows(&items)
+
+	err = global.DEFAULT_DmSQL.Raw(sql, classifyName, contracts, classifyName, contracts, classifyName, contracts, classifyName, contracts).Scan(&items).Error
 	return
 }
 
@@ -453,13 +451,13 @@ func GetLastTradeZhengzhouDataByClassify(exchange string, contracts []string) (i
 			tpt.classify_name IN (%s)
 		)`
 	sql = fmt.Sprintf(sql, tableName, tableName, contractReplacer, contractReplacer, tableName, tableName, contractReplacer, contractReplacer)
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, contracts, contracts, contracts, contracts).QueryRows(&items)
+
+	err = global.DEFAULT_DmSQL.Raw(sql, contracts, contracts, contracts, contracts).Scan(&items).Error
 	return
 }
 
 type BaseFromTradeGuangzhouIndex struct {
-	BaseFromTradeGuangzhouIndexId    int       `orm:"column(base_from_trade_guangzhou_index_id);pk"`
+	BaseFromTradeGuangzhouIndexId    int       `gorm:"primaryKey;autoIncrement;column:base_from_trade_guangzhou_index_id"`
 	BaseFromTradeGuangzhouClassifyId int       `description:"分类id"`
 	IndexCode                        string    `description:"指标编码"`
 	IndexName                        string    `description:"指标名称"`
@@ -472,14 +470,14 @@ type BaseFromTradeGuangzhouIndex struct {
 }
 
 func GetBaseFromTradeGuangzhouIndexByClassifyId(classifyId int) (list []*BaseFromTradeGuangzhouIndex, err error) {
-	o := orm.NewOrm()
+
 	sql := `SELECT * FROM base_from_trade_guangzhou_index WHERE base_from_trade_guangzhou_classify_id = ?`
-	_, err = o.Raw(sql, classifyId).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, classifyId).Scan(&list).Error
 	return
 }
 
 type BaseFromTradeGuangzhouData struct {
-	BaseFromTradeGuangzhouDataId  int       `orm:"column(base_from_trade_guangzhou_data_id);pk"`
+	BaseFromTradeGuangzhouDataId  int       `gorm:"primaryKey;autoIncrement;column:base_from_trade_guangzhou_data_id"`
 	BaseFromTradeGuangzhouIndexId int       `description:"指标id"`
 	IndexCode                     string    `description:"指标编码"`
 	DataTime                      time.Time `description:"数据日期"`
@@ -494,9 +492,9 @@ func GetBaseFromTradeGuangzhouDataByIndexIds(indexIds []int) (list []*BaseFromTr
 	if len(indexIds) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT * FROM base_from_trade_guangzhou_data WHERE base_from_trade_guangzhou_index_id IN (%s) ORDER BY base_from_trade_guangzhou_index_id`, utils.GetOrmInReplace(len(indexIds)))
-	_, err = o.Raw(sql, indexIds).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexIds).Scan(&list).Error
 	return
 }
 
@@ -506,7 +504,7 @@ func GetBaseFromTradeGuangzhouMinDataByIndexIds(indexIds []int) (list []*BaseFro
 	if indexLen == 0 {
 		return
 	}
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT 
 			t1.data_time,
 			t1.min_value AS value
@@ -528,6 +526,6 @@ func GetBaseFromTradeGuangzhouMinDataByIndexIds(indexIds []int) (list []*BaseFro
 			t1.data_time = t2.data_time AND t1.min_value = t2.value AND t2.base_from_trade_guangzhou_index_id IN (%s)
 		GROUP BY 
 			t1.data_time`, utils.GetOrmInReplace(indexLen), utils.GetOrmInReplace(indexLen))
-	_, err = o.Raw(sql, indexIds, indexIds).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexIds, indexIds).Scan(&list).Error
 	return
 }

models/trade_analysis/trade_futures_company.go

@@ -1,8 +1,8 @@
 package trade_analysis
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -11,17 +11,17 @@ const TradeFuturesCompanyTop20 = "TOP20"
 
 // TradeFuturesCompany 期货公司表
 type TradeFuturesCompany struct {
-	TradeFuturesCompanyId int       `orm:"column(trade_futures_company_id);pk"`
-	CompanyName           string    `description:"标准公司名称"`
-	ZhengzhouName         string    `description:"郑商所下的名称"`
-	DalianName            string    `description:"大商所下的名称"`
-	ShanghaiName          string    `description:"上期所下的名称"`
-	IneName               string    `description:"上期能源下的名称"`
-	GuangzhouName         string    `description:"广期所下的名称"`
-	CffexName             string    `description:"中金所下的名称"`
-	Sort                  int       `description:"排序"`
-	CreateTime            time.Time `description:"创建时间"`
-	ModifyTime            time.Time `description:"修改时间"`
+	TradeFuturesCompanyId int       `gorm:"primaryKey;autoIncrement;column:trade_futures_company_id" description:"标准公司名称ID"`
+	CompanyName           string    `gorm:"column:company_name" description:"标准公司名称"`
+	ZhengzhouName         string    `gorm:"column:zhengzhou_name" description:"郑商所下的名称"`
+	DalianName            string    `gorm:"column:dalian_name" description:"大商所下的名称"`
+	ShanghaiName          string    `gorm:"column:shanghai_name" description:"上期所下的名称"`
+	IneName               string    `gorm:"column:ine_name" description:"上期能源下的名称"`
+	GuangzhouName         string    `gorm:"column:guangzhou_name" description:"广期所下的名称"`
+	CffexName             string    `gorm:"column:cffex_name" description:"中金所下的名称"`
+	Sort                  int       `gorm:"column:sort" description:"排序"`
+	CreateTime            time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime            time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 func (m *TradeFuturesCompany) TableName() string {
@@ -59,32 +59,32 @@ func (m *TradeFuturesCompany) Cols() TradeFuturesCompanyCols {
 }
 
 func (m *TradeFuturesCompany) GetItemById(id int) (item *TradeFuturesCompany, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *TradeFuturesCompany) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *TradeFuturesCompany, err error) {
-	o := orm.NewOrm()
+
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *TradeFuturesCompany) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func (m *TradeFuturesCompany) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*TradeFuturesCompany, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -94,12 +94,12 @@ func (m *TradeFuturesCompany) GetItemsByCondition(condition string, pars []inter
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
 	return
 }
 
 func (m *TradeFuturesCompany) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*TradeFuturesCompany, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -109,7 +109,7 @@ func (m *TradeFuturesCompany) GetPageItemsByCondition(condition string, pars []i
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
 	return
 }
 

models/trade_analysis/warehouse.go

@@ -2,13 +2,13 @@ package trade_analysis
 
 // WarehouseExtraConfig 建仓图表配置
 type WarehouseExtraConfig struct {
-	MultipleGraphConfigId int      `description:"多图配置ID"`
-	WarehouseChartType    int      `description:"图表类型: 1-多单图; 2-空单图; 3-净多单图"`
-	Exchange              string   `description:"交易所标识"`
-	ClassifyName          string   `description:"品种名称"`
-	Contracts             []string `description:"合约代码"`
-	Companies             []string `description:"期货公司, 不超过5个"`
-	PredictRatio          float64  `description:"预估参数, 0-1之间"`
+	MultipleGraphConfigId int      `gorm:"primaryKey;autoIncrement;column:multiple_graph_config_id" description:"多图配置ID"`
+	WarehouseChartType    int      `gorm:"column:warehouse_chart_type" description:"图表类型: 1-多单图; 2-空单图; 3-净多单图"`
+	Exchange              string   `gorm:"column:exchange" description:"交易所标识"`
+	ClassifyName          string   `gorm:"column:classify_name" description:"品种名称"`
+	Contracts             []string `gorm:"-" description:"合约代码"`        // 通常不直接映射slice到数据库列
+	Companies             []string `gorm:"-" description:"期货公司, 不超过5个"` // 同上
+	PredictRatio          float64  `gorm:"column:predict_ratio" description:"预估参数, 0-1之间"`
 }
 
 // WarehouseChartPars 建仓单表配置

utils/common.go

@@ -215,7 +215,8 @@ func GetToken() string {
 
 // 数据没有记录
 func ErrNoRow() string {
-	return "<QuerySeter> no row found"
+	//return "<QuerySeter> no row found"
+	return "record not found"
 }
 
 // 判断文件是否存在