no message

global/dm.go

@@ -0,0 +1,103 @@
+package global
+
+import (
+	_ "dm"
+	dm "dmgorm2"
+	"eta_gn/eta_task/utils"
+	"fmt"
+	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
+	"gorm.io/gorm/schema"
+	"io"
+	"log"
+	"os"
+	"time"
+
+	_ "github.com/go-sql-driver/mysql"
+)
+
+// InitDm
+// @Description: 达梦数据库初始化
+func InitDm() {
+	dmSqlMap := make(map[string]*gorm.DB)
+
+	//开启日志
+	logWriter := io.MultiWriter(utils.Binlog) //binlog日志，记录到文件中去
+	if utils.RunMode == `dev` {               // 测试环境，默认输出在控制台，不需要的话，可以注释if里面下面的这行
+		logWriter = io.MultiWriter(utils.Binlog, os.Stdout)
+	}
+	newLogger := logger.New(log.New(logWriter, "\r\n", log.LstdFlags), logger.Config{
+		SlowThreshold:             200 * time.Millisecond, //慢sql ：200ms
+		LogLevel:                  logger.Info,            //记录的日志类型，info代表所有信息都记录
+		IgnoreRecordNotFoundError: true,                   //是否忽略找不到数据错误信息（只是日志记录记录成err还是普通的输出的区别，并不影响业务代码中的：找不到数据行error）
+		Colorful:                  true,                   //是否颜色输出
+	})
+
+	// 默认库
+	connectDm("dm://SYSDBA:SYSDBA001@8.136.199.33:30238?schema=\"eta_index\"", "default", newLogger, dmSqlMap, true)
+	// 手工数据库
+	connectDm("dm://SYSDBA:SYSDBA001@8.136.199.33:30238?schema=\"eta_manual_index\"", "edb", newLogger, dmSqlMap, false)
+	// eta主库
+	connectDm("dm://SYSDBA:SYSDBA001@8.136.199.33:30238?schema=\"eta_master\"", "master", newLogger, dmSqlMap, false)
+	// 钢联库
+	connectDm("dm://SYSDBA:SYSDBA001@8.136.199.33:30238?schema=\"eta_gl\"", "gl", newLogger, dmSqlMap, false)
+
+	/*initDm(utils.MYSQL_URL, "default", newLogger, dmSqlMap, true)
+	initDm(utils.MYSQL_URL_EDB, "edb", newLogger, dmSqlMap, true)
+	initDm(utils.MYSQL_URL_MASTER, "master", newLogger, dmSqlMap, true)
+	initDm(utils.MYSQL_URL_GL, "gl", newLogger, dmSqlMap, true)*/
+
+	//全局赋值数据库链接
+	DmSQL = dmSqlMap
+
+}
+
+// connectDm
+// @Description: 达梦数据库连接
+// @param dsn
+// @param aliasName
+// @param newLogger
+// @param dmSqlMap
+// @param isDefault
+func connectDm(dsn, aliasName string, newLogger logger.Interface, dmSqlMap map[string]*gorm.DB, isDefault bool) {
+	//fmt.Println("dsn:", dsn, "  ==  ;aliasName:", aliasName)
+	if dsn == `` {
+		return
+	}
+	//dsn := "dm://SYSDBA:SYSDBA001@8.136.199.33:30236?schema=\"eta_master\""
+	//dsn := "dm://ETA:Han6258199118%60@localhost:5236?schema=ECOLOGY_TARGET"
+	db, err := gorm.Open(dm.Open(dsn), &gorm.Config{
+		Logger: newLogger,
+		NamingStrategy: schema.NamingStrategy{
+			SingularTable: true, // 表示使用单数表名，启用该选项后，GORM 将不会对表名进行复数化处理
+		},
+	})
+	if err != nil {
+		//global.LOG.Errorf("mysql 启动异常，数据库:default;Err：", err)
+		panic(fmt.Errorf("mysql 启动异常，数据库:%s;Err:%s", aliasName, err))
+	}
+
+	//创建连接池
+	sqlDB, err := db.DB()
+	if err != nil {
+		//global.LOG.Errorf("mysql 创建连接池失败，数据库:default;Err：", err)
+		panic(fmt.Errorf("mysql 创建连接池失败，数据库:%s;Err:%s", aliasName, err))
+	}
+
+	dmSqlMap[aliasName] = db
+
+	//默认数据库连接
+	if isDefault {
+		DEFAULT_DmSQL = db
+	}
+
+	// SetMaxIdleConns 设置空闲连接池中连接的最大数量
+	sqlDB.SetMaxIdleConns(50)
+
+	// SetMaxOpenConns 设置打开数据库连接的最大数量。
+	sqlDB.SetMaxOpenConns(100)
+
+	// SetConnMaxLifetime 设置了连接可复用的最大时间。
+	sqlDB.SetConnMaxLifetime(10 * time.Minute)
+
+}

global/global.go

@@ -0,0 +1,17 @@
+package global
+
+import (
+	_ "dm"
+	_ "github.com/go-sql-driver/mysql"
+	"gorm.io/gorm"
+)
+
+var (
+	DmSQL         map[string]*gorm.DB //数据库连接配置
+	DEFAULT_DmSQL *gorm.DB            //默认数据库连接配置
+)
+
+func init() {
+	// 初始化达梦连接
+	InitDm()
+}

go.mod

@@ -25,6 +25,8 @@ require (
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -43,4 +45,5 @@ require (
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gorm.io/gorm v1.25.12 // indirect
 )

go.sum

@@ -92,6 +92,10 @@ github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZH
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -291,3 +295,5 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
+gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=

models/data_manage/base_from_changes_visitors_covid.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -25,24 +25,29 @@ type BaseFromChangesVisitorsCovid struct {
 
 // AddBaseFromChangesVisitorsCovidMulti 批量添加谷歌出行记录
 func AddBaseFromChangesVisitorsCovid(item *BaseFromChangesVisitorsCovid) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//_, err = o.Insert(item)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
 // GetLatestBaseFromChangesVisitorsCovid 查询最新的日期
 func GetLatestBaseFromChangesVisitorsCovid() (item *BaseFromChangesVisitorsCovid, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_changes_visitors_covid order by day desc, id desc limit 1`
-	err = o.Raw(sql).QueryRow(&item)
+	//err = o.Raw(sql).QueryRow(&item)
+
+	err = global.DEFAULT_DmSQL.Raw(sql).First(&item).Error
 	return
 }
 
 // GetBaseFromChangesVisitorsCovidByEntityDay 查询国家和统计日期查询记录是否存在
 func GetBaseFromChangesVisitorsCovidByEntityDay(entity, day string) (item *BaseFromChangesVisitorsCovid, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_changes_visitors_covid where entity=? and day=? limit 1`
-	err = o.Raw(sql, entity, day).QueryRow(&item)
+	//err = o.Raw(sql, entity, day).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, entity, day).First(&item).Error
 	return
 }
 
@@ -56,15 +61,18 @@ type ChangesVisitorsCovidIndexResp struct {
 
 // 获取当天数据信息列表
 func GetChangesVisitorsCovidAll(dateTime string) (items []*BaseFromChangesVisitorsCovid, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_changes_visitors_covid WHERE day>=? `
-	_, err = o.Raw(sql, dateTime).QueryRows(&items)
+	//_, err = o.Raw(sql, dateTime).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, dateTime).Find(&items).Error
 	return
 }
 
 func GetChangesVisitorsCovidMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT max(a.day)as max_date FROM base_from_changes_visitors_covid as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	//err = o.Raw(sql).QueryRow(&max_date)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
+
 	return
 }

models/data_manage/base_from_eia_steo.go

@@ -1,11 +1,10 @@
 package data_manage
 
 import (
+	"eta_gn/eta_task/global"
 	"eta_gn/eta_task/utils"
 
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 // BaseFromEiaSteoIndex EiaSteo指标
@@ -30,46 +29,62 @@ type BaseFromEiaSteoIndex struct {
 }
 
 func AddBaseFromEiaSteoIndex(item *BaseFromEiaSteoIndex) (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
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromEiaSteoIndexId)
 	return
 }
 
 func InsertOrUpdateBaseFromEiaSteoIndex(item *BaseFromEiaSteoIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertOrUpdate(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.InsertOrUpdate(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromEiaSteoIndexId)
 	return
 }
 
 // Add 新增指标
 func (item *BaseFromEiaSteoIndex) Add() (err error) {
-	o := orm.NewOrm()
-	lastId, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.BaseFromEiaSteoIndexId = int(lastId)
+	//o := orm.NewOrm()
+	//lastId, err := o.Insert(item)
+	//if err != nil {
+	//	return
+	//}
+	//item.BaseFromEiaSteoIndexId = int(lastId)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
 func GetBaseFromEiaSteoIndexAll(dateStr string) (list []*BaseFromEiaSteoIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_eia_steo_index WHERE create_time>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func GetBaseFromEiaSteoIndexCodeListByDate(dateStr string) (list []string, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT index_code FROM base_from_eia_steo_index WHERE modify_time>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 // Update 更新作者基础信息
 func (item *BaseFromEiaSteoIndex) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(item, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(item, cols...)
+
+	err = global.DEFAULT_DmSQL.Select(cols).Updates(item).Error
 	return
 }
 
@@ -86,12 +101,14 @@ type BaseFromEiaSteoClassify struct {
 
 // 新增分类
 func (item *BaseFromEiaSteoClassify) AddBaseFromEiaSteoClassify() (err error) {
-	o := orm.NewOrm()
-	lastId, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.BaseFromEiaSteoClassifyId = int(lastId)
+	//o := orm.NewOrm()
+	//lastId, err := o.Insert(item)
+	//if err != nil {
+	//	return
+	//}
+	//item.BaseFromEiaSteoClassifyId = int(lastId)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
@@ -107,34 +124,48 @@ type BaseFromEiaSteoData struct {
 }
 
 func (b *BaseFromEiaSteoData) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(b, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(b, cols...)
+	err = global.DEFAULT_DmSQL.Select(cols).Updates(b).Error
 	return
 }
 
 func AddBaseFromEiaSteoData(item *BaseFromEiaSteoData) (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
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromEiaSteoDataId)
 	return
 }
 
 // GetBaseFromEiaSteoClassifyAll 获取所有的分类
 func GetBaseFromEiaSteoClassifyAll() (list []*BaseFromEiaSteoClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_eia_steo_classify`
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
 	return
 }
 
 func AddBaseEiaSteoClassify(item *BaseFromEiaSteoClassify) (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
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromEiaSteoClassifyId)
 	return
 }
 
 func (item *BaseFromEiaSteoClassify) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(item, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(item, cols...)
+	err = global.DEFAULT_DmSQL.Select(cols).Updates(item).Error
 	return
 }
 
@@ -142,9 +173,10 @@ func BatchDeleteBaseFromEiaSteoClassify(id []int) (err error) {
 	if len(id) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `DELETE FROM base_from_eia_steo_classify WHERE base_from_eia_steo_classify_id IN (` + utils.GetOrmInReplace(len(id)) + `)`
-	_, err = o.Raw(sql, id).Exec()
+	//_, err = o.Raw(sql, id).Exec()
+	err = global.DEFAULT_DmSQL.Raw(sql, id).Error
 	return
 }
 
@@ -173,36 +205,41 @@ type EiaSteoClassifyDataResp struct {
 }
 
 func GetBaseFromEiaSteoIndexDataAll(dateStr string) (list []*BaseFromEiaSteoData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_eia_steo_data WHERE create_time>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func GetBaseFromEiaSteoIndexDataByIndexCode(indexCode, dateStr string) (list []*BaseFromEiaSteoData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_eia_steo_data WHERE index_code=? AND modify_time>=?`
-	_, err = o.Raw(sql, indexCode, dateStr).QueryRows(&list)
+	//_, err = o.Raw(sql, indexCode, dateStr).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode, dateStr).Find(&list).Error
 	return
 }
 
 func GetBaseFromEiaSteoIndexDataByDate(dateStr string) (list []*BaseFromEiaSteoData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_eia_steo_data WHERE modify_time>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func GetBaseFromEiaSteoIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT max(a.data_time)as max_date FROM base_from_eia_steo_data as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	//err = o.Raw(sql).QueryRow(&max_date)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
 	return
 }
 
 func GetBaseFromEiaSteoIndexMaxCreateDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT max(a.create_time)as max_date FROM base_from_eia_steo_index as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	//err = o.Raw(sql).QueryRow(&max_date)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
 	return
 }

models/data_manage/base_from_gie.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -38,24 +38,30 @@ type BaseFromTradeEicIndexV2 struct {
 	ModifyTime             time.Time
 }
 
-
 func GetBaseFromEicIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT max(a.gas_day_start)as max_date FROM base_from_trade_eic_index_v2 as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	//err = o.Raw(sql).QueryRow(&max_date)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
 	return
 }
 
 func GetBaseFromEicIndexAll(dateStr string) (list []*BaseFromTradeEicIndexV2, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_eic_index_v2 where gas_day_start >=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func AddBaseFromEicIndexV2(item *BaseFromTradeEicIndexV2) (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
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromEicIndexId)
 	return
 }
 

models/data_manage/base_from_icpi.go

@@ -1,7 +1,8 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
+	"eta_gn/eta_task/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -19,9 +20,10 @@ type BaseFromIcpiIndex struct {
 }
 
 func GetBaseFromIcpiIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT max(a.data_time)as max_date FROM base_from_icpi_data as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	//err = o.Raw(sql).QueryRow(&max_date)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
 	return
 }
 
@@ -34,21 +36,32 @@ type IcpiIndexResp struct {
 }
 
 func GetBaseFromIcpiIndexAll(dateStr string) (list []*BaseFromIcpiIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_icpi_index WHERE end_date>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func (obj *BaseFromIcpiIndex) AddBaseFromIcpiIndex(item *BaseFromIcpiIndex) (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
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromIcpiIndexId)
 	return
 }
 
 func (obj *BaseFromIcpiIndex) InsertOrUpdateBaseFromIcpiIndex(item *BaseFromIcpiIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertOrUpdate(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.InsertOrUpdate(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromIcpiIndexId)
 	return
 }
 
@@ -70,29 +83,43 @@ type IcpiClassifyResp struct {
 }
 
 func GetBaseFromIcpiClassifyAll() (list []*BaseFromIcpiClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_icpi_classify `
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
 	return
 }
 
 func AddBaseFromIcpiClassify(item *BaseFromIcpiClassify) (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
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromIcpiClassifyId)
 	return
 }
 
 func InsertOrUpdateBaseFromIcpiClassify(item *BaseFromIcpiClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertOrUpdate(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.InsertOrUpdate(item)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromIcpiClassifyId)
 	return
 }
 
 // GetBaseFromComTradeMaxDate 获取ICPI消费者指数最大数据
 func GetBaseFromIcpiMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT max(a.create_time)as max_date FROM base_from_icpi_data as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	//err = o.Raw(sql).QueryRow(&max_date)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
 	return
 }
 
@@ -108,9 +135,10 @@ type BaseFromIcpiData struct {
 
 // GetAllComTradeDataList 获取ICPI消费者指数数据
 func GetAllBaseFromIcpiDataList(startDate string) (list []*BaseFromIcpiData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_icpi_data WHERE create_time>=?  ORDER BY base_from_icpi_data_id ASC `
-	_, err = o.Raw(sql, startDate).QueryRows(&list)
+	//_, err = o.Raw(sql, startDate).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, startDate).Find(&list).Error
 	return
 }
 
@@ -130,12 +158,14 @@ type BaseFromIcpiDataIndexAndDataResp struct {
 
 // MultiAddBaseFromComTradeData 批量添加数据
 func MultiAddBaseFromIcpiDataIndex(items []*BaseFromIcpiData) (lastId int64, err error) {
-	num := len(items)
-	if num <= 0 {
-		return
-	}
-	o := orm.NewOrm()
-	lastId, err = o.InsertMulti(num, items)
+	//num := len(items)
+	//if num <= 0 {
+	//	return
+	//}
+	//o := orm.NewOrm()
+	//lastId, err = o.InsertMulti(num, items)
+
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
 
 	return
 }

models/data_manage/base_from_mysteel_chemical_index.go

@@ -1,9 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_task/global"
 	"eta_gn/eta_task/utils"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type BaseFromMysteelChemicalIndexItem struct {
@@ -46,10 +45,10 @@ type BaseFromMysteelChemicalIndexItem struct {
 // @return item *BaseFromMysteelChemicalIndexItem
 // @return err error
 func GetBaseFromMysteelChemicalIndexItemByCode(edbCode string) (item *BaseFromMysteelChemicalIndexItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE index_code = ?`
-	err = o.Raw(sql, edbCode).QueryRow(&item)
-
+	//err = o.Raw(sql, edbCode).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, edbCode).First(&item).Error
 	return
 }
 
@@ -58,34 +57,38 @@ func GetBaseFromMysteelChemicalIndexItems(frequencyList []string) (items []*Base
 	if num == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT b.*, e.edb_info_id FROM base_from_mysteel_chemical_index AS b
 	LEFT JOIN edb_info AS e
 	ON b.index_code = e.edb_code
 	WHERE b.source='api' AND b.frequency IN (` + utils.GetOrmInReplace(len(frequencyList)) + `)`
-	_, err = o.Raw(sql, frequencyList).QueryRows(&items)
+	//_, err = o.Raw(sql, frequencyList).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, frequencyList).Find(&items).Error
 	return
 }
 
 // GetRefreshBaseFromMysteelChemicalIndexItemByCreateTime 获取正常刷新的钢联化工指标
 func GetRefreshBaseFromMysteelChemicalIndexItemByCreateTime(endDate string, startPage, pageSize int) (items []*BaseFromMysteelChemicalIndexItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE is_stop = 0 and create_time < ? Limit ?,?`
-	_, err = o.Raw(sql, endDate, startPage, pageSize).QueryRows(&items)
+	//_, err = o.Raw(sql, endDate, startPage, pageSize).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, endDate, startPage, pageSize).Find(&items).Error
 	return
 }
 
 // GetCountRefreshBaseFromMysteelChemicalIndexItemByCreateTime 获取正常刷新的钢联化工指标
 func GetCountRefreshBaseFromMysteelChemicalIndexItemByCreateTime(endDate string) (total int64, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT count(*) FROM base_from_mysteel_chemical_index WHERE is_stop = 0 and create_time < ?`
-	err = o.Raw(sql, endDate).QueryRow(&total)
+	//err = o.Raw(sql, endDate).QueryRow(&total)
+	err = global.DmSQL["data"].Raw(sql, endDate).Scan(&total).Error
 	return
 }
 
 func SetStopRefreshMysteelChemicalIndex(ids []int32) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = 1 WHERE base_from_mysteel_chemical_index_id IN (` + utils.GetOrmInReplace(len(ids)) + `) and is_stop=0`
-	_, err = o.Raw(sql, ids).Exec()
+	//_, err = o.Raw(sql, ids).Exec()
+	err = global.DmSQL["data"].Exec(sql, ids).Error
 	return
 }

models/data_manage/base_from_smm.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -34,16 +34,24 @@ type BaseFromSmm struct {
 }
 
 func AddBaseFromSmm(item *BaseFromSmm) (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
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromSmmId)
 	return
 }
 
 func GetBaseFromSmmList() (list []*BaseFromSmm, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	//sql := `SELECT * FROM base_from_smm WHERE interface='cu_annual_copper_cathode_demand_supply_balance_in_china' `
 	sql := `SELECT * FROM base_from_smm WHERE end_date IS NOT NULL `
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
 	return
 }
 
@@ -67,15 +75,21 @@ type BaseFromSmmIndex struct {
 }
 
 func AddBaseFromSmmIndex(item *BaseFromSmmIndex) (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
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromSmmIndexId)
 	return
 }
 
 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
 }
 
@@ -91,52 +105,77 @@ type BaseFromSmmData struct {
 }
 
 func AddBaseFromSmmData(item *BaseFromSmmData) (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
+	if err != nil {
+		return
+	}
+	lastId = int64(item.SmmDataId)
 	return
 }
 
 func GetBaseFromSmmDataAll(indexCode 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, indexCode).QueryRows(&list)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
 	return
 }
 
 func ModifyBaseFromSmmData(smmDataId int, value string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_smm_data SET value=?,modify_time=NOW() WHERE smm_data_id=? `
-	_, err = o.Raw(sql, value, smmDataId).Exec()
+	//_, err = o.Raw(sql, value, smmDataId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, value, smmDataId).Error
 	return
 }
 
 func GetBaseFromSmmIndexByCode(smmCode string) (list []*BaseFromSmmIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_smm_index WHERE interface=? `
-	_, err = o.Raw(sql, smmCode).QueryRows(&list)
+	//_, err = o.Raw(sql, smmCode).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, smmCode).Find(&list).Error
 	return
 }
 
 func GetBaseFromSmmMaxOrMinDate(indexCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM base_from_smm_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&min_date, &max_date)
+	//err = o.Raw(sql, indexCode).QueryRow(&min_date, &max_date)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(min_date, &max_date).Error
 	return
 }
 
 func ModifyBaseFromSmmSmmType(baseFromSmmId int, smmType string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_smm SET smm_type=? WHERE base_from_smm_id=? `
-	_, err = o.Raw(sql, smmType, baseFromSmmId).Exec()
+	//_, err = o.Raw(sql, smmType, baseFromSmmId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, smmType, baseFromSmmId).Error
 	return
 }
 
 func ModifyBaseFromSmmMinDateAndMaxDate(baseFromSmmIndexId, baseFromSmmId int, minDate, maxDate string) (err error) {
-	o := orm.NewOrm()
+	to := global.DEFAULT_DmSQL.Begin()
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+		} else {
+			_ = to.Commit()
+		}
+	}()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_smm_index SET start_date=?,end_date=?,modify_time=NOW() WHERE base_from_smm_index_id=? `
-	_, err = o.Raw(sql, minDate, maxDate, baseFromSmmIndexId).Exec()
+	//_, err = o.Raw(sql, minDate, maxDate, baseFromSmmIndexId).Exec()
+	err = to.Exec(sql, minDate, maxDate, baseFromSmmIndexId).Error
+	if err != nil {
+		return
+	}
+
 	sql = ` UPDATE base_from_smm SET start_date=?,end_date=?,modify_time=NOW() WHERE base_from_smm_id=? `
-	_, err = o.Raw(sql, minDate, maxDate, baseFromSmmId).Exec()
+	//_, err = o.Raw(sql, minDate, maxDate, baseFromSmmId).Exec()
+	err = to.Exec(sql, minDate, maxDate, baseFromSmmId).Error
 	return
 }
 
@@ -149,11 +188,12 @@ type BaseFromSmmDataSimple struct {
 }
 
 func GetBaseFromSmmDataByCondition(condition string, pars []interface{}) (list []*BaseFromSmmDataSimple, 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).Find(&list).Error
 	return
 }

models/data_manage/base_from_smm_index.go

@@ -1,6 +1,8 @@
 package data_manage
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta_gn/eta_task/global"
+)
 
 type BaseFromSmmIndexItem struct {
 	BaseFromSmmIndexId int32   `json:"base_from_smm_index_id"`
@@ -42,9 +44,9 @@ type BaseFromSmmIndexItem struct {
 // @return item *BaseFromSmmIndexItem
 // @return err error
 func GetBaseFromSmmIndexItemItemByCode(edbCode string) (item *BaseFromSmmIndexItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_smm_index WHERE index_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&item)
-
+	//err = o.Raw(sql, edbCode).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, edbCode).First(&item).Error
 	return
 }

models/data_manage/base_from_ths_hf_index.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_task/global"
 	"eta_gn/eta_task/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -88,34 +88,41 @@ func (m *BaseFromThsHfIndex) Cols() BaseFromThsHfIndexCols {
 }
 
 func (m *BaseFromThsHfIndex) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.BaseFromThsHfIndexId = int(id)
+	//o := orm.NewOrm()
+	//id, err := o.Insert(m)
+	//if err != nil {
+	//	return
+	//}
+	//m.BaseFromThsHfIndexId = int(id)
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
 func (m *BaseFromThsHfIndex) CreateMulti(items []*BaseFromThsHfIndex) (err error) {
-	if len(items) == 0 {
-		return
-	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+	//if len(items) == 0 {
+	//	return
+	//}
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(len(items), items)
+
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).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.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
 }
 
@@ -123,9 +130,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
 }
 
@@ -133,39 +141,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).Scan(&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 = `*`
@@ -175,12 +187,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 = `*`
@@ -190,6 +203,7 @@ 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/data_manage/base_from_trade_cffex.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -32,24 +32,33 @@ type BaseFromTradeCffexIndex struct {
 }
 
 func AddBaseFromTradeCffexIndex(item *BaseFromTradeCffexIndex) (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
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromTradeCffexIndexId)
 	return
 }
 
 func GetBaseFromTradeCffexIndexAll(dateStr string) (list []*BaseFromTradeCffexIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_cffex_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).Find(&list).Error
 	return
 }
 
 func ModifyBaseFromTradeCffexIndex(columnList [5]string, dataList [5]interface{}, dataId int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := "UPDATE base_from_trade_cffex_index SET " +
 		columnList[0] + "=?," + columnList[1] + "=?," + columnList[2] + "=?," + columnList[3] + "=?," + columnList[4] +
 		"=?,modify_time=NOW() WHERE base_from_trade_cffex_index_id=? "
-	_, err = o.Raw(sql, dataList[0], dataList[1], dataList[2], dataList[3], dataList[4], dataId).Exec()
+	//_, err = o.Raw(sql, dataList[0], dataList[1], dataList[2], dataList[3], dataList[4], dataId).Exec()
+	err = global.DEFAULT_DmSQL.Raw(sql, dataList[0], dataList[1], dataList[2], dataList[3], dataList[4], dataId).Error
 	return
 }
 
@@ -62,8 +71,10 @@ type CffexIndexResp struct {
 }
 
 func GetBaseFromTradeCffexIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT max(a.data_time)as max_date FROM base_from_trade_cffex_index as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	//err = o.Raw(sql).QueryRow(&max_date)
+
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
 	return
 }

models/data_manage/base_from_trade_dalian.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -32,8 +32,14 @@ type BaseFromTradeDalianIndex struct {
 }
 
 func AddBaseFromTradeDalianIndex(item *BaseFromTradeDalianIndex) (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
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromTradeDalianIndexId)
 	return
 }
 
@@ -51,26 +57,31 @@ type BaseFromTradeDalianData struct {
 
 // 刷新大连指标数据
 func RefreshEdbDataByDaLian(addSql string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Raw(addSql).Exec()
-	if err != nil {
-		return err
-	}
+	//o := orm.NewOrm()
+	//_, err = o.Raw(addSql).Exec()
+	//if err != nil {
+	//	return err
+	//}
+
+	//err = global.DEFAULT_DmSQL.Exec(addSql).Error
 	return
 }
 
 // 获取当天数据信息列表
 func GetBaseFromTradeDalianDataList(dateTime string) (items []*BaseFromTradeDalianIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_dalian_index WHERE data_time>=?`
-	_, err = o.Raw(sql, dateTime).QueryRows(&items)
+	//_, err = o.Raw(sql, dateTime).QueryRows(&items)
+
+	err = global.DEFAULT_DmSQL.Raw(sql, dateTime).Find(&items).Error
 	return
 }
 
 func UpdateBaseFromTradeDalianIndex(item *BaseFromTradeDalianIndex, dataId int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := "UPDATE base_from_trade_dalian_index SET `rank`=?,deal_short_name=?,deal_name=?,deal_code=?,deal_value=?,buy_short_name=?,deal_change=?,buy_name=?,buy_code=?,buy_value=?,buy_change=?,sold_short_name=?,sold_name=?,sold_code=?,sold_value=?,sold_change=?,frequency=?,classify_name=?,classify_type=?,modify_time=?,data_time=? WHERE base_from_trade_dalian_index_id=? "
-	_, err = o.Raw(sql, item.Rank, item.DealShortName, item.DealName, item.DealCode, item.DealValue, item.BuyShortName, item.DealChange, item.BuyName, item.BuyCode, item.BuyValue, item.BuyChange, item.SoldShortName, item.SoldName, item.SoldCode, item.SoldValue, item.SoldChange, item.Frequency, item.ClassifyName, item.ClassifyType, item.ModifyTime, item.DataTime, dataId).Exec()
+	//_, err = o.Raw(sql, item.Rank, item.DealShortName, item.DealName, item.DealCode, item.DealValue, item.BuyShortName, item.DealChange, item.BuyName, item.BuyCode, item.BuyValue, item.BuyChange, item.SoldShortName, item.SoldName, item.SoldCode, item.SoldValue, item.SoldChange, item.Frequency, item.ClassifyName, item.ClassifyType, item.ModifyTime, item.DataTime, dataId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, item.Rank, item.DealShortName, item.DealName, item.DealCode, item.DealValue, item.BuyShortName, item.DealChange, item.BuyName, item.BuyCode, item.BuyValue, item.BuyChange, item.SoldShortName, item.SoldName, item.SoldCode, item.SoldValue, item.SoldChange, item.Frequency, item.ClassifyName, item.ClassifyType, item.ModifyTime, item.DataTime, dataId).Error
 	return
 }
 
@@ -83,8 +94,9 @@ type DalianIndexResp struct {
 }
 
 func GetBaseFromTradeDalianIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT max(a.data_time)as max_date FROM base_from_trade_dalian_index as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	//err = o.Raw(sql).QueryRow(&max_date)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
 	return
 }

models/data_manage/cross_variety/chart_info_cross_variety.go

@@ -1,7 +1,7 @@
 package cross_variety
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -19,17 +19,19 @@ type ChartInfoCrossVariety struct {
 }
 
 func GetChartInfoCrossVarietyList(startSize, pageSize int) (items []*ChartInfoCrossVariety, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info_cross_variety WHERE 1=1 `
 	sql += " LIMIT ?,? "
-	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
+	//_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, startSize, pageSize).Find(&items).Error
 	return
 }
 
 func GetChartInfoCrossVarietyTotal() (total int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT count(*) FROM chart_info_cross_variety`
-	err = o.Raw(sql).QueryRow(&total)
+	//err = o.Raw(sql).QueryRow(&total)
+	err = global.DmSQL["data"].Raw(sql).Scan(&total).Error
 	return
 }
 

models/data_manage/cross_variety/chart_tag_variety.go

@@ -1,8 +1,8 @@
 package cross_variety
 
 import (
+	"eta_gn/eta_task/global"
 	"eta_gn/eta_task/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -20,8 +20,9 @@ type ChartTagVariety struct {
 }
 
 func GetChartTagVarietyEdbInfoIdsByTagIds(chartTagIds []int) (items []*ChartTagVariety, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id in (` + utils.GetOrmInReplace(len(chartTagIds)) + `)`
-	_, err = o.Raw(sql, chartTagIds).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, chartTagIds).Find(&items).Error
+	//_, err = o.Raw(sql, chartTagIds).QueryRows(&items)
 	return
 }

models/data_manage/edb_refresh/edb_refresh_config.go

@@ -2,7 +2,7 @@ package edb_refresh
 
 import (
 	"errors"
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -31,13 +31,13 @@ func (m *EdbRefreshConfig) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	lastId, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.EdbRefreshConfigId = int(lastId)
-
+	//o := orm.NewOrmUsingDB("data")
+	//lastId, err := o.Insert(m)
+	//if err != nil {
+	//	return
+	//}
+	//m.EdbRefreshConfigId = int(lastId)
+	err = global.DmSQL["data"].Create(m).Error
 	return
 }
 
@@ -49,8 +49,9 @@ func (m *EdbRefreshConfig) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *EdbRefreshConfig) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Update(m, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(m).Error
 	return
 }
 
@@ -61,8 +62,9 @@ func (m *EdbRefreshConfig) Update(cols []string) (err error) {
 // @datetime 2023-12-14 16:11:10
 // @return err error
 func (m *EdbRefreshConfig) Delete() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Delete(m)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Delete(m)
+	err = global.DmSQL["data"].Exec("DELETE FROM edb_refresh_config WHERE edb_refresh_config_id = ?", m.EdbRefreshConfigId).Error
 	return
 }
 
@@ -75,7 +77,7 @@ func (m *EdbRefreshConfig) Delete() (err error) {
 // @return list []*EdbRefreshDefaultConfig
 // @return err error
 func GetEdbRefreshConfigListByCondition(condition string, pars []interface{}) (list []*EdbRefreshConfig, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_refresh_config
          WHERE 1 = 1 `
 
@@ -83,7 +85,7 @@ func GetEdbRefreshConfigListByCondition(condition string, pars []interface{}) (l
 		sql += condition
 	}
 	sql += ` ORDER BY edb_refresh_config_id ASC `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
-
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, pars).Find(&list).Error
 	return
 }

models/data_manage/edb_refresh/edb_refresh_default_config.go

@@ -2,8 +2,8 @@ package edb_refresh
 
 import (
 	"errors"
+	"eta_gn/eta_task/global"
 	"eta_gn/eta_task/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -35,13 +35,13 @@ func (m *EdbRefreshDefaultConfig) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	lastId, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.Id = int(lastId)
-
+	//o := orm.NewOrmUsingDB("data")
+	//lastId, err := o.Insert(m)
+	//if err != nil {
+	//	return
+	//}
+	//m.Id = int(lastId)
+	err = global.DmSQL["data"].Create(m).Error
 	return
 }
 
@@ -53,8 +53,10 @@ func (m *EdbRefreshDefaultConfig) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *EdbRefreshDefaultConfig) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Update(m, cols...)
+
+	err = global.DmSQL["data"].Select(cols).Updates(m).Error
 	return
 }
 
@@ -65,8 +67,9 @@ func (m *EdbRefreshDefaultConfig) Update(cols []string) (err error) {
 // @datetime 2023-12-14 16:11:10
 // @return err error
 func (m *EdbRefreshDefaultConfig) Delete() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Delete(m)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Delete(m)
+	err = global.DmSQL["data"].Exec("DELETE FROM edb_refresh_default_config WHERE id = ?", m.Id).Error
 	return
 }
 
@@ -80,10 +83,11 @@ func (m *EdbRefreshDefaultConfig) Delete() (err error) {
 // @return list []*EdbRefreshDefaultConfig
 // @return err error
 func GetListBySourceAndFrequency(source, subSource int, frequency string) (list []*EdbRefreshDefaultConfig, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_refresh_default_config
          WHERE source = ? AND sub_source = ? AND frequency = ? ORDER BY id ASC `
-	_, err = o.Raw(sql, source, subSource, frequency).QueryRows(&list)
+	//_, err = o.Raw(sql, source, subSource, frequency).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, source, subSource, frequency).Find(&list).Error
 
 	return
 }
@@ -97,7 +101,7 @@ func GetListBySourceAndFrequency(source, subSource int, frequency string) (list
 // @return list []*EdbRefreshDefaultConfig
 // @return err error
 func GetListByCondition(condition string, pars []interface{}) (list []*EdbRefreshDefaultConfig, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_refresh_default_config
          WHERE 1 = 1 `
 
@@ -105,7 +109,8 @@ func GetListByCondition(condition string, pars []interface{}) (list []*EdbRefres
 		sql += condition
 	}
 	sql += ` ORDER BY id ASC `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, pars).Find(&list).Error
 
 	return
 }
@@ -124,11 +129,11 @@ func GetDefaultRefreshEdbInfoListBySourceAndSubSource(source, subSource int, fre
 		return
 	}
 
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT a.* FROM edb_info a 
 LEFT JOIN edb_refresh_mapping b ON a.edb_info_id = b.edb_info_id
 WHERE a.source = ? AND a.sub_source = ? AND a.frequency IN (` + utils.GetOrmInReplace(num) + `)  AND b.edb_info_id is null`
-	_, err = o.Raw(sql, source, subSource, frequencyList).QueryRows(&list)
-
+	//_, err = o.Raw(sql, source, subSource, frequencyList).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, source, subSource, frequencyList).Find(&list).Error
 	return
 }

models/data_manage/edb_refresh/edb_refresh_mapping.go

@@ -2,8 +2,8 @@ package edb_refresh
 
 import (
 	"errors"
+	"eta_gn/eta_task/global"
 	"eta_gn/eta_task/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -33,13 +33,13 @@ func (m *EdbRefreshMapping) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	lastId, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.EdbRefreshMappingId = int(lastId)
-
+	//o := orm.NewOrmUsingDB("data")
+	//lastId, err := o.Insert(m)
+	//if err != nil {
+	//	return
+	//}
+	//m.EdbRefreshMappingId = int(lastId)
+	err = global.DmSQL["data"].Create(m).Error
 	return
 }
 
@@ -51,8 +51,9 @@ func (m *EdbRefreshMapping) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *EdbRefreshMapping) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Update(m, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(m).Error
 	return
 }
 
@@ -63,8 +64,10 @@ func (m *EdbRefreshMapping) Update(cols []string) (err error) {
 // @datetime 2023-12-14 16:11:10
 // @return err error
 func (m *EdbRefreshMapping) Delete() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Delete(m)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Delete(m)
+
+	err = global.DmSQL["data"].Exec("DELETE FROM chart_tag WHERE edb_refresh_mapping = ?", m.EdbRefreshMappingId).Error
 	return
 }
 
@@ -105,7 +108,7 @@ func GetConfigRefreshEdbInfoListBySourceAndSubSource(sourceList, configIdList []
 
 	var pars []interface{}
 
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT a.*,b.edb_refresh_config_id FROM edb_info a 
  JOIN edb_refresh_mapping b ON a.edb_info_id = b.edb_info_id
 WHERE b.edb_refresh_config_id IN (` + utils.GetOrmInReplace(num) + `) `
@@ -116,7 +119,7 @@ WHERE b.edb_refresh_config_id IN (` + utils.GetOrmInReplace(num) + `) `
 		sql += ` AND b.source not in (` + utils.GetOrmInReplace(sourceNum) + `) `
 		pars = append(pars, sourceList)
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
-
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, pars).Find(&list).Error
 	return
 }

models/data_manage/edb_refresh/edb_refresh_source.go

@@ -1,7 +1,7 @@
 package edb_refresh
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -36,9 +36,10 @@ type EdbRefreshSourceList struct {
 // @return items []*EdbRefreshSource
 // @return err error
 func (m EdbRefreshSource) GetAllList() (items []*EdbRefreshSource, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM edb_refresh_source ORDER BY id ASC `
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
 	return
 }
 

models/data_manage/excel/excel_edb_mapping.go

@@ -1,8 +1,8 @@
 package excel
 
 import (
+	"eta_gn/eta_task/global"
 	"eta_gn/eta_task/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -18,18 +18,20 @@ type ExcelEdbMapping struct {
 
 // GetExcelEdbMappingTotalBySource 根据表格类型获取总数
 func GetExcelEdbMappingTotalBySource(sources []int) (total int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT count(*)  FROM excel_edb_mapping WHERE source in (` + utils.GetOrmInReplace(len(sources)) + `)`
 
-	err = o.Raw(sql, sources).QueryRow(&total)
+	//err = o.Raw(sql, sources).QueryRow(&total)
+	err = global.DmSQL["data"].Raw(sql, sources).Scan(total).Error
 	return
 }
 
 // GetExcelEdbMappingListBySource 根据表格类型获取列表
 func GetExcelEdbMappingListBySource(sources []int, pageIndex, pageSize int) (items []*ExcelEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM excel_edb_mapping WHERE source in (` + utils.GetOrmInReplace(len(sources)) + `) Limit ?,? `
 
-	_, err = o.Raw(sql, sources, pageIndex, pageSize).QueryRows(&items)
+	//_, err = o.Raw(sql, sources, pageIndex, pageSize).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, sources, pageIndex, pageSize).Find(&items).Error
 	return
 }

models/data_manage/future_good/future_good_edb_info.go

@@ -1,7 +1,7 @@
 package future_good
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -27,56 +27,64 @@ type FutureGoodEdbInfo struct {
 
 // GetFutureGoodEdbInfo 期货指标
 func GetFutureGoodEdbInfo(edbInfoId int) (item *FutureGoodEdbInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_info WHERE future_good_edb_info_id = ? `
 	sql += ` ORDER BY future_good_edb_info_id DESC `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	//err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&item).Error
 	return
 }
 
 // GetFutureGoodEdbInfoList 获取指标数据列表
 func GetFutureGoodEdbInfoList(condition string, pars []interface{}) (list []*FutureGoodEdbInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY future_good_edb_info_id DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&list).Error
 	return
 }
 
 // GetAllFutureGoodEdbInfoList 获取指标数据列表
 func GetAllFutureGoodEdbInfoList() (list []*FutureGoodEdbInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_info  ORDER BY future_good_edb_info_id DESC `
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
 	return
 }
 
 // GetFutureGoodEdbInfoListByParentId 根据父级ID获取指标数据列表
 func GetFutureGoodEdbInfoListByParentId(parentId int) (list []*FutureGoodEdbInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_info WHERE parent_id = ?  ORDER BY future_good_edb_info_id ASC `
-	_, err = o.Raw(sql, parentId).QueryRows(&list)
+	//_, err = o.Raw(sql, parentId).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Find(&list).Error
 	return
+
 }
 
 // AddFutureGoodEdbInfo 添加期货数据库指标
 func AddFutureGoodEdbInfo(item *FutureGoodEdbInfo) (err error) {
-	o := orm.NewOrm()
-	lastId, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.FutureGoodEdbInfoId = int(lastId)
+	//o := orm.NewOrm()
+	//lastId, err := o.Insert(item)
+	//if err != nil {
+	//	return
+	//}
+	//item.FutureGoodEdbInfoId = int(lastId)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
 // Update 更新指标基础信息
 func (FutureGoodEdbInfo *FutureGoodEdbInfo) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(FutureGoodEdbInfo, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(FutureGoodEdbInfo, cols...)
+	err = global.DEFAULT_DmSQL.Select(cols).Updates(FutureGoodEdbInfo).Error
 	return
 }
 
@@ -89,13 +97,15 @@ type FutureGoodEdbInfoGroupListResp struct {
 
 // GetFutureGoodEdbInfoGroupList 获取分組指标数据列表
 func GetFutureGoodEdbInfoGroupList(condition string, pars []interface{}) (list []*FutureGoodEdbInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY future_good_edb_info_id DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&list).Error
 	return
 }
 

utils/constants.go

@@ -192,3 +192,6 @@ const (
 	CUSTOM_ANALYSIS_TABLE = 4 // 自定义分析表格
 	BALANCE_TABLE         = 5 // 平衡表
 )
+
+// MultiAddNum 批量插入的数据量
+const MultiAddNum = 500