fix

models/base_from_adjust.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
@@ -32,8 +33,9 @@ type AddAdjustEdbData struct {
 // SaveAdjustEdb 保存数据调整指标
 func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg string) {
 	errMsg = `添加指标失败`
-	o := orm.NewOrm()
-	to, err := o.Begin()
+	//o := orm.NewOrm()
+	//to, err := o.Begin()
+	to := global.DEFAULT_DmSQL.Begin()
 	if err != nil {
 		return
 	}
@@ -75,12 +77,13 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 			EdbType:         2,
 			Sort:            GetAddEdbMaxSortByClassifyId(req.ClassifyId, utils.EDB_INFO_TYPE),
 		}
-		newEdbInfoId, tmpErr := to.Insert(edbInfo)
+		//newEdbInfoId, tmpErr := to.Insert(edbInfo)
+		tmpErr := to.Create(edbInfo).Error
 		if tmpErr != nil {
 			err = tmpErr
 			return
 		}
-		edbInfo.EdbInfoId = int(newEdbInfoId)
+		//edbInfo.EdbInfoId = int(newEdbInfoId)
 
 		// 获取来源指标
 		fromEdbInfo, tmpErr := GetEdbInfoById(req.FromEdbInfoId)
@@ -105,7 +108,8 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 			calculateMappingItem.FromTag = ""
 			calculateMappingItem.Source = edbInfo.Source
 			calculateMappingItem.SourceName = edbInfo.SourceName
-			_, err = to.Insert(calculateMappingItem)
+			//_, err = to.Insert(calculateMappingItem)
+			err = to.Create(calculateMappingItem).Error
 			if err != nil {
 				return
 			}
@@ -122,7 +126,8 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 				ModifyTime:    time.Now(),
 				CreateTime:    time.Now(),
 			}
-			_, err = to.Insert(edbAdjustConf)
+			//_, err = to.Insert(edbAdjustConf)
+			err = to.Create(edbAdjustConf).Error
 			if err != nil {
 				return
 			}
@@ -140,7 +145,8 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 		edbInfo.Unit = utils.TrimStr(req.Unit)
 		edbInfo.ClassifyId = req.ClassifyId
 		edbInfo.ModifyTime = time.Now()
-		_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "ModifyTime")
+		//_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "ModifyTime")
+		err = to.Model(edbInfo).Updates(edbInfo).Error
 		if err != nil {
 			return
 		}
@@ -152,7 +158,8 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 		dataTableName := GetEdbDataTableName(utils.DATA_SOURCE_CALCULATE_ADJUST, edbInfo.SubSource)
 		deleteSql := ` DELETE FROM %s WHERE edb_info_id=? `
 		deleteSql = fmt.Sprintf(deleteSql, dataTableName)
-		_, err = to.Raw(deleteSql, req.EdbInfoId).Exec()
+		//_, err = to.Raw(deleteSql, req.EdbInfoId).Exec()
+		err = to.Exec(deleteSql, req.EdbInfoId).Error
 		if err != nil {
 			return
 		}
@@ -180,7 +187,8 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 			// 获取之前的配置
 			var edbAdjustConf *EdbAdjustConf
 			sql := ` SELECT * FROM edb_adjust_conf WHERE edb_info_id=? `
-			err = o.Raw(sql, edbInfo.EdbInfoId).QueryRow(&edbAdjustConf)
+			//err = o.Raw(sql, edbInfo.EdbInfoId).QueryRow(&edbAdjustConf)
+			err = to.Raw(sql, edbInfo.EdbInfoId).Scan(&edbAdjustConf).Error
 			if err != nil {
 				errMsg = "获取指标配置失败"
 				return
@@ -189,7 +197,8 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 			// 修改配置的最晚日期
 			edbAdjustConf.SourceEndDate = fromEdbEndDate
 			edbAdjustConf.ModifyTime = time.Now()
-			_, err = to.Update(edbAdjustConf, "SourceEndDate", "ModifyTime")
+			//_, err = to.Update(edbAdjustConf, "SourceEndDate", "ModifyTime")
+			err = to.Model(edbAdjustConf).Updates(edbAdjustConf).Error
 			if err != nil {
 				errMsg = "更新指标配置失败"
 				return
@@ -235,7 +244,8 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = to.Raw(addSql).Exec()
+		//_, err = to.Raw(addSql).Exec()
+		err = to.Exec(addSql).Error
 		if err != nil {
 			return
 		}
@@ -245,8 +255,9 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 
 // RefreshAllAdjustEdb 刷新所有 数据调整指标
 func RefreshAllAdjustEdb(edbInfo *EdbInfo, fromEdbInfo *EdbInfo) (err error) {
-	o := orm.NewOrm()
-	to, err := o.Begin()
+	//o := orm.NewOrm()
+	//to, err := o.Begin()
+	to := global.DEFAULT_DmSQL
 	if err != nil {
 		return
 	}
@@ -265,7 +276,8 @@ func RefreshAllAdjustEdb(edbInfo *EdbInfo, fromEdbInfo *EdbInfo) (err error) {
 	// 获取之前的配置
 	var edbAdjustConf *EdbAdjustConf
 	sql := ` SELECT * FROM edb_adjust_conf WHERE edb_info_id=? `
-	err = o.Raw(sql, edbInfo.EdbInfoId).QueryRow(&edbAdjustConf)
+	//err = o.Raw(sql, edbInfo.EdbInfoId).QueryRow(&edbAdjustConf)
+	err = to.Raw(sql, edbInfo.EdbInfoId).Scan(&edbAdjustConf).Error
 	if err != nil {
 		err = errors.New("获取指标配置失败")
 		return
@@ -322,7 +334,8 @@ func RefreshAllAdjustEdb(edbInfo *EdbInfo, fromEdbInfo *EdbInfo) (err error) {
 			if existVal != item.Value {
 				sql = ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 				sql = fmt.Sprintf(sql, dataTableName)
-				_, err = to.Raw(sql, saveVal, edbInfo.EdbInfoId, currDay).Exec()
+				//_, err = to.Raw(sql, saveVal, edbInfo.EdbInfoId, currDay).Exec()
+				err = to.Exec(sql, saveVal, edbInfo.EdbInfoId, currDay).Error
 				if err != nil {
 					return err
 				}
@@ -332,7 +345,8 @@ func RefreshAllAdjustEdb(edbInfo *EdbInfo, fromEdbInfo *EdbInfo) (err error) {
 	}
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = to.Raw(addSql).Exec()
+		//_, err = to.Raw(addSql).Exec()
+		err = to.Exec(addSql).Error
 		if err != nil {
 			return
 		}
@@ -345,7 +359,8 @@ func RefreshAllAdjustEdb(edbInfo *EdbInfo, fromEdbInfo *EdbInfo) (err error) {
 			}
 			edbAdjustConf.SourceEndDate = fromEdbEndDate
 			edbAdjustConf.ModifyTime = time.Now()
-			_, err = to.Update(edbAdjustConf, "SourceEndDate", "ModifyTime")
+			//_, err = to.Update(edbAdjustConf, "SourceEndDate", "ModifyTime")
+			err = to.Model(edbAdjustConf).Updates(edbAdjustConf).Error
 		}
 	}
 

models/base_from_baiinfo.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"strconv"
@@ -41,7 +42,7 @@ func GetBaseFromBaiinfoDataByCondition(condition string, pars []interface{}) (li
 		sql += condition
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = DEFAULT_DmSQL.Raw(sql, pars).Find(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&list).Error
 	return
 }
 
@@ -80,7 +81,7 @@ func AddEdbDataFromBaiinfo(edbCode string) (err error) {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
 		//_, err = o.Raw(addSql).Exec()
-		err = DEFAULT_DmSQL.Exec(addSql).Error
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -191,7 +192,7 @@ func RefreshEdbDataFromBaiinfo(edbInfoId int, edbCode, startDate string) (err er
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		//_, err = o.Raw(addSql).Exec()
-		err = DEFAULT_DmSQL.Exec(addSql).Error
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshEdbDataFromBaiinfo add Err", err.Error())
 			return
@@ -245,7 +246,7 @@ type BaseFromBaiinfoIndex struct {
 func (d *BaseFromBaiinfoIndex) AddBaseFromBaiinfoIndex() (lastId int64, err error) {
 	//o := orm.NewOrm()
 	//lastId, err = o.Insert(d)
-	err = DEFAULT_DmSQL.Create(d).Error
+	err = global.DEFAULT_DmSQL.Create(d).Error
 	lastId = d.BaseFromBaiinfoIndexId
 	return
 }
@@ -253,7 +254,7 @@ func (d *BaseFromBaiinfoIndex) AddBaseFromBaiinfoIndex() (lastId int64, err erro
 func AddBaseFromBaiinfoData(item []*BaseFromBaiinfoData) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.InsertMulti(1, item)
-	err = DEFAULT_DmSQL.CreateInBatches(item, 500).Error
+	err = global.DEFAULT_DmSQL.CreateInBatches(item, 500).Error
 	return
 }
 
@@ -261,7 +262,7 @@ func (d *BaseFromBaiinfoIndex) GetSmmIndexItem(indexCode string) (item *BaseFrom
 	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_baiinfo_index WHERE index_code=? `
 	//err = o.Raw(sql, indexCode).QueryRow(&item)
-	err = DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
 	return
 }
 
@@ -269,7 +270,7 @@ func GetBaseFromBaiinfoDataByCode(indexCode string) (list []*BaseFromBaiinfoData
 	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_baiinfo_data WHERE index_code=? `
 	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
-	err = DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
 	return
 }
 
@@ -277,7 +278,7 @@ func ModifyBaiinfoIndexSort(baseFromBaiinfoIndexId int64) (err error) {
 	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_baiinfo_index SET sort=? WHERE base_from_baiinfo_index_id=? `
 	//_, err = o.Raw(sql, baseFromBaiinfoIndexId, baseFromBaiinfoIndexId).Exec()
-	err = DEFAULT_DmSQL.Exec(sql, baseFromBaiinfoIndexId, baseFromBaiinfoIndexId).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, baseFromBaiinfoIndexId, baseFromBaiinfoIndexId).Error
 	return
 }
 
@@ -285,7 +286,7 @@ func GetBaiinfoIndexInfoMaxAndMinInfo(indexCode string) (item *EdbInfoMaxAndMinI
 	//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_baiinfo_data WHERE index_code=? `
 	//err = o.Raw(sql, indexCode).QueryRow(&item)
-	err = DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
 	return
 }
 
@@ -293,7 +294,7 @@ func ModifyBaiinfoIndexMaxAndMinInfo(indexCode string, item *EdbInfoMaxAndMinInf
 	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_baiinfo_index SET start_date=?,end_date=?,modify_time=NOW() WHERE index_code=? `
 	//_, err = o.Raw(sql, item.MinDate, item.MaxDate, indexCode).Exec()
-	err = DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, indexCode).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, indexCode).Error
 	return
 }
 
@@ -301,6 +302,6 @@ func ModifyBaiinfoIndexMaxAndMinInfo(indexCode string, item *EdbInfoMaxAndMinInf
 func (r *BaseFromBaiinfoIndex) Update(updateCols []string) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.Update(r, updateCols...)
-	err = DEFAULT_DmSQL.Model(r).Updates(r).Error
+	err = global.DEFAULT_DmSQL.Model(r).Updates(r).Error
 	return
 }

models/base_from_bloomberg.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"strconv"
@@ -54,7 +55,7 @@ func (m *BaseFromBloombergIndex) TableName() string {
 func (m *BaseFromBloombergIndex) Create() (err error) {
 	//o := orm.NewOrm()
 	//id, err := o.Insert(m)
-	err = DEFAULT_DmSQL.Create(m).Error
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	if err != nil {
 		return
 	}
@@ -65,7 +66,7 @@ func (m *BaseFromBloombergIndex) Create() (err error) {
 func (m *BaseFromBloombergIndex) Update(cols []string) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.Update(m, cols...)
-	err = DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
+	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
@@ -73,7 +74,7 @@ func GetBaseFromBloombergIndexByCode(indexCode string) (item *BaseFromBloombergI
 	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_bloomberg_index WHERE index_code = ? LIMIT 1`
 	//err = o.Raw(sql, indexCode).QueryRow(&item)
-	err = DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
 	return
 }
 
@@ -113,7 +114,7 @@ func GetBaseFromBloombergDataByCondition(condition string, pars []interface{}) (
 	}
 	sql := `SELECT * FROM (` + sub + ` HAVING 1 ORDER BY modify_time DESC) tmp GROUP BY data_time ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
 	return
 }
 
@@ -121,13 +122,13 @@ func MultiInsertOrUpdateBaseFromBloombergData(inserts, updates []*BaseFromBloomb
 	//o := orm.NewOrm()
 	if len(inserts) > 0 {
 		//_, e := o.InsertMulti(1000, inserts)
-		e := DEFAULT_DmSQL.CreateInBatches(inserts, 1000).Error
+		e := global.DEFAULT_DmSQL.CreateInBatches(inserts, 1000).Error
 		if e != nil {
 			err = fmt.Errorf("insert multi err: %s", e.Error())
 			return
 		}
 	}
-	tx := DEFAULT_DmSQL.Begin()
+	tx := global.DEFAULT_DmSQL.Begin()
 	if len(updates) > 0 {
 		//p, e := o.Raw("UPDATE base_from_bloomberg_data SET value = ?, modify_time = NOW() WHERE index_code = ? AND data_time = ?").Prepare()
 		//if e != nil {
@@ -169,7 +170,7 @@ func MultiInsertOrUpdateBaseFromBloombergData(inserts, updates []*BaseFromBloomb
 func GetBaseFromBloombergIndexMinMax(indexCode string) (item *EdbInfoMaxAndMinInfo, err error) {
 	//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_bloomberg_data WHERE index_code = ? `
-	err = DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
 	//err = o.Raw(sql, indexCode).QueryRow(&item)
 	if err != nil {
 		return
@@ -179,7 +180,7 @@ func GetBaseFromBloombergIndexMinMax(indexCode string) (item *EdbInfoMaxAndMinIn
 	var lastVal float64
 	sql = ` SELECT value AS latest_value FROM base_from_bloomberg_data WHERE index_code = ? ORDER BY data_time DESC LIMIT 1 `
 	//err = o.Raw(sql, indexCode).QueryRow(&lastVal)
-	err = DEFAULT_DmSQL.Raw(sql, indexCode).First(&lastVal).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&lastVal).Error
 	if err != nil {
 		return
 	}
@@ -191,7 +192,7 @@ func ModifyBaseFromBloombergIndexMinMax(indexCode string, item *EdbInfoMaxAndMin
 	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_bloomberg_index SET start_date = ?, end_date = ?, modify_time = NOW() WHERE index_code = ? `
 	//_, err = o.Raw(sql, item.MinDate, item.MaxDate, indexCode).Exec()
-	err = DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, indexCode).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, indexCode).Error
 	return
 }
 
@@ -213,7 +214,7 @@ func GetBloombergDataByCondition(condition string, pars []interface{}) (item []*
 	}
 	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 = DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
 	return
 }
 
@@ -262,7 +263,7 @@ func AddEdbDataFromBloomberg(edbCode string) (err error) {
 			addSql = strings.TrimRight(addSql, ",")
 			utils.FileLog.Info("addSql:" + addSql)
 			//_, err = o.Raw(addSql).Exec()
-			err = DEFAULT_DmSQL.Exec(addSql).Error
+			err = global.DEFAULT_DmSQL.Exec(addSql).Error
 			if err != nil {
 				return err
 			}
@@ -383,7 +384,7 @@ func RefreshEdbDataFromBloomberg(edbInfoId int, edbCode, startDate string) (err
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		//_, err = o.Raw(addSql).Exec()
-		err = DEFAULT_DmSQL.Exec(addSql).Error
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}

models/base_from_business.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/models/mgo"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
@@ -114,7 +115,7 @@ func (m *BaseFromBusinessIndex) GetIndexItem(indexCode string) (item *BaseFromBu
 	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_business_index WHERE index_code = ? `
 	//err = o.Raw(sql, indexCode).QueryRow(&item)
-	err = DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
 	return
 }
 
@@ -134,7 +135,7 @@ func (m *BaseFromBusinessIndex) GetIndexItemList(indexCodeList []string) (items
 	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_business_index WHERE index_code in (` + utils.GetOrmInReplace(num) + `) `
 	//_, err = o.Raw(sql, indexCodeList).QueryRows(&items)
-	err = DEFAULT_DmSQL.Raw(sql, indexCodeList).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCodeList).Find(&items).Error
 
 	return
 }
@@ -154,7 +155,7 @@ func (m *BaseFromBusinessIndex) DelIndexItemList(indexCodeList []string) (err er
 	//o := orm.NewOrm()
 	sql := `DELETE FROM base_from_business_index WHERE index_code in (` + utils.GetOrmInReplace(num) + `) `
 	//_, err = o.Raw(sql, indexCodeList).Exec()
-	err = DEFAULT_DmSQL.Exec(sql, indexCodeList).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, indexCodeList).Error
 
 	return
 }
@@ -170,7 +171,7 @@ func (m *BaseFromBusinessIndex) GetMaxId() (maxId int, err error) {
 	//o := orm.NewOrm()
 	sql := `SELECT max(base_from_business_index_id) id FROM base_from_business_index limit 1`
 	//err = o.Raw(sql).QueryRow(&maxId)
-	err = DEFAULT_DmSQL.Raw(sql).First(&maxId).Error
+	err = global.DEFAULT_DmSQL.Raw(sql).First(&maxId).Error
 	return
 }
 
@@ -178,7 +179,7 @@ func (m *BaseFromBusinessIndex) GetMaxId() (maxId int, err error) {
 func (m *BaseFromBusinessIndex) Add() (err error) {
 	//o := orm.NewOrm()
 	//lastId, err := o.Insert(m)
-	err = DEFAULT_DmSQL.Create(m).Error
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	if err != nil {
 		return
 	}
@@ -190,14 +191,14 @@ func (m *BaseFromBusinessIndex) Add() (err error) {
 func (m *BaseFromBusinessIndex) Update(cols []string) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.Update(m, cols...)
-	err = DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
+	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
 func (m *BaseFromBusinessIndex) Del() (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.Delete(m)
-	err = DEFAULT_DmSQL.Delete(m).Error
+	err = global.DEFAULT_DmSQL.Delete(m).Error
 	return
 }
 
@@ -210,7 +211,7 @@ func (m *BaseFromBusinessIndex) UpdateIndex(item *BaseFromBusinessIndex, updateC
 	}
 	//o := orm.NewOrm()
 	//_, err = o.Update(item, updateCols...)
-	err = DEFAULT_DmSQL.Model(item).Select(updateCols).Updates(item).Error
+	err = global.DEFAULT_DmSQL.Model(item).Select(updateCols).Updates(item).Error
 	return
 }
 
@@ -226,7 +227,7 @@ func (m *EdbBusinessSource) GetEdbBusinessSourceItem(sourceName string) (item *E
 	//o := orm.NewOrm()
 	sql := `SELECT * FROM edb_business_source WHERE source_name = ? `
 	//err = o.Raw(sql, sourceName).QueryRow(&item)
-	err = DEFAULT_DmSQL.Raw(sql, sourceName).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, sourceName).First(&item).Error
 	return
 }
 
@@ -234,7 +235,7 @@ func (m *EdbBusinessSource) GetEdbBusinessSourceItem(sourceName string) (item *E
 func (m *EdbBusinessSource) Add() (err error) {
 	//o := orm.NewOrm()
 	//lastId, err := o.Insert(m)
-	err = DEFAULT_DmSQL.Create(m).Error
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	if err != nil {
 		return
 	}
@@ -358,6 +359,6 @@ func (m *BaseFromBusinessIndex) ModifyIndexMaxAndMinInfo(indexCode string, item
 	}
 	sql += ` WHERE index_code=?`
 	//_, err = o.Raw(sql, item.MinDate, item.MaxDate, indexCode).Exec()
-	err = DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, indexCode).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, indexCode).Error
 	return
 }

models/base_from_business_data.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"strings"
@@ -79,7 +80,7 @@ func (m *BaseFromBusinessData) GetAllDataList(condition []string, pars []interfa
 	}
 
 	//_, err = o.Raw(sql, pars).QueryRows(&result)
-	err = DEFAULT_DmSQL.Raw(sql, pars).Find(&result).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&result).Error
 
 	return
 }
@@ -109,7 +110,7 @@ func (m *BaseFromBusinessData) GetLimitDataList(condition []string, pars []inter
 	sql += fmt.Sprintf(` LIMIT %d`, size)
 
 	//_, err = o.Raw(sql, pars).QueryRows(&result)
-	err = DEFAULT_DmSQL.Raw(sql, pars).Find(&result).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&result).Error
 
 	return
 }
@@ -140,7 +141,7 @@ func (m *BaseFromBusinessData) GetPageDataList(condition []string, pars []interf
 	sql += fmt.Sprintf(` LIMIT %d,%d`, startSize, size)
 
 	//_, err = o.Raw(sql, pars).QueryRows(&result)
-	err = DEFAULT_DmSQL.Raw(sql, pars).Find(&result).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&result).Error
 
 	return
 }
@@ -161,7 +162,7 @@ func (m *BaseFromBusinessData) GetCountDataList(condition []string, pars []inter
 		sql += ` WHERE ` + strings.Join(condition, " AND ")
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = DEFAULT_DmSQL.Raw(sql, pars).Find(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&count).Error
 
 	return
 }
@@ -176,7 +177,7 @@ func (m *BaseFromBusinessData) GetCountDataList(condition []string, pars []inter
 func (m *BaseFromBusinessData) InsertDataByColl(addData interface{}) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.Insert(addData)
-	err = DEFAULT_DmSQL.Create(addData).Error
+	err = global.DEFAULT_DmSQL.Create(addData).Error
 
 	return
 }
@@ -192,7 +193,7 @@ func (m *BaseFromBusinessData) InsertDataByColl(addData interface{}) (err error)
 func (m *BaseFromBusinessData) BatchInsertData(bulk int, dataList []*BaseFromBusinessData) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.InsertMulti(bulk, dataList)
-	err = DEFAULT_DmSQL.CreateInBatches(dataList, bulk).Error
+	err = global.DEFAULT_DmSQL.CreateInBatches(dataList, bulk).Error
 
 	return
 }
@@ -208,7 +209,7 @@ func (m *BaseFromBusinessData) BatchInsertData(bulk int, dataList []*BaseFromBus
 func (m *BaseFromBusinessData) UpdateData(updateCols []string) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.Update(m, updateCols...)
-	err = DEFAULT_DmSQL.Model(m).Select(updateCols).Updates(m).Error
+	err = global.DEFAULT_DmSQL.Model(m).Select(updateCols).Updates(m).Error
 	if err != nil {
 		fmt.Println("UpdateDataByColl:Err:" + err.Error())
 		return
@@ -228,7 +229,7 @@ func (m *BaseFromBusinessData) UpdateData(updateCols []string) (err error) {
 func (m *BaseFromBusinessData) HandleData(addDataList, updateDataList []*BaseFromBusinessData) (err error) {
 	//o := orm.NewOrm()
 	//to, err := o.Begin()
-	to := DEFAULT_DmSQL.Begin()
+	to := global.DEFAULT_DmSQL.Begin()
 	if err != nil {
 		return
 	}
@@ -279,7 +280,7 @@ func (m *BaseFromBusinessData) GetEdbInfoMaxAndMinInfo(indexCode string) (result
 	sql := ``
 	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_business_data WHERE index_code = ? `
 	//err = o.Raw(sql, indexCode).QueryRow(&result)
-	err = DEFAULT_DmSQL.Raw(sql, indexCode).First(&result).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&result).Error
 	if err != nil {
 		return
 	}
@@ -287,7 +288,7 @@ func (m *BaseFromBusinessData) GetEdbInfoMaxAndMinInfo(indexCode string) (result
 	var latestValue float64
 	sql = ` SELECT value AS latest_value FROM base_from_business_data WHERE index_code = ? ORDER BY data_time DESC LIMIT 1 `
 	//err = o.Raw(sql, indexCode).QueryRow(&latestValue)
-	err = DEFAULT_DmSQL.Raw(sql, indexCode).First(&latestValue).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&latestValue).Error
 	result.LatestValue = latestValue
 
 	return
@@ -312,7 +313,7 @@ func (m *BaseFromBusinessData) DelDataByCond(condition []string, pars []interfac
 	sql += ` WHERE ` + strings.Join(condition, " AND ")
 
 	//_, err = o.Raw(sql, pars).Exec()
-	err = DEFAULT_DmSQL.Exec(sql, pars).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
 
 	return
 }

models/base_from_calculate.go

@@ -3,6 +3,7 @@ package models
 import (
 	"encoding/json"
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"gorm.io/gorm"
@@ -50,7 +51,7 @@ func AddCalculateInfo(req EdbInfoCalculateSaveReq, calculateMappingList []*EdbIn
 
 	//o := orm.NewOrm()
 	//to, err := o.Begin()
-	to := DEFAULT_DmSQL.Begin()
+	to := global.DEFAULT_DmSQL.Begin()
 	if err != nil {
 		return
 	}
@@ -132,7 +133,7 @@ func AddCalculateInfo(req EdbInfoCalculateSaveReq, calculateMappingList []*EdbIn
 func EditCalculateInfo(edbInfo *EdbInfo, req EdbInfoCalculateSaveReq, formulaSlice []string, edbInfoIdBytes []string, needCalculate bool) (err error, errMsg string) {
 	//o := orm.NewOrm()
 	//to, err := o.Begin()
-	to := DEFAULT_DmSQL.Begin()
+	to := global.DEFAULT_DmSQL.Begin()
 	if err != nil {
 		return
 	}
@@ -256,7 +257,7 @@ func GetCalculateEdbInfo(edbInfoId int) (from_edb_info_id string, err error) {
 			GROUP BY edb_info_id
 			 `
 	//err = o.Raw(sql, edbInfoId).QueryRow(&from_edb_info_id)
-	err = DEFAULT_DmSQL.Raw(sql, edbInfoId).Find(&from_edb_info_id).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Find(&from_edb_info_id).Error
 	return
 }
 
@@ -264,7 +265,7 @@ func GetCalculateEdbInfo(edbInfoId int) (from_edb_info_id string, err error) {
 func DeleteCalculateEdbInfo(edbInfoId int) (err error) {
 	//o := orm.NewOrm()
 	//to, err := o.Begin()
-	to := DEFAULT_DmSQL.Begin()
+	to := global.DEFAULT_DmSQL.Begin()
 	if err != nil {
 		return
 	}
@@ -291,7 +292,7 @@ func DeleteCalculateEdbInfo(edbInfoId int) (err error) {
 func RefreshAllCalculate(edbInfoIdArr []*EdbInfo, edbInfoTag map[string]int, edbInfoId, source, subSource int, edbCode, formulaStr, startDate, endDate string, edbInfoIdBytes []string, emptyType, maxEmptyType int, extra string) (err error) {
 	//o := orm.NewOrm()
 	//to, err := o.Begin()
-	to := DEFAULT_DmSQL.Begin()
+	to := global.DEFAULT_DmSQL.Begin()
 	if err != nil {
 		return
 	}

models/base_from_ccf.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"strconv"
@@ -44,7 +45,7 @@ func GetBaseFromCCFDataByCondition(condition string, pars []interface{}) (list [
 		sql += condition
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = DEFAULT_DmSQL.Raw(sql, pars).Find(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&list).Error
 	return
 }
 
@@ -83,7 +84,7 @@ func (obj BaseFromCCF) Add(edbCode string) (err error) {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
 		//_, err = o.Raw(addSql).Exec()
-		err = DEFAULT_DmSQL.Exec(addSql).Error
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -193,7 +194,7 @@ func (obj BaseFromCCF) Refresh(edbInfoId int, edbCode, startDate string) (err er
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		//_, err = o.Raw(addSql).Exec()
-		err = DEFAULT_DmSQL.Exec(addSql).Error
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshEdbDataFromBaiinfo add Err", err.Error())
 			return
@@ -249,14 +250,14 @@ func (m *BaseFromCCFIndex) TableName() string {
 func (m *BaseFromCCFIndex) Add() (lastId int64, err error) {
 	//o := orm.NewOrm()
 	//lastId, err = o.Insert(m)
-	err = DEFAULT_DmSQL.Create(m).Error
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
 func (m *BaseFromCCFIndex) Update(updateCols []string) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.Update(m, updateCols...)
-	err = DEFAULT_DmSQL.Model(m).Updates(m).Error
+	err = global.DEFAULT_DmSQL.Model(m).Updates(m).Error
 
 	return
 }
@@ -265,7 +266,7 @@ func (m *BaseFromCCFIndex) ModifyIndexMaxAndMinDate(indexCode string, item *EdbI
 	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_ccf_index SET start_date=?,end_date=?,modify_time=NOW() WHERE index_code=? `
 	//_, err = o.Raw(sql, item.MinDate, item.MaxDate, indexCode).Exec()
-	err = DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, indexCode).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, indexCode).Error
 	return
 }
 
@@ -273,7 +274,7 @@ func (m *BaseFromCCFIndex) GetByIndexCode(indexCode string) (item *BaseFromCCFIn
 	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_ccf_index WHERE index_code=? `
 	//err = o.Raw(sql, indexCode).QueryRow(&item)
-	err = DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
 	return
 }
 
@@ -289,7 +290,7 @@ func (m *BaseFromCCFIndex) GetItemsByCondition(condition string, pars []interfac
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_ccf_index WHERE 1=1 %s %s`, fields, condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
 	return
 }
 
@@ -311,14 +312,14 @@ func (m *BaseFromCCFData) GetByIndexCode(indexCode string) (list []*BaseFromCCFD
 	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_ccf_data WHERE index_code=? `
 	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
-	err = DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
 	return
 }
 
 func (m *BaseFromCCFData) AddMulti(item []*BaseFromCCFData) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.InsertMulti(100, item)
-	err = DEFAULT_DmSQL.CreateInBatches(item, 100).Error
+	err = global.DEFAULT_DmSQL.CreateInBatches(item, 100).Error
 	return
 }
 
@@ -355,7 +356,7 @@ func (m *BaseFromCCFData) GetMaxAndMinDateByIndexCode(indexCode string) (item *E
 	//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_ccf_data WHERE index_code=? `
 	//err = o.Raw(sql, indexCode).QueryRow(&item)
-	err = DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
 	return
 }
 
@@ -387,14 +388,14 @@ type BaseFromCCFClassify struct {
 func (m *BaseFromCCFClassify) Add() (lastId int64, err error) {
 	//o := orm.NewOrm()
 	//lastId, err = o.Insert(m)
-	err = DEFAULT_DmSQL.Create(m).Error
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
 func (m *BaseFromCCFClassify) Update(updateCols []string) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.Update(m, updateCols...)
-	err = DEFAULT_DmSQL.Model(m).Select(updateCols).Updates(m).Error
+	err = global.DEFAULT_DmSQL.Model(m).Select(updateCols).Updates(m).Error
 
 	return
 }
@@ -403,7 +404,7 @@ func (m *BaseFromCCFClassify) GetByClassifyName(classifyName string) (item *Base
 	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_ccf_classify WHERE classify_name=? `
 	//err = o.Raw(sql, classifyName).QueryRow(&item)
-	err = DEFAULT_DmSQL.Raw(sql, classifyName).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, classifyName).First(&item).Error
 	return
 }
 
@@ -419,7 +420,7 @@ func (m *BaseFromCCFClassify) GetItemsByCondition(condition string, pars []inter
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_ccf_classify WHERE 1=1 %s %s`, fields, condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
 	return
 }
 
@@ -470,7 +471,7 @@ func MultiUpdateBaseFromCCFDataValue(items []*BaseFromCCFData) (err error) {
 			continue
 		}
 		//_, err = p.Exec(v.Value, v.IndexCode, v.DataTime)
-		err = DEFAULT_DmSQL.Exec(sql, v.Value, v.IndexCode, v.DataTime).Error
+		err = global.DEFAULT_DmSQL.Exec(sql, v.Value, v.IndexCode, v.DataTime).Error
 		if err != nil {
 			return
 		}

models/base_from_cffex.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"strconv"
@@ -60,12 +61,16 @@ type BaseFromTradeCFFEXIndex struct {
 	DataTime                  string    `gorm:"column:data_time"`
 }
 
+func (m *BaseFromTradeCFFEXIndex) TableName() string {
+	return "base_from_trade_cffex_index"
+}
+
 func GetBaseFromCffexDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeCFFEXIndex, err error) {
 	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_cffex_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
 	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
-	err = DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&list).Error
 	return
 }
 
@@ -99,7 +104,7 @@ func GetCffexDataByTradeCode(condition string, pars []interface{}) (item []*Base
 	}
 	sql += ` ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
 	return
 }
 
@@ -155,7 +160,7 @@ func AddEdbDataFromCffex(edbCode string) (err error) {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
 		//_, err = o.Raw(addSql).Exec()
-		err = DEFAULT_DmSQL.Exec(addSql).Error
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -298,7 +303,7 @@ func RefreshEdbDataFromCffex(edbInfoId int, edbCode, startDate string) (err erro
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		//_, err = o.Raw(addSql).Exec()
-		err = DEFAULT_DmSQL.Exec(addSql).Error
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return err
 		}

models/base_from_coal.go

@@ -1,47 +1,69 @@
 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 BaseFromCoalmineIndex struct {
+//	BaseFromCoalmineCompanyIndexId int
+//	IndexName                      string `description:"持买单量指标名称"`
+//	IndexCode                      string `description:"持买单量指标编码"`
+//	DealValue                      string `description:"成交量"`
+//	DataTime                       string `description:"数据日期"`
+//	Source                         string `description:"来源"`
+//	Province                       string `description:"省份"`
+//	City                           string `description:"城市"`
+//	GroupName                      string `description:"集团名称"`
+//	Unit                           string `description:"单位"`
+//	Frequency                      string `description:"频率"`
+//	CreateTime                     string `description:"插入时间"`
+//	ModifyTime                     string `description:"修改时间"`
+//}
+
 type BaseFromCoalmineIndex struct {
-	BaseFromCoalmineCompanyIndexId int
-	IndexName                      string `description:"持买单量指标名称"`
-	IndexCode                      string `description:"持买单量指标编码"`
-	DealValue                      string `description:"成交量"`
-	DataTime                       string `description:"数据日期"`
-	Source                         string `description:"来源"`
-	Province                       string `description:"省份"`
-	City                           string `description:"城市"`
-	GroupName                      string `description:"集团名称"`
-	Unit                           string `description:"单位"`
-	Frequency                      string `description:"频率"`
-	CreateTime                     string `description:"插入时间"`
-	ModifyTime                     string `description:"修改时间"`
+	BaseFromCoalmineCompanyIndexId int    `gorm:"column:base_from_coalmine_company_index_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:"数据日期"`
+	Source                         string `gorm:"column:source" description:"来源"`
+	Province                       string `gorm:"column:province" description:"省份"`
+	City                           string `gorm:"column:city" description:"城市"`
+	GroupName                      string `gorm:"column:group_name" description:"集团名称"`
+	Unit                           string `gorm:"column:unit" description:"单位"`
+	Frequency                      string `gorm:"column:frequency" description:"频率"`
+	CreateTime                     string `gorm:"column:create_time" description:"插入时间"`
+	ModifyTime                     string `gorm:"column:modify_time" description:"修改时间"`
+}
+
+func (m *BaseFromCoalmineIndex) TableName() string {
+	return "base_from_coalmine_index"
 }
 
 func GetBaseFromCoalIndexByCode(suffix, indexCode string) (items []*BaseFromCoalmineIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_coalmine_%s WHERE index_code=? `
 	sql = fmt.Sprintf(sql, suffix)
-	_, 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 GetCoalDataByTradeCode(suffix, condition string, pars []interface{}) (item []*BaseFromCoalmineIndex, err error) {
 	sql := ` SELECT * FROM base_from_coalmine_%s WHERE 1=1 `
 	sql = fmt.Sprintf(sql, suffix)
-	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
 }
 
@@ -59,7 +81,7 @@ func AddEdbDataFromCoal(edbCode string) (err error) {
 		suffix = "inland_index"
 	}
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	coalBaseDataAll, err := GetBaseFromCoalIndexByCode(suffix, edbCode)
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -129,7 +151,8 @@ func AddEdbDataFromCoal(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
 		}
@@ -140,7 +163,7 @@ func AddEdbDataFromCoal(edbCode string) (err error) {
 func RefreshEdbDataFromCoal(edbInfoId int, edbCode, startDate string) (err error) {
 	source := utils.DATA_SOURCE_COAL
 	subSource := utils.DATA_SUB_SOURCE_EDB
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -297,7 +320,8 @@ func RefreshEdbDataFromCoal(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_coal_coastal.go

@@ -1,43 +1,66 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
+// BaseFromCoalmineCoastalIndex 沿海八省动力煤用户供耗存数据指标表
+//type BaseFromCoalmineCoastalIndex struct {
+//	BaseFromCoalmineCoastalIndexID int       `orm:"column(base_from_coalmine_coastal_index_id);pk"`
+//	IndexName                      string    // 省份/企业名称
+//	IndexCode                      string    // 持买单量指标编码
+//	DataTime                       string    // 指标时间
+//	DealValue                      string    // 数据量
+//	GroupName                      string    // 地区
+//	Source                         string    // 来源
+//	Unit                           string    //单位
+//	Frequency                      string    `description:"频率"`
+//	CreateTime                     time.Time `description:"插入时间"`
+//	ModifyTime                     time.Time `description:"修改时间"`
+//}
+
 // BaseFromCoalmineCoastalIndex 沿海八省动力煤用户供耗存数据指标表
 type BaseFromCoalmineCoastalIndex struct {
-	BaseFromCoalmineCoastalIndexID int       `orm:"column(base_from_coalmine_coastal_index_id);pk"`
-	IndexName                      string    // 省份/企业名称
-	IndexCode                      string    // 持买单量指标编码
-	DataTime                       string    // 指标时间
-	DealValue                      string    // 数据量
-	GroupName                      string    // 地区
-	Source                         string    // 来源
-	Unit                           string    //单位
-	Frequency                      string    `description:"频率"`
-	CreateTime                     time.Time `description:"插入时间"`
-	ModifyTime                     time.Time `description:"修改时间"`
+	BaseFromCoalmineCoastalIndexID int       `gorm:"column:base_from_coalmine_coastal_index_id;primaryKey"`
+	IndexName                      string    `gorm:"column:index_name"` // 省份/企业名称
+	IndexCode                      string    `gorm:"column:index_code"` // 持买单量指标编码
+	DataTime                       string    `gorm:"column:data_time"`  // 指标时间
+	DealValue                      string    `gorm:"column:deal_value"` // 数据量
+	GroupName                      string    `gorm:"column:group_name"` // 地区
+	Source                         string    `gorm:"column:source"`     // 来源
+	Unit                           string    `gorm:"column:unit"`       // 单位
+	Frequency                      string    `gorm:"column:frequency" description:"频率"`
+	CreateTime                     time.Time `gorm:"column:create_time" description:"插入时间"`
+	ModifyTime                     time.Time `gorm:"column:modify_time" description:"修改时间"`
+}
+
+func (m *BaseFromCoalmineCoastalIndex) TableName() string {
+	return "base_from_coalmine_coastal_index"
 }
 
-//查询指标
+// 查询指标
 func GetBaseFromCoalmineCoastalIndex() (items []*BaseFromCoalmineCoastalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_coalmine_coastal_index`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
 
-//添加数据
-func AddBaseFromCoalCoastalIndex(item *BaseFromCoalmineCoastalIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+// 添加数据
+func AddBaseFromCoalCoastalIndex(item *BaseFromCoalmineCoastalIndex) (lastId int, err error) {
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	lastId = item.BaseFromCoalmineCoastalIndexID
 	return
 }
 
 func UpdateBaseFromCoalCoastalIndex(item *BaseFromCoalmineCoastalIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_coalmine_coastal_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.Exec(sql, item.DealValue, item.IndexName, item.DataTime).Error
 	return
 }

models/base_from_coal_firm.go

@@ -1,43 +1,67 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
+// BaseFromCoalmineFirmIndex 煤矿产量周度公司数据表
+//type BaseFromCoalmineFirmIndex struct {
+//	BaseFromCoalmineFirmIndexID int       `orm:"column(base_from_coalmine_firm_index_id);pk"`
+//	IndexName                   string    // 省份/企业名称
+//	IndexCode                   string    // 持买单量指标编码
+//	DataTime                    string    // 指标时间
+//	DealValue                   string    // 数据量
+//	GroupName                   string    // 集团名
+//	Source                      string    // 来源
+//	Unit                        string    // 来源
+//	Frequency                   string    `description:"频率"`
+//	CreateTime                  time.Time `description:"插入时间"`
+//	ModifyTime                  time.Time `description:"修改时间"`
+//}
+
 // BaseFromCoalmineFirmIndex 煤矿产量周度公司数据表
 type BaseFromCoalmineFirmIndex struct {
-	BaseFromCoalmineFirmIndexID int       `orm:"column(base_from_coalmine_firm_index_id);pk"`
-	IndexName                   string    // 省份/企业名称
-	IndexCode                   string    // 持买单量指标编码
-	DataTime                    string    // 指标时间
-	DealValue                   string    // 数据量
-	GroupName                   string    // 集团名
-	Source                      string    // 来源
-	Unit                        string    // 来源
-	Frequency                   string    `description:"频率"`
-	CreateTime                  time.Time `description:"插入时间"`
-	ModifyTime                  time.Time `description:"修改时间"`
+	BaseFromCoalmineFirmIndexID int       `gorm:"column:base_from_coalmine_firm_index_id;primaryKey"`
+	IndexName                   string    `gorm:"column:index_name"` // 省份/企业名称
+	IndexCode                   string    `gorm:"column:index_code"` // 持买单量指标编码
+	DataTime                    string    `gorm:"column:data_time"` // 指标时间
+	DealValue                   string    `gorm:"column:deal_value"` // 数据量
+	GroupName                   string    `gorm:"column:group_name"` // 集团名
+	Source                      string    `gorm:"column:source"` // 来源
+	Unit                        string    `gorm:"column:unit"` // 单位
+	Frequency                   string    `gorm:"column:frequency" description:"频率"`
+	CreateTime                  time.Time `gorm:"column:create_time" description:"插入时间"`
+	ModifyTime                  time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
+func (m *BaseFromCoalmineFirmIndex) TableName() string {
+	return "base_from_coalmine_firm_index"
+}
+
+
 // 查询指标
 func GetBaseFromCoalmineFirmIndex() (items []*BaseFromCoalmineFirmIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_coalmine_firm_index`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
 
 // 添加数据
-func AddBaseFromCoalFirmIndex(item *BaseFromCoalmineFirmIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+func AddBaseFromCoalFirmIndex(item *BaseFromCoalmineFirmIndex) (lastId int, err error) {
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	lastId = item.BaseFromCoalmineFirmIndexID
 	return
 }
 
 func UpdateBaseFromCoalFirmIndex(item *BaseFromCoalmineFirmIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_coalmine_firm_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.Exec(sql, item.DealValue, item.IndexName, item.DataTime).Error
 	return
 }

models/base_from_coal_inland.go

@@ -1,43 +1,67 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
+//// BaseFromCoalmineInlandIndex 沿海八省动力煤用户供耗存数据指标表
+//type BaseFromCoalmineInlandIndex struct {
+//	BaseFromCoalmineInlandIndexID int       `orm:"column(base_from_coalmine_inland_index_id);pk"`
+//	IndexName                     string    // 省份/企业名称
+//	IndexCode                     string    // 持买单量指标编码
+//	DataTime                      string    // 指标时间
+//	DealValue                     string    // 数据量
+//	GroupName                     string    // 地区
+//	Source                        string    // 来源
+//	Unit                          string    // 来源
+//	Frequency                     string    `description:"频率"`
+//	CreateTime                    time.Time `description:"插入时间"`
+//	ModifyTime                    time.Time `description:"修改时间"`
+//}
+
+
 // BaseFromCoalmineInlandIndex 沿海八省动力煤用户供耗存数据指标表
 type BaseFromCoalmineInlandIndex struct {
-	BaseFromCoalmineInlandIndexID int       `orm:"column(base_from_coalmine_inland_index_id);pk"`
-	IndexName                     string    // 省份/企业名称
-	IndexCode                     string    // 持买单量指标编码
-	DataTime                      string    // 指标时间
-	DealValue                     string    // 数据量
-	GroupName                     string    // 地区
-	Source                        string    // 来源
-	Unit                          string    // 来源
-	Frequency                     string    `description:"频率"`
-	CreateTime                    time.Time `description:"插入时间"`
-	ModifyTime                    time.Time `description:"修改时间"`
+	BaseFromCoalmineInlandIndexID int       `gorm:"column:base_from_coalmine_inland_index_id;primaryKey"`
+	IndexName                     string    `gorm:"column:index_name" description:"省份/企业名称"`
+	IndexCode                     string    `gorm:"column:index_code" description:"持买单量指标编码"`
+	DataTime                      string    `gorm:"column:data_time" description:"指标时间"`
+	DealValue                     string    `gorm:"column:deal_value" description:"数据量"`
+	GroupName                     string    `gorm:"column:group_name" description:"地区"`
+	Source                        string    `gorm:"column:source" 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 *BaseFromCoalmineInlandIndex) TableName() string {
+	return "base_from_coalmine_inland_index"
 }
 
 //查询指标
 func GetBaseFromCoalmineInlandIndex() (items []*BaseFromCoalmineInlandIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_coalmine_inland_index`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
 
 //添加数据
-func AddBaseFromCoalInlandIndex(item *BaseFromCoalmineInlandIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+func AddBaseFromCoalInlandIndex(item *BaseFromCoalmineInlandIndex) (lastId int, err error) {
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	lastId = item.BaseFromCoalmineInlandIndexID
 	return
 }
 
 func UpdateBaseFromCoalInlandIndex(item *BaseFromCoalmineInlandIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_coalmine_inland_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.Exec(sql, item.DealValue, item.IndexName, item.DataTime).Error
 	return
 }

models/base_from_coalmine.go

@@ -1,106 +1,163 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
-type BaseFromCoalmineMapping struct {
-	BaseFromCoalmineMappingId int       `orm:"column(base_from_coalmine_mapping_id);pk"`
-	IndexName                 string    `description:"持买单量指标名称"`
-	IndexCode                 string    `description:"持买单量指标编码"`
-	CreateTime                time.Time `description:"时间"`
-}
+//type BaseFromCoalmineMapping struct {
+//	BaseFromCoalmineMappingId int       `orm:"column(base_from_coalmine_mapping_id);pk"`
+//	IndexName                 string    `description:"持买单量指标名称"`
+//	IndexCode                 string    `description:"持买单量指标编码"`
+//	CreateTime                time.Time `description:"时间"`
+//}
 
+type BaseFromCoalmineMapping struct {
+	BaseFromCoalmineMappingId int       `gorm:"column:base_from_coalmine_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:"时间"`
+}
+
+func (m *BaseFromCoalmineMapping) TableName() string {
+	return "base_from_coalmine_mapping"
+}
+
+//type BaseFromCoalmineJsmIndex struct {
+//	BaseFromCoalmineJsmIndexId int       `orm:"column(base_from_coalmine_jsm_index_id);pk"`
+//	IndexName                  string    `description:"持买单量指标名称"`
+//	IndexCode                  string    `description:"持买单量指标编码"`
+//	Exchange                   string    `description:"样本统计类别"`
+//	DealValue                  string    `description:"成交量"`
+//	DataTime                   string    `description:"数据日期"`
+//	Source                     string    `description:"来源"`
+//	Province                   string    `description:"省份"`
+//	Description                string    `description:"描述"`
+//	Unit                       string    `description:"单位"`
+//	Frequency                  string    `description:"频率"`
+//	CreateTime                 time.Time `description:"插入时间"`
+//	ModifyTime                 time.Time `description:"修改时间"`
+//}
 type BaseFromCoalmineJsmIndex struct {
-	BaseFromCoalmineJsmIndexId int       `orm:"column(base_from_coalmine_jsm_index_id);pk"`
-	IndexName                  string    `description:"持买单量指标名称"`
-	IndexCode                  string    `description:"持买单量指标编码"`
-	Exchange                   string    `description:"样本统计类别"`
-	DealValue                  string    `description:"成交量"`
-	DataTime                   string    `description:"数据日期"`
-	Source                     string    `description:"来源"`
-	Province                   string    `description:"省份"`
-	Description                string    `description:"描述"`
-	Unit                       string    `description:"单位"`
-	Frequency                  string    `description:"频率"`
-	CreateTime                 time.Time `description:"插入时间"`
-	ModifyTime                 time.Time `description:"修改时间"`
-}
+	BaseFromCoalmineJsmIndexId int       `gorm:"column:base_from_coalmine_jsm_index_id;primaryKey" description:"持买单量指标ID"`
+	IndexName                  string    `gorm:"column:index_name" description:"持买单量指标名称"`
+	IndexCode                  string    `gorm:"column:index_code" description:"持买单量指标编码"`
+	Exchange                   string    `gorm:"column:exchange" description:"样本统计类别"`
+	DealValue                  string    `gorm:"column:deal_value" description:"成交量"`
+	DataTime                   string    `gorm:"column:data_time" description:"数据日期"`
+	Source                     string    `gorm:"column:source" description:"来源"`
+	Province                   string    `gorm:"column:province" description:"省份"`
+	Description                string    `gorm:"column:description" 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 *BaseFromCoalmineJsmIndex) TableName() string {
+	return "base_from_coalmine_jsm_index"
+}
+
+//type BaseFromCoalmineCompanyIndex struct {
+//	BaseFromCoalmineCompanyIndexId int       `orm:"column(base_from_coalmine_company_index_id);pk"`
+//	IndexName                      string    `description:"持买单量指标名称"`
+//	IndexCode                      string    `description:"持买单量指标编码"`
+//	DealValue                      string    `description:"成交量"`
+//	DataTime                       string    `description:"数据日期"`
+//	Source                         string    `description:"来源"`
+//	Province                       string    `description:"省份"`
+//	City                           string    `description:"城市"`
+//	GroupName                      string    `description:"集团名称"`
+//	Unit                           string    `description:"单位"`
+//	Frequency                      string    `description:"频率"`
+//	CreateTime                     time.Time `description:"插入时间"`
+//	ModifyTime                     time.Time `description:"修改时间"`
+//}
 
 type BaseFromCoalmineCompanyIndex struct {
-	BaseFromCoalmineCompanyIndexId int       `orm:"column(base_from_coalmine_company_index_id);pk"`
-	IndexName                      string    `description:"持买单量指标名称"`
-	IndexCode                      string    `description:"持买单量指标编码"`
-	DealValue                      string    `description:"成交量"`
-	DataTime                       string    `description:"数据日期"`
-	Source                         string    `description:"来源"`
-	Province                       string    `description:"省份"`
-	City                           string    `description:"城市"`
-	GroupName                      string    `description:"集团名称"`
-	Unit                           string    `description:"单位"`
-	Frequency                      string    `description:"频率"`
-	CreateTime                     time.Time `description:"插入时间"`
-	ModifyTime                     time.Time `description:"修改时间"`
+	BaseFromCoalmineCompanyIndexId int       `gorm:"column:base_from_coalmine_company_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:"数据日期"`
+	Source                         string    `gorm:"column:source" description:"来源"`
+	Province                       string    `gorm:"column:province" description:"省份"`
+	City                           string    `gorm:"column:city" description:"城市"`
+	GroupName                      string    `gorm:"column:group_name" 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 *BaseFromCoalmineCompanyIndex) TableName() string {
+	return "base_from_coalmine_company_index"
 }
-
-
 //添加指标
-func AddBaseFromCoalmineMapping(item *BaseFromCoalmineMapping) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+func AddBaseFromCoalmineMapping(item *BaseFromCoalmineMapping) (lastId int, err error) {
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	lastId = item.BaseFromCoalmineMappingId
 	return
 }
 
 //查询指标
 func GetBaseFromCoalmineMapping() (items []*BaseFromCoalmineMapping, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_coalmine_mapping`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
 
 //查询数据
 func GetBaseFromCoalmineIndex() (items []*BaseFromCoalmineJsmIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_coalmine_jsm_index`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
 
 func UpdateBaseFromCoalmineIndex(item *BaseFromCoalmineJsmIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_coalmine_jsm_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.Exec(sql, item.DealValue, item.IndexName, item.DataTime).Error
 	return
 }
 
 //添加数据
-func AddBaseFromCoalmineIndex(item *BaseFromCoalmineJsmIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+func AddBaseFromCoalmineIndex(item *BaseFromCoalmineJsmIndex) (lastId int, err error) {
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	lastId = item.BaseFromCoalmineJsmIndexId
 	return
 }
 
 //添加公司指标
 func AddBaseFromCoalmineCompanyIndex(item *BaseFromCoalmineCompanyIndex) (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.BaseFromCoalmineCompanyIndexId)
 	return
 }
 
 //查询公司指标
 func GetBaseFromCoalmineCompanyIndex() (items []*BaseFromCoalmineCompanyIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_coalmine_company_index`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
 
 func UpdateBaseFromCoalmineCompanyIndex(item *BaseFromCoalmineCompanyIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_coalmine_company_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.Exec(sql, item.DealValue, item.IndexName, item.DataTime).Error
 	return
 }
 

models/base_from_com_trade.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"strconv"
@@ -12,30 +13,49 @@ import (
 
 // UN 联合国商品贸易数据指标
 
+// ComTradeCodeMapping 联合国商品贸易数据指标编码与分类编码的关系表
+//type ComTradeCodeMapping struct {
+//	Code       int       `orm:"column(code);pk"`
+//	IndexCode  string    `description:"联合国商品贸易编码"`
+//	Type       int       `description:"1:价格；2：重量"`
+//	Name       string    `description:"指标名称"`
+//	CreateTime time.Time `description:"创建时间"`
+//}
+
 // ComTradeCodeMapping 联合国商品贸易数据指标编码与分类编码的关系表
 type ComTradeCodeMapping struct {
-	Code       int       `orm:"column(code);pk"`
-	IndexCode  string    `description:"联合国商品贸易编码"`
-	Type       int       `description:"1:价格；2：重量"`
-	Name       string    `description:"指标名称"`
-	CreateTime time.Time `description:"创建时间"`
+	Code       int       `gorm:"column:code;primaryKey" description:"联合国商品贸易编码"`
+	IndexCode  string    `gorm:"column:index_code" description:"联合国商品贸易编码"`
+	Type       int       `gorm:"column:type" description:"1:价格；2：重量"`
+	Name       string    `gorm:"column:name" description:"指标名称"`
+	CreateTime time.Time `gorm:"column:create_time" description:"创建时间"`
+}
+
+func (m *ComTradeCodeMapping) TableName() string {
+	return "com_trade_code_mapping"
 }
 
 // GetComTradeIndex 根据指标code获取指标信息
 func GetComTradeIndex(indexCode string) (item *ComTradeCodeMapping, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM com_trade_code_mapping WHERE code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).Find(&item).Error
 	return
 }
 
+//type ComTradeData struct {
+//	Value    float64 `orm:"column(value)" description:"值"`
+//	DataTime string  `orm:"column(data_time)" description:"日期"`
+//}
+
 type ComTradeData struct {
-	Value    float64 `orm:"column(value)" description:"值"`
-	DataTime string  `orm:"column(data_time)" description:"日期"`
+	Value    float64 `gorm:"column:value" description:"值"`
+	DataTime string  `gorm:"column:data_time" description:"日期"`
 }
 
 func GetComTradeDataByTradeCode(tradeCode, startDate string) (items []*ComTradeData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	pars := []interface{}{tradeCode}
 	sql1 := ` SELECT * FROM com_trade_data WHERE 1=1 AND index_trade_code = ? `
 	if startDate != `` {
@@ -43,12 +63,13 @@ func GetComTradeDataByTradeCode(tradeCode, startDate string) (items []*ComTradeD
 		pars = append(pars, startDate)
 	}
 	sql := `select trade_value AS value,data_time 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(&items)
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
 	return
 }
 
 func GetComTradeDataByWeightCode(weightCode, startDate string) (items []*ComTradeData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	pars := []interface{}{weightCode}
 	sql1 := ` SELECT * FROM com_trade_data WHERE 1=1  AND index_net_weight_code = ? `
 	if startDate != `` {
@@ -56,7 +77,8 @@ func GetComTradeDataByWeightCode(weightCode, startDate string) (items []*ComTrad
 		pars = append(pars, startDate)
 	}
 	sql := `select net_weight_value AS value,data_time 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(&items)
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
 	return
 }
 
@@ -73,7 +95,7 @@ func GetComTradeDataByCondition(condition string, pars []interface{}) (item []*C
 
 // AddEdbDataFromComTrade 新增钢联指标数据
 func AddEdbDataFromComTrade(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	// 获取指标关系
 	codeMapping, err := GetComTradeIndex(edbCode)
@@ -115,7 +137,8 @@ func AddEdbDataFromComTrade(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 +152,7 @@ func RefreshEdbDataFromComTrade(edbInfoId int, edbCode, startDate string) (err e
 	source := utils.DATA_SOURCE_COM_TRADE
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -233,7 +256,8 @@ func RefreshEdbDataFromComTrade(edbInfoId int, edbCode, startDate string) (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 err
 		}

models/base_from_dl.go

@@ -1,45 +1,72 @@
 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 BaseFromTradeDalianIndex struct {
+//	BaseFromTradeDalianIndexId int `orm:"column(base_from_trade_dalian_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 BaseFromTradeDalianIndex struct {
-	BaseFromTradeDalianIndexId int `orm:"column(base_from_trade_dalian_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
+	BaseFromTradeDalianIndexId int       `gorm:"column:base_from_trade_dalian_index_id;primaryKey"`
+	Rank                       int       `gorm:"column:rank"`
+	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 GetBaseFromDalianDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeDalianIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_dalian_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
 }
 
@@ -56,12 +83,13 @@ type BaseFromDlDataSimple struct {
 
 func GetDlDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromDlDataSimple, err error) {
 	sql := ` SELECT * FROM base_from_trade_dalian_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 +104,7 @@ func AddEdbDataFromDl(edbCode string) (err error) {
 		suffix = "sold"
 	}
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	dlBaseDataAll, err := GetBaseFromDalianDataAllByIndexCode(edbCode, suffix)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		return
@@ -116,7 +144,8 @@ func AddEdbDataFromDl(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 +158,7 @@ func RefreshEdbDataFromDl(edbInfoId int, edbCode, startDate string) (err error)
 	source := utils.DATA_SOURCE_DL
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -256,7 +285,8 @@ func RefreshEdbDataFromDl(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_edb_mapping.go

@@ -1,25 +1,39 @@
 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"
 )
 
+// BaseFromEdbMapping 同花顺高频数据
+//type BaseFromEdbMapping struct {
+//	Id              int       `orm:"column(id);pk"`
+//	BaseFromIndexId int       `description:"源指标ID"`
+//	BaseIndexCode   string    `description:"源指标编码"`
+//	EdbInfoId       int       `description:"指标ID"`
+//	EdbCode         string    `description:"指标编码"`
+//	Source          int       `description:"指标来源：1-同花顺..."`
+//	SubSource       int       `description:"子数据来源：0-经济数据库；1-日期序列；2-高频数据"`
+//	ConvertRule     string    `description:"转换规则"`
+//	CreateTime      time.Time `description:"创建时间"`
+//	ModifyTime      time.Time `description:"修改时间"`
+//}
+
 // BaseFromEdbMapping 同花顺高频数据
 type BaseFromEdbMapping struct {
-	Id              int       `orm:"column(id);pk"`
-	BaseFromIndexId int       `description:"源指标ID"`
-	BaseIndexCode   string    `description:"源指标编码"`
-	EdbInfoId       int       `description:"指标ID"`
-	EdbCode         string    `description:"指标编码"`
-	Source          int       `description:"指标来源：1-同花顺..."`
-	SubSource       int       `description:"子数据来源：0-经济数据库；1-日期序列；2-高频数据"`
-	ConvertRule     string    `description:"转换规则"`
-	CreateTime      time.Time `description:"创建时间"`
-	ModifyTime      time.Time `description:"修改时间"`
+	Id              int       `gorm:"column:id;primaryKey" description:"同花顺高频数据ID"`
+	BaseFromIndexId int       `gorm:"column:base_from_index_id" description:"源指标ID"`
+	BaseIndexCode   string    `gorm:"column:base_index_code" description:"源指标编码"`
+	EdbInfoId       int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode         string    `gorm:"column:edb_code" description:"指标编码"`
+	Source          int       `gorm:"column:source" description:"指标来源：1-同花顺..."`
+	SubSource       int       `gorm:"column:sub_source" description:"子数据来源：0-经济数据库；1-日期序列；2-高频数据"`
+	ConvertRule     string    `gorm:"column:convert_rule" description:"转换规则"`
+	CreateTime      time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime      time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 func (m *BaseFromEdbMapping) TableName() string {
@@ -55,12 +69,13 @@ func (m *BaseFromEdbMapping) Cols() BaseFromEdbMappingCols {
 }
 
 func (m *BaseFromEdbMapping) 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.Id = int(id)
+	//m.Id = int(id)
 	return
 }
 
@@ -68,21 +83,24 @@ func (m *BaseFromEdbMapping) CreateMulti(items []*BaseFromEdbMapping) (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 *BaseFromEdbMapping) 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 *BaseFromEdbMapping) 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.Id).Exec()
+	//_, err = o.Raw(sql, m.Id).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, m.Id).Error
 	return
 }
 
@@ -90,9 +108,10 @@ func (m *BaseFromEdbMapping) 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
 }
 
@@ -100,39 +119,43 @@ func (m *BaseFromEdbMapping) 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 *BaseFromEdbMapping) GetItemById(id int) (item *BaseFromEdbMapping, 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).Find(&item).Error
 	return
 }
 
 func (m *BaseFromEdbMapping) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *BaseFromEdbMapping, 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).Find(&item).Error
 	return
 }
 
 func (m *BaseFromEdbMapping) 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 *BaseFromEdbMapping) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromEdbMapping, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -142,12 +165,13 @@ func (m *BaseFromEdbMapping) 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 *BaseFromEdbMapping) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BaseFromEdbMapping, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -157,6 +181,7 @@ func (m *BaseFromEdbMapping) 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_eia_steo.go

@@ -1,36 +1,44 @@
 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 EiaSteoData struct {
+//	InputValue float64 `orm:"column(value)" description:"值"`
+//	DataTime   string  `orm:"column(data_time)" description:"日期"`
+//}
+
 type EiaSteoData 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 *EiaSteoData) TableName() string {
+	return "base_from_eia_steo_data"
+}
 func GetEiaSteoDataByCondition(condition string, pars []interface{}) (item []*EiaSteoData, err error) {
 	sql1 := ` SELECT * FROM base_from_eia_steo_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).Find(&item).Error
 	return
 }
 
 // AddEdbDataFromEiaSteo 新增钢联指标数据
 func AddEdbDataFromEiaSteo(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -72,7 +80,8 @@ func AddEdbDataFromEiaSteo(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 +95,7 @@ func RefreshEdbDataFromEiaSteo(edbInfoId int, edbCode, startDate string) (err er
 	source := utils.DATA_SOURCE_EIA_STEO
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -192,7 +201,8 @@ func RefreshEdbDataFromEiaSteo(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_fenwei.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
@@ -13,15 +14,26 @@ import (
 // BaseFromFenwei 涌溢咨询
 type BaseFromFenwei struct{}
 
+//type BaseFromFenweiData struct {
+//	FenweiDataId  int `orm:"column(fenwei_data_id);pk"`
+//	FenweiIndexId int
+//	IndexCode     string
+//	DataTime      string
+//	Value         string
+//	CreateTime    time.Time
+//	ModifyTime    time.Time
+//	DataTimestamp int64
+//}
+
 type BaseFromFenweiData struct {
-	FenweiDataId  int `orm:"column(fenwei_data_id);pk"`
-	FenweiIndexId int
-	IndexCode     string
-	DataTime      string
-	Value         string
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
+	FenweiDataId  int       `gorm:"column:fenwei_data_id;primaryKey"`
+	FenweiIndexId int       `gorm:"column:fenwei_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"`
+	DataTimestamp int64     `gorm:"column:data_timestamp"`
 }
 
 func (m *BaseFromFenweiData) TableName() string {
@@ -29,18 +41,19 @@ func (m *BaseFromFenweiData) TableName() string {
 }
 
 func GetBaseFromFenweiDataByCondition(condition string, pars []interface{}) (list []*BaseFromFenweiData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_fenwei_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 BaseFromFenwei) Add(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -72,7 +85,8 @@ func (obj BaseFromFenwei) 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
 		}
@@ -83,7 +97,7 @@ func (obj BaseFromFenwei) Add(edbCode string) (err error) {
 // Refresh 刷新汾渭数据指标数据
 func (obj BaseFromFenwei) Refresh(edbInfoId int, edbCode, startDate string) (err error) {
 	source := obj.GetSource()
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -181,7 +195,8 @@ func (obj BaseFromFenwei) 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
@@ -200,19 +215,34 @@ func (obj BaseFromFenwei) GetSourceName() string {
 	return utils.DATA_SOURCE_NAME_FENWEI
 }
 
+//type BaseFromFenweiIndex struct {
+//	FenweiIndexId int64 `orm:"column(fenwei_index_id);pk"`
+//	IndexCode     string
+//	IndexName     string
+//	Frequency     string
+//	Unit          string
+//	ClassifyId    int
+//	StartDate     string
+//	EndDate       string
+//	Sort          int
+//	TerminalCode  string
+//	CreateTime    time.Time
+//	ModifyTime    time.Time
+//}
+
 type BaseFromFenweiIndex struct {
-	FenweiIndexId int64 `orm:"column(fenwei_index_id);pk"`
-	IndexCode     string
-	IndexName     string
-	Frequency     string
-	Unit          string
-	ClassifyId    int
-	StartDate     string
-	EndDate       string
-	Sort          int
-	TerminalCode  string
-	CreateTime    time.Time
-	ModifyTime    time.Time
+	FenweiIndexId int64     `gorm:"column:fenwei_index_id;primaryKey"`
+	IndexCode     string    `gorm:"column:index_code"`
+	IndexName     string    `gorm:"column:index_name"`
+	Frequency     string    `gorm:"column:frequency"`
+	Unit          string    `gorm:"column:unit"`
+	ClassifyId    int       `gorm:"column:classify_id"`
+	StartDate     string    `gorm:"column:start_date"`
+	EndDate       string    `gorm:"column:end_date"`
+	Sort          int       `gorm:"column:sort"`
+	TerminalCode  string    `gorm:"column:terminal_code"`
+	CreateTime    time.Time `gorm:"column:create_time"`
+	ModifyTime    time.Time `gorm:"column:modify_time"`
 }
 
 func (m *BaseFromFenweiIndex) TableName() string {
@@ -220,34 +250,40 @@ func (m *BaseFromFenweiIndex) TableName() string {
 }
 
 func (m *BaseFromFenweiIndex) Add() (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(m)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(m)
+	err = global.DEFAULT_DmSQL.Create(m).Error
+	lastId = m.FenweiIndexId
+
 	return
 }
 
 func (m *BaseFromFenweiIndex) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, updateCols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(m, updateCols...)
+	err = global.DEFAULT_DmSQL.Save(m).Error
 
 	return
 }
 
 func (m *BaseFromFenweiIndex) ModifyIndexMaxAndMinDate(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_fenwei_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 (m *BaseFromFenweiIndex) GetByIndexCode(indexCode string) (item *BaseFromFenweiIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_fenwei_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).Find(&item).Error
 	return
 }
 
 func (m *BaseFromFenweiIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromFenweiIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -257,7 +293,8 @@ func (m *BaseFromFenweiIndex) GetItemsByCondition(condition string, pars []inter
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_fenwei_index WHERE 1=1 %s %s`, fields, 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
 }
 
@@ -276,15 +313,17 @@ type BaseFromFenweiIndexList struct {
 }
 
 func (y *BaseFromFenweiData) GetByIndexCode(indexCode string) (list []*BaseFromFenweiData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_fenwei_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 *BaseFromFenweiData) AddMulti(item []*BaseFromFenweiData) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(1, item)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(1, item)
+	err = global.DEFAULT_DmSQL.CreateInBatches(item, len(item)).Error
 	return
 }
 
@@ -324,42 +363,59 @@ type HandleFenWeiNetDataReq struct {
 }
 
 func (y *BaseFromFenweiData) 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_fenwei_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).Find(&item).Error
 	return
 }
 
 // BaseFromFenweiClassify 汾渭数据分类表
 type BaseFromFenweiClassify struct {
-	ClassifyId      int       `orm:"column(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:"创建时间"`
-}
+	ClassifyId      int       `gorm:"column: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:"创建时间"`
+}
+
+//type BaseFromFenweiClassify struct {
+//	ClassifyId      int       `orm:"column(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:"创建时间"`
+//}
 
 func (y *BaseFromFenweiClassify) 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 = int64(y.ClassifyId)
 	return
 }
 
 func (y *BaseFromFenweiClassify) 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.Save(y).Error
 
 	return
 }
 
 func (y *BaseFromFenweiClassify) GetByClassifyName(classifyName string) (item []*BaseFromFenweiClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_fenwei_classify WHERE classify_name=? `
-	_, err = o.Raw(sql, classifyName).QueryRows(&item)
+	//_, err = o.Raw(sql, classifyName).QueryRows(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, classifyName).Find(&item).Error
 
 	if errors.Is(err, orm.ErrNoRows) {
 		return nil, nil
@@ -369,7 +425,7 @@ func (y *BaseFromFenweiClassify) GetByClassifyName(classifyName string) (item []
 }
 
 func (y *BaseFromFenweiClassify) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromFenweiClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -379,19 +435,32 @@ func (y *BaseFromFenweiClassify) GetItemsByCondition(condition string, pars []in
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_fenwei_classify WHERE 1=1 %s %s`, fields, 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
 }
 
+// BaseFromFenweiClassifyItem 汾渭数据分类信息
+//type BaseFromFenweiClassifyItem struct {
+//	ClassifyId   int                           `description:"分类ID"`
+//	ClassifyName string                        `description:"分类名称"`
+//	ParentId     int                           `description:"父级id"`
+//	Level        int                           `description:"层级"`
+//	Sort         int                           `description:"排序字段"`
+//	CreateTime   string                        `description:"创建时间"`
+//	ModifyTime   string                        `description:"修改时间"`
+//	Child        []*BaseFromFenweiClassifyItem `description:"子分类"`
+//}
+
 // BaseFromFenweiClassifyItem 汾渭数据分类信息
 type BaseFromFenweiClassifyItem struct {
-	ClassifyId   int                           `description:"分类ID"`
-	ClassifyName string                        `description:"分类名称"`
-	ParentId     int                           `description:"父级id"`
-	Level        int                           `description:"层级"`
-	Sort         int                           `description:"排序字段"`
-	CreateTime   string                        `description:"创建时间"`
-	ModifyTime   string                        `description:"修改时间"`
+	ClassifyId   int                           `gorm:"column:classify_id" description:"分类ID"`
+	ClassifyName string                        `gorm:"column:classify_name" description:"分类名称"`
+	ParentId     int                           `gorm:"column:parent_id" description:"父级id"`
+	Level        int                           `gorm:"column:level" description:"层级"`
+	Sort         int                           `gorm:"column:sort" description:"排序字段"`
+	CreateTime   string                        `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime   string                        `gorm:"column:modify_time" description:"修改时间"`
 	Child        []*BaseFromFenweiClassifyItem `description:"子分类"`
 }
 
@@ -416,20 +485,21 @@ func MultiUpdateBaseFromFenweiDataValue(items []*BaseFromFenweiData) (err error)
 		return
 	}
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_fenwei_data SET value = ?, modify_time = NOW() WHERE index_code = ? AND data_time = ? LIMIT 1`
-	p, err := o.Raw(sql).Prepare()
+	//p, err := o.Raw(sql).Prepare()
 	if err != nil {
 		return
 	}
-	defer func() {
-		_ = p.Close()
-	}()
+	//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
 		}
@@ -439,10 +509,10 @@ func MultiUpdateBaseFromFenweiDataValue(items []*BaseFromFenweiData) (err error)
 
 // GetBaseFromFenWeiIndexByIndexName 根据指标名称查询指标
 func GetBaseFromFenWeiIndexByIndexName(indexName string) (item *BaseFromFenweiIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_fenwei_index WHERE index_name=? `
-	err = o.Raw(sql, indexName).QueryRow(&item)
-
+	//err = o.Raw(sql, indexName).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, indexName).Find(&item).Error
 	if errors.Is(err, orm.ErrNoRows) {
 		return nil, nil
 	}
@@ -451,9 +521,10 @@ func GetBaseFromFenWeiIndexByIndexName(indexName string) (item *BaseFromFenweiIn
 
 // GetBaseFromFenweiDataByIndexCodeAndDataTime 根据指标编码和dataTime查询指标数据
 func GetBaseFromFenweiDataByIndexCodeAndDataTime(indexCode, dataTime string) (item *BaseFromFenweiData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_fenwei_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).Find(&item).Error
 
 	if errors.Is(err, orm.ErrNoRows) {
 		return nil, nil
@@ -468,23 +539,27 @@ func BatchAddBaseFromFenWeiData(items []*BaseFromFenweiData) (err error) {
 		return
 	}
 
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(1, items)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(1, items)
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, 1).Error
 	return
 }
 
 // AddBaseFromFenWeiClassify 新增汾渭分类
 func AddBaseFromFenWeiClassify(item *BaseFromFenweiClassify) (classifyId int64, err error) {
-	o := orm.NewOrm()
-	classifyId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//classifyId, err = o.Insert(item)
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	classifyId = int64(item.ClassifyId)
 	return
 }
 
 // GetBaseFromFenWeiIndexByIndexCode 跟据指标编码查询指标信息
 func GetBaseFromFenWeiIndexByIndexCode(indexCode string) (item *BaseFromFenweiIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_fenwei_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).Find(&item).Error
 
 	if errors.Is(err, orm.ErrNoRows) {
 		return nil, nil

models/base_from_fubao.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"
@@ -28,7 +28,7 @@ type FuBaoData struct {
 
 // 新增富宝指标数据
 func AddEdbDataFromFubao(edbCode string, fubaoData *FuBaoData) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_fubao(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	for _, dataItem := range fubaoData.ReturnValue.Data {
@@ -47,7 +47,8 @@ func AddEdbDataFromFubao(edbCode string, fubaoData *FuBaoData) (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("RefreshAllEdbDataByFubao add Err", err.Error())
 			return
@@ -61,7 +62,7 @@ func RefreshEdbDataFromFubao(edbInfoId int, edbCode, startDate string, fubaoData
 	source := utils.DATA_SOURCE_FUBAO
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	// 真实数据的最大日期  ， 插入规则配置的日期
 	var realDataMaxDate, edbDataInsertConfigDate time.Time
@@ -149,7 +150,8 @@ func RefreshEdbDataFromFubao(edbInfoId int, edbCode, startDate string, fubaoData
 
 	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("RefreshEdbDataFromFubao Err", err.Error())
 			return

models/base_from_gie.go

@@ -1,79 +1,151 @@
 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 BaseFromTradeEicIndex struct {
+//	BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk"`
+//	Country                string
+//	Type                   string
+//	EicCode                string
+//	ShortName              string
+//	Name                   string
+//	Status                 string
+//	GasDayStartedOn        string
+//	GasInStorage           string
+//	GasInStorageCode       string
+//	Full                   string
+//	FullCode               string
+//	Trend                  string
+//	TrendCode              string
+//	Injection              string
+//	InjectionCode          string
+//	Withdrawal             string
+//	WithdrawalCode         string
+//	WorkingGasVolume       string
+//	WorkingGasVolumeCode   string
+//	InjectionCapacity      string
+//	InjectionCapacityCode  string
+//	WithdrawalCapacity     string
+//	WithdrawalCapacityCode string
+//	Info                   string
+//	CreateTime             time.Time
+//	ModifyTime             time.Time
+//}
+
 type BaseFromTradeEicIndex struct {
-	BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk"`
-	Country                string
-	Type                   string
-	EicCode                string
-	ShortName              string
-	Name                   string
-	Status                 string
-	GasDayStartedOn        string
-	GasInStorage           string
-	GasInStorageCode       string
-	Full                   string
-	FullCode               string
-	Trend                  string
-	TrendCode              string
-	Injection              string
-	InjectionCode          string
-	Withdrawal             string
-	WithdrawalCode         string
-	WorkingGasVolume       string
-	WorkingGasVolumeCode   string
-	InjectionCapacity      string
-	InjectionCapacityCode  string
-	WithdrawalCapacity     string
-	WithdrawalCapacityCode string
-	Info                   string
-	CreateTime             time.Time
-	ModifyTime             time.Time
+	BaseFromEicIndexId     int       `gorm:"column:base_from_eic_index_id;primaryKey"`
+	Country                string    `gorm:"column:country"`
+	Type                   string    `gorm:"column:type"`
+	EicCode                string    `gorm:"column:eic_code"`
+	ShortName              string    `gorm:"column:short_name"`
+	Name                   string    `gorm:"column:name"`
+	Status                 string    `gorm:"column:status"`
+	GasDayStartedOn        string    `gorm:"column:gas_day_started_on"`
+	GasInStorage           string    `gorm:"column:gas_in_storage"`
+	GasInStorageCode       string    `gorm:"column:gas_in_storage_code"`
+	Full                   string    `gorm:"column:full"`
+	FullCode               string    `gorm:"column:full_code"`
+	Trend                  string    `gorm:"column:trend"`
+	TrendCode              string    `gorm:"column:trend_code"`
+	Injection              string    `gorm:"column:injection"`
+	InjectionCode          string    `gorm:"column:injection_code"`
+	Withdrawal             string    `gorm:"column:withdrawal"`
+	WithdrawalCode         string    `gorm:"column:withdrawal_code"`
+	WorkingGasVolume       string    `gorm:"column:working_gas_volume"`
+	WorkingGasVolumeCode   string    `gorm:"column:working_gas_volume_code"`
+	InjectionCapacity      string    `gorm:"column:injection_capacity"`
+	InjectionCapacityCode  string    `gorm:"column:injection_capacity_code"`
+	WithdrawalCapacity     string    `gorm:"column:withdrawal_capacity"`
+	WithdrawalCapacityCode string    `gorm:"column:withdrawal_capacity_code"`
+	Info                   string    `gorm:"column:info"`
+	CreateTime             time.Time `gorm:"column:create_time"`
+	ModifyTime             time.Time `gorm:"column:modify_time"`
+}
+
+func (m *BaseFromTradeEicIndex) TableName() string {
+	return "base_from_eic_index"
 }
 
+//type BaseFromTradeEicIndexV2 struct {
+//	BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk"`
+//	Type                   string
+//	EicCode                string
+//	Name                   string
+//	Status                 string
+//	GasDayStart            string
+//	GasInStorage           string
+//	GasInStorageCode       string
+//	Consumption            string
+//	ConsumptionCode        string
+//	ConsumptionFull        string
+//	ConsumptionFullCode    string
+//	Full                   string
+//	FullCode               string
+//	Trend                  string
+//	TrendCode              string
+//	Injection              string
+//	InjectionCode          string
+//	Withdrawal             string
+//	WithdrawalCode         string
+//	WorkingGasVolume       string
+//	WorkingGasVolumeCode   string
+//	InjectionCapacity      string
+//	InjectionCapacityCode  string
+//	WithdrawalCapacity     string
+//	WithdrawalCapacityCode string
+//	Info                   string
+//	Parent                 string
+//	CreateTime             time.Time
+//	ModifyTime             time.Time
+//}
+
 type BaseFromTradeEicIndexV2 struct {
-	BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk"`
-	Type                   string
-	EicCode                string
-	Name                   string
-	Status                 string
-	GasDayStart            string
-	GasInStorage           string
-	GasInStorageCode       string
-	Consumption            string
-	ConsumptionCode        string
-	ConsumptionFull        string
-	ConsumptionFullCode    string
-	Full                   string
-	FullCode               string
-	Trend                  string
-	TrendCode              string
-	Injection              string
-	InjectionCode          string
-	Withdrawal             string
-	WithdrawalCode         string
-	WorkingGasVolume       string
-	WorkingGasVolumeCode   string
-	InjectionCapacity      string
-	InjectionCapacityCode  string
-	WithdrawalCapacity     string
-	WithdrawalCapacityCode string
-	Info                   string
-	Parent                 string
-	CreateTime             time.Time
-	ModifyTime             time.Time
+	BaseFromEicIndexId     int       `gorm:"column:base_from_eic_index_id;primaryKey"`
+	Type                   string    `gorm:"column:type"`
+	EicCode                string    `gorm:"column:eic_code"`
+	Name                   string    `gorm:"column:name"`
+	Status                 string    `gorm:"column:status"`
+	GasDayStart            string    `gorm:"column:gas_day_start"`
+	GasInStorage           string    `gorm:"column:gas_in_storage"`
+	GasInStorageCode       string    `gorm:"column:gas_in_storage_code"`
+	Consumption            string    `gorm:"column:consumption"`
+	ConsumptionCode        string    `gorm:"column:consumption_code"`
+	ConsumptionFull        string    `gorm:"column:consumption_full"`
+	ConsumptionFullCode    string    `gorm:"column:consumption_full_code"`
+	Full                   string    `gorm:"column:full"`
+	FullCode               string    `gorm:"column:full_code"`
+	Trend                  string    `gorm:"column:trend"`
+	TrendCode              string    `gorm:"column:trend_code"`
+	Injection              string    `gorm:"column:injection"`
+	InjectionCode          string    `gorm:"column:injection_code"`
+	Withdrawal             string    `gorm:"column:withdrawal"`
+	WithdrawalCode         string    `gorm:"column:withdrawal_code"`
+	WorkingGasVolume       string    `gorm:"column:working_gas_volume"`
+	WorkingGasVolumeCode   string    `gorm:"column:working_gas_volume_code"`
+	InjectionCapacity      string    `gorm:"column:injection_capacity"`
+	InjectionCapacityCode  string    `gorm:"column:injection_capacity_code"`
+	WithdrawalCapacity     string    `gorm:"column:withdrawal_capacity"`
+	WithdrawalCapacityCode string    `gorm:"column:withdrawal_capacity_code"`
+	Info                   string    `gorm:"column:info"`
+	Parent                 string    `gorm:"column:parent"`
+	CreateTime             time.Time `gorm:"column:create_time"`
+	ModifyTime             time.Time `gorm:"column:modify_time"`
+}
+
+
+func (m *BaseFromTradeEicIndexV2) TableName() string {
+	return "base_from_eic_index"
 }
 
 func GetBaseFromEicDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeEicIndexV2, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	var name string
 	if suffix == "" {
 		name = "eic_code"
@@ -100,31 +172,34 @@ func GetBaseFromEicDataAllByIndexCode(indexCode, suffix string) (list []*BaseFro
 	}
 	sql := `SELECT * FROM base_from_trade_eic_index_v2 WHERE %s=? `
 	sql = fmt.Sprintf(sql, name)
-	_, 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 GetGieDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromTradeEicIndex, err error) {
 	sql := ` SELECT * FROM base_from_trade_eic_index WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY gas_day_started_on DESC `
 	fmt.Println(sql, pars)
-	_, 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 GetGieDataByTradeCodeV2(condition string, pars []interface{}) (item []*BaseFromTradeEicIndexV2, err error) {
 	sql := ` SELECT * FROM base_from_trade_eic_index_v2 WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY gas_day_start DESC `
 	fmt.Println(sql, pars)
-	_, 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
 }
 
@@ -156,7 +231,7 @@ func AddEdbDataFromGie(edbCode string) (err error) {
 		suffix = ""
 	}
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	eicBaseDataAll, err := GetBaseFromEicDataAllByIndexCode(edbCode, suffix)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		fmt.Println("GetBaseFromEicDataAllByIndexCode err:", err)
@@ -225,7 +300,8 @@ func AddEdbDataFromGie(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 {
 			fmt.Println("addSql err:", err)
 			return err
@@ -239,7 +315,7 @@ func RefreshEdbDataFromGie(edbInfoId int, edbCode, startDate string) (err error)
 	source := utils.DATA_SOURCE_GIE
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -393,7 +469,8 @@ func RefreshEdbDataFromGie(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_google_travel.go

@@ -1,53 +1,76 @@
 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 BaseFromChangesVisitorsCovid struct {
+//	Id                  int    `orm:"column(id);pk"`
+//	Entity              string `description:"国家"`
+//	Code                string `description:"国家编码"`
+//	EdbCode             string `description:"指标ID"`
+//	Day                 string `description:"统计的日期"`
+//	RetailAndRecreation string `description:"零售和娱乐场所"`
+//	GroceryAndPharmacy  string `description:"杂货店和药房"`
+//	Residential         string `description:"居家"`
+//	TransitStations     string `description:"公共交通车站"`
+//	Parks               string `description:"公园"`
+//	Workplaces          string `description:"工作场所"`
+//	Total               string `description:"总计"`
+//	CreateTime          string `description:"创建时间"`
+//	ModifyTime          string `description:"修改时间"`
+//}
+
 type BaseFromChangesVisitorsCovid struct {
-	Id                  int    `orm:"column(id);pk"`
-	Entity              string `description:"国家"`
-	Code                string `description:"国家编码"`
-	EdbCode             string `description:"指标ID"`
-	Day                 string `description:"统计的日期"`
-	RetailAndRecreation string `description:"零售和娱乐场所"`
-	GroceryAndPharmacy  string `description:"杂货店和药房"`
-	Residential         string `description:"居家"`
-	TransitStations     string `description:"公共交通车站"`
-	Parks               string `description:"公园"`
-	Workplaces          string `description:"工作场所"`
-	Total               string `description:"总计"`
-	CreateTime          string `description:"创建时间"`
-	ModifyTime          string `description:"修改时间"`
+	Id                  int    `gorm:"column:id;primaryKey" description:"唯一标识"`
+	Entity              string `gorm:"column:entity" description:"国家"`
+	Code                string `gorm:"column:code" description:"国家编码"`
+	EdbCode             string `gorm:"column:edb_code" description:"指标ID"`
+	Day                 string `gorm:"column:day" description:"统计的日期"`
+	RetailAndRecreation string `gorm:"column:retail_and_recreation" description:"零售和娱乐场所"`
+	GroceryAndPharmacy  string `gorm:"column:grocery_and_pharmacy" description:"杂货店和药房"`
+	Residential         string `gorm:"column:residential" description:"居家"`
+	TransitStations     string `gorm:"column:transit_stations" description:"公共交通车站"`
+	Parks               string `gorm:"column:parks" description:"公园"`
+	Workplaces          string `gorm:"column:workplaces" description:"工作场所"`
+	Total               string `gorm:"column:total" description:"总计"`
+	CreateTime          string `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime          string `gorm:"column:modify_time" description:"修改时间"`
+}
+
+func (m *BaseFromChangesVisitorsCovid) TableName() string {
+	return "base_from_changes_visitors_covid"
 }
 
 func GetBaseFromChangesVisitorsCovidDataAllByIndexCode(indexCode string) (list []*BaseFromChangesVisitorsCovid, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_changes_visitors_covid WHERE edb_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 GetBaseFromChangesVisitorsCovidDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromChangesVisitorsCovid, err error) {
 	sql := ` SELECT * FROM base_from_changes_visitors_covid WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY day 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 AddEdbDataGoogleTravel(edbCode string) (err error) {
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	dataAll, err := GetBaseFromChangesVisitorsCovidDataAllByIndexCode(edbCode)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		return
@@ -71,7 +94,8 @@ func AddEdbDataGoogleTravel(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
 		}
@@ -84,7 +108,7 @@ func RefreshEdbDataGoogleTravel(edbInfoId int, edbCode, startDate string) (err e
 	source := utils.DATA_SOURCE_GOOGLE_TRAVEL
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -190,7 +214,8 @@ func RefreshEdbDataGoogleTravel(edbInfoId int, edbCode, startDate string) (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 err
 		}

models/base_from_gz.go

@@ -1,59 +1,93 @@
 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 BaseFromTradeGuangzhouIndex struct {
+//	BaseFromTradeGuangzhouIndexId    int       `orm:"column(base_from_trade_guangzhou_index_id);pk"`
+//	BaseFromTradeGuangzhouClassifyId int       `description:"分类id"`
+//	IndexCode                        string    `description:"指标编码"`
+//	IndexName                        string    `description:"指标名称"`
+//	Frequency                        string    `description:"频率"`
+//	Unit                             string    `description:"单位"`
+//	StartDate                        string    `description:"开始日期"`
+//	EndDate                          string    `description:"结束日期"`
+//	CreateTime                       time.Time `description:"创建日期"`
+//	ModifyTime                       time.Time `description:"修改日期"`
+//}
+
 type BaseFromTradeGuangzhouIndex struct {
-	BaseFromTradeGuangzhouIndexId    int       `orm:"column(base_from_trade_guangzhou_index_id);pk"`
-	BaseFromTradeGuangzhouClassifyId int       `description:"分类id"`
-	IndexCode                        string    `description:"指标编码"`
-	IndexName                        string    `description:"指标名称"`
-	Frequency                        string    `description:"频率"`
-	Unit                             string    `description:"单位"`
-	StartDate                        string    `description:"开始日期"`
-	EndDate                          string    `description:"结束日期"`
-	CreateTime                       time.Time `description:"创建日期"`
-	ModifyTime                       time.Time `description:"修改日期"`
+	BaseFromTradeGuangzhouIndexId    int       `gorm:"column:base_from_trade_guangzhou_index_id;primaryKey" description:"索引ID"`
+	BaseFromTradeGuangzhouClassifyId int       `gorm:"column:base_from_trade_guangzhou_classify_id" description:"分类id"`
+	IndexCode                        string    `gorm:"column:index_code" description:"指标编码"`
+	IndexName                        string    `gorm:"column:index_name" description:"指标名称"`
+	Frequency                        string    `gorm:"column:frequency" description:"频率"`
+	Unit                             string    `gorm:"column:unit" description:"单位"`
+	StartDate                        string    `gorm:"column:start_date" description:"开始日期"`
+	EndDate                          string    `gorm:"column:end_date" description:"结束日期"`
+	CreateTime                       time.Time `gorm:"column:create_time" description:"创建日期"`
+	ModifyTime                       time.Time `gorm:"column:modify_time" description:"修改日期"`
+}
+
+func (m *BaseFromTradeGuangzhouIndex) TableName() string {
+	return "base_from_trade_guangzhou_index"
 }
 
+//type BaseFromTradeGuangzhouData struct {
+//	BaseFromTradeGuangzhouDataId  int       `orm:"column(base_from_trade_guangzhou_data_id);pk"`
+//	BaseFromTradeGuangzhouIndexId int       `description:"指标id"`
+//	IndexCode                     string    `description:"指标编码"`
+//	DataTime                      string    `description:"数据日期"`
+//	Value                         string    `description:"数据值"`
+//	QtySub                        float64   `description:"增减"`
+//	CreateTime                    time.Time `description:"创建日期"`
+//	ModifyTime                    time.Time `description:"修改日期"`
+//}
+
 type BaseFromTradeGuangzhouData struct {
-	BaseFromTradeGuangzhouDataId  int       `orm:"column(base_from_trade_guangzhou_data_id);pk"`
-	BaseFromTradeGuangzhouIndexId int       `description:"指标id"`
-	IndexCode                     string    `description:"指标编码"`
-	DataTime                      string    `description:"数据日期"`
-	Value                         string    `description:"数据值"`
-	QtySub                        float64   `description:"增减"`
-	CreateTime                    time.Time `description:"创建日期"`
-	ModifyTime                    time.Time `description:"修改日期"`
+	BaseFromTradeGuangzhouDataId  int       `gorm:"column:base_from_trade_guangzhou_data_id;primaryKey" description:"数据ID"`
+	BaseFromTradeGuangzhouIndexId int       `gorm:"column:base_from_trade_guangzhou_index_id" description:"指标id"`
+	IndexCode                     string    `gorm:"column:index_code" description:"指标编码"`
+	DataTime                      string    `gorm:"column:data_time" description:"数据日期"`
+	Value                         string    `gorm:"column:value" description:"数据值"`
+	QtySub                        float64   `gorm:"column:qty_sub" description:"增减"`
+	CreateTime                    time.Time `gorm:"column:create_time" description:"创建日期"`
+	ModifyTime                    time.Time `gorm:"column:modify_time" description:"修改日期"`
+}
+
+func (m *BaseFromTradeGuangzhouData) TableName() string {
+	return "base_from_trade_guangzhou_data"
 }
 
 func GetBaseFromGuangzhouDataByIndexCode(indexCode string) (items []*BaseFromTradeGuangzhouData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_guangzhou_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 GetBaseFromGuangzhouDataDataByCondition(condition string, pars []interface{}) (item []*BaseFromTradeGuangzhouData, err error) {
 	sql := ` SELECT * FROM base_from_trade_guangzhou_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 AddEdbDataFromGz(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	dataAll, err := GetBaseFromGuangzhouDataByIndexCode(edbCode)
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -81,7 +115,8 @@ func AddEdbDataFromGz(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
 		}
@@ -94,7 +129,7 @@ func RefreshEdbDataFromGz(edbInfoId int, edbCode, startDate string) (err error)
 	source := utils.DATA_SOURCE_GFEX
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -199,7 +234,8 @@ func RefreshEdbDataFromGz(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_predict_from_calculate.go

@@ -3,11 +3,12 @@ package models
 import (
 	"encoding/json"
 	"errors"
+	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/dengsgo/math-engine/engine"
 	"github.com/shopspring/decimal"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -36,14 +37,16 @@ type PredictCalculateItems struct {
 
 // EditPredictCalculate 新增预测计算（运算）指标
 func EditPredictCalculate(edbInfo *EdbInfo, calculateMappingList []*EdbInfoCalculateMapping) (err error) {
-	o := orm.NewOrm()
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	//o := orm.NewOrm()
+	//to, err := o.Begin()
+	//if err != nil {
+	//	return
+	//}
+
+	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
-			tmpErr := to.Rollback()
+			tmpErr := to.Rollback().Error
 			errMsg := fmt.Sprintf("AddPredictCalculate Err:%s" + err.Error())
 			if tmpErr != nil {
 				errMsg += `;rollback失败：` + tmpErr.Error()
@@ -52,7 +55,7 @@ func EditPredictCalculate(edbInfo *EdbInfo, calculateMappingList []*EdbInfoCalcu
 			return
 		}
 
-		tmpErr := to.Commit()
+		tmpErr := to.Commit().Error
 		if tmpErr != nil {
 			errMsg := fmt.Sprintf("AddPredictCalculate commit Err:%s" + tmpErr.Error())
 			utils.FileLog.Info(errMsg)
@@ -60,14 +63,18 @@ func EditPredictCalculate(edbInfo *EdbInfo, calculateMappingList []*EdbInfoCalcu
 	}()
 
 	// 修改指标信息
-	_, err = to.Update(edbInfo, "EdbName", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "EmptyType", "MaxEmptyType", "Extra", "EdbNameEn", "UnitEn")
+	//_, err = to.Update(edbInfo, "EdbName", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "EmptyType", "MaxEmptyType", "Extra", "EdbNameEn", "UnitEn")
+	err = edbInfo.Update(
+		[]string{"EdbName", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "EmptyType", "MaxEmptyType", "Extra", "EdbNameEn", "UnitEn"},
+	)
 	if err != nil {
 		return
 	}
 
 	//删除，计算指标关联的，基础指标的关联关系
 	sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? `
-	_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+	//_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+	err = to.Exec(sql, edbInfo.EdbInfoId).Error
 	if err != nil {
 		err = errors.New("删除计算指标关联关系失败,Err:" + err.Error())
 		return
@@ -75,14 +82,16 @@ func EditPredictCalculate(edbInfo *EdbInfo, calculateMappingList []*EdbInfoCalcu
 
 	// 插入新的关系表
 	if len(calculateMappingList) > 0 {
-		_, err = to.InsertMulti(len(calculateMappingList), calculateMappingList)
+		//_, err = to.InsertMulti(len(calculateMappingList), calculateMappingList)
+		err = to.CreateInBatches(calculateMappingList, len(calculateMappingList)).Error
 	}
 
 	//数据表
 	tableName := GetEdbDataTableName(edbInfo.Source, edbInfo.SubSource)
 	//清空原有数据
 	sql = ` DELETE FROM ` + tableName + ` WHERE edb_info_id = ? `
-	_, err = o.Raw(sql, edbInfo.EdbInfoId).Exec()
+	//_, err = o.Raw(sql, edbInfo.EdbInfoId).Exec()
+	err = to.Exec(sql, edbInfo.EdbInfoId).Error
 	if err != nil {
 		return
 	}
@@ -225,11 +234,12 @@ func EditPredictCalculate(edbInfo *EdbInfo, calculateMappingList []*EdbInfoCalcu
 //}
 
 func AddPredictCalculateData(edbInfoIdList []*EdbInfo, edbInfoTag map[string]int, edbInfo *EdbInfo, edbCode, formulaStr string, edbInfoIdBytes []string) (latestDateStr string, latestValue float64, err error) {
-	o := orm.NewOrm()
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	//o := orm.NewOrm()
+	//to, err := o.Begin()
+	//if err != nil {
+	//	return
+	//}
+	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
 			fmt.Println("AddPredictCalculateData Calculate,Err:" + err.Error())
@@ -245,11 +255,12 @@ func AddPredictCalculateData(edbInfoIdList []*EdbInfo, edbInfoTag map[string]int
 
 // RefreshAllPredictCalculate 刷新预测计算指标的全部数据
 func RefreshAllPredictCalculate(edbInfoIdList []*EdbInfo, edbInfoTag map[string]int, edbInfoId, source, subSource int, edbCode, formulaStr, startDate string, edbInfoIdBytes []string, emptyType, maxEmptyType int, extra string) (latestDateStr string, latestValue float64, err error) {
-	o := orm.NewOrm()
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	//o := orm.NewOrm()
+	//to, err := o.Begin()
+	//if err != nil {
+	//	return
+	//}
+	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
 			fmt.Println("RefreshAllCalculate,Err:" + err.Error())
@@ -265,7 +276,7 @@ func RefreshAllPredictCalculate(edbInfoIdList []*EdbInfo, edbInfoTag map[string]
 }
 
 // refreshAllPredictCalculate 刷新预测计算指标的全部数据
-func refreshAllPredictCalculate(to orm.TxOrmer, edbInfoIdList []*EdbInfo, edbInfoTag map[string]int, edbInfoId, source, subSource int, edbCode, formulaStr, startDate string, edbInfoIdBytes []string, emptyType, maxEmptyType int, extra string) (latestDateStr string, latestValue float64, err error) {
+func refreshAllPredictCalculate(to *gorm.DB, edbInfoIdList []*EdbInfo, edbInfoTag map[string]int, edbInfoId, source, subSource int, edbCode, formulaStr, startDate string, edbInfoIdBytes []string, emptyType, maxEmptyType int, extra string) (latestDateStr string, latestValue float64, err error) {
 	fmt.Println("startDate:", startDate)
 	// 最小的结束日期 , 最晚的数据开始日期
 	var newLatestDate, minLatestDate, maxStartDate time.Time
@@ -394,7 +405,8 @@ func refreshAllPredictCalculate(to orm.TxOrmer, edbInfoIdList []*EdbInfo, edbInf
 	dataTableName := GetEdbDataTableName(source, subSource)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	_, err = to.Raw(sql, edbInfoId).QueryRows(&dataList)
+	//_, err = to.Raw(sql, edbInfoId).QueryRows(&dataList)
+	err = to.Raw(sql, edbInfoId).Find(&dataList).Error
 	if err != nil {
 		return
 	}
@@ -513,7 +525,8 @@ func refreshAllPredictCalculate(to orm.TxOrmer, edbInfoIdList []*EdbInfo, edbInf
 				if existStr != saveValue {
 					sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 					sql = fmt.Sprintf(sql, dataTableName)
-					_, err = to.Raw(sql, saveValue, edbInfoId, sk).Exec()
+					//_, err = to.Raw(sql, saveValue, edbInfoId, sk).Exec()
+					err = to.Exec(sql, saveValue, edbInfoId, sk).Error
 					if err != nil {
 						return "", 0, err
 					}
@@ -528,7 +541,8 @@ func refreshAllPredictCalculate(to orm.TxOrmer, edbInfoIdList []*EdbInfo, edbInf
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = to.Raw(addSql).Exec()
+		//_, err = to.Raw(addSql).Exec()
+		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshAllCalculate add Err", err.Error())
 			return
@@ -542,7 +556,8 @@ func refreshAllPredictCalculate(to orm.TxOrmer, edbInfoIdList []*EdbInfo, edbInf
 		tableName := GetEdbDataTableName(source, subSource)
 		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)
 
-		_, err = to.Raw(sql, edbInfoId).Exec()
+		//_, err = to.Raw(sql, edbInfoId).Exec()
+		err = to.Exec(sql, edbInfoId).Error
 		if err != nil {
 			err = fmt.Errorf("删除计算失败的计算指标数据失败,Err:" + err.Error())
 			return
@@ -554,12 +569,14 @@ func refreshAllPredictCalculate(to orm.TxOrmer, edbInfoIdList []*EdbInfo, edbInf
 		latestDateStr = newLatestDate.Format(utils.FormatDate)
 		sql = fmt.Sprintf(` SELECT * FROM %s WHERE edb_info_id = ? and data_time <= ? ORDER BY data_time desc limit 1`, dataTableName)
 		var latestDate EdbData
-		e := to.Raw(sql, edbInfoId, latestDateStr).QueryRow(&latestDate)
+		//e := to.Raw(sql, edbInfoId, latestDateStr).QueryRow(&latestDate)
+		e := to.Raw(sql, edbInfoId, latestDateStr).Find(&latestDate).Error
 		if e != nil {
 			if e.Error() == utils.ErrNoRow() {
 				//首个日期的值
 				sql = fmt.Sprintf(` SELECT * FROM %s WHERE edb_info_id = ? ORDER BY data_time ASC limit 1`, dataTableName)
-				e = to.Raw(sql, edbInfoId).QueryRow(&latestDate)
+				//e = to.Raw(sql, edbInfoId).QueryRow(&latestDate)
+				e = to.Raw(sql, edbInfoId).Find(&latestDate).Error
 				if e != nil {
 					err = fmt.Errorf("查询最新日期失败,Err:" + e.Error())
 					return

models/edb_info.go

@@ -332,12 +332,7 @@ func GetEdbDataListAllByMysqlTo(to *gorm.DB, source, subSource int, findEdbDataL
 	} else {
 		sql += ` ORDER BY data_time DESC `
 	}
-<<<<<<< HEAD
-	//_, err = to.Raw(sql, pars).QueryRows(&item)
-	err = to.Raw(sql, pars).Find(&item).Error
-=======
 	err = to.Raw(sql, pars).Scan(&item).Error
->>>>>>> 7c1f8625a99a361bce679463bde92b1492937938
 	return
 }