gorm改造

models/admin.go

@@ -1,9 +1,12 @@
 package models
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
+)
 
 type Admin struct {
-	AdminId      int
+	AdminId      int    `gorm:"column:admin_id;primaryKey;autoIncrement"`
 	AdminName    string `description:"系统用户名称"`
 	RealName     string `description:"系统用户姓名"`
 	Password     string `description:"密码"`
@@ -20,28 +23,6 @@ type Admin struct {
 
 func GetAdminByAdminId(adminId int) (item *Admin, err error) {
 	sql := `SELECT * FROM admin WHERE admin_id=? `
-	err = orm.NewOrm().Raw(sql, adminId).QueryRow(&item)
-	return
-}
-
-type AdminView struct {
-	AdminId      int
-	AdminName    string `description:"系统用户名称"`
-	RealName     string `description:"系统用户姓名"`
-	Password     string `description:"密码"`
-	Mobile       string `description:"手机号"`
-	RoleId       int    `description:"角色id"`
-	RoleName     string `description:"角色名称"`
-	RoleTypeCode string `description:"角色编码"`
-	DepartmentId int    `description:"部门id"`
-	GroupId      int    `description:"分组id"`
-	GroupName    string `description:"分组名称"`
-	Authority    int    `description:"管理权限，0：无，1：部门负责人，2：小组负责人"`
-	Position     string `description:"职位"`
-}
-
-func GetAdminList() (list []*AdminView, err error) {
-	sql := `SELECT * FROM admin `
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&list)
+	err = global.DbMap[utils.DbNameWeekly].Raw(sql, adminId).First(&item).Error
 	return
 }

models/admin_operate_record.go

@@ -1,11 +1,14 @@
 package models
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
+)
 
 // ClearAdminOperateRecord 清理用户操作日志
 func ClearAdminOperateRecord(date string) (err error) {
-	o := orm.NewOrmUsingDB("eta")
+	o := global.DbMap[utils.DbNameMaster]
 	sql := `DELETE FROM admin_operate_record WHERE create_time <= ?`
-	_, err = o.Raw(sql, date).Exec()
+	err = o.Exec(sql, date).Error
 	return
 }

models/ai_predict_model/ai_predict_model_index.go

@@ -1,15 +1,16 @@
 package data_manage
 
 import (
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
 
 // AiPredictModelIndex AI预测模型标的
 type AiPredictModelIndex struct {
-	AiPredictModelIndexId int       `orm:"column(ai_predict_model_index_id);pk"`
+	AiPredictModelIndexId int       `gorm:"column:ai_predict_model_index_id;primaryKey;autoIncrement"`
 	IndexName             string    `description:"标的名称"`
 	IndexCode             string    `description:"自生成的指标编码"`
 	ClassifyId            int       `description:"分类ID"`
@@ -76,7 +77,7 @@ func (m *AiPredictModelIndex) Cols() AiPredictModelIndexCols {
 }
 
 func (m *AiPredictModelIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*AiPredictModelIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -86,6 +87,6 @@ func (m *AiPredictModelIndex) GetItemsByCondition(condition string, pars []inter
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }

models/business_conf.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"html"
-	"strings"
 	"time"
 )
 
@@ -28,7 +27,7 @@ const (
 
 // BusinessConf 商户配置表
 type BusinessConf struct {
-	Id         int    `orm:"column(id);pk"`
+	Id         int    `gorm:"column:id;primaryKey;autoIncrement"`
 	ConfKey    string `description:"配置Key"`
 	ConfVal    string `description:"配置值"`
 	ValType    int    `description:"1-字符串；2-数值；3-字符串数组；4-富文本；"`
@@ -41,88 +40,6 @@ func (m *BusinessConf) TableName() string {
 	return "business_conf"
 }
 
-func (m *BusinessConf) PrimaryId() string {
-	return "id"
-}
-
-func (m *BusinessConf) Create() (err error) {
-	o := orm.NewOrmUsingDB("eta")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-
-	err = global.DbMap[utils.DbNameMaster].Create(m).Error
-	m.Id = int(id)
-	return
-}
-
-func (m *BusinessConf) CreateMulti(items []*BusinessConf) (err error) {
-	if len(items) == 0 {
-		return
-	}
-	err = global.DbMap[utils.DbNameMaster].CreateInBatches(items, utils.MultiAddNum).Error
-	return
-}
-
-func (m *BusinessConf) Update(cols []string) (err error) {
-	err = global.DbMap[utils.DbNameMaster].Select(cols).Updates(m).Error
-	return
-}
-
-func (m *BusinessConf) Del() (err error) {
-	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = global.DbMap[utils.DbNameMaster].Exec(sql, m.Id).Error
-	return
-}
-
-func (m *BusinessConf) GetItemById(id int) (item *BusinessConf, err error) {
-	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = global.DbMap[utils.DbNameMaster].Raw(sql, id).First(&item).Error
-	return
-}
-
-func (m *BusinessConf) GetItemByCondition(condition string, pars []interface{}) (item *BusinessConf, err error) {
-	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = global.DbMap[utils.DbNameMaster].Raw(sql, pars...).First(&item).Error
-	return
-}
-
-func (m *BusinessConf) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DbMap[utils.DbNameMaster].Raw(sql, pars...).Scan(&count).Error
-	return
-}
-
-func (m *BusinessConf) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BusinessConf, err error) {
-	fields := strings.Join(fieldArr, ",")
-	if len(fieldArr) == 0 {
-		fields = `*`
-	}
-	order := `ORDER BY create_time DESC`
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DbMap[utils.DbNameMaster].Raw(sql, pars...).Find(&items).Error
-	return
-}
-
-func (m *BusinessConf) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BusinessConf, err error) {
-	fields := strings.Join(fieldArr, ",")
-	if len(fieldArr) == 0 {
-		fields = `*`
-	}
-	order := `ORDER BY create_time DESC`
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	err = global.DbMap[utils.DbNameMaster].Raw(sql, pars...).Find(&items).Error
-
-	return
-}
-
 // GetBusinessConf 获取商家配置
 func GetBusinessConf() (list map[string]string, err error) {
 	list = make(map[string]string)
@@ -144,31 +61,6 @@ func GetBusinessConf() (list map[string]string, err error) {
 	return
 }
 
-// BusinessConfUpdate 更新配置
-type BusinessConfUpdate struct {
-	ConfKey string
-	ConfVal string
-}
-
-// UpdateBusinessConfMulti 批量修改配置
-func UpdateBusinessConfMulti(items []BusinessConfUpdate) (err error) {
-	o := orm.NewOrmUsingDB("eta")
-	p, err := o.Raw("UPDATE business_conf SET conf_val = ? WHERE conf_key = ?").Prepare()
-	if err != nil {
-		return
-	}
-	defer func() {
-		_ = p.Close()
-	}()
-	for _, v := range items {
-		_, err = p.Exec(v.ConfVal, v.ConfKey)
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
 func (m *BusinessConf) GetItemByConfKey(key string) (item *BusinessConf, err error) {
 	o := orm.NewOrmUsingDB("eta")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE conf_key = ? LIMIT 1`, m.TableName())

models/classify.go

@@ -1,13 +1,13 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
-	"github.com/rdlucklib/rdluck_tools/paging"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
 type Classify struct {
-	Id             int       `orm:"column(id);pk"`
+	Id             int       `gorm:"column:id;primaryKey;autoIncrement"`
 	ClassifyName   string    `description:"分类名称"`
 	Sort           int       `json:"-"`
 	ParentId       int       `description:"父级分类id"`
@@ -26,220 +26,9 @@ type Classify struct {
 	IsMassSend     int       `description:"1:群发,0:非群发"`
 }
 
-type ClassifyAddReq struct {
-	ClassifyName   string `description:"分类名称"`
-	ParentId       int    `description:"父级分类id，没有父级分类传0"`
-	Abstract       string `description:"栏目简介"`
-	Descript       string `description:"分享描述"`
-	ReportAuthor   string `description:"栏目作者"`
-	AuthorDescript string `description:"作者简介"`
-	ColumnImgUrl   string `description:"栏目配图"`
-	ReportImgUrl   string `description:"报告配图"`
-	HeadImgUrl     string `description:"头部banner"`
-	AvatarImgUrl   string `description:"头像"`
-	HomeImgUrl     string `description:"首页配图"`
-	ClassifyLabel  string `description:"分类标签"`
-}
-
-func GetClassifyByName(classifyName string, parentId int) (item *Classify, err error) {
-	sql := `SELECT * FROM classify WHERE classify_name=? AND parent_id=? `
-	o := orm.NewOrmUsingDB("rddp")
-	err = o.Raw(sql, classifyName, parentId).QueryRow(&item)
-	return
-}
-
 func GetClassifyById(classifyId int) (item *Classify, err error) {
 	sql := `SELECT * FROM classify WHERE id=? `
-	o := orm.NewOrmUsingDB("rddp")
-	err = o.Raw(sql, classifyId).QueryRow(&item)
-	return
-}
-
-// 添加分类
-func AddClassify(item *Classify) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Insert(item)
-	return
-}
-
-func GetReportCountByClassifyId(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT COUNT(1) AS count FROM report WHERE classify_id_second=? `
-	err = o.Raw(sql, classifyId).QueryRow(&count)
-	return
-}
-
-func GetClassifySubCountByClassifyId(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT COUNT(1) as num FROM classify AS a
-        INNER JOIN report AS b ON a.id=b.classify_id_second
-        WHERE a.parent_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&count)
-	return
-}
-
-func GetClassifySubCountByParentId(classifyId int) (count int, err error) {
-	sqlCount := `
-	SELECT COUNT(1) as num FROM classify AS a
-	WHERE a.parent_id=? `
-	o := orm.NewOrmUsingDB("rddp")
-	err = o.Raw(sqlCount, classifyId).QueryRow(&count)
-	return
-}
-
-// 删除分类
-func DeleteClassify(classifyId int) (err error) {
-	sql := `DELETE FROM classify WHERE id=? `
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Raw(sql, classifyId).Exec()
-	if err != nil {
-		return
-	}
-	deleteImgSql := `DELETE FROM banner WHERE classify_id=? `
-	_, err = o.Raw(deleteImgSql, classifyId).Exec()
-	return
-}
-
-// classifyName, abstract, descript string, parentId, classifyId int
-// 修改分类
-func EditClassify(req *EditClassifyReq) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := `UPDATE classify SET classify_name = ?,abstract=?, parent_id= ?,descript=?,report_author=?,author_descript=?,column_img_url=?,head_img_url=?,avatar_img_url=?,report_img_url=?,home_img_url=?,classify_label=?, modify_time= NOW() WHERE id = ? `
-	_, err = o.Raw(sql, req.ClassifyName, req.Abstract, req.ParentId, req.Descript, req.ReportAuthor, req.AuthorDescript, req.ColumnImgUrl, req.HeadImgUrl, req.AvatarImgUrl, req.ReportImgUrl, req.HomeImgUrl, req.ClassifyLabel, req.ClassifyId).Exec()
-	return
-}
-
-//获取父级分类
-
-func ParentClassify() (items []*Classify, err error) {
-	sql := `SELECT * FROM classify WHERE parent_id=0 order by id desc `
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-// 根据id获取分类详情
-func FindByIdClassify(classifyId int) (item *Classify, err error) {
-	sql := `SELECT * FROM classify WHERE id=? `
-	o := orm.NewOrmUsingDB("rddp")
-	err = o.Raw(sql, classifyId).QueryRow(&item)
-	return
-}
-
-type ClassifyList struct {
-	Id            int       `orm:"column(id);pk"`
-	ClassifyName  string    `description:"分类名称"`
-	Sort          int       `json:"-"`
-	ParentId      int       `description:"父级分类id"`
-	CreateTime    time.Time `description:"创建时间"`
-	ModifyTime    time.Time `description:"修改时间"`
-	Abstract      string    `description:"简介"`
-	Descript      string    `description:"描述"`
-	ClassifyLabel string    `description:"分类标签"`
-	Child         []*Classify
-}
-
-type ClassifyListResp struct {
-	List   []*ClassifyList
-	Paging *paging.PagingItem `description:"分页数据"`
-}
-
-// 获取分类列表
-func GetClassifyList(startSize, pageSize int, keyWord, companyType string) (items []*ClassifyList, err error) {
-	sql := ``
-	companyTypeSqlStr := ``
-	if companyType == "ficc" {
-		companyTypeSqlStr = " AND id != 40 AND parent_id != 40 "
-	} else if companyType == "权益" {
-		companyTypeSqlStr = " AND (id = 40 or parent_id = 40)  "
-	}
-	if keyWord != "" {
-		sql = `SELECT * FROM (
-                   SELECT * FROM classify
-                   WHERE parent_id=0 ` + companyTypeSqlStr + `  AND classify_name LIKE '%` + keyWord + `%'
-                   UNION
-                   SELECT * FROM classify
-                   WHERE id IN(SELECT parent_id FROM classify
-                   WHERE parent_id>0 ` + companyTypeSqlStr + `  AND classify_name LIKE '%` + keyWord + `%')
-                   )AS t
-                   ORDER BY create_time ASC
-                   LIMIT ?,? `
-	} else {
-		sql = `SELECT * FROM classify WHERE parent_id=0 ` + companyTypeSqlStr + ` ORDER BY create_time ASC LIMIT ?,? `
-	}
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
-	return
-}
-
-func GetClassifyListCount(keyWord, companyType string) (count int, err error) {
-	sqlCount := ``
-
-	companyTypeSqlStr := ``
-	if companyType == "ficc" {
-		companyTypeSqlStr = " AND id != 40 AND parent_id != 40 "
-	} else if companyType == "权益" {
-		companyTypeSqlStr = " AND (id = 40 or parent_id = 40)  "
-	}
-	if keyWord != "" {
-		sqlCount = `SELECT  COUNT(1) AS count FROM (
-               SELECT * FROM classify
-               WHERE parent_id=0 ` + companyTypeSqlStr + `  AND classify_name LIKE '%` + keyWord + `%'
-               UNION
-               SELECT * FROM classify
-               WHERE id IN(SELECT parent_id FROM classify
-               WHERE parent_id>0 ` + companyTypeSqlStr + `  AND classify_name LIKE '%` + keyWord + `%')
-               )AS t `
-
-	} else {
-		sqlCount = `SELECT COUNT(1) AS count FROM classify WHERE parent_id=0 ` + companyTypeSqlStr
-	}
-	o := orm.NewOrmUsingDB("rddp")
-	err = o.Raw(sqlCount).QueryRow(&count)
-	return
-}
-
-type CheckDeleteClassifyReq struct {
-	ClassifyId int `description:"分类ID"`
-}
-
-type CheckDeleteClassifyResp struct {
-	Code int    `description:"编码：0:检测成功，可进行删除,1：分类不存在，2：该分类有关联报告，不允许删除,3:二级分类有关联报告，不允许删除,4:该分类下有关联分类，是否确认全部删除"`
-	Msg  string `description:"描述信息"`
-}
-
-type DeleteClassifyReq struct {
-	ClassifyId int `description:"分类ID"`
-}
-
-type EditClassifyReq struct {
-	ClassifyId     int    `description:"分类ID"`
-	ClassifyName   string `description:"分类名称"`
-	ParentId       int    `description:"父级分类id"`
-	Abstract       string `description:"栏目简介"`
-	Descript       string `description:"分享描述"`
-	ReportAuthor   string `description:"栏目作者"`
-	AuthorDescript string `description:"作者简介"`
-	ColumnImgUrl   string `description:"栏目配图"`
-	HeadImgUrl     string `description:"头部banner"`
-	AvatarImgUrl   string `description:"头像"`
-	ReportImgUrl   string `description:"报告配图"`
-	HomeImgUrl     string `description:"首页配图"`
-	ClassifyLabel  string `description:"分类标签"`
-}
-
-type FindByIdClassifyReq struct {
-	ClassifyId int `description:"分类ID"`
-}
-
-func GetClassifyChild(parentId int, keyWord string) (items []*Classify, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := ``
-	if keyWord != "" {
-		sql = `SELECT * FROM classify WHERE parent_id=? AND classify_name LIKE '%` + keyWord + `%' ORDER BY create_time ASC `
-	} else {
-		sql = `SELECT * FROM classify WHERE parent_id=? ORDER BY create_time ASC `
-	}
-	_, err = o.Raw(sql, parentId).QueryRows(&items)
+	o := global.DbMap[utils.DbNameReport]
+	err = o.Raw(sql, classifyId).First(&item).Error
 	return
 }

models/data_manage/base_from_changes_visitors_covid.go

@@ -1,17 +1,19 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	sql2 "database/sql"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
-// 谷歌出行指数
+// BaseFromChangesVisitorsCovid 谷歌出行指数
 type BaseFromChangesVisitorsCovid struct {
-	Id                  uint64    `orm:"column(id);pk"`    //序号
-	Entity              string    `orm:"column(entity)"`   //国家
-	Code                string    `orm:"column(code)"`     //国家编码
-	EdbCode             string    `orm:"column(edb_code)"` //指标ID
-	Day                 time.Time `orm:"column(day)"`      //统计的日期
+	Id                  uint64    `gorm:"column:id;primaryKey;autoIncrement" orm:"column(id);pk"` //序号
+	Entity              string    `orm:"column(entity)"`                                          //国家
+	Code                string    `orm:"column(code)"`                                            //国家编码
+	EdbCode             string    `orm:"column(edb_code)"`                                        //指标ID
+	Day                 time.Time `orm:"column(day)"`                                             //统计的日期
 	RetailAndRecreation string    `orm:"column(retail_and_recreation)"`
 	GroceryAndPharmacy  string    `orm:"column(grocery_and_pharmacy)"`
 	Residential         string    `orm:"column(residential)"`
@@ -23,26 +25,25 @@ type BaseFromChangesVisitorsCovid struct {
 	ModifyTime          time.Time `orm:"auto_now_add;column(modify_time)"` //修改时间
 }
 
-// AddBaseFromChangesVisitorsCovidMulti 批量添加谷歌出行记录
+// AddBaseFromChangesVisitorsCovid 批量添加谷歌出行记录
 func AddBaseFromChangesVisitorsCovid(item *BaseFromChangesVisitorsCovid) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }
 
 // GetLatestBaseFromChangesVisitorsCovid 查询最新的日期
 func GetLatestBaseFromChangesVisitorsCovid() (item *BaseFromChangesVisitorsCovid, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_changes_visitors_covid order by day desc, id desc limit 1`
-	err = o.Raw(sql).QueryRow(&item)
+	err = o.Raw(sql).First(&item).Error
 	return
 }
 
 // GetBaseFromChangesVisitorsCovidByEntityDay 查询国家和统计日期查询记录是否存在
 func GetBaseFromChangesVisitorsCovidByEntityDay(entity, day string) (item *BaseFromChangesVisitorsCovid, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_changes_visitors_covid where entity=? and day=? limit 1`
-	err = o.Raw(sql, entity, day).QueryRow(&item)
+	err = o.Raw(sql, entity, day).First(&item).Error
 	return
 }
 
@@ -54,17 +55,23 @@ type ChangesVisitorsCovidIndexResp struct {
 	Data    []*BaseFromChangesVisitorsCovid
 }
 
-// 获取当天数据信息列表
 func GetChangesVisitorsCovidAll(dateTime string) (items []*BaseFromChangesVisitorsCovid, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_changes_visitors_covid WHERE day>=? `
-	_, err = o.Raw(sql, dateTime).QueryRows(&items)
+	err = o.Raw(sql, dateTime).Find(&items).Error
 	return
 }
 
-func GetChangesVisitorsCovidMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT max(a.day)as max_date FROM base_from_changes_visitors_covid as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+func GetChangesVisitorsCovidMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
+	sql := ` SELECT MAX(a.day) AS max_date FROM base_from_changes_visitors_covid AS a `
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }

models/data_manage/base_from_eia_steo.go

@@ -1,16 +1,16 @@
 package data_manage
 
 import (
+	sql2 "database/sql"
+	"eta/eta_task/global"
 	"eta/eta_task/utils"
 
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 // BaseFromEiaSteoIndex EiaSteo指标
 type BaseFromEiaSteoIndex struct {
-	BaseFromEiaSteoIndexId    int     `orm:"column(base_from_eia_steo_index_id);pk"`
+	BaseFromEiaSteoIndexId    int     `gorm:"column:base_from_eia_steo_index_id;primaryKey;autoIncrement"`
 	BaseFromEiaSteoClassifyId int     `description:"指标分类id"`
 	IndexCode                 string  `description:"指标编码"`
 	IndexName                 string  `description:"指标名称（中文名称）"`
@@ -31,52 +31,62 @@ type BaseFromEiaSteoIndex struct {
 }
 
 func AddBaseFromEiaSteoIndex(item *BaseFromEiaSteoIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromEiaSteoIndexId)
 	return
 }
 
 func InsertOrUpdateBaseFromEiaSteoIndex(item *BaseFromEiaSteoIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertOrUpdate(item)
-	return
+	//o := orm.NewOrm()
+	//lastId, err = o.InsertOrUpdate(item)
+	o := global.DbMap[utils.DbNameIndex]
+	result := o.FirstOrCreate(item, "base_from_eia_steo_index_id = ?", item.BaseFromEiaSteoIndexId)
+	if result.Error != nil {
+		err = result.Error
+		return
+	}
+	if result.RowsAffected == 0 {
+		result = o.Save(item)
+		if result.Error != nil {
+			err = result.Error
+			return
+		}
+	}
+	return int64(item.BaseFromEiaSteoIndexId), nil
 }
 
 // Add 新增指标
 func (item *BaseFromEiaSteoIndex) Add() (err error) {
-	o := orm.NewOrm()
-	lastId, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.BaseFromEiaSteoIndexId = int(lastId)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }
 
 func GetBaseFromEiaSteoIndexAll(dateStr string) (list []*BaseFromEiaSteoIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_eia_steo_index WHERE create_time>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = o.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func GetBaseFromEiaSteoIndexCodeListByDate(dateStr string) (list []string, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT index_code FROM base_from_eia_steo_index WHERE modify_time>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = o.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 // Update 更新作者基础信息
 func (item *BaseFromEiaSteoIndex) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(item, cols...)
+	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(item).Error
 	return
 }
 
 // BaseFromEiaSteoClassify EiaSteo分类
 type BaseFromEiaSteoClassify struct {
-	BaseFromEiaSteoClassifyId int       `orm:"column(base_from_eia_steo_classify_id);pk"`
+	BaseFromEiaSteoClassifyId int       `gorm:"column:base_from_eia_steo_classify_id;primaryKey;autoIncrement"`
 	ClassifyName              string    `description:"分类名称（中文名称）"`
 	ClassifyNameOriginal      string    `description:"分类名称（原始名称）"`
 	ParentId                  int       `description:"父级id"`
@@ -85,20 +95,14 @@ type BaseFromEiaSteoClassify struct {
 	CreateTime                time.Time `description:"创建时间"`
 }
 
-// 新增分类
 func (item *BaseFromEiaSteoClassify) AddBaseFromEiaSteoClassify() (err error) {
-	o := orm.NewOrm()
-	lastId, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.BaseFromEiaSteoClassifyId = int(lastId)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }
 
 // BaseFromEiaSteoData EiaSteo数据表
 type BaseFromEiaSteoData struct {
-	BaseFromEiaSteoDataId  int       `orm:"column(base_from_eia_steo_data_id);pk"`
+	BaseFromEiaSteoDataId  int       `gorm:"column:base_from_eia_steo_data_id;primaryKey;autoIncrement"`
 	BaseFromEiaSteoIndexId int       `description:"指标id"`
 	IndexCode              string    `description:"指标编码"`
 	DataTime               time.Time `description:"数据日期"`
@@ -108,34 +112,38 @@ type BaseFromEiaSteoData struct {
 }
 
 func (b *BaseFromEiaSteoData) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(b, cols...)
+	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(b).Error
 	return
 }
 
 func AddBaseFromEiaSteoData(item *BaseFromEiaSteoData) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromEiaSteoDataId)
 	return
 }
 
 // GetBaseFromEiaSteoClassifyAll 获取所有的分类
 func GetBaseFromEiaSteoClassifyAll() (list []*BaseFromEiaSteoClassify, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_eia_steo_classify`
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
 func AddBaseEiaSteoClassify(item *BaseFromEiaSteoClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromEiaSteoClassifyId)
 	return
 }
 
 func (item *BaseFromEiaSteoClassify) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(item, cols...)
+	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(item).Error
 	return
 }
 
@@ -143,9 +151,9 @@ func BatchDeleteBaseFromEiaSteoClassify(id []int) (err error) {
 	if len(id) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `DELETE FROM base_from_eia_steo_classify WHERE base_from_eia_steo_classify_id IN (` + utils.GetOrmInReplace(len(id)) + `)`
-	_, err = o.Raw(sql, id).Exec()
+	err = o.Exec(sql, id).Error
 	return
 }
 
@@ -174,36 +182,50 @@ type EiaSteoClassifyDataResp struct {
 }
 
 func GetBaseFromEiaSteoIndexDataAll(dateStr string) (list []*BaseFromEiaSteoData, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_eia_steo_data WHERE create_time>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = o.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func GetBaseFromEiaSteoIndexDataByIndexCode(indexCode, dateStr string) (list []*BaseFromEiaSteoData, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_eia_steo_data WHERE index_code=? AND modify_time>=?`
-	_, err = o.Raw(sql, indexCode, dateStr).QueryRows(&list)
+	err = o.Raw(sql, indexCode, dateStr).Find(&list).Error
 	return
 }
 
 func GetBaseFromEiaSteoIndexDataByDate(dateStr string) (list []*BaseFromEiaSteoData, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_eia_steo_data WHERE modify_time>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = o.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
-func GetBaseFromEiaSteoIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT max(a.data_time)as max_date FROM base_from_eia_steo_data as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+func GetBaseFromEiaSteoIndexMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
+	sql := ` SELECT MAX(a.data_time) AS max_date FROM base_from_eia_steo_data AS a `
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }
 
-func GetBaseFromEiaSteoIndexMaxCreateDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT max(a.create_time)as max_date FROM base_from_eia_steo_index as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+func GetBaseFromEiaSteoIndexMaxCreateDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
+	sql := ` SELECT MAX(a.create_time) AS max_date FROM base_from_eia_steo_index AS a `
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }

models/data_manage/base_from_gie.go

@@ -1,12 +1,14 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	sql2 "database/sql"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
 type BaseFromTradeEicIndexV2 struct {
-	BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk"`
+	BaseFromEicIndexId     int `gorm:"column:base_from_eic_index_id;primaryKey;autoIncrement"`
 	Type                   string
 	EicCode                string
 	Name                   string
@@ -38,24 +40,33 @@ type BaseFromTradeEicIndexV2 struct {
 	ModifyTime             time.Time
 }
 
-
-func GetBaseFromEicIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+func GetBaseFromEicIndexMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT max(a.gas_day_start)as max_date FROM base_from_trade_eic_index_v2 as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }
 
 func GetBaseFromEicIndexAll(dateStr string) (list []*BaseFromTradeEicIndexV2, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_trade_eic_index_v2 where gas_day_start >=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = o.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func AddBaseFromEicIndexV2(item *BaseFromTradeEicIndexV2) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromEicIndexId)
 	return
 }
 

models/data_manage/base_from_gpr_risk.go

@@ -1,13 +1,15 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	sql2 "database/sql"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
 type BaseFromGprRiskIndex struct {
-	BaseFromGprRiskIndexId int `orm:"column(base_from_gpr_risk_index_id);pk"`
+	BaseFromGprRiskIndexId int `gorm:"column:base_from_gpr_risk_index_id;primaryKey;autoIncrement"`
 	ClassifyId             int
 	IndexCode              string
 	IndexName              string
@@ -23,7 +25,7 @@ type BaseFromGprRiskIndex struct {
 
 // BaseFromGprRiskClassify GprRisk原始数据分类表
 type BaseFromGprRiskClassify struct {
-	ClassifyId      int       `orm:"column(classify_id);pk"`
+	ClassifyId      int       `gorm:"column:classify_id;primaryKey;autoIncrement"`
 	ClassifyName    string    `description:"分类名称"`
 	ParentId        int       `description:"父级id"`
 	SysUserId       int       `description:"创建人id"`
@@ -34,10 +36,17 @@ type BaseFromGprRiskClassify struct {
 	CreateTime      time.Time `description:"创建时间"`
 }
 
-func GetBaseFromGprRiskIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+func GetBaseFromGprRiskIndexMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT max(a.modify_time)as max_date FROM base_from_gpr_risk_data as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }
 
@@ -50,22 +59,32 @@ type GprRiskIndexResp struct {
 }
 
 func GetBaseFromGprRiskIndexAll(dateStr string) (list []*BaseFromGprRiskIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_gpr_risk_index WHERE end_date>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = o.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func (obj *BaseFromGprRiskIndex) AddBaseFromGprRiskIndex(item *BaseFromGprRiskIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }
 
 func (obj *BaseFromGprRiskIndex) InsertOrUpdateBaseFromGprRiskIndex(item *BaseFromGprRiskIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertOrUpdate(item)
-	return
+	o := global.DbMap[utils.DbNameIndex]
+	result := o.FirstOrCreate(item, "base_from_gpr_risk_index_id = ?", item.BaseFromGprRiskIndexId)
+	if result.Error != nil {
+		err = result.Error
+		return
+	}
+	if result.RowsAffected == 0 {
+		result = o.Save(item)
+		if result.Error != nil {
+			err = result.Error
+			return
+		}
+	}
+	return int64(item.BaseFromGprRiskIndexId), nil
 }
 
 type GprRiskClassifyResp struct {
@@ -77,34 +96,51 @@ type GprRiskClassifyResp struct {
 }
 
 func GetBaseFromGprRiskClassifyAll() (list []*BaseFromGprRiskClassify, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_gpr_risk_classify `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
 func AddBaseFromGprRiskClassify(item *BaseFromGprRiskClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }
 
 func InsertOrUpdateBaseFromGprRiskClassify(item *BaseFromGprRiskClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertOrUpdate(item)
-	return
+	o := global.DbMap[utils.DbNameIndex]
+	result := o.FirstOrCreate(item, "classify_id = ?", item.ClassifyId)
+	if result.Error != nil {
+		err = result.Error
+		return
+	}
+	if result.RowsAffected == 0 {
+		result = o.Save(item)
+		if result.Error != nil {
+			err = result.Error
+			return
+		}
+	}
+	return int64(item.ClassifyId), nil
 }
 
-// GetBaseFromComTradeMaxDate 获取GprRisk消费者指数最大数据
-func GetBaseFromGprRiskMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+// GetBaseFromGprRiskMaxDate 获取GprRisk消费者指数最大数据
+func GetBaseFromGprRiskMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT max(a.modify_time)as max_date FROM base_from_gpr_risk_data as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }
 
 type BaseFromGprRiskData struct {
-	BaseFromGprRiskDataId  int       `orm:"column(base_from_gpr_risk_data_id);pk"`
+	BaseFromGprRiskDataId  int       `gorm:"column:base_from_gpr_risk_data_id;primaryKey;autoIncrement"`
 	BaseFromGprRiskIndexId int       `description:"指标id"`
 	IndexCode              string    `description:"指标编码"`
 	DataTime               string    `description:"日期"`
@@ -113,11 +149,11 @@ type BaseFromGprRiskData struct {
 	ModifyTime             time.Time `description:"修改时间"`
 }
 
-// GetAllComTradeDataList 获取GprRisk消费者指数数据
+// GetAllBaseFromGprRiskDataList 获取GprRisk消费者指数数据
 func GetAllBaseFromGprRiskDataList(startDate string) (list []*BaseFromGprRiskData, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_gpr_risk_data WHERE modify_time>=?  ORDER BY base_from_gpr_risk_data_id ASC `
-	_, err = o.Raw(sql, startDate).QueryRows(&list)
+	err = o.Raw(sql, startDate).Find(&list).Error
 	return
 }
 
@@ -129,20 +165,19 @@ type BaseFromGprRiskDataResp struct {
 	Data    BaseFromGprRiskDataIndexAndDataResp
 }
 
-// ComTradeIndexDataResp 分页列表响应体
+// BaseFromGprRiskDataIndexAndDataResp 分页列表响应体
 type BaseFromGprRiskDataIndexAndDataResp struct {
 	List   []*BaseFromGprRiskData
 	Paging *paging.PagingItem `description:"分页数据"`
 }
 
-// MultiAddBaseFromComTradeData 批量添加数据
+// MultiAddBaseFromGprRiskDataIndex 批量添加数据
 func MultiAddBaseFromGprRiskDataIndex(items []*BaseFromGprRiskData) (lastId int64, err error) {
 	num := len(items)
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
-	lastId, err = o.InsertMulti(num, items)
-
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }

models/data_manage/base_from_icpi.go

@@ -1,13 +1,15 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	sql2 "database/sql"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
 type BaseFromIcpiIndex struct {
-	BaseFromIcpiIndexId    int       `orm:"column(base_from_icpi_index_id);pk"`
+	BaseFromIcpiIndexId    int       `gorm:"column:base_from_icpi_index_id;primaryKey;autoIncrement"`
 	BaseFromIcpiClassifyId int       `description:"分类id"`
 	IndexCode              string    `description:"指标编码"`
 	IndexName              string    `description:"指标名称"`
@@ -19,10 +21,17 @@ type BaseFromIcpiIndex struct {
 	LatestValue            float64   `description:"最新值"`
 }
 
-func GetBaseFromIcpiIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+func GetBaseFromIcpiIndexMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT max(a.data_time)as max_date FROM base_from_icpi_data as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }
 
@@ -35,26 +44,36 @@ type IcpiIndexResp struct {
 }
 
 func GetBaseFromIcpiIndexAll(dateStr string) (list []*BaseFromIcpiIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_icpi_index WHERE end_date>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = o.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func (obj *BaseFromIcpiIndex) AddBaseFromIcpiIndex(item *BaseFromIcpiIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }
 
 func (obj *BaseFromIcpiIndex) InsertOrUpdateBaseFromIcpiIndex(item *BaseFromIcpiIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertOrUpdate(item)
-	return
+	o := global.DbMap[utils.DbNameIndex]
+	result := o.FirstOrCreate(item, "base_from_icpi_index_id = ?", item.BaseFromIcpiIndexId)
+	if result.Error != nil {
+		err = result.Error
+		return
+	}
+	if result.RowsAffected == 0 {
+		result = o.Save(item)
+		if result.Error != nil {
+			err = result.Error
+			return
+		}
+	}
+	return int64(item.BaseFromIcpiIndexId), nil
 }
 
 type BaseFromIcpiClassify struct {
-	BaseFromIcpiClassifyId int    `orm:"column(base_from_icpi_classify_id);pk"`
+	BaseFromIcpiClassifyId int    `gorm:"column:base_from_icpi_classify_id;primaryKey;autoIncrement"`
 	ClassifyName           string `description:"分类名称"`
 	ClassifyNameEn         string `description:"英文名称"`
 	ParentId               int    `description:"上级id"`
@@ -71,29 +90,46 @@ type IcpiClassifyResp struct {
 }
 
 func GetBaseFromIcpiClassifyAll() (list []*BaseFromIcpiClassify, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_icpi_classify `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
 func AddBaseFromIcpiClassify(item *BaseFromIcpiClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }
 
 func InsertOrUpdateBaseFromIcpiClassify(item *BaseFromIcpiClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertOrUpdate(item)
-	return
+	o := global.DbMap[utils.DbNameIndex]
+	result := o.FirstOrCreate(item, "base_from_icpi_classify_id = ?", item.BaseFromIcpiClassifyId)
+	if result.Error != nil {
+		err = result.Error
+		return
+	}
+	if result.RowsAffected == 0 {
+		result = o.Save(item)
+		if result.Error != nil {
+			err = result.Error
+			return
+		}
+	}
+	return int64(item.BaseFromIcpiClassifyId), nil
 }
 
-// GetBaseFromComTradeMaxDate 获取ICPI消费者指数最大数据
-func GetBaseFromIcpiMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+// GetBaseFromIcpiMaxDate 获取ICPI消费者指数最大数据
+func GetBaseFromIcpiMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT max(a.create_time)as max_date FROM base_from_icpi_data as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }
 
@@ -107,11 +143,11 @@ type BaseFromIcpiData struct {
 	ModifyTime          time.Time `description:"修改时间"`
 }
 
-// GetAllComTradeDataList 获取ICPI消费者指数数据
+// GetAllBaseFromIcpiDataList 获取ICPI消费者指数数据
 func GetAllBaseFromIcpiDataList(startDate string) (list []*BaseFromIcpiData, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_icpi_data WHERE create_time>=?  ORDER BY base_from_icpi_data_id ASC `
-	_, err = o.Raw(sql, startDate).QueryRows(&list)
+	err = o.Raw(sql, startDate).Find(&list).Error
 	return
 }
 
@@ -123,20 +159,19 @@ type BaseFromIcpiDataResp struct {
 	Data    BaseFromIcpiDataIndexAndDataResp
 }
 
-// ComTradeIndexDataResp 分页列表响应体
+// BaseFromIcpiDataIndexAndDataResp 分页列表响应体
 type BaseFromIcpiDataIndexAndDataResp struct {
 	List   []*BaseFromIcpiData
 	Paging *paging.PagingItem `description:"分页数据"`
 }
 
-// MultiAddBaseFromComTradeData 批量添加数据
+// MultiAddBaseFromIcpiDataIndex 批量添加数据
 func MultiAddBaseFromIcpiDataIndex(items []*BaseFromIcpiData) (lastId int64, err error) {
 	num := len(items)
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
-	lastId, err = o.InsertMulti(num, items)
-
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }

models/data_manage/base_from_mysteel_chemical_index.go

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

models/data_manage/base_from_smm.go

@@ -1,12 +1,14 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	sql2 "database/sql"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
 type BaseFromSmm struct {
-	BaseFromSmmId int `orm:"column(base_from_smm_id);pk"`
+	BaseFromSmmId int `gorm:"column:base_from_smm_id;primaryKey;autoIncrement"`
 	Aid           int
 	Name          string
 	Interface     string
@@ -34,21 +36,20 @@ type BaseFromSmm struct {
 }
 
 func AddBaseFromSmm(item *BaseFromSmm) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }
 
 func GetBaseFromSmmList() (list []*BaseFromSmm, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	//sql := `SELECT * FROM base_from_smm WHERE interface='cu_annual_copper_cathode_demand_supply_balance_in_china' `
 	sql := `SELECT * FROM base_from_smm WHERE end_date IS NOT NULL `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
 type BaseFromSmmIndex struct {
-	BaseFromSmmIndexId int `orm:"column(base_from_smm_index_id);pk"`
+	BaseFromSmmIndexId int `gorm:"column:base_from_smm_index_id;primaryKey;autoIncrement"`
 	Interface          string
 	Name               string
 	IndexCode          string
@@ -67,15 +68,14 @@ type BaseFromSmmIndex struct {
 }
 
 func AddBaseFromSmmIndex(item *BaseFromSmmIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }
 
 func GetBaseFromSmmIndex() (list []*BaseFromSmmIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_smm_index `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
@@ -91,52 +91,61 @@ type BaseFromSmmData struct {
 }
 
 func AddBaseFromSmmData(item *BaseFromSmmData) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }
 
 func GetBaseFromSmmDataAll(indexCode string) (list []*BaseFromSmmData, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_smm_data WHERE index_code=?`
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = o.Raw(sql, indexCode).Find(&list).Error
 	return
 }
 
 func ModifyBaseFromSmmData(smmDataId int, value string) (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `UPDATE base_from_smm_data SET value=?,modify_time=NOW() WHERE smm_data_id=? `
-	_, err = o.Raw(sql, value, smmDataId).Exec()
+	err = o.Exec(sql, value, smmDataId).Error
 	return
 }
 
 func GetBaseFromSmmIndexByCode(smmCode string) (list []*BaseFromSmmIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM base_from_smm_index WHERE interface=? `
-	_, err = o.Raw(sql, smmCode).QueryRows(&list)
+	err = o.Raw(sql, smmCode).Find(&list).Error
 	return
 }
 
-func GetBaseFromSmmMaxOrMinDate(indexCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM base_from_smm_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&min_date, &max_date)
+func GetBaseFromSmmMaxOrMinDate(indexCode string) (minDate, maxDate string, err error) {
+	o := global.DbMap[utils.DbNameIndex]
+	sql := ` SELECT MIN(data_time) AS min_date, MAX(data_time) AS max_date FROM base_from_smm_data WHERE index_code=? `
+	var minNull, maxNull sql2.NullString
+	err = o.Raw(sql, indexCode).Row().Scan(&minNull, &maxNull)
+	if err != nil {
+		return
+	}
+	if minNull.Valid {
+		minDate = minNull.String
+	}
+	if maxNull.Valid {
+		maxDate = maxNull.String
+	}
 	return
 }
 
 func ModifyBaseFromSmmSmmType(baseFromSmmId int, smmType string) (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` UPDATE base_from_smm SET smm_type=? WHERE base_from_smm_id=? `
-	_, err = o.Raw(sql, smmType, baseFromSmmId).Exec()
+	err = o.Exec(sql, smmType, baseFromSmmId).Error
 	return
 }
 
 func ModifyBaseFromSmmMinDateAndMaxDate(baseFromSmmIndexId, baseFromSmmId int, minDate, maxDate string) (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` UPDATE base_from_smm_index SET start_date=?,end_date=?,modify_time=NOW() WHERE base_from_smm_index_id=? `
-	_, err = o.Raw(sql, minDate, maxDate, baseFromSmmIndexId).Exec()
+	err = o.Exec(sql, minDate, maxDate, baseFromSmmIndexId).Error
 	sql = ` UPDATE base_from_smm SET start_date=?,end_date=?,modify_time=NOW() WHERE base_from_smm_id=? `
-	_, err = o.Raw(sql, minDate, maxDate, baseFromSmmId).Exec()
+	err = o.Exec(sql, minDate, maxDate, baseFromSmmId).Error
 	return
 }
 
@@ -149,11 +158,11 @@ type BaseFromSmmDataSimple struct {
 }
 
 func GetBaseFromSmmDataByCondition(condition string, pars []interface{}) (list []*BaseFromSmmDataSimple, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_smm_data WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = o.Raw(sql, pars).Find(&list).Error
 	return
 }

models/data_manage/base_from_smm_index.go

@@ -1,9 +1,12 @@
 package data_manage
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
+)
 
 type BaseFromSmmIndexItem struct {
-	BaseFromSmmIndexId int32   `json:"base_from_smm_index_id"`
+	BaseFromSmmIndexId int32   `gorm:"column:base_from_smm_index_id;primaryKey;autoIncrement" json:"base_from_smm_index_id"`
 	ClassifyId         int32   `json:"classify_id"` // Smm原始数据指标分类id
 	Interface          string  `json:"interface"`
 	Name               string  `json:"name"`
@@ -42,9 +45,8 @@ type BaseFromSmmIndexItem struct {
 // @return item *BaseFromSmmIndexItem
 // @return err error
 func GetBaseFromSmmIndexItemItemByCode(edbCode string) (item *BaseFromSmmIndexItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM base_from_smm_index WHERE index_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&item)
-
+	err = o.Raw(sql, edbCode).First(&item).Error
 	return
 }

models/data_manage/base_from_ths_hf_index.go

@@ -1,16 +1,16 @@
 package data_manage
 
 import (
+	"eta/eta_task/global"
 	"eta/eta_task/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
 
 // BaseFromThsHfIndex 同花顺高频数据
 type BaseFromThsHfIndex struct {
-	BaseFromThsHfIndexId    int       `orm:"column(base_from_ths_hf_index_id);pk"`
+	BaseFromThsHfIndexId    int       `gorm:"column:base_from_ths_hf_index_id;primaryKey;autoIncrement"`
 	BaseFromThsHfClassifyId int       `description:"分类ID"`
 	IndexCode               string    `description:"指标编码"`
 	IndexName               string    `description:"指标名称"`
@@ -88,12 +88,7 @@ func (m *BaseFromThsHfIndex) Cols() BaseFromThsHfIndexCols {
 }
 
 func (m *BaseFromThsHfIndex) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.BaseFromThsHfIndexId = int(id)
+	err = global.DbMap[utils.DbNameIndex].Create(m).Error
 	return
 }
 
@@ -101,21 +96,20 @@ func (m *BaseFromThsHfIndex) CreateMulti(items []*BaseFromThsHfIndex) (err error
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *BaseFromThsHfIndex) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(m).Error
 	return
 }
 
 func (m *BaseFromThsHfIndex) Remove() (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.BaseFromThsHfIndexId).Exec()
+	err = o.Exec(sql, m.BaseFromThsHfIndexId).Error
 	return
 }
 
@@ -123,9 +117,9 @@ func (m *BaseFromThsHfIndex) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	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.Exec(sql, ids).Error
 	return
 }
 
@@ -133,39 +127,39 @@ func (m *BaseFromThsHfIndex) RemoveByCondition(condition string, pars []interfac
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	err = o.Raw(sql, pars...).Error
 	return
 }
 
 func (m *BaseFromThsHfIndex) GetItemById(id int) (item *BaseFromThsHfIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	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).First(&item).Error
 	return
 }
 
 func (m *BaseFromThsHfIndex) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *BaseFromThsHfIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	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...).First(&item).Error
 	return
 }
 
 func (m *BaseFromThsHfIndex) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	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...).Scan(&count).Error
 	return
 }
 
 func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromThsHfIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -175,12 +169,12 @@ func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *BaseFromThsHfIndex) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BaseFromThsHfIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -190,6 +184,7 @@ func (m *BaseFromThsHfIndex) GetPageItemsByCondition(condition string, pars []in
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	pars = append(pars, startSize, pageSize)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }

models/data_manage/base_from_trade_cffex.go

@@ -1,12 +1,14 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	sql2 "database/sql"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
 type BaseFromTradeCffexIndex struct {
-	BaseFromTradeCffexIndexId int `orm:"column(base_from_trade_cffex_index_id);pk"`
+	BaseFromTradeCffexIndexId int `gorm:"column:base_from_trade_cffex_index_id;primaryKey;autoIncrement"`
 	Rank                      int
 	DealShortName             string
 	DealName                  string
@@ -32,24 +34,23 @@ type BaseFromTradeCffexIndex struct {
 }
 
 func AddBaseFromTradeCffexIndex(item *BaseFromTradeCffexIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }
 
 func GetBaseFromTradeCffexIndexAll(dateStr string) (list []*BaseFromTradeCffexIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_trade_cffex_index WHERE data_time=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = o.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func ModifyBaseFromTradeCffexIndex(columnList [5]string, dataList [5]interface{}, dataId int) (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := "UPDATE base_from_trade_cffex_index SET " +
 		columnList[0] + "=?," + columnList[1] + "=?," + columnList[2] + "=?," + columnList[3] + "=?," + columnList[4] +
 		"=?,modify_time=NOW() WHERE base_from_trade_cffex_index_id=? "
-	_, err = o.Raw(sql, dataList[0], dataList[1], dataList[2], dataList[3], dataList[4], dataId).Exec()
+	err = o.Exec(sql, dataList[0], dataList[1], dataList[2], dataList[3], dataList[4], dataId).Error
 	return
 }
 
@@ -61,9 +62,16 @@ type CffexIndexResp struct {
 	Data    []*BaseFromTradeCffexIndex
 }
 
-func GetBaseFromTradeCffexIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+func GetBaseFromTradeCffexIndexMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT max(a.data_time)as max_date FROM base_from_trade_cffex_index as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }

models/data_manage/base_from_trade_dalian.go

@@ -1,12 +1,14 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	sql2 "database/sql"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
 type BaseFromTradeDalianIndex struct {
-	BaseFromTradeDalianIndexId int    `orm:"column(base_from_trade_dalian_index_id);pk"`
+	BaseFromTradeDalianIndexId int    `gorm:"column:base_from_trade_dalian_index_id;primaryKey;autoIncrement"`
 	Rank                       string `description:"排名"`
 	DealShortName              string `description:"成交量公司简称"`
 	DealName                   string `description:"成交量指标名称"`
@@ -32,13 +34,16 @@ type BaseFromTradeDalianIndex struct {
 }
 
 func AddBaseFromTradeDalianIndex(item *BaseFromTradeDalianIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromTradeDalianIndexId)
 	return
 }
 
 type BaseFromTradeDalianData struct {
-	BaseFromTradeDalianDataId  int `orm:"column(base_from_trade_dalian_data_id);pk"`
+	BaseFromTradeDalianDataId  int `gorm:"column:base_from_trade_dalian_data_id;primaryKey;autoIncrement"`
 	BaseFromTradeDalianIndexId int
 	IndexCode                  string
 	DataTime                   time.Time
@@ -49,28 +54,10 @@ type BaseFromTradeDalianData struct {
 	DataTimestamp              string
 }
 
-// 刷新大连指标数据
-func RefreshEdbDataByDaLian(addSql string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Raw(addSql).Exec()
-	if err != nil {
-		return err
-	}
-	return
-}
-
-// 获取当天数据信息列表
 func GetBaseFromTradeDalianDataList(dateTime string) (items []*BaseFromTradeDalianIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_trade_dalian_index WHERE data_time>=?`
-	_, err = o.Raw(sql, dateTime).QueryRows(&items)
-	return
-}
-
-func UpdateBaseFromTradeDalianIndex(item *BaseFromTradeDalianIndex, dataId int) (err error) {
-	o := orm.NewOrm()
-	sql := "UPDATE base_from_trade_dalian_index SET `rank`=?,deal_short_name=?,deal_name=?,deal_code=?,deal_value=?,buy_short_name=?,deal_change=?,buy_name=?,buy_code=?,buy_value=?,buy_change=?,sold_short_name=?,sold_name=?,sold_code=?,sold_value=?,sold_change=?,frequency=?,classify_name=?,classify_type=?,modify_time=?,data_time=? WHERE base_from_trade_dalian_index_id=? "
-	_, err = o.Raw(sql, item.Rank, item.DealShortName, item.DealName, item.DealCode, item.DealValue, item.BuyShortName, item.DealChange, item.BuyName, item.BuyCode, item.BuyValue, item.BuyChange, item.SoldShortName, item.SoldName, item.SoldCode, item.SoldValue, item.SoldChange, item.Frequency, item.ClassifyName, item.ClassifyType, item.ModifyTime, item.DataTime, dataId).Exec()
+	err = o.Raw(sql, dateTime).Find(&items).Error
 	return
 }
 
@@ -82,9 +69,16 @@ type DalianIndexResp struct {
 	Data    []*BaseFromTradeDalianIndex
 }
 
-func GetBaseFromTradeDalianIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+func GetBaseFromTradeDalianIndexMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT max(a.data_time)as max_date FROM base_from_trade_dalian_index as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }

models/data_manage/base_from_trade_guangzhou.go

@@ -1,13 +1,15 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	sql2 "database/sql"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
 type BaseFromTradeGuangzhouIndex struct {
-	BaseFromTradeGuangzhouIndexId    int       `orm:"column(base_from_trade_guangzhou_index_id);pk"`
+	BaseFromTradeGuangzhouIndexId    int       `gorm:"column:base_from_trade_guangzhou_index_id;primaryKey;autoIncrement"`
 	BaseFromTradeGuangzhouClassifyId int       `description:"分类id"`
 	BaseFromTradeGuangzhouContractId int       `description:"合约id"`
 	IndexCode                        string    `description:"指标编码"`
@@ -22,15 +24,27 @@ type BaseFromTradeGuangzhouIndex struct {
 }
 
 func AddBaseFromTradeGuangzhouIndex(item *BaseFromTradeGuangzhouIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertOrUpdate(item)
-	return
+	o := global.DbMap[utils.DbNameIndex]
+	//lastId, err = o.InsertOrUpdate(item)
+	result := o.FirstOrCreate(item, "base_from_trade_guangzhou_index_id = ?", item.BaseFromTradeGuangzhouIndexId)
+	if result.Error != nil {
+		err = result.Error
+		return
+	}
+	if result.RowsAffected == 0 {
+		result = o.Save(item)
+		if result.Error != nil {
+			err = result.Error
+			return
+		}
+	}
+	return int64(item.BaseFromTradeGuangzhouIndexId), nil
 }
 
 func GetBaseFromTradeGuangzhouIndexAll() (list []*BaseFromTradeGuangzhouIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_trade_guangzhou_index `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
@@ -43,7 +57,7 @@ type GuangzhouIndexResp struct {
 }
 
 type BaseFromTradeGuangzhouClassify struct {
-	BaseFromTradeGuangzhouClassifyId int       `orm:"column(base_from_trade_guangzhou_classify_id);pk"`
+	BaseFromTradeGuangzhouClassifyId int       `gorm:"column:base_from_trade_guangzhou_classify_id;primaryKey;autoIncrement"`
 	ClassifyName                     string    `description:"分类名称"`
 	ClassifyCode                     string    `description:"分类编码"`
 	ParentId                         int       `description:"分类父级id"`
@@ -60,30 +74,31 @@ type GuangzhouClassifyResp struct {
 }
 
 func GetBaseFromTradeGuangzhouClassifyAll() (list []*BaseFromTradeGuangzhouClassify, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_trade_guangzhou_classify `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
 func AddBaseFromTradeGuangzhouClassify(item *BaseFromTradeGuangzhouClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromTradeGuangzhouClassifyId)
 	return
 }
 
 type BaseFromTradeGuangzhouContract struct {
-	BaseFromTradeGuangzhouContractId int    `orm:"column(base_from_trade_guangzhou_contract_id);pk"`
+	BaseFromTradeGuangzhouContractId int    `gorm:"column:base_from_trade_guangzhou_contract_id;primaryKey;autoIncrement"`
 	BaseFromTradeGuangzhouClassifyId int    `description:"分类id"`
 	ClassifyCode                     string `description:"分类编码"`
 	Contract                         string `description:"合约编码"`
 	TradeDate                        string `description:"合约日期"`
 }
 
-// 新增合约
 func (obj *BaseFromTradeGuangzhouIndex) AddBaseFromTradeGuangzhouContract(item *BaseFromTradeGuangzhouContract) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }
 
@@ -96,22 +111,29 @@ type GuangzhouContractResp struct {
 }
 
 func GetBaseFromTradeGuangzhouContractAll() (list []*BaseFromTradeGuangzhouContract, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_trade_guangzhou_contract `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
-// GetBaseFromComTradeMaxDate 获取广州期货交易所最大数据
-func GetBaseFromTradeGuangzhouMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+// GetBaseFromTradeGuangzhouMaxDate 获取广州期货交易所最大数据
+func GetBaseFromTradeGuangzhouMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT max(a.create_time)as max_date FROM base_from_trade_guangzhou_data as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }
 
 type BaseFromTradeGuangzhouData struct {
-	BaseFromTradeGuangzhouDataId  int       `orm:"column(base_from_trade_guangzhou_data_id);pk"`
+	BaseFromTradeGuangzhouDataId  int       `gorm:"column:base_from_trade_guangzhou_data_id;primaryKey;autoIncrement"`
 	BaseFromTradeGuangzhouIndexId int       `description:"指标id"`
 	IndexCode                     string    `description:"指标编码"`
 	DataTime                      string    `description:"数据日期"`
@@ -121,11 +143,11 @@ type BaseFromTradeGuangzhouData struct {
 	ModifyTime                    time.Time `description:"修改日期"`
 }
 
-// GetAllComTradeDataList 获取广州期货交易所数据
+// GetAllBaseFromTradeGuangzhouDataList 获取广州期货交易所数据
 func GetAllBaseFromTradeGuangzhouDataList(startDate string) (list []*BaseFromTradeGuangzhouData, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	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).Find(&list).Error
 	return
 }
 
@@ -137,20 +159,19 @@ type BaseFromTradeGuangzhouDataResp struct {
 	Data    BaseFromTradeGuangzhouIndexAndDataResp
 }
 
-// ComTradeIndexDataResp 分页列表响应体
+// BaseFromTradeGuangzhouIndexAndDataResp 分页列表响应体
 type BaseFromTradeGuangzhouIndexAndDataResp struct {
 	List   []*BaseFromTradeGuangzhouData
 	Paging *paging.PagingItem `description:"分页数据"`
 }
 
-// MultiAddBaseFromComTradeData 批量添加数据
+// MultiAddBaseFromTradeGuangzhouData 批量添加数据
 func MultiAddBaseFromTradeGuangzhouData(items []*BaseFromTradeGuangzhouData) (lastId int64, err error) {
 	num := len(items)
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
-	lastId, err = o.InsertMulti(num, items)
-
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }

models/data_manage/base_from_trade_ine.go

@@ -1,12 +1,14 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	sql2 "database/sql"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
 type BaseFromTradeIneIndex struct {
-	BaseFromTradeIneIndexId int `orm:"column(base_from_trade_ine_index_id);pk"`
+	BaseFromTradeIneIndexId int `gorm:"column:base_from_trade_ine_index_id;primaryKey;autoIncrement"`
 	Rank                    int
 	DealShortName           string
 	DealName                string
@@ -32,22 +34,21 @@ type BaseFromTradeIneIndex struct {
 }
 
 func AddBaseFromTradeIneIndex(item *BaseFromTradeIneIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }
 
 func GetBaseFromTradeIneIndexAll(dateStr string) (list []*BaseFromTradeIneIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_trade_ine_index where data_time>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = o.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func ModifyBaseFromTradeIneIndex(dealValue, buyValue, soldValue int, dataId int) (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	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.Exec(sql, dealValue, buyValue, soldValue, dataId).Error
 	return
 }
 
@@ -59,9 +60,16 @@ type IneIndexResp struct {
 	Data    []*BaseFromTradeIneIndex
 }
 
-func GetBaseFromTradeIneIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
+func GetBaseFromTradeIneIndexMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT max(a.data_time)as max_date FROM base_from_trade_ine_index as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }

models/data_manage/cross_variety/chart_info_cross_variety.go

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

models/data_manage/cross_variety/chart_tag_variety.go

@@ -1,15 +1,15 @@
 package cross_variety
 
 import (
+	"eta/eta_task/global"
 	"eta/eta_task/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // ChartTagVariety
 // @Description: chart_tag_variety 图表标签品种关系表
 type ChartTagVariety struct {
-	Id                        int       `orm:"column(id);pk"`
+	Id                        int       `gorm:"column:id;primaryKey;autoIncrement"`
 	ChartTagId                int       `description:"标签id"`
 	ChartVarietyId            int       `description:"品种id"`
 	EdbInfoId                 int       `description:"指标id"`
@@ -20,8 +20,8 @@ type ChartTagVariety struct {
 }
 
 func GetChartTagVarietyEdbInfoIdsByTagIds(chartTagIds []int) (items []*ChartTagVariety, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id in (` + utils.GetOrmInReplace(len(chartTagIds)) + `)`
-	_, err = o.Raw(sql, chartTagIds).QueryRows(&items)
+	err = o.Raw(sql, chartTagIds).Find(&items).Error
 	return
 }

models/data_manage/edb_refresh/edb_refresh_config.go

@@ -2,14 +2,15 @@ package edb_refresh
 
 import (
 	"errors"
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
 // EdbRefreshConfig
 // @Description: 指标的刷新时间配置表
 type EdbRefreshConfig struct {
-	EdbRefreshConfigId  int       `orm:"column(edb_refresh_config_id);pk"`
+	EdbRefreshConfigId  int       `gorm:"column:edb_refresh_config_id;primaryKey;autoIncrement"`
 	RefreshFrequency    string    `description:"刷新频率"`
 	RefreshFrequencyDay int       `description:"具体刷新的日期"`
 	RefreshTime         string    `description:"刷新时间"`
@@ -31,13 +32,7 @@ func (m *EdbRefreshConfig) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	lastId, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.EdbRefreshConfigId = int(lastId)
-
+	err = global.DbMap[utils.DbNameIndex].Create(m).Error
 	return
 }
 
@@ -49,8 +44,7 @@ func (m *EdbRefreshConfig) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *EdbRefreshConfig) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(m).Error
 	return
 }
 
@@ -61,8 +55,7 @@ func (m *EdbRefreshConfig) Update(cols []string) (err error) {
 // @datetime 2023-12-14 16:11:10
 // @return err error
 func (m *EdbRefreshConfig) Delete() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Delete(m)
+	err = global.DbMap[utils.DbNameIndex].Delete(m).Error
 	return
 }
 
@@ -75,7 +68,7 @@ func (m *EdbRefreshConfig) Delete() (err error) {
 // @return list []*EdbRefreshDefaultConfig
 // @return err error
 func GetEdbRefreshConfigListByCondition(condition string, pars []interface{}) (list []*EdbRefreshConfig, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM edb_refresh_config
          WHERE 1 = 1 `
 
@@ -83,7 +76,6 @@ func GetEdbRefreshConfigListByCondition(condition string, pars []interface{}) (l
 		sql += condition
 	}
 	sql += ` ORDER BY edb_refresh_config_id ASC `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
-
+	err = o.Raw(sql, pars).Find(&list).Error
 	return
 }

models/data_manage/edb_refresh/edb_refresh_default_config.go

@@ -2,15 +2,15 @@ package edb_refresh
 
 import (
 	"errors"
+	"eta/eta_task/global"
 	"eta/eta_task/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // EdbRefreshDefaultConfig
 // @Description: 指标的默认刷新时间配置表
 type EdbRefreshDefaultConfig struct {
-	Id                  int       `orm:"column(id);pk"`
+	Id                  int       `gorm:"column:id;primaryKey;autoIncrement"`
 	Source              int       `description:"来源"`
 	SubSource           int       `description:"来源名称"`
 	Frequency           string    `description:"频度"`
@@ -35,13 +35,7 @@ func (m *EdbRefreshDefaultConfig) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	lastId, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.Id = int(lastId)
-
+	err = global.DbMap[utils.DbNameIndex].Create(m).Error
 	return
 }
 
@@ -53,8 +47,7 @@ func (m *EdbRefreshDefaultConfig) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *EdbRefreshDefaultConfig) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(m).Error
 	return
 }
 
@@ -65,8 +58,7 @@ func (m *EdbRefreshDefaultConfig) Update(cols []string) (err error) {
 // @datetime 2023-12-14 16:11:10
 // @return err error
 func (m *EdbRefreshDefaultConfig) Delete() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Delete(m)
+	err = global.DbMap[utils.DbNameIndex].Delete(m).Error
 	return
 }
 
@@ -80,11 +72,10 @@ func (m *EdbRefreshDefaultConfig) Delete() (err error) {
 // @return list []*EdbRefreshDefaultConfig
 // @return err error
 func GetListBySourceAndFrequency(source, subSource int, frequency string) (list []*EdbRefreshDefaultConfig, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM edb_refresh_default_config
          WHERE source = ? AND sub_source = ? AND frequency = ? ORDER BY id ASC `
-	_, err = o.Raw(sql, source, subSource, frequency).QueryRows(&list)
-
+	err = o.Raw(sql, source, subSource, frequency).Find(&list).Error
 	return
 }
 
@@ -97,7 +88,7 @@ func GetListBySourceAndFrequency(source, subSource int, frequency string) (list
 // @return list []*EdbRefreshDefaultConfig
 // @return err error
 func GetListByCondition(condition string, pars []interface{}) (list []*EdbRefreshDefaultConfig, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM edb_refresh_default_config
          WHERE 1 = 1 `
 
@@ -105,8 +96,7 @@ func GetListByCondition(condition string, pars []interface{}) (list []*EdbRefres
 		sql += condition
 	}
 	sql += ` ORDER BY id ASC `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
-
+	err = o.Raw(sql, pars...).Find(&list).Error
 	return
 }
 
@@ -123,12 +113,10 @@ func GetDefaultRefreshEdbInfoListBySourceAndSubSource(source, subSource int, fre
 	if num <= 0 {
 		return
 	}
-
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT a.* FROM edb_info a 
 LEFT JOIN edb_refresh_mapping b ON a.edb_info_id = b.edb_info_id
 WHERE a.source = ? AND a.sub_source = ? AND a.frequency IN (` + utils.GetOrmInReplace(num) + `)  AND b.edb_info_id is null`
-	_, err = o.Raw(sql, source, subSource, frequencyList).QueryRows(&list)
-
+	err = o.Raw(sql, source, subSource, frequencyList).Find(&list).Error
 	return
 }

models/data_manage/edb_refresh/edb_refresh_mapping.go

@@ -2,15 +2,15 @@ package edb_refresh
 
 import (
 	"errors"
+	"eta/eta_task/global"
 	"eta/eta_task/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // EdbRefreshMapping
 // @Description: 指标刷新时间配置关系表
 type EdbRefreshMapping struct {
-	EdbRefreshMappingId int       `orm:"column(edb_refresh_mapping_id);pk"`
+	EdbRefreshMappingId int       `gorm:"column:edb_refresh_mapping_id;primaryKey;autoIncrement"`
 	Source              int       `description:"来源"`
 	SubSource           int       `description:"来源名称"`
 	EdbInfoId           int       `description:"指标id，如果是数据源（钢联、有色）的，那么就是数据源里面的id"`
@@ -33,13 +33,7 @@ func (m *EdbRefreshMapping) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	lastId, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.EdbRefreshMappingId = int(lastId)
-
+	err = global.DbMap[utils.DbNameIndex].Create(m).Error
 	return
 }
 
@@ -51,8 +45,7 @@ func (m *EdbRefreshMapping) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *EdbRefreshMapping) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(m).Error
 	return
 }
 
@@ -63,13 +56,12 @@ func (m *EdbRefreshMapping) Update(cols []string) (err error) {
 // @datetime 2023-12-14 16:11:10
 // @return err error
 func (m *EdbRefreshMapping) Delete() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Delete(m)
+	err = global.DbMap[utils.DbNameIndex].Delete(m).Error
 	return
 }
 
 type EdbInfoListAndRefreshConfig struct {
-	EdbInfoId          int       `orm:"column(edb_info_id);pk"`
+	EdbInfoId          int       `gorm:"column:edb_info_id;primaryKey;autoIncrement"`
 	SourceName         string    `description:"来源名称"`
 	Source             int       `description:"来源id"`
 	SubSource          int       `description:"子数据来源:0:经济数据库,1:日期序列"`
@@ -105,7 +97,7 @@ func GetConfigRefreshEdbInfoListBySourceAndSubSource(sourceList, configIdList []
 
 	var pars []interface{}
 
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT a.*,b.edb_refresh_config_id FROM edb_info a 
  JOIN edb_refresh_mapping b ON a.edb_info_id = b.edb_info_id
 WHERE b.edb_refresh_config_id IN (` + utils.GetOrmInReplace(num) + `) `
@@ -116,7 +108,6 @@ WHERE b.edb_refresh_config_id IN (` + utils.GetOrmInReplace(num) + `) `
 		sql += ` AND b.source not in (` + utils.GetOrmInReplace(sourceNum) + `) `
 		pars = append(pars, sourceList)
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
-
+	err = o.Raw(sql, pars).Find(&list).Error
 	return
 }

models/data_manage/edb_refresh/edb_refresh_source.go

@@ -1,14 +1,15 @@
 package edb_refresh
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
 // EdbRefreshSource
 // @Description: 刷新的数据源表
 type EdbRefreshSource struct {
-	Id            int       `orm:"column(id);pk"`
+	Id            int       `gorm:"column:id;primaryKey;autoIncrement" orm:"column(id);pk"`
 	Source        int       `orm:"column(source)" description:"来源"`
 	SourceName    string    `description:"来源名称"`
 	SubSource     int       `description:"子数据来源:0:经济数据库,1:日期序列"`
@@ -36,9 +37,9 @@ type EdbRefreshSourceList struct {
 // @return items []*EdbRefreshSource
 // @return err error
 func (m EdbRefreshSource) GetAllList() (items []*EdbRefreshSource, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT *  FROM edb_refresh_source ORDER BY id ASC `
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Find(&items).Error
 	return
 }
 

models/data_manage/excel/excel_edb_mapping.go

@@ -1,14 +1,14 @@
 package excel
 
 import (
+	"eta/eta_task/global"
 	"eta/eta_task/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // ExcelEdbMapping excel与指标的关系表
 type ExcelEdbMapping struct {
-	ExcelEdbMappingId int       `orm:"column(excel_edb_mapping_id);pk"`
+	ExcelEdbMappingId int       `gorm:"column:excel_edb_mapping_id;primaryKey;autoIncrement"`
 	ExcelInfoId       int       `description:"excel的id"`
 	Source            int       `description:"表格来源，1：excel插件的表格，2：自定义表格，3：混合表格，4：自定义分析，默认：1"`
 	EdbInfoId         int       `description:"计算指标id"`
@@ -18,18 +18,16 @@ type ExcelEdbMapping struct {
 
 // GetExcelEdbMappingTotalBySource 根据表格类型获取总数
 func GetExcelEdbMappingTotalBySource(sources []int) (total int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT count(*)  FROM excel_edb_mapping WHERE source in (` + utils.GetOrmInReplace(len(sources)) + `)`
-
-	err = o.Raw(sql, sources).QueryRow(&total)
+	err = o.Raw(sql, sources).Scan(&total).Error
 	return
 }
 
 // GetExcelEdbMappingListBySource 根据表格类型获取列表
 func GetExcelEdbMappingListBySource(sources []int, pageIndex, pageSize int) (items []*ExcelEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT *  FROM excel_edb_mapping WHERE source in (` + utils.GetOrmInReplace(len(sources)) + `) Limit ?,? `
-
-	_, err = o.Raw(sql, sources, pageIndex, pageSize).QueryRows(&items)
+	err = o.Raw(sql, sources, pageIndex, pageSize).Find(&items).Error
 	return
 }

models/data_manage/excel/excel_info.go

@@ -1,15 +1,16 @@
 package excel
 
 import (
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
 
 // ExcelInfo excel表格详情表
 type ExcelInfo struct {
-	ExcelInfoId        int       `orm:"column(excel_info_id);pk"`
+	ExcelInfoId        int       `gorm:"column:excel_info_id;primaryKey;autoIncrement"`
 	Source             int       `description:"表格来源，1：excel插件的表格，2：自定义表格，3：混合表格，4：自定义分析，默认：1"`
 	ExcelType          int       `description:"表格类型，1：指标列，2：日期列，默认：1"`
 	ExcelName          string    `description:"表格名称"`
@@ -40,7 +41,7 @@ func (m *ExcelInfo) TableName() string {
 }
 
 func (m *ExcelInfo) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*ExcelInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -50,6 +51,6 @@ func (m *ExcelInfo) GetItemsByCondition(condition string, pars []interface{}, fi
 		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).Find(&items).Error
 	return
 }

models/data_manage/future_good/chart_info_future_good_profit.go

@@ -1,15 +1,16 @@
 package future_good
 
 import (
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
 
 // ChartInfoFutureGoodProfit 商品利润图表-扩展信息
 type ChartInfoFutureGoodProfit struct {
-	ChartInfoId  int       `orm:"column(chart_info_id);pk" description:"商品利润图表ID(chart_info表source=5的)"`
+	ChartInfoId  int       `gorm:"column:chart_info_id;primaryKey;autoIncrement" description:"商品利润图表ID(chart_info表source=5的)"`
 	ProfitName   string    `description:"利润名称"`
 	ProfitNameEn string    `description:"利润英文名称"`
 	XValue       string    `description:"X轴数据值"`
@@ -23,44 +24,38 @@ func (m *ChartInfoFutureGoodProfit) TableName() string {
 }
 
 func (m *ChartInfoFutureGoodProfit) Create() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(m)
-	if err != nil {
-		return
-	}
-	//m.CorrelationChartInfoId = int(id)
+	err = global.DbMap[utils.DbNameIndex].Create(m).Error
 	return
 }
 
 func (m *ChartInfoFutureGoodProfit) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(m).Error
 	return
 }
 
 func (m *ChartInfoFutureGoodProfit) Delete() (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE chart_info_id = ? LIMIT 1`, m.TableName())
-	_, err = o.Raw(sql, m.ChartInfoId).Exec()
+	err = o.Exec(sql, m.ChartInfoId).Error
 	return
 }
 
 func (m *ChartInfoFutureGoodProfit) GetItemById(id int) (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE chart_info_id = ? LIMIT 1`, m.TableName())
-	err = o.Raw(sql, id).QueryRow(&m)
+	err = o.Raw(sql, id).First(&m).Error
 	return
 }
 
 func (m *ChartInfoFutureGoodProfit) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&m)
+	err = o.Raw(sql, pars...).First(&m).Error
 	return
 }
 
 func (m *ChartInfoFutureGoodProfit) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*ChartInfoFutureGoodProfit, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -70,6 +65,6 @@ func (m *ChartInfoFutureGoodProfit) GetItemsByCondition(condition string, pars [
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }

models/data_manage/future_good/future_good_edb_info.go

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

models/data_source/data_source.go

@@ -1,9 +1,9 @@
 package data_source
 
 import (
+	"eta/eta_task/global"
 	"eta/eta_task/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"strings"
 	"time"
@@ -150,7 +150,7 @@ func GetEsBaseFromIndexByTableName(tableName string) EsBaseFromIndex {
 
 // BaseFromRzdIndex 睿咨得
 type BaseFromRzdIndex struct {
-	BaseFromRzdIndexId    int       `orm:"column(base_from_rzd_index_id);pk"`
+	BaseFromRzdIndexId    int       `gorm:"column:base_from_rzd_index_id;primaryKey;autoIncrement"`
 	BaseFromRzdClassifyId int       `description:"分类ID"`
 	IndexCode             string    `description:"指标编码"`
 	IndexName             string    `description:"指标名称"`
@@ -207,7 +207,7 @@ func (m *BaseFromRzdIndex) Format2SearchDataSource(origin *BaseFromRzdIndex) (it
 }
 
 func (m *BaseFromRzdIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromRzdIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -217,13 +217,13 @@ func (m *BaseFromRzdIndex) GetItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_rzd_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromHisugarIndex 泛糖科技
 type BaseFromHisugarIndex struct {
-	BaseFromHisugarIndexId int       `orm:"column(base_from_hisugar_index_id);pk"`
+	BaseFromHisugarIndexId int       `gorm:"column:base_from_hisugar_index_id;primaryKey;autoIncrement"`
 	ClassifyId             int       `description:"分类ID"`
 	IndexCode              string    `description:"指标编码"`
 	IndexName              string    `description:"指标名称"`
@@ -283,7 +283,7 @@ func (m *BaseFromHisugarIndex) Format2SearchDataSource(origin *BaseFromHisugarIn
 }
 
 func (m *BaseFromHisugarIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromHisugarIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -293,13 +293,13 @@ func (m *BaseFromHisugarIndex) GetItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_hisugar_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromLyIndex 粮油商务网
 type BaseFromLyIndex struct {
-	BaseFromLyIndexId    int       `orm:"column(base_from_ly_index_id);pk"`
+	BaseFromLyIndexId    int       `gorm:"column:base_from_ly_index_id;primaryKey;autoIncrement"`
 	BaseFromLyClassifyId int       `description:"分类ID"`
 	IndexCode            string    `description:"指标编码"`
 	IndexName            string    `description:"指标名称"`
@@ -357,7 +357,7 @@ func (m *BaseFromLyIndex) Format2SearchDataSource(origin *BaseFromLyIndex) (item
 }
 
 func (m *BaseFromLyIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromLyIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -367,13 +367,13 @@ func (m *BaseFromLyIndex) GetItemsByCondition(condition string, pars []interface
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_ly_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromSciHqIndex 卓创红期
 type BaseFromSciHqIndex struct {
-	BaseFromSciHqIndexId int       `orm:"column(base_from_sci_hq_index_id);pk"`
+	BaseFromSciHqIndexId int       `gorm:"column:base_from_sci_hq_index_id;primaryKey;autoIncrement"`
 	ClassifyId           int       `description:"分类ID"`
 	IndexCode            string    `description:"指标编码"`
 	IndexName            string    `description:"指标名称"`
@@ -434,7 +434,7 @@ func (m *BaseFromSciHqIndex) Format2SearchDataSource(origin *BaseFromSciHqIndex)
 }
 
 func (m *BaseFromSciHqIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromSciHqIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -444,13 +444,13 @@ func (m *BaseFromSciHqIndex) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_sci_hq_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromOilchemIndex 隆众资讯
 type BaseFromOilchemIndex struct {
-	BaseFromOilchemIndexId int       `orm:"column(base_from_oilchem_index_id);pk"`
+	BaseFromOilchemIndexId int       `gorm:"column:base_from_oilchem_index_id;primaryKey;autoIncrement"`
 	ClassifyId             int       `description:"分类ID"`
 	IndexCode              string    `description:"指标编码"`
 	IndexName              string    `description:"指标名称"`
@@ -507,7 +507,7 @@ func (m *BaseFromOilchemIndex) Format2SearchDataSource(origin *BaseFromOilchemIn
 }
 
 func (m *BaseFromOilchemIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromOilchemIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -517,13 +517,13 @@ func (m *BaseFromOilchemIndex) GetItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_oilchem_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromThsHfIndex 同花顺高频数据
 type BaseFromThsHfIndex struct {
-	BaseFromThsHfIndexId    int       `orm:"column(base_from_ths_hf_index_id);pk"`
+	BaseFromThsHfIndexId    int       `gorm:"column:base_from_ths_hf_index_id;primaryKey;autoIncrement"`
 	BaseFromThsHfClassifyId int       `description:"分类ID"`
 	IndexCode               string    `description:"指标编码"`
 	IndexName               string    `description:"指标名称"`
@@ -590,7 +590,7 @@ func (m *BaseFromThsHfIndex) Format2SearchDataSource(origin *BaseFromThsHfIndex)
 }
 
 func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromThsHfIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -600,13 +600,13 @@ func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_ths_hf_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromCcfIndex CCF化纤信息
 type BaseFromCcfIndex struct {
-	BaseFromCcfIndexId int       `orm:"column(base_from_ccf_index_id);pk"`
+	BaseFromCcfIndexId int       `gorm:"column:base_from_ccf_index_id;primaryKey;autoIncrement"`
 	ClassifyId         int       `description:"分类ID"`
 	IndexCode          string    `description:"指标编码"`
 	IndexName          string    `description:"指标名称"`
@@ -663,7 +663,7 @@ func (m *BaseFromCcfIndex) Format2SearchDataSource(origin *BaseFromCcfIndex) (it
 }
 
 func (m *BaseFromCcfIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromCcfIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -673,13 +673,13 @@ func (m *BaseFromCcfIndex) GetItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	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 = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromUsdaFasIndex 美国农业部
 type BaseFromUsdaFasIndex struct {
-	BaseFromUsdaFasIndexId int       `orm:"column(base_from_usda_fas_index_id);pk"`
+	BaseFromUsdaFasIndexId int       `gorm:"column:base_from_usda_fas_index_id;primaryKey;autoIncrement"`
 	ClassifyId             int       `description:"分类ID"`
 	IndexCode              string    `description:"指标编码"`
 	IndexName              string    `description:"指标名称"`
@@ -736,7 +736,7 @@ func (m *BaseFromUsdaFasIndex) Format2SearchDataSource(origin *BaseFromUsdaFasIn
 }
 
 func (m *BaseFromUsdaFasIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromUsdaFasIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -746,13 +746,13 @@ func (m *BaseFromUsdaFasIndex) GetItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s, end_value AS latest_value FROM base_from_usda_fas_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromMysteelChemicalIndex 上海钢联
 type BaseFromMysteelChemicalIndex struct {
-	BaseFromMysteelChemicalIndexId    int       `orm:"column(base_from_mysteel_chemical_index_id);pk"`
+	BaseFromMysteelChemicalIndexId    int       `gorm:"column:base_from_mysteel_chemical_index_id;primaryKey;autoIncrement"`
 	BaseFromMysteelChemicalClassifyId int       `description:"分类ID"`
 	IndexCode                         string    `description:"指标编码"`
 	IndexName                         string    `description:"指标名称"`
@@ -809,7 +809,7 @@ func (m *BaseFromMysteelChemicalIndex) Format2SearchDataSource(origin *BaseFromM
 }
 
 func (m *BaseFromMysteelChemicalIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -819,13 +819,13 @@ func (m *BaseFromMysteelChemicalIndex) GetItemsByCondition(condition string, par
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s, end_value AS latest_value FROM base_from_mysteel_chemical_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromSmmIndex 有色原始数据库
 type BaseFromSmmIndex struct {
-	BaseFromSmmIndexId int       `orm:"column(base_from_smm_index_id);pk"`
+	BaseFromSmmIndexId int       `gorm:"column:base_from_smm_index_id;primaryKey;autoIncrement"`
 	ClassifyId         int       `description:"分类ID"`
 	IndexCode          string    `description:"指标编码"`
 	IndexName          string    `description:"指标名称"`
@@ -882,7 +882,7 @@ func (m *BaseFromSmmIndex) Format2SearchDataSource(origin *BaseFromSmmIndex) (it
 }
 
 func (m *BaseFromSmmIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromSmmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -892,13 +892,13 @@ func (m *BaseFromSmmIndex) GetItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s, end_value AS latest_value FROM base_from_smm_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromBaiinfoIndex 百川盈孚
 type BaseFromBaiinfoIndex struct {
-	BaseFromBaiinfoIndexId int       `orm:"column(base_from_baiinfo_index_id);pk"`
+	BaseFromBaiinfoIndexId int       `gorm:"column:base_from_baiinfo_index_id;primaryKey;autoIncrement"`
 	ClassifyId             int       `description:"分类ID"`
 	IndexCode              string    `description:"指标编码"`
 	IndexName              string    `description:"指标名称"`
@@ -955,7 +955,7 @@ func (m *BaseFromBaiinfoIndex) Format2SearchDataSource(origin *BaseFromBaiinfoIn
 }
 
 func (m *BaseFromBaiinfoIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromBaiinfoIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -965,13 +965,13 @@ func (m *BaseFromBaiinfoIndex) GetItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_baiinfo_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromSciIndex 卓创数据（红桃3）
 type BaseFromSciIndex struct {
-	BaseFromSciIndexId int       `orm:"column(base_from_sci_index_id);pk"`
+	BaseFromSciIndexId int       `gorm:"column:base_from_sci_index_id;primaryKey;autoIncrement"`
 	ClassifyId         int       `description:"分类ID"`
 	IndexCode          string    `description:"指标编码"`
 	IndexName          string    `description:"指标名称"`
@@ -1028,7 +1028,7 @@ func (m *BaseFromSciIndex) Format2SearchDataSource(origin *BaseFromSciIndex) (it
 }
 
 func (m *BaseFromSciIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromSciIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1038,13 +1038,13 @@ func (m *BaseFromSciIndex) GetItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_sci_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromCoalmineMapping 中国煤炭市场网
 type BaseFromCoalmineMapping struct {
-	BaseFromCoalmineMappingId int       `orm:"column(base_from_coalmine_mapping_id);pk"`
+	BaseFromCoalmineMappingId int       `gorm:"column:base_from_coalmine_mapping_id;primaryKey;autoIncrement"`
 	ClassifyId                int       `description:"分类ID"`
 	IndexCode                 string    `description:"指标编码"`
 	IndexName                 string    `description:"指标名称"`
@@ -1101,7 +1101,7 @@ func (m *BaseFromCoalmineMapping) Format2SearchDataSource(origin *BaseFromCoalmi
 }
 
 func (m *BaseFromCoalmineMapping) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromCoalmineMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1111,13 +1111,13 @@ func (m *BaseFromCoalmineMapping) GetItemsByCondition(condition string, pars []i
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_coalmine_mapping WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromEiaSteoIndex EIA STEO报告
 type BaseFromEiaSteoIndex struct {
-	BaseFromEiaSteoIndexId    int       `orm:"column(base_from_eia_steo_index_id);pk"`
+	BaseFromEiaSteoIndexId    int       `gorm:"column:base_from_eia_steo_index_id;primaryKey;autoIncrement"`
 	BaseFromEiaSteoClassifyId int       `description:"分类ID"`
 	IndexCode                 string    `description:"指标编码"`
 	IndexName                 string    `description:"指标名称"`
@@ -1174,7 +1174,7 @@ func (m *BaseFromEiaSteoIndex) Format2SearchDataSource(origin *BaseFromEiaSteoIn
 }
 
 func (m *BaseFromEiaSteoIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromEiaSteoIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1184,13 +1184,13 @@ func (m *BaseFromEiaSteoIndex) GetItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_eia_steo_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromIcpiIndex ICPI消费价格指数
 type BaseFromIcpiIndex struct {
-	BaseFromIcpiIndexId    int       `orm:"column(base_from_icpi_index_id);pk"`
+	BaseFromIcpiIndexId    int       `gorm:"column:base_from_icpi_index_id;primaryKey;autoIncrement"`
 	BaseFromIcpiClassifyId int       `description:"分类ID"`
 	IndexCode              string    `description:"指标编码"`
 	IndexName              string    `description:"指标名称"`
@@ -1247,7 +1247,7 @@ func (m *BaseFromIcpiIndex) Format2SearchDataSource(origin *BaseFromIcpiIndex) (
 }
 
 func (m *BaseFromIcpiIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromIcpiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1257,13 +1257,13 @@ func (m *BaseFromIcpiIndex) GetItemsByCondition(condition string, pars []interfa
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_icpi_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromYongyiIndex 涌益咨询
 type BaseFromYongyiIndex struct {
-	YongyiIndexId int       `orm:"column(yongyi_index_id);pk"`
+	YongyiIndexId int       `gorm:"column:yongyi_index_id;primaryKey;autoIncrement"`
 	ClassifyId    int       `description:"分类ID"`
 	IndexCode     string    `description:"指标编码"`
 	IndexName     string    `description:"指标名称"`
@@ -1320,7 +1320,7 @@ func (m *BaseFromYongyiIndex) Format2SearchDataSource(origin *BaseFromYongyiInde
 }
 
 func (m *BaseFromYongyiIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromYongyiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1330,13 +1330,13 @@ func (m *BaseFromYongyiIndex) GetItemsByCondition(condition string, pars []inter
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_yongyi_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromFenweiIndex 汾渭数据
 type BaseFromFenweiIndex struct {
-	FenweiIndexId int       `orm:"column(fenwei_index_id);pk"`
+	FenweiIndexId int       `gorm:"column:fenwei_index_id;primaryKey;autoIncrement"`
 	ClassifyId    int       `description:"分类ID"`
 	IndexCode     string    `description:"指标编码"`
 	IndexName     string    `description:"指标名称"`
@@ -1393,7 +1393,7 @@ func (m *BaseFromFenweiIndex) Format2SearchDataSource(origin *BaseFromFenweiInde
 }
 
 func (m *BaseFromFenweiIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromFenweiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1403,13 +1403,13 @@ 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...).Find(&items).Error
 	return
 }
 
 // BaseFromSci99Index 卓创资讯
 type BaseFromSci99Index struct {
-	BaseFromSciIndexId int       `orm:"column(base_from_sci_index_id);pk"`
+	BaseFromSciIndexId int       `gorm:"column:base_from_sci_index_id;primaryKey;autoIncrement"`
 	ClassifyId         int       `description:"分类ID"`
 	IndexCode          string    `description:"指标编码"`
 	IndexName          string    `description:"指标名称"`
@@ -1466,7 +1466,7 @@ func (m *BaseFromSci99Index) Format2SearchDataSource(origin *BaseFromSci99Index)
 }
 
 func (m *BaseFromSci99Index) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromSci99Index, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1476,13 +1476,13 @@ func (m *BaseFromSci99Index) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_sci99_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromGlIndex 钢联原始指标库
 type BaseFromGlIndex struct {
-	PrimaryId   int       `orm:"column(ID);pk"`
+	PrimaryId   int       `gorm:"column:ID;primaryKey;autoIncrement" orm:"column(ID);pk"`
 	IndexCode   string    `orm:"column(INDEX_CODE)" description:"指标编码"`
 	IndexName   string    `orm:"column(INDEX_NAME)" description:"指标名称"`
 	Unit        string    `orm:"column(UNIT_NAME)" description:"单位"`
@@ -1538,7 +1538,7 @@ func (m *BaseFromGlIndex) Format2SearchDataSource(origin *BaseFromGlIndex) (item
 }
 
 func (m *BaseFromGlIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromGlIndex, err error) {
-	o := orm.NewOrmUsingDB("gl")
+	o := global.DbMap[utils.DbNameGL]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1548,7 +1548,7 @@ func (m *BaseFromGlIndex) GetItemsByCondition(condition string, pars []interface
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM mb_index_main_info WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1611,7 +1611,7 @@ func (m *BaseFromManualEdb) Format2SearchDataSource(origin *BaseFromManualEdb) (
 }
 
 func (m *BaseFromManualEdb) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromManualEdb, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	o := global.DbMap[utils.DbNameManualIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1621,13 +1621,13 @@ func (m *BaseFromManualEdb) GetItemsByCondition(condition string, pars []interfa
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM edbinfo WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromBusinessIndex 自有数据
 type BaseFromBusinessIndex struct {
-	BaseFromBusinessIndexId int `orm:"column(base_from_business_index_id);pk"`
+	BaseFromBusinessIndexId int `gorm:"column:base_from_business_index_id;primaryKey;autoIncrement"`
 	//ClassifyId              int       `description:"分类ID"`
 	IndexCode   string    `description:"指标编码"`
 	IndexName   string    `description:"指标名称"`
@@ -1684,7 +1684,7 @@ func (m *BaseFromBusinessIndex) Format2SearchDataSource(origin *BaseFromBusiness
 }
 
 func (m *BaseFromBusinessIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromBusinessIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1694,13 +1694,13 @@ func (m *BaseFromBusinessIndex) GetItemsByCondition(condition string, pars []int
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_business_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromBloombergIndex Bloomberg
 type BaseFromBloombergIndex struct {
-	BaseFromBloombergIndexId int `orm:"column(base_from_bloomberg_index_id);pk"`
+	BaseFromBloombergIndexId int `gorm:"column:base_from_bloomberg_index_id;primaryKey;autoIncrement"`
 	//ClassifyId              int       `description:"分类ID"`
 	IndexCode   string    `description:"指标编码"`
 	IndexName   string    `description:"指标名称"`
@@ -1757,7 +1757,7 @@ func (m *BaseFromBloombergIndex) Format2SearchDataSource(origin *BaseFromBloombe
 }
 
 func (m *BaseFromBloombergIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromBloombergIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1767,13 +1767,13 @@ func (m *BaseFromBloombergIndex) GetItemsByCondition(condition string, pars []in
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_bloomberg_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // BaseFromMtjhMapping 煤炭江湖
 type BaseFromMtjhMapping struct {
-	BaseFromMtjhMappingId int `orm:"column(base_from_mtjh_mapping_id);pk"`
+	BaseFromMtjhMappingId int `gorm:"column:base_from_mtjh_mapping_id;primaryKey;autoIncrement"`
 	//ClassifyId            int       `description:"分类ID"`
 	IndexCode   string    `description:"指标编码"`
 	IndexName   string    `description:"指标名称"`
@@ -1830,7 +1830,7 @@ func (m *BaseFromMtjhMapping) Format2SearchDataSource(origin *BaseFromMtjhMappin
 }
 
 func (m *BaseFromMtjhMapping) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromMtjhMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1840,7 +1840,7 @@ func (m *BaseFromMtjhMapping) GetItemsByCondition(condition string, pars []inter
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_mtjh_mapping WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1943,20 +1943,20 @@ func getCoalmineDataTableName(indexCode string) string {
 
 // GetBaseIndexDataMinMax 获取数据源极值
 func GetBaseIndexDataMinMax(source, subSource int, indexCode string) (item *BaseIndexDataMinMax, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	var sql string
 	var latestVal float64
 
 	// 煤炭江湖
 	if source == utils.DATA_SOURCE_MTJH {
 		sql = `SELECT MIN(data_time) AS min_date, MAX(data_time) AS max_date FROM base_from_mtjh_index WHERE index_code = ?`
-		if e := o.Raw(sql, indexCode).QueryRow(&item); e != nil {
+		if e := o.Raw(sql, indexCode).Scan(&item); e != nil {
 			err = fmt.Errorf("获取数据源开始结束时间失败, %v", e)
 			return
 		}
 
 		sql = `SELECT deal_value AS latest_value FROM base_from_mtjh_index WHERE index_code = ? ORDER BY data_time DESC LIMIT 1`
-		if e := o.Raw(sql, indexCode).QueryRow(&latestVal); e != nil {
+		if e := o.Raw(sql, indexCode).Scan(&latestVal); e != nil {
 			err = fmt.Errorf("获取数据源最新值失败, %v", e)
 			return
 		}
@@ -1977,14 +1977,14 @@ func GetBaseIndexDataMinMax(source, subSource int, indexCode string) (item *Base
 		}
 		sql = `SELECT MIN(%s) AS min_date, MAX(%s) AS max_date FROM %s WHERE index_code = ?`
 		sql = fmt.Sprintf(sql, fieldDataTime, fieldDataTime, dataTable)
-		if e := o.Raw(sql, indexCode).QueryRow(&item); e != nil {
+		if e := o.Raw(sql, indexCode).Scan(&item); e != nil {
 			err = fmt.Errorf("获取数据源开始结束时间失败, %v", e)
 			return
 		}
 
 		sql = `SELECT deal_value AS latest_value FROM %s WHERE index_code = ? ORDER BY %s DESC LIMIT 1`
 		sql = fmt.Sprintf(sql, dataTable, fieldDataTime)
-		if e := o.Raw(sql, indexCode).QueryRow(&latestVal); e != nil {
+		if e := o.Raw(sql, indexCode).Scan(&latestVal); e != nil {
 			err = fmt.Errorf("获取数据源最新值失败, %v", e)
 			return
 		}
@@ -2001,14 +2001,14 @@ func GetBaseIndexDataMinMax(source, subSource int, indexCode string) (item *Base
 
 	sql = `SELECT MIN(data_time) AS min_date, MAX(data_time) AS max_date FROM %s WHERE index_code = ?`
 	sql = fmt.Sprintf(sql, dataTable)
-	if e := o.Raw(sql, indexCode).QueryRow(&item); e != nil {
+	if e := o.Raw(sql, indexCode).Scan(&item); e != nil {
 		err = fmt.Errorf("获取数据源开始结束时间失败, %v", e)
 		return
 	}
 
 	sql = `SELECT value AS latest_value FROM %s WHERE index_code = ? ORDER BY data_time DESC LIMIT 1`
 	sql = fmt.Sprintf(sql, dataTable)
-	if e := o.Raw(sql, indexCode).QueryRow(&latestVal); e != nil {
+	if e := o.Raw(sql, indexCode).Scan(&latestVal); e != nil {
 		err = fmt.Errorf("获取数据源最新值失败, %v", e)
 		return
 	}

models/edbinfo_send_msg_record.go

@@ -1,26 +1,19 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
 type EdbinfoSendMsgRecord struct {
-	Id         int `orm:"column(id);pk"`
+	Id         int `gorm:"column:id;primaryKey;autoIncrement"`
 	UserId     int
 	TradeCode  string
 	CreateTime time.Time
 }
 
 func AddEdbinfoSendMsgRecord(item *EdbinfoSendMsgRecord) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Insert(item)
-	return err
-}
-
-func GetEdbinfoSendMsgCount(userId int, tradeCode string) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT COUNT(1) AS count FROM edbinfo_send_msg_record WHERE user_id=? AND trade_code=? AND create_time=DATE(NOW()) `
-	err = o.Raw(sql, userId, tradeCode).QueryRow(&count)
+	err = global.DbMap[utils.DbNameReport].Create(item).Error
 	return
 }

models/english_report.go

@@ -1,11 +1,12 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 )
 
 type EnglishReport struct {
-	Id                 int    `orm:"column(id)" description:"报告Id"`
+	Id                 int    `gorm:"column:id;primaryKey;autoIncrement" description:"报告Id"`
 	AddType            int    `description:"新增方式：1:新增报告，2:继承报告"`
 	ClassifyIdFirst    int    `description:"一级分类id"`
 	ClassifyNameFirst  string `description:"一级分类名称"`
@@ -39,7 +40,7 @@ type EnglishReport struct {
 }
 
 type EnglishReportDetail struct {
-	Id                 int    `orm:"column(id)" description:"报告Id"`
+	Id                 int    `gorm:"column:id;primaryKey;autoIncrement" description:"报告Id"`
 	AddType            int    `description:"新增方式：1:新增报告，2:继承报告"`
 	ClassifyIdFirst    int    `description:"一级分类id"`
 	ClassifyNameFirst  string `description:"一级分类名称"`
@@ -91,38 +92,31 @@ type ElasticEnglishReportDetail struct {
 
 // GetPrePublishedEnglishReports 获取定时发布时间为当前时间的未发布的英文报告列表
 func GetPrePublishedEnglishReports(startTime, endTime, afterDate string) (list []*EnglishReport, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `SELECT * FROM english_report WHERE state = 1 and pre_publish_time >= ? and pre_publish_time <= ? and modify_time >= ?`
-	_, err = o.Raw(sql, startTime, endTime, afterDate).QueryRows(&list)
+	err = o.Raw(sql, startTime, endTime, afterDate).Find(&list).Error
 	return
 }
 
 // PublishEnglishReportById 发布报告
 func PublishEnglishReportById(reportId int, publishTime string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `UPDATE english_report SET state=2, publish_time=?, modify_time=NOW() WHERE id = ? `
-	_, err = o.Raw(sql, publishTime, reportId).Exec()
+	err = o.Exec(sql, publishTime, reportId).Error
 	return
 }
 
 func GetEnglishReportById(reportId int) (item *EnglishReportDetail, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `SELECT * FROM english_report WHERE id=?`
-	err = o.Raw(sql, reportId).QueryRow(&item)
+	err = o.Raw(sql, reportId).First(&item).Error
 	return
 }
 
 // GetReportByReportId 主键获取报告
 func GetReportByReportId(reportId int) (item *Report, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `SELECT * FROM report WHERE id = ?`
-	err = o.Raw(sql, reportId).QueryRow(&item)
-	return
-}
-
-// Update 更新
-func (item *EnglishReport) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(item, cols...)
+	err = o.Raw(sql, reportId).First(&item).Error
 	return
 }

models/fe_calendar/fe_calendar_matter.go

@@ -1,8 +1,9 @@
 package fe_calendar
 
 import (
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -15,7 +16,7 @@ const (
 
 // FeCalendarMatter 外汇日历-事项表
 type FeCalendarMatter struct {
-	FeCalendarMatterId  int       `orm:"column(fe_calendar_matter_id);pk" description:"事项ID"`
+	FeCalendarMatterId  int       `gorm:"column:fe_calendar_matter_id;primaryKey;autoIncrement" description:"事项ID"`
 	ChartPermissionId   int       `description:"品种ID"`
 	ChartPermissionName string    `description:"品种名称"`
 	MatterMonth         string    `description:"事项年月：格式2006-01"`
@@ -84,25 +85,25 @@ func (m *FeCalendarMatter) PrimaryId() string {
 }
 
 func (m *FeCalendarMatter) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FeCalendarMatter, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	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...).First(&item).Error
 	return
 }
 
 func (m *FeCalendarMatter) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	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...).Scan(&count).Error
 	return
 }
 
 func (m *FeCalendarMatter) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FeCalendarMatter, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -112,6 +113,7 @@ func (m *FeCalendarMatter) GetPageItemsByCondition(condition string, pars []inte
 		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)
+	pars = append(pars, startSize, pageSize)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }

models/index_notice.go

@@ -1,7 +1,8 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
@@ -18,8 +19,8 @@ type EdbInfo struct {
 // GetEdbInfoByFrequencyNotDay 获取频度非日度 且 提醒时间不为空 的指标数据
 func GetEdbInfoByFrequencyNotDay() (items []*EdbInfo, err error) {
 	sql := `SELECT * FROM edbinfo WHERE frequency!="日度" AND notice_time<>'' and user_id>0 `
-	o := orm.NewOrmUsingDB("edb")
-	_, err = o.Raw(sql).QueryRows(&items)
+	o := global.DbMap[utils.DbNameManualIndex]
+	err = o.Raw(sql).Find(&items).Error
 	return
 }
 
@@ -33,7 +34,7 @@ type Edbdata struct {
 // GetLastEdbdataInfo 根据指标编号获取指标最近的一条数据
 func GetLastEdbdataInfo(tradeCode string) (item *Edbdata, err error) {
 	sql := `SELECT * FROM edbdata WHERE TRADE_CODE=? order by DT desc `
-	o := orm.NewOrmUsingDB("edb")
-	err = o.Raw(sql, tradeCode).QueryRow(&item)
+	o := global.DbMap[utils.DbNameManualIndex]
+	err = o.Raw(sql, tradeCode).First(&item).Error
 	return
 }

models/report.go

@@ -1,14 +1,13 @@
 package models
 
 import (
+	"eta/eta_task/global"
 	"eta/eta_task/utils"
-	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 type Report struct {
-	Id                 int       `orm:"column(id)" description:"报告Id"`
+	Id                 int       `gorm:"column:id;primaryKey;autoIncrement" description:"报告Id"`
 	AddType            int       `description:"新增方式：1:新增报告，2:继承报告"`
 	ClassifyIdFirst    int       `description:"一级分类id"`
 	ClassifyNameFirst  string    `description:"一级分类名称"`
@@ -40,103 +39,26 @@ type Report struct {
 	ClassifyNameThird  string `description:"三级分类名称"`
 }
 
-func GetReportById(reportId int) (item *ReportDetail, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM report WHERE id=?`
-	err = o.Raw(sql, reportId).QueryRow(&item)
-	return
-}
-
-func GetReport() (items []*Report, err error) {
-	sql := `SELECT * FROM report ORDER BY id ASC `
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-func ModifyReportContentSub(id int, contentSub string) (err error) {
-	sql := `UPDATE report SET content_sub=? WHERE id=? `
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Raw(sql, contentSub, id).Exec()
-	return
-}
-
-func GetReportLimit() (items []*Report, err error) {
-	sql := `SELECT * FROM report WHERE state=2 ORDER BY id DESC LIMIT 50 `
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-func EditReportContent(reportId int, content, contentSub string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := ` UPDATE report SET content=?,content_sub=?,modify_time=NOW() WHERE id=? `
-	_, err = o.Raw(sql, content, contentSub, reportId).Exec()
-	return
-}
-
-// 删除报告日志记录-保留3个月
-func DeleteReportSaveLog() {
-	startDateTime := time.Now().AddDate(0, -3, 0).Format(utils.FormatDateTime)
-	fmt.Println(startDateTime)
-}
-
-func EditReportContentHtml(reportId int, content string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := ` UPDATE report SET content=?,modify_time=NOW() WHERE id=? `
-	_, err = o.Raw(sql, content, reportId).Exec()
-	return
-}
-
 // GetPrePublishedReports 获取定时发布时间为当前时间的未发布的报告列表
 func GetPrePublishedReports(startTime, endTime, afterDate string) (list []*Report, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `SELECT * FROM report WHERE state = 1 and pre_publish_time >= ? and pre_publish_time <=? and modify_time >= ?`
-	_, err = o.Raw(sql, startTime, endTime, afterDate).QueryRows(&list)
+	err = o.Raw(sql, startTime, endTime, afterDate).Find(&list).Error
 	return
 }
 
 // PublishReportById 发布报告
 func PublishReportById(reportId int, publishTime time.Time) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `UPDATE report SET state = 2, publish_time = ?, modify_time = NOW() WHERE id = ? `
-	_, err = o.Raw(sql, publishTime, reportId).Exec()
+	err = o.Exec(sql, publishTime, reportId).Error
 	return
 }
 
-type ReportDetail struct {
-	Id                 int    `orm:"column(id)" description:"报告Id"`
-	AddType            int    `description:"新增方式：1:新增报告，2:继承报告"`
-	ClassifyIdFirst    int    `description:"一级分类id"`
-	ClassifyNameFirst  string `description:"一级分类名称"`
-	ClassifyIdSecond   int    `description:"二级分类id"`
-	ClassifyNameSecond string `description:"二级分类名称"`
-	Title              string `description:"标题"`
-	Abstract           string `description:"摘要"`
-	Author             string `description:"作者"`
-	Frequency          string `description:"频度"`
-	CreateTime         string `description:"创建时间"`
-	ModifyTime         string `description:"修改时间"`
-	State              int    `description:"1:未发布，2:已发布"`
-	PublishTime        string `description:"发布时间"`
-	Stage              int    `description:"期数"`
-	MsgIsSend          int    `description:"消息是否已发送，0:否，1:是"`
-	Content            string `description:"内容"`
-	VideoUrl           string `description:"音频文件URL"`
-	VideoName          string `description:"音频文件名称"`
-	VideoPlaySeconds   string `description:"音频播放时长"`
-	ContentSub         string `description:"内容前两个章节"`
-	ThsMsgIsSend       int    `description:"客户群消息是否已发送，0:否，1:是"`
-	HasChapter         int    `description:"是否有章节 0-否 1-是"`
-	ChapterType        string `description:"章节类型 day-晨报 week-周报"`
-	OldReportId        int    `description:"research_report表ID(后续一两个版本过渡需要,之后可移除)"`
-	PreMsgSend         int    `description:"定时发布成功后是否立即推送模版消息：0否，1是"`
-}
-
 func ModifyReportVideo(reportId int, videoUrl, videoName, videoSize string, playSeconds float64) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `UPDATE report SET video_url=?,video_name=?,video_play_seconds=?,video_size=? WHERE id=? `
-	_, err = o.Raw(sql, videoUrl, videoName, playSeconds, videoSize, reportId).Exec()
+	err = o.Exec(sql, videoUrl, videoName, playSeconds, videoSize, reportId).Error
 	return
 }
 
@@ -151,27 +73,9 @@ func ModifyReportVideo(reportId int, videoUrl, videoName, videoSize string, play
 // @param playSeconds float64
 // @return err error
 func ModifyReportVideoByNoVideo(reportId int, videoUrl, videoName, videoSize string, playSeconds float64) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `UPDATE report SET video_url=?,video_name=?,video_play_seconds=?,video_size=? WHERE id=? AND video_url=""`
-	_, err = o.Raw(sql, videoUrl, videoName, playSeconds, videoSize, reportId).Exec()
-	return
-}
-
-type ReportChapterTypePermission struct {
-	Id                    int       `orm:"column(id);pk" description:"主键ID"`
-	ReportChapterTypeId   int       `description:"报告章节类型ID"`
-	ReportChapterTypeName string    `description:"章节名称"`
-	ChartPermissionId     int       `description:"大分类ID"`
-	PermissionName        string    `description:"权限名称"`
-	ResearchType          string    `description:"研报类型"`
-	CreatedTime           time.Time `description:"创建时间"`
-}
-
-// GetChapterTypePermissionByTypeIdAndResearchType 根据章节类型ID及研报类型获取章节类型权限列表
-func GetChapterTypePermissionByTypeIdAndResearchType(typeId int, researchType string) (list []*ReportChapterTypePermission, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM report_chapter_type_permission WHERE report_chapter_type_id = ? AND research_type = ? ORDER BY chart_permission_id ASC `
-	_, err = o.Raw(sql, typeId, researchType).QueryRows(&list)
+	err = o.Exec(sql, videoUrl, videoName, playSeconds, videoSize, reportId).Error
 	return
 }
 
@@ -200,60 +104,57 @@ type ChartPermissionMappingIdName struct {
 }
 
 func GetChartPermissionNameFromMappingByKeyword(source string, classifyId int) (list []*ChartPermissionMappingIdName, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := " SELECT b.chart_permission_id AS permission_id,b.permission_name FROM chart_permission_search_key_word_mapping AS a INNER JOIN chart_permission AS b ON a.chart_permission_id = b.chart_permission_id WHERE a.`from` = ? AND a.classify_id = ? "
-	_, err = o.Raw(sql, source, classifyId).QueryRows(&list)
+	err = o.Raw(sql, source, classifyId).Find(&list).Error
 	return
 }
 
 func UpdateReportPublishTime(reportId int, videoNameDate string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql1 := ` UPDATE report SET publish_time = NOW() WHERE id = ?  `
-	_, err = o.Raw(sql1, reportId).Exec()
+	err = o.Exec(sql1, reportId).Error
 	if err != nil {
 		return
 	}
 	//修改音频标题
 	sql2 := ` UPDATE report SET video_name=CONCAT(SUBSTRING_INDEX(video_name,"(",1),"` + videoNameDate + `") WHERE id = ? and (video_name !="" and video_name is not null)`
-	_, err = o.Raw(sql2, reportId).Exec()
+	err = o.Exec(sql2, reportId).Error
 	return
 }
 
 func UpdateReportChapterPublishTime(reportId int, videoNameDate string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql1 := ` UPDATE report_chapter SET publish_time = NOW() WHERE report_id = ? `
-	_, err = o.Raw(sql1, reportId).Exec()
+	err = o.Exec(sql1, reportId).Error
 	if err != nil {
 		return
 	}
 	//修改音频标题
 	sql2 := ` UPDATE report_chapter SET video_name=CONCAT(SUBSTRING_INDEX(video_name,"(",1),"` + videoNameDate + `") WHERE report_id = ? and (video_name !="" and video_name is not null)`
-	_, err = o.Raw(sql2, reportId).Exec()
+	err = o.Exec(sql2, reportId).Error
 	return
 }
 
 func ModifyReportMsgIsSend(reportId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `UPDATE report SET msg_is_send = 1, msg_send_time=NOW()  WHERE id = ? and msg_is_send=0`
-	_, err = o.Raw(sql, reportId).Exec()
+	err = o.Exec(sql, reportId).Error
 	return
 }
 
 // ClearReportSaveLog 清理报告保存日志
 func ClearReportSaveLog(date string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `DELETE FROM report_save_log WHERE create_time <= ?`
-	_, err = o.Raw(sql, date).Exec()
+	err = o.Exec(sql, date).Error
 	return
 }
 
 // PublishReportAndChapter 发布报告及章节
 func PublishReportAndChapter(reportInfo *Report, isPublishReport bool, cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	o := global.DbMap[utils.DbNameReport]
+	to := o.Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -263,7 +164,7 @@ func PublishReportAndChapter(reportInfo *Report, isPublishReport bool, cols []st
 	}()
 	// 更新报告
 	if isPublishReport {
-		_, err = to.Update(reportInfo, cols...)
+		err = to.Select(cols).Updates(reportInfo).Error
 		if err != nil {
 			return
 		}
@@ -271,17 +172,17 @@ func PublishReportAndChapter(reportInfo *Report, isPublishReport bool, cols []st
 
 	// 发布该报告的所有章节
 	sql := ` UPDATE report_chapter SET publish_state = 2, publish_time = ? WHERE report_id = ?  `
-	_, err = to.Raw(sql, reportInfo.PublishTime, reportInfo.Id).Exec()
+	err = to.Exec(sql, reportInfo.PublishTime, reportInfo.Id).Error
 
 	// 发布章节
 	//if len(publishIds) > 0 {
 	//	sql := ` UPDATE report_chapter SET publish_state = 2, publish_time = ? WHERE report_id = ? AND report_chapter_id IN (` + utils.GetOrmInReplace(len(publishIds)) + `) `
-	//	_, err = to.Raw(sql, reportInfo.PublishTime, reportInfo.Id, publishIds).Exec()
+	//	err = to.Raw(sql, reportInfo.PublishTime, reportInfo.Id, publishIds).Error
 	//}
 
 	//if len(unPublishIds) > 0 {
 	//	sql := ` UPDATE report_chapter SET publish_state = 1, publish_time = NULL, is_edit = 0 WHERE report_id = ? AND report_chapter_id IN (` + utils.GetOrmInReplace(len(unPublishIds)) + `) `
-	//	_, err = to.Raw(sql, reportInfo.Id, unPublishIds).Exec()
+	//	err = to.Raw(sql, reportInfo.Id, unPublishIds).Error
 	//}
 
 	return

models/report/report_chapter_permission_mapping.go

@@ -1,15 +1,15 @@
 package report
 
 import (
+	"eta/eta_task/global"
 	"eta/eta_task/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // ReportChapterPermissionMapping
 // @Description: 报告章节的权限关系表
 type ReportChapterPermissionMapping struct {
-	ReportChapterPermissionMappingId int `orm:"column(report_chapter_permission_mapping_id)"`
+	ReportChapterPermissionMappingId int `gorm:"column:report_chapter_permission_mapping_id;primaryKey;autoIncrement"`
 	ReportChapterId                  int `description:"报告章节的id"` // 报告章节的id
 	ChartPermissionId                int `description:"权限id"`    // 权限id
 	CreateTime                       time.Time
@@ -24,11 +24,8 @@ type ReportChapterPermissionMapping struct {
 // @param list []*ReportChapterPermissionMapping
 // @return err error
 func (m ReportChapterPermissionMapping) MultiAddReportChapterPermissionMappingPermission(reportChapterId int, list []*ReportChapterPermissionMapping) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	o := global.DbMap[utils.DbNameReport]
+	to := o.Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -38,20 +35,19 @@ func (m ReportChapterPermissionMapping) MultiAddReportChapterPermissionMappingPe
 	}()
 
 	sql := "DELETE from report_chapter_permission_mapping where report_chapter_id=?"
-	_, err = to.Raw(sql, reportChapterId).Exec()
+	err = to.Exec(sql, reportChapterId).Error
 	if err != nil {
 		return
 	}
 
 	// 新增品种权限记录
 	if len(list) > 0 {
-		_, tmpErr := to.InsertMulti(500, list)
+		tmpErr := to.CreateInBatches(list, utils.MultiAddNum).Error
 		if tmpErr != nil {
 			err = tmpErr
 			return
 		}
 	}
-
 	return
 }
 
@@ -64,17 +60,16 @@ func (m ReportChapterPermissionMapping) MultiAddReportChapterPermissionMappingPe
 // @return list []*ReportChapterPermissionMapping
 // @return err error
 func (m ReportChapterPermissionMapping) GetPermissionListById(reportChapterId int) (list []*ReportChapterPermissionMapping, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `SELECT * FROM report_chapter_permission_mapping WHERE report_chapter_id=? `
-	_, err = o.Raw(sql, reportChapterId).QueryRows(&list)
-
+	err = o.Raw(sql, reportChapterId).Find(&list).Error
 	return
 }
 
 // ReportChapterPermissionItem
 // @Description: 报告章节的权限关系表（带有品种名称）
 type ReportChapterPermissionItem struct {
-	ReportChapterPermissionMappingId int    `orm:"column(report_chapter_permission_mapping_id)"`
+	ReportChapterPermissionMappingId int    `gorm:"column:report_chapter_permission_mapping_id;primaryKey;autoIncrement"`
 	ReportChapterId                  int    `description:"报告章节的id"`
 	ChartPermissionId                int    `description:"权限id"`
 	ChartPermissionName              string `description:"品种名称"`
@@ -90,11 +85,10 @@ type ReportChapterPermissionItem struct {
 // @return list []*ReportChapterPermissionMapping
 // @return err error
 func (m ReportChapterPermissionMapping) GetPermissionItemListById(reportChapterId int) (list []*ReportChapterPermissionItem, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `SELECT a.*,b.chart_permission_name FROM report_chapter_permission_mapping AS a 
          JOIN chart_permission AS b on a.chart_permission_id=b.chart_permission_id WHERE report_chapter_id=? `
-	_, err = o.Raw(sql, reportChapterId).QueryRows(&list)
-
+	err = o.Raw(sql, reportChapterId).Find(&list).Error
 	return
 }
 
@@ -112,10 +106,9 @@ func (m ReportChapterPermissionMapping) GetPermissionListByIdList(reportChapterI
 		return
 	}
 
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `SELECT * FROM report_chapter_permission_mapping WHERE report_chapter_id in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, reportChapterIdList).QueryRows(&list)
-
+	err = o.Raw(sql, reportChapterIdList).Find(&list).Error
 	return
 }
 
@@ -127,11 +120,8 @@ func (m ReportChapterPermissionMapping) GetPermissionListByIdList(reportChapterI
 // @param list []*ReportChapterPermissionMapping
 // @return err error
 func (m ReportChapterPermissionMapping) MultiAdd(list []*ReportChapterPermissionMapping) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	o := global.DbMap[utils.DbNameReport]
+	to := o.Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -142,11 +132,10 @@ func (m ReportChapterPermissionMapping) MultiAdd(list []*ReportChapterPermission
 
 	// 新增品种权限记录
 	if len(list) > 0 {
-		_, err = to.InsertMulti(500, list)
+		err = to.CreateInBatches(list, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
 	}
-
 	return
 }

models/report_chapter.go

@@ -1,14 +1,14 @@
 package models
 
 import (
+	"eta/eta_task/global"
 	"eta/eta_task/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // ReportChapter 报告章节
 type ReportChapter struct {
-	ReportChapterId   int       `orm:"column(report_chapter_id);pk" description:"报告章节ID"`
+	ReportChapterId   int       `gorm:"column:report_chapter_id;primaryKey;autoIncrement" description:"报告章节ID"`
 	ReportId          int       `description:"报告ID"`
 	ReportType        string    `description:"报告类型 day-晨报 week-周报"`
 	ClassifyIdFirst   int       `description:"一级分类id"`
@@ -39,37 +39,22 @@ type ReportChapter struct {
 
 // GetPublishedChapterListByReportId 根据ReportId获取已发布章节列表
 func GetPublishedChapterListByReportId(reportId int) (list []*ReportChapter, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := ` SELECT * FROM report_chapter WHERE report_id = ? AND publish_state = 2 ORDER BY sort ASC`
-	_, err = o.Raw(sql, reportId).QueryRows(&list)
-
+	err = o.Raw(sql, reportId).Find(&list).Error
 	return
 }
 
 // GetChapterListByReportId 根据ReportId获取章节列表
 func GetChapterListByReportId(reportId int) (list []*ReportChapter, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := ` SELECT * FROM report_chapter WHERE report_id = ? ORDER BY sort ASC`
-	_, err = o.Raw(sql, reportId).QueryRows(&list)
-
-	return
-}
-
-// GetChapterListByChapterIds 根据ReportId获取章节列表
-func GetChapterListByChapterIds(chapterIds []int) (list []*ReportChapter, err error) {
-	if len(chapterIds) == 0 {
-		return
-	}
-	o := orm.NewOrmUsingDB("rddp")
-	sql := ` SELECT * FROM report_chapter WHERE report_chapter_id IN (` + utils.GetOrmInReplace(len(chapterIds)) + `) ORDER BY sort ASC`
-	_, err = o.Raw(sql, chapterIds).QueryRows(&list)
+	err = o.Raw(sql, reportId).Find(&list).Error
 	return
 }
 
 // UpdateChapter 更新报表章节
 func (chapterChapterInfo *ReportChapter) UpdateChapter(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(chapterChapterInfo, cols...)
-
+	err = global.DbMap[utils.DbNameReport].Select(cols).Updates(chapterChapterInfo).Error
 	return
 }

models/report_state_record.go

@@ -1,12 +1,13 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
 type ReportStateRecord struct {
-	Id         int       `orm:"column(id)" description:"Id"`
+	Id         int       `gorm:"column:id;primaryKey;autoIncrement"`
 	ReportId   int       // 研报id
 	ReportType int       // 报告类型'报告类型：1中文研报2智能研报'
 	State      int       // 状态：1-未提交 2-待审核 3-驳回 4-审核
@@ -16,7 +17,10 @@ type ReportStateRecord struct {
 }
 
 func AddReportStateRecord(item *ReportStateRecord) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameReport].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.Id)
 	return
 }

models/sandbox/sandbox.go

@@ -1,31 +1,13 @@
 package sandbox
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
-// Sandbox 沙盘推演主表
-//type Sandbox struct {
-//	SandboxId           int       `orm:"column(sandbox_id);pk" description:"沙盘id"`
-//	Name                string    `description:"沙盘名称"`
-//	ChartPermissionId   int       `description:"品种id"`
-//	ChartPermissionName string    `description:"品种名称"`
-//	CurrVersion         int       `description:"当前版本"`
-//	Code                string    `description:"沙盘code"`
-//	Content             string    `description:"沙盘数据"`
-//	PicUrl              string    `description:"沙盘图片地址"`
-//	OpUserId            int       `description:"最近一次编辑操作的用户id"`
-//	OpUserName          string    `description:"最近一次编辑的用户名称（冗余字段，避免查表）"`
-//	IsDelete            int8      `description:"是否删除，0：未删除，1：已删除"`
-//	ModifyTime          time.Time `description:"修改时间"`
-//	CreateTime          time.Time `description:"创建时间"`
-//	SandboxClassifyId   int       `description:"分类id"`
-//	Sort                int       `description:"排序"`
-//}
-
 type Sandbox struct {
-	SandboxId         int       `orm:"column(sandbox_id);pk" description:"沙盘id"`
+	SandboxId         int       `gorm:"column:sandbox_id;primaryKey;autoIncrement" description:"沙盘id"`
 	Name              string    `description:"沙盘名称"`
 	Code              string    `description:"沙盘code"`
 	Content           string    `description:"沙盘数据"`
@@ -42,23 +24,24 @@ type Sandbox struct {
 }
 
 func GetSandboxListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*Sandbox, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM sandbox WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += " ORDER BY create_time DESC LIMIT ?,? "
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&item)
+	pars = append(pars, startSize, pageSize)
+	err = o.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 func GetSandboxListCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT COUNT(1) AS count FROM sandbox WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

models/smart_report.go

@@ -1,14 +1,15 @@
 package models
 
 import (
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // SmartReport 智能研报
 type SmartReport struct {
-	SmartReportId      int       `orm:"column(smart_report_id)" description:"智能研报ID"`
+	SmartReportId      int       `gorm:"column:smart_report_id;primaryKey;autoIncrement" description:"智能研报ID"`
 	ReportCode         string    `description:"报告唯一编码"`
 	ClassifyIdFirst    int       `description:"一级分类ID"`
 	ClassifyNameFirst  string    `description:"一级分类名称"`
@@ -48,31 +49,30 @@ func (m *SmartReport) PrimaryId() string {
 }
 
 func (m *SmartReport) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(m, cols...)
+	err = global.DbMap[utils.DbNameReport].Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SmartReport) GetItemById(id int) (item *SmartReport, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = o.Raw(sql, id).First(&item).Error
 	return
 }
 
 // GetPrePublishSmartReports 获取定时发布时间为当前时间的未发布的报告列表
 func GetPrePublishSmartReports(startTime, endTime string) (list []*SmartReport, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `SELECT * FROM smart_report WHERE state = 1 AND pre_publish_time >= ? AND pre_publish_time <= ?`
-	_, err = o.Raw(sql, startTime, endTime).QueryRows(&list)
+	err = o.Raw(sql, startTime, endTime).Find(&list).Error
 	return
 }
 
 // PublishSmartReportById 发布智能报告
 func PublishSmartReportById(reportId int, publishTime time.Time) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `UPDATE smart_report SET state = 2, publish_time = ?, msg_is_send = 1, msg_send_time = NOW(), modify_time = NOW() WHERE smart_report_id = ?`
-	_, err = o.Raw(sql, publishTime, reportId).Exec()
+	err = o.Exec(sql, publishTime, reportId).Error
 	return
 }
 

models/wx_template_msg.go

@@ -1,6 +1,9 @@
 package models
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
+)
 
 type SendTemplateResponse struct {
 	Errcode int    `json:"errcode"`
@@ -14,24 +17,8 @@ type OpenIdList struct {
 
 func DeleteTemplateRecordByDate(date string) (err error) {
 	sql := `DELETE FROM user_template_record WHERE create_time<? `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, date).Exec()
-	return
-}
-
-// GetOpenIdListV2 2022-08-18从hongze_admin复制过来的最新的代码
-func GetOpenIdListV2() (items []*OpenIdList, err error) {
-	sql := `SELECT DISTINCT
-				ur.open_id,
-				wu.user_id
-			FROM
-				wx_user AS wu
-			INNER JOIN company AS c ON c.company_id = wu.company_id
-			INNER JOIN company_product AS d ON c.company_id = d.company_id
-			INNER JOIN user_record AS ur ON wu.user_id = ur.user_id
-			WHERE
-				ur.open_id != "" AND ur.subscribe = 1 AND ur.create_platform = 1 AND d. STATUS IN ('正式', '试用', '永续') `
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
+	o := global.DbMap[utils.DbNameWeekly]
+	err = o.Exec(sql, date).Error
 	return
 }
 
@@ -42,25 +29,8 @@ func GetOpenIdArr() (items []string, err error) {
 		INNER JOIN user_record  AS ur ON wu.user_id=ur.user_id
           WHERE ur.open_id != "" AND ur.subscribe=1 AND ur.create_platform=1 AND  d.status IN('正式','试用','永续')
          ORDER BY FIELD(c.company_id, 16) desc, ur.user_record_id asc`
-	o := orm.NewOrm()
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-func GetOpenIdArrByClassifyNameSecond(classifyNameSecond string) (items []string, err error) {
-	sql := ` SELECT DISTINCT ur.open_id FROM wx_user AS wu 
-			INNER JOIN company AS c ON c.company_id = wu.company_id 
-			INNER JOIN company_product AS d ON c.company_id=d.company_id
-			INNER JOIN user_record  AS ur ON wu.user_id=ur.user_id
-			INNER JOIN company_report_permission AS e ON d.company_id=e.company_id
-			INNER JOIN chart_permission AS f ON e.chart_permission_id=f.chart_permission_id
-			INNER JOIN chart_permission_search_key_word_mapping AS g ON f.chart_permission_id=g.chart_permission_id
-			WHERE ur.open_id != "" AND ur.subscribe=1 AND ur.create_platform=1 AND  d.status IN('正式','试用','永续') AND  e.status IN('正式','试用','永续') 
-			AND g.from='rddp'
-			AND g.key_word=?
-			ORDER BY FIELD(c.company_id, 16) DESC, ur.user_record_id ASC  `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, classifyNameSecond).QueryRows(&items)
+	o := global.DbMap[utils.DbNameWeekly]
+	err = o.Raw(sql).Find(&items).Error
 	return
 }
 
@@ -83,7 +53,7 @@ func GetOpenIdArrByClassifyId(classifyId int) (items []string, err error) {
 			AND g.from='rddp'
 			AND g.classify_id=?
 			ORDER BY FIELD(c.company_id, 16) DESC, ur.user_record_id ASC  `
-	o := orm.NewOrmUsingDB("weekly")
-	_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	o := global.DbMap[utils.DbNameWeekly]
+	err = o.Raw(sql, classifyId).Find(&items).Error
 	return
 }