no message

models/data_manage/base_from_trade_cffex.go

@@ -58,7 +58,7 @@ func ModifyBaseFromTradeCffexIndex(columnList [5]string, dataList [5]interface{}
 		columnList[0] + "=?," + columnList[1] + "=?," + columnList[2] + "=?," + columnList[3] + "=?," + columnList[4] +
 		"=?,modify_time=NOW() WHERE base_from_trade_cffex_index_id=? "
 	//_, err = o.Raw(sql, dataList[0], dataList[1], dataList[2], dataList[3], dataList[4], dataId).Exec()
-	err = global.DEFAULT_DmSQL.Raw(sql, dataList[0], dataList[1], dataList[2], dataList[3], dataList[4], dataId).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, dataList[0], dataList[1], dataList[2], dataList[3], dataList[4], dataId).Error
 	return
 }
 

models/data_manage/base_from_trade_guangzhou.go

@@ -1,7 +1,8 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
+	"eta_gn/eta_task/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -22,15 +23,22 @@ type BaseFromTradeGuangzhouIndex struct {
 }
 
 func AddBaseFromTradeGuangzhouIndex(item *BaseFromTradeGuangzhouIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertOrUpdate(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.InsertOrUpdate(item)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromTradeGuangzhouIndexId)
 	return
 }
 
 func GetBaseFromTradeGuangzhouIndexAll() (list []*BaseFromTradeGuangzhouIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_guangzhou_index `
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
 	return
 }
 
@@ -60,15 +68,22 @@ type GuangzhouClassifyResp struct {
 }
 
 func GetBaseFromTradeGuangzhouClassifyAll() (list []*BaseFromTradeGuangzhouClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_guangzhou_classify `
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
 	return
 }
 
 func AddBaseFromTradeGuangzhouClassify(item *BaseFromTradeGuangzhouClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromTradeGuangzhouClassifyId)
 	return
 }
 
@@ -82,8 +97,9 @@ type BaseFromTradeGuangzhouContract struct {
 
 // 新增合约
 func (obj *BaseFromTradeGuangzhouIndex) AddBaseFromTradeGuangzhouContract(item *BaseFromTradeGuangzhouContract) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Insert(item)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Insert(item)
+	err = global.DmSQL["data"].Create(item).Error
 	return
 }
 
@@ -96,17 +112,19 @@ type GuangzhouContractResp struct {
 }
 
 func GetBaseFromTradeGuangzhouContractAll() (list []*BaseFromTradeGuangzhouContract, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_guangzhou_contract `
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
 	return
 }
 
 // GetBaseFromComTradeMaxDate 获取广州期货交易所最大数据
 func GetBaseFromTradeGuangzhouMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT max(a.create_time)as max_date FROM base_from_trade_guangzhou_data as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	//err = o.Raw(sql).QueryRow(&max_date)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
 	return
 }
 
@@ -123,9 +141,11 @@ type BaseFromTradeGuangzhouData struct {
 
 // GetAllComTradeDataList 获取广州期货交易所数据
 func GetAllBaseFromTradeGuangzhouDataList(startDate string) (list []*BaseFromTradeGuangzhouData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_guangzhou_data WHERE create_time>=?  ORDER BY base_from_trade_guangzhou_data_id ASC `
-	_, err = o.Raw(sql, startDate).QueryRows(&list)
+	//_, err = o.Raw(sql, startDate).QueryRows(&list)
+
+	err = global.DEFAULT_DmSQL.Raw(sql, startDate).Find(&list).Error
 	return
 }
 
@@ -145,12 +165,13 @@ type BaseFromTradeGuangzhouIndexAndDataResp struct {
 
 // MultiAddBaseFromComTradeData 批量添加数据
 func MultiAddBaseFromTradeGuangzhouData(items []*BaseFromTradeGuangzhouData) (lastId int64, err error) {
-	num := len(items)
-	if num <= 0 {
-		return
-	}
-	o := orm.NewOrm()
-	lastId, err = o.InsertMulti(num, items)
-
+	//num := len(items)
+	//if num <= 0 {
+	//	return
+	//}
+	//o := orm.NewOrm()
+	//lastId, err = o.InsertMulti(num, items)
+
+	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }

models/data_manage/base_from_trade_ine.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -32,22 +32,30 @@ type BaseFromTradeIneIndex struct {
 }
 
 func AddBaseFromTradeIneIndex(item *BaseFromTradeIneIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromTradeIneIndexId)
 	return
 }
 
 func GetBaseFromTradeIneIndexAll(dateStr string) (list []*BaseFromTradeIneIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_ine_index where data_time>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func ModifyBaseFromTradeIneIndex(dealValue, buyValue, soldValue int, dataId int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_trade_ine_index SET deal_value=?,buy_value=?,sold_value=?,modify_time=NOW() WHERE base_from_trade_ine_index_id=? `
-	_, err = o.Raw(sql, dealValue, buyValue, soldValue, dataId).Exec()
+	//_, err = o.Raw(sql, dealValue, buyValue, soldValue, dataId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, dealValue, buyValue, soldValue, dataId).Error
 	return
 }
 
@@ -60,8 +68,9 @@ type IneIndexResp struct {
 }
 
 func GetBaseFromTradeIneIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT max(a.data_time)as max_date FROM base_from_trade_ine_index as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	//err = o.Raw(sql).QueryRow(&max_date)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
 	return
 }

models/data_manage/base_from_trade_shanghai.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -32,22 +32,32 @@ type BaseFromTradeShanghaiIndex struct {
 }
 
 func AddBaseFromTradeShangHaiIndex(item *BaseFromTradeShanghaiIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromTradeShangHaiIndexId)
 	return
 }
 
 func GetBaseFromTradeShangHaiIndexAll(dateStr string) (list []*BaseFromTradeShanghaiIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_shanghai_index WHERE data_time>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
+
+	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func ModifyBaseFromTradeShangHaiIndex(dealValue, buyValue, soldValue int, dataId int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_trade_shanghai_index SET deal_value=?,buy_value=?,sold_value=?,modify_time=NOW() WHERE base_from_trade_shanghai_index_id=? `
-	_, err = o.Raw(sql, dealValue, buyValue, soldValue, dataId).Exec()
+	//_, err = o.Raw(sql, dealValue, buyValue, soldValue, dataId).Exec()
+
+	err = global.DEFAULT_DmSQL.Exec(sql, dealValue, buyValue, soldValue, dataId).Error
 	return
 }
 
@@ -60,8 +70,9 @@ type ShanghaiIndexResp struct {
 }
 
 func GetBaseFromTradeShangHaiIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT max(a.data_time)as max_date FROM base_from_trade_shanghai_index as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	//err = o.Raw(sql).QueryRow(&max_date)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
 	return
 }

models/data_manage/base_from_trade_zhengzhou.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -32,22 +32,32 @@ type BaseFromTradeZhengzhouIndex struct {
 }
 
 func AddBaseFromTradeZhengzhouIndex(item *BaseFromTradeZhengzhouIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+
+	err = global.DEFAULT_DmSQL.Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromTradeZhengzhouIndexId)
 	return
 }
 
 func GetBaseFromTradeZhengzhouIndexAll(dateStr string) (list []*BaseFromTradeZhengzhouIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_zhengzhou_index WHERE data_time>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	//_, err = o.Raw(sql, dateStr).QueryRows(&list)
+
+	err = global.DEFAULT_DmSQL.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func ModifyBaseFromTradeZhengzhouIndex(dealValue, buyValue, soldValue int, dataId int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_trade_zhengzhou_index SET deal_value=?,buy_value=?,sold_value=?,modify_time=NOW() WHERE base_from_trade_zhengzhou_index_id=? `
-	_, err = o.Raw(sql, dealValue, buyValue, soldValue, dataId).Exec()
+
+	//_, err = o.Raw(sql, dealValue, buyValue, soldValue, dataId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, dealValue, buyValue, soldValue, dataId).Error
 	return
 }
 
@@ -60,8 +70,9 @@ type ZhengzhouIndexResp struct {
 }
 
 func GetBaseFromTradeZhengzhouIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT max(a.data_time)as max_date FROM base_from_trade_zhengzhou_index as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	//err = o.Raw(sql).QueryRow(&max_date)
+	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&max_date).Error
 	return
 }

models/data_manage/business_sys_interaction_log.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -39,21 +39,27 @@ var BusinessSysInteractionLogColumns = struct {
 
 // Create 添加数据
 func (m *BusinessSysInteractionLog) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
+	//o := orm.NewOrm()
+	//id, err := o.Insert(m)
+	//if err != nil {
+	//	return
+	//}
+	//m.ID = uint32(id)
+
+	err = global.DEFAULT_DmSQL.Create(m).Error
 	if err != nil {
 		return
 	}
-	m.ID = uint32(id)
 
 	return
 }
 
 // Update 更新数据
 func (m *BusinessSysInteractionLog) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(m, cols...)
 
+	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
@@ -63,8 +69,9 @@ var CrmIndexLastUpdateTime = "crm_index_update_time" // crm数据
 
 // GetBusinessSysInteractionLogByKey 根据记录key获取数据
 func GetBusinessSysInteractionLogByKey(key string) (item *BusinessSysInteractionLog, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM business_sys_interaction_log WHERE 1=1 AND interaction_key = ? LIMIT 1`
-	err = o.Raw(sql, key).QueryRow(&item)
+	//err = o.Raw(sql, key).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, key).First(&item).Error
 	return
 }

models/data_manage/chart_edb_mapping.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -33,17 +33,19 @@ type ChartEdbMapping struct {
 }
 
 func GetChartEdbMappingTotal() (total int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM chart_edb_mapping `
-	err = o.Raw(sql).QueryRow(&total)
+	//err = o.Raw(sql).QueryRow(&total)
+	err = global.DmSQL["data"].Raw(sql).Scan(&total).Error
 	return
 }
 
 func GetChartEdbMappingList(startSize, pageSize int) (items []*ChartEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_edb_mapping WHERE 1=1 `
 	sql += " LIMIT ?,? "
-	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
+	//_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, startSize, pageSize).Find(&items).Error
 	return
 }
 
@@ -104,12 +106,13 @@ type ChartEdbInfoMapping struct {
 }
 
 func GetRelationEdbInfoListMappingByCondition(condition string, pars []interface{}) (item []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.* FROM edb_info AS a 
 	JOIN edb_info_calculate_mapping AS b on a.edb_info_id = b.edb_info_id WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DmSQL["data"].Raw(sql, pars).Find(&item).Error
 	return
 }

models/data_manage/chart_info.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_task/global"
 	"eta_gn/eta_task/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -32,33 +32,39 @@ type ChartInfo struct {
 }
 
 func GetAllChartInfo() (list []*ChartInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM chart_info  `
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
 	return
 }
 
 func GetChartInfoEdbEndDate() (list []*ChartInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT a.*,max(c.end_date) AS edb_end_date FROM  chart_info  AS a
 			INNER JOIN chart_edb_mapping AS b ON a.chart_info_id=b.chart_info_id
 			INNER JOIN edb_info AS c ON b.edb_info_id=c.edb_info_id
 			GROUP BY a.chart_info_id  `
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
 	return
 }
 
 func ModifyChartInfoEdbEndDate(chartInfoId int, edbEndDate string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE chart_info SET edb_end_date=? WHERE chart_info_id=? `
-	_, err = o.Raw(sql, edbEndDate, chartInfoId).Exec()
+	//_, err = o.Raw(sql, edbEndDate, chartInfoId).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, edbEndDate, chartInfoId).Error
 	return
 }
 
 // 根据chart_info_id数组获取图表信息
 func GetChartInfoByChartInfoIds(chartInfoIds []int) (list []*ChartInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info  WHERE chart_info_id IN (` + utils.GetOrmInReplace(len(chartInfoIds)) + `) `
-	_, err = o.Raw(sql, chartInfoIds).QueryRows(&list)
+	//_, err = o.Raw(sql, chartInfoIds).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, chartInfoIds).Find(&list).Error
 	return
 }