orm->gorm

models/english_report_email.go

@@ -1,32 +1,32 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
 // EnglishReportEmail 英文研报-邮箱/客户联系人
 type EnglishReportEmail struct {
-	Id              int       `orm:"column(id);pk" description:"邮箱ID"`
-	CompanyId       int       `description:"客户ID"`
-	Name            string    `description:"联系人名称"`
-	Email           string    `description:"邮箱地址"`
-	Mobile          string    `description:"手机号"`
-	CountryCode     string    `description:"区号，86、852、886等"`
-	BusinessCardUrl string    `description:"名片"`
-	ViewTotal       int       `description:"累计点击量/阅读量"`
-	LastViewTime    time.Time `description:"最后阅读时间"`
-	IsDeleted       int       `description:"删除状态：0-正常；1-已删除"`
-	Enabled         int       `description:"邮箱状态：1:有效，0:禁用"`
-	AdminId         int       `description:"创建人ID"`
-	AdminName       string    `description:"创建人姓名"`
-	Status          int       `description:"1:正式,2:临时,3:终止"`
-	CompanyName     string    `description:"公司名称"`
-	CreateTime      time.Time `description:"创建时间"`
-	ModifyTime      time.Time `description:"更新时间"`
-	RegisterTime    time.Time `description:"注册时间"`
+	Id              int       `gorm:"column:id;primary_key:true" description:"邮箱ID"`
+	CompanyId       int       `gorm:"column:company_id" description:"客户ID"`
+	Name            string    `gorm:"column:name" description:"联系人名称"`
+	Email           string    `gorm:"column:email" description:"邮箱地址"`
+	Mobile          string    `gorm:"column:mobile" description:"手机号"`
+	CountryCode     string    `gorm:"column:country_code" description:"区号，86、852、886等"`
+	BusinessCardUrl string    `gorm:"column:business_card_url" description:"名片"`
+	ViewTotal       int       `gorm:"column:view_total" description:"累计点击量/阅读量"`
+	LastViewTime    time.Time `gorm:"column:last_view_time" description:"最后阅读时间"`
+	IsDeleted       int       `gorm:"column:is_deleted" description:"删除状态：0-正常；1-已删除"`
+	Enabled         int       `gorm:"column:enabled" description:"邮箱状态：1:有效，0:禁用"`
+	AdminId         int       `gorm:"column:admin_id" description:"创建人ID"`
+	AdminName       string    `gorm:"column:admin_name" description:"创建人姓名"`
+	Status          int       `gorm:"column:status" description:"1:正式,2:临时,3:终止"`
+	CompanyName     string    `gorm:"column:company_name" description:"公司名称"`
+	CreateTime      time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime      time.Time `gorm:"column:modify_time" description:"更新时间"`
+	RegisterTime    time.Time `gorm:"column:register_time" description:"注册时间"`
 }
 
 func (item *EnglishReportEmail) TableName() string {
@@ -46,26 +46,29 @@ type EnglishReportEmailSaveReq struct {
 }
 
 func (item *EnglishReportEmail) Create() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	id, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.Id = int(id)
+	//o := orm.NewOrmUsingDB("rddp")
+	//id, err := o.Insert(item)
+	//if err != nil {
+	//	return
+	//}
+	//item.Id = int(id)
+	err = global.DmSQL["rddp"].Create(item).Error
 	return
 }
 
 func (item *EnglishReportEmail) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(item, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(item, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }
 
 // GetEnglishReportEmailById 主键获取邮箱
 func GetEnglishReportEmailById(id int) (item *EnglishReportEmail, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_report_email WHERE is_deleted = 0 AND id = ? LIMIT 1`
-	err = o.Raw(sql, id).QueryRow(&item)
+	//err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
 	return
 }
 
@@ -117,7 +120,7 @@ type EnglishReportEmailRespItem struct {
 
 // GetEnglishReportEmailPageList 获取邮箱列表-分页
 func GetEnglishReportEmailPageList(condition string, pars []interface{}, order string, startSize, pageSize int) (total int, list []*EnglishReportEmailRespItem, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.id,a.name,a.email,a.mobile,a.country_code,a.business_card_url,a.view_total,a.company_id,
 a.last_view_time,a.admin_id,a.admin_name,a.create_time,a.modify_time,a.enabled,a.status,a.is_deleted,a.register_time,
 b.company_name AS company_name,a.company_name AS register_company_name FROM english_report_email AS a LEFT JOIN 
@@ -130,17 +133,19 @@ WHERE a.is_deleted = 0 `
 		sql += ` ORDER BY a.create_time DESC`
 	}
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
+	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, pars, startSize, pageSize).Find(&list).Error
 	return
 }
 
 // GetEnglishReportEmailList 获取邮箱列表
 func GetEnglishReportEmailList(condition string, pars []interface{}, order string) (list []*EnglishReportEmail, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_report_email WHERE is_deleted = 0`
 	sql += condition
 	if order != "" {
@@ -148,18 +153,20 @@ func GetEnglishReportEmailList(condition string, pars []interface{}, order strin
 	} else {
 		sql += ` ORDER BY create_time DESC`
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&list).Error
 	return
 }
 
 // GetEnglishReportEmailByEmail 地址获取邮箱
 func GetEnglishReportEmailByEmail(email string) (item *EnglishReportEmailResp, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.id,a.name,a.email,a.mobile,a.country_code,a.business_card_url,a.view_total,
 a.last_view_time,a.admin_id,a.admin_name,a.create_time,a.modify_time,a.enabled,a.status,
 b.company_name AS company_name,a.company_name AS register_company_name FROM english_report_email AS a LEFT JOIN 
 	english_company AS b ON a.company_id = b.company_id WHERE a.is_deleted = 0 AND a.email = ? LIMIT 1`
-	err = o.Raw(sql, email).QueryRow(&item)
+	//err = o.Raw(sql, email).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, email).First(&item).Error
 	return
 }
 
@@ -176,9 +183,10 @@ type EnglishReportEditEnabledReq struct {
 
 // DelEnglishReportEmail 删除邮箱
 func DelEnglishReportEmail(id int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM english_report_email WHERE id = ? LIMIT 1`
-	_, err = o.Raw(sql, id).Exec()
+	//_, err = o.Raw(sql, id).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, id).Error
 	return
 }
 
@@ -199,7 +207,7 @@ type EnglishReportEmailConf struct {
 
 // GetEnglishCompanyViewPageList 获取联系人点击量列表-分页
 func GetEnglishCompanyViewPageList(condition string, pars []interface{}, order string, startSize, pageSize int) (total int, list []*EnglishReportEmail, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_report_email WHERE view_total > 0 `
 	sql += condition
 	if order != "" {
@@ -209,18 +217,21 @@ func GetEnglishCompanyViewPageList(condition string, pars []interface{}, order s
 	}
 
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
+	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, pars, startSize, pageSize).Find(&list).Error
 	return
 }
 
 // MultiCreateEnglishEmail 批量新增英文邮箱/联系人
 func MultiCreateEnglishEmail(items []*EnglishReportEmail, logs []*EnglishReportEmailOpLog) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	tx, err := o.Begin()
+	//o := orm.NewOrmUsingDB("rddp")
+	//tx, err := o.Begin()
+	tx := global.DmSQL["rddp"].Begin()
 	if err != nil {
 		return
 	}
@@ -233,13 +244,15 @@ func MultiCreateEnglishEmail(items []*EnglishReportEmail, logs []*EnglishReportE
 	}()
 
 	// 新增联系人
-	_, err = tx.InsertMulti(len(items), items)
+	//	_, err = tx.InsertMulti(len(items), items)
+	err = tx.CreateInBatches(items, utils.MultiAddNum).Error
 	if err != nil {
 		return
 	}
 
 	// 新增日志
-	_, err = tx.InsertMulti(len(logs), logs)
+	//_, err = tx.InsertMulti(len(logs), logs)
+	err = tx.CreateInBatches(logs, utils.MultiAddNum).Error
 	return
 }
 
@@ -251,9 +264,10 @@ type EnglishReportEmailResendReq struct {
 
 // UpdateEnglishEmailEnabledByCompanyId 更新客户下所有联系人状态
 func UpdateEnglishEmailEnabledByCompanyId(companyId, enabled int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_report_email SET enabled = ? WHERE company_id = ?`
-	_, err = o.Raw(sql, enabled, companyId).Exec()
+	//	_, err = o.Raw(sql, enabled, companyId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, enabled, companyId).Error
 	return
 }
 
@@ -265,7 +279,7 @@ type EnglishReportMoveReq struct {
 
 // GetEnglishReportEmailListWithCompany 获取邮箱列表
 func GetEnglishReportEmailListWithCompany(condition string, pars []interface{}, order string) (list []*EnglishReportEmailRespItem, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.id,a.name,a.email,a.mobile,a.country_code,a.business_card_url,a.view_total,
 a.last_view_time,a.admin_id,a.admin_name,a.create_time,a.modify_time,a.enabled,a.status,
 b.company_name AS company_name,a.company_name AS register_company_name FROM english_report_email AS a LEFT JOIN 
@@ -276,13 +290,14 @@ b.company_name AS company_name,a.company_name AS register_company_name FROM engl
 	} else {
 		sql += ` ORDER BY create_time DESC`
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&list).Error
 	return
 }
 
 // GetEnCompanyIdsByKeyword 关键词获取英文客户IDs
 func GetEnCompanyIdsByKeyword(keyword string) (companyIds []int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT DISTINCT
 				a.company_id
 			FROM
@@ -290,6 +305,7 @@ func GetEnCompanyIdsByKeyword(keyword string) (companyIds []int, err error) {
 			JOIN english_company AS b ON a.company_id = b.company_id AND b.is_deleted = 0
 			WHERE
 				a.is_deleted = 0 AND a.status = 1 AND (a.email LIKE ? OR a.mobile LIKE ? OR b.company_name LIKE ?)`
-	_, err = o.Raw(sql, utils.GetLikeKeyword(keyword), utils.GetLikeKeyword(keyword), utils.GetLikeKeyword(keyword)).QueryRows(&companyIds)
+	//	_, err = o.Raw(sql, utils.GetLikeKeyword(keyword), utils.GetLikeKeyword(keyword), utils.GetLikeKeyword(keyword)).QueryRows(&companyIds)
+	err = global.DmSQL["rddp"].Raw(sql, utils.GetLikeKeyword(keyword), utils.GetLikeKeyword(keyword), utils.GetLikeKeyword(keyword)).Find(&companyIds).Error
 	return
 }

models/english_report_email_log.go

@@ -1,8 +1,8 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -18,19 +18,19 @@ const (
 
 // EnglishReportEmailLog 英文研报-邮件推送记录
 type EnglishReportEmailLog struct {
-	Id           int       `orm:"column(id);pk;auto" description:"邮箱ID"`
-	ReportId     int       `description:"报告ID或者线上路演ID"`
-	ReportType   int       `description:"类型：0英文研报，1英文线上路演"`
-	EmailId      int       `description:"邮箱ID"`
-	Email        string    `description:"邮箱地址"`
-	SendData     string    `description:"请求信息"`
-	Result       string    `description:"响应信息"`
-	SendStatus   int       `description:"发送状态：-1-已发送(一个中间状态,重新推送时可能会产生这种状态)；0-发送失败；1-发送成功"`
-	CreateTime   time.Time `description:"请求时间"`
-	Source       int       `description:"服务商：1-阿里云；2-腾讯云"`
-	IsDeleted    int       `description:"是否已删除: 0-正常; 1-已删除"`
-	CallbackData string    `description:"回调信息"`
-	ErrMsg       string    `description:"错误信息"`
+	Id           int       `gorm:"column:id;primary_key:true;auto_increment:true" description:"邮箱日志ID"`
+	ReportId     int       `gorm:"column:report_id" description:"报告ID或者线上路演ID"`
+	ReportType   int       `gorm:"column:report_type" description:"类型：0英文研报，1英文线上路演"`
+	EmailId      int       `gorm:"column:email_id" description:"邮箱ID"`
+	Email        string    `gorm:"column:email" description:"邮箱地址"`
+	SendData     string    `gorm:"column:send_data" description:"请求信息"`
+	Result       string    `gorm:"column:result" description:"响应信息"`
+	SendStatus   int       `gorm:"column:send_status" description:"发送状态：-1-已发送(一个中间状态,重新推送时可能会产生这种状态)；0-发送失败；1-发送成功"`
+	CreateTime   time.Time `gorm:"column:create_time" description:"请求时间"`
+	Source       int       `gorm:"column:source" description:"服务商：1-阿里云；2-腾讯云"`
+	IsDeleted    int       `gorm:"column:is_deleted" description:"是否已删除: 0-正常; 1-已删除"`
+	CallbackData string    `gorm:"column:callback_data" description:"回调信息"`
+	ErrMsg       string    `gorm:"column:err_msg" description:"错误信息"`
 }
 
 func (item *EnglishReportEmailLog) TableName() string {
@@ -38,36 +38,40 @@ func (item *EnglishReportEmailLog) TableName() string {
 }
 
 func (item *EnglishReportEmailLog) Create() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	id, e := o.Insert(item)
-	if e != nil {
-		err = e
-		return
-	}
-	item.Id = int(id)
+	//o := orm.NewOrmUsingDB("rddp")
+	//id, e := o.Insert(item)
+	//if e != nil {
+	//	err = e
+	//	return
+	//}
+	//item.Id = int(id)
+	err = global.DmSQL["rddp"].Create(item).Error
 	return
 }
 
 func (item *EnglishReportEmailLog) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(item, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(item, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }
 
 func (item *EnglishReportEmailLog) InsertMulti(items []*EnglishReportEmailLog) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.InsertMulti(len(items), items)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["rddp"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 // GetEnglishReportEmailLogList 获取日志列表
 func GetEnglishReportEmailLogList(condition string, pars []interface{}) (list []*EnglishReportEmailLog, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_report_email_log WHERE is_deleted = 0 `
 	if condition != `` {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&list).Error
 	return
 }
 
@@ -91,7 +95,7 @@ type EnglishReportEmailLogPageList struct {
 
 // GetEnglishReportEmailLogPageList 获取日志列表-分页
 func GetEnglishReportEmailLogPageList(condition string, pars []interface{}, order string, startSize, pageSize int) (total int, list []*EnglishReportEmailLog, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_report_email_log WHERE is_deleted = 0 `
 	sql += condition
 	if order != "" {
@@ -100,19 +104,22 @@ func GetEnglishReportEmailLogPageList(condition string, pars []interface{}, orde
 		sql += ` ORDER BY send_status ASC, create_time DESC`
 	}
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
+	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, pars, startSize, pageSize).Find(&list).Error
 	return
 }
 
 // GetEnglishReportEmailLogById 主键获取日志
 func GetEnglishReportEmailLogById(id int) (item *EnglishReportEmailLog, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_report_email_log WHERE is_deleted = 0 AND id = ? LIMIT 1`
-	err = o.Raw(sql, id).QueryRow(&item)
+	//err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
 	return
 }
 
@@ -121,10 +128,11 @@ func DeleteEnglishReportEmailLogByIds(logIds []int) (err error) {
 	if len(logIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM english_report_email_log WHERE id IN (` + utils.GetOrmInReplace(len(logIds)) + `)`
 	//sql := `UPDATE english_report_email_log SET is_deleted = 1 WHERE id IN (` + utils.GetOrmInReplace(len(logIds)) + `)`
-	_, err = o.Raw(sql, logIds).Exec()
+	//_, err = o.Raw(sql, logIds).Exec()
+	err = global.DmSQL["rddp"].Raw(sql, logIds).Exec(sql, logIds).Error
 	return
 }
 
@@ -136,36 +144,47 @@ type EnglishReportEmailLogFail struct {
 
 // GetEnglishReportEmailLogFailList 获取群发消息日志失败列表
 func GetEnglishReportEmailLogFailList(reportType int) (list []*EnglishReportEmailLogFail, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT 1 AS has_fail, report_id FROM english_report_email_log WHERE report_type=? and is_deleted = 0 AND send_status = 0 GROUP BY report_id`
-	_, err = o.Raw(sql, reportType).QueryRows(&list)
+	//_, err = o.Raw(sql, reportType).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, reportType).Find(&list).Error
 	return
 }
 
 // GetEnglishReportEmailLog 获取邮件推送日志
 func GetEnglishReportEmailLog(condition string, pars []interface{}) (item *EnglishReportEmailLog, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_report_email_log WHERE 1 = 1 `
 	sql += condition
 	sql += ` ORDER BY id DESC LIMIT 1`
-	err = o.Raw(sql, pars).QueryRow(&item)
+	//err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (item *EnglishReportEmailLog) MultiUpdateResult(items []*EnglishReportEmailLog) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	p, err := o.Raw("UPDATE english_report_email_log SET send_data = ?, result = ?, send_status = ?, err_msg = ? WHERE id = ?").Prepare()
-	if err != nil {
-		return
-	}
-	defer func() {
-		_ = p.Close()
-	}()
+	//o := orm.NewOrmUsingDB("rddp")
+	//p, err := o.Raw("UPDATE english_report_email_log SET send_data = ?, result = ?, send_status = ?, err_msg = ? WHERE id = ?").Prepare()
+	//if err != nil {
+	//	return
+	//}
+	//defer func() {
+	//	_ = p.Close()
+	//}()
+	//for _, v := range items {
+	//	_, err = p.Exec(v.SendData, v.Result, v.SendStatus, v.ErrMsg, v.Id)
+	//	if err != nil {
+	//		return
+	//	}
+	//}
+	tx := global.DmSQL["rddp"].Begin()
 	for _, v := range items {
-		_, err = p.Exec(v.SendData, v.Result, v.SendStatus, v.ErrMsg, v.Id)
+		err = tx.Exec("UPDATE english_report_email_log SET send_data = ?, result = ?, send_status = ?, err_msg = ? WHERE id = ?", v.SendData, v.Result, v.SendStatus, v.ErrMsg, v.Id).Error
 		if err != nil {
+			tx.Rollback()
 			return
 		}
 	}
+	tx.Commit()
 	return
 }

models/english_report_email_op_log.go

@@ -1,7 +1,8 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
+	"eta_gn/eta_api/utils"
 	"time"
 )
 
@@ -16,13 +17,13 @@ const (
 
 // EnglishReportEmailOpLog 英文邮箱/联系人-操作日志表
 type EnglishReportEmailOpLog struct {
-	Id         int       `orm:"column(id);pk"`
-	CompanyId  int       `description:"客户ID"`
-	EmailId    int       `description:"联系人ID"`
-	AdminId    int       `description:"操作人ID"`
-	OptionData string    `description:"操作数据-JSON"`
-	OptionType int       `description:"操作类型：1-新增；2-编辑；3-删除；4-导入"`
-	CreateTime time.Time `description:"创建时间"`
+	Id         int       `gorm:"column:id;primary_key:true" description:"日志ID"`
+	CompanyId  int       `gorm:"column:company_id" description:"客户ID"`
+	EmailId    int       `gorm:"column:email_id" description:"联系人ID"`
+	AdminId    int       `gorm:"column:admin_id" description:"操作人ID"`
+	OptionData string    `gorm:"column:option_data" description:"操作数据-JSON"`
+	OptionType int       `gorm:"column:option_type" description:"操作类型：1-新增；2-编辑；3-删除；4-导入"`
+	CreateTime time.Time `gorm:"column:create_time" description:"创建时间"`
 }
 
 func (item *EnglishReportEmailOpLog) TableName() string {
@@ -30,23 +31,26 @@ func (item *EnglishReportEmailOpLog) TableName() string {
 }
 
 func (item *EnglishReportEmailOpLog) Create() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	id, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.Id = int(id)
+	//o := orm.NewOrmUsingDB("rddp")
+	//id, err := o.Insert(item)
+	//if err != nil {
+	//	return
+	//}
+	//item.Id = int(id)
+	err = global.DmSQL["rddp"].Create(item).Error
 	return
 }
 
 func (item *EnglishReportEmailOpLog) MultiCreate(items []*EnglishReportEmailOpLog) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.InsertMulti(len(items), items)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["rddp"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (item *EnglishReportEmailOpLog) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(item, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(item, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }

models/english_report_email_pv.go

@@ -1,19 +1,20 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"time"
 
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 // EnglishReportEmailPV 英文研报-邮箱pv
+
 type EnglishReportEmailPV struct {
-	Id         int       `orm:"column(id);pk;auto"`
-	ReportId   int       `description:"英文报告ID"`
-	EmailId    int       `description:"邮箱ID"`
-	ReportType int       `description:"类型：0英文研报，1英文线上路演"`
-	CreateTime time.Time `description:"创建时间"`
+	Id         int       `gorm:"column:id;primary_key:true;auto_increment:true" description:"日志ID"`
+	ReportId   int       `gorm:"column:report_id" description:"英文报告ID"`
+	EmailId    int       `gorm:"column:email_id" description:"邮箱ID"`
+	ReportType int       `gorm:"column:report_type" description:"类型：0英文研报，1英文线上路演"`
+	CreateTime time.Time `gorm:"column:create_time" description:"创建时间"`
 }
 
 func (item *EnglishReportEmailPV) TableName() string {
@@ -21,8 +22,9 @@ func (item *EnglishReportEmailPV) TableName() string {
 }
 
 func (item *EnglishReportEmailPV) Create() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Insert(item)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Insert(item)
+	err = global.DmSQL["rddp"].Create(item).Error
 	return
 }
 
@@ -52,7 +54,7 @@ type EnglishReportEmailUvResp struct {
 
 // GetEnglishReportEmailPageList 获取邮箱pv列表-分页
 func GetEnglishReportEmailPvPageList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*EnglishReportEmailPvResp, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT
 				b.name,
 				b.email,
@@ -68,18 +70,19 @@ func GetEnglishReportEmailPvPageList(condition string, pars []interface{}, start
 	sql += ` GROUP BY a.email_id `
 
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
+	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` ORDER BY recent_click_time DESC LIMIT ?,?`
-
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, pars, startSize, pageSize).Find(&list).Error
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
 	return
 }
 
 // GetEnglishReportEmailUvPageList 获取邮箱uv列表-分页
 func GetEnglishReportEmailUvPageList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*EnglishReportEmailUvResp, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT
 				b.name,
 				b.email,
@@ -94,12 +97,13 @@ func GetEnglishReportEmailUvPageList(condition string, pars []interface{}, start
 	sql += ` GROUP BY a.email_id `
 
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
+	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` ORDER BY recent_click_time DESC LIMIT ?,?`
-
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, pars, startSize, pageSize).Find(&list).Error
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
 	return
 }
 
@@ -121,7 +125,7 @@ type EnglishEmailViewResp struct {
 
 // todo GetEnglishEmailPageList 获取英文邮箱/联系人阅读列表-分页
 func GetEnglishEmailViewPageList(condition string, pars []interface{}, orderRule string, startSize, pageSize int) (total int, list []*EnglishEmailViewResp, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT
 				report_id,
                 report_type as click_type,
@@ -137,14 +141,15 @@ func GetEnglishEmailViewPageList(condition string, pars []interface{}, orderRule
 	sql += ` GROUP BY report_id, report_type`
 
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
+	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
 		return
 	}
 	if orderRule != `` {
 		sql += orderRule
 	}
 	sql += ` LIMIT ?,?`
-
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, pars, startSize, pageSize).Find(&list).Error
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
 	return
 }

models/english_video.go

@@ -1,50 +1,52 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"strings"
 	"time"
 
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 type EnglishVideo struct {
-	Id                 int       `orm:"column(id);pk;auto" description:"路演视频Id"`
-	ClassifyIdFirst    int       `description:"一级分类id"`
-	ClassifyNameFirst  string    `description:"一级分类名称"`
-	ClassifyIdSecond   int       `description:"二级分类id"`
-	ClassifyNameSecond string    `description:"二级分类名称"`
-	Title              string    `description:"标题"`
-	Abstract           string    `description:"摘要"`
-	Author             string    `description:"作者"`
-	CreateTime         time.Time `description:"创建时间"`
-	ModifyTime         time.Time `description:"修改时间"`
-	State              int       `description:"1:未发布，2:已发布"`
-	PublishTime        time.Time `description:"发布时间"`
-	VideoUrl           string    `description:"视频文件URL"`
-	VideoCoverUrl      string    `description:"视频文件封面地址"`
-	VideoSeconds       string    `description:"视频时长"`
-	VideoCode          string    `description:"报告唯一编码"`
-	Pv                 int       `description:"Pv"`
-	PvEmail            int       `description:"邮箱PV"`
-	UvEmail            int       `description:"邮箱UV"`
-	EmailState         int       `description:"群发邮件状态: 0-未发送; 1-已发送"`
-	Overview           string    `description:"英文概述部分"`
-	AdminId            int       `description:"上传视频的管理员账号"`
-	AdminRealName      string    `description:"上传视频的管理员姓名"`
+	Id                 int       `gorm:"column:id;primary_key:true;auto_increment:true" description:"路演视频Id"`
+	ClassifyIdFirst    int       `gorm:"column:classify_id_first" description:"一级分类id"`
+	ClassifyNameFirst  string    `gorm:"column:classify_name_first" description:"一级分类名称"`
+	ClassifyIdSecond   int       `gorm:"column:classify_id_second" description:"二级分类id"`
+	ClassifyNameSecond string    `gorm:"column:classify_name_second" description:"二级分类名称"`
+	Title              string    `gorm:"column:title" description:"标题"`
+	Abstract           string    `gorm:"column:abstract" description:"摘要"`
+	Author             string    `gorm:"column:author" description:"作者"`
+	CreateTime         time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime         time.Time `gorm:"column:modify_time" description:"修改时间"`
+	State              int       `gorm:"column:state" description:"1:未发布，2:已发布"`
+	PublishTime        time.Time `gorm:"column:publish_time" description:"发布时间"`
+	VideoUrl           string    `gorm:"column:video_url" description:"视频文件URL"`
+	VideoCoverUrl      string    `gorm:"column:video_cover_url" description:"视频文件封面地址"`
+	VideoSeconds       string    `gorm:"column:video_seconds" description:"视频时长"`
+	VideoCode          string    `gorm:"column:video_code" description:"报告唯一编码"`
+	Pv                 int       `gorm:"column:pv" description:"Pv"`
+	PvEmail            int       `gorm:"column:pv_email" description:"邮箱PV"`
+	UvEmail            int       `gorm:"column:uv_email" description:"邮箱UV"`
+	EmailState         int       `gorm:"column:email_state" description:"群发邮件状态: 0-未发送; 1-已发送"`
+	Overview           string    `gorm:"column:overview" description:"英文概述部分"`
+	AdminId            int       `gorm:"column:admin_id" description:"上传视频的管理员账号"`
+	AdminRealName      string    `gorm:"column:admin_real_name" description:"上传视频的管理员姓名"`
 }
 
 func AddEnglishVideo(item *EnglishVideo) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Insert(item)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Insert(item)
+	err = global.DmSQL["rddp"].Create(item).Error
 	return
 }
 
 func ModifyEnglishVideoCode(id int, VideoCode string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_video SET video_code=? WHERE id=? `
-	_, err = o.Raw(sql, VideoCode, id).Exec()
+	//_, err = o.Raw(sql, VideoCode, id).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, VideoCode, id).Error
 	return
 }
 
@@ -90,7 +92,7 @@ type ElasticEnglishVideoDetail struct {
 }
 
 func EditEnglishVideo(item *EnglishVideo, Id int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_video
 			SET
 			  classify_id_first =?,
@@ -106,8 +108,11 @@ func EditEnglishVideo(item *EnglishVideo, Id int) (err error) {
               video_cover_url = ?,
               video_seconds = ?
 			WHERE id = ? `
-	_, err = o.Raw(sql, item.ClassifyIdFirst, item.ClassifyNameFirst, item.ClassifyIdSecond, item.ClassifyNameSecond, item.Title,
-		item.Abstract, item.State, time.Now(), item.Overview, item.VideoUrl, item.VideoCoverUrl, item.VideoSeconds, Id).Exec()
+	//_, err = o.Raw(sql, item.ClassifyIdFirst, item.ClassifyNameFirst, item.ClassifyIdSecond, item.ClassifyNameSecond, item.Title,
+
+	//	item.Abstract, item.State, time.Now(), item.Overview, item.VideoUrl, item.VideoCoverUrl, item.VideoSeconds, Id).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, item.ClassifyIdFirst, item.ClassifyNameFirst, item.ClassifyIdSecond, item.ClassifyNameSecond, item.Title,
+		item.Abstract, item.State, time.Now(), item.Overview, item.VideoUrl, item.VideoCoverUrl, item.VideoSeconds, Id).Error
 	return
 }
 
@@ -134,16 +139,18 @@ type EnglishVideoDetail struct {
 }
 
 func GetEnglishVideoById(Id int) (item *EnglishVideoDetail, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_video WHERE id=?`
-	err = o.Raw(sql, Id).QueryRow(&item)
+	//err = o.Raw(sql, Id).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, Id).First(&item).Error
 	return
 }
 
 func GetEnglishVideoItemById(Id int) (item *EnglishVideo, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM english_video WHERE id = ? LIMIT 1`
-	err = o.Raw(sql, Id).QueryRow(&item)
+	//err = o.Raw(sql, Id).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, Id).First(&item).Error
 	return
 }
 
@@ -186,17 +193,18 @@ type EnglishVideoReq struct {
 
 func GetEnglishVideoListCount(condition string, pars []interface{}) (count int, err error) {
 	//产品权限
-	oRddp := orm.NewOrmUsingDB("rddp")
+	//	oRddp := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COUNT(1) AS count  FROM english_video WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = oRddp.Raw(sql, pars).QueryRow(&count)
+	//err = oRddp.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func GetEnglishVideoList(condition string, pars []interface{}, startSize, pageSize int) (items []*EnglishVideoList, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 
 	sql := `SELECT * 
         FROM english_video WHERE 1=1  `
@@ -204,53 +212,59 @@ func GetEnglishVideoList(condition string, pars []interface{}, startSize, pageSi
 		sql += condition
 	}
 	sql += `ORDER BY  modify_time DESC LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, pars, startSize, pageSize).Find(&items).Error
 	return
 }
 
 func GetEnglishVideoByCondition(condition string, pars []interface{}) (items []*EnglishVideo, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * 
         FROM english_video WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
 	return
 }
 
 // 发布报告
 func PublishEnglishVideoById(Id int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_video SET state=2,publish_time=now(),modify_time=NOW() WHERE id = ? `
-	_, err = o.Raw(sql, Id).Exec()
+	//_, err = o.Raw(sql, Id).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, Id).Error
 	return
 }
 
 // 取消发布报告
 func PublishCancelEnglishVideo(Ids int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := ` UPDATE english_video SET state=1,publish_time=null WHERE id =?  `
-	_, err = o.Raw(sql, Ids).Exec()
+	//_, err = o.Raw(sql, Ids).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, Ids).Error
 	return
 }
 
 // DeleteEnglishVideo 删除路演视频
 func DeleteEnglishVideo(Id int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := ` DELETE FROM english_video WHERE id=? `
-	_, err = o.Raw(sql, Id).Exec()
+	//_, err = o.Raw(sql, Id).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, Id).Error
 	return
 }
 
 func UpdateEnglishVideoClassifyByFirstSecondClassifyId(classifyId, parentId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	// 更新相关联的二级分类的parentId,和classify_name_second
 	sql := `update english_video r
 LEFT JOIN english_classify c ON r.classify_id_second = c.id
 SET r.classify_id_first=c.parent_id, r.classify_name_second=c.classify_name
 where (r.classify_id_first != c.parent_id or r.classify_name_second != c.classify_name) and r.classify_id_second =?`
-	_, err = o.Raw(sql, classifyId).Exec()
+	//_, err = o.Raw(sql, classifyId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, classifyId).Error
 	if err != nil {
 		return
 	}
@@ -259,7 +273,8 @@ where (r.classify_id_first != c.parent_id or r.classify_name_second != c.classif
     LEFT JOIN english_classify c ON r.classify_id_first = c.id
     SET r.classify_name_first=c.classify_name
 where r.classify_name_first	!= c.classify_name and r.classify_id_first=?`
-	_, err = o.Raw(sql, parentId).Exec()
+	//_, err = o.Raw(sql, parentId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, parentId).Error
 	if err != nil {
 		return
 	}
@@ -268,50 +283,56 @@ where r.classify_name_first	!= c.classify_name and r.classify_id_first=?`
     LEFT JOIN english_classify c ON r.classify_id_first = c.id
     SET r.classify_name_first=c.classify_name
 where r.classify_name_first	!= c.classify_name and r.classify_id_first=?`
-	_, err = o.Raw(sql, classifyId).Exec()
+	//_, err = o.Raw(sql, classifyId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, classifyId).Error
 	return
 }
 
 // Update 更新
 func (item *EnglishVideo) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(item, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(item, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }
 
 func GetEnglishVideoCounts(classifyId, parentId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ``
 	if parentId == 0 {
 		sql = `SELECT COUNT(1) AS count FROM english_video WHERE classify_id_first=? `
 	} else {
 		sql = `SELECT COUNT(1) AS count FROM english_video WHERE classify_id_second=? `
 	}
-	err = o.Raw(sql, classifyId).QueryRow(&count)
+	//	err = o.Raw(sql, classifyId).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, classifyId).Scan(&count).Error
 	return
 }
 
 // UpdateEnglishVideoSecondClassifyNameByClassifyId 更新报告分类名称字段
 func UpdateEnglishVideoSecondClassifyNameByClassifyId(classifyId int, classifyName string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := " UPDATE english_video SET classify_name_second = ? WHERE classify_id_second = ? "
-	_, err = o.Raw(sql, classifyName, classifyId).Exec()
+	//_, err = o.Raw(sql, classifyName, classifyId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, classifyName, classifyId).Error
 	return
 }
 
 // UpdateEnglishVideoFirstClassifyNameByClassifyId 更新报告分类名称字段
 func UpdateEnglishVideoFirstClassifyNameByClassifyId(classifyId int, classifyName string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := " UPDATE english_video SET classify_name_first = ? WHERE classify_id_first = ? "
-	_, err = o.Raw(sql, classifyName, classifyId).Exec()
+	//_, err = o.Raw(sql, classifyName, classifyId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, classifyName, classifyId).Error
 	return
 }
 
 // UpdateEnglishVideoFirstClassifyNameByClassifyId 更新报告分类名称字段
 func UpdateEnglishVideoByClassifyId(classifyFirstName, classifySecondName string, firstClassifyId, secondClassifyId int, ids string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := " UPDATE english_video SET classify_name_first = ?,classify_name_second = ?,classify_id_first=?, classify_id_second =?  WHERE id IN (" + ids + ") "
-	_, err = o.Raw(sql, classifyFirstName, classifySecondName, firstClassifyId, secondClassifyId).Exec()
+	//_, err = o.Raw(sql, classifyFirstName, classifySecondName, firstClassifyId, secondClassifyId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, classifyFirstName, classifySecondName, firstClassifyId, secondClassifyId).Error
 	return
 }
 
@@ -325,8 +346,9 @@ func GetEnglishVideoByIds(Ids []int, fieldArr []string) (list []*EnglishVideo, e
 	if len(fieldArr) > 0 {
 		fields = strings.Join(fieldArr, ",")
 	}
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT ` + fields + ` FROM english_video WHERE id IN (` + utils.GetOrmInReplace(listLen) + `)`
-	_, err = o.Raw(sql, Ids).QueryRows(&list)
+	//_, err = o.Raw(sql, Ids).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, Ids).Find(&list).Error
 	return
 }