orm->grom

models/data_manage/excel_style.go

@@ -7,17 +7,17 @@ import (
 )
 
 type ExcelStyle struct {
-	ExcelId          int `orm:"column(excel_id);pk"`
-	Name             string
-	Color            string
-	Row              int
-	Colum            int
-	DefaultRowHeight int
-	DefaultColWidth  int
-	CellData         string
-	Config           string
-	Data             string
-	CreateTime       time.Time
+	ExcelId          int       `gorm:"column:excel_id;primaryKey"` //`orm:"column(excel_id);pk"`
+	Name             string    `gorm:"column:name"`
+	Color            string    `gorm:"column:color"`
+	Row              int       `gorm:"column:row"`
+	Colum            int       `gorm:"column:colum"`
+	DefaultRowHeight int       `gorm:"column:default_row_height"`
+	DefaultColWidth  int       `gorm:"column:default_col_width"`
+	CellData         string    `gorm:"column:cell_data"`
+	Config           string    `gorm:"column:config"`
+	Data             string    `gorm:"column:data"`
+	CreateTime       time.Time `gorm:"column:create_time"`
 }
 
 type ExcelStyleReq struct {

models/permission.go

@@ -1,36 +1,42 @@
 package models
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta_gn/eta_api/global"
+	"eta_gn/eta_api/utils"
+)
 
 // ChartPermissionSearchKeyWordMapping 权限相关
 type ChartPermissionSearchKeyWordMapping struct {
-	Id                 int    `description:"id" json:"-"`
-	ChartPermissionId  int    `description:"权限id"`
-	KeyWord            string `description:"二级分类名称"`
-	From               string `description:"类型标识" json:"-"`
-	TacticType         string `description:"策略表type字段值" json:"-"`
-	TeleconferenceSort int    `description:"电话会类型排序" json:"-"`
-	ClassifyId         int    `description:"分类ID"`
+	Id                 int    `gorm:"column:id" json:"id"`                                   //`description:"id" json:"-"`
+	ChartPermissionId  int    `gorm:"column:chart_permission_id" json:"chart_permission_id"` //`description:"权限id"`
+	KeyWord            string `gorm:"column:key_word" json:"key_word"`                       //`description:"二级分类名称"`
+	From               string `gorm:"column:from" json:"-"`                                  //`description:"类型标识" json:"-"`
+	TacticType         string `gorm:"column:tactic_type" json:"-"`                           //`description:"策略表type字段值" json:"-"`
+	TeleconferenceSort int    `gorm:"column:teleconference_sort" json:"-"`                   //`description:"电话会类型排序" json:"-"`
+	ClassifyId         int    `gorm:"column:classify_id" json:"classify_id"`                 //`description:"分类ID"`
 }
 
 func GetPermission(classifyId int) (items []*ChartPermissionSearchKeyWordMapping, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM chart_permission_search_key_word_mapping AS a WHERE a.from='rddp' AND a.classify_id = ? `
-	_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	//_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, classifyId).Find(&items).Error
 	return
 }
 
 func GetAllPermissionMapping() (items []*ChartPermissionSearchKeyWordMapping, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM chart_permission_search_key_word_mapping AS a WHERE a.from='rddp'`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql).Find(&items).Error
 	return
 }
 
 // EditChartPermissionSearchKeyWordMappingMulti 修改报告报告权限（先删除原有的权限，再添加新的权限）
 func EditChartPermissionSearchKeyWordMappingMulti(keyword string, permissionIdList []int, classifyId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	to, err := o.Begin()
+	//o := orm.NewOrmUsingDB("rddp")
+	//to, err := o.Begin()
+	to := global.DmSQL["rddp"].Begin()
 	if err != nil {
 		return
 	}
@@ -42,7 +48,8 @@ func EditChartPermissionSearchKeyWordMappingMulti(keyword string, permissionIdLi
 		}
 	}()
 	sql := "DELETE FROM chart_permission_search_key_word_mapping WHERE `from` = 'rddp' AND classify_id = ?"
-	_, err = to.Raw(sql, classifyId).Exec()
+	//_, err = to.Raw(sql, classifyId).Exec()
+	err = to.Exec(sql, classifyId).Error
 	if err != nil {
 		return
 	}
@@ -60,7 +67,8 @@ func EditChartPermissionSearchKeyWordMappingMulti(keyword string, permissionIdLi
 			}
 			chartPermissionSearchKeyWordMappingList = append(chartPermissionSearchKeyWordMappingList, tmpChartPermissionSearchKeyWordMapping)
 		}
-		_, err = to.InsertMulti(len(chartPermissionSearchKeyWordMappingList), chartPermissionSearchKeyWordMappingList)
+		//_, err = to.InsertMulti(len(chartPermissionSearchKeyWordMappingList), chartPermissionSearchKeyWordMappingList)
+		err = to.CreateInBatches(chartPermissionSearchKeyWordMappingList, utils.MultiAddNum).Error
 	}
 	return
 }
@@ -68,46 +76,50 @@ func EditChartPermissionSearchKeyWordMappingMulti(keyword string, permissionIdLi
 func AddChartPermissionChapterMapping(chartPermissionId int, reportId int64) (err error) {
 	sql := `INSERT INTO chart_permission_chapter_mapping (chart_permission_id, report_chapter_type_id,research_type)
            VALUES(?,?,?)`
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Raw(sql, chartPermissionId, reportId, "rddp").Exec()
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Raw(sql, chartPermissionId, reportId, "rddp").Exec()
+	err = global.DmSQL["rddp"].Exec(sql, chartPermissionId, reportId, "rddp").Error
 	return
 }
 
 func RemoveChartPermissionChapterMapping(reportId int64) (err error) {
 	sql := ` DELETE FROM chart_permission_chapter_mapping WHERE research_type=? AND report_chapter_type_id=? `
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Raw(sql, "rddp", reportId).Exec()
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Raw(sql, "rddp", reportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, "rddp", reportId).Error
 	return
 }
 
 type ChartPermissionMappingIdName struct {
-	PermissionId   int
-	PermissionName string
+	PermissionId   int    `gorm:"column:permission_id" json:"permission_id"`
+	PermissionName string `gorm:"column:permission_name" json:"permission_name"`
 }
 
 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)
+	//_, err = o.Raw(sql, source, classifyId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, source, classifyId).Find(&list).Error
 	return
 }
 
 // UpdateChartPermissionNameFromMappingByKeyword 根据关键词及来源更新新关键词
 func UpdateChartPermissionNameFromMappingByKeyword(newKeyword string, classifyId int, source string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := " UPDATE chart_permission_search_key_word_mapping SET key_word = ? WHERE classify_id = ? AND `from` = ? "
-	_, err = o.Raw(sql, newKeyword, classifyId, source).Exec()
+	//_, err = o.Raw(sql, newKeyword, classifyId, source).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, newKeyword, classifyId, source).Error
 	return
 }
 
 // ChartPermissionSearchKeyWordMappingAndPermissionName
 // @Description: 分类关联品种
 type ChartPermissionSearchKeyWordMappingAndPermissionName struct {
-	ChartPermissionId   int    `description:"权限id"`
-	ChartPermissionName string `description:"权限名称"`
-	PermissionName      string `description:"权限名称"`
-	KeyWord             string `description:"二级分类名称"`
-	ClassifyId          int    `description:"分类ID"`
+	ChartPermissionId   int    `gorm:"column:chart_permission_id" json:"chart_permission_id"`     //`description:"权限id"`
+	ChartPermissionName string `gorm:"column:chart_permission_name" json:"chart_permission_name"` //`description:"权限名称"`
+	PermissionName      string `gorm:"column:permission_name" json:"permission_name"`             //`description:"权限名称"`
+	KeyWord             string `gorm:"column:key_word"`                                           //`description:"二级分类名称"`
+	ClassifyId          int    `gorm:"column:classify_id"`                                        // `description:"分类ID"`
 }
 
 // GetPermissionByClassifyId
@@ -118,9 +130,10 @@ type ChartPermissionSearchKeyWordMappingAndPermissionName struct {
 // @return items []*ChartPermissionSearchKeyWordMappingAndPermissionName
 // @return err error
 func GetPermissionByClassifyId(classifyId int) (items []*ChartPermissionSearchKeyWordMappingAndPermissionName, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.chart_permission_name,a.permission_name,b.chart_permission_id,b.key_word,b.classify_id FROM chart_permission AS a 
  join chart_permission_search_key_word_mapping AS b ON a.chart_permission_id=b.chart_permission_id WHERE b.from='rddp' AND b.classify_id = ? `
-	_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	//_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql, classifyId).Find(&items).Error
 	return
 }

models/ppt_v2.go

@@ -1,7 +1,9 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/models/ppt_english"
+	"eta_gn/eta_api/utils"
 	"time"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -10,56 +12,56 @@ import (
 
 // PptV2 表
 type PptV2 struct {
-	PptId         int       `orm:"column(ppt_id);pk;auto" description:"ppt的Id"`
-	TemplateType  int       `description:"模版类型"`
-	BackgroundImg string    `description:"背景图片"`
-	Title         string    `description:"标题"`
-	ReportType    string    `description:"报告类型"`
-	PptDate       string    `description:"选择日期"`
-	Content       string    `description:"ppt内容"`
-	PptUrl        string    `description:"ppt下载地址"`
-	PptxUrl       string    `description:"pptx下载地址"`
-	CreateTime    time.Time `description:"创建时间"`
-	ModifyTime    time.Time `description:"修改时间"`
-	AdminId       int       `description:"系统用户id"`
-	AdminRealName string    `description:"系统用户名称"`
-	PptVersion    int8      `description:"是否ppt的旧版本；1：旧的，2：新的"`
-	ReportId      int       `description:"关联的报告ID"`
-	ReportCode    string    `description:"关联的报告code"`
-	IsShare       int8      `description:"是否分享，0：不分享，1：分享"`
-	PublishTime   time.Time `description:"发布时间"`
-	CoverContent  string    `description:"PPT内容-JSON"`
-	PptPage       int       `description:"PPT页数"`
-	TitleSetting  string    `description:"PPT标题设置"`
+	PptId         int       `gorm:"column:ppt_id;primaryKey;autoIncrement:true" description:"ppt的Id"`
+	TemplateType  int       `gorm:"column:template_type" description:"模版类型"`
+	BackgroundImg string    `gorm:"column:background_img" description:"背景图片"`
+	Title         string    `gorm:"column:title" description:"标题"`
+	ReportType    string    `gorm:"column:report_type" description:"报告类型"`
+	PptDate       string    `gorm:"column:ppt_date" description:"选择日期"`
+	Content       string    `gorm:"column:content" description:"ppt内容"`
+	PptUrl        string    `gorm:"column:ppt_url" description:"ppt下载地址"`
+	PptxUrl       string    `gorm:"column:pptx_url" description:"pptx下载地址"`
+	CreateTime    time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:modify_time" description:"修改时间"`
+	AdminId       int       `gorm:"column:admin_id" description:"系统用户id"`
+	AdminRealName string    `gorm:"column:admin_real_name" description:"系统用户名称"`
+	PptVersion    int8      `gorm:"column:ppt_version" description:"是否ppt的旧版本；1：旧的，2：新的"`
+	ReportId      int       `gorm:"column:report_id" description:"关联的报告ID"`
+	ReportCode    string    `gorm:"column:report_code" description:"关联的报告code"`
+	IsShare       int8      `gorm:"column:is_share" description:"是否分享，0：不分享，1：分享"`
+	PublishTime   time.Time `gorm:"column:publish_time" description:"发布时间"`
+	CoverContent  string    `gorm:"column:cover_content" description:"PPT内容-JSON"`
+	PptPage       int       `gorm:"column:ppt_page" description:"PPT页数"`
+	TitleSetting  string    `gorm:"column:title_setting" description:"PPT标题设置"`
 }
 
 type PptV2Item struct {
-	PptId         int       `orm:"column(ppt_id);pk" description:"ppt的Id"`
-	TemplateType  int       `description:"模版类型"`
-	BackgroundImg string    `description:"背景图片"`
-	Title         string    `description:"标题"`
-	ReportType    string    `description:"报告类型"`
-	PptDate       string    `description:"选择日期"`
-	Content       string    `description:"ppt内容"`
-	PptUrl        string    `description:"ppt下载地址"`
-	PptxUrl       string    `description:"pptx下载地址"`
-	CreateTime    time.Time `description:"创建时间"`
-	ModifyTime    time.Time `description:"修改时间"`
-	AdminId       int       `description:"系统用户id"`
-	AdminRealName string    `description:"系统用户名称"`
-	PptVersion    int8      `description:"是否ppt的旧版本；1：旧的，2：新的"`
-	IsAuth        bool      `description:"true:有操作权限，false:无操作权限"`
-	ReportId      int       `description:"报告ID"`
-	ReportCode    string    `description:"关联的报告code"`
-	IsShare       int8      `description:"是否分享，0：不分享，1：分享"`
-	PublishTime   time.Time `description:"发布时间"`
-	CoverContent  string    `description:"PPT内容-JSON"`
-	PptPage       int       `description:"PPT页数"`
-	TitleSetting  string    `description:"PPT标题设置"`
+	PptId         int       `gorm:"column:ppt_id;primaryKey" description:"ppt的Id"`
+	TemplateType  int       `gorm:"column:template_type" description:"模版类型"`
+	BackgroundImg string    `gorm:"column:background_img" description:"背景图片"`
+	Title         string    `gorm:"column:title" description:"标题"`
+	ReportType    string    `gorm:"column:report_type" description:"报告类型"`
+	PptDate       string    `gorm:"column:ppt_date" description:"选择日期"`
+	Content       string    `gorm:"column:content" description:"ppt内容"`
+	PptUrl        string    `gorm:"column:ppt_url" description:"ppt下载地址"`
+	PptxUrl       string    `gorm:"column:pptx_url" description:"pptx下载地址"`
+	CreateTime    time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:modify_time" description:"修改时间"`
+	AdminId       int       `gorm:"column:admin_id" description:"系统用户id"`
+	AdminRealName string    `gorm:"column:admin_real_name" description:"系统用户名称"`
+	PptVersion    int8      `gorm:"column:ppt_version" description:"是否ppt的旧版本；1：旧的，2：新的"`
+	IsAuth        bool      `gorm:"column:is_auth" description:"true:有操作权限，false:无操作权限"`
+	ReportId      int       `gorm:"column:report_id" description:"报告ID"`
+	ReportCode    string    `gorm:"column:report_code" description:"关联的报告code"`
+	IsShare       int8      `gorm:"column:is_share" description:"是否分享，0：不分享，1：分享"`
+	PublishTime   time.Time `gorm:"column:publish_time" description:"发布时间"`
+	CoverContent  string    `gorm:"column:cover_content" description:"PPT内容-JSON"`
+	PptPage       int       `gorm:"column:ppt_page" description:"PPT页数"`
+	TitleSetting  string    `gorm:"column:title_setting" description:"PPT标题设置"`
 }
 
 func GetPptV2List(condition string, pars []interface{}, startSize, pageSize int) (items []*PptV2Item, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2 WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -67,12 +69,13 @@ func GetPptV2List(condition string, pars []interface{}, startSize, pageSize int)
 	//
 	sql += `ORDER BY modify_time DESC LIMIT ?,?`
 	//sql += `ORDER BY create_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 GetPptV2ByCondition(condition string, pars []interface{}) (items []*PptV2, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2 WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -80,17 +83,19 @@ func GetPptV2ByCondition(condition string, pars []interface{}) (items []*PptV2,
 	//
 	sql += `ORDER BY modify_time DESC`
 	//sql += `ORDER BY create_time DESC LIMIT ?,?`
-	_, 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 GetPptV2ListCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COUNT(1) AS count FROM ppt_v2 WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	//err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
 	return
 }
 
@@ -101,16 +106,19 @@ type PptV2ListResp struct {
 
 // AddPptV2 新增PPT
 func AddPptV2(item *PptV2) (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
+	lastId = int64(item.PptId)
 	return
 }
 
 // DeletePptV2 删除ppt
 func DeletePptV2(pptId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM ppt_v2 WHERE ppt_id=? `
-	_, err = o.Raw(sql, pptId).Exec()
+	//_, err = o.Raw(sql, pptId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, pptId).Error
 	return
 }
 
@@ -136,8 +144,9 @@ type AddPptResp struct {
 
 // Update 更新ppt基础信息
 func (item *PptV2) 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
 }
 
@@ -152,9 +161,10 @@ type SavePptV2PathReq struct {
 }
 
 func GetPptV2ById(pptId int) (item *PptV2, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2 WHERE 1=1 AND ppt_id=? `
-	err = o.Raw(sql, pptId).QueryRow(&item)
+	//err = o.Raw(sql, pptId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, pptId).Find(&item).Error
 	return
 }
 
@@ -163,21 +173,25 @@ func GetPptV2ByIds(pptIds []int) (list []*PptV2, err error) {
 		QueryTable("ppt_v2").
 		Filter("ppt_id__in", pptIds).
 		All(&list)
+	err = global.DmSQL["rddp"].Table("ppt_v2").Where("ppt_id IN ?", pptIds).Find(&list).Error
+
 	return
 }
 
 func GetPptV2ByTitle(title string) (item *PptV2, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2 WHERE 1=1 AND title=? `
-	err = o.Raw(sql, title).QueryRow(&item)
+	//err = o.Raw(sql, title).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, title).First(&item).Error
 	return
 }
 
 // EditPptV2Path 编辑Ppt的下载地址
 func EditPptV2Path(pptId int, pptxPath string) (err error) {
 	sql := `UPDATE ppt_v2 SET pptx_url=?,modify_time=NOW(),publish_time=NOW() WHERE ppt_id=? `
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Raw(sql, pptxPath, pptId).Exec()
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Raw(sql, pptxPath, pptId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, pptxPath, pptId).Error
 	return
 }
 
@@ -191,32 +205,36 @@ type PptV2PublishRecord struct {
 
 // AddPptV2PublishRecord 添加发布记录，主要是记录每次发布的时候，当前的ppt
 func AddPptV2PublishRecord(item *PptV2PublishRecord) (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
+	lastId = int64(item.Id)
 	return
 }
 
 // PptV2SaveLog ppt记录表
 type PptV2SaveLog struct {
-	Id            int       `orm:"column(id);pk" description:"自增Id"`
-	PptId         int       `orm:"column(ppt_id)" description:"ppt的Id"`
-	TemplateType  int       `description:"模版类型"`
-	BackgroundImg string    `description:"背景图片"`
-	Title         string    `description:"标题"`
-	ReportType    string    `description:"报告类型"`
-	PptDate       string    `description:"选择日期"`
-	Content       string    `description:"ppt内容"`
-	AdminId       int       `description:"系统用户id"`
-	AdminRealName string    `description:"系统用户名称"`
-	CreateTime    time.Time `description:"创建时间"`
-	CoverContent  string    `description:"PPT内容-JSON"`
-	TitleSetting  string    `description:"PPT标题设置"`
+	Id            int       `gorm:"column:id;primaryKey;autoIncrement" description:"自增Id"`
+	PptId         int       `gorm:"column:ppt_id" description:"ppt的Id"`
+	TemplateType  int       `gorm:"column:template_type" description:"模版类型"`
+	BackgroundImg string    `gorm:"column:background_img" description:"背景图片"`
+	Title         string    `gorm:"column:title" description:"标题"`
+	ReportType    string    `gorm:"column:report_type" description:"报告类型"`
+	PptDate       string    `gorm:"column:ppt_date" description:"选择日期"`
+	Content       string    `gorm:"column:content" description:"ppt内容"`
+	AdminId       int       `gorm:"column:admin_id" description:"系统用户id"`
+	AdminRealName string    `gorm:"column:admin_real_name" description:"系统用户名称"`
+	CreateTime    time.Time `gorm:"column:create_time" description:"创建时间"`
+	CoverContent  string    `gorm:"column:cover_content" description:"PPT内容-JSON"`
+	TitleSetting  string    `gorm:"column:title_setting" description:"PPT标题设置"`
 }
 
 // AddPptV2SaveLog 新增PPT日志
 func AddPptV2SaveLog(item *PptV2SaveLog) (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
+	lastId = int64(item.Id)
 	return
 }
 
@@ -233,16 +251,18 @@ type PPT2ReportReq struct {
 
 // AddPptV2Multi 批量新增ppt
 func AddPptV2Multi(list []*PptV2) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.InsertMulti(1, list)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.InsertMulti(1, list)
+	err = global.DmSQL["rddp"].CreateInBatches(list, utils.MultiAddNum).Error
 	return
 }
 
 // GetAllPptTitle 获取当前目录的所有名称
 func GetAllPptTitle() (names []string, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := "select title from ppt_v2"
-	_, err = o.Raw(sql).QueryRows(&names)
+	//_, err = o.Raw(sql).QueryRows(&names)
+	err = global.DmSQL["rddp"].Raw(sql).Scan(&names).Error
 	return
 }
 
@@ -254,15 +274,16 @@ type PPT2ReportResp struct {
 
 // GetPptV2ByReportId 通过关联的报告ID获取PPT
 func GetPptV2ByReportId(reportId int) (item *PptV2, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2 WHERE 1=1 AND report_id=? LIMIT 1`
-	err = o.Raw(sql, reportId).QueryRow(&item)
+	//err = o.Raw(sql, reportId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).First(&item).Error
 	return
 }
 
 // GetSharePptV2 获取公开分享的ppt
 func GetSharePptV2(IsNewPpt int) (items []*PptV2, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2 WHERE 1=1 AND is_share = 1 `
 
 	if IsNewPpt > 0 {
@@ -270,20 +291,22 @@ func GetSharePptV2(IsNewPpt int) (items []*PptV2, err error) {
 	}
 	sql += `ORDER BY create_time DESC`
 	//sql += `ORDER BY create_time DESC LIMIT ?,?`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql).Find(&items).Error
 	return
 }
 
 // GetAllPptV2List 根据条件获取所有的Ppt
 func GetAllPptV2List(condition string, pars []interface{}) (items []*PptV2Item, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2 WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	//
 	sql += `ORDER BY modify_time DESC `
-	_, 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
 }
 
@@ -298,9 +321,10 @@ type BatchEnPPT2CnReq struct {
 }
 
 func GetPptV2ByTitleAndId(title string, adminId int) (item *PptV2, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2 WHERE 1=1 AND title=? AND admin_id=? `
-	err = o.Raw(sql, title, adminId).QueryRow(&item)
+	//err = o.Raw(sql, title, adminId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, title, adminId).First(&item).Error
 	return
 }
 

models/ppt_v2_grant.go

@@ -1,25 +1,26 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
+	"eta_gn/eta_api/utils"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 // PptV2Grant Ppt授权表
 type PptV2Grant struct {
-	GrantId      int64     `orm:"column(grant_id);pk;auto" description:"自增序号"`
-	PptId        int64     `description:"ppt ID"`
-	DepartmentId int64     `description:"授权部门id"`
-	GrantAdminId int64     `description:"授权部门id"`
-	CreateTime   time.Time `orm:"auto_now_add;type(datetime)" description:"创建时间"`
+	GrantId      int64     `gorm:"column:grant_id;primaryKey;autoIncrement" description:"自增序号"`
+	PptId        int64     `gorm:"column:ppt_id" description:"ppt ID"`
+	DepartmentId int64     `gorm:"column:department_id" description:"授权部门id"`
+	GrantAdminId int64     `gorm:"column:grant_admin_id" description:"授权管理员id"`
+	CreateTime   time.Time `gorm:"column:create_time;autoCreateTime" description:"创建时间"`
 }
 
 // GetPPtGrantInfo 获取已经有权限的ppt列表
 func GetPPtGrantInfo(pptId int) (list []*PptV2Grant, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2_grant WHERE ppt_id=? `
-	_, err = o.Raw(sql, pptId).QueryRows(&list)
+	//_, err = o.Raw(sql, pptId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, pptId).Find(&list).Error
 	return
 }
 
@@ -39,8 +40,9 @@ type GrantPptReq struct {
 
 // MultiAddPptV2Grant 批量添加授权记录
 func MultiAddPptV2Grant(pptId int, list []*PptV2Grant) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	to, err := o.Begin()
+	//o := orm.NewOrmUsingDB("rddp")
+	//to, err := o.Begin()
+	to := global.DmSQL["rddp"].Begin()
 	if err != nil {
 		return
 	}
@@ -53,14 +55,16 @@ func MultiAddPptV2Grant(pptId int, list []*PptV2Grant) (err error) {
 	}()
 
 	sql := "DELETE from ppt_v2_grant where ppt_id=?"
-	_, err = to.Raw(sql, pptId).Exec()
+	//_, err = to.Raw(sql, pptId).Exec()
+	err = to.Exec(sql, pptId).Error
 	if err != nil {
 		return
 	}
 
 	// 新增授权记录
 	if len(list) > 0 {
-		_, tmpErr := to.InsertMulti(len(list), list)
+		//_, tmpErr := to.InsertMulti(len(list), list)
+		tmpErr := to.CreateInBatches(list, utils.MultiAddNum).Error
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -72,69 +76,93 @@ func MultiAddPptV2Grant(pptId int, list []*PptV2Grant) (err error) {
 
 // DeletePptV2Grant 移除授权记录
 func DeletePptV2Grant(pptId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := "DELETE from ppt_v2_grant where ppt_id=?"
-	_, err = o.Raw(sql, pptId).Exec()
-
+	//_, err = o.Raw(sql, pptId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, pptId).Error
 	return
 }
 
 // PptV2InfoGrantItem Ppt信息记录（包含授权信息）
+//
+//	type PptV2InfoGrantItem struct {
+//		PptId         int       `orm:"column(ppt_id);pk;auto" description:"ppt的Id"`
+//		TemplateType  int       `description:"模版类型"`
+//		BackgroundImg string    `description:"背景图片"`
+//		Title         string    `description:"标题"`
+//		ReportType    string    `description:"报告类型"`
+//		PptDate       string    `description:"选择日期"`
+//		Content       string    `description:"ppt内容"`
+//		PptUrl        string    `description:"ppt下载地址"`
+//		PptxUrl       string    `description:"pptx下载地址"`
+//		CreateTime    time.Time `description:"创建时间"`
+//		ModifyTime    time.Time `description:"修改时间"`
+//		AdminId       int       `description:"系统用户id"`
+//		AdminRealName string    `description:"系统用户名称"`
+//		PptVersion    int8      `description:"是否ppt的旧版本；1：旧的，2：新的"`
+//		ReportId      int       `description:"关联的报告ID"`
+//		ReportCode    string    `description:"关联的报告code"`
+//		IsShare       int8      `description:"是否分享，0：不分享，1：分享"`
+//		PublishTime   time.Time `description:"发布时间"`
+//		PptPage       int       `description:"PPT页数"`
+//
+//		//GrantId      int64     `orm:"column(grant_id);pk;auto" description:"自增序号"`
+//		//PptId        int64     `description:"ppt ID"`
+//		//DepartmentId int64     `description:"授权部门id"`
+//		//GrantAdminId int64     `description:"授权部门id"`
+//		//CreateTime   time.Time `orm:"auto_now_add;type(datetime)" description:"创建时间"`
+//	}
 type PptV2InfoGrantItem struct {
-	PptId         int       `orm:"column(ppt_id);pk;auto" description:"ppt的Id"`
-	TemplateType  int       `description:"模版类型"`
-	BackgroundImg string    `description:"背景图片"`
-	Title         string    `description:"标题"`
-	ReportType    string    `description:"报告类型"`
-	PptDate       string    `description:"选择日期"`
-	Content       string    `description:"ppt内容"`
-	PptUrl        string    `description:"ppt下载地址"`
-	PptxUrl       string    `description:"pptx下载地址"`
-	CreateTime    time.Time `description:"创建时间"`
-	ModifyTime    time.Time `description:"修改时间"`
-	AdminId       int       `description:"系统用户id"`
-	AdminRealName string    `description:"系统用户名称"`
-	PptVersion    int8      `description:"是否ppt的旧版本；1：旧的，2：新的"`
-	ReportId      int       `description:"关联的报告ID"`
-	ReportCode    string    `description:"关联的报告code"`
-	IsShare       int8      `description:"是否分享，0：不分享，1：分享"`
-	PublishTime   time.Time `description:"发布时间"`
-	PptPage       int       `description:"PPT页数"`
-
-	//GrantId      int64     `orm:"column(grant_id);pk;auto" description:"自增序号"`
-	//PptId        int64     `description:"ppt ID"`
-	//DepartmentId int64     `description:"授权部门id"`
-	//GrantAdminId int64     `description:"授权部门id"`
-	//CreateTime   time.Time `orm:"auto_now_add;type(datetime)" description:"创建时间"`
+	PptId         int       `gorm:"column:ppt_id;primaryKey;autoIncrement" description:"ppt的Id"`
+	TemplateType  int       `gorm:"column:template_type" description:"模版类型"`
+	BackgroundImg string    `gorm:"column:background_img" description:"背景图片"`
+	Title         string    `gorm:"column:title" description:"标题"`
+	ReportType    string    `gorm:"column:report_type" description:"报告类型"`
+	PptDate       string    `gorm:"column:ppt_date" description:"选择日期"`
+	Content       string    `gorm:"column:content" description:"ppt内容"`
+	PptUrl        string    `gorm:"column:ppt_url" description:"ppt下载地址"`
+	PptxUrl       string    `gorm:"column:pptx_url" description:"pptx下载地址"`
+	CreateTime    time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:modify_time" description:"修改时间"`
+	AdminId       int       `gorm:"column:admin_id" description:"系统用户id"`
+	AdminRealName string    `gorm:"column:admin_real_name" description:"系统用户名称"`
+	PptVersion    int8      `gorm:"column:ppt_version" description:"是否ppt的旧版本；1：旧的，2：新的"`
+	ReportId      int       `gorm:"column:report_id" description:"关联的报告ID"`
+	ReportCode    string    `gorm:"column:report_code" description:"关联的报告code"`
+	IsShare       int8      `gorm:"column:is_share" description:"是否分享，0：不分享，1：分享"`
+	PublishTime   time.Time `gorm:"column:publish_time" description:"发布时间"`
+	PptPage       int       `gorm:"column:ppt_page" description:"PPT页数"`
 }
 
 // GetAllGrantList 获取已经有权限的ppt列表
 func GetAllGrantList(sysUserId int) (list []*PptV2InfoGrantItem, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.* FROM ppt_v2 a JOIN ppt_v2_grant b on a.ppt_id=b.ppt_id 
  WHERE a.admin_id=? OR b.department_id=1 OR b.grant_admin_id=? GROUP BY a.ppt_id`
-	_, err = o.Raw(sql, sysUserId, sysUserId).QueryRows(&list)
+	//_, err = o.Raw(sql, sysUserId, sysUserId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, sysUserId, sysUserId).Find(&list).Error
 	return
 }
 
 // GetGrantList 获取我共享出去/别人共享给我的的ppt列表
 func GetGrantList(condition string, pars []interface{}) (list []*PptV2InfoGrantItem, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.* FROM ppt_v2 a JOIN ppt_v2_grant b on a.ppt_id=b.ppt_id 
  WHERE 1=1 `
 	sql += condition
 
 	sql += ` GROUP BY a.ppt_id ORDER BY a.modify_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
 }
 
 // GetPPtGrantConf 根据ppt_id和操作人获取ppt权限配置
 func GetPPtGrantConf(pptId, sysUserId int) (item *PptV2InfoGrantItem, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.* FROM ppt_v2 a JOIN ppt_v2_grant b on a.ppt_id=b.ppt_id 
  WHERE a.ppt_id=?  AND (b.department_id=1 OR b.grant_admin_id=?) GROUP BY a.ppt_id`
-	err = o.Raw(sql, pptId, sysUserId).QueryRow(&item)
+	//err = o.Raw(sql, pptId, sysUserId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, pptId, sysUserId).First(&item).Error
 	return
 }

models/ppt_v2_group.go

@@ -1,157 +1,182 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/models/ppt_english"
+	"eta_gn/eta_api/utils"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type PptV2Group struct {
-	GroupId    int64     `orm:"column(group_id);pk;auto" description:"ppt目录ID"`
-	GroupName  string    `description:"目录名称"`
-	AdminId    int       `description:"目录创建者账号ID"`
-	IsShare    int8      `description:"是否共享，0私有，1共享"`
-	GroupSort  int64     `description:"目录排序标识"`
-	IsShareAdd int8      `description:"是否是通过单个ppt共享生成的目录，0不是，1-是"`
-	CreateTime time.Time `orm:"auto_now_add;type(datetime)" description:"创建时间"`
-	ModifyTime time.Time `orm:"auto_now;type(datetime)" description:"修改时间"`
-	ShareTime  time.Time `description:"分享时间"`
+	GroupId    int64     `gorm:"column:group_id;primaryKey;autoIncrement" description:"ppt目录ID"`
+	GroupName  string    `gorm:"column:group_name" description:"目录名称"`
+	AdminId    int       `gorm:"column:admin_id" description:"目录创建者账号ID"`
+	IsShare    int8      `gorm:"column:is_share" description:"是否共享，0私有，1共享"`
+	GroupSort  int64     `gorm:"column:group_sort" description:"目录排序标识"`
+	IsShareAdd int8      `gorm:"column:is_share_add" description:"是否是通过单个ppt共享生成的目录，0不是，1-是"`
+	CreateTime time.Time `gorm:"column:create_time;autoCreateTime" description:"创建时间"`
+	ModifyTime time.Time `gorm:"column:modify_time;autoUpdateTime" description:"修改时间"`
+	ShareTime  time.Time `gorm:"column:share_time" description:"分享时间"`
 }
 
 // GetPrivatePptGroups 获取私有目录
 func GetPrivatePptGroups(adminId int) (list []*PptV2Group, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_v2_group where admin_id=? order by group_sort asc, group_id asc"
-	_, err = o.Raw(sql, adminId).QueryRows(&list)
+	//_, err = o.Raw(sql, adminId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, adminId).Find(&list).Error
 	return
 }
 
 // GetPrivatePptGroupsByAdminId 获取用户自己的私有目录
 func GetPrivatePptGroupsByAdminId(adminId int) (list []*PptV2Group, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_v2_group where admin_id=? AND is_share_add=0 order by group_sort asc, group_id asc"
-	_, err = o.Raw(sql, adminId).QueryRows(&list)
+	//_, err = o.Raw(sql, adminId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, adminId).Find(&list).Error
 	return
 }
 
 // GetPublicPptGroups 获取ppt公共目录
 func GetPublicPptGroups() (list []*PptV2Group, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_v2_group where is_share=1 order by share_time asc, group_id asc"
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql).Find(&list).Error
 	return
 }
 
 // GetPptGroupByName 根据目录名称查询
 func GetPptGroupByName(groupName string, adminId int) (item *PptV2Group, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_v2_group where admin_id=? and group_name=?"
-	err = o.Raw(sql, adminId, groupName).QueryRow(&item)
+	//err = o.Raw(sql, adminId, groupName).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, adminId, groupName).Find(&item).Error
 	return
 }
 
 // GetPptGroupById 根据目录Id查询
 func GetPptGroupByGroupIdAdminId(groupId int64, adminId int) (item *PptV2Group, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_v2_group where admin_id=? and group_id=?"
-	err = o.Raw(sql, adminId, groupId).QueryRow(&item)
+	//err = o.Raw(sql, adminId, groupId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, adminId, groupId).First(&item).Error
 	return
 }
 
 // GetPptGroupByGroupId 根据目录Id查询
 func GetPptGroupByGroupId(groupId int64) (item *PptV2Group, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_v2_group where group_id=?"
-	err = o.Raw(sql, groupId).QueryRow(&item)
+	//err = o.Raw(sql, groupId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, groupId).First(&item).Error
 	return
 }
 
 // AddPptGroup 新增目录
 func AddPptGroup(item *PptV2Group) (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
+	lastId = item.GroupId
 	return
 }
 
 // DeletePptGroup 删除单个ppt目录
 func DeletePptGroup(groupId int64) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM ppt_v2_group WHERE group_id=? `
-	_, err = o.Raw(sql, groupId).Exec()
+	//_, err = o.Raw(sql, groupId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, groupId).Error
 	return
 }
 
 // DeletePptGroupByGroupIds 删除单个ppt目录
 func DeletePptGroupByGroupIds(groupIds string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM ppt_v2_group WHERE group_id in  ` + groupIds
-	_, err = o.Raw(sql).Exec()
+	//_, err = o.Raw(sql).Exec()
+	err = global.DmSQL["rddp"].Exec(sql).Error
 	return
 }
 
 // Update 更新ppt目录基础信息
 func (item *PptV2Group) 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
 }
 
 // MoveUpGroupBySort 往上移动目录
 func MoveUpGroupBySort(nextSort, currentSort int64) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `update ppt_v2_group set group_sort = group_sort + 1 where group_sort >= ? and group_sort< ?`
-	_, err = o.Raw(sql, nextSort, currentSort).Exec()
+	//_, err = o.Raw(sql, nextSort, currentSort).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, nextSort, currentSort).Error
 	return
 }
 
 // MoveDownGroupBySort 往下移动目录
 func MoveDownGroupBySort(prevSort, currentSort int64) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `update ppt_v2_group set group_sort = group_sort - 1 where group_sort <= ? and group_sort> ? `
-	_, err = o.Raw(sql, prevSort, currentSort).Exec()
+	//_, err = o.Raw(sql, prevSort, currentSort).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, prevSort, currentSort).Error
 	return
 }
 
 // GetPptGroupNamesByAdminId 获取当前目录的所有名称
 func GetPptGroupNamesByAdminId(adminId int) (names []string, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select group_name from ppt_v2_group  where admin_id = ?"
-	_, err = o.Raw(sql, adminId).QueryRows(&names)
+	//_, err = o.Raw(sql, adminId).QueryRows(&names)
+	err = global.DmSQL["rddp"].Raw(sql, adminId).Scan(&names).Error
 	return
 }
 
 // GetPptGroupIdAndGroupNameByAdminId 查找分组名称和标识
 func GetPptGroupIdAndGroupNameByAdminId(adminId int) (list []*RespPptGroupName, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select group_id, group_name from ppt_v2_group where admin_id = ? and is_share_add != 1 order by group_sort asc, group_id asc"
-	_, err = o.Raw(sql, adminId).QueryRows(&list)
+	//_, err = o.Raw(sql, adminId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, adminId).Find(&list).Error
 	return
 }
 
 // AddPptGroupMappingMulti 批量新增ppt和目录的映射关系
 func AddPptGroupMulti(list []*PptV2Group) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.InsertMulti(1, list)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.InsertMulti(1, list)
+	err = global.DmSQL["rddp"].CreateInBatches(list, utils.MultiAddNum).Error
 	return
 }
 
 // UpdatePptGroupSortMulti 批量更新初始排序标识
 func UpdatePptGroupSortMulti(groupIds []int64) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	p, err := o.Raw("UPDATE ppt_v2_group SET group_sort = group_id WHERE group_id = ?").Prepare()
-	if err != nil {
-		return
-	}
-	defer func() {
-		_ = p.Close() // 别忘记关闭 statement
-	}()
+	//o := orm.NewOrmUsingDB("rddp")
+	//p, err := o.Raw("UPDATE ppt_v2_group SET group_sort = group_id WHERE group_id = ?").Prepare()
+	//if err != nil {
+	//	return
+	//}
+	//defer func() {
+	//	_ = p.Close() // 别忘记关闭 statement
+	//}()
+	//for _, v := range groupIds {
+	//	_, err = p.Exec(v)
+	//	if err != nil {
+	//		return
+	//	}
+	//}
+	tx := global.DmSQL["rddp"].Begin()
 	for _, v := range groupIds {
-		_, err = p.Exec(v)
+		err = tx.Exec("UPDATE ppt_v2_group SET group_sort = group_id WHERE group_id = ?", v).Error
 		if err != nil {
+			tx.Rollback()
 			return
 		}
 	}
+	tx.Commit()
 	return
 }
 
@@ -288,8 +313,8 @@ type RespPptGroupNameList struct {
 }
 
 type RespPptGroupName struct {
-	GroupId   int64  `description:"目录id"`
-	GroupName string `description:"目录名称"`
+	GroupId   int64  `gorm:"column:group_id`    // `description:"目录id"`
+	GroupName string `gorm:"column:group_name"` //`description:"目录名称"`
 }
 
 type RespSearchGroupPptList struct {

models/ppt_v2_group_mapping.go

@@ -1,6 +1,8 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
+	"eta_gn/eta_api/utils"
 	"time"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -8,146 +10,169 @@ import (
 
 // ppt目录和ppt 映射表
 type PptV2GroupMapping struct {
-	GroupPptId      int64     `orm:"column(group_ppt_id);pk;auto" description:"自增序号"`
-	GroupId         int64     `description:"ppt目录ID"`
-	PptSort         int64     `description:"Ppt的排序"`
-	PptId           int64     `description:"ppt ID"`
-	CreateTime      time.Time `orm:"auto_now_add;type(datetime)" description:"创建时间"`
-	ModifyTime      time.Time `orm:"auto_now;type(datetime)" description:"修改时间"`
-	AdminId         int       `description:"移动ppt到该目录的系统用户id"`
-	AdminRealName   string    `description:"系统用户名称"`
-	ChildGroupPptId int64     `description:"设置共享后的新映射ID"`
-	IsMoved         bool      `description:"true表示改PPT被人为移动过"`
+	GroupPptId      int64     `gorm:"column:group_ppt_id;primaryKey;autoIncrement" description:"自增序号"`
+	GroupId         int64     `gorm:"column:group_id" description:"ppt目录ID"`
+	PptSort         int64     `gorm:"column:ppt_sort" description:"Ppt的排序"`
+	PptId           int64     `gorm:"column:ppt_id" description:"ppt ID"`
+	CreateTime      time.Time `gorm:"column:create_time;autoCreateTime" description:"创建时间"`
+	ModifyTime      time.Time `gorm:"column:modify_time;autoUpdateTime" description:"修改时间"`
+	AdminId         int       `gorm:"column:admin_id" description:"移动ppt到该目录的系统用户id"`
+	AdminRealName   string    `gorm:"column:admin_real_name" description:"系统用户名称"`
+	ChildGroupPptId int64     `gorm:"column:child_group_ppt_id" description:"设置共享后的新映射ID"`
+	IsMoved         bool      `gorm:"column:is_moved" description:"true表示改PPT被人为移动过"`
 }
 
 // AddPptGroupMapping 新增目录和ppt的映射关系
 func AddPptGroupMapping(item *PptV2GroupMapping) (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
+	lastId = item.GroupId
 	return
 }
 
 // GetPptMappingCountByGroupId 查询目录下，ppt的个数
 func GetPptMappingCountByGroupId(groupId int64) (total int64, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `select count(*) from ppt_v2_group_mapping where group_id=?`
-	err = o.Raw(sql, groupId).QueryRow(&total)
+	//err = o.Raw(sql, groupId).QueryRow(&total)
+	err = global.DmSQL["rddp"].Raw(sql, groupId).Scan(&total).Error
 	return
 }
 
 // GetPptMappingListByGroupId 查询目录下，ppt列表
 func GetPptMappingListByGroupId(groupId int64) (list []*PptV2GroupMapping, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := `select group_ppt_id, group_id, ppt_id, ppt_sort, admin_id, admin_real_name, create_time from ppt_v2_group_mapping where group_id=? order by ppt_sort asc, group_ppt_id asc `
-	_, err = o.Raw(sql, groupId).QueryRows(&list)
+	//_, err = o.Raw(sql, groupId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, groupId).Find(&list).Error
 	return
 }
 
 // GetPptMappingListByGroupIds 根据分组ID查找
 func GetPptMappingListByGroupIds(groupIds []int64) (list []*PptV2GroupMapping, err error) {
-	_, err = orm.NewOrmUsingDB("rddp").
-		QueryTable("ppt_v2_group_mapping").
-		Filter("group_id__in", groupIds).
-		OrderBy("-ppt_sort", "group_ppt_id").
-		All(&list)
-
+	//_, err = orm.NewOrmUsingDB("rddp").
+	//	QueryTable("ppt_v2_group_mapping").
+	//	Filter("group_id__in", groupIds).
+	//	OrderBy("-ppt_sort", "group_ppt_id").
+	//	All(&list)
+	err = global.DmSQL["rddp"].Table("ppt_v2_group_mapping").Where("group_id in ?", groupIds).Find(&list).Error
 	return
 }
 
 // GetPptMappingByGroupPptId 查询根据映射ID，查询单个映射关系
 func GetPptMappingByGroupPptId(groupPptId int64, adminId int) (item *PptV2GroupMapping, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `select * from ppt_v2_group_mapping where group_ppt_id=? and admin_id=?`
-	err = o.Raw(sql, groupPptId, adminId).QueryRow(&item)
+	//err = o.Raw(sql, groupPptId, adminId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, groupPptId, adminId).First(&item).Error
 	return
 }
 
 // GetPptMappingByGroupPptId 查询根据映射ID，查询单个映射关系数量
 func GetPptMappingByGroupPptCountId(groupPptId int64, adminId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `select COUNT(*) AS count from ppt_v2_group_mapping where group_ppt_id=? and admin_id=?`
-	err = o.Raw(sql, groupPptId, adminId).QueryRow(&count)
+	//err = o.Raw(sql, groupPptId, adminId).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, groupPptId, adminId).Scan(&count).Error
 	return
 }
 
 // GetPptMappingByPptId 查询根据ppt_Id, 查询当映单个映射关系
 func GetPptMappingByPptId(pptId int64) (item *PptV2GroupMapping, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` select * from ppt_v2_group_mapping where ppt_id=? `
-	err = o.Raw(sql, pptId).QueryRow(&item)
+	//err = o.Raw(sql, pptId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, pptId).First(&item).Error
 	return
 }
 
 // Update 更新ppt目录映射的基本信息
 func (item *PptV2GroupMapping) 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
 }
 
 // AddPptGroupMappingMulti 批量新增ppt和目录的映射关系
 func AddPptGroupMappingMulti(list []*PptV2GroupMapping) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.InsertMulti(1, list)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.InsertMulti(1, list)
+	err = global.DmSQL["rddp"].CreateInBatches(list, utils.MultiAddNum).Error
 	return
 }
 
 // UpdatePptGroupMappingSortMulti 批量更新初始排序标识
 func UpdatePptGroupMappingSortMulti(groupPptIds []int64) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	p, err := o.Raw("UPDATE ppt_v2_group_mapping SET ppt_sort = group_ppt_id WHERE group_ppt_id = ?").Prepare()
-	if err != nil {
-		return
-	}
-	defer func() {
-		_ = p.Close() // 别忘记关闭 statement
-	}()
+	//o := orm.NewOrmUsingDB("rddp")
+	//p, err := o.Raw("UPDATE ppt_v2_group_mapping SET ppt_sort = group_ppt_id WHERE group_ppt_id = ?").Prepare()
+	//if err != nil {
+	//	return
+	//}
+	//defer func() {
+	//	_ = p.Close() // 别忘记关闭 statement
+	//}()
+	//for _, v := range groupPptIds {
+	//	_, err = p.Exec(v)
+	//	if err != nil {
+	//		return
+	//	}
+	//}
+	tx := global.DmSQL["rddp"].Begin()
 	for _, v := range groupPptIds {
-		_, err = p.Exec(v)
+		err = tx.Exec("UPDATE ppt_v2_group_mapping SET ppt_sort = group_ppt_id WHERE group_ppt_id = ?", v).Error
 		if err != nil {
+			tx.Rollback()
 			return
 		}
 	}
+	tx.Commit()
 	return
 }
 
 // DeletePptGroupMapping 删除ppt目录
 func DeletePptGroupMapping(groupId int64, adminId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM ppt_v2_group_mapping WHERE group_ppt_id=? and admin_id=? `
-	_, err = o.Raw(sql, groupId, adminId).Exec()
+	//_, err = o.Raw(sql, groupId, adminId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, groupId, adminId).Error
 	return
 }
 
 // DeletePptGroupMappingByPptId 删除ppt目录
 func DeletePptGroupMappingByPptId(pptId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM ppt_v2_group_mapping WHERE ppt_id=?`
-	_, err = o.Raw(sql, pptId).Exec()
+	//_, err = o.Raw(sql, pptId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, pptId).Error
 	return
 }
 
 // MoveUpGroupPptBySort 往上移动ppt
 func MoveUpGroupPptBySort(groupId, nextSort, currentSort int64) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `update ppt_v2_group_mapping set ppt_sort = ppt_sort + 1 where group_id=? and ppt_sort >= ? and ppt_sort< ?`
-	_, err = o.Raw(sql, groupId, nextSort, currentSort).Exec()
+	//_, err = o.Raw(sql, groupId, nextSort, currentSort).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, groupId, nextSort, currentSort).Error
 	return
 }
 
 // MoveDownGroupPptBySort 往下移动ppt
 func MoveDownGroupPptBySort(groupId, prevSort, currentSort int64) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `update ppt_v2_group_mapping set ppt_sort = ppt_sort - 1 where group_id=? and ppt_sort <= ? and ppt_sort> ? `
-	_, err = o.Raw(sql, groupId, prevSort, currentSort).Exec()
+	//_, err = o.Raw(sql, groupId, prevSort, currentSort).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, groupId, prevSort, currentSort).Error
 	return
 }
 
 // GetGroupPptByPptId 根据pptID 查找各个目录下的ppt
 func GetGroupPptByPptId(pptId int) (list []*PptV2GroupMapping, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `select * from ppt_v2_group_mapping where ppt_id=?`
-	_, err = o.Raw(sql, pptId).QueryRows(&list)
+	//_, err = o.Raw(sql, pptId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, pptId).Find(&list).Error
 	return
 }
 
@@ -165,7 +190,8 @@ func GetPublicGroupPptByPptIds(pptIds []string) (list []*PptV2GroupMapping, err
 	sql := qb.String()
 
 	// 执行 SQL 语句
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Raw(sql).QueryRows(&list)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql).Find(&list).Error
 	return
 }

models/report_author.go

@@ -1,49 +1,52 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
 type ReportAuthor struct {
-	Id           int       `orm:"column(id)" description:"报告作者ID"`
-	ReportAuthor string    `description:"报告作者名称"`
-	AuthorType   int       `description:"类型，1：中文；2：英文"`
-	Enable       int       `description:"是否启用，0：禁用，1：启用"`
-	IsDelete     int       `description:"是否删除，0：未删除，1：已删除"`
-	CreateTime   time.Time `description:"创建时间"`
-	ModifyTime   time.Time `description:"更新时间"`
+	Id           int       `gorm:"column:id"`            //`orm:"column(id)" description:"报告作者ID"`
+	ReportAuthor string    `gorm:"column:report_author"` //`description:"报告作者名称"`
+	AuthorType   int       `gorm:"column:author_type"`   //`description:"类型，1：中文；2：英文"`
+	Enable       int       `gorm:"column:enable"`        //`description:"是否启用，0：禁用，1：启用"`
+	IsDelete     int       `gorm:"column:is_delete"`     //`description:"是否删除，0：未删除，1：已删除"`
+	CreateTime   time.Time `gorm:"column:create_time"`   //`description:"创建时间"`
+	ModifyTime   time.Time `gorm:"column:modify_time"`   //`description:"更新时间"`
 }
 
 // GetReportAuthorList 获取报告作者列表
 func GetReportAuthorList(condition string, pars []interface{}, startSize, pageSize int) (total int, items []*ReportAuthor, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	baseSql := `  report_author WHERE is_delete=0 `
 	if condition != "" {
 		baseSql += condition
 	}
 
 	totalSql := ` SELECT count(1) total FROM ` + baseSql
-	err = o.Raw(totalSql, pars).QueryRow(&total)
+	//err = o.Raw(totalSql, pars).QueryRow(&total)
+	err = global.DmSQL["rddp"].Raw(totalSql, pars).Scan(&total).Error
 	if err != nil {
 		return
 	}
 
 	sql := ` SELECT * FROM ` + baseSql + ` ORDER BY id 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
 }
 
 // GetReportAuthorCount 获取报告作者列表数
 func GetReportAuthorCount(condition string, pars []interface{}) (total int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 
 	totalSql := ` SELECT count(1) total FROM report_author WHERE 1=1 `
 	if condition != "" {
 		totalSql += condition
 	}
-	err = o.Raw(totalSql, pars).QueryRow(&total)
+	//err = o.Raw(totalSql, pars).QueryRow(&total)
+	err = global.DmSQL["rddp"].Raw(totalSql, pars).Scan(&total).Error
 	return
 }
 
@@ -61,39 +64,45 @@ type AddReportAuthorReq struct {
 
 // GetReportAuthorById 根据作者id获取数据
 func GetReportAuthorById(authorId int) (item *ReportAuthor, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_author WHERE is_delete=0 AND id = ? `
-	err = o.Raw(sql, authorId).QueryRow(&item)
+	//err = o.Raw(sql, authorId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, authorId).First(&item).Error
 	return
 }
 
 // GetReportAuthorByAuthor 根据作者名称获取数据
 func GetReportAuthorByAuthor(title string, authorType int) (item *ReportAuthor, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_author WHERE is_delete=0 AND report_author=? AND author_type = ? `
-	err = o.Raw(sql, title, authorType).QueryRow(&item)
+	//err = o.Raw(sql, title, authorType).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, title, authorType).First(&item).Error
 	return
 }
 
 // GetReportAuthorByAuthorAndId 根据作者名称和作者id获取数据
 func GetReportAuthorByAuthorAndId(title string, authorType, authorId int) (item *ReportAuthor, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_author WHERE is_delete=0 AND report_author=? AND author_type = ? AND id != ? `
-	err = o.Raw(sql, title, authorType, authorId).QueryRow(&item)
+	//err = o.Raw(sql, title, authorType, authorId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, title, authorType, authorId).First(&item).Error
 	return
 }
 
 // AddReportAuthor 新增作者
 func AddReportAuthor(item *ReportAuthor) (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
+	lastId = int64(item.Id)
 	return
 }
 
 // Update 更新作者基础信息
 func (item *ReportAuthor) 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/report_chapter.go

@@ -1,85 +1,85 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/models/report"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // ReportChapter 报告章节
 type ReportChapter struct {
-	ReportChapterId     int       `orm:"column(report_chapter_id);pk" description:"报告章节ID"`
-	ReportId            int       `description:"报告ID"`
-	ReportType          string    `description:"报告类型 day-晨报 week-周报"`
-	ClassifyIdFirst     int       `description:"一级分类id"`
-	ClassifyNameFirst   string    `description:"一级分类名称"`
-	TypeId              int       `description:"品种ID"`
-	TypeName            string    `description:"品种名称"`
-	Title               string    `description:"标题"`
-	Abstract            string    `description:"摘要"`
-	AddType             int       `description:"新增方式：1:新增报告，2:继承报告"`
-	Author              string    `description:"作者"`
-	Content             string    `description:"内容"`
-	ContentSub          string    `description:"内容前两个章节"`
-	Stage               int       `description:"期数"`
-	Trend               string    `description:"趋势观点"`
-	Sort                int       `description:"排序: 数值越小越靠前"`
-	IsEdit              int       `description:"是否已编辑 0-待编辑 1-已编辑"`
-	PublishState        int       `description:"发布状态 1-待发布，2-已发布"`
-	PublishTime         time.Time `description:"发布时间"`
-	VideoUrl            string    `description:"音频文件URL"`
-	VideoName           string    `description:"音频文件名称"`
-	VideoPlaySeconds    string    `description:"音频播放时长"`
-	VideoSize           string    `description:"音频文件大小，单位M"`
-	VideoKind           int       `description:"音频生成方式:1,手动上传,2:自动生成"`
-	CreateTime          string    `description:"创建时间"`
-	ModifyTime          time.Time `description:"修改时间"`
-	OriginalVideoUrl    string    `description:"原始音频文件URL"`
-	ContentStruct       string    `description:"内容组件"`
-	LastModifyAdminId   int       `description:"最后更新人ID"`
-	LastModifyAdminName string    `description:"最后更新人姓名"`
-	ContentModifyTime   time.Time `description:"内容更新时间"`
-	ReportLayout        int8      `description:"报告布局，1：常规布局，2：智能布局。默认：1"`
-	ReportCreateTime    time.Time `description:"报告时间创建时间"`
-	VoiceGenerateType   int       `description:"音频生成方式，0：系统生成，1：人工上传"`
+	ReportChapterId     int       `gorm:"column:report_chapter_id;primaryKey;autoIncrement:false;not null" description:"报告章节ID"`
+	ReportId            int       `gorm:"column:report_id" description:"报告ID"`
+	ReportType          string    `gorm:"column:report_type" description:"报告类型 day-晨报 week-周报"`
+	ClassifyIdFirst     int       `gorm:"column:classify_id_first" description:"一级分类id"`
+	ClassifyNameFirst   string    `gorm:"column:classify_name_first" description:"一级分类名称"`
+	TypeId              int       `gorm:"column:type_id" description:"品种ID"`
+	TypeName            string    `gorm:"column:type_name" description:"品种名称"`
+	Title               string    `gorm:"column:title" description:"标题"`
+	Abstract            string    `gorm:"column:abstract" description:"摘要"`
+	AddType             int       `gorm:"column:add_type" description:"新增方式：1:新增报告，2:继承报告"`
+	Author              string    `gorm:"column:author" description:"作者"`
+	Content             string    `gorm:"column:content" description:"内容"`
+	ContentSub          string    `gorm:"column:content_sub" description:"内容前两个章节"`
+	Stage               int       `gorm:"column:stage" description:"期数"`
+	Trend               string    `gorm:"column:trend" description:"趋势观点"`
+	Sort                int       `gorm:"column:sort" description:"排序: 数值越小越靠前"`
+	IsEdit              int       `gorm:"column:is_edit" description:"是否已编辑 0-待编辑 1-已编辑"`
+	PublishState        int       `gorm:"column:publish_state" description:"发布状态 1-待发布，2-已发布"`
+	PublishTime         time.Time `gorm:"column:publish_time" description:"发布时间"`
+	VideoUrl            string    `gorm:"column:video_url" description:"音频文件URL"`
+	VideoName           string    `gorm:"column:video_name" description:"音频文件名称"`
+	VideoPlaySeconds    string    `gorm:"column:video_play_seconds" description:"音频播放时长"`
+	VideoSize           string    `gorm:"column:video_size" description:"音频文件大小，单位M"`
+	VideoKind           int       `gorm:"column:video_kind" description:"音频生成方式:1,手动上传,2:自动生成"`
+	CreateTime          string    `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime          time.Time `gorm:"column:modify_time" description:"修改时间"`
+	OriginalVideoUrl    string    `gorm:"column:original_video_url" description:"原始音频文件URL"`
+	ContentStruct       string    `gorm:"column:content_struct" description:"内容组件"`
+	LastModifyAdminId   int       `gorm:"column:last_modify_admin_id" description:"最后更新人ID"`
+	LastModifyAdminName string    `gorm:"column:last_modify_admin_name" description:"最后更新人姓名"`
+	ContentModifyTime   time.Time `gorm:"column:content_modify_time" description:"内容更新时间"`
+	ReportLayout        int8      `gorm:"column:report_layout" description:"报告布局，1：常规布局，2：智能布局。默认：1"`
+	ReportCreateTime    time.Time `gorm:"column:report_create_time" description:"报告时间创建时间"`
+	VoiceGenerateType   int       `gorm:"column:voice_generate_type" description:"音频生成方式，0：系统生成，1：人工上传"`
 }
 
 // ReportChapterItem 报告章节详情
 type ReportChapterItem struct {
-	ReportChapterId     int    `orm:"column(report_chapter_id);pk" description:"报告章节ID"`
-	ReportId            int    `description:"报告ID"`
-	ReportType          string `description:"报告类型 day-晨报 week-周报"`
-	ClassifyIdFirst     int    `description:"一级分类id"`
-	ClassifyNameFirst   string `description:"一级分类名称"`
-	TypeId              int    `description:"品种ID"`
-	TypeName            string `description:"品种名称"`
-	Title               string `description:"标题"`
-	Abstract            string `description:"摘要"`
-	AddType             int    `description:"新增方式：1:新增报告，2:继承报告"`
-	Author              string `description:"作者"`
-	Content             string `description:"内容"`
-	ContentSub          string `description:"内容前两个章节"`
-	Stage               int    `description:"期数"`
-	Trend               string `description:"趋势观点"`
-	Sort                int    `description:"排序: 数值越小越靠前"`
-	IsEdit              int    `description:"是否已编辑 0-待编辑 1-已编辑"`
-	PublishState        int    `description:"发布状态 1-待发布，2-已发布"`
-	PublishTime         string `description:"发布时间"`
-	VideoUrl            string `description:"音频文件URL"`
-	VideoName           string `description:"音频文件名称"`
-	VideoPlaySeconds    string `description:"音频播放时长"`
-	VideoSize           string `description:"音频文件大小，单位M"`
-	VideoKind           int    `description:"音频生成方式:1,手动上传,2:自动生成"`
-	CreateTime          string `description:"创建时间"`
-	ModifyTime          string `description:"修改时间"`
-	OriginalVideoUrl    string `description:"原始音频文件URL"`
-	ContentStruct       string `description:"内容组件"`
-	LastModifyAdminId   int    `description:"最后更新人ID"`
-	LastModifyAdminName string `description:"最后更新人姓名"`
-	ContentModifyTime   string `description:"内容更新时间"`
-	ReportLayout        int8   `description:"报告布局，1：常规布局，2：智能布局。默认：1"`
-	ReportCreateTime    string `description:"报告时间创建时间"`
+	ReportChapterId     int    `gorm:"column:report_chapter_id;primaryKey;autoIncrement:false;not null" description:"报告章节ID"`
+	ReportId            int    `gorm:"column:report_id" description:"报告ID"`
+	ReportType          string `gorm:"column:report_type" description:"报告类型 day-晨报 week-周报"`
+	ClassifyIdFirst     int    `gorm:"column:classify_id_first" description:"一级分类id"`
+	ClassifyNameFirst   string `gorm:"column:classify_name_first" description:"一级分类名称"`
+	TypeId              int    `gorm:"column:type_id" description:"品种ID"`
+	TypeName            string `gorm:"column:type_name" description:"品种名称"`
+	Title               string `gorm:"column:title" description:"标题"`
+	Abstract            string `gorm:"column:abstract" description:"摘要"`
+	AddType             int    `gorm:"column:add_type" description:"新增方式：1:新增报告，2:继承报告"`
+	Author              string `gorm:"column:author" description:"作者"`
+	Content             string `gorm:"column:content" description:"内容"`
+	ContentSub          string `gorm:"column:content_sub" description:"内容前两个章节"`
+	Stage               int    `gorm:"column:stage" description:"期数"`
+	Trend               string `gorm:"column:trend" description:"趋势观点"`
+	Sort                int    `gorm:"column:sort" description:"排序: 数值越小越靠前"`
+	IsEdit              int    `gorm:"column:is_edit" description:"是否已编辑 0-待编辑 1-已编辑"`
+	PublishState        int    `gorm:"column:publish_state" description:"发布状态 1-待发布，2-已发布"`
+	PublishTime         string `gorm:"column:publish_time" description:"发布时间"`
+	VideoUrl            string `gorm:"column:video_url" description:"音频文件URL"`
+	VideoName           string `gorm:"column:video_name" description:"音频文件名称"`
+	VideoPlaySeconds    string `gorm:"column:video_play_seconds" description:"音频播放时长"`
+	VideoSize           string `gorm:"column:video_size" description:"音频文件大小，单位M"`
+	VideoKind           int    `gorm:"column:video_kind" description:"音频生成方式:1,手动上传,2:自动生成"`
+	CreateTime          string `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime          string `gorm:"column:modify_time" description:"修改时间"`
+	OriginalVideoUrl    string `gorm:"column:original_video_url" description:"原始音频文件URL"`
+	ContentStruct       string `gorm:"column:content_struct" description:"内容组件"`
+	LastModifyAdminId   int    `gorm:"column:last_modify_admin_id" description:"最后更新人ID"`
+	LastModifyAdminName string `gorm:"column:last_modify_admin_name" description:"最后更新人姓名"`
+	ContentModifyTime   string `gorm:"column:content_modify_time" description:"内容更新时间"`
+	ReportLayout        int8   `gorm:"column:report_layout" description:"报告布局，1：常规布局，2：智能布局。默认：1"`
+	ReportCreateTime    string `gorm:"column:report_create_time" description:"报告时间创建时间"`
 }
 
 // ReportChapterItemResp
@@ -130,19 +130,19 @@ type ReportChapterResp struct {
 
 // GetChapterListByReportId 根据ReportId获取章节列表
 func GetChapterListByReportId(reportId int) (list []*ReportChapter, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter WHERE report_id = ? ORDER BY sort ASC`
-	_, err = o.Raw(sql, reportId).QueryRows(&list)
-
+	//_, err = o.Raw(sql, reportId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&list).Error
 	return
 }
 
 // GetPublishedChapterListByReportId 根据ReportId获取已发布章节列表
 func GetPublishedChapterListByReportId(reportId int) (list []*ReportChapter, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//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)
-
+	//_, err = o.Raw(sql, reportId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&list).Error
 	return
 }
 
@@ -186,10 +186,10 @@ type EditTickList struct {
 
 // GetReportChapterInfoById 根据主键获取报告章节
 func GetReportChapterInfoById(reportChapterId int) (item *ReportChapter, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter WHERE report_chapter_id = ? `
-	err = o.Raw(sql, reportChapterId).QueryRow(&item)
-
+	//err = o.Raw(sql, reportChapterId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, reportChapterId).First(&item).Error
 	return
 }
 
@@ -201,19 +201,19 @@ func GetReportChapterInfoById(reportChapterId int) (item *ReportChapter, err err
 // @return item *ReportChapterItem
 // @return err error
 func GetReportChapterItemById(reportChapterId int) (item *ReportChapterItem, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter WHERE report_chapter_id = ? `
-	err = o.Raw(sql, reportChapterId).QueryRow(&item)
-
+	//err = o.Raw(sql, reportChapterId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, reportChapterId).First(&item).Error
 	return
 }
 
 // GetLastPublishedReportChapter 获取上一篇已发表的晨周报章节
 func GetLastPublishedReportChapter(typeId int, reportType string) (item *ReportChapter, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter WHERE publish_state = 2 AND type_id = ? AND report_type = ? ORDER BY report_chapter_id DESC limit 1 `
-	err = o.Raw(sql, typeId, reportType).QueryRow(&item)
-
+	//err = o.Raw(sql, typeId, reportType).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, typeId, reportType).First(&item).Error
 	return
 }
 
@@ -224,21 +224,21 @@ func GetLastPublishedReportChapter(typeId int, reportType string) (item *ReportC
 // @datetime 2024-06-04 15:14:41
 // @return err error
 func (chapterChapterInfo *ReportChapter) Add() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	lastId, err := o.Insert(chapterChapterInfo)
-	if err != nil {
-		return
-	}
-	chapterChapterInfo.ReportChapterId = int(lastId)
-
+	//o := orm.NewOrmUsingDB("rddp")
+	//lastId, err := o.Insert(chapterChapterInfo)
+	//if err != nil {
+	//	return
+	//}
+	//chapterChapterInfo.ReportChapterId = int(lastId)
+	err = global.DmSQL["rddp"].Create(chapterChapterInfo).Error
 	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
 }
 
@@ -277,16 +277,16 @@ func UpdateChapterAndTicker(reportInfo *Report, chapterInfo *ReportChapter, upda
 
 // ReportChapterVideoList 报告章节音频列表
 type ReportChapterVideoList struct {
-	ReportId         int    `description:"报告ID"`
-	ReportChapterId  int    `description:"报告章节ID"`
-	VideoUrl         string `description:"音频文件URL"`
-	VideoName        string `description:"音频文件名称"`
-	VideoPlaySeconds string `description:"音频播放时长"`
+	ReportId         int    `gorm:"column:report_id"`          //`description:"报告ID"`
+	ReportChapterId  int    `gorm:"column:report_chapter_id"`  //`description:"报告章节ID"`
+	VideoUrl         string `gorm:"column:video_url"`          //`description:"音频文件URL"`
+	VideoName        string `gorm:"column:video_name"`         //`description:"音频文件名称"`
+	VideoPlaySeconds string `gorm:"column:video_play_seconds"` //`description:"音频播放时长"`
 }
 
 // GetReportChapterVideoList 获取报告章节音频列表
 func GetReportChapterVideoList(reportId int) (list []*ReportChapterVideoList, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT
 				report_id,
 				report_chapter_id,
@@ -299,8 +299,8 @@ func GetReportChapterVideoList(reportId int) (list []*ReportChapterVideoList, er
 				report_id = ? AND publish_state = 2 AND video_url != ""
 			ORDER BY
 				report_chapter_id ASC `
-	_, err = o.Raw(sql, reportId).QueryRows(&list)
-
+	//_, err = o.Raw(sql, reportId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&list).Error
 	return
 }
 
@@ -309,7 +309,7 @@ func GetReportChapterVideoListByReportIds(reportIds []int) (list []*ReportChapte
 	if len(reportIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT
 				report_id,
 				report_chapter_id,
@@ -322,8 +322,8 @@ func GetReportChapterVideoListByReportIds(reportIds []int) (list []*ReportChapte
 				report_id IN (` + utils.GetOrmInReplace(len(reportIds)) + `) AND publish_state = 2 AND video_url != ""
 			ORDER BY
 				report_chapter_id ASC `
-	_, err = o.Raw(sql, reportIds).QueryRows(&list)
-
+	//_, err = o.Raw(sql, reportIds).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, reportIds).Find(&list).Error
 	return
 }
 
@@ -332,7 +332,7 @@ func GetReportChapterVideoListByChapterIds(chapterIds []int) (list []*ReportChap
 	if len(chapterIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT
 				report_id,
 				report_chapter_id,
@@ -345,7 +345,8 @@ func GetReportChapterVideoListByChapterIds(chapterIds []int) (list []*ReportChap
 				report_chapter_id IN (` + utils.GetOrmInReplace(len(chapterIds)) + `) AND publish_state = 2
 			ORDER BY
 				report_chapter_id ASC `
-	_, err = o.Raw(sql, chapterIds).QueryRows(&list)
+	//_, err = o.Raw(sql, chapterIds).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, chapterIds).Find(&list).Error
 	return
 }
 
@@ -357,10 +358,10 @@ type PublishReportChapterReq struct {
 
 // CountPublishedChapterNum 获取报告已发布的章节数
 func CountPublishedChapterNum(reportId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT COUNT(1) AS ct FROM report_chapter WHERE report_id = ? AND publish_state = 2 `
-	err = o.Raw(sql, reportId).QueryRow(&count)
-
+	//err = o.Raw(sql, reportId).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).Scan(&count).Error
 	return
 }
 
@@ -372,10 +373,10 @@ func CountPublishedChapterNum(reportId int) (count int, err error) {
 // @return count int
 // @return err error
 func CountUnPublishedChapterNum(reportId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT COUNT(1) AS ct FROM report_chapter WHERE report_id = ? AND publish_state = 1 `
-	err = o.Raw(sql, reportId).QueryRow(&count)
-
+	//err = o.Raw(sql, reportId).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).Scan(&count).Error
 	return
 }
 
@@ -387,10 +388,10 @@ func CountUnPublishedChapterNum(reportId int) (count int, err error) {
 // @return list []*ReportChapter
 // @return err error
 func GetUnPublishedChapterList(reportId int) (list []*ReportChapter, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT report_chapter_id,report_id,title FROM report_chapter WHERE report_id = ? AND publish_state = 1 ORDER BY sort ASC`
-	_, err = o.Raw(sql, reportId).QueryRows(&list)
-
+	//_, err = o.Raw(sql, reportId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&list).Error
 	return
 }
 
@@ -399,9 +400,10 @@ func GetChapterListByChapterIds(chapterIds []int) (list []*ReportChapter, err er
 	if len(chapterIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter WHERE report_chapter_id IN (` + utils.GetOrmInReplace(len(chapterIds)) + `) ORDER BY sort ASC`
-	_, err = o.Raw(sql, chapterIds).QueryRows(&list)
+	//_, err = o.Raw(sql, chapterIds).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, chapterIds).Find(&list).Error
 	return
 }
 
@@ -410,9 +412,10 @@ func GetChapterSimpleListByChapterIds(chapterIds []int) (list []*ReportChapter,
 	if len(chapterIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT report_id, report_chapter_id, title, type_name, create_time, IF(publish_time,publish_time,create_time) as publish_time FROM report_chapter WHERE report_chapter_id IN (` + utils.GetOrmInReplace(len(chapterIds)) + `) ORDER BY publish_time desc, sort ASC`
-	_, err = o.Raw(sql, chapterIds).QueryRows(&list)
+	//	_, err = o.Raw(sql, chapterIds).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, chapterIds).Find(&list).Error
 	return
 }
 
@@ -421,25 +424,28 @@ func GetChapterSimpleListByReportIds(reportIds []int) (list []*ReportChapter, er
 	if len(reportIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT report_id, report_chapter_id, title, type_name, create_time, IF(publish_time,publish_time,create_time) as publish_time FROM report_chapter WHERE publish_state = 2 and report_id IN (` + utils.GetOrmInReplace(len(reportIds)) + `) ORDER BY publish_time desc, sort ASC`
-	_, err = o.Raw(sql, reportIds).QueryRows(&list)
+	//_, err = o.Raw(sql, reportIds).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, reportIds).Find(&list).Error
 	return
 }
 
 // UpdateReportChapterTypeNameByTypeId 更新章节类型名称
 func UpdateReportChapterTypeNameByTypeId(typeId int, typeName string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report_chapter SET type_name = ? WHERE type_id = ?`
-	_, err = o.Raw(sql, typeName, typeId).Exec()
+	//_, err = o.Raw(sql, typeName, typeId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, typeName, typeId).Error
 	return
 }
 
 // CountReportChapterByTypeId 通过章节类型ID获取章节数
 func CountReportChapterByTypeId(typeId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT COUNT(1) AS ct FROM report_chapter WHERE type_id = ?`
-	err = o.Raw(sql, typeId).QueryRow(&count)
+	//err = o.Raw(sql, typeId).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, typeId).Scan(&count).Error
 	return
 }
 
@@ -468,12 +474,12 @@ type EditReportChapterBaseInfoAndPermissionReq struct {
 // @return list []int
 // @return err error
 func GetReportChapterIdList(reportId int) (list []int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT report_chapter_id FROM report_chapter
 			WHERE report_id = ? 
 			ORDER BY report_chapter_id ASC `
-	_, err = o.Raw(sql, reportId).QueryRows(&list)
-
+	//_, err = o.Raw(sql, reportId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).Scan(&list).Error
 	return
 }
 
@@ -495,9 +501,10 @@ type ReportChapterMoveReq struct {
 // @return item *ReportChapter
 // @return err error
 func (chapterChapterInfo *ReportChapter) GetReportChapterById(reportChapterId int) (item *ReportChapter, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter WHERE report_chapter_id = ?`
-	err = o.Raw(sql, reportChapterId).QueryRow(&item)
+	//err = o.Raw(sql, reportChapterId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, reportChapterId).First(&item).Error
 	return
 }
 
@@ -512,7 +519,7 @@ func (chapterChapterInfo *ReportChapter) GetReportChapterById(reportChapterId in
 // @param updateSort string
 // @return err error
 func (chapterChapterInfo *ReportChapter) UpdateReportChapterSortByReportId(reportId, reportChapterId, nowSort int, updateSort string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	pars := make([]interface{}, 0)
 	sql := ` update report_chapter set sort = ` + updateSort + ` WHERE report_id = ? AND sort > ?`
 	pars = append(pars, reportId, nowSort)
@@ -522,8 +529,8 @@ func (chapterChapterInfo *ReportChapter) UpdateReportChapterSortByReportId(repor
 		pars = append(pars, reportChapterId, nowSort)
 	}
 
-	_, err = o.Raw(sql, pars).Exec()
-
+	//_, err = o.Raw(sql, pars).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, pars).Error
 	return
 }
 
@@ -536,9 +543,10 @@ func (chapterChapterInfo *ReportChapter) UpdateReportChapterSortByReportId(repor
 // @return item *ReportChapter
 // @return err error
 func (chapterChapterInfo *ReportChapter) GetFirstReportChapterByReportId(reportId int) (item *ReportChapter, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter WHERE 1 = 1 AND report_id = ? ORDER BY sort ASC, report_chapter_id ASC LIMIT 1`
-	err = o.Raw(sql, reportId).QueryRow(&item)
+	//err = o.Raw(sql, reportId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).First(&item).Error
 	return
 }
 
@@ -551,10 +559,10 @@ func (chapterChapterInfo *ReportChapter) GetFirstReportChapterByReportId(reportI
 // @return maxSort int
 // @return err error
 func (chapterChapterInfo *ReportChapter) GetMaxSortByReportId(reportId int) (maxSort int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT max(sort) AS sort FROM report_chapter WHERE report_id = ?`
-	err = o.Raw(sql, reportId).QueryRow(&maxSort)
-
+	//err = o.Raw(sql, reportId).QueryRow(&maxSort)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).Scan(&maxSort).Error
 	return
 }
 
@@ -566,9 +574,9 @@ func (chapterChapterInfo *ReportChapter) GetMaxSortByReportId(reportId int) (max
 // @param cols []string
 // @return err error
 func (chapterChapterInfo *ReportChapter) Update(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
 }
 
@@ -580,10 +588,10 @@ type DelReportChapterReq struct {
 
 // GetAllReportChapter 获取所有的报告章节
 func GetAllReportChapter() (items []*ReportChapter, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter ORDER BY report_chapter_id asc `
-	_, err = o.Raw(sql).QueryRows(&items)
-
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["rddp"].Raw(sql).Find(&items).Error
 	return
 }
 
@@ -596,12 +604,12 @@ func GetAllReportChapter() (items []*ReportChapter, err error) {
 // @return count int
 // @return err error
 func GetCountReportChapterByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT COUNT(1) AS count FROM report_chapter WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
-
+	//err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
 	return
 }

models/report_chapter_ticker.go

@@ -1,64 +1,66 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 type ReportChapterTicker struct {
-	Id              int       `orm:"column(id);pk" description:"主键ID"`
-	ReportChapterId int       `description:"报告章节ID"`
-	Sort            int       `description:"排序"`
-	Ticker          string    `description:"ticker"`
-	CreateTime      time.Time `description:"创建时间"`
-	UpdateTime      time.Time `description:"更新时间"`
+	Id              int       `gorm:"column:id;primaryKey"`     //`orm:"column(id);pk" description:"主键ID"`
+	ReportChapterId int       `gorm:"column:report_chapter_id"` //`description:"报告章节ID"`
+	Sort            int       `gorm:"column:sort"`              //`description:"排序"`
+	Ticker          string    `gorm:"column:ticker"`            //`description:"ticker"`
+	CreateTime      time.Time `gorm:"column:create_time"`       //`description:"创建时间"`
+	UpdateTime      time.Time `gorm:"column:update_time"`       //`description:"更新时间"`
 }
 
 // 新增章节ticker
 func InsertChapterTicker(tickerInfo *ReportChapterTicker) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	lastId, err = o.Insert(tickerInfo)
+	//o := orm.NewOrmUsingDB("rddp")
+	//lastId, err = o.Insert(tickerInfo)
+	err = global.DmSQL["rddp"].Create(tickerInfo).Error
+	lastId = int64(tickerInfo.Id)
 	return
 }
 
 // GetTickerListByReportChapterId 根据章节ID获取ticker列表
 func GetTickerListByReportChapterId(reportChapterId int) (list []*ReportChapterTicker, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_ticker WHERE report_chapter_id = ? ORDER BY sort ASC `
-	_, err = o.Raw(sql, reportChapterId).QueryRows(&list)
-
+	//_, err = o.Raw(sql, reportChapterId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, reportChapterId).Find(&list).Error
 	return
 }
 
 // ClearReportChapterTicker 清空章节ticker
 func ClearReportChapterTicker(reportChapterId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` DELETE FROM report_chapter_ticker WHERE report_chapter_id = ? `
-	_, err = o.Raw(sql, reportChapterId).Exec()
-
+	//_, err = o.Raw(sql, reportChapterId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, reportChapterId).Error
 	return
 }
 
 // DailyBaseColumn 基础列
 type DailyBaseColumn struct {
-	BaseColumnId          int       `orm:"column(base_column_id)" description:"主键ID"`
-	TableName             string    `description:"表名"`
-	BaseColumnName        string    `description:"列名称"`
-	BaseColumnChapterType string    `description:"列类型"`
-	BaseColumnTicker      string    `description:"指标"`
-	Enabled               int       `description:"状态"`
-	CreatedTime           time.Time `description:"创建时间"`
-	LastUpdatedTime       time.Time `description:"更新时间"`
-	Freq                  string    `description:"频率 D-日度 W-周度 M-月度"`
-	Catalog               string    `description:"分类名称"`
-	ReportChapterTypeId   int       `description:"分类ID"`
-	Selected              int       `description:"选中状态 0-未选中 1-已选中"`
+	BaseColumnId          int       `gorm:"column:base_column_id"`           //`orm:"column(base_column_id)" description:"主键ID"`
+	TableName             string    `gorm:"column:table_name"`               //`description:"表名"`
+	BaseColumnName        string    `gorm:"column:base_column_name"`         // `description:"列名称"`
+	BaseColumnChapterType string    `gorm:"column:base_column_chapter_type"` // `description:"列类型"`
+	BaseColumnTicker      string    `gorm:"column:base_column_ticker"`       // `description:"指标"`
+	Enabled               int       `gorm:"column:enabled"`                  // `description:"状态"`
+	CreatedTime           time.Time `gorm:"column:created_time"`             //`description:"创建时间"`
+	LastUpdatedTime       time.Time `gorm:"column:last_updated_time"`        //`description:"更新时间"`
+	Freq                  string    `gorm:"column:freq"`                     //`description:"频率 D-日度 W-周度 M-月度"`
+	Catalog               string    `gorm:"column:catalog"`                  //`description:"分类名称"`
+	ReportChapterTypeId   int       `gorm:"column:report_chapter_type_id"`   //`description:"分类ID"`
+	Selected              int       `gorm:"column:selected"`                 //`description:"选中状态 0-未选中 1-已选中"`
 }
 
 // GetDailyBaseColumnList 获取基础列列表
 func GetDailyBaseColumnList(keyword string, typeId int) (list []*DailyBaseColumn, err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	//o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM daily_base_column WHERE 1 = 1 `
 	pars := make([]interface{}, 0)
 	if keyword != "" {
@@ -67,7 +69,7 @@ func GetDailyBaseColumnList(keyword string, typeId int) (list []*DailyBaseColumn
 	}
 	pars = append(pars, typeId)
 	sql += ` AND report_chapter_type_id = ? `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
-
+	//_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DmSQL["weekly"].Raw(sql, pars).Find(&list).Error
 	return
 }

models/report_chapter_type.go

@@ -1,46 +1,47 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 type ReportChapterType struct {
-	ReportChapterTypeId        int       `orm:"column(report_chapter_type_id);pk" description:"报告章节类型id"`
-	ReportChapterTypeKey       string    `description:"章节key"`
-	ReportChapterTypeThumb     string    `description:"H5展示的图片"`
-	BannerUrl                  string    `description:"banner显示图片"`
-	ReportChapterTypeName      string    `description:"报告章节类型名称"`
-	Sort                       int       `description:"排序字段"`
-	Enabled                    int       `description:"启禁用状态"`
-	CreatedTime                time.Time `description:"创建时间"`
-	LastUpdatedTime            time.Time `description:"更新时间"`
-	ResearchType               string    `description:"研报类型"`
-	SelectedImage              string    `description:"选中时的图片"`
-	UnselectedImage            string    `description:"没选中时的图片"`
-	PcSelectedImage            string    `description:"PC-选中的图片"`
-	PcUnselectedImage          string    `description:"PC-未选中的图片"`
-	EditImgUrl                 string    `description:"管理后台编辑时选用的图"`
-	TickerTitle                string    `description:"指标列的标题"`
-	IsShow                     int       `description:"是否显示(研报小程序端根据此字段判断)"`
-	PauseStartTime             string    `description:"暂停开始日期"`
-	PauseEndTime               string    `description:"暂停结束日期"`
-	IsSet                      int       `description:"是否设置:0为设置,1已设置"`
-	YbIconUrl                  string    `description:"研报小程序icon"`
-	YbBottomIcon               string    `description:"研报小程序详情底部icon"`
-	ReportClassifyId           int       `description:"所属分类id"`
-	InheritReportChapterTypeId int       `description:"继承的报告章节类型id"`
+	ReportChapterTypeId        int       `gorm:"column:report_chapter_type_id"`         //`orm:"column(report_chapter_type_id);pk" description:"报告章节类型id"`
+	ReportChapterTypeKey       string    `gorm:"column:report_chapter_type_key"`        //`description:"章节key"`
+	ReportChapterTypeThumb     string    `gorm:"column:report_chapter_type_thumb"`      //`description:"H5展示的图片"`
+	BannerUrl                  string    `gorm:"column:banner_url"`                     //`description:"banner显示图片"`
+	ReportChapterTypeName      string    `gorm:"column:report_chapter_type_name"`       //`description:"报告章节类型名称"`
+	Sort                       int       `gorm:"column:sort"`                           //`description:"排序字段"`
+	Enabled                    int       `gorm:"column:enabled"`                        //`description:"启禁用状态"`
+	CreatedTime                time.Time `gorm:"column:created_time"`                   //`description:"创建时间"`
+	LastUpdatedTime            time.Time `gorm:"column:last_updated_time"`              //`description:"更新时间"`
+	ResearchType               string    `gorm:"column:research_type"`                  //`description:"研报类型"`
+	SelectedImage              string    `gorm:"column:selected_image"`                 //`description:"选中时的图片"`
+	UnselectedImage            string    `gorm:"column:unselected_image"`               //`description:"没选中时的图片"`
+	PcSelectedImage            string    `gorm:"column:pc_selected_image"`              //`description:"PC-选中的图片"`
+	PcUnselectedImage          string    `gorm:"column:pc_unselected_image"`            //`description:"PC-未选中的图片"`
+	EditImgUrl                 string    `gorm:"column:edit_img_url"`                   //`description:"管理后台编辑时选用的图"`
+	TickerTitle                string    `gorm:"column:ticker_title"`                   //`description:"指标列的标题"`
+	IsShow                     int       `gorm:"column:is_show"`                        //`description:"是否显示(研报小程序端根据此字段判断)"`
+	PauseStartTime             string    `gorm:"column:pause_start_time"`               //`description:"暂停开始日期"`
+	PauseEndTime               string    `gorm:"column:pause_end_time"`                 //`description:"暂停结束日期"`
+	IsSet                      int       `gorm:"column:is_set"`                         //`description:"是否设置:0为设置,1已设置"`
+	YbIconUrl                  string    `gorm:"column:yb_icon_url"`                    // `description:"研报小程序icon"`
+	YbBottomIcon               string    `gorm:"column:yb_bottom_icon"`                 // `description:"研报小程序详情底部icon"`
+	ReportClassifyId           int       `gorm:"column:report_classify_id"`             // `description:"所属分类id"`
+	InheritReportChapterTypeId int       `gorm:"column:inherit_report_chapter_type_id"` // `description:"继承的报告章节类型id"`
 }
 
 func (r *ReportChapterType) Create() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	id, err := o.Insert(r)
-	if err != nil {
-		return
-	}
-	r.ReportChapterTypeId = int(id)
+	//o := orm.NewOrmUsingDB("rddp")
+	//id, err := o.Insert(r)
+	//if err != nil {
+	//	return
+	//}
+	//r.ReportChapterTypeId = int(id)
+	err = global.DmSQL["rddp"].Create(r).Error
 	return
 }
 
@@ -55,22 +56,24 @@ func (r *ReportChapterType) MultiCreate(addList []*ReportChapterType) (err error
 	if len(addList) <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.InsertMulti(500, addList)
-
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.InsertMulti(500, addList)
+	err = global.DmSQL["rddp"].CreateInBatches(addList, utils.MultiAddNum).Error
 	return
 }
 
 func (r *ReportChapterType) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(r, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(r, cols...)
+	err = global.DmSQL["rddp"].Model(r).Select(cols).Updates(r).Error
 	return
 }
 
 // DeleteReportChapterType 删除章节类型及相关权限
 func DeleteReportChapterType(typeId int, reportType string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	to, err := o.Begin()
+	//o := orm.NewOrmUsingDB("rddp")
+	//to, err := o.Begin()
+	to := global.DmSQL["rddp"].Begin()
 	if err != nil {
 		return
 	}
@@ -84,64 +87,70 @@ func DeleteReportChapterType(typeId int, reportType string) (err error) {
 
 	// 删除章节类型
 	sql := `DELETE FROM report_chapter_type WHERE report_chapter_type_id = ? LIMIT 1`
-	_, err = to.Raw(sql, typeId).Exec()
-
+	//_, err = to.Raw(sql, typeId).Exec()
+	err = to.Exec(sql, typeId).Error
 	// 删除章节类型权限
 	sql = `DELETE FROM report_chapter_type_permission WHERE report_chapter_type_id = ?`
-	_, err = to.Raw(sql, typeId).Exec()
-
+	//_, err = to.Raw(sql, typeId).Exec()
+	err = to.Exec(sql, typeId).Error
 	// 周报-删除实际权限
 	if reportType == utils.REPORT_TYPE_WEEK {
 		sql = `DELETE FROM chart_permission_chapter_mapping WHERE report_chapter_type_id = ? AND research_type = ?`
-		_, err = to.Raw(sql, typeId, reportType).Exec()
+		//_, err = to.Raw(sql, typeId, reportType).Exec()
+		err = to.Exec(sql, typeId, reportType).Error
 	}
 	return
 }
 
 // GetReportChapterTypeById 获取章节类型
 func GetReportChapterTypeById(reportChapterTypeId int) (item *ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE report_chapter_type_id = ? `
-	err = o.Raw(sql, reportChapterTypeId).QueryRow(&item)
+	//err = o.Raw(sql, reportChapterTypeId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, reportChapterTypeId).First(&item).Error
 	return
 }
 
 // GetReportChapterTypeList 获取章节类型列表
 func GetReportChapterTypeList() (list []*ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE enabled = 1 `
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql).Find(&list).Error
 	return
 }
 
 // GetReportChapterTypeListByResearchType 通过报告类型获取章节类型列表
 func GetReportChapterTypeListByResearchType(researchType string) (list []*ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE research_type = ? AND enabled = 1`
-	_, err = o.Raw(sql, researchType).QueryRows(&list)
+	//_, err = o.Raw(sql, researchType).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, researchType).Find(&list).Error
 	return
 }
 
 // GetAllReportChapterTypeListByResearchType 通过报告类型获取章节类型列表
 func GetAllReportChapterTypeListByResearchType(researchType string) (list []*ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE research_type = ?`
-	_, err = o.Raw(sql, researchType).QueryRows(&list)
+	//_, err = o.Raw(sql, researchType).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, researchType).Find(&list).Error
 	return
 }
 
 // GetAllReportChapterTypeList 通过传入的条件获取所有的章节类型列表
 func GetAllReportChapterTypeList(condition string, pars []interface{}) (list []*ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE 1=1 `
 	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
 }
 
 // GetEnableReportChapterTypeList 获取未暂停的章节类型列表
 func GetEnableReportChapterTypeList(researchType string) (list []*ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT
 				*
 			FROM
@@ -157,22 +166,24 @@ func GetEnableReportChapterTypeList(researchType string) (list []*ReportChapterT
 					NOW() NOT BETWEEN pause_start_time AND pause_end_time
 				)
 			) `
-	_, err = o.Raw(sql, researchType).QueryRows(&list)
+	//_, err = o.Raw(sql, researchType).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, researchType).Find(&list).Error
 	return
 }
 
 // DayWeekReportPauseTime 晨报周报暂停时间
 type DayWeekReportPauseTime struct {
-	ResearchType   string `description:"报告类型 day; week;"`
-	PauseStartTime string `description:"暂停开始时间"`
-	PauseEndTime   string `description:"暂停结束时间"`
+	ResearchType   string `gorm:"column:research_type"`    //`description:"报告类型 day; week;"`
+	PauseStartTime string `gorm:"column:pause_start_time"` //`description:"暂停开始时间"`
+	PauseEndTime   string `gorm:"column:pause_end_time"`   //`description:"暂停结束时间"`
 }
 
 // GetDayWeekReportPauseTimeList 获取晨报周报暂停时间
 func GetDayWeekReportPauseTimeList() (list []*DayWeekReportPauseTime, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT research_type, MAX(a.pause_start_time) AS pause_start_time, MAX(a.pause_end_time) AS pause_end_time FROM report_chapter_type AS a WHERE a.is_set = 1 GROUP BY a.research_type`
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql).Find(&list).Error
 	return
 }
 
@@ -183,9 +194,9 @@ type SetDayWeekReportUpdateRuleReq struct {
 }
 
 type DayWeekReportUpdateRule struct {
-	ReportChapterTypeId int    `description:"章节类型ID"`
-	PauseStartTime      string `description:"暂停开始时间"`
-	PauseEndTime        string `description:"暂停结束时间"`
+	ReportChapterTypeId int    `gorm:"column:report_chapter_type_id"` //`description:"章节类型ID"`
+	PauseStartTime      string `gorm:"column:pause_start_time"`       //`description:"暂停开始时间"`
+	PauseEndTime        string `gorm:"column:pause_end_time"`         //`description:"暂停结束时间"`
 }
 
 // SetDayWeekReportEnableUpdateRuleReq 设置章节类型的永久暂停请求体
@@ -196,16 +207,18 @@ type SetDayWeekReportEnableUpdateRuleReq struct {
 
 // ResetDayWeekReportUpdateRule 重置章节类型的暂停时间
 func ResetDayWeekReportUpdateRule(researchType string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` UPDATE report_chapter_type SET pause_start_time = null, pause_end_time = null, is_set = 0 WHERE research_type = ?`
-	_, err = o.Raw(sql, researchType).Exec()
+	//_, err = o.Raw(sql, researchType).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, researchType).Error
 	return
 }
 
 // SetDayWeekReportUpdateRule 设置章节类型的暂停时间
 func SetDayWeekReportUpdateRule(researchType string, list []DayWeekReportUpdateRule) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	to, err := o.Begin()
+	//o := orm.NewOrmUsingDB("rddp")
+	//to, err := o.Begin()
+	to := global.DmSQL["rddp"].Begin()
 	if err != nil {
 		return
 	}
@@ -219,7 +232,8 @@ func SetDayWeekReportUpdateRule(researchType string, list []DayWeekReportUpdateR
 
 	// 先将所有品种的状态变更为启用
 	sql := ` UPDATE report_chapter_type SET pause_start_time = null, pause_end_time = null, is_set = 0 WHERE research_type = ?`
-	_, err = to.Raw(sql, researchType).Exec()
+	//_, err = to.Raw(sql, researchType).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, researchType).Error
 	if err != nil {
 		return
 	}
@@ -229,7 +243,8 @@ func SetDayWeekReportUpdateRule(researchType string, list []DayWeekReportUpdateR
 			continue
 		}
 		tmpSql := ` UPDATE report_chapter_type SET pause_start_time = ?, pause_end_time = ?, is_set = 1 WHERE research_type = ? AND report_chapter_type_id = ? `
-		_, err = to.Raw(tmpSql, v.PauseStartTime, v.PauseEndTime, researchType, v.ReportChapterTypeId).Exec()
+		//_, err = to.Raw(tmpSql, v.PauseStartTime, v.PauseEndTime, researchType, v.ReportChapterTypeId).Exec()
+		err = global.DmSQL["rddp"].Exec(tmpSql, v.PauseStartTime, v.PauseEndTime, researchType, v.ReportChapterTypeId).Error
 		if err != nil {
 			return
 		}
@@ -240,8 +255,9 @@ func SetDayWeekReportUpdateRule(researchType string, list []DayWeekReportUpdateR
 
 // SetDayWeekReportEnableUpdateRule 设置章节类型的禁用状态
 func SetDayWeekReportEnableUpdateRule(dayReportChapterTypeIdList, weekReportChapterTypeIdList []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	to, err := o.Begin()
+	//o := orm.NewOrmUsingDB("rddp")
+	//to, err := o.Begin()
+	to := global.DmSQL["rddp"].Begin()
 	if err != nil {
 		return
 	}
@@ -256,7 +272,8 @@ func SetDayWeekReportEnableUpdateRule(dayReportChapterTypeIdList, weekReportChap
 		researchType := `day`
 		// 先将所有品种的状态变更为启用
 		sql := ` UPDATE report_chapter_type SET enabled = 1 WHERE research_type = ?`
-		_, err = to.Raw(sql, researchType).Exec()
+		//_, err = to.Raw(sql, researchType).Exec()
+		err = global.DmSQL["rddp"].Exec(sql, researchType).Error
 		if err != nil {
 			return
 		}
@@ -265,7 +282,8 @@ func SetDayWeekReportEnableUpdateRule(dayReportChapterTypeIdList, weekReportChap
 		num := len(dayReportChapterTypeIdList)
 		if num > 0 {
 			sql = ` UPDATE report_chapter_type SET pause_start_time = null, pause_end_time = null, is_set = 0 , enabled = 0 WHERE research_type = ? AND report_chapter_type_id IN (` + utils.GetOrmInReplace(num) + `) `
-			_, err = to.Raw(sql, researchType, dayReportChapterTypeIdList).Exec()
+			//_, err = to.Raw(sql, researchType, dayReportChapterTypeIdList).Exec()
+			err = global.DmSQL["rddp"].Exec(sql, researchType, dayReportChapterTypeIdList).Error
 		}
 	}
 
@@ -273,7 +291,8 @@ func SetDayWeekReportEnableUpdateRule(dayReportChapterTypeIdList, weekReportChap
 		researchType := `week`
 		// 先将所有品种的状态变更为启用
 		sql := ` UPDATE report_chapter_type SET enabled = 1 WHERE research_type = ?`
-		_, err = to.Raw(sql, researchType).Exec()
+		//_, err = to.Raw(sql, researchType).Exec()
+		err = global.DmSQL["rddp"].Exec(sql, researchType).Error
 		if err != nil {
 			return
 		}
@@ -282,7 +301,8 @@ func SetDayWeekReportEnableUpdateRule(dayReportChapterTypeIdList, weekReportChap
 		num := len(weekReportChapterTypeIdList)
 		if num > 0 {
 			sql = ` UPDATE report_chapter_type SET pause_start_time = null, pause_end_time = null, is_set = 0 , enabled = 0 WHERE research_type = ? AND report_chapter_type_id IN (` + utils.GetOrmInReplace(num) + `) `
-			_, err = to.Raw(sql, researchType, weekReportChapterTypeIdList).Exec()
+			//_, err = to.Raw(sql, researchType, weekReportChapterTypeIdList).Exec()
+			err = global.DmSQL["rddp"].Exec(sql, researchType, weekReportChapterTypeIdList).Error
 		}
 	}
 	return
@@ -298,17 +318,19 @@ type StopUpdateReportChapterTypeResp struct {
 
 // GetStopUpdateReportChapterTypeListByResearchType 获取暂停更新章节类型列表
 func GetStopUpdateReportChapterTypeListByResearchType() (list []*ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE is_set = 1 AND pause_end_time >= ? AND enabled = 1 `
-	_, err = o.Raw(sql, time.Now().Format(utils.FormatDate)).QueryRows(&list)
+	//_, err = o.Raw(sql, time.Now().Format(utils.FormatDate)).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, time.Now().Format(utils.FormatDate)).First(&list).Error
 	return
 }
 
 // GetDisableUpdateReportChapterTypeListByResearchType 获取停止更新的章节类型列表
 func GetDisableUpdateReportChapterTypeListByResearchType() (list []*ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE enabled = 0`
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql).Find(&list).Error
 	return
 }
 
@@ -324,37 +346,39 @@ type ReportChapterTypeListResp struct {
 
 // GetReportChapterTypeCount 获取章节类型总数
 func GetReportChapterTypeCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT COUNT(1) FROM report_chapter_type WHERE 1 = 1 `
 	sql += condition
-	err = o.Raw(sql, pars).QueryRow(&count)
+	//err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 // GetReportChapterTypePageList 获取章节类型列表
 func GetReportChapterTypePageList(condition string, pars []interface{}) (list []*ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE 1 = 1 `
 	sql += condition
 	sql += ` ORDER BY sort ASC, created_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
 }
 
 // ReportChapterTypeListItem 章节类型列表信息
 type ReportChapterTypeListItem struct {
-	ReportChapterTypeId   int    `description:"报告章节类型id"`
-	ReportChapterTypeName string `description:"报告章节类型名称"`
-	Sort                  int    `description:"排序字段"`
-	CreatedTime           string `description:"创建时间"`
-	ResearchType          string `description:"研报类型"`
-	SelectedImage         string `description:"选中时的图片"`
-	UnselectedImage       string `description:"没选中时的图片"`
-	WordsImage            string `description:"带字的icon"`
-	EditImgUrl            string `description:"管理后台编辑时选用的图"`
-	IsShow                int    `description:"显示隐藏: 1-显示; 0-隐藏"`
-	ChartPermissionIdList []int  `description:"权限id数组"`
-	Enabled               int    `description:"是否可用，1可用，0禁用"`
+	ReportChapterTypeId   int    `gorm:"column:report_chapter_type_id"`   //`description:"报告章节类型id"`
+	ReportChapterTypeName string `gorm:"column:report_chapter_type_name"` //`description:"报告章节类型名称"`
+	Sort                  int    `gorm:"column:sort"`                     //`description:"排序字段"`
+	CreatedTime           string `gorm:"column:created_time"`             //`description:"创建时间"`
+	ResearchType          string `gorm:"column:research_type"`            //`description:"研报类型"`
+	SelectedImage         string `gorm:"column:selected_image"`           //`description:"选中时的图片"`
+	UnselectedImage       string `gorm:"column:unselected_image"`         //`description:"没选中时的图片"`
+	WordsImage            string `gorm:"column:words_image"`              //`description:"带字的icon"`
+	EditImgUrl            string `gorm:"column:edit_img_url"`             //`description:"管理后台编辑时选用的图"`
+	IsShow                int    `gorm:"column:is_show"`                  //`description:"显示隐藏: 1-显示; 0-隐藏"`
+	ChartPermissionIdList []int  `gorm:"-"`                               //`description:"权限id数组"`
+	Enabled               int    `gorm:"column:enabled"`                  //`description:"是否可用，1可用，0禁用"`
 }
 
 // ReportChapterTypeAddReq 新增章节类型请求体
@@ -407,63 +431,70 @@ type ReportChapterTypeEnabledReq struct {
 
 // GetReportChapterTypeByCondition 获取章节类型
 func GetReportChapterTypeByCondition(condition string, pars []interface{}) (item *ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE 1 = 1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	err = o.Raw(sql, pars).QueryRow(&item)
+	//err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&item).Error
 	return
 }
 
 // GetMaxSort 获取最大的排序值
 func (r *ReportChapterType) GetMaxSort() (maxSort int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT max(sort) AS sort FROM report_chapter_type`
-	err = o.Raw(sql).QueryRow(&maxSort)
+	//err = o.Raw(sql).QueryRow(&maxSort)
+	err = global.DmSQL["rddp"].Raw(sql).Scan(&maxSort).Error
 	return
 }
 
 // GetMaxSortByResearchType 获取最大的排序值
 func (r *ReportChapterType) GetMaxSortByResearchType(researchType string) (maxSort int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT max(sort) AS sort FROM report_chapter_type WHERE research_type = ?`
-	err = o.Raw(sql, researchType).QueryRow(&maxSort)
+	//err = o.Raw(sql, researchType).QueryRow(&maxSort)
+	err = global.DmSQL["rddp"].Raw(sql, researchType).Scan(&maxSort).Error
 	return
 }
 
 // UpdateReportChapterTypeSortByResearchType 根据父类id更新排序
 func UpdateReportChapterTypeSortByResearchType(researchType string, reportChapterTypeId, nowSort int, updateSort string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` update report_chapter_type set sort = ` + updateSort + ` WHERE research_type=? AND sort > ?`
 	if reportChapterTypeId > 0 {
 		sql += ` or ( report_chapter_type_id > ` + fmt.Sprint(reportChapterTypeId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
 	}
 
-	_, err = o.Raw(sql, researchType, nowSort).Exec()
+	//_, err = o.Raw(sql, researchType, nowSort).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, researchType, nowSort).Error
 	return
 }
 
 // GetFirstReportChapterTypeByParentId 获取当前父级分类下，且排序数相同 的排序第一条的数据
 func (r *ReportChapterType) GetFirstReportChapterTypeByResearchType(researchType string) (item *ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE 1 = 1 AND research_type = ? ORDER BY sort ASC, report_chapter_type_id ASC LIMIT 1`
-	err = o.Raw(sql, researchType).QueryRow(&item)
+	//err = o.Raw(sql, researchType).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, researchType).First(&item).Error
 	return
 }
 
 // GetReportChapterTypeById 获取章节类型
 func (r *ReportChapterType) GetReportChapterTypeById(reportChapterTypeId int) (item *ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE report_chapter_type_id = ?`
-	err = o.Raw(sql, reportChapterTypeId).QueryRow(&item)
+	//err = o.Raw(sql, reportChapterTypeId).QueryRow(&item)
+	err = global.DmSQL["rddp"].Raw(sql, reportChapterTypeId).First(&item).Error
 	return
 }
 
 // SetEnabled 更新启动禁用
 func (r *ReportChapterType) SetEnabled(id, enabled int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` update report_chapter_type set enabled = ? WHERE report_chapter_type_id = ?`
-	_, err = o.Raw(sql, enabled, id).Exec()
+	//_, err = o.Raw(sql, enabled, id).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, enabled, id).Error
 	return
 }
 
@@ -475,9 +506,10 @@ func (r *ReportChapterType) SetEnabled(id, enabled int) (err error) {
 // @return list []*ReportChapterType
 // @return err error
 func GetReportChapterTypeListByClassifyId(classifyId int) (list []*ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE report_classify_id = ? AND enabled = 1`
-	_, err = o.Raw(sql, classifyId).QueryRows(&list)
+	//_, err = o.Raw(sql, classifyId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, classifyId).Find(&list).Error
 	return
 }
 
@@ -489,8 +521,9 @@ func GetReportChapterTypeListByClassifyId(classifyId int) (list []*ReportChapter
 // @return list []*ReportChapterType
 // @return err error
 func GetAllReportChapterTypeListByClassifyId(classifyId int) (list []*ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE report_classify_id = ? `
-	_, err = o.Raw(sql, classifyId).QueryRows(&list)
+	//_, err = o.Raw(sql, classifyId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, classifyId).Find(&list).Error
 	return
 }

models/report_chapter_type_permission.go

@@ -1,19 +1,19 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 type ReportChapterTypePermission struct {
-	Id                    int       `orm:"column(id);pk" description:"主键ID"`
-	ReportChapterTypeId   int       `description:"报告章节类型ID"`
-	ReportChapterTypeName string    `description:"章节名称"`
-	ChartPermissionId     int       `description:"大分类ID"`
-	PermissionName        string    `description:"权限名称"`
-	ResearchType          string    `description:"研报类型"`
-	CreatedTime           time.Time `description:"创建时间"`
+	Id                    int       `gorm:"column:id;primaryKey"`            //`orm:"column(id);pk" description:"主键ID"`
+	ReportChapterTypeId   int       `gorm:"column:report_chapter_type_id`    //`description:"报告章节类型ID"`
+	ReportChapterTypeName string    `gorm:"column:report_chapter_type_name"` //`description:"章节名称"`
+	ChartPermissionId     int       `gorm:"column:chart_permission_id"`      //`description:"大分类ID"`
+	PermissionName        string    `gorm:"column:permission_name"`          //`description:"权限名称"`
+	ResearchType          string    `gorm:"column:research_type"`            //`description:"研报类型"`
+	CreatedTime           time.Time `gorm:"column:created_time"`             //`description:"创建时间"`
 }
 
 // GetChapterTypePermissionByReportChapterTypeId
@@ -24,16 +24,18 @@ type ReportChapterTypePermission struct {
 // @return list []*ReportChapterTypePermission
 // @return err error
 func GetChapterTypePermissionByReportChapterTypeId(typeId int) (list []*ReportChapterTypePermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type_permission WHERE report_chapter_type_id = ?  ORDER BY chart_permission_id ASC `
-	_, err = o.Raw(sql, typeId).QueryRows(&list)
+	//_, err = o.Raw(sql, typeId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, typeId).Find(&list).Error
 	return
 }
 
 // SetReportChapterTypePermission 设置报告章节类型权限
 func SetReportChapterTypePermission(chapterTypeId int, newPermissions []*ReportChapterTypePermission) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	to, err := o.Begin()
+	//o := orm.NewOrmUsingDB("rddp")
+	//to, err := o.Begin()
+	to := global.DmSQL["rddp"].Begin()
 	if err != nil {
 		return
 	}
@@ -47,14 +49,16 @@ func SetReportChapterTypePermission(chapterTypeId int, newPermissions []*ReportC
 
 	// 删除原章节类型权限
 	sql := `DELETE FROM report_chapter_type_permission WHERE report_chapter_type_id = ?`
-	_, err = to.Raw(sql, chapterTypeId).Exec()
+	//_, err = to.Raw(sql, chapterTypeId).Exec()
+	err = to.Exec(sql, chapterTypeId).Error
 	if err != nil {
 		return
 	}
 
 	// 新增章节类型权限
 	if len(newPermissions) > 0 {
-		_, err = to.InsertMulti(len(newPermissions), newPermissions)
+		//_, err = to.InsertMulti(len(newPermissions), newPermissions)
+		err = to.CreateInBatches(newPermissions, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -83,9 +87,10 @@ func SetReportChapterTypePermission(chapterTypeId int, newPermissions []*ReportC
 
 // GetChapterTypePermissionByResearchType 根据章节类型ID及研报类型获取章节类型权限列表
 func GetChapterTypePermissionByResearchType(researchType string) (list []*ReportChapterTypePermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type_permission WHERE research_type = ? ORDER BY chart_permission_id ASC `
-	_, err = o.Raw(sql, researchType).QueryRows(&list)
+	//_, err = o.Raw(sql, researchType).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, researchType).Find(&list).Error
 	return
 }
 
@@ -101,9 +106,10 @@ func GetChapterTypePermissionByChapterTypeIdList(chapterTypeIdList []int) (list
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type_permission WHERE report_chapter_type_id in (` + utils.GetOrmInReplace(num) + `) ORDER BY chart_permission_id ASC `
-	_, err = o.Raw(sql, chapterTypeIdList).QueryRows(&list)
+	//_, err = o.Raw(sql, chapterTypeIdList).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, chapterTypeIdList).Find(&list).Error
 	return
 }
 
@@ -114,8 +120,9 @@ func GetChapterTypePermissionByChapterTypeIdList(chapterTypeIdList []int) (list
 // @return list []*ReportChapterTypePermission
 // @return err error
 func GetAllChapterTypePermission() (list []*ReportChapterTypePermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type_permission ORDER BY chart_permission_id ASC `
-	_, err = o.Raw(sql).QueryRows(&list)
+	///_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql).Find(&list).Error
 	return
 }

models/report_grant.go

@@ -1,32 +1,34 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
+	"eta_gn/eta_api/utils"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 // ReportGrant Ppt授权表
 type ReportGrant struct {
-	GrantId      int64     `orm:"column(grant_id);pk;auto" description:"自增序号"`
-	ReportId     int64     `description:"report ID"`
-	DepartmentId int64     `description:"授权部门id"`
-	GrantAdminId int64     `description:"授权部门id"`
-	CreateTime   time.Time `orm:"auto_now_add;type(datetime)" description:"创建时间"`
+	GrantId      int64     `gorm:"column:grant_id"`       //`orm:"column(grant_id);pk;auto" description:"自增序号"`
+	ReportId     int64     `gorm:"column:report_id"`      //`description:"report ID"`
+	DepartmentId int64     `gorm:"column:department_id"`  //`description:"授权部门id"`
+	GrantAdminId int64     `gorm:"column:grant_admin_id"` //`description:"授权部门id"`
+	CreateTime   time.Time `gorm:"column:create_time"`    //`orm:"auto_now_add;type(datetime)" description:"创建时间"`
 }
 
 // GetReportGrantInfo 获取已经有权限的report列表
 func GetReportGrantInfo(reportId int) (list []*ReportGrant, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_grant WHERE report_id=? `
-	_, err = o.Raw(sql, reportId).QueryRows(&list)
+	//_, err = o.Raw(sql, reportId).QueryRows(&list)
+	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&list).Error
 	return
 }
 
 // MultiAddReportGrant 批量添加授权记录
 func MultiAddReportGrant(reportId int, list []*ReportGrant) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	to, err := o.Begin()
+	//o := orm.NewOrmUsingDB("rddp")
+	//to, err := o.Begin()
+	to := global.DmSQL["rddp"].Begin()
 	if err != nil {
 		return
 	}
@@ -39,14 +41,16 @@ func MultiAddReportGrant(reportId int, list []*ReportGrant) (err error) {
 	}()
 
 	sql := "DELETE from report_grant where report_id=?"
-	_, err = to.Raw(sql, reportId).Exec()
+	//_, err = to.Raw(sql, reportId).Exec()
+	err = to.Exec(sql, reportId).Error
 	if err != nil {
 		return
 	}
 
 	// 新增授权记录
 	if len(list) > 0 {
-		_, tmpErr := to.InsertMulti(len(list), list)
+		//_, tmpErr := to.InsertMulti(len(list), list)
+		tmpErr := to.CreateInBatches(list, utils.MultiAddNum).Error
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -58,9 +62,9 @@ func MultiAddReportGrant(reportId int, list []*ReportGrant) (err error) {
 
 // DeleteReportGrant 移除授权记录
 func DeleteReportGrant(reportId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := "DELETE from report_grant where report_id=?"
-	_, err = o.Raw(sql, reportId).Exec()
-
+	//_, err = o.Raw(sql, reportId).Exec()
+	err = global.DmSQL["rddp"].Exec(sql, reportId).Error
 	return
 }

models/report_ppt_img.go

@@ -1,18 +1,19 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
+	"eta_gn/eta_api/utils"
 	"time"
 )
 
 // ReportPptImg Ppt转报告的图片记录表
 type ReportPptImg struct {
-	ReportPptImgId  int       `orm:"column(report_ppt_img_id);pk;auto" description:"自增id"`
-	PptId           int       `description:"ppt的id"`
-	ReportId        int       `description:"关联的报告ID"`
-	ReportChapterId int       `description:"关联的报告章节ID"`
-	ImgUrl          string    `description:"ppt图片地址"`
-	CreateTime      time.Time `description:"创建时间"`
+	ReportPptImgId  int       `gorm:"column:report_ppt_img_id" json:"report_ppt_img_id"` //`orm:"column(report_ppt_img_id);pk;auto" description:"自增id"`
+	PptId           int       `gorm:"column:ppt_id"`                                     //`description:"ppt的id"`
+	ReportId        int       `gorm:"column:report_id"`                                  //`description:"关联的报告ID"`
+	ReportChapterId int       `gorm:"column:report_chapter_id"`                          //`description:"关联的报告章节ID"`
+	ImgUrl          string    `gorm:"column:img_url"`                                    // `description:"ppt图片地址"`
+	CreateTime      time.Time `gorm:"column:create_time"`                                //`description:"创建时间"`
 }
 
 // AddAndEditMultiReportPptImg 批量添加Ppt转报告的图片记录
@@ -20,9 +21,10 @@ func AddAndEditMultiReportPptImg(pptId int, reportPptImgList []*ReportPptImg) (e
 	if len(reportPptImgList) < 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("rddp")
-
-	to, err := o.Begin()
+	//o := orm.NewOrmUsingDB("rddp")
+	//
+	//to, err := o.Begin()
+	to := global.DmSQL["rddp"].Begin()
 	if err != nil {
 		return
 	}
@@ -34,10 +36,12 @@ func AddAndEditMultiReportPptImg(pptId int, reportPptImgList []*ReportPptImg) (e
 		}
 	}()
 	sql := ` DELETE FROM report_ppt_img WHERE ppt_id = ?`
-	_, err = to.Raw(sql, pptId).Exec()
+	//_, err = to.Raw(sql, pptId).Exec()
+	err = to.Exec(sql, pptId).Error
 	if err != nil {
 		return
 	}
-	_, err = to.InsertMulti(len(reportPptImgList), reportPptImgList)
+	//_, err = to.InsertMulti(len(reportPptImgList), reportPptImgList)
+	err = to.CreateInBatches(reportPptImgList, utils.MultiAddNum).Error
 	return
 }

models/report_state_record.go

@@ -1,22 +1,24 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"time"
 )
 
 type ReportStateRecord struct {
-	Id         int       `orm:"column(id)" description:"Id"`
-	ReportId   int       // 研报id
-	ReportType int       // 报告类型'报告类型：1中文研报2智能研报'
-	State      int       // 状态：1-未提交 2-待审核 3-驳回 4-审核
-	AdminId    int       // 操作人id
-	AdminName  string    // 操作人姓名
-	CreateTime time.Time // 创建时间
+	Id         int       `gorm:"column:id;primaryKey"` //`orm:"column(id)" description:"Id"`
+	ReportId   int       `gorm:"column:report_id"`     // 研报id
+	ReportType int       `gorm:"column:report_type"`   // 报告类型'报告类型：1中文研报2智能研报'
+	State      int       `gorm:"column:state"`         // 状态：1-未提交 2-待审核 3-驳回 4-审核
+	AdminId    int       `gorm:"column:admin_id"`      // 操作人id
+	AdminName  string    `gorm:"column:admin_name"`    // 操作人姓名
+	CreateTime time.Time `gorm:"column:create_time"`   // 创建时间
 }
 
 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
+	lastId = int64(item.Id)
 	return
 }

models/report_v2.go

@@ -5,7 +5,6 @@ import (
 	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/models/report"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 // AddReportAndChapter
@@ -227,8 +226,9 @@ func AddChapterBaseInfoAndPermission(reportChapterInfo *ReportChapter, addReport
 // @param delChapterPermissionMappingIdList []int
 // @return err error
 func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *ReportChapter, updateCols []string, addReportChapterGrantList []*report.ReportChapterGrant, addChapterPermissionMap []*report.ReportChapterPermissionMapping, delReportChapterGrantIdList, delChapterPermissionMappingIdList []int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	to, err := o.Begin()
+	//o := orm.NewOrmUsingDB("rddp")
+	//to, err := o.Begin()
+	to := global.DmSQL["rddp"].Begin()
 	if err != nil {
 		return
 	}
@@ -242,7 +242,8 @@ func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *Rep
 
 	// 变更报告的最后编辑人信息
 	{
-		_, err = to.Update(reportInfo, "LastModifyAdminId", "LastModifyAdminName", "ModifyTime")
+		//_, err = to.Update(reportInfo, "LastModifyAdminId", "LastModifyAdminName", "ModifyTime")
+		err = to.Select("LastModifyAdminId", "LastModifyAdminName", "ModifyTime").Updates(reportInfo).Error
 		if err != nil {
 			return
 		}
@@ -250,7 +251,8 @@ func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *Rep
 
 	// 变更报告章节信息
 	if len(updateCols) > 0 {
-		_, err = to.Update(reportChapterInfo, updateCols...)
+		//_, err = to.Update(reportChapterInfo, updateCols...)
+		err = to.Select(updateCols).Updates(reportChapterInfo).Error
 		if err != nil {
 			return
 		}
@@ -258,7 +260,8 @@ func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *Rep
 
 	// 新增报告章节授权用户
 	if len(addReportChapterGrantList) > 0 {
-		_, err = to.InsertMulti(500, addReportChapterGrantList)
+		//_, err = to.InsertMulti(500, addReportChapterGrantList)
+		err = to.CreateInBatches(addReportChapterGrantList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -268,7 +271,8 @@ func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *Rep
 	delNum := len(delReportChapterGrantIdList)
 	if delNum > 0 {
 		sql := `DELETE FROM report_chapter_grant WHERE grant_id IN (` + utils.GetOrmInReplace(delNum) + `)`
-		_, err = to.Raw(sql, delReportChapterGrantIdList).Exec()
+		//_, err = to.Raw(sql, delReportChapterGrantIdList).Exec()
+		err = to.Exec(sql, delReportChapterGrantIdList).Error
 		if err != nil {
 			return
 		}
@@ -276,7 +280,8 @@ func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *Rep
 
 	// 新增报告章节的品种配置
 	if len(addChapterPermissionMap) > 0 {
-		_, err = to.InsertMulti(500, addChapterPermissionMap)
+		//_, err = to.InsertMulti(500, addChapterPermissionMap)
+		err = to.CreateInBatches(addChapterPermissionMap, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -286,7 +291,8 @@ func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *Rep
 	delNum = len(delChapterPermissionMappingIdList)
 	if delNum > 0 {
 		sql := `DELETE FROM report_chapter_permission_mapping WHERE report_chapter_permission_mapping_id IN (` + utils.GetOrmInReplace(delNum) + `)`
-		_, err = to.Raw(sql, delChapterPermissionMappingIdList).Exec()
+		//_, err = to.Raw(sql, delChapterPermissionMappingIdList).Exec()
+		err = to.Exec(sql, delChapterPermissionMappingIdList).Error
 		if err != nil {
 			return
 		}
@@ -304,8 +310,9 @@ func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *Rep
 // @param reportChapterInfo *ReportChapter
 // @return err error
 func DelChapterAndPermission(reportInfo *Report, updateReportCols []string, reportChapterInfo *ReportChapter) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	to, err := o.Begin()
+	//o := orm.NewOrmUsingDB("rddp")
+	//to, err := o.Begin()
+	to := global.DmSQL["rddp"].Begin()
 	if err != nil {
 		return
 	}
@@ -319,7 +326,8 @@ func DelChapterAndPermission(reportInfo *Report, updateReportCols []string, repo
 
 	// 变更报告信息
 	if len(updateReportCols) > 0 {
-		_, err = to.Update(reportInfo, updateReportCols...)
+		//_, err = to.Update(reportInfo, updateReportCols...)
+		err = to.Select(updateReportCols).Updates(reportInfo).Error
 		if err != nil {
 			return
 		}
@@ -327,7 +335,8 @@ func DelChapterAndPermission(reportInfo *Report, updateReportCols []string, repo
 
 	// 删除报告对应章节
 	{
-		_, err = to.Delete(reportChapterInfo)
+		//	_, err = to.Delete(reportChapterInfo)
+		err = to.Delete(reportChapterInfo).Error
 		if err != nil {
 			return
 		}
@@ -336,7 +345,8 @@ func DelChapterAndPermission(reportInfo *Report, updateReportCols []string, repo
 	// 删除报告章节的授权用户权限
 	{
 		sql := `DELETE FROM report_chapter_grant WHERE report_chapter_id = ? `
-		_, err = to.Raw(sql, reportChapterInfo.ReportChapterId).Exec()
+		//_, err = to.Raw(sql, reportChapterInfo.ReportChapterId).Exec()
+		err = to.Exec(sql, reportChapterInfo.ReportChapterId).Error
 		if err != nil {
 			return
 		}
@@ -345,7 +355,8 @@ func DelChapterAndPermission(reportInfo *Report, updateReportCols []string, repo
 	// 删除报告章节的品种配置
 	{
 		sql := `DELETE FROM report_chapter_permission_mapping WHERE report_chapter_id = ? `
-		_, err = to.Raw(sql, reportChapterInfo.ReportChapterId).Exec()
+		//_, err = to.Raw(sql, reportChapterInfo.ReportChapterId).Exec()
+		err = to.Exec(sql, reportChapterInfo.ReportChapterId).Error
 		if err != nil {
 			return
 		}
@@ -363,14 +374,15 @@ func DelChapterAndPermission(reportInfo *Report, updateReportCols []string, repo
 // @return count int
 // @return err error
 func GetReportListCountByAuthorized(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COUNT(1) AS count  FROM report as a 
  WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 
-	err = o.Raw(sql, pars).QueryRow(&count)
+	//err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
 	return
 }
 
@@ -385,7 +397,7 @@ func GetReportListCountByAuthorized(condition string, pars []interface{}) (count
 // @return items []*ReportList
 // @return err error
 func GetReportListByAuthorized(condition string, pars []interface{}, startSize, pageSize int) (items []*ReportList, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
 
 	sql := `SELECT id,classify_id_first,classify_name_first,classify_id_second,classify_name_second,classify_id_third,classify_name_third,title,stage,create_time,author,report_layout,collaborate_type,is_public_publish,abstract,has_chapter,publish_time FROM report as a WHERE 1=1  `
 	if condition != "" {
@@ -393,7 +405,8 @@ func GetReportListByAuthorized(condition string, pars []interface{}, startSize,
 	}
 	// 排序：1:未发布；2:已发布；3-待提交；4-待审批；5-已驳回；6-已通过
 	sql += ` GROUP BY a.id ORDER BY  report_create_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
 }
 
@@ -410,8 +423,9 @@ func GetReportListByAuthorized(condition string, pars []interface{}, startSize,
 // @param currClassifyName string
 // @return err error
 func ModifyReportClassifyAndReportChapterTypeByCondition(condition string, pars []interface{}, updateStr string, chapterTypeIdMap map[int]int, oldClassifyId, currClassifyId int, currClassifyName string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	to, err := o.Begin()
+	//o := orm.NewOrmUsingDB("rddp")
+	//to, err := o.Begin()
+	to := global.DmSQL["rddp"].Begin()
 	if err != nil {
 		return
 	}
@@ -432,14 +446,16 @@ func ModifyReportClassifyAndReportChapterTypeByCondition(condition string, pars
 	if condition != "" {
 		sql += condition
 	}
-	_, err = to.Raw(sql, pars).Exec()
+	//_, err = to.Raw(sql, pars).Exec()
+	err = to.Exec(sql, pars).Error
 	if err != nil {
 		return
 	}
 
 	// 修改历史报告中的章节分类归属
 	sql = `UPDATE report_chapter set classify_id_first=?,classify_name_first=? where classify_id_first = ?`
-	_, err = to.Raw(sql, currClassifyId, currClassifyName, oldClassifyId).Exec()
+	//_, err = to.Raw(sql, currClassifyId, currClassifyName, oldClassifyId).Exec()
+	err = to.Exec(sql, currClassifyId, currClassifyName, oldClassifyId).Error
 	if err != nil {
 		return
 	}
@@ -450,7 +466,8 @@ func ModifyReportClassifyAndReportChapterTypeByCondition(condition string, pars
 			continue
 		}
 		tmpSql := `UPDATE report_chapter set type_id=? where type_id = ?`
-		_, err = to.Raw(tmpSql, currTypeId, oldTypeId).Exec()
+		//_, err = to.Raw(tmpSql, currTypeId, oldTypeId).Exec()
+		err = to.Exec(tmpSql, currTypeId, oldTypeId).Error
 		if err != nil {
 			return
 		}