Merge branch 'dm' of http://8.136.199.33:3000/eta_gn_server/eta_task into dm

global/dm.go

@@ -34,13 +34,15 @@ func InitDm() {
 	})
 
 	// 默认库
-	connectDm("dm://SYSDBA:SYSDBA001@8.136.199.33:30238?schema=\"eta_index\"", "default", newLogger, dmSqlMap, true)
+	connectDm(utils.MYSQL_URL, "default", newLogger, dmSqlMap, true)
 	// 手工数据库
-	connectDm("dm://SYSDBA:SYSDBA001@8.136.199.33:30238?schema=\"eta_manual_index\"", "edb", newLogger, dmSqlMap, false)
+	connectDm(utils.MYSQL_URL_EDB, "edb", newLogger, dmSqlMap, false)
 	// eta主库
-	connectDm("dm://SYSDBA:SYSDBA001@8.136.199.33:30238?schema=\"eta_master\"", "master", newLogger, dmSqlMap, false)
+	connectDm(utils.MYSQL_URL, "master", newLogger, dmSqlMap, true)
+	// 指标库
+	connectDm(utils.MYSQL_URL_DATA, "data", newLogger, dmSqlMap, false)
 	// 钢联库
-	connectDm("dm://SYSDBA:SYSDBA001@8.136.199.33:30238?schema=\"eta_gl\"", "gl", newLogger, dmSqlMap, false)
+	connectDm(utils.MYSQL_URL_GL, "gl", newLogger, dmSqlMap, false)
 
 	/*initDm(utils.MYSQL_URL, "default", newLogger, dmSqlMap, true)
 	initDm(utils.MYSQL_URL_EDB, "edb", newLogger, dmSqlMap, true)

go.mod

@@ -16,6 +16,7 @@ require (
 	github.com/shopspring/decimal v1.3.1
 	golang.org/x/net v0.21.0
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
+	gorm.io/gorm v1.25.12
 )
 
 require (
@@ -24,6 +25,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
@@ -45,5 +47,4 @@ require (
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gorm.io/gorm v1.25.12 // indirect
 )

go.sum

@@ -78,6 +78,7 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=

models/admin.go

@@ -1,6 +1,8 @@
 package models
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta_gn/eta_task/global"
+)
 
 type Admin struct {
 	AdminId      int
@@ -19,8 +21,11 @@ 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)
+
 	sql := `SELECT * FROM admin WHERE admin_id=? `
-	err = orm.NewOrm().Raw(sql, adminId).QueryRow(&item)
+	err = global.DEFAULT_DmSQL.Raw(sql, adminId).Find(&item).Error
 	return
 }
 
@@ -40,8 +45,8 @@ type AdminView struct {
 	Position     string `description:"职位"`
 }
 
-func GetAdminList() (list []*AdminView, err error) {
-	sql := `SELECT * FROM admin `
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&list)
-	return
-}
+//func GetAdminList() (list []*AdminView, err error) {
+//	sql := `SELECT * FROM admin `
+//	_, err = orm.NewOrm().Raw(sql).QueryRows(&list)
+//	return
+//}

models/admin_operate_record.go

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

models/business_conf.go

@@ -1,8 +1,9 @@
 package models
 
 import (
+	"eta_gn/eta_task/global"
+	"eta_gn/eta_task/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"html"
 	"strings"
 	"time"
@@ -37,12 +38,13 @@ func (m *BusinessConf) PrimaryId() string {
 }
 
 func (m *BusinessConf) Create() (err error) {
-	o := orm.NewOrmUsingDB("eta")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.Id = int(id)
+	//o := orm.NewOrmUsingDB("eta")
+	//id, err := o.Insert(m)
+	//if err != nil {
+	//	return
+	//}
+	//m.Id = int(id)
+	err = global.DmSQL["eta"].Create(m).Error
 	return
 }
 
@@ -50,47 +52,73 @@ func (m *BusinessConf) CreateMulti(items []*BusinessConf) (err error) {
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("eta")
-	_, err = o.InsertMulti(len(items), items)
+	//o := orm.NewOrmUsingDB("eta")
+	//_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["eta"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *BusinessConf) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("eta")
-	_, err = o.Update(m, cols...)
+	//o := orm.NewOrmUsingDB("eta")
+	//_, err = o.Update(m, cols...)
+	err = global.DmSQL["eta"].Select(cols).Updates(m).Error
 	return
 }
 
 func (m *BusinessConf) Del() (err error) {
-	o := orm.NewOrmUsingDB("eta")
+	//o := orm.NewOrmUsingDB("eta")
+	//sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
+	//_, err = o.Raw(sql, m.Id).Exec()
+
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	_, err = o.Raw(sql, m.Id).Exec()
+	err = global.DmSQL["eta"].Exec(sql, m.Id).Error
+
 	return
 }
 
 func (m *BusinessConf) GetItemById(id int) (item *BusinessConf, err error) {
-	o := orm.NewOrmUsingDB("eta")
+	//o := orm.NewOrmUsingDB("eta")
+	//sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
+	//err = o.Raw(sql, id).QueryRow(&item)
+
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["eta"].Raw(sql, id).Find(&item).Error
 	return
 }
 
 func (m *BusinessConf) GetItemByCondition(condition string, pars []interface{}) (item *BusinessConf, err error) {
-	o := orm.NewOrmUsingDB("eta")
+	//o := orm.NewOrmUsingDB("eta")
+	//sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
+	//err = o.Raw(sql, pars).QueryRow(&item)
+
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DmSQL["eta"].Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *BusinessConf) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("eta")
-	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	//o := orm.NewOrmUsingDB("eta")
+	//sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
+	//err = o.Raw(sql, pars).QueryRow(&count)
+
+	sql := fmt.Sprintf(`SELECT COUNT(1) AS count FROM %s WHERE 1=1 %s`, m.TableName(), condition)
+	err = global.DmSQL["eta"].Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func (m *BusinessConf) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BusinessConf, err error) {
-	o := orm.NewOrmUsingDB("eta")
+	//o := orm.NewOrmUsingDB("eta")
+	//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 = o.Raw(sql, pars).QueryRows(&items)
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -100,12 +128,23 @@ func (m *BusinessConf) GetItemsByCondition(condition string, pars []interface{},
 		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 = global.DmSQL["eta"].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) {
-	o := orm.NewOrmUsingDB("eta")
+	//o := orm.NewOrmUsingDB("eta")
+	//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 = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -115,7 +154,7 @@ func (m *BusinessConf) GetPageItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["eta"].Raw(sql, pars, startSize, pageSize).Find(&items).Error
 	return
 }
 
@@ -124,9 +163,15 @@ func GetBusinessConf() (list map[string]string, err error) {
 	list = make(map[string]string)
 
 	var items []*BusinessConf
-	o := orm.NewOrmUsingDB("eta")
+	//o := orm.NewOrmUsingDB("eta")
+	//sql := `SELECT * FROM business_conf`
+	//_, err = o.Raw(sql).QueryRows(&items)
+	//if err != nil {
+	//	return
+	//}
+
 	sql := `SELECT * FROM business_conf`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["eta"].Raw(sql).Find(&items).Error
 	if err != nil {
 		return
 	}
@@ -147,29 +192,32 @@ type BusinessConfUpdate struct {
 	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
-}
+//// 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")
+	//o := orm.NewOrmUsingDB("eta")
+	//sql := fmt.Sprintf(`SELECT * FROM %s WHERE conf_key = ? LIMIT 1`, m.TableName())
+	//err = o.Raw(sql, key).QueryRow(&item)
+
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE conf_key = ? LIMIT 1`, m.TableName())
-	err = o.Raw(sql, key).QueryRow(&item)
+	err = global.DmSQL["eta"].Raw(sql, key).First(&item).Error
 	return
 }
 

models/classify.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -41,91 +41,95 @@ type ClassifyAddReq struct {
 	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 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
-}
+	//sql := `SELECT * FROM classify WHERE id=? `
+	//o := orm.NewOrmUsingDB("rddp")
+	//err = o.Raw(sql, classifyId).QueryRow(&item)
 
-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)
+	err = global.DmSQL["data"].Raw(sql, classifyId).Find(&item).Error
 	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:"分类名称"`
@@ -144,60 +148,61 @@ type ClassifyListResp struct {
 	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
-}
+//
+//// 获取分类列表
+//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"`
@@ -232,14 +237,14 @@ 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)
-	return
-}
+//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)
+//	return
+//}

models/db.go

@@ -13,7 +13,7 @@ import (
 	"github.com/beego/beego/v2/client/orm"
 )
 
-func init() {
+func initback() {
 
 	_ = orm.RegisterDataBase("default", "mysql", utils.MYSQL_URL)
 	orm.SetMaxIdleConns("default", 50)

models/edbinfo_send_msg_record.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -13,14 +13,15 @@ type EdbinfoSendMsgRecord struct {
 }
 
 func AddEdbinfoSendMsgRecord(item *EdbinfoSendMsgRecord) (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 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)
-	return
-}
+//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)
+//	return
+//}

models/english_report.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 )
 
 type EnglishReport struct {
@@ -91,38 +91,51 @@ type ElasticEnglishReportDetail struct {
 
 // GetPrePublishedEnglishReports 获取定时发布时间为当前时间的未发布的英文报告列表
 func GetPrePublishedEnglishReports(startTime, endTime, afterDate string) (list []*EnglishReport, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//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)
+
 	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 = global.DmSQL["rddp"].Raw(sql, startTime, endTime, afterDate).Find(&list).Error
 	return
 }
 
 // PublishEnglishReportById 发布报告
 func PublishEnglishReportById(reportId int, publishTime string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `UPDATE english_report SET state=2, publish_time=?, modify_time=NOW() WHERE id = ? `
+	//_, err = o.Raw(sql, publishTime, reportId).Exec()
+
 	sql := `UPDATE english_report SET state=2, publish_time=?, modify_time=NOW() WHERE id = ? `
-	_, err = o.Raw(sql, publishTime, reportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, publishTime, reportId).Error
 	return
 }
 
 func GetEnglishReportById(reportId int) (item *EnglishReportDetail, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `SELECT * FROM english_report WHERE id=?`
+	//err = o.Raw(sql, reportId).QueryRow(&item)
+
 	sql := `SELECT * FROM english_report WHERE id=?`
-	err = o.Raw(sql, reportId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).First(&item).Error
 	return
 }
 
 // GetReportByReportId 主键获取报告
 func GetReportByReportId(reportId int) (item *Report, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `SELECT * FROM report WHERE id = ?`
+	//err = o.Raw(sql, reportId).QueryRow(&item)
+
 	sql := `SELECT * FROM report WHERE id = ?`
-	err = o.Raw(sql, reportId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&item).Error
 	return
 }
 
 // Update 更新
 func (item *EnglishReport) 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["data"].Select(cols).Updates(item).Error
 	return
 }

models/fe_calendar/fe_calendar_matter.go

@@ -1,8 +1,8 @@
 package fe_calendar
 
 import (
+	"eta_gn/eta_task/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -84,25 +84,46 @@ func (m *FeCalendarMatter) PrimaryId() string {
 }
 
 func (m *FeCalendarMatter) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FeCalendarMatter, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//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)
+
 	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 = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *FeCalendarMatter) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
+	//err = o.Raw(sql, pars).QueryRow(&count)
+
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["data"].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 := orm.NewOrmUsingDB("data")
+	//fields := strings.Join(fieldArr, ",")
+	//if len(fieldArr) == 0 {
+	//	fields = `*`
+	//}
+	//order := fmt.Sprintf(`ORDER BY %s DESC`, FeCalendarMatterCols.CreateTime)
+	//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 = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -112,6 +133,6 @@ 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)
+	err = global.DmSQL["data"].Raw(sql, pars, startSize, pageSize).Find(&items).Error
 	return
 }

models/index_notice.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -17,9 +17,12 @@ 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)
+
 	sql := `SELECT * FROM edbinfo WHERE frequency!="日度" AND notice_time<>'' and user_id>0 `
-	o := orm.NewOrmUsingDB("edb")
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["edb"].Raw(sql).Find(&items).Error
 	return
 }
 
@@ -32,8 +35,11 @@ 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)
+
 	sql := `SELECT * FROM edbdata WHERE TRADE_CODE=? order by DT desc `
-	o := orm.NewOrmUsingDB("edb")
-	err = o.Raw(sql, tradeCode).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, tradeCode).Find(&item).Error
 	return
 }

models/report.go

@@ -1,9 +1,7 @@
 package models
 
 import (
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -39,67 +37,74 @@ 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
-}
+//
+//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 := orm.NewOrmUsingDB("rddp")
+	//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)
+
 	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 = global.DmSQL["rddp"].Raw(sql, startTime, endTime, afterDate).Find(&list).Error
 	return
 }
 
 // PublishReportById 发布报告
 func PublishReportById(reportId int, publishTime time.Time) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `UPDATE report SET state = 2, publish_time = ?, modify_time = NOW() WHERE id = ? `
+	//_, err = o.Raw(sql, publishTime, reportId).Exec()
+
 	sql := `UPDATE report SET state = 2, publish_time = ?, modify_time = NOW() WHERE id = ? `
-	_, err = o.Raw(sql, publishTime, reportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, publishTime, reportId).Error
 	return
 }
 
@@ -133,9 +138,12 @@ type ReportDetail struct {
 }
 
 func ModifyReportVideo(reportId int, videoUrl, videoName, videoSize string, playSeconds float64) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//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()
+
 	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 = global.DmSQL["rddp"].Exec(sql, videoUrl, videoName, playSeconds, videoSize, reportId).Error
 	return
 }
 
@@ -149,13 +157,14 @@ type ReportChapterTypePermission struct {
 	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)
-	return
-}
+//
+//// 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)
+//	return
+//}
 
 type ElasticReportDetail struct {
 	ReportId           int    `description:"报告ID"`
@@ -182,60 +191,98 @@ type ChartPermissionMappingIdName struct {
 }
 
 func GetChartPermissionNameFromMappingByKeyword(source string, classifyId int) (list []*ChartPermissionMappingIdName, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//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)
+
 	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 = global.DmSQL["rddp"].Raw(sql, source, classifyId).Find(&list).Error
 	return
 }
 
 func UpdateReportPublishTime(reportId int, videoNameDate string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql1 := ` UPDATE report SET publish_time = NOW() WHERE id = ?  `
+	//_, err = o.Raw(sql1, reportId).Exec()
+	//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()
+
 	sql1 := ` UPDATE report SET publish_time = NOW() WHERE id = ?  `
-	_, err = o.Raw(sql1, reportId).Exec()
+	err = global.DmSQL["rddp"].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 = global.DmSQL["rddp"].Exec(sql2, reportId).Error
 	return
 }
 
 func UpdateReportChapterPublishTime(reportId int, videoNameDate string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql1 := ` UPDATE report_chapter SET publish_time = NOW() WHERE report_id = ? `
+	//_, err = o.Raw(sql1, reportId).Exec()
+	//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()
+
 	sql1 := ` UPDATE report_chapter SET publish_time = NOW() WHERE report_id = ? `
-	_, err = o.Raw(sql1, reportId).Exec()
+	err = global.DmSQL["rddp"].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 = global.DmSQL["rddp"].Exec(sql2, reportId).Error
 	return
 }
 
 func ModifyReportMsgIsSend(reportId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//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()
+
 	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 = global.DmSQL["rddp"].Exec(sql, reportId).Error
 	return
 }
 
 // ClearReportSaveLog 清理报告保存日志
 func ClearReportSaveLog(date string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `DELETE FROM report_save_log WHERE create_time <= ?`
+	//_, err = o.Raw(sql, date).Exec()
+
 	sql := `DELETE FROM report_save_log WHERE create_time <= ?`
-	_, err = o.Raw(sql, date).Exec()
+	err = global.DmSQL["rddp"].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 := orm.NewOrmUsingDB("rddp")
+	//to, err := o.Begin()
+	//if err != nil {
+	//	return
+	//}
+	//defer func() {
+	//	if err != nil {
+	//		_ = to.Rollback()
+	//	} else {
+	//		_ = to.Commit()
+	//	}
+	//}()
+
+	to := global.DmSQL["rddp"].Begin()
+
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -243,17 +290,21 @@ func PublishReportAndChapter(reportInfo *Report, isPublishReport bool, cols []st
 			_ = to.Commit()
 		}
 	}()
+
 	// 更新报告
 	if isPublishReport {
-		_, err = to.Update(reportInfo, cols...)
+		err = to.Select(cols).Updates(reportInfo).Error
 		if err != nil {
 			return
 		}
 	}
 
 	// 发布该报告的所有章节
+	//sql := ` UPDATE report_chapter SET publish_state = 2, publish_time = ? WHERE report_id = ?  `
+	//_, err = to.Raw(sql, reportInfo.PublishTime, reportInfo.Id).Exec()
+
 	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 {

models/report/report_chapter_permission_mapping.go

@@ -1,8 +1,8 @@
 package report
 
 import (
+	"eta_gn/eta_task/global"
 	"eta_gn/eta_task/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -11,7 +11,7 @@ import (
 type ReportChapterPermissionMapping struct {
 	ReportChapterPermissionMappingId int `orm:"column(report_chapter_permission_mapping_id)"`
 	ReportChapterId                  int `description:"报告章节的id"` // 报告章节的id
-	ChartPermissionId                int `description:"权限id"`       // 权限id
+	ChartPermissionId                int `description:"权限id"`    // 权限id
 	CreateTime                       time.Time
 }
 
@@ -24,11 +24,20 @@ 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 := orm.NewOrmUsingDB("rddp")
+	//to, err := o.Begin()
+	//if err != nil {
+	//	return
+	//}
+	//defer func() {
+	//	if err != nil {
+	//		_ = to.Rollback()
+	//	} else {
+	//		_ = to.Commit()
+	//	}
+	//}()
+	to := global.DmSQL["rddp"].Begin()
+
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -36,16 +45,21 @@ func (m ReportChapterPermissionMapping) MultiAddReportChapterPermissionMappingPe
 			_ = to.Commit()
 		}
 	}()
-
 	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.InsertMulti(500, list)
+		//if tmpErr != nil {
+		//	err = tmpErr
+		//	return
+		//}
+
+		tmpErr := to.CreateInBatches(list, utils.MultiAddNum).Error
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -64,10 +78,12 @@ func (m ReportChapterPermissionMapping) MultiAddReportChapterPermissionMappingPe
 // @return list []*ReportChapterPermissionMapping
 // @return err error
 func (m ReportChapterPermissionMapping) GetPermissionListById(reportChapterId int) (list []*ReportChapterPermissionMapping, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM report_chapter_permission_mapping WHERE report_chapter_id=? `
-	_, err = o.Raw(sql, reportChapterId).QueryRows(&list)
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `SELECT * FROM report_chapter_permission_mapping WHERE report_chapter_id=? `
+	//_, err = o.Raw(sql, reportChapterId).QueryRows(&list)
 
+	sql := `SELECT * FROM report_chapter_permission_mapping WHERE report_chapter_id=? `
+	err = global.DmSQL["rddp"].Raw(sql, reportChapterId).Find(&list).Error
 	return
 }
 
@@ -90,11 +106,14 @@ type ReportChapterPermissionItem struct {
 // @return list []*ReportChapterPermissionMapping
 // @return err error
 func (m ReportChapterPermissionMapping) GetPermissionItemListById(reportChapterId int) (list []*ReportChapterPermissionItem, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	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)
+	//o := orm.NewOrmUsingDB("rddp")
+	//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)
 
+	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 = global.DmSQL["data"].Raw(sql, reportChapterId).Find(&list).Error
 	return
 }
 
@@ -112,10 +131,12 @@ func (m ReportChapterPermissionMapping) GetPermissionListByIdList(reportChapterI
 		return
 	}
 
-	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM report_chapter_permission_mapping WHERE report_chapter_id in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, reportChapterIdList).QueryRows(&list)
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `SELECT * FROM report_chapter_permission_mapping WHERE report_chapter_id in (` + utils.GetOrmInReplace(num) + `) `
+	//_, err = o.Raw(sql, reportChapterIdList).QueryRows(&list)
 
+	sql := `SELECT * FROM report_chapter_permission_mapping WHERE report_chapter_id in (` + utils.GetOrmInReplace(num) + `) `
+	err = global.DmSQL["data"].Raw(sql, reportChapterIdList).Find(&list).Error
 	return
 }
 
@@ -127,11 +148,20 @@ 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 := orm.NewOrmUsingDB("rddp")
+	//to, err := o.Begin()
+	//if err != nil {
+	//	return
+	//}
+	//defer func() {
+	//	if err != nil {
+	//		_ = to.Rollback()
+	//	} else {
+	//		_ = to.Commit()
+	//	}
+	//}()
+	to := global.DmSQL["rddp"].Begin()
+
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -139,10 +169,9 @@ func (m ReportChapterPermissionMapping) MultiAdd(list []*ReportChapterPermission
 			_ = to.Commit()
 		}
 	}()
-
 	// 新增品种权限记录
 	if len(list) > 0 {
-		_, err = to.InsertMulti(500, list)
+		err = to.CreateInBatches(list, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}

models/report_chapter.go

@@ -1,8 +1,7 @@
 package models
 
 import (
-	"eta_gn/eta_task/utils"
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -39,37 +38,41 @@ type ReportChapter struct {
 
 // GetPublishedChapterListByReportId 根据ReportId获取已发布章节列表
 func GetPublishedChapterListByReportId(reportId int) (list []*ReportChapter, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := ` SELECT * FROM report_chapter WHERE report_id = ? AND publish_state = 2 ORDER BY sort ASC`
-	_, err = o.Raw(sql, reportId).QueryRows(&list)
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := ` SELECT * FROM report_chapter WHERE report_id = ? AND publish_state = 2 ORDER BY sort ASC`
+	//_, err = o.Raw(sql, reportId).QueryRows(&list)
 
+	sql := ` SELECT * FROM report_chapter WHERE report_id = ? AND publish_state = 2 ORDER BY sort ASC`
+	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&list).Error
 	return
 }
 
 // GetChapterListByReportId 根据ReportId获取章节列表
 func GetChapterListByReportId(reportId int) (list []*ReportChapter, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := ` SELECT * FROM report_chapter WHERE report_id = ? ORDER BY sort ASC`
-	_, err = o.Raw(sql, reportId).QueryRows(&list)
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := ` SELECT * FROM report_chapter WHERE report_id = ? ORDER BY sort ASC`
+	//_, err = o.Raw(sql, reportId).QueryRows(&list)
 
+	sql := ` SELECT * FROM report_chapter WHERE report_id = ? ORDER BY sort ASC`
+	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&list).Error
 	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)
-	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)
+//	return
+//}
 
 // UpdateChapter 更新报表章节
 func (chapterChapterInfo *ReportChapter) UpdateChapter(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(chapterChapterInfo, cols...)
-
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(chapterChapterInfo, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(chapterChapterInfo).Error
 	return
 }

models/report_state_record.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -16,7 +16,8 @@ type ReportStateRecord struct {
 }
 
 func AddReportStateRecord(item *ReportStateRecord) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrmUsingDB("rddp")
+	//lastId, err = o.Insert(item)
+	err = global.DmSQL["rddp"].Create(item).Error
 	return
 }

models/sandbox/sandbox.go

@@ -1,7 +1,7 @@
 package sandbox
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_task/global"
 	"time"
 )
 
@@ -42,23 +42,36 @@ type Sandbox struct {
 }
 
 func GetSandboxListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*Sandbox, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//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)
+
 	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)
+	err = global.DmSQL["data"].Raw(sql, pars, startSize, pageSize).Find(&item).Error
 	return
 }
 
 func GetSandboxListCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT COUNT(1) AS count FROM sandbox WHERE 1=1 `
+	//if condition != "" {
+	//	sql += condition
+	//}
+	//err = o.Raw(sql, pars).QueryRow(&count)
+
 	sql := ` SELECT COUNT(1) AS count FROM sandbox WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
 	return
 }
 

models/smart_report.go

@@ -1,8 +1,8 @@
 package models
 
 import (
+	"eta_gn/eta_task/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -48,31 +48,41 @@ func (m *SmartReport) PrimaryId() string {
 }
 
 func (m *SmartReport) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(m, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(m, cols...)
+	err = global.DmSQL["rddp"].Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SmartReport) GetItemById(id int) (item *SmartReport, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
+	//err = o.Raw(sql, id).QueryRow(&item)
+
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, id).Find(&item).Error
 	return
 }
 
 // GetPrePublishSmartReports 获取定时发布时间为当前时间的未发布的报告列表
 func GetPrePublishSmartReports(startTime, endTime string) (list []*SmartReport, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `SELECT * FROM smart_report WHERE state = 1 AND pre_publish_time >= ? AND pre_publish_time <= ?`
+	//_, err = o.Raw(sql, startTime, endTime).QueryRows(&list)
+
 	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 = global.DmSQL["rddp"].Raw(sql, startTime, endTime).Find(&list).Error
 	return
 }
 
 // PublishSmartReportById 发布智能报告
 func PublishSmartReportById(reportId int, publishTime time.Time) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//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()
+
 	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 = global.DmSQL["rddp"].Exec(sql, publishTime, reportId).Error
 	return
 }
 

models/wx_template_msg.go

@@ -1,6 +1,8 @@
 package models
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta_gn/eta_task/global"
+)
 
 type SendTemplateResponse struct {
 	Errcode int    `json:"errcode"`
@@ -13,56 +15,67 @@ 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()
+
 	sql := `DELETE FROM user_template_record WHERE create_time<? `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, date).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, date).Error
 	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)
-	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)
+//	return
+//}
 
 func GetOpenIdArr() (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
+	//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
+	//      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)
+
+	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
-          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)
+	     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`
+	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	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)
-	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)
+//	return
+//}
 
 // GetOpenIdArrByClassifyId
 // @Description: 根据分类id获取关联的用户微信openid
@@ -72,18 +85,18 @@ func GetOpenIdArrByClassifyNameSecond(classifyNameSecond string) (items []string
 // @return items []string
 // @return err error
 func GetOpenIdArrByClassifyId(classifyId int) (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.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)
+	//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.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)
 	return
 }