fix

models/base_from_icpi.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"
 	"strconv"
 	"strings"
 	"time"
@@ -21,14 +21,28 @@ type BaseFromIcpiIndex struct {
 	ModifyTime             time.Time `description:"修改时间"`
 }
 
+//	type BaseFromIcpiData struct {
+//		BaseFromIcpiDataId  int       `orm:"column(base_from_icpi_data_id);pk"`
+//		BaseFromIcpiIndexId int       `description:"指标id"`
+//		IndexCode           string    `description:"指标编码"`
+//		DataTime            string    `description:"日期"`
+//		Value               string    `description:"值"`
+//		CreateTime          time.Time `description:"创建时间"`
+//		ModifyTime          time.Time `description:"修改时间"`
+//	}
+
 type BaseFromIcpiData struct {
-	BaseFromIcpiDataId  int       `orm:"column(base_from_icpi_data_id);pk"`
-	BaseFromIcpiIndexId int       `description:"指标id"`
-	IndexCode           string    `description:"指标编码"`
-	DataTime            string    `description:"日期"`
-	Value               string    `description:"值"`
-	CreateTime          time.Time `description:"创建时间"`
-	ModifyTime          time.Time `description:"修改时间"`
+	BaseFromIcpiDataId  int       `gorm:"column:base_from_icpi_data_id;primaryKey" description:"数据ID"`
+	BaseFromIcpiIndexId int       `gorm:"column:base_from_icpi_index_id" description:"指标id"`
+	IndexCode           string    `gorm:"column:index_code" description:"指标编码"`
+	DataTime            string    `gorm:"column:data_time" description:"日期"`
+	Value               string    `gorm:"column:value" description:"值"`
+	CreateTime          time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime          time.Time `gorm:"column:modify_time" description:"修改时间"`
+}
+
+func (m *BaseFromIcpiData) TableName() string {
+	return "base_from_icpi_data"
 }
 
 type BaseFromIcpiClassify struct {
@@ -41,26 +55,28 @@ type BaseFromIcpiClassify struct {
 }
 
 func GetBaseFromIcpiDataByIndexCode(indexCode string) (items []*BaseFromIcpiData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_icpi_data WHERE index_code=? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&items).Error
 	return
 }
 
 func GetBaseFromIcpiDataDataByCondition(condition string, pars []interface{}) (item []*BaseFromIcpiData, err error) {
 	sql := ` SELECT * FROM base_from_icpi_data WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY data_time DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
 	return
 }
 
 // 新增广期所指标数据
 func AddEdbDataFromIcpi(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	dataAll, err := GetBaseFromIcpiDataByIndexCode(edbCode)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		return
@@ -87,7 +103,8 @@ func AddEdbDataFromIcpi(edbCode string) (err error) {
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -100,7 +117,7 @@ func RefreshEdbDataFromIcpi(edbInfoId int, edbCode, startDate string) (err error
 	source := utils.DATA_SOURCE_ICPI
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -205,7 +222,8 @@ func RefreshEdbDataFromIcpi(edbInfoId int, edbCode, startDate string) (err error
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}

models/base_from_jiayue.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"
 	"strconv"
 	"strings"
 	"time"
@@ -103,8 +103,9 @@ func AddEdbDataFromJiaYue(tableName, edbCode string, dataList []BridgeJiaYueInde
 	sql = strings.TrimRight(sql, ",")
 
 	// 新增入库
-	o := orm.NewOrm()
-	_, e := o.Raw(sql).Exec()
+	//o := orm.NewOrm()
+	//_, e := o.Raw(sql).Exec()
+	e := global.DEFAULT_DmSQL.Exec(sql).Error
 	if e != nil {
 		err = fmt.Errorf("insert data err: %s", e.Error())
 	}
@@ -217,9 +218,10 @@ func RefreshEdbDataFromJiaYue(source, subSource, edbInfoId int, tableName, edbCo
 	if !hasNew {
 		return
 	}
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sqlInsert = strings.TrimRight(sqlInsert, ",")
-	_, e = o.Raw(sqlInsert).Exec()
+	//_, e = o.Raw(sqlInsert).Exec()
+	e = global.DEFAULT_DmSQL.Exec(sqlInsert).Error
 	if e != nil {
 		err = fmt.Errorf("insert edb data err: %s", e.Error())
 		return

models/base_from_lt.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"
 	"reflect"
 	"strconv"
 	"strings"
@@ -14,7 +14,7 @@ import (
 
 // 新增路透指标数据
 func AddEdbDataFromLt(edbCode string, ltDataList map[int64]interface{}) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if len(ltDataList) > 0 {
 		var isAdd bool
 		addSql := ` INSERT INTO edb_data_lt(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
@@ -42,7 +42,8 @@ func AddEdbDataFromLt(edbCode string, ltDataList map[int64]interface{}) (err err
 		}
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
-			_, err = o.Raw(addSql).Exec()
+			//_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DmSQL.Exec(addSql).Error
 			if err != nil {
 				fmt.Println("RefreshAllEdbDataByPb add Err", err.Error())
 				return
@@ -57,7 +58,7 @@ func RefreshEdbDataFromLt(edbInfoId int, edbCode, startDate string, ltDataList m
 	source := utils.DATA_SOURCE_LT
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	// 真实数据的最大日期  ， 插入规则配置的日期
 	var realDataMaxDate, edbDataInsertConfigDate time.Time
@@ -148,7 +149,8 @@ func RefreshEdbDataFromLt(edbInfoId int, edbCode, startDate string, ltDataList m
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshAllEdbDataByLt add Err", err.Error())
 			return

models/base_from_ly_classify.go

@@ -3,28 +3,43 @@ package models
 
 import (
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"github.com/beego/beego/v2/client/orm"
 )
 
+//type BaseFromLyClassify struct {
+//	BaseFromLyClassifyId int    `orm:"column(base_from_ly_classify_id);pk"` // 分类ID
+//	CreateTime           string `orm:"column(create_time)"`                 // 创建时间
+//	ModifyTime           string `orm:"column(modify_time)"`                 // 修改时间
+//	ClassifyName         string `orm:"column(classify_name)"`               // 分类名称
+//	ParentId             int    `orm:"column(parent_id)"`                   // 上级id
+//	Sort                 int    `orm:"column(sort)"`                        // 排序字段，越小越靠前
+//	ClassifyNameEn       string `orm:"column(classify_name_en)"`            // 英文分类名称
+//}
+
 type BaseFromLyClassify struct {
-	BaseFromLyClassifyId int    `orm:"column(base_from_ly_classify_id);pk"` // 分类ID
-	CreateTime           string `orm:"column(create_time)"`                 // 创建时间
-	ModifyTime           string `orm:"column(modify_time)"`                 // 修改时间
-	ClassifyName         string `orm:"column(classify_name)"`               // 分类名称
-	ParentId             int    `orm:"column(parent_id)"`                   // 上级id
-	Sort                 int    `orm:"column(sort)"`                        // 排序字段，越小越靠前
-	ClassifyNameEn       string `orm:"column(classify_name_en)"`            // 英文分类名称
+	BaseFromLyClassifyId int    `gorm:"column:base_from_ly_classify_id;primaryKey"` // 分类ID
+	CreateTime           string `gorm:"column:create_time"`                         // 创建时间
+	ModifyTime           string `gorm:"column:modify_time"`                         // 修改时间
+	ClassifyName         string `gorm:"column:classify_name"`                       // 分类名称
+	ParentId             int    `gorm:"column:parent_id"`                           // 上级id
+	Sort                 int    `gorm:"column:sort"`                                // 排序字段，越小越靠前
+	ClassifyNameEn       string `gorm:"column:classify_name_en"`                    // 英文分类名称
 }
 
+func (m *BaseFromLyClassify) TableName() string {
+	return "base_from_ly_classify"
+}
 func init() {
 	orm.RegisterModel(new(BaseFromLyClassify))
 }
 
 // GetLyClassifyByName 根据分类名称查询
 func GetLyClassifyByName(classifyName string) (item *BaseFromLyClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_ly_classify WHERE classify_name=?`
-	err = o.Raw(sql, classifyName).QueryRow(&item)
+	//err = o.Raw(sql, classifyName).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, classifyName).First(&item).Error
 	if errors.Is(err, orm.ErrNoRows) {
 		return nil, nil
 	}

models/base_from_ly_data.go

@@ -3,17 +3,32 @@ package models
 
 import (
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"github.com/beego/beego/v2/client/orm"
 )
 
+//type BaseFromLyData struct {
+//	BaseFromLyDataId  int     `orm:"column(base_from_ly_data_id);pk"` // 数据ID
+//	CreateTime        string  `orm:"column(create_time)"`             // 创建时间
+//	ModifyTime        string  `orm:"column(modify_time)"`             // 修改时间
+//	BaseFromLyIndexId int     `orm:"column(base_from_ly_index_id)"`   // 指标id
+//	IndexCode         string  `orm:"column(index_code)"`              // 指标编码
+//	DataTime          string  `orm:"column(data_time)"`               // 数据日期
+//	Value             float64 `orm:"column(value)"`                   // 数据值
+//}
+
 type BaseFromLyData struct {
-	BaseFromLyDataId  int     `orm:"column(base_from_ly_data_id);pk"` // 数据ID
-	CreateTime        string  `orm:"column(create_time)"`             // 创建时间
-	ModifyTime        string  `orm:"column(modify_time)"`             // 修改时间
-	BaseFromLyIndexId int     `orm:"column(base_from_ly_index_id)"`   // 指标id
-	IndexCode         string  `orm:"column(index_code)"`              // 指标编码
-	DataTime          string  `orm:"column(data_time)"`               // 数据日期
-	Value             float64 `orm:"column(value)"`                   // 数据值
+	BaseFromLyDataId  int       `gorm:"column:base_from_ly_data_id;primaryKey"` // 数据ID
+	CreateTime        string `gorm:"column:create_time"`                        // 创建时间
+	ModifyTime        string `gorm:"column:modify_time"`                        // 修改时间
+	BaseFromLyIndexId int       `gorm:"column:base_from_ly_index_id"`             // 指标id
+	IndexCode         string    `gorm:"column:index_code"`                         // 指标编码
+	DataTime          string    `gorm:"column:data_time"`                          // 数据日期
+	Value             float64   `gorm:"column:value"`                              // 数据值
+}
+
+func (m *BaseFromLyData) TableName() string {
+	return "base_from_ly_data"
 }
 
 func init() {
@@ -22,16 +37,18 @@ func init() {
 
 // AddLyDataList 批量插入数据记录列表
 func AddLyDataList(items []BaseFromLyData) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(len(items), items)
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
 	return
 }
 
 // GetLyDataByIndexIdAndDataTime 根据指标id和数据日期查询数据
 func GetLyDataByIndexIdAndDataTime(indexId int, dataTime string) (items []BaseFromLyData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_ly_data WHERE base_from_ly_index_id=? AND data_time=?`
-	_, err = o.Raw(sql, indexId, dataTime).QueryRows(&items)
+	//_, err = o.Raw(sql, indexId, dataTime).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexId, dataTime).Find(&items).Error
 	if errors.Is(err, orm.ErrNoRows) {
 		return nil, nil
 	}
@@ -40,9 +57,10 @@ func GetLyDataByIndexIdAndDataTime(indexId int, dataTime string) (items []BaseFr
 
 // GetLyDataByIndexIdAndDataTimeYM 根据指标id和数据日期的年月查询数据
 func GetLyDataByIndexIdAndDataTimeYM(indexId int, dataTime string) (items []BaseFromLyData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_ly_data WHERE base_from_ly_index_id=? AND data_time like ?`
-	_, err = o.Raw(sql, indexId, dataTime+"%").QueryRows(&items)
+	//_, err = o.Raw(sql, indexId, dataTime+"%").QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexId, dataTime+"%").Find(&items).Error
 	if errors.Is(err, orm.ErrNoRows) {
 		return nil, nil
 	}
@@ -51,20 +69,22 @@ func GetLyDataByIndexIdAndDataTimeYM(indexId int, dataTime string) (items []Base
 
 // UpdateLyDataById 根据主键id更新数据
 func UpdateLyDataById(dataId int, value float64) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_ly_data SET value=? WHERE base_from_ly_data_id=?`
-	_, err = o.Raw(sql, value, dataId).Exec()
+	//_, err = o.Raw(sql, value, dataId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, value, dataId).Error
 	return
 }
 
 // GetBaseFromLyDataByIndexCode 根据指标编码查询
 func GetBaseFromLyDataByIndexCode(condition string, pars []interface{}) (items []BaseFromLyData, err error) {
 	sql := `SELECT * FROM base_from_ly_data WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars...).QueryRows(&items)
+	//_, err = o.Raw(sql, pars...).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	if errors.Is(err, orm.ErrNoRows) {
 		return nil, nil
 	}

models/base_from_ly_index.go

@@ -4,20 +4,37 @@ package models
 
 import (
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
+//type BaseFromLyIndex struct {
+//	BaseFromLyIndexId    int    `orm:"column(base_from_ly_index_id);pk"` // 指标ID
+//	CreateTime           string `orm:"column(create_time)"`              // 创建时间
+//	ModifyTime           string `orm:"column(modify_time)"`              // 修改时间
+//	BaseFromLyClassifyId int    `orm:"column(base_from_ly_classify_id)"` // 原始数据指标分类id
+//	IndexCode            string `orm:"column(index_code)"`               // 指标编码
+//	IndexName            string `orm:"column(index_name)"`               // 指标名称
+//	Frequency            string `orm:"column(frequency)"`                // 频度
+//	Unit                 string `orm:"column(unit)"`                     // 单位
+//	EdbExist             int    `orm:"column(edb_exist)"`                // 指标库是否已添加：0-否；1-是
+//}
+
 type BaseFromLyIndex struct {
-	BaseFromLyIndexId    int    `orm:"column(base_from_ly_index_id);pk"` // 指标ID
-	CreateTime           string `orm:"column(create_time)"`              // 创建时间
-	ModifyTime           string `orm:"column(modify_time)"`              // 修改时间
-	BaseFromLyClassifyId int    `orm:"column(base_from_ly_classify_id)"` // 原始数据指标分类id
-	IndexCode            string `orm:"column(index_code)"`               // 指标编码
-	IndexName            string `orm:"column(index_name)"`               // 指标名称
-	Frequency            string `orm:"column(frequency)"`                // 频度
-	Unit                 string `orm:"column(unit)"`                     // 单位
-	EdbExist             int    `orm:"column(edb_exist)"`                // 指标库是否已添加：0-否；1-是
+	BaseFromLyIndexId    int    `gorm:"column:base_from_ly_index_id;primaryKey"` // 指标ID
+	CreateTime           string `gorm:"column:create_time"`                      // 创建时间
+	ModifyTime           string `gorm:"column:modify_time"`                      // 修改时间
+	BaseFromLyClassifyId int    `gorm:"column:base_from_ly_classify_id"`         // 原始数据指标分类id
+	IndexCode            string `gorm:"column:index_code"`                       // 指标编码
+	IndexName            string `gorm:"column:index_name"`                       // 指标名称
+	Frequency            string `gorm:"column:frequency"`                        // 频度
+	Unit                 string `gorm:"column:unit"`                             // 单位
+	EdbExist             int    `gorm:"column:edb_exist"`                        // 指标库是否已添加：0-否；1-是
+}
+
+func (m *BaseFromLyIndex) TableName() string {
+	return "base_from_ly_index"
 }
 
 // 在 init 函数中注册模型
@@ -27,27 +44,30 @@ func init() {
 
 // AddLyIndexList 批量插入指标记录列表
 func AddLyIndexList(items []*BaseFromLyIndex) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(len(items), items)
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
 	return
 }
 
 // AddLyIndex 添加指标
 func AddLyIndex(item *BaseFromLyIndex) (int64, error) {
 	item.CreateTime = time.Now().Format("2006-01-02 15:04:05")
-	o := orm.NewOrm()
-	id, err := o.Insert(item)
+	//o := orm.NewOrm()
+	//id, err := o.Insert(item)
+	err := global.DEFAULT_DmSQL.Create(item).Error
 	if err != nil {
 		return 0, err
 	}
-	return id, nil
+	return int64(item.BaseFromLyIndexId), nil
 }
 
 // GetLyIndexByCode 查询指标编码是否存在
 func GetLyIndexByCode(indexCode string) (item *BaseFromLyIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_ly_index WHERE index_code=?`
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Scan(&item).Error
 
 	if errors.Is(err, orm.ErrNoRows) {
 		return nil, nil

models/base_from_ly_index_record.go

@@ -4,17 +4,32 @@ package models
 
 import (
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"github.com/beego/beego/v2/client/orm"
 )
 
+//type BaseFromLyIndexRecord struct {
+//	BaseFromLyIndexRecordId int    `orm:"column(base_from_ly_index_record_id);pk"` // 指标记录ID
+//	CreateTime              string `orm:"column(create_time)"`                     // 创建时间
+//	ModifyTime              string `orm:"column(modify_time)"`                     // 修改时间
+//	Product                 string `orm:"column(product)"`                         // 产品
+//	Category                string `orm:"column(category)"`                        // 分类
+//	Url                     string `orm:"column(url)"`                             // 指标页面地址
+//	DataTime                string `orm:"column(data_time)"`                       // 数据日期
+//}
+
 type BaseFromLyIndexRecord struct {
-	BaseFromLyIndexRecordId int    `orm:"column(base_from_ly_index_record_id);pk"` // 指标记录ID
-	CreateTime              string `orm:"column(create_time)"`                     // 创建时间
-	ModifyTime              string `orm:"column(modify_time)"`                     // 修改时间
-	Product                 string `orm:"column(product)"`                         // 产品
-	Category                string `orm:"column(category)"`                        // 分类
-	Url                     string `orm:"column(url)"`                             // 指标页面地址
-	DataTime                string `orm:"column(data_time)"`                       // 数据日期
+	BaseFromLyIndexRecordId int    `gorm:"column:base_from_ly_index_record_id;primaryKey"` // 指标记录ID
+	CreateTime              string `gorm:"column:create_time"`                             // 创建时间
+	ModifyTime              string `gorm:"column:modify_time"`                             // 修改时间
+	Product                 string `gorm:"column:product"`                                 // 产品
+	Category                string `gorm:"column:category"`                                // 分类
+	Url                     string `gorm:"column:url"`                                     // 指标页面地址
+	DataTime                string `gorm:"column:data_time"`                               // 数据日期
+}
+
+func (m *BaseFromLyIndexRecord) TableName() string {
+	return "base_from_ly_index_record"
 }
 
 // 在 init 函数中注册模型
@@ -24,19 +39,21 @@ func init() {
 
 // AddLyIndexRecord 添加指标记录
 func AddLyIndexRecord(item *BaseFromLyIndexRecord) (int64, error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(item)
+	//o := orm.NewOrm()
+	//id, err := o.Insert(item)
+	err := global.DEFAULT_DmSQL.Create(item).Error
 	if err != nil {
 		return 0, err
 	}
-	return id, nil
+	return int64(item.BaseFromLyIndexRecordId), nil
 }
 
 // GetLyIndexRecordByUrl 查询指标记录是否存在
 func GetLyIndexRecordByUrl(url string) (item *BaseFromLyIndexRecord, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_ly_index_record WHERE url=?`
-	err = o.Raw(sql, url).QueryRow(&item)
+	//err = o.Raw(sql, url).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, url).Scan(&item).Error
 
 	if errors.Is(err, orm.ErrNoRows) {
 		return nil, nil

models/base_from_lz.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"
 	"strconv"
 	"strings"
 	"time"
@@ -11,27 +11,37 @@ import (
 
 //隆众
 
+//type lzSurveyData struct {
+//	DataTime   string `orm:"column(data_time)" description:"日期"`
+//	InputValue string `orm:"column(input_value)" description:"值"`
+//}
+
 type lzSurveyData struct {
-	DataTime   string `orm:"column(data_time)" description:"日期"`
-	InputValue string `orm:"column(input_value)" description:"值"`
+	DataTime   string `gorm:"column:data_time" description:"日期"`
+	InputValue string `gorm:"column:input_value" description:"值"`
+}
+
+func (m *lzSurveyData) TableName() string {
+	return "longzhong_survey_data"
 }
 
 func GetLzSurveyDataFromLz(condition string, pars []interface{}) (item []*lzSurveyData, err error) {
 	sql := ` SELECT  a.* FROM longzhong_survey_data AS a
 				INNER JOIN longzhong_survey_product AS b ON a.survey_product_id=b.survey_product_id
 				WHERE 1=1 `
-	o := orm.NewOrmUsingDB("edb")
+	//o := orm.NewOrmUsingDB("edb")
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` GROUP BY data_time ORDER BY a.data_time DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DmSQL["edb"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 // 新增钢联指标数据
 func AddEdbDataFromLz(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -66,7 +76,8 @@ func AddEdbDataFromLz(edbCode string) (err error) {
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
 			utils.FileLog.Info("addSql:" + addSql)
-			_, err = o.Raw(addSql).Exec()
+			//_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DmSQL.Exec(addSql).Error
 			if err != nil {
 				return err
 			}
@@ -80,7 +91,7 @@ func RefreshEdbDataFromLz(edbInfoId int, edbCode, startDate string) (err error)
 	source := utils.DATA_SOURCE_LZ
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	// 真实数据的最大日期  ， 插入规则配置的日期
 	var realDataMaxDate, edbDataInsertConfigDate time.Time
@@ -174,7 +185,8 @@ func RefreshEdbDataFromLz(edbInfoId int, edbCode, startDate string) (err error)
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}

models/base_from_manual.go

@@ -1,10 +1,10 @@
 package models
 
 import (
+	"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"
 	"strconv"
@@ -14,11 +14,22 @@ import (
 
 //弘则手工数据
 
+//type ManualEdbdata struct {
+//	TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
+//	Dt         string    `orm:"column(DT)" description:"日期"`
+//	Close      string    `orm:"column(CLOSE)" description:"值"`
+//	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`
+//}
+
 type ManualEdbdata struct {
-	TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
-	Dt         string    `orm:"column(DT)" description:"日期"`
-	Close      string    `orm:"column(CLOSE)" description:"值"`
-	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`
+	TradeCode  string    `gorm:"column:TRADE_CODE;primaryKey" description:"指标编码"`
+	Dt         string    `gorm:"column:DT" description:"日期"`
+	Close      string    `gorm:"column:CLOSE" description:"值"`
+	ModifyTime time.Time `gorm:"column:modify_time" description:"修改时间"`
+}
+
+func (m *ManualEdbdata) TableName() string {
+	return "edb_data_manual"
 }
 
 func GetEdbdataManualByCondition(condition string, pars []interface{}) (item []*ManualEdbdata, err error) {
@@ -27,14 +38,15 @@ func GetEdbdataManualByCondition(condition string, pars []interface{}) (item []*
 		sql += condition
 	}
 	sql += ` ORDER BY DT DESC `
-	o := orm.NewOrmUsingDB("edb")
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//o := orm.NewOrmUsingDB("edb")
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DmSQL["edb"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 // AddEdbDataFromManual 新增弘则手工指标数据
 func AddEdbDataFromManual(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -74,7 +86,8 @@ func AddEdbDataFromManual(edbCode string) (err error) {
 		}
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
-			_, err = o.Raw(addSql).Exec()
+			//_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DmSQL.Exec(addSql).Error
 			if err != nil {
 				return
 			}
@@ -88,7 +101,7 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err err
 	source := utils.DATA_SOURCE_MANUAL
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -208,7 +221,8 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err err
 	}
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshAllEdbDataByManual add Err", err.Error())
 			return
@@ -254,9 +268,10 @@ func HandleConfigInsertEdbData(realDataMaxDate time.Time, edbDataInsertConfig *E
 			DeleteEdbDataById(source, subSource, item.EdbDataId)
 		}
 	} else {
-		o := orm.NewOrm()
+		//o := orm.NewOrm()
 		edbDataInsertConfig.RealDate = realDataMaxDate
-		_, err = o.Update(edbDataInsertConfig, "RealDate")
+		//_, err = o.Update(edbDataInsertConfig, "RealDate")
+		err = global.DEFAULT_DmSQL.Model(&EdbDataInsertConfig{}).Where("edb_info_id=?", edbInfoId).Update("RealDate", realDataMaxDate).Error
 	}
 
 	return
@@ -298,9 +313,10 @@ func HandleConfigInsertEdbDataByMongo(realDataMaxDate time.Time, edbDataInsertCo
 			mogDataObj.RemoveManyByColl(coll, bson.M{"_id": item.ID})
 		}
 	} else {
-		o := orm.NewOrm()
+		//o := orm.NewOrm()
 		edbDataInsertConfig.RealDate = realDataMaxDate
-		_, err = o.Update(edbDataInsertConfig, "RealDate")
+		//_, err = o.Update(edbDataInsertConfig, "RealDate")
+		err = global.DEFAULT_DmSQL.Model(&EdbDataInsertConfig{}).Where("edb_info_id=?", edbInfoId).Update("RealDate", realDataMaxDate).Error
 	}
 
 	return

models/base_from_mtjh.go

@@ -1,92 +1,135 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
 )
 
+//type BaseFromMtjhMapping struct {
+//	BaseFromMtjhMappingId int       `orm:"column(base_from_Mtjh_mapping_id);pk"`
+//	IndexName             string    `description:"持买单量指标名称"`
+//	IndexCode             string    `description:"持买单量指标编码"`
+//	CreateTime            time.Time `description:"时间"`
+//	Area                  string    `description:"区域"`
+//	Port                  string    `description:"港口或码头"`
+//	Variety               string    `description:"品种"`
+//	Unit                  string    `description:"单位"`
+//	Frequency             string    `description:"频率"`
+//}
 type BaseFromMtjhMapping struct {
-	BaseFromMtjhMappingId int       `orm:"column(base_from_Mtjh_mapping_id);pk"`
-	IndexName             string    `description:"持买单量指标名称"`
-	IndexCode             string    `description:"持买单量指标编码"`
-	CreateTime            time.Time `description:"时间"`
-	Area                  string    `description:"区域"`
-	Port                  string    `description:"港口或码头"`
-	Variety               string    `description:"品种"`
-	Unit                  string    `description:"单位"`
-	Frequency             string    `description:"频率"`
+	BaseFromMtjhMappingId int       `gorm:"column:base_from_mtjh_mapping_id;primaryKey" description:"持买单量指标ID"`
+	IndexName             string    `gorm:"column:index_name" description:"持买单量指标名称"`
+	IndexCode             string    `gorm:"column:index_code" description:"持买单量指标编码"`
+	CreateTime            time.Time `gorm:"column:create_time" description:"时间"`
+	Area                  string    `gorm:"column:area" description:"区域"`
+	Port                  string    `gorm:"column:port" description:"港口或码头"`
+	Variety               string    `gorm:"column:variety" description:"品种"`
+	Unit                  string    `gorm:"column:unit" description:"单位"`
+	Frequency             string    `gorm:"column:frequency" description:"频率"`
 }
 
+// tableName
+func (m *BaseFromMtjhMapping) TableName() string {
+	return "base_from_mtjh_mapping"
+}
+
+//type BaseFromMtjhIndex struct {
+//	BaseFromMtjhIndexId int       `orm:"column(base_from_mtjh_index_id);pk"`
+//	IndexName           string    `description:"持买单量指标名称"`
+//	IndexCode           string    `description:"持买单量指标编码"`
+//	DealValue           string    `description:"成交量"`
+//	DataTime            string    `description:"数据日期"`
+//	Area                string    `description:"区域"`
+//	Port                string    `description:"港口或码头"`
+//	Variety             string    `description:"品种"`
+//	Unit                string    `description:"单位"`
+//	Frequency           string    `description:"频率"`
+//	CreateTime          time.Time `description:"插入时间"`
+//	ModifyTime          time.Time `description:"修改时间"`
+//}
+
 type BaseFromMtjhIndex struct {
-	BaseFromMtjhIndexId int       `orm:"column(base_from_mtjh_index_id);pk"`
-	IndexName           string    `description:"持买单量指标名称"`
-	IndexCode           string    `description:"持买单量指标编码"`
-	DealValue           string    `description:"成交量"`
-	DataTime            string    `description:"数据日期"`
-	Area                string    `description:"区域"`
-	Port                string    `description:"港口或码头"`
-	Variety             string    `description:"品种"`
-	Unit                string    `description:"单位"`
-	Frequency           string    `description:"频率"`
-	CreateTime          time.Time `description:"插入时间"`
-	ModifyTime          time.Time `description:"修改时间"`
+	BaseFromMtjhIndexId int       `gorm:"column:base_from_mtjh_index_id;primaryKey" description:"持买单量指标ID"`
+	IndexName           string    `gorm:"column:index_name" description:"持买单量指标名称"`
+	IndexCode           string    `gorm:"column:index_code" description:"持买单量指标编码"`
+	DealValue           string    `gorm:"column:deal_value" description:"成交量"`
+	DataTime            string    `gorm:"column:data_time" description:"数据日期"`
+	Area                string    `gorm:"column:area" description:"区域"`
+	Port                string    `gorm:"column:port" description:"港口或码头"`
+	Variety             string    `gorm:"column:variety" description:"品种"`
+	Unit                string    `gorm:"column:unit" description:"单位"`
+	Frequency           string    `gorm:"column:frequency" description:"频率"`
+	CreateTime          time.Time `gorm:"column:create_time" description:"插入时间"`
+	ModifyTime          time.Time `gorm:"column:modify_time" description:"修改时间"`
+}
+
+func (m *BaseFromMtjhIndex) TableName() string {
+	return "base_from_mtjh_index"
 }
 
 // 查询指标
 func GetBaseFromMtjhMapping() (items []*BaseFromMtjhMapping, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mtjh_mapping`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&items).Error
 	return
 }
 
 // 查询指标
 func GetBaseFromMtjhIndex() (items []*BaseFromMtjhIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mtjh_index`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&items).Error
 	return
 }
 
 // 添加数据
 func AddBaseFromMtjhIndex(item *BaseFromMtjhIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	lastId = int64(item.BaseFromMtjhIndexId)
 	return
 }
 
 func AddBaseFromMtjhIndexMuti(items []*BaseFromMtjhIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertMulti(500, items)
+	//o := orm.NewOrm()
+	//lastId, err = o.InsertMulti(500, items)
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
 	return
 }
 
 // 添加指标
 func AddBaseFromMtjhMapping(item *BaseFromMtjhMapping) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
 func AddBaseFromMtjhMappingMuti(items []*BaseFromMtjhMapping) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertMulti(500, items)
+	//o := orm.NewOrm()
+	//lastId, err = o.InsertMulti(500, items)
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
 	return
 }
 
 func UpdateBaseFromMtjhIndex(item *BaseFromMtjhIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_mtjh_index SET deal_value=?  WHERE index_name=?  AND  data_time = ?`
-	_, err = o.Raw(sql, item.DealValue, item.IndexName, item.DataTime).Exec()
+	//_, err = o.Raw(sql, item.DealValue, item.IndexName, item.DataTime).Exec()
+	err = global.DEFAULT_DmSQL.Raw(sql, item.DealValue, item.IndexName, item.DataTime).Scan(&item).Error
 	return
 }
 
 func AddEdbDataFromMtjh(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	coalBaseDataAll, err := GetMtjhindexByCode(edbCode)
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -126,7 +169,8 @@ func AddEdbDataFromMtjh(edbCode string) (err error) {
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -137,7 +181,7 @@ func AddEdbDataFromMtjh(edbCode string) (err error) {
 func RefreshEdbDataFromMtjh(edbInfoId int, edbCode, startDate string) (err error) {
 	source := utils.DATA_SOURCE_MTJH
 	subSource := utils.DATA_SUB_SOURCE_EDB
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -254,7 +298,8 @@ func RefreshEdbDataFromMtjh(edbInfoId int, edbCode, startDate string) (err error
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -265,19 +310,21 @@ func RefreshEdbDataFromMtjh(edbInfoId int, edbCode, startDate string) (err error
 
 // GetMtjhindexByCode
 func GetMtjhindexByCode(indexCode string) (items []*BaseFromMtjhIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := "SELECT * FROM base_from_mtjh_index WHERE index_code=? "
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Scan(&items).Error
 	return
 }
 
 func GetMtjhDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromMtjhIndex, err error) {
 	sql := ` SELECT * FROM base_from_mtjh_index WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY data_time DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
 	return
 }

models/base_from_mysteel.go

@@ -1,26 +1,33 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 //钢联
 
+//type GlData struct {
+//	InputValue float64 `orm:"column(DATA_VALUE)" description:"日期"`
+//	DataTime   string  `orm:"column(DATA_DATE)" description:"值"`
+//}
 type GlData struct {
-	InputValue float64 `orm:"column(DATA_VALUE)" description:"日期"`
-	DataTime   string  `orm:"column(DATA_DATE)" description:"值"`
+	InputValue float64 `gorm:"column:DATA_VALUE" description:"值"`
+	DataTime   string  `gorm:"column:DATA_DATE" description:"日期"`
+}
+// tableName
+func (m *GlData) TableName() string {
+	return "mb_index_main_data"
 }
 
 func GetGlDataByCondition(condition string, pars []interface{}) (item []*GlData, err error) {
 	condition += " AND IS_DELETE=0 "
 	sql1 := ` SELECT * FROM mb_index_main_data WHERE 1=1 AND DATA_VALUE is not null `
-	o := orm.NewOrmUsingDB("gl")
+	//o := orm.NewOrmUsingDB("gl")
 	if condition != "" {
 		sql1 += condition
 	}
@@ -38,13 +45,14 @@ func GetGlDataByCondition(condition string, pars []interface{}) (item []*GlData,
 	//		) tmp group by DATA_DATE
 	//
 	//		order by PUBLISH_TIME DESC
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DmSQL["gl"].Raw(sql, pars).Scan(&item).Error
 	return
 }
 
 // 新增钢联指标数据
 func AddEdbDataFromMysteel(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -86,7 +94,8 @@ func AddEdbDataFromMysteel(edbCode string) (err error) {
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
 			utils.FileLog.Info("addSql:" + addSql)
-			_, err = o.Raw(addSql).Exec()
+			//_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DmSQL.Exec(addSql).Error
 			if err != nil {
 				return err
 			}
@@ -100,7 +109,7 @@ func RefreshEdbDataFromMysteel(edbInfoId int, edbCode, startDate string) (err er
 	source := utils.DATA_SOURCE_GL
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -206,7 +215,8 @@ func RefreshEdbDataFromMysteel(edbInfoId int, edbCode, startDate string) (err er
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}

models/base_from_mysteel_chemical.go

@@ -1,36 +1,45 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 //钢联
 
+//type MysteelChemicalData struct {
+//	InputValue float64 `orm:"column(value)" description:"值"`
+//	DataTime   string  `orm:"column(data_time)" description:"日期"`
+//}
+
 type MysteelChemicalData struct {
-	InputValue float64 `orm:"column(value)" description:"值"`
-	DataTime   string  `orm:"column(data_time)" description:"日期"`
+	InputValue float64 `gorm:"column:value" description:"值"`
+	DataTime   string  `gorm:"column:data_time" description:"日期"`
+}
+
+func (m *MysteelChemicalData) TableName() string {
+	return "base_from_mysteel_chemical_data"
 }
 
 func GetMysteelChemicalDataByCondition(condition string, pars []interface{}) (item []*MysteelChemicalData, err error) {
 	sql1 := ` SELECT * FROM base_from_mysteel_chemical_data WHERE 1=1  `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql1 += condition
 	}
 	sql := `select * from (` + sql1 + ` having 1 order by modify_time DESC ) tmp GROUP BY data_time ORDER BY data_time DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
 	return
 }
 
 // AddEdbDataFromMysteelChemical 新增钢联指标数据
 func AddEdbDataFromMysteelChemical(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -72,7 +81,8 @@ func AddEdbDataFromMysteelChemical(edbCode string) (err error) {
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
 			utils.FileLog.Info("addSql:" + addSql)
-			_, err = o.Raw(addSql).Exec()
+			//_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DmSQL.Exec(addSql).Error
 			if err != nil {
 				return err
 			}
@@ -86,7 +96,7 @@ func RefreshEdbDataFromMysteelChemical(edbInfoId int, edbCode, startDate string)
 	source := utils.DATA_SOURCE_MYSTEEL_CHEMICAL
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -192,7 +202,8 @@ func RefreshEdbDataFromMysteelChemical(edbInfoId int, edbCode, startDate string)
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -201,32 +212,64 @@ func RefreshEdbDataFromMysteelChemical(edbInfoId int, edbCode, startDate string)
 }
 
 // 钢联化工指标数据
+//type BaseFromMysteelChemicalIndex struct {
+//	BaseFromMysteelChemicalIndexId    int64     `orm:"column(base_from_mysteel_chemical_index_id);pk"`
+//	BaseFromMysteelChemicalClassifyId int       `description:"分类id"`
+//	IndexCode                         string    `description:"指标编码"`
+//	IndexName                         string    `description:"指标名称"`
+//	Unit                              string    `description:"单位"`
+//	Source                            string    `description:"数据来源"`
+//	Frequency                         string    `description:"频度"`
+//	StartDate                         time.Time `description:"开始日期"`
+//	EndDate                           time.Time `description:"结束日期"`
+//	Describe                          string    `description:"指标描述"`
+//	UpdateWeek                        string    `description:"更新周期"`
+//	UpdateTime                        string    `description:"更新时间，多个时间点用英文,隔开"`
+//	UpdateTime2                       string    `description:"更新时间2"`
+//	SysUserId                         int       `description:"创建人id"`
+//	SysUserRealName                   string    `description:"创建人姓名"`
+//	FilePath                          string    `description:"文件存储路径"`
+//	MergeFilePath                     string    `description:"更新文件"`
+//	FileIndex                         int       `description:"文件索引"`
+//	MergeUpdateWeek                   string    `description:"合并文件的更新周"`
+//	UpdateDate                        string    `description:"更新日期"`
+//	CreateTime                        time.Time `description:"创建时间"`
+//	ModifyTime                        time.Time `description:"修改时间"`
+//	IsStop                            int       `description:"是否停更:1:停更,0:未停更"`
+//	TerminalCode                      string    `description:"终端编码"`
+//	IsSupplierStop                    int       `description:"是否供应商停更:1:停更,0:未停更"`
+//}
+
 type BaseFromMysteelChemicalIndex struct {
-	BaseFromMysteelChemicalIndexId    int64     `orm:"column(base_from_mysteel_chemical_index_id);pk"`
-	BaseFromMysteelChemicalClassifyId int       `description:"分类id"`
-	IndexCode                         string    `description:"指标编码"`
-	IndexName                         string    `description:"指标名称"`
-	Unit                              string    `description:"单位"`
-	Source                            string    `description:"数据来源"`
-	Frequency                         string    `description:"频度"`
-	StartDate                         time.Time `description:"开始日期"`
-	EndDate                           time.Time `description:"结束日期"`
-	Describe                          string    `description:"指标描述"`
-	UpdateWeek                        string    `description:"更新周期"`
-	UpdateTime                        string    `description:"更新时间，多个时间点用英文,隔开"`
-	UpdateTime2                       string    `description:"更新时间2"`
-	SysUserId                         int       `description:"创建人id"`
-	SysUserRealName                   string    `description:"创建人姓名"`
-	FilePath                          string    `description:"文件存储路径"`
-	MergeFilePath                     string    `description:"更新文件"`
-	FileIndex                         int       `description:"文件索引"`
-	MergeUpdateWeek                   string    `description:"合并文件的更新周"`
-	UpdateDate                        string    `description:"更新日期"`
-	CreateTime                        time.Time `description:"创建时间"`
-	ModifyTime                        time.Time `description:"修改时间"`
-	IsStop                            int       `description:"是否停更:1:停更,0:未停更"`
-	TerminalCode                      string    `description:"终端编码"`
-	IsSupplierStop                    int       `description:"是否供应商停更:1:停更,0:未停更"`
+	BaseFromMysteelChemicalIndexId    int64     `gorm:"column:base_from_mysteel_chemical_index_id;primaryKey" description:"指标ID"`
+	BaseFromMysteelChemicalClassifyId int       `gorm:"column:base_from_mysteel_chemical_classify_id" description:"分类id"`
+	IndexCode                         string    `gorm:"column:index_code" description:"指标编码"`
+	IndexName                         string    `gorm:"column:index_name" description:"指标名称"`
+	Unit                              string    `gorm:"column:unit" description:"单位"`
+	Source                            string    `gorm:"column:source" description:"数据来源"`
+	Frequency                         string    `gorm:"column:frequency" description:"频度"`
+	StartDate                         time.Time `gorm:"column:start_date" description:"开始日期"`
+	EndDate                           time.Time `gorm:"column:end_date" description:"结束日期"`
+	Describe                          string    `gorm:"column:describe" description:"指标描述"`
+	UpdateWeek                        string    `gorm:"column:update_week" description:"更新周期"`
+	UpdateTime                        string    `gorm:"column:update_time" description:"更新时间，多个时间点用英文,隔开"`
+	UpdateTime2                       string    `gorm:"column:update_time2" description:"更新时间2"`
+	SysUserId                         int       `gorm:"column:sys_user_id" description:"创建人id"`
+	SysUserRealName                   string    `gorm:"column:sys_user_real_name" description:"创建人姓名"`
+	FilePath                          string    `gorm:"column:file_path" description:"文件存储路径"`
+	MergeFilePath                     string    `gorm:"column:merge_file_path" description:"更新文件"`
+	FileIndex                         int       `gorm:"column:file_index" description:"文件索引"`
+	MergeUpdateWeek                   string    `gorm:"column:merge_update_week" description:"合并文件的更新周"`
+	UpdateDate                        string    `gorm:"column:update_date" description:"更新日期"`
+	CreateTime                        time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                        time.Time `gorm:"column:modify_time" description:"修改时间"`
+	IsStop                            int       `gorm:"column:is_stop" description:"是否停更:1:停更,0:未停更"`
+	TerminalCode                      string    `gorm:"column:terminal_code" description:"终端编码"`
+	IsSupplierStop                    int       `gorm:"column:is_supplier_stop" description:"是否供应商停更:1:停更,0:未停更"`
+}
+// tableName
+func (m *BaseFromMysteelChemicalIndex) TableName() string {
+	return "base_from_mysteel_chemical_index"
 }
 
 type MysteelChemicalAPiCheck struct {
@@ -236,16 +279,18 @@ type MysteelChemicalAPiCheck struct {
 
 // GetIndexRefreshAllByMergeFile 根据合并文件去分组查询需要刷新的文件
 func (m *BaseFromMysteelChemicalIndex) GetIndexRefreshAllByMergeFile() (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE merge_file_path <>'' AND base_from_mysteel_chemical_classify_id NOT IN(54,55,56,57) GROUP BY merge_file_path`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&items).Error
 	return
 }
 
 func (m *BaseFromMysteelChemicalIndex) GetIndexItem(indexCode string) (item *BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_code = ? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Scan(&item).Error
 	return
 }
 
@@ -253,42 +298,47 @@ func (m *BaseFromMysteelChemicalIndex) GetBatchIndexItem(indexCodes []string) (i
 	if len(indexCodes) <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_code IN (%s) `
 	holder := make([]string, 0, len(indexCodes))
 	for range indexCodes {
 		holder = append(holder, "?")
 	}
 	sql = fmt.Sprintf(sql, strings.Join(holder, ","))
-	_, err = o.Raw(sql, indexCodes).QueryRows(&items)
+	//_, err = o.Raw(sql, indexCodes).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCodes).Scan(&items).Error
 	return
 }
 
 func (m *BaseFromMysteelChemicalIndex) GetIndexCreate(terminalCode string) (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_name = '' AND terminal_code = ? `
-	_, err = o.Raw(sql, terminalCode).QueryRows(&items)
+	//_, err = o.Raw(sql, terminalCode).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, terminalCode).Scan(&items).Error
 	return
 }
 
 // Add 新增
 func (m *BaseFromMysteelChemicalIndex) Add() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(m)
+	//o := orm.NewOrm()
+	//_, err = o.Insert(m)
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
 func (m *BaseFromMysteelChemicalIndex) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(m, cols...)
+	err = global.DEFAULT_DmSQL.Model(m).Updates(cols).Error
 	return
 }
 
 // GetNoMergeIndexByFrequencyCount 获取未合并的指标总数量
 func (m *BaseFromMysteelChemicalIndex) GetNoMergeIndexByFrequencyCount(frequency string) (total int64, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT count(1) AS total FROM base_from_mysteel_chemical_index WHERE frequency = ? AND merge_file_path = '' AND index_name NOT LIKE "%停%"  `
-	err = o.Raw(sql, frequency).QueryRow(&total)
+	//err = o.Raw(sql, frequency).QueryRow(&total)
+	err = global.DEFAULT_DmSQL.Raw(sql, frequency).Scan(&total).Error
 
 	return
 }
@@ -302,9 +352,10 @@ type GetMaxFileIndexReq struct {
 
 // GetMaxFileIndex 获取最大文件的
 func (m *BaseFromMysteelChemicalIndex) GetMaxFileIndex(frequency string) (item *BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE frequency=? AND index_name NOT LIKE "%停%" ORDER BY file_index DESC `
-	err = o.Raw(sql, frequency).QueryRow(&item)
+	//err = o.Raw(sql, frequency).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, frequency).Scan(&item).Error
 
 	return
 }
@@ -317,9 +368,10 @@ type GetNoMergeIndexByFrequencyPageReq struct {
 
 // GetNoMergeIndexByFrequencyPage 获取未合并的指标列表
 func (m *BaseFromMysteelChemicalIndex) GetNoMergeIndexByFrequencyPage(frequency string, limit int) (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE frequency=? AND merge_file_path = '' limit ? `
-	_, err = o.Raw(sql, frequency, limit).QueryRows(&items)
+	//_, err = o.Raw(sql, frequency, limit).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, frequency, limit).Scan(&items).Error
 	return
 }
 
@@ -328,25 +380,28 @@ type GetIndexCountByMergeFilePathReq struct {
 }
 
 func (m *BaseFromMysteelChemicalIndex) GetIndexCountByMergeFilePath(mergeFilePath string) (total int64, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT count(1) AS total FROM base_from_mysteel_chemical_index WHERE merge_file_path = ?`
-	err = o.Raw(sql, mergeFilePath).QueryRow(&total)
+	//err = o.Raw(sql, mergeFilePath).QueryRow(&total)
+	err = global.DEFAULT_DmSQL.Raw(sql, mergeFilePath).Scan(&total).Error
 	return
 }
 
 // GetIndexRefreshMethanolByMergeFile 根据合并文件去分组查询需要刷新的甲醇文件
 func (m *BaseFromMysteelChemicalIndex) GetIndexRefreshMethanolByMergeFile() (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE merge_file_path <> '' AND base_from_mysteel_chemical_classify_id IN(54,55,56,57) GROUP BY merge_file_path`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&items).Error
 	return
 }
 
 // GetIndexRefreshMethanolByTimely 获取需要及时刷新的文件
 func (m *BaseFromMysteelChemicalIndex) GetIndexRefreshMethanolByTimely() (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE merge_file_path <> '' AND is_refresh = 1 GROUP BY merge_file_path`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&items).Error
 	return
 }
 
@@ -356,9 +411,10 @@ type GetIndexByFrequencyReq struct {
 
 // GetIndexByFrequency 根据频率获取指标
 func (m *BaseFromMysteelChemicalIndex) GetIndexByFrequency(frequency string) (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE frequency = ? AND merge_file_path = '' `
-	_, err = o.Raw(sql, frequency).QueryRows(&items)
+	//_, err = o.Raw(sql, frequency).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, frequency).Scan(&items).Error
 	return
 }
 
@@ -370,9 +426,10 @@ type GetIndexRefreshWeekReq struct {
 
 func (m *BaseFromMysteelChemicalIndex) GetIndexRefreshWeek(nowWeekZn, startTime, endTime string) (items []*BaseFromMysteelChemicalIndex, err error) {
 	where := `update_week = ? AND ((update_time >= ? AND update_time <= ?) OR (update_time2 >= ? AND update_time2 <= ?)) `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM base_from_mysteel_chemical_index WHERE %s `, where)
-	_, err = o.Raw(sql, nowWeekZn, startTime, endTime, startTime, endTime).QueryRows(&items)
+	//_, err = o.Raw(sql, nowWeekZn, startTime, endTime, startTime, endTime).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, where, nowWeekZn, startTime, endTime, startTime, endTime).Scan(&items).Error
 	return
 }
 
@@ -389,8 +446,9 @@ func (m *BaseFromMysteelChemicalIndex) UpdateIndex(item *BaseFromMysteelChemical
 	if len(updateCols) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.Update(item, updateCols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(item, updateCols...)
+	err = global.DEFAULT_DmSQL.Model(item).Updates(updateCols).Error
 	return
 }
 
@@ -399,7 +457,7 @@ func (m *BaseFromMysteelChemicalIndex) MultiUpdateIndex(items []UpdateIndexReq)
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	for _, v := range items {
 		if len(v.UpdateCols) == 0 {
 			continue
@@ -407,7 +465,8 @@ func (m *BaseFromMysteelChemicalIndex) MultiUpdateIndex(items []UpdateIndexReq)
 		if v.Item == nil {
 			continue
 		}
-		if _, e := o.Update(v.Item, v.UpdateCols...); e != nil {
+		//if _, e := o.Update(v.Item, v.UpdateCols...); e != nil {
+		if e := global.DEFAULT_DmSQL.Model(v.Item).Updates(v.UpdateCols).Error; e != nil {
 			err = fmt.Errorf("update err: %s", e.Error())
 			return
 		}
@@ -433,36 +492,53 @@ type HandleMysteelIndexResp struct {
 }
 
 // 钢联化工指标数据
+//type BaseFromMysteelChemicalData struct {
+//	BaseFromMysteelChemicalDataId  int64 `orm:"column(base_from_mysteel_chemical_data_id);pk"`
+//	BaseFromMysteelChemicalIndexId int64
+//	IndexCode                      string
+//	DataTime                       time.Time
+//	Value                          string
+//	UpdateDate                     string
+//	CreateTime                     time.Time `description:"创建时间"`
+//	ModifyTime                     time.Time `description:"修改时间"`
+//}
 type BaseFromMysteelChemicalData struct {
-	BaseFromMysteelChemicalDataId  int64 `orm:"column(base_from_mysteel_chemical_data_id);pk"`
-	BaseFromMysteelChemicalIndexId int64
-	IndexCode                      string
-	DataTime                       time.Time
-	Value                          string
-	UpdateDate                     string
-	CreateTime                     time.Time `description:"创建时间"`
-	ModifyTime                     time.Time `description:"修改时间"`
+	BaseFromMysteelChemicalDataId  int64 `gorm:"column:base_from_mysteel_chemical_data_id;primaryKey" description:"数据ID"`
+	BaseFromMysteelChemicalIndexId int64 `gorm:"column:base_from_mysteel_chemical_index_id" description:"指标ID"`
+	IndexCode                      string `gorm:"column:index_code" description:"指标编码"`
+	DataTime                       time.Time `gorm:"column:data_time" description:"数据时间"`
+	Value                          string `gorm:"column:value" description:"数据值"`
+	UpdateDate                     string `gorm:"column:update_date" description:"更新日期"`
+	CreateTime                     time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                     time.Time `gorm:"column:modify_time" description:"修改时间"`
+}
+
+func (m *BaseFromMysteelChemicalData) TableName() string {
+	return "base_from_mysteel_chemical_data"
 }
 
 // GetIndexDataList 根据指标编码获取数据
 func (d *BaseFromMysteelChemicalData) GetIndexDataList(indexCode string) (item []*BaseFromMysteelChemicalData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_data WHERE index_code = ? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&item)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Scan(&item).Error
 	return
 }
 
 // Update 修改
 func (r *BaseFromMysteelChemicalData) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(r, updateCols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(r, updateCols...)
+	err = global.DEFAULT_DmSQL.Model(r).Updates(updateCols).Error
 	return
 }
 
 // Add 新增
 func (r *BaseFromMysteelChemicalData) Add(list []BaseFromMysteelChemicalData) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(500, list)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(500, list)
+	err = global.DEFAULT_DmSQL.CreateInBatches(list, 500).Error
 	return
 }
 
@@ -471,8 +547,9 @@ func (r *BaseFromMysteelChemicalData) AddV2(list []*BaseFromMysteelChemicalData)
 	if len(list) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(500, list)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(500, list)
+	err = global.DEFAULT_DmSQL.CreateInBatches(list, 500).Error
 	return
 }
 
@@ -490,22 +567,24 @@ type GetIndexDetailReq struct {
 
 // GetIndexCountByFrequency 获取未合并的指标总数量
 func (m *BaseFromMysteelChemicalIndex) GetIndexCountByFrequency(condition string, pars []interface{}) (total int64, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	sql := `SELECT count(1) AS total FROM base_from_mysteel_chemical_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&total)
+	//err = o.Raw(sql, pars).QueryRow(&total)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&total).Error
 
 	return
 }
 
 // GetNoMergeIndexByFrequencyPage 获取未合并的指标列表
 func (m *BaseFromMysteelChemicalIndex) GetIndexLimitByFrequency(frequency string, limit int) (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE frequency=? limit ? `
-	_, err = o.Raw(sql, frequency, limit).QueryRows(&items)
+	//_, err = o.Raw(sql, frequency, limit).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, frequency, limit).Scan(&items).Error
 	return
 }
 
@@ -519,20 +598,22 @@ type GetIndexPageByFrequencyPageReq struct {
 
 // GetNoMergeIndexByFrequencyPage 获取未合并的指标列表
 func (m *BaseFromMysteelChemicalIndex) GetIndexPageByFrequency(condition string, pars []interface{}, startSize, pageSize int) (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` LIMIT ?,?  `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
 	return
 }
 
 func (d *BaseFromMysteelChemicalData) GetMysteelIndexInfoMaxAndMinInfo(indexCode string) (item *EdbInfoMaxAndMinInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	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 base_from_mysteel_chemical_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Scan(&item).Error
 
 	if err != nil {
 		return
@@ -541,7 +622,8 @@ func (d *BaseFromMysteelChemicalData) GetMysteelIndexInfoMaxAndMinInfo(indexCode
 	// 获取最新值
 	var latest_value float64
 	sql = ` SELECT value AS latest_value FROM base_from_mysteel_chemical_data WHERE index_code=? ORDER BY data_time DESC LIMIT 1 `
-	err = o.Raw(sql, indexCode).QueryRow(&latest_value)
+	//err = o.Raw(sql, indexCode).QueryRow(&latest_value)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Scan(&latest_value).Error
 	if err != nil {
 		return
 	}
@@ -551,35 +633,50 @@ func (d *BaseFromMysteelChemicalData) GetMysteelIndexInfoMaxAndMinInfo(indexCode
 }
 
 func (d *BaseFromMysteelChemicalData) ModifyMysteelIndexMaxAndMinInfo(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_mysteel_chemical_index SET start_date=?,end_date=?,end_value=?,modify_time=NOW() WHERE index_code=? `
-	_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, indexCode).Exec()
+	//_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, indexCode).Exec()
+	err = global.DEFAULT_DmSQL.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, indexCode).Error
 	return
 }
 
 // GetIndexByCondition 获取指标
 func (m *BaseFromMysteelChemicalIndex) GetIndexByCondition(condition string, pars []interface{}) (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&items).Error
 	return
 }
 
+//type BaseFromMysteelChemicalRecord struct {
+//	BaseFromMysteelChemicalRecordId int64 `orm:"column(base_from_mysteel_chemical_record_id);pk"`
+//	BaseFromMysteelChemicalIndexId  int64
+//	OldIndexName                    string    `description:"原始名称"`
+//	NewIndexName                    string    `description:"新的名称"`
+//	CreateTime                      time.Time `description:"记录创建时间"`
+//	Timestamp                       int64     `description:"记录创建时间戳"`
+//}
 type BaseFromMysteelChemicalRecord struct {
-	BaseFromMysteelChemicalRecordId int64 `orm:"column(base_from_mysteel_chemical_record_id);pk"`
-	BaseFromMysteelChemicalIndexId  int64
-	OldIndexName                    string    `description:"原始名称"`
-	NewIndexName                    string    `description:"新的名称"`
-	CreateTime                      time.Time `description:"记录创建时间"`
-	Timestamp                       int64     `description:"记录创建时间戳"`
+	BaseFromMysteelChemicalRecordId int64 `gorm:"column:base_from_mysteel_chemical_record_id;primaryKey" description:"记录ID"`
+	BaseFromMysteelChemicalIndexId  int64 `gorm:"column:base_from_mysteel_chemical_index_id" description:"指标ID"`
+	OldIndexName                    string `gorm:"column:old_index_name" description:"原始名称"`
+	NewIndexName                    string `gorm:"column:new_index_name" description:"新的名称"`
+	CreateTime                      time.Time `gorm:"column:create_time" description:"记录创建时间"`
+	Timestamp                       int64     `gorm:"column:timestamp" description:"记录创建时间戳"`
+}
+
+func (m *BaseFromMysteelChemicalRecord) TableName() string {
+	return "base_from_mysteel_chemical_record"
 }
 
 func (m *BaseFromMysteelChemicalRecord) AddBaseFromMysteelChemicalRecord() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(m)
+	//o := orm.NewOrm()
+	//_, err = o.Insert(m)
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 

models/base_from_mysteel_chemical_classify.go

@@ -1,43 +1,62 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"time"
 )
 
+//type BaseFromMysteelChemicalClassify struct {
+//	BaseFromMysteelChemicalClassifyId int       `orm:"column(base_from_mysteel_chemical_classify_id);pk"`
+//	ClassifyName                      string    `description:"分类名称"`
+//	ParentId                          int       `description:"父级id"`
+//	SysUserId                         int       `description:"创建人id"`
+//	SysUserRealName                   string    `description:"创建人姓名"`
+//	Level                             int       `description:"层级"`
+//	Sort                              int       `description:"排序字段，越小越靠前，默认值：10"`
+//	ModifyTime                        time.Time `description:"修改时间"`
+//	CreateTime                        time.Time `description:"创建时间"`
+//}
+
 type BaseFromMysteelChemicalClassify struct {
-	BaseFromMysteelChemicalClassifyId int       `orm:"column(base_from_mysteel_chemical_classify_id);pk"`
-	ClassifyName                      string    `description:"分类名称"`
-	ParentId                          int       `description:"父级id"`
-	SysUserId                         int       `description:"创建人id"`
-	SysUserRealName                   string    `description:"创建人姓名"`
-	Level                             int       `description:"层级"`
-	Sort                              int       `description:"排序字段，越小越靠前，默认值：10"`
-	ModifyTime                        time.Time `description:"修改时间"`
-	CreateTime                        time.Time `description:"创建时间"`
+	BaseFromMysteelChemicalClassifyId int       `gorm:"column:base_from_mysteel_chemical_classify_id;primaryKey" description:"分类ID"`
+	ClassifyName                      string    `gorm:"column: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:"层级"`
+	Sort                              int       `gorm:"column:sort" description:"排序字段，越小越靠前，默认值：10"`
+	ModifyTime                        time.Time `gorm:"column:modify_time" description:"修改时间"`
+	CreateTime                        time.Time `gorm:"column:create_time" description:"创建时间"`
+}
+
+func (m *BaseFromMysteelChemicalClassify) TableName() string {
+	return "base_from_mysteel_chemical_classify"
 }
 
 // 判断分类名称是否存在
 func GetMysteelClassify(classifyName string, parentId int) (item *BaseFromMysteelChemicalClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_classify WHERE parent_id=? AND classify_name=? `
-	err = o.Raw(sql, parentId, classifyName).QueryRow(&item)
+	//err = o.Raw(sql, parentId, classifyName).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, parentId, classifyName).Scan(&item).Error
 	return
 }
 
 // GetEdbClassifyMaxSort 获取分类下最大的排序数
 func GetMysteelClassifyMaxSort(parentId int) (sort int, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT Max(sort) AS sort FROM base_from_mysteel_chemical_classify WHERE parent_id=? `
-	err = o.Raw(sql, parentId).QueryRow(&sort)
+	//err = o.Raw(sql, parentId).QueryRow(&sort)
+	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Scan(&sort).Error
 	return
 }
 
 func AddMysteelClassify(item *BaseFromMysteelChemicalClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 

models/base_from_national_statistics.go

@@ -1,39 +1,55 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
 )
 
+//// BaseFromNationalStatisticsData 国家统计局-指标数据表
+//type BaseFromNationalStatisticsData struct {
+//	BaseFromNationalStatisticsDataId  int `orm:"column(base_from_national_statistics_data_id);pk"`
+//	BaseFromNationalStatisticsIndexId int
+//	IndexCode                         string
+//	DataTime                          string
+//	Value                             string
+//	CreateTime                        time.Time
+//	ModifyTime                        time.Time
+//}
+
 // BaseFromNationalStatisticsData 国家统计局-指标数据表
 type BaseFromNationalStatisticsData struct {
-	BaseFromNationalStatisticsDataId  int `orm:"column(base_from_national_statistics_data_id);pk"`
-	BaseFromNationalStatisticsIndexId int
-	IndexCode                         string
-	DataTime                          string
-	Value                             string
-	CreateTime                        time.Time
-	ModifyTime                        time.Time
+	BaseFromNationalStatisticsDataId  int `gorm:"column:base_from_national_statistics_data_id;primaryKey"`
+	BaseFromNationalStatisticsIndexId int `gorm:"column:base_from_national_statistics_index_id"`
+	IndexCode                         string `gorm:"column:index_code"`
+	DataTime                          string `gorm:"column:data_time"`
+	Value                             string `gorm:"column:value"`
+	CreateTime                        time.Time `gorm:"column:create_time"`
+	ModifyTime                        time.Time `gorm:"column:modify_time"`
+}
+
+func (m *BaseFromNationalStatisticsData) TableName() string {
+	return "base_from_national_statistics_data"
 }
 
 // GetBaseFromNationalStatisticsDataByCondition 获取指标值
 func GetBaseFromNationalStatisticsDataByCondition(condition string, pars []interface{}) (list []*BaseFromNationalStatisticsData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_national_statistics_data WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
 	return
 }
 
 // AddEdbDataFromNationalStatistics 新增国家统计局指标数据
 func AddEdbDataFromNationalStatistics(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -66,7 +82,8 @@ func AddEdbDataFromNationalStatistics(edbCode string) (err error) {
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -79,7 +96,7 @@ func RefreshEdbDataFromNationalStatistics(edbInfoId int, edbCode, startDate stri
 	source := utils.DATA_SOURCE_NATIONAL_STATISTICS
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -175,7 +192,8 @@ func RefreshEdbDataFromNationalStatistics(edbInfoId int, edbCode, startDate stri
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshEdbDataFromNationalStatistics add Err", err.Error())
 			return

models/base_from_oilchem.go

@@ -1,57 +1,90 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
 )
 
+//type BaseFromOilchemIndex struct {
+//	BaseFromOilchemIndexId int       // 主键ID
+//	IndexCode              string    // 指标编码
+//	IndexName              string    // 指标名称
+//	ClassifyId             uint      // 分类ID
+//	Unit                   string    // 单位
+//	Frequency              string    // 频度
+//	Describe               string    // 指标描述
+//	Sort                   int       // 排序
+//	CreateTime             time.Time // 创建时间
+//	ModifyTime             time.Time // 修改时间
+//}
 type BaseFromOilchemIndex struct {
-	BaseFromOilchemIndexId int       // 主键ID
-	IndexCode              string    // 指标编码
-	IndexName              string    // 指标名称
-	ClassifyId             uint      // 分类ID
-	Unit                   string    // 单位
-	Frequency              string    // 频度
-	Describe               string    // 指标描述
-	Sort                   int       // 排序
-	CreateTime             time.Time // 创建时间
-	ModifyTime             time.Time // 修改时间
+	BaseFromOilchemIndexId int       `gorm:"column:base_from_oilchem_index_id;primaryKey"` // 主键ID
+	IndexCode              string    `gorm:"column:index_code"`                           // 指标编码
+	IndexName              string    `gorm:"column:index_name"`                           // 指标名称
+	ClassifyId             uint      `gorm:"column:classify_id"`                          // 分类ID
+	Unit                   string    `gorm:"column:unit"`                                 // 单位
+	Frequency              string    `gorm:"column:frequency"`                            // 频度
+	Describe               string    `gorm:"column:describe"`                             // 指标描述
+	Sort                   int       `gorm:"column:sort"`                                  // 排序
+	CreateTime             time.Time `gorm:"column:create_time"`                           // 创建时间
+	ModifyTime             time.Time `gorm:"column:modify_time"`                           // 修改时间
+}
+
+
+func (m *BaseFromOilchemIndex) TableName() string {
+	return "base_from_oilchem_index"
 }
+//
+//type BaseFromOilchemData struct {
+//	BaseFromOilchemDataId  int    // 数据表ID
+//	BaseFromOilchemIndexId int    // 指标ID
+//	IndexCode              string // 指标编码
+//	DataTime               string
+//	Value                  string
+//	CreateTime             time.Time // 创建时间
+//	ModifyTime             time.Time // 修改时间
+//}
 
 type BaseFromOilchemData struct {
-	BaseFromOilchemDataId  int    // 数据表ID
-	BaseFromOilchemIndexId int    // 指标ID
-	IndexCode              string // 指标编码
-	DataTime               string
-	Value                  string
-	CreateTime             time.Time // 创建时间
-	ModifyTime             time.Time // 修改时间
+	BaseFromOilchemDataId  int       `gorm:"column:base_from_oilchem_data_id;primaryKey"` // 数据表ID
+	BaseFromOilchemIndexId int       `gorm:"column:base_from_oilchem_index_id"`          // 指标ID
+	IndexCode              string    `gorm:"column:index_code"`                           // 指标编码
+	DataTime               string    `gorm:"column:data_time"`                             // 数据时间
+	Value                  string    `gorm:"column:value"`                                 // 数据值
+	CreateTime             time.Time `gorm:"column:create_time"`                           // 创建时间
+	ModifyTime             time.Time `gorm:"column:modify_time"`                           // 修改时间
+}
+func (m *BaseFromOilchemData) TableName() string {
+	return "base_from_oilchem_data"
 }
 
 // 添加数据
 func AddBaseFromOilchemIndexMuti(items []*BaseFromOilchemIndex) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(500, items)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(500, items)
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
 	return
 }
 func AddBaseFromOilchemIndex(item *BaseFromOilchemIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
 func AddBaseFromOilchemData(item *BaseFromOilchemData) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
 func AddEdbDataFromOilchem(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	oilchemBaseDataAll, err := GetOilchemDataByCode(edbCode)
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -91,7 +124,8 @@ func AddEdbDataFromOilchem(edbCode string) (err error) {
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -101,9 +135,10 @@ func AddEdbDataFromOilchem(edbCode string) (err error) {
 
 // GetOilchemDataByCode
 func GetOilchemDataByCode(indexCode string) (items []*BaseFromOilchemData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := "SELECT * FROM base_from_oilchem_data WHERE index_code=? "
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Scan(&items).Error
 	return
 }
 
@@ -112,7 +147,7 @@ func RefreshEdbDataFromOilchem(edbInfoId int, edbCode, startDate string) (err er
 	source := utils.DATA_SOURCE_OILCHEM
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -210,7 +245,8 @@ func RefreshEdbDataFromOilchem(edbInfoId int, edbCode, startDate string) (err er
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshEdbDataFromSci add Err", err.Error())
 			return
@@ -220,12 +256,13 @@ func RefreshEdbDataFromOilchem(edbInfoId int, edbCode, startDate string) (err er
 }
 
 func GetBaseFromOilchemDataByCondition(condition string, pars []interface{}) (list []*BaseFromOilchemData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_oilchem_data WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
 	return
 }
 
@@ -252,23 +289,26 @@ type HandleOielchemEdbDataReq struct {
 }
 
 func GetBaseFromOilchemIndex() (list []*BaseFromOilchemIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_oilchem_index group by index_name `
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&list).Error
 	return
 }
 
 func GetBaseFromOilchemData(indexCode, dataTime string) (item *BaseFromOilchemData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_oilchem_data where index_code=? And data_time = ? `
-	err = o.Raw(sql, indexCode, dataTime).QueryRow(&item)
+	//err = o.Raw(sql, indexCode, dataTime).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode, dataTime).Scan(&item).Error
 	return
 }
 
 // UpdateBaseFromSci99Data
 func UpdateBaseFromOilchemData(value, indexCode, dataTime string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_sci99_data SET value=?,modify_time=NOW() WHERE index_code = ? AND data_time = ? `
-	_, err = o.Raw(sql, value, indexCode, dataTime).Exec()
+	//_, err = o.Raw(sql, value, indexCode, dataTime).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, value, indexCode, dataTime).Error
 	return
 }

models/base_from_pb.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"
 	"strconv"
 	"strings"
 	"time"
@@ -17,7 +17,7 @@ type EdbDataFromPb struct {
 }
 
 func AddEdbDataFromPb(edbCode string, item *EdbDataFromPb) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if len(item.Date) > 0 {
 		var isAdd bool
 		dateMap := item.Date
@@ -52,7 +52,8 @@ func AddEdbDataFromPb(edbCode string, item *EdbDataFromPb) (err error) {
 		}
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
-			_, err = o.Raw(addSql).Exec()
+			//_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DmSQL.Exec(addSql).Error
 			if err != nil {
 				return
 			}
@@ -63,7 +64,7 @@ func AddEdbDataFromPb(edbCode string, item *EdbDataFromPb) (err error) {
 
 // 刷新彭博指标数据
 func RefreshEdbDataFromPb(edbInfoId int, edbCode, startDate string, item *EdbDataFromPb) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	source := utils.DATA_SOURCE_PB
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
@@ -158,7 +159,8 @@ func RefreshEdbDataFromPb(edbInfoId int, edbCode, startDate string, item *EdbDat
 
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
-			_, err = o.Raw(addSql).Exec()
+			//_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DmSQL.Exec(addSql).Error
 			if err != nil {
 				fmt.Println("RefreshAllEdbDataByPb add Err", err.Error())
 				return

models/base_from_pb_finance.go

@@ -1,16 +1,16 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
 )
 
 func AddEdbDataFromPbFinance(edbCode string, item *EdbDataFromPb) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if len(item.Date) > 0 {
 		var isAdd bool
 		dateMap := item.Date
@@ -34,7 +34,8 @@ func AddEdbDataFromPbFinance(edbCode string, item *EdbDataFromPb) (err error) {
 		}
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
-			_, err = o.Raw(addSql).Exec()
+			//_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DmSQL.Exec(addSql).Error
 			if err != nil {
 				return
 			}
@@ -45,7 +46,7 @@ func AddEdbDataFromPbFinance(edbCode string, item *EdbDataFromPb) (err error) {
 
 // 刷新彭博指标数据
 func RefreshEdbDataFromPbFinance(edbInfoId int, edbCode, startDate string, item *EdbDataFromPb) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	source := utils.DATA_SOURCE_PB_FINANCE
 	subSource := utils.DATA_SUB_SOURCE_DATE
 
@@ -135,7 +136,8 @@ func RefreshEdbDataFromPbFinance(edbInfoId int, edbCode, startDate string, item
 
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
-			_, err = o.Raw(addSql).Exec()
+			//_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DmSQL.Exec(addSql).Error
 			if err != nil {
 				fmt.Println("RefreshAllEdbDataByPbFinance add Err", err.Error())
 				return

models/base_from_python.go

@@ -2,25 +2,41 @@ package models
 
 import (
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/services/alarm_msg"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/shopspring/decimal"
 	"strings"
 	"time"
 )
 
 // EdbDataPython python指标数据结构体
+//type EdbDataPython struct {
+//	EdbDataId     int `orm:"column(edb_data_id);pk"`
+//	EdbInfoId     int
+//	EdbCode       string
+//	DataTime      string
+//	Value         float64
+//	CreateTime    time.Time
+//	ModifyTime    time.Time
+//	DataTimestamp int64
+//}
+
 type EdbDataPython struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
+	EdbDataId     int       `gorm:"column:edb_data_id;primaryKey"` // 指标数据ID
+	EdbInfoId     int       `gorm:"column:edb_info_id"`            // 指标信息ID
+	EdbCode       string    `gorm:"column:edb_code"`               // 指标编码
+	DataTime      string    `gorm:"column:data_time"`              // 数据时间
+	Value         float64   `gorm:"column:value"`                  // 数据值
+	CreateTime    time.Time `gorm:"column:create_time"`            // 创建时间
+	ModifyTime    time.Time `gorm:"column:modify_time"`            // 修改时间
+	DataTimestamp int64     `gorm:"column:data_timestamp"`         // 数据时间戳
+}
+
+// tableName
+func (m *EdbDataPython) TableName() string {
+	return "edb_data_python"
 }
 
 // EdbDataFromPython 通过python代码获取到的指标数据
@@ -31,7 +47,7 @@ type EdbDataFromPython struct {
 
 // AddPythonEdb 新增python运算指标
 func AddPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython, edbInfoList []*EdbInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	//添加指标关系
 	for _, tmpEdbInfo := range edbInfoList {
@@ -48,7 +64,8 @@ func AddPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython, edbInfoList []*EdbIn
 		calculateMappingItem.FromSourceName = tmpEdbInfo.SourceName
 		calculateMappingItem.Source = edbInfo.Source
 		calculateMappingItem.SourceName = edbInfo.SourceName
-		_, err = o.Insert(calculateMappingItem)
+		//_, err = o.Insert(calculateMappingItem)
+		err = global.DEFAULT_DmSQL.Create(calculateMappingItem).Error
 		if err != nil {
 			return
 		}
@@ -76,7 +93,8 @@ func AddPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython, edbInfoList []*EdbIn
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return
 		}
@@ -86,7 +104,7 @@ func AddPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython, edbInfoList []*EdbIn
 
 // EditPythonEdb 编辑python运算指标
 func EditPythonEdb(edbInfoId int, edbCode string, item EdbDataFromPython) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_python (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	for k, dateTimeStr := range item.Date {
@@ -109,7 +127,8 @@ func EditPythonEdb(edbInfoId int, edbCode string, item EdbDataFromPython) (err e
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return
 		}
@@ -119,19 +138,20 @@ func EditPythonEdb(edbInfoId int, edbCode string, item EdbDataFromPython) (err e
 
 // RefreshAllPythonEdb 刷新所有 python运算指标
 func RefreshAllPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython) (err error) {
-	o := orm.NewOrm()
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshAllPythonEdb,Err:" + err.Error())
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
+	//o := orm.NewOrm()
+	//to, err := o.Begin()
+	//to := global.DEFAULT_DmSQL.Begin()
+	//if err != nil {
+	//	return
+	//}
+	//defer func() {
+	//	if err != nil {
+	//		fmt.Println("RefreshAllPythonEdb,Err:" + err.Error())
+	//		_ = to.Rollback()
+	//	} else {
+	//		_ = to.Commit()
+	//	}
+	//}()
 
 	pythonDataMap := make(map[string]float64)
 	pythonDate := make([]string, 0)
@@ -196,7 +216,8 @@ func RefreshAllPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython) (err error) {
 		}
 		//最后如果还有需要新增的数据，那么就统一入库
 		if len(addDataList) > 0 {
-			_, tmpErr := o.InsertMulti(len(addDataList), addDataList)
+			//_, tmpErr := o.InsertMulti(len(addDataList), addDataList)
+			tmpErr := global.DEFAULT_DmSQL.CreateInBatches(addDataList, 500).Error
 			if tmpErr != nil {
 				err = tmpErr
 				return
@@ -213,7 +234,8 @@ func RefreshAllPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython) (err error) {
 			tableName := GetEdbDataTableName(edbInfo.Source, edbInfo.SubSource)
 			sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)
 
-			_, err = o.Raw(sql, edbInfo.EdbInfoId).Exec()
+			//_, err = o.Raw(sql, edbInfo.EdbInfoId).Exec()
+			err = global.DEFAULT_DmSQL.Exec(sql, edbInfo.EdbInfoId).Error
 			if err != nil {
 				err = errors.New("删除不存在的Python运算指标数据失败,Err:" + err.Error())
 				return
@@ -227,7 +249,8 @@ func RefreshAllPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython) (err error) {
 		for edbDate, edbDataValue := range updateEdbDataMap {
 			sql := fmt.Sprintf(` UPDATE  %s set value = ?,modify_time=now() WHERE edb_info_id = ? and data_time = ? `, tableName)
 
-			_, err = o.Raw(sql, edbDataValue, edbInfo.EdbInfoId, edbDate).Exec()
+			//_, err = o.Raw(sql, edbDataValue, edbInfo.EdbInfoId, edbDate).Exec()
+			err = global.DEFAULT_DmSQL.Exec(sql, edbDataValue, edbInfo.EdbInfoId, edbDate).Error
 			if err != nil {
 				err = errors.New("更新现有的Python运算指标数据失败,Err:" + err.Error())
 				return
@@ -239,7 +262,7 @@ func RefreshAllPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython) (err error) {
 
 // EditEdbInfoCalculateMapping 更新关联关系表
 func EditEdbInfoCalculateMapping(edbInfo *EdbInfo, edbInfoList []*EdbInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var existCondition string
 	var existPars []interface{}
@@ -281,7 +304,8 @@ func EditEdbInfoCalculateMapping(edbInfo *EdbInfo, edbInfoList []*EdbInfo) (err
 			calculateMappingItem.FromSourceName = tmpEdbInfo.SourceName
 			calculateMappingItem.Source = edbInfo.Source
 			calculateMappingItem.SourceName = edbInfo.SourceName
-			_, err = o.Insert(calculateMappingItem)
+			//_, err = o.Insert(calculateMappingItem)
+			err = global.DEFAULT_DmSQL.Create(calculateMappingItem).Error
 			if err != nil {
 				return
 			}
@@ -291,7 +315,8 @@ func EditEdbInfoCalculateMapping(edbInfo *EdbInfo, edbInfoList []*EdbInfo) (err
 	for _, v := range existEdbInfoIdMap {
 		//删除，计算指标关联的，基础指标的关联关系
 		sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? and from_edb_info_id=?`
-		_, err = o.Raw(sql, edbInfo.EdbInfoId, v).Exec()
+		//_, err = o.Raw(sql, edbInfo.EdbInfoId, v).Exec()
+		err = global.DEFAULT_DmSQL.Exec(sql, edbInfo.EdbInfoId, v).Error
 		if err != nil {
 			err = errors.New("删除计算指标关联关系失败,Err:" + err.Error())
 			return
@@ -302,9 +327,10 @@ func EditEdbInfoCalculateMapping(edbInfo *EdbInfo, edbInfoList []*EdbInfo) (err
 
 // GetAllEdbDataPythonByEdbInfoId 根据指标id获取全部的数据
 func GetAllEdbDataPythonByEdbInfoId(edbInfoId int) (items []*EdbDataPython, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_data_python WHERE edb_info_id=? ORDER BY data_time DESC `
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
+	//_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Scan(&items).Error
 	return
 }
 

models/base_from_sci.go

@@ -1,64 +1,81 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
+//	type BaseFromSciData struct {
+//		SciDataId          int `orm:"column(sci_data_id);pk"`
+//		BaseFromSciIndexId int
+//		IndexCode          string
+//		DataTime           string
+//		Value              string
+//		CreateTime         time.Time
+//		ModifyTime         time.Time
+//		DataTimestamp      int64
+//	}
 type BaseFromSciData struct {
-	SciDataId          int `orm:"column(sci_data_id);pk"`
-	BaseFromSciIndexId int
-	IndexCode          string
-	DataTime           string
-	Value              string
-	CreateTime         time.Time
-	ModifyTime         time.Time
-	DataTimestamp      int64
+	SciDataId          int       `gorm:"column:sci_data_id;primaryKey"` // 数据ID
+	BaseFromSciIndexId int       `gorm:"column:base_from_sci_index_id"` // 指标ID
+	IndexCode          string    `gorm:"column:index_code"`             // 指标编码
+	DataTime           string    `gorm:"column:data_time"`              // 数据时间
+	Value              string    `gorm:"column:value"`                  // 数据值
+	CreateTime         time.Time `gorm:"column:create_time"`            // 创建时间
+	ModifyTime         time.Time `gorm:"column:modify_time"`            // 修改时间
+	DataTimestamp      int64     `gorm:"column:data_timestamp"`         // 数据时间戳
+}
+
+func (r *BaseFromSciData) TableName() string {
+	return "base_from_sci_data"
 }
 
 // Update 修改
 func (r *BaseFromSciData) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(r, updateCols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(r, updateCols...)
+	err = global.DEFAULT_DmSQL.Model(r).Updates(updateCols).Error
 
 	return
 }
 
 // GetIndexDataList 获取所有的指标数据
 func (r *BaseFromSciData) GetIndexDataList(indexCode string) (items []*BaseFromSciData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_sci_data WHERE 1=1 AND index_code = ? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Scan(&items).Error
 
 	return
 }
 
 // BatchAdd 批量添加指标
 func (r *BaseFromSciData) BatchAdd(list []*BaseFromSciData) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(list), list)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(len(list), list)
+	err = global.DEFAULT_DmSQL.CreateInBatches(list, len(list)).Error
 
 	return
 }
 
 func GetBaseFromSciDataByCondition(condition string, pars []interface{}) (list []*BaseFromSciData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_sci_data WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
 	return
 }
 
 // AddEdbDataFromSci 新增卓创（红桃3）指标数据
 func AddEdbDataFromSci(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -90,7 +107,8 @@ func AddEdbDataFromSci(edbCode string) (err error) {
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -103,7 +121,7 @@ func RefreshEdbDataFromSci(edbInfoId int, edbCode, startDate string) (err error)
 	source := utils.DATA_SOURCE_SCI
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -201,7 +219,8 @@ func RefreshEdbDataFromSci(edbInfoId int, edbCode, startDate string) (err error)
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshEdbDataFromSci add Err", err.Error())
 			return
@@ -244,24 +263,27 @@ func (r *BaseFromSciIndex) TableName() string {
 
 // Update 修改
 func (r *BaseFromSciIndex) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(r, updateCols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(r, updateCols...)
+	err = global.DEFAULT_DmSQL.Model(r).Select(updateCols).Updates(r).Error
 
 	return
 }
 
 // GetAllIndex 获取所有的指标
 func (r *BaseFromSciIndex) GetAllIndex() (items []*BaseFromSciIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_sci_index WHERE 1=1 `
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&items).Error
 	return
 }
 
 // BatchAdd 批量添加指标
 func (r *BaseFromSciIndex) BatchAdd(list []*BaseFromSciIndex) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(list), list)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(len(list), list)
+	err = global.DEFAULT_DmSQL.CreateInBatches(list, len(list)).Error
 
 	return
 }

models/base_from_sci99.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
@@ -10,96 +11,154 @@ import (
 )
 
 // BaseFromSci99Index 代表卓创资讯-原始指标表的结构
+//type BaseFromSci99Index struct {
+//	BaseFromSciIndexId int       `orm:"column(base_from_sci_index_id);pk"` // 主键，自动递增
+//	IndexCode          string    // 指标编码
+//	IndexName          string    // 指标名称
+//	ClassifyId         int       // 分类Id
+//	Unit               string    // 单位
+//	Frequency          string    // 频度
+//	Describe           string    // 指标描述
+//	CreateTime         time.Time // 创建时间
+//	ModifyTime         time.Time // 修改时间
+//}
 type BaseFromSci99Index struct {
-	BaseFromSciIndexId int       `orm:"column(base_from_sci_index_id);pk"` // 主键，自动递增
-	IndexCode          string    // 指标编码
-	IndexName          string    // 指标名称
-	ClassifyId         int       // 分类Id
-	Unit               string    // 单位
-	Frequency          string    // 频度
-	Describe           string    // 指标描述
-	CreateTime         time.Time // 创建时间
-	ModifyTime         time.Time // 修改时间
+	BaseFromSciIndexId int       `gorm:"column:base_from_sci_index_id;primaryKey;autoIncrement"` // 主键，自动递增
+	IndexCode          string    `gorm:"column:index_code"`                                       // 指标编码
+	IndexName          string    `gorm:"column:index_name"`                                        // 指标名称
+	ClassifyId         int       `gorm:"column:classify_id"`                                       // 分类Id
+	Unit               string    `gorm:"column:unit"`                                               // 单位
+	Frequency          string    `gorm:"column:frequency"`                                         // 频度
+	Describe           string    `gorm:"column:describe"`                                          // 指标描述
+	CreateTime         time.Time `gorm:"column:create_time"`                                        // 创建时间
+	ModifyTime         time.Time `gorm:"column:modify_time"`                                        // 修改时间
+}
+func (m *BaseFromSci99Index) TableName() string {
+	return "base_from_sci99_index"
 }
 
 // BaseFromSci99Data 代表卓创资讯-原始指标数据表的结构
+//type BaseFromSci99DataItem struct {
+//	BaseFromSciDataId  int       `orm:"column(base_from_sci_data_id);pk"` // 主键，自动递增
+//	BaseFromSciIndexId int       // 指标id
+//	IndexCode          string    // 指标编码
+//	DataTime           string    // 数据日期
+//	Value              string    // 数据值
+//	CreateTime         time.Time // 创建时间
+//	ModifyTime         time.Time // 修改时间
+//}
 type BaseFromSci99DataItem struct {
-	BaseFromSciDataId  int       `orm:"column(base_from_sci_data_id);pk"` // 主键，自动递增
-	BaseFromSciIndexId int       // 指标id
-	IndexCode          string    // 指标编码
-	DataTime           string    // 数据日期
-	Value              string    // 数据值
-	CreateTime         time.Time // 创建时间
-	ModifyTime         time.Time // 修改时间
+	BaseFromSciDataId  int       `gorm:"column:base_from_sci_data_id;primaryKey;autoIncrement"` // 主键，自动递增
+	BaseFromSciIndexId int       `gorm:"column:base_from_sci_index_id"`                           // 指标id
+	IndexCode          string    `gorm:"column:index_code"`                                       // 指标编码
+	DataTime           string    `gorm:"column:data_time"`                                         // 数据日期
+	Value              string    `gorm:"column:value"`                                             // 数据值
+	CreateTime         time.Time `gorm:"column:create_time"`                                        // 创建时间
+	ModifyTime         time.Time `gorm:"column:modify_time"`                                        // 修改时间
+}
+
+func (m *BaseFromSci99DataItem) TableName() string {
+	return "base_from_sci99_data"
 }
 
 // BaseFromSci99Data 代表卓创资讯-原始指标数据表的结构
+//type BaseFromSci99Data struct {
+//	BaseFromSciDataId  int       `orm:"column(base_from_sci_data_id);pk"` // 主键，自动递增
+//	BaseFromSciIndexId int       // 指标id
+//	IndexCode          string    // 指标编码
+//	DataTime           string    // 数据日期
+//	Value              float64   // 数据值
+//	CreateTime         time.Time // 创建时间
+//	ModifyTime         time.Time // 修改时间
+//}
+
 type BaseFromSci99Data struct {
-	BaseFromSciDataId  int       `orm:"column(base_from_sci_data_id);pk"` // 主键，自动递增
-	BaseFromSciIndexId int       // 指标id
-	IndexCode          string    // 指标编码
-	DataTime           string    // 数据日期
-	Value              float64   // 数据值
-	CreateTime         time.Time // 创建时间
-	ModifyTime         time.Time // 修改时间
+	BaseFromSciDataId  int       `gorm:"column:base_from_sci_data_id;primaryKey;autoIncrement"` // 主键，自动递增
+	BaseFromSciIndexId int       `gorm:"column:base_from_sci_index_id"`                           // 指标id
+	IndexCode          string    `gorm:"column:index_code"`                                       // 指标编码
+	DataTime           string    `gorm:"column:data_time"`                                         // 数据日期
+	Value              float64   `gorm:"column:value"`                                             // 数据值
+	CreateTime         time.Time `gorm:"column:create_time"`                                        // 创建时间
+	ModifyTime         time.Time `gorm:"column:modify_time"`                                        // 修改时间
+}
+func (m *BaseFromSci99Data) TableName() string {
+	return "base_from_sci99_data"
 }
 
 // BaseFromSci99Classify 代表卓创资讯-原始指标分类表的结构
+//type BaseFromSci99Classify struct {
+//	BaseFromSciClassifyId int       `orm:"column(base_from_sci_classify_id);pk"` // 主键，自动递增
+//	ClassifyName          string    // 分类名称
+//	Sort                  int       // 排序
+//	CreateTime            time.Time // 创建时间
+//	ModifyTime            time.Time // 修改时间
+//}
+
 type BaseFromSci99Classify struct {
-	BaseFromSciClassifyId int       `orm:"column(base_from_sci_classify_id);pk"` // 主键，自动递增
-	ClassifyName          string    // 分类名称
-	Sort                  int       // 排序
-	CreateTime            time.Time // 创建时间
-	ModifyTime            time.Time // 修改时间
+	BaseFromSciClassifyId int       `gorm:"column:base_from_sci_classify_id;primaryKey;autoIncrement"` // 主键，自动递增
+	ClassifyName          string    `gorm:"column:classify_name"`                                     // 分类名称
+	Sort                  int       `gorm:"column:sort"`                                                // 排序
+	CreateTime            time.Time `gorm:"column:create_time"`                                         // 创建时间
+	ModifyTime            time.Time `gorm:"column:modify_time"`                                         // 修改时间
+}
+func (m *BaseFromSci99Classify) TableName() string {
+	return "base_from_sci99_classify"
 }
 
-func GetBaseFromSci99DataDataByCondition(condition string, pars []interface{}) (item []*BaseFromIcpiData, err error) {
+func GetBaseFromSci99DataDataByCondition(condition string, pars []interface{}) (item []*BaseFromSci99DataItem, err error) {
 	sql := ` SELECT * FROM base_from_sci99_data WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY data_time DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 // 添加数据
 func AddBaseFromSci99Index(item *BaseFromSci99Index) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	lastId = int64(item.BaseFromSciIndexId)
 	return
 }
 
 func AddBaseFromSci99Classify(item *BaseFromSci99Classify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
 func AddBaseFromSci99DataMulti(item []*BaseFromSci99Data) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(1000, item)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(1000, item)
+	err = global.DEFAULT_DmSQL.CreateInBatches(item, 1000).Error
 	return
 }
 
 func GetBaseFromSci99Index() (list []*BaseFromSci99Index, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_sci99_index `
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
 	return
 }
 
 func GetBaseFromSci99DataByIndexCode(indexCode string) (items []*BaseFromSci99DataItem, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_sci99_data WHERE index_code=? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&items).Error
 	return
 }
 
 // 新增卓创资讯指标数据
 func AddEdbDataFromSci99(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	dataAll, err := GetBaseFromSci99DataByIndexCode(edbCode)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		return
@@ -126,7 +185,8 @@ func AddEdbDataFromSci99(edbCode string) (err error) {
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -139,7 +199,7 @@ func RefreshEdbDataFromSci99(edbInfoId int, edbCode, startDate string) (err erro
 	source := utils.DATA_SOURCE_SCI99
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -244,7 +304,8 @@ func RefreshEdbDataFromSci99(edbInfoId int, edbCode, startDate string) (err erro
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}

models/base_from_sci_hq.go

@@ -1,35 +1,36 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 func GetBaseFromSciHqDataByCondition(condition string, pars []interface{}) (list []*BaseFromSciHqData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_sci_hq_data WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&list).Error
 	return
 }
 
 func GetBaseFromSciHqDataByIndexCode(indexCode string) (list []*BaseFromSciHqData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_sci_hq_data WHERE 1=1 AND index_code=?`
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
 	return
 }
 
 // AddEdbDataFromSciHq 新增卓创红期指标数据
 func AddEdbDataFromSciHq(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -61,7 +62,8 @@ func AddEdbDataFromSciHq(edbCode string) (err error) {
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -74,7 +76,7 @@ func RefreshEdbDataFromSciHq(edbInfoId int, edbCode, startDate string) (err erro
 	source := utils.DATA_SOURCE_SCI_HQ
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	edbInfoIdStr := strconv.Itoa(edbInfoId)
 	//计算数据
 	var condition string
@@ -169,7 +171,7 @@ func RefreshEdbDataFromSciHq(edbInfoId int, edbCode, startDate string) (err erro
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
 		if err != nil {
 			fmt.Println("RefreshEdbDataFromSci add Err", err.Error())
 			return
@@ -189,62 +191,101 @@ type HandleSciHqExcelDataReq struct {
 	Data           map[string]string
 }
 
+//type BaseFromSciHqIndex struct {
+//	BaseFromSciHqIndexId int       `orm:"column(base_from_sci_hq_index_id);pk"` //序号
+//	IndexCode            string    `description:"指标编码"`
+//	IndexName            string    `description:"指标名称"`
+//	ClassifyId           int       `description:"分类id"`
+//	Frequency            string    `description:"频率"`
+//	Unit                 string    `description:"单位"`
+//	StartDate            string    `description:"开始日期"`
+//	EndDate              string    `description:"结束日期"`
+//	Sort                 int       `description:"排序"`
+//	TerminalCode         string    `description:"终端编码"`
+//	FilePath             string    `description:"文件路径"`
+//	CreateTime           time.Time `description:"创建时间"`
+//	ModifyTime           time.Time `description:"更新时间"`
+//}
+
 type BaseFromSciHqIndex struct {
-	BaseFromSciHqIndexId int       `orm:"column(base_from_sci_hq_index_id);pk"` //序号
-	IndexCode            string    `description:"指标编码"`
-	IndexName            string    `description:"指标名称"`
-	ClassifyId           int       `description:"分类id"`
-	Frequency            string    `description:"频率"`
-	Unit                 string    `description:"单位"`
-	StartDate            string    `description:"开始日期"`
-	EndDate              string    `description:"结束日期"`
-	Sort                 int       `description:"排序"`
-	TerminalCode         string    `description:"终端编码"`
-	FilePath             string    `description:"文件路径"`
-	CreateTime           time.Time `description:"创建时间"`
-	ModifyTime           time.Time `description:"更新时间"`
+	BaseFromSciHqIndexId int       `gorm:"column:base_from_sci_hq_index_id;primaryKey" description:"序号"`
+	IndexCode            string    `gorm:"column:index_code" description:"指标编码"`
+	IndexName            string    `gorm:"column:index_name" description:"指标名称"`
+	ClassifyId           int       `gorm:"column:classify_id" description:"分类id"`
+	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:"结束日期"`
+	Sort                 int       `gorm:"column:sort" description:"排序"`
+	TerminalCode         string    `gorm:"column:terminal_code" description:"终端编码"`
+	FilePath             string    `gorm:"column:file_path" description:"文件路径"`
+	CreateTime           time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime           time.Time `gorm:"column:modify_time" description:"更新时间"`
+}
+func (m *BaseFromSciHqIndex) TableName() string {
+	return "base_from_sci_hq_index"
 }
 
 func GetAllBaseFromSciHqIndex() (items []*BaseFromSciHqIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_sci_hq_index`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
 
 func BatchAddBaseFromSciHqIndex(list []*BaseFromSciHqIndex) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(list), list)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(len(list), list)
+	err = global.DEFAULT_DmSQL.CreateInBatches(list, 500).Error
 	return
 }
 
+//type BaseFromSciHqData struct {
+//	SciHqDataId          int       `orm:"column(sci_hq_data_id);pk"`         //序号
+//	BaseFromSciHqIndexId int       `orm:"column(base_from_sci_hq_index_id)"` //指标id
+//	IndexCode            string    `description:"指标编码"`
+//	DataTime             string    `description:"数据时间"`
+//	Value                string    `description:"数据值"`
+//	CreateTime           time.Time `description:"创建时间"`
+//	ModifyTime           time.Time `description:"更新时间"`
+//	DataTimestamp        int64     `description:"数据时间戳"`
+//}
+
 type BaseFromSciHqData struct {
-	SciHqDataId          int       `orm:"column(sci_hq_data_id);pk"`         //序号
-	BaseFromSciHqIndexId int       `orm:"column(base_from_sci_hq_index_id)"` //指标id
-	IndexCode            string    `description:"指标编码"`
-	DataTime             string    `description:"数据时间"`
-	Value                string    `description:"数据值"`
-	CreateTime           time.Time `description:"创建时间"`
-	ModifyTime           time.Time `description:"更新时间"`
-	DataTimestamp        int64     `description:"数据时间戳"`
+	SciHqDataId          int       `gorm:"column:sci_hq_data_id;primaryKey" description:"序号"`
+	BaseFromSciHqIndexId int       `gorm:"column:base_from_sci_hq_index_id" description:"指标id"`
+	IndexCode            string    `gorm:"column:index_code" description:"指标编码"`
+	DataTime             string    `gorm:"column:data_time" description:"数据时间"`
+	Value                string    `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 (r *BaseFromSciHqData) TableName() string {
+	return "base_from_sci_hq_data"
 }
 
 func (r *BaseFromSciHqData) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(r, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(r, cols...)
+	err = global.DEFAULT_DmSQL.Model(r).Updates(cols).Error
 	return
 }
 
 func BatchAddBaseFromSciHqData(list []*BaseFromSciHqData) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(500, list)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(500, list)
+	err = global.DEFAULT_DmSQL.CreateInBatches(list, 500).Error
 	return
 }
 
 func GetSciHqIndexInfoMaxAndMinInfo(indexCode string) (item *EdbInfoMaxAndMinInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	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 base_from_sci_hq_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Scan(&item).Error
 
 	if err != nil {
 		return
@@ -255,7 +296,9 @@ func GetSciHqIndexInfoMaxAndMinInfo(indexCode string) (item *EdbInfoMaxAndMinInf
 	var latestDate string
 
 	sql = ` SELECT value AS latest_value, data_time AS latest_date FROM base_from_sci_hq_data WHERE index_code=? ORDER BY data_time DESC LIMIT 1 `
-	err = o.Raw(sql, indexCode).QueryRow(&latest_value, &latestDate)
+	//err = o.Raw(sql, indexCode).QueryRow(&latest_value, &latestDate)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&latest_value, &latestDate).Error
+
 	if err != nil {
 		return
 	}
@@ -266,8 +309,9 @@ func GetSciHqIndexInfoMaxAndMinInfo(indexCode string) (item *EdbInfoMaxAndMinInf
 }
 
 func ModifySciHqIndexMaxAndMinInfo(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_sci_hq_index SET start_date=?,end_date=?,latest_value=?,latest_date=?,modify_time=NOW() WHERE index_code=? `
-	_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, item.LatestDate, indexCode).Exec()
+	//_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, item.LatestDate, indexCode).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, item.LatestValue, item.LatestDate, indexCode).Error
 	return
 }

models/base_from_sh.go

@@ -1,16 +1,16 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
 )
 
 type BaseFromTradeShIndex struct {
-	BaseFromTradeShIndexId int `orm:"column(base_from_trade_shanghai_index_id);pk"`
+	BaseFromTradeShIndexId int `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"`
 	Rank                   int
 	DealShortName          string
 	DealName               string
@@ -34,9 +34,12 @@ type BaseFromTradeShIndex struct {
 	ModifyTime             time.Time
 	DataTime               string
 }
+func (m *BaseFromTradeShIndex) TableName() string {
+	return "base_from_trade_shanghai_index"
+}
 
 type BaseFromShDataSimple struct {
-	Id        int `orm:"column(base_from_trade_shanghai_index_id);pk"`
+	Id        int    `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"`
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -45,23 +48,28 @@ type BaseFromShDataSimple struct {
 	BuyValue  string
 	SoldValue string
 }
+func (m *BaseFromShDataSimple) TableName() string {
+	return "base_from_trade_shanghai_index"
+}
 
 func GetBaseFromShDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeShIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_shanghai_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Scan(&list).Error
 	return
 }
 
 func GetShDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromShDataSimple, err error) {
 	sql := ` SELECT * FROM base_from_trade_shanghai_index WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY data_time DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
 	return
 }
 
@@ -76,7 +84,7 @@ func AddEdbDataFromSh(edbCode string) (err error) {
 		suffix = "sold"
 	}
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	shBaseDataAll, err := GetBaseFromShDataAllByIndexCode(edbCode, suffix)
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -117,7 +125,8 @@ func AddEdbDataFromSh(edbCode string) (err error) {
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -130,7 +139,7 @@ func RefreshEdbDataFromSh(edbInfoId int, edbCode, startDate string) (err error)
 	source := utils.DATA_SOURCE_SH
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -257,7 +266,8 @@ func RefreshEdbDataFromSh(edbInfoId int, edbCode, startDate string) (err error)
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -302,7 +312,7 @@ type SHMessage struct {
 }
 
 type BaseFromTradeShanghaiIndex struct {
-	BaseFromTradeShangHaiIndexId int `orm:"column(base_from_trade_shanghai_index_id);pk"`
+	BaseFromTradeShanghaiIndexId int    `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"`
 	Rank                         int
 	DealShortName                string
 	DealName                     string
@@ -326,23 +336,29 @@ type BaseFromTradeShanghaiIndex struct {
 	ModifyTime                   time.Time
 	DataTime                     string
 }
+func (m *BaseFromTradeShanghaiIndex) TableName() string {
+	return "base_from_trade_shanghai_index"
+}
 
 func AddBaseFromTradeShangHaiIndex(item *BaseFromTradeShanghaiIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
 func GetBaseFromTradeShangHaiIndexAll(dateStr string) (list []*BaseFromTradeShanghaiIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_shanghai_index WHERE data_time=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Scan(&list).Error
 	return
 }
 
 func ModifyBaseFromTradeShangHaiIndex(dealValue, buyValue, soldValue int, dataId int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_trade_shanghai_index SET deal_value=?,buy_value=?,sold_value=?,modify_time=NOW() WHERE base_from_trade_shanghai_index_id=? `
-	_, err = o.Raw(sql, dealValue, buyValue, soldValue, dataId).Exec()
+	//_, err = o.Raw(sql, dealValue, buyValue, soldValue, dataId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, dealValue, buyValue, soldValue, dataId).Error
 	return
 }

models/base_from_shfe.go

@@ -1,16 +1,16 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
 )
 
 type BaseFromTradeShfeIndex struct {
-	BaseFromTradeShfeIndexId int `orm:"column(base_from_trade_ine_index_id);pk"`
+	BaseFromTradeShfeIndexId int `gorm:"column:base_from_trade_ine_index_id;primaryKey"`
 	Rank                     int
 	DealShortName            string
 	DealName                 string
@@ -34,17 +34,21 @@ type BaseFromTradeShfeIndex struct {
 	ModifyTime               time.Time
 	DataTime                 string
 }
+func (m *BaseFromTradeShfeIndex) TableName() string {
+	return "base_from_trade_ine_index"
+}
 
 func GetBaseFromShfeDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeShfeIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_ine_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Scan(&list).Error
 	return
 }
 
 type BaseFromShfeDataSimple struct {
-	Id        int `orm:"column(base_from_trade_ine_index_id);pk"`
+	Id        int `gorm:"column:base_from_trade_ine_index_id;primaryKey"`
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -53,15 +57,19 @@ type BaseFromShfeDataSimple struct {
 	BuyValue  string
 	SoldValue string
 }
+func (m *BaseFromShfeDataSimple) TableName() string {
+	return "base_from_trade_ine_index"
+}
 
 func GetShfeDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromShfeDataSimple, err error) {
 	sql := ` SELECT * FROM base_from_trade_ine_index WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY data_time DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&item).Error
 	return
 }
 
@@ -75,7 +83,7 @@ func AddEdbDataFromShfe(edbCode string) (err error) {
 	} else if strings.Contains(edbCode, "sold") {
 		suffix = "sold"
 	}
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	ineBaseDataAll, err := GetBaseFromShfeDataAllByIndexCode(edbCode, suffix)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		return
@@ -115,7 +123,8 @@ func AddEdbDataFromShfe(edbCode string) (err error) {
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -128,7 +137,7 @@ func RefreshEdbDataFromShfe(edbInfoId int, edbCode, startDate string) (err error
 	source := utils.DATA_SOURCE_SHFE
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -255,7 +264,8 @@ func RefreshEdbDataFromShfe(edbInfoId int, edbCode, startDate string) (err error
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -264,7 +274,7 @@ func RefreshEdbDataFromShfe(edbInfoId int, edbCode, startDate string) (err error
 }
 
 type BaseFromTradeIneIndex struct {
-	BaseFromTradeIneIndexId int `orm:"column(base_from_trade_ine_index_id);pk"`
+	BaseFromTradeIneIndexId int `gorm:"column:base_from_trade_ine_index_id;primaryKey"`
 	Rank                    int
 	DealShortName           string
 	DealName                string
@@ -288,45 +298,56 @@ type BaseFromTradeIneIndex struct {
 	ModifyTime              time.Time
 	DataTime                string
 }
+func (m *BaseFromTradeIneIndex) TableName() string {
+	return "base_from_trade_ine_index"
+}
 
 type BaseFromTradeMapping struct {
-	BaseFromTradeMappingId int `orm:"column(base_from_trade_mapping_id);pk"`
+	BaseFromTradeMappingId int `gorm:"column:base_from_trade_mapping_id;primaryKey"`
 	IndexName              string
 	IndexCode              string
 	Exchange               string
 }
+func (m *BaseFromTradeMapping) TableName() string {
+	return "base_from_trade_mapping"
+}
 
 func AddBaseFromTradeIneIndex(item *BaseFromTradeIneIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
 func GetBaseFromTradeIneIndexAll(dateStr string) (list []*BaseFromTradeIneIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_ine_index where data_time=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Scan(&list).Error
 	return
 }
 
 func ModifyBaseFromTradeIneIndex(dealValue, buyValue, soldValue int, dataId int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_trade_ine_index SET deal_value=?,buy_value=?,sold_value=?,modify_time=NOW() WHERE base_from_trade_ine_index_id=? `
-	_, err = o.Raw(sql, dealValue, buyValue, soldValue, dataId).Exec()
+	//_, err = o.Raw(sql, dealValue, buyValue, soldValue, dataId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, dealValue, buyValue, soldValue, dataId).Error
 	return
 }
 
 func GetIndexCodeFromMapping(exchange string) (list []*BaseFromTradeMapping, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_mapping where exchange=?`
-	_, err = o.Raw(sql, exchange).QueryRows(&list)
+	//_, err = o.Raw(sql, exchange).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, exchange).Scan(&list).Error
 	return
 }
 
 func AddBaseFromTradeMapping(indexName, indexCode, exchange string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := "Insert Into base_from_trade_mapping(index_name,index_code,exchange) Values('" + indexName + "','" + indexCode + "','" + exchange + "')"
-	_, err = o.Raw(sql).Exec()
+	//_, err = o.Raw(sql).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql).Error
 	return
 }
 

models/base_from_smm.go

@@ -1,17 +1,16 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type BaseFromSmmData struct {
-	SmmDataId          int `orm:"column(smm_data_id);pk"`
+	SmmDataId          int `gorm:"column:smm_data_id;primaryKey"`
 	BaseFromSmmIndexId int
 	IndexCode          string
 	DataTime           string
@@ -20,39 +19,46 @@ type BaseFromSmmData struct {
 	ModifyTime         time.Time
 	DataTimestamp      int64
 }
+func (m *BaseFromSmmData) TableName() string {
+	return "base_from_smm_data"
+}
 
 func (s *BaseFromSmmData) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(s, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(s, cols...)
+	err = global.DEFAULT_DmSQL.Model(s).Updates(cols).Error
 	return
 }
 
 func AddBaseFromSmmData(item []*BaseFromSmmData) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(500, item)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(500, item)
+	err = global.DEFAULT_DmSQL.CreateInBatches(item, 500).Error
 	return
 }
 
 func GetBaseFromSmmDataByCondition(condition string, pars []interface{}) (list []*BaseFromSmmData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_smm_data WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&list).Error
 	return
 }
 
 func UpdateBaseFromSmmDataListByIndexCode(items []*BaseFromSmmData) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_smm_data SET value=? WHERE index_code=? AND data_time=? `
-	stmt, err := o.Raw(sql).Prepare()
-	if err != nil {
-		return
-	}
-	defer stmt.Close()
+	//stmt, err := o.Raw(sql).Prepare()
+	//if err != nil {
+	//	return
+	//}
+	//defer stmt.Close()
 	for _, item := range items {
-		_, err = stmt.Exec(item.Value, item.IndexCode, item.DataTime)
+		//_, err = stmt.Exec(item.Value, item.IndexCode, item.DataTime)
+		err = global.DEFAULT_DmSQL.Exec(sql, item.Value, item.IndexCode, item.DataTime).Error
 		if err != nil {
 			return
 		}
@@ -64,22 +70,24 @@ func GetBaseFromSmmDataByIds(smmDataIds []int) (list []*BaseFromSmmData, err err
 	if len(smmDataIds) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_smm_data WHERE 1=1 AND base_from_smm_index_id in (` + utils.GetOrmInReplace(len(smmDataIds)) + `)`
-	_, err = o.Raw(sql, smmDataIds).QueryRows(&list)
+	//_, err = o.Raw(sql, smmDataIds).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, smmDataIds).Scan(&list).Error
 	return
 }
 
 func GetBaseFromSmmDataByCodeAndDate(indexCode string, dataTime string) (item *BaseFromSmmData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_smm_data WHERE 1=1 AND index_code=? AND data_time=? `
-	err = o.Raw(sql, indexCode, dataTime).QueryRow(&item)
+	//err = o.Raw(sql, indexCode, dataTime).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode, dataTime).Scan(&item).Error
 	return
 }
 
 // 新增有色指标数据
 func AddEdbDataFromSmm(edbCode string, smmBaseDataAll []*BaseFromSmmData) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_ys(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	existMap := make(map[string]string)
@@ -100,7 +108,8 @@ func AddEdbDataFromSmm(edbCode string, smmBaseDataAll []*BaseFromSmmData) (err e
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -113,7 +122,7 @@ func RefreshEdbDataFromSmm(edbInfoId int, edbCode, startDate string) (err error)
 	source := utils.DATA_SOURCE_YS
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -211,7 +220,8 @@ func RefreshEdbDataFromSmm(edbInfoId int, edbCode, startDate string) (err error)
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshEdbDataFromSmm add Err", err.Error())
 			return
@@ -221,7 +231,7 @@ func RefreshEdbDataFromSmm(edbInfoId int, edbCode, startDate string) (err error)
 }
 
 type BaseFromSmmIndex struct {
-	BaseFromSmmIndexId int64 `orm:"column(base_from_smm_index_id);pk"`
+	BaseFromSmmIndexId int64 `gorm:"column:base_from_smm_index_id;primaryKey"`
 	ClassifyId         int
 	Interface          string
 	Name               string
@@ -246,47 +256,56 @@ type BaseFromSmmIndex struct {
 	DataState          string
 	ReleaseTime        string
 }
+func (d *BaseFromSmmIndex) TableName() string {
+	return "base_from_smm_index"
+}
 
 func (d *BaseFromSmmIndex) AddBaseFromSmmIndex() (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(d)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(d)
+	err = global.DEFAULT_DmSQL.Create(d).Error
 	return
 }
 
 func (d *BaseFromSmmIndex) GetSmmIndexItem(indexCode string) (item *BaseFromSmmIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_smm_index WHERE index_code=? `
 
-	fmt.Println(sql, indexCode)
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	//fmt.Println(sql, indexCode)
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Scan(&item).Error
 	return
 }
 
 // Add 新增
 func (m *BaseFromSmmIndex) Add() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(m)
+	//o := orm.NewOrm()
+	//_, err = o.Insert(m)
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
 func GetBaseFromSmmDataBySmmCode(smmCode string) (list []*BaseFromSmmData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_smm_data WHERE index_code=? `
-	_, err = o.Raw(sql, smmCode).QueryRows(&list)
+	//_, err = o.Raw(sql, smmCode).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, smmCode).Scan(&list).Error
 	return
 }
 
 func ModifySmmIndexSort(baseFromSmmIndexId int64) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_smm_index SET sort=? WHERE base_from_smm_index_id=? `
-	_, err = o.Raw(sql, baseFromSmmIndexId, baseFromSmmIndexId).Exec()
+	//_, err = o.Raw(sql, baseFromSmmIndexId, baseFromSmmIndexId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, baseFromSmmIndexId, baseFromSmmIndexId).Error
 	return
 }
 
 func GetSmmIndexInfoMaxAndMinInfo(indexCode string) (item *EdbInfoMaxAndMinInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	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 base_from_smm_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Scan(&item).Error
 	if err != nil {
 		return
 	}
@@ -294,7 +313,8 @@ func GetSmmIndexInfoMaxAndMinInfo(indexCode string) (item *EdbInfoMaxAndMinInfo,
 	// 获取最新值
 	var latest_value float64
 	sql = ` SELECT value AS latest_value FROM base_from_smm_data WHERE index_code=? ORDER BY data_time DESC LIMIT 1 `
-	err = o.Raw(sql, indexCode).QueryRow(&latest_value)
+	//err = o.Raw(sql, indexCode).QueryRow(&latest_value)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Scan(&latest_value).Error
 	if err != nil {
 		return
 	}
@@ -304,9 +324,10 @@ func GetSmmIndexInfoMaxAndMinInfo(indexCode string) (item *EdbInfoMaxAndMinInfo,
 }
 
 func ModifySmmIndexMaxAndMinInfo(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_smm_index SET start_date=?,end_date=?,end_value=?,modify_time=NOW() WHERE index_code=? `
-	_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, indexCode).Exec()
+	//_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, indexCode).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, item.LatestValue, indexCode).Error
 	return
 }
 
@@ -329,20 +350,21 @@ func MultiUpdateBaseFromSmmDataValue(items []*BaseFromSmmData) (err error) {
 		return
 	}
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_smm_data SET value = ?, modify_time = NOW() WHERE index_code = ? AND data_time = ? LIMIT 1`
-	p, err := o.Raw(sql).Prepare()
-	if err != nil {
-		return
-	}
-	defer func() {
-		_ = p.Close()
-	}()
+	//p, err := o.Raw(sql).Prepare()
+	//if err != nil {
+	//	return
+	//}
+	//defer func() {
+	//	_ = p.Close()
+	//}()
 	for _, v := range items {
 		if v.IndexCode == "" || v.DataTime == "" {
 			continue
 		}
-		_, err = p.Exec(v.Value, v.IndexCode, v.DataTime)
+		//_, err = p.Exec(v.Value, v.IndexCode, v.DataTime)
+		err = global.DEFAULT_DmSQL.Exec(sql, v.Value, v.IndexCode, v.DataTime).Error
 		if err != nil {
 			return
 		}
@@ -358,22 +380,24 @@ type AddSmmIndexToDataSourceResp struct {
 }
 
 func (m *BaseFromSmmIndex) GetIndexItem(indexCode string) (item *BaseFromSmmIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_smm_index WHERE index_code = ? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Scan(&item).Error
 	return
 }
 
 // 修改
 func (m *BaseFromSmmIndex) Update(updateParams, whereParam map[string]interface{}) (err error) {
-	to := orm.NewOrm()
-	ptrStructOrTableName := "base_from_smm_index"
-
-	qs := to.QueryTable(ptrStructOrTableName)
-	for expr, exprV := range whereParam {
-		qs = qs.Filter(expr, exprV)
-	}
-	_, err = qs.Update(updateParams)
+	//to := orm.NewOrm()
+	//ptrStructOrTableName := "base_from_smm_index"
+	//
+	//qs := to.QueryTable(ptrStructOrTableName)
+	//for expr, exprV := range whereParam {
+	//	qs = qs.Filter(expr, exprV)
+	//}
+	//_, err = qs.Update(updateParams)
+	err = global.DEFAULT_DmSQL.Model(m).Where(whereParam).Updates(updateParams).Error
 	return
 }
 
@@ -455,8 +479,9 @@ type SmmListResp struct {
 }
 
 func AddBaseFromSmmIndex(list []*BaseFromSmmIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(list), list)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(len(list), list)
+	err = global.DEFAULT_DmSQL.CreateInBatches(list, 500).Error
 	return
 }
 
@@ -467,29 +492,33 @@ type BridgeZhongJiIndexLatestDataParams struct {
 }
 
 func GetBaseFromSmmIndex() (list []*BaseFromSmmIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_smm_index`
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
 	return
 }
 
 func ModifyBaseFromSmmIndex(item *BaseFromSmmIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_smm_index SET end_date = ?, modify_time=NOW(), data_state= ? `
-	_, err = o.Raw(sql, item.EndDate, item.DataState).Exec()
+	//_, err = o.Raw(sql, item.EndDate, item.DataState).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, item.EndDate, item.DataState).Error
 	return
 }
 
 func (m *BaseFromSmmIndex) UpdateCols(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(m, cols...)
+	err = global.DEFAULT_DmSQL.Model(m).Updates(cols).Error
 	return
 }
 
 func ModifyBaseFromSmmIndexDate(item *BaseFromSmmIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_smm_index SET end_date = ?, modify_time=NOW(), data_state= ? WHERE base_from_smm_index_id=?`
-	_, err = o.Raw(sql, item.EndDate, item.DataState, item.BaseFromSmmIndexId).Exec()
+	//_, err = o.Raw(sql, item.EndDate, item.DataState, item.BaseFromSmmIndexId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, item.EndDate, item.DataState, item.BaseFromSmmIndexId).Error
 	return
 }
 
@@ -524,7 +553,7 @@ func RefreshEdbDataFromSmmToEdb(edbInfoId int, edbCode, startDate string, smmDat
 	source := utils.DATA_SOURCE_YS
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -617,7 +646,8 @@ func RefreshEdbDataFromSmmToEdb(edbInfoId int, edbCode, startDate string, smmDat
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshEdbDataFromSmm add Err", err.Error())
 			return
@@ -627,7 +657,7 @@ func RefreshEdbDataFromSmmToEdb(edbInfoId int, edbCode, startDate string, smmDat
 }
 
 type BaseFromSmmRecord struct {
-	BaseFromSmmRecordId int64 `orm:"column(base_from_smm_record_id);pk"`
+	BaseFromSmmRecordId int64 `gorm:"column:base_from_smm_record_id;primaryKey"`
 	BaseFromSmmIndexId  int64
 	OldIndexName        string    `description:"原始名称"`
 	NewIndexName        string    `description:"新的名称"`
@@ -635,8 +665,12 @@ type BaseFromSmmRecord struct {
 	Timestamp           int64     `description:"记录创建时间戳"`
 }
 
+func (m *BaseFromSmmRecord) TableName() string {
+	return "base_from_smm_record"
+}
 func AddBaseFromSmmRecord(item *BaseFromSmmRecord) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//_, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }

models/base_from_smm_classify.go

@@ -1,14 +1,14 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"time"
 )
 
 type BaseFromSmmClassify struct {
-	ClassifyId      int       `orm:"column(classify_id);pk"`
+	ClassifyId      int      `gorm:"column:classify_id;primaryKey"`
 	ClassifyName    string    `description:"分类名称"`
 	ParentId        int       `description:"父级id"`
 	SysUserId       int       `description:"创建人id"`
@@ -19,9 +19,13 @@ type BaseFromSmmClassify struct {
 	CreateTime      time.Time `description:"创建时间"`
 }
 
+func (m *BaseFromSmmClassify) TableName() string {
+	return "base_from_smm_classify"
+}
 func AddSmmClassify(item *BaseFromSmmClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
@@ -35,9 +39,10 @@ type AddSmmClassifyReq struct {
 
 // 判断分类名称是否存在
 func GetSmmClassify(classifyName string, parentId int) (item *BaseFromSmmClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_smm_classify WHERE parent_id=? AND classify_name=? `
-	err = o.Raw(sql, parentId, classifyName).QueryRow(&item)
+	//err = o.Raw(sql, parentId, classifyName).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, parentId, classifyName).Scan(&item).Error
 	return
 }
 

models/base_from_stock_plant.go

@@ -1,21 +1,31 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/models/supply_analysis"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
 )
 
 // StockPlantEdbdata 存量装置数据
+//type StockPlantEdbdata struct {
+//	VarietyEdbId string    `orm:"column(variety_edb_id);pk" description:"指标编码"`
+//	DataTime     string    `orm:"column(data_time)" description:"日期"`
+//	Value        string    `orm:"column(value)" description:"值"`
+//	ModifyTime   time.Time `orm:"column(modify_time)" description:"修改时间"`
+//}
+
 type StockPlantEdbdata struct {
-	VarietyEdbId string    `orm:"column(variety_edb_id);pk" description:"指标编码"`
-	DataTime     string    `orm:"column(data_time)" description:"日期"`
-	Value        string    `orm:"column(value)" description:"值"`
-	ModifyTime   time.Time `orm:"column(modify_time)" description:"修改时间"`
+	VarietyEdbId string    `gorm:"column:variety_edb_id;primaryKey" description:"指标编码"`
+	DataTime     string    `gorm:"column:data_time" description:"日期"`
+	Value        string    `gorm:"column:value" description:"值"`
+	ModifyTime   time.Time `gorm:"column:modify_time" description:"修改时间"`
+}
+func (m *StockPlantEdbdata) TableName() string {
+	return "base_from_stock_plant_data"
 }
 
 func GetStockPlantEdbDataByCondition(condition string, pars []interface{}) (item []*StockPlantEdbdata, err error) {
@@ -24,8 +34,9 @@ func GetStockPlantEdbDataByCondition(condition string, pars []interface{}) (item
 		sql += condition
 	}
 	sql += ` ORDER BY data_time DESC `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//o := orm.NewOrm()
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
 	return
 }
 
@@ -34,7 +45,7 @@ func RefreshEdbDataFromStockPlant(edbInfoId int, edbCode, startDate string) (err
 	source := utils.DATA_SOURCE_STOCK_PLANT
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -121,7 +132,8 @@ func RefreshEdbDataFromStockPlant(edbInfoId int, edbCode, startDate string) (err
 	// 将数据入库
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshAllEdbDataByStockPlant add Err", err.Error())
 			return

models/base_from_ths.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"
 	"strconv"
 	"strings"
 	"time"
@@ -26,7 +26,7 @@ type Tables struct {
 
 // 新增同花顺指标数据
 func AddEdbDataFromThs(edbCode string, item EdbDataFromThs) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	if len(item.Tables) > 0 {
 		table := item.Tables[0]
@@ -51,7 +51,8 @@ func AddEdbDataFromThs(edbCode string, item EdbDataFromThs) (err error) {
 		}
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
-			_, err = o.Raw(addSql).Exec()
+			//_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DmSQL.Exec(addSql).Error
 			if err != nil {
 				return
 			}
@@ -62,7 +63,7 @@ func AddEdbDataFromThs(edbCode string, item EdbDataFromThs) (err error) {
 
 // 刷新同花顺指标数据
 func RefreshEdbDataFromThs(edbInfoId int, edbCode, startDate string, item EdbDataFromThs) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	source := utils.DATA_SOURCE_THS
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
@@ -149,7 +150,8 @@ func RefreshEdbDataFromThs(edbInfoId int, edbCode, startDate string, item EdbDat
 
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
-			_, err = o.Raw(addSql).Exec()
+			//_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DmSQL.Exec(addSql).Error
 			if err != nil {
 				return err
 			}

models/base_from_ths_ds.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"
 	"strconv"
 	"strings"
 	"time"
@@ -13,7 +13,7 @@ var thsds = "thsds"
 
 // 新增同花顺指标数据
 func AddEdbDataFromThsDs(stockCode, edbCode string, item EdbDataFromThs) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	edbCodeList := strings.Split(edbCode, ",")
 	indexCodeMap := make(map[string]string)
@@ -45,13 +45,15 @@ func AddEdbDataFromThsDs(stockCode, edbCode string, item EdbDataFromThs) (err er
 			for _, v := range indexCodeMap {
 				var count int
 				sql := ` SELECT COUNT(1) FROM edb_data_ths_ds WHERE edb_code=? `
-				err = o.Raw(sql, v).QueryRow(&count)
+				//err = o.Raw(sql, v).QueryRow(&count)
+				err = global.DEFAULT_DmSQL.Raw(sql, v).Scan(&count).Error
 				if err != nil {
 					return err
 				}
 				if count > 0 {
 					sql = ` DELETE FROM edb_data_ths_ds WHERE edb_code=? `
-					_, err = o.Raw(sql, v).Exec()
+					//_, err = o.Raw(sql, v).Exec()
+					err = global.DEFAULT_DmSQL.Exec(sql, v).Error
 					if err != nil {
 						return err
 					}
@@ -59,7 +61,8 @@ func AddEdbDataFromThsDs(stockCode, edbCode string, item EdbDataFromThs) (err er
 			}
 
 			addSql = strings.TrimRight(addSql, ",")
-			_, err = o.Raw(addSql).Exec()
+			//_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DmSQL.Exec(addSql).Error
 			if err != nil {
 				return
 			}
@@ -70,7 +73,7 @@ func AddEdbDataFromThsDs(stockCode, edbCode string, item EdbDataFromThs) (err er
 
 // 刷新同花顺指标数据
 func RefreshEdbDataFromThsDs(edbInfoId int, edbCode, startDate string, item EdbDataFromThs) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	source := utils.DATA_SOURCE_THS
 	subSource := utils.DATA_SUB_SOURCE_DATE
 
@@ -157,7 +160,8 @@ func RefreshEdbDataFromThsDs(edbInfoId int, edbCode, startDate string, item EdbD
 
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
-			_, err = o.Raw(addSql).Exec()
+			//_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DmSQL.Exec(addSql).Error
 			if err != nil {
 				return err
 			}

models/base_from_ths_hf.go

@@ -1,10 +1,10 @@
 package models
 
 import (
+	"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"
 	"go.mongodb.org/mongo-driver/bson"
 	"strings"
 	"time"
@@ -18,7 +18,7 @@ var (
 
 // BaseFromThsHfIndex 同花顺高频数据
 type BaseFromThsHfIndex struct {
-	BaseFromThsHfIndexId    int       `orm:"column(base_from_ths_hf_index_id);pk"`
+	BaseFromThsHfIndexId    int       `gorm:"column:base_from_ths_hf_index_id;primaryKey"`
 	BaseFromThsHfClassifyId int       `description:"分类ID"`
 	IndexCode               string    `description:"指标编码"`
 	IndexName               string    `description:"指标名称"`
@@ -96,12 +96,13 @@ func (m *BaseFromThsHfIndex) Cols() BaseFromThsHfIndexCols {
 }
 
 func (m *BaseFromThsHfIndex) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
+	//o := orm.NewOrm()
+	//id, err := o.Insert(m)
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	if err != nil {
 		return
 	}
-	m.BaseFromThsHfIndexId = int(id)
+	//m.BaseFromThsHfIndexId = int(id)
 	return
 }
 
@@ -109,21 +110,24 @@ func (m *BaseFromThsHfIndex) CreateMulti(items []*BaseFromThsHfIndex) (err error
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(len(items), items)
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, len(items)).Error
 	return
 }
 
 func (m *BaseFromThsHfIndex) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(m, cols...)
+	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
 func (m *BaseFromThsHfIndex) Remove() (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.BaseFromThsHfIndexId).Exec()
+	//_, err = o.Raw(sql, m.BaseFromThsHfIndexId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, m.BaseFromThsHfIndexId).Error
 	return
 }
 
@@ -131,9 +135,10 @@ func (m *BaseFromThsHfIndex) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+	//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 = o.Raw(sql, ids).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
 	return
 }
 
@@ -141,39 +146,43 @@ func (m *BaseFromThsHfIndex) RemoveByCondition(condition string, pars []interfac
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	//_, err = o.Raw(sql, pars).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
 	return
 }
 
 func (m *BaseFromThsHfIndex) GetItemById(id int) (item *BaseFromThsHfIndex, err error) {
-	o := orm.NewOrm()
+	//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 = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *BaseFromThsHfIndex) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *BaseFromThsHfIndex, err error) {
-	o := orm.NewOrm()
+	//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 = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *BaseFromThsHfIndex) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	//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 = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&count).Error
 	return
 }
 
 func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromThsHfIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -183,12 +192,13 @@ func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interf
 		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 = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
 	return
 }
 
 func (m *BaseFromThsHfIndex) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BaseFromThsHfIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -198,7 +208,8 @@ func (m *BaseFromThsHfIndex) GetPageItemsByCondition(condition string, pars []in
 		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 = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Find(&items).Error
 	return
 }
 

models/base_from_ths_hf_data.go

@@ -1,16 +1,16 @@
 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"
 )
 
 // BaseFromThsHfData 同花顺高频数据-指标数据
 type BaseFromThsHfData struct {
-	BaseFromThsHfDataId  int       `orm:"column(base_from_ths_hf_data_id);pk"`
+	BaseFromThsHfDataId  int       `gorm:"column:base_from_ths_hf_data_id;primaryKey"`
 	BaseFromThsHfIndexId int       `description:"指标ID"`
 	IndexCode            string    `description:"指标编码"`
 	DataTime             time.Time `description:"数据日期（至时分秒）"`
@@ -52,12 +52,13 @@ func (m *BaseFromThsHfData) Cols() BaseFromThsHfDataCols {
 }
 
 func (m *BaseFromThsHfData) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
+	//o := orm.NewOrm()
+	//id, err := o.Insert(m)
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	if err != nil {
 		return
 	}
-	m.BaseFromThsHfDataId = int(id)
+	//m.BaseFromThsHfDataId = int(id)
 	return
 }
 
@@ -65,21 +66,24 @@ func (m *BaseFromThsHfData) CreateMulti(items []*BaseFromThsHfData) (err error)
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(500, items)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(500, items)
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
 	return
 }
 
 func (m *BaseFromThsHfData) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(m, cols...)
+	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
 func (m *BaseFromThsHfData) Remove() (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.BaseFromThsHfDataId).Exec()
+	//_, err = o.Raw(sql, m.BaseFromThsHfDataId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, m.BaseFromThsHfDataId).Error
 	return
 }
 
@@ -87,9 +91,10 @@ func (m *BaseFromThsHfData) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+	//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 = o.Raw(sql, ids).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
 	return
 }
 
@@ -97,39 +102,43 @@ func (m *BaseFromThsHfData) RemoveByCondition(condition string, pars []interface
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	//_, err = o.Raw(sql, pars).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
 	return
 }
 
 func (m *BaseFromThsHfData) GetItemById(id int) (item *BaseFromThsHfData, err error) {
-	o := orm.NewOrm()
+	//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 = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *BaseFromThsHfData) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *BaseFromThsHfData, err error) {
-	o := orm.NewOrm()
+	//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 = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *BaseFromThsHfData) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	//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 = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&count).Error
 	return
 }
 
 func (m *BaseFromThsHfData) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromThsHfData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -139,12 +148,13 @@ func (m *BaseFromThsHfData) GetItemsByCondition(condition string, pars []interfa
 		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 = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
 	return
 }
 
 func (m *BaseFromThsHfData) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BaseFromThsHfData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -154,7 +164,8 @@ func (m *BaseFromThsHfData) GetPageItemsByCondition(condition string, pars []int
 		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 = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Find(&items).Error
 	return
 }
 
@@ -180,9 +191,10 @@ func (m *BaseFromThsHfData) Format2Item() (item *BaseFromThsHfDataItem) {
 }
 
 func (m *BaseFromThsHfData) MultiInsertOrUpdate(inserts, updates []*BaseFromThsHfData) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if len(inserts) > 0 {
-		_, e := o.InsertMulti(600, inserts)
+		//_, e := o.InsertMulti(600, inserts)
+		e := global.DEFAULT_DmSQL.CreateInBatches(inserts, 500).Error
 		if e != nil {
 			err = fmt.Errorf("insert multi err: %s", e.Error())
 			return
@@ -190,16 +202,17 @@ func (m *BaseFromThsHfData) MultiInsertOrUpdate(inserts, updates []*BaseFromThsH
 	}
 	if len(updates) > 0 {
 		sql := fmt.Sprintf("UPDATE %s SET %s = ?, modify_time = NOW() WHERE %s = ?", m.TableName(), m.Cols().Value, m.Cols().UniqueCode)
-		p, e := o.Raw(sql).Prepare()
-		if e != nil {
-			err = fmt.Errorf("prepare err: %s", e.Error())
-			return
-		}
-		defer func() {
-			_ = p.Close()
-		}()
+		//p, e := o.Raw(sql).Prepare()
+		//if e != nil {
+		//	err = fmt.Errorf("prepare err: %s", e.Error())
+		//	return
+		//}
+		//defer func() {
+		//	_ = p.Close()
+		//}()
 		for _, v := range updates {
-			_, e = p.Exec(v.Value, v.UniqueCode)
+			//_, e = p.Exec(v.Value, v.UniqueCode)
+			e := global.DEFAULT_DmSQL.Exec(sql, v.Value, v.UniqueCode).Error
 			if e != nil {
 				err = fmt.Errorf("update err: %s", e.Error())
 				return
@@ -210,9 +223,10 @@ func (m *BaseFromThsHfData) MultiInsertOrUpdate(inserts, updates []*BaseFromThsH
 }
 
 func (m *BaseFromThsHfData) GetIndexMinMax(indexCode string) (item *EdbInfoMaxAndMinInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT MIN(%s) AS min_date, MAX(%s) AS max_date, MIN(%s) AS min_value,MAX(%s) AS max_value FROM %s WHERE %s = ?`, m.Cols().DataTime, m.Cols().DataTime, m.Cols().Value, m.Cols().Value, m.TableName(), m.Cols().IndexCode)
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
 	if err != nil {
 		return
 	}
@@ -220,7 +234,8 @@ func (m *BaseFromThsHfData) GetIndexMinMax(indexCode string) (item *EdbInfoMaxAn
 	// 获取最新值
 	var lastVal float64
 	sql = fmt.Sprintf(`SELECT %s AS latest_value FROM %s WHERE %s = ? ORDER BY %s DESC LIMIT 1`, m.Cols().Value, m.TableName(), m.Cols().IndexCode, m.Cols().DataTime)
-	err = o.Raw(sql, indexCode).QueryRow(&lastVal)
+	//err = o.Raw(sql, indexCode).QueryRow(&lastVal)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&lastVal).Error
 	if err != nil {
 		return
 	}

models/base_from_wind.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"
 	"strconv"
 	"strings"
 	"time"
@@ -17,7 +17,7 @@ type EdbDataFromWind struct {
 }
 
 func AddEdbDataFromWind(edbCode string, item *EdbDataFromWind) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_wind(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
@@ -39,7 +39,8 @@ func AddEdbDataFromWind(edbCode string, item *EdbDataFromWind) (err error) {
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return
 		}
@@ -49,7 +50,7 @@ func AddEdbDataFromWind(edbCode string, item *EdbDataFromWind) (err error) {
 
 // RefreshEdbDataFromWind 刷新wind指标数据
 func RefreshEdbDataFromWind(edbInfoId int, edbCode, startDate string, item *EdbDataFromWind) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	source := utils.DATA_SOURCE_WIND
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
@@ -140,7 +141,8 @@ func RefreshEdbDataFromWind(edbInfoId int, edbCode, startDate string, item *EdbD
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshEdbDataFromWind add Err", err.Error())
 			return
@@ -157,8 +159,9 @@ type ServerUrlCountGroup struct {
 
 // GetServerUrlCountGroupByServerUrl 获取服务器地址分组总数
 func GetServerUrlCountGroupByServerUrl() (list []ServerUrlCountGroup, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `select server_url,count(1) total from edb_info where source = 2 AND no_update=0 AND server_url != "" group by server_url; `
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
 	return
 }

models/base_from_wind_wsd.go

@@ -2,9 +2,9 @@ package models
 
 import (
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
@@ -13,7 +13,7 @@ import (
 var windWsd = "wsd"
 
 func AddEdbDataFromWindWsd(stockCode string, item map[string]map[string]interface{}) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_wind_wsd(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
@@ -77,13 +77,15 @@ func AddEdbDataFromWindWsd(stockCode string, item map[string]map[string]interfac
 		for _, v := range indexCodeMap {
 			var count int
 			sql := ` SELECT COUNT(1) FROM edb_data_wind_wsd WHERE edb_code=? `
-			err = o.Raw(sql, v).QueryRow(&count)
+			//err = o.Raw(sql, v).QueryRow(&count)
+			err = global.DEFAULT_DmSQL.Raw(sql, v).Find(&count).Error
 			if err != nil {
 				return err
 			}
 			if count > 0 {
 				sql = ` DELETE FROM edb_data_wind_wsd WHERE edb_code=? `
-				_, err = o.Raw(sql, v).Exec()
+				//_, err = o.Raw(sql, v).Exec()
+				err = global.DEFAULT_DmSQL.Raw(sql, v).Find(&count).Error
 				if err != nil {
 					return err
 				}
@@ -91,7 +93,8 @@ func AddEdbDataFromWindWsd(stockCode string, item map[string]map[string]interfac
 		}
 
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("sql exec err:" + err.Error())
 			return
@@ -102,7 +105,7 @@ func AddEdbDataFromWindWsd(stockCode string, item map[string]map[string]interfac
 
 // RefreshEdbDataFromWind 刷新wind指标数据
 func RefreshEdbDataFromWindWsd(edbInfoId int, edbCode, startDate string, item map[string]map[string]interface{}) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	source := utils.DATA_SOURCE_WIND
 	subSource := utils.DATA_SUB_SOURCE_DATE
 
@@ -221,7 +224,8 @@ func RefreshEdbDataFromWindWsd(edbInfoId int, edbCode, startDate string, item ma
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshEdbDataFromWind add Err", err.Error())
 			return

models/base_from_yongyi.go

@@ -1,20 +1,19 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 // BaseFromYongyi 涌溢咨询
 type BaseFromYongyi struct{}
 
 type BaseFromYongyiData struct {
-	YongyiDataId  int `orm:"column(yongyi_data_id);pk"`
+	YongyiDataId  int `gorm:"column:yongyi_data_id;primaryKey"`
 	YongyiIndexId int
 	IndexCode     string
 	DataTime      string
@@ -23,20 +22,25 @@ type BaseFromYongyiData struct {
 	ModifyTime    time.Time
 	DataTimestamp int64
 }
+// tablename
+func (m *BaseFromYongyiData) TableName() string {
+	return "base_from_yongyi_data"
+}
 
 func GetBaseFromYongyiDataByCondition(condition string, pars []interface{}) (list []*BaseFromYongyiData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_yongyi_data WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&list).Error
 	return
 }
 
 // Add 添加
 func (obj BaseFromYongyi) Add(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -68,7 +72,8 @@ func (obj BaseFromYongyi) Add(edbCode string) (err error) {
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -79,7 +84,7 @@ func (obj BaseFromYongyi) Add(edbCode string) (err error) {
 // Refresh 刷新涌益咨询指标数据
 func (obj BaseFromYongyi) Refresh(edbInfoId int, edbCode, startDate string) (err error) {
 	source := obj.GetSource()
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -177,7 +182,8 @@ func (obj BaseFromYongyi) Refresh(edbInfoId int, edbCode, startDate string) (err
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshEdbDataFromBaiinfo add Err", err.Error())
 			return
@@ -197,7 +203,7 @@ func (obj BaseFromYongyi) GetSourceName() string {
 }
 
 type BaseFromYongyiIndex struct {
-	YongyiIndexId int64 `orm:"column(yongyi_index_id);pk"`
+	YongyiIndexId int64 `gorm:"column:yongyi_index_id;primaryKey"`
 	IndexCode     string
 	IndexName     string
 	Frequency     string
@@ -210,6 +216,9 @@ type BaseFromYongyiIndex struct {
 	CreateTime    time.Time
 	ModifyTime    time.Time
 }
+func (y *BaseFromYongyiIndex) TableName() string {
+	return "base_from_yongyi_index"
+}
 
 type BaseFromYongyiIndexList struct {
 	YongyiIndexId int64 `orm:"column(yongyi_index_id);pk"`
@@ -226,22 +235,25 @@ type BaseFromYongyiIndexList struct {
 }
 
 func (y *BaseFromYongyiData) GetByIndexCode(indexCode string) (list []*BaseFromYongyiData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_yongyi_data WHERE index_code=? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
 	return
 }
 
 func (y *BaseFromYongyiData) AddMulti(item []*BaseFromYongyiData) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(1, item)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(1, item)
+	err = global.DEFAULT_DmSQL.CreateInBatches(item, 500).Error
 	return
 }
 
 // Update 修改
 func (y *BaseFromYongyiData) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(y, updateCols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(y, updateCols...)
+	err = global.DEFAULT_DmSQL.Model(y).Select(updateCols).Updates(y).Error
 	return
 }
 
@@ -263,43 +275,49 @@ type HandleYongyiExcelDataReq struct {
 }
 
 func (y *BaseFromYongyiData) GetMaxAndMinDateByIndexCode(indexCode string) (item *EdbInfoMaxAndMinInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	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 base_from_yongyi_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
 	return
 }
 
 func (y *BaseFromYongyiIndex) ModifyIndexMaxAndMinDate(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_yongyi_index SET start_date=?,end_date=?,modify_time=NOW() WHERE index_code=? `
-	_, err = o.Raw(sql, item.MinDate, item.MaxDate, indexCode).Exec()
+	//_, err = o.Raw(sql, item.MinDate, item.MaxDate, indexCode).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, indexCode).Error
 	return
 }
 
 func (y *BaseFromYongyiIndex) GetByIndexCode(indexCode string) (item *BaseFromYongyiIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_yongyi_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
 	return
 }
 
 func (y *BaseFromYongyiIndex) Add() (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(y)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(y)
+	err = global.DEFAULT_DmSQL.Create(y).Error
+	lastId = y.YongyiIndexId
 	return
 }
 
 // Update 修改
 func (y *BaseFromYongyiIndex) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(y, updateCols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(y, updateCols...)
+	err = global.DEFAULT_DmSQL.Model(y).Select(updateCols).Updates(y).Error
 
 	return
 }
 
 // BaseFromYongyiClassify Yongyi原始数据分类表
 type BaseFromYongyiClassify struct {
-	ClassifyId      int64     `orm:"column(classify_id);pk"`
+	ClassifyId      int64     `gorm:"column:classify_id;primaryKey"`
 	ClassifyName    string    `description:"分类名称"`
 	ParentId        int       `description:"父级id"`
 	SysUserId       int       `description:"创建人id"`
@@ -309,31 +327,39 @@ type BaseFromYongyiClassify struct {
 	ModifyTime      time.Time `description:"修改时间"`
 	CreateTime      time.Time `description:"创建时间"`
 }
+func (y *BaseFromYongyiClassify) TableName() string {
+	return "base_from_yongyi_classify"
+}
 
 func (y *BaseFromYongyiClassify) Add() (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(y)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(y)
+	err = global.DEFAULT_DmSQL.Create(y).Error
+	lastId = y.ClassifyId
 	return
 }
 
 // Update 修改
 func (y *BaseFromYongyiClassify) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(y, updateCols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(y, updateCols...)
+	err = global.DEFAULT_DmSQL.Model(y).Select(updateCols).Updates(y).Error
 
 	return
 }
 
 func (y *BaseFromYongyiClassify) GetByClassifyName(classifyName string) (item *BaseFromYongyiClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_yongyi_classify WHERE classify_name=? `
-	err = o.Raw(sql, classifyName).QueryRow(&item)
+	//err = o.Raw(sql, classifyName).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, classifyName).First(&item).Error
 	return
 }
 
 func (y *BaseFromYongyiClassify) GetParentClassify() (items []*BaseFromYongyiClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_yongyi_classify WHERE classify_name in ("日度", "月度", "周度", "年度", "旬度") and parent_id=0 `
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }

models/base_from_zz.go

@@ -1,67 +1,114 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
 )
 
+//type BaseFromTradeZhengzhouIndex struct {
+//	BaseFromTradeZhengzhouIndexId int `orm:"column(base_from_trade_zhengzhou_index_id);pk"`
+//	Rank                          int
+//	DealShortName                 string
+//	DealName                      string
+//	DealCode                      string
+//	DealValue                     string
+//	DealChange                    int
+//	BuyShortName                  string
+//	BuyName                       string
+//	BuyCode                       string
+//	BuyValue                      string
+//	BuyChange                     int
+//	SoldShortName                 string
+//	SoldName                      string
+//	SoldCode                      string
+//	SoldValue                     string
+//	SoldChange                    int
+//	Frequency                     string
+//	ClassifyName                  string
+//	ClassifyType                  string
+//	CreateTime                    time.Time
+//	ModifyTime                    time.Time
+//	DataTime                      string
+//}
+
 type BaseFromTradeZhengzhouIndex struct {
-	BaseFromTradeZhengzhouIndexId int `orm:"column(base_from_trade_zhengzhou_index_id);pk"`
+	BaseFromTradeZhengzhouIndexId int       `gorm:"column:base_from_trade_zhengzhou_index_id;primaryKey"`
 	Rank                          int
-	DealShortName                 string
-	DealName                      string
-	DealCode                      string
-	DealValue                     string
-	DealChange                    int
-	BuyShortName                  string
-	BuyName                       string
-	BuyCode                       string
-	BuyValue                      string
-	BuyChange                     int
-	SoldShortName                 string
-	SoldName                      string
-	SoldCode                      string
-	SoldValue                     string
-	SoldChange                    int
-	Frequency                     string
-	ClassifyName                  string
-	ClassifyType                  string
-	CreateTime                    time.Time
-	ModifyTime                    time.Time
-	DataTime                      string
+	DealShortName                 string    `gorm:"column:deal_short_name"`
+	DealName                      string    `gorm:"column:deal_name"`
+	DealCode                      string    `gorm:"column:deal_code"`
+	DealValue                     string    `gorm:"column:deal_value"`
+	DealChange                    int       `gorm:"column:deal_change"`
+	BuyShortName                  string    `gorm:"column:buy_short_name"`
+	BuyName                       string    `gorm:"column:buy_name"`
+	BuyCode                       string    `gorm:"column:buy_code"`
+	BuyValue                      string    `gorm:"column:buy_value"`
+	BuyChange                     int       `gorm:"column:buy_change"`
+	SoldShortName                 string    `gorm:"column:sold_short_name"`
+	SoldName                      string    `gorm:"column:sold_name"`
+	SoldCode                      string    `gorm:"column:sold_code"`
+	SoldValue                     string    `gorm:"column:sold_value"`
+	SoldChange                    int       `gorm:"column:sold_change"`
+	Frequency                     string    `gorm:"column:frequency"`
+	ClassifyName                  string    `gorm:"column:classify_name"`
+	ClassifyType                  string    `gorm:"column:classify_type"`
+	CreateTime                    time.Time `gorm:"column:create_time"`
+	ModifyTime                    time.Time `gorm:"column:modify_time"`
+	DataTime                      string    `gorm:"column:data_time"`
+}
+
+func (m *BaseFromTradeZhengzhouIndex) TableName() string {
+	return "base_from_trade_zhengzhou_index"
 }
 
+//type BaseFromZzDataSimple struct {
+//	Id        int `orm:"column(base_from_trade_zhengzhou_index_id);pk"`
+//	DealCode  string
+//	BuyCode   string
+//	SoldCode  string
+//	DataTime  string
+//	DealValue string
+//	BuyValue  string
+//	SoldValue string
+//}
+
 type BaseFromZzDataSimple struct {
-	Id        int `orm:"column(base_from_trade_zhengzhou_index_id);pk"`
-	DealCode  string
-	BuyCode   string
-	SoldCode  string
-	DataTime  string
-	DealValue string
-	BuyValue  string
-	SoldValue string
+	Id        int    `gorm:"column:base_from_trade_zhengzhou_index_id;primaryKey"`
+	DealCode  string `gorm:"column:deal_code"`
+	BuyCode   string `gorm:"column:buy_code"`
+	SoldCode  string `gorm:"column:sold_code"`
+	DataTime  string `gorm:"column:data_time"`
+	DealValue string `gorm:"column:deal_value"`
+	BuyValue  string `gorm:"column:buy_value"`
+	SoldValue string `gorm:"column:sold_value"`
+}
+
+func (m *BaseFromZzDataSimple) TableName() string {
+	return "base_from_trade_zhengzhou_index"
 }
 
 func GetBaseFromZhengzhouDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeZhengzhouIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_zhengzhou_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
 	return
 }
 
 func GetZzDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromZzDataSimple, err error) {
 	sql := ` SELECT * FROM base_from_trade_zhengzhou_index WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY data_time DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
 	return
 }
 
@@ -76,7 +123,7 @@ func AddEdbDataFromZz(edbCode string) (err error) {
 		suffix = "sold"
 	}
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	zzBaseDataAll, err := GetBaseFromZhengzhouDataAllByIndexCode(edbCode, suffix)
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -116,7 +163,8 @@ func AddEdbDataFromZz(edbCode string) (err error) {
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -129,7 +177,7 @@ func RefreshEdbDataFromZz(edbInfoId int, edbCode, startDate string) (err error)
 	source := utils.DATA_SOURCE_ZZ
 	subSource := utils.DATA_SUB_SOURCE_DATE
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -257,7 +305,7 @@ func RefreshEdbDataFromZz(edbInfoId int, edbCode, startDate string) (err error)
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
 		if err != nil {
 			return err
 		}