改成gorm

models/binlog/binlog.go

@@ -1,6 +1,9 @@
 package binlog
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
+)
 
 // BinlogFormatStruct
 // @Description: 数据库的binlog格式
@@ -14,9 +17,9 @@ type BinlogFormatStruct struct {
 // @return item
 // @return err
 func GetBinlogFormat() (item *BinlogFormatStruct, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SHOW VARIABLES LIKE 'binlog_format'`
-	err = o.Raw(sql).QueryRow(&item)
+	err = o.Raw(sql).First(&item).Error
 	return
 }
 
@@ -30,8 +33,8 @@ type BinlogFileStruct struct {
 // @return item
 // @return err
 func GetShowMaster() (item *BinlogFileStruct, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `show master status`
-	err = o.Raw(sql).QueryRow(&item)
+	err = o.Raw(sql).First(&item).Error
 	return
 }

models/binlog/business_sys_interaction_log.go

@@ -3,7 +3,8 @@ package binlog
 import (
 	"time"
 
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 )
 
 // BusinessSysInteractionLog 商家系统交互记录表
@@ -40,15 +41,15 @@ var BusinessSysInteractionLogColumns = struct {
 
 // Create 添加数据
 func (m *BusinessSysInteractionLog) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Insert(m)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Create(m).Error
 	return
 }
 
 // Update 更新数据
 func (m *BusinessSysInteractionLog) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
@@ -57,8 +58,8 @@ var BinlogPositionKey = "binlog_edb_info_position" // binlog位置
 
 // GetBusinessSysInteractionLogByKey 根据记录key获取数据
 func GetBusinessSysInteractionLogByKey(key string) (item *BusinessSysInteractionLog, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := "SELECT * FROM business_sys_interaction_log WHERE interaction_key = ?"
-	err = o.Raw(sql, key).QueryRow(&item)
+	err = o.Raw(sql, key).First(&item).Error
 	return
 }

models/data_manage/base_from_ly_classify.go

@@ -5,7 +5,6 @@ package data_manage
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type BaseFromLyClassify struct {
@@ -31,10 +30,6 @@ type BaseFromLyClassifyAndIndexInfo struct {
 	IndexName            string `orm:"column(index_name)" description:"指标名称"`
 }
 
-func init() {
-	orm.RegisterModel(new(BaseFromLyClassify))
-}
-
 // GetAllLyClassify 查询所有分类
 func GetAllLyClassify() (items []*BaseFromLyClassify, err error) {
 	o := global.DbMap[utils.DbNameIndex]

models/data_manage/base_from_ly_index.go

@@ -6,7 +6,6 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"gorm.io/gorm"
 )
@@ -29,11 +28,6 @@ func (b *BaseFromLyIndex) AfterFind(db *gorm.DB) (err error) {
 	return
 }
 
-// 在 init 函数中注册模型
-func init() {
-	orm.RegisterModel(new(BaseFromLyIndex))
-}
-
 type BaseFromLyIndexPage struct {
 	List   []*BaseFromLyIndexAndData `description:"指标列表"`
 	Paging *paging.PagingItem        `description:"分页数据"`

models/data_manage/base_from_rzd_classify.go

@@ -4,7 +4,6 @@ package data_manage
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type BaseFromRzdClassify struct {
@@ -29,9 +28,6 @@ type BaseFromRzdClassifyResponse struct {
 	Child                 []*BaseFromRzdClassifyResponse
 }
 
-func init() {
-	orm.RegisterModel(new(BaseFromRzdClassify))
-}
 
 // GetAllRzdClassify 查询所有分类
 func GetAllRzdClassify() (items []*BaseFromRzdClassify, err error) {

models/data_manage/base_from_rzd_data.go

@@ -4,9 +4,8 @@ package data_manage
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"gorm.io/gorm"
 
-	"github.com/beego/beego/v2/client/orm"
+	"gorm.io/gorm"
 )
 
 type BaseFromRzdData struct {
@@ -50,9 +49,6 @@ type RzdIndexDataCountGroup struct {
 	Count     int
 }
 
-func init() {
-	orm.RegisterModel(new(BaseFromRzdData))
-}
 
 func GetRzdIndexDataCountGroup(indexCodes []string) (items []*RzdIndexDataCountGroup, err error) {
 	if len(indexCodes) <= 0 {

models/data_manage/base_from_rzd_index.go

@@ -6,9 +6,8 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
-	"gorm.io/gorm"
 
-	"github.com/beego/beego/v2/client/orm"
+	"gorm.io/gorm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
@@ -95,9 +94,6 @@ type BaseFromRzdIndexBatchAddCheckReq struct {
 	IsCheckAll     bool     `description:"是否全选"`
 }
 
-func init() {
-	orm.RegisterModel(new(BaseFromRzdIndex))
-}
 
 // GetRzdIndexByClassifyIds 根据分类id获取指标信息
 func GetRzdIndexByClassifyIds(classifyIds []int) (items []*BaseFromRzdIndex, err error) {

models/data_manage/chart_theme/chart_theme.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -72,9 +71,9 @@ func (m *ChartTheme) Update(cols []string) (err error) {
 // @return list []*ChartTheme
 // @return err error
 func GetChartThemeListByTypeId(chartThemeTypeId int) (list []*ChartTheme, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM chart_theme WHERE chart_theme_type_id = ? AND  is_delete=0 ORDER BY chart_theme_id ASC `
-	_, err = o.Raw(sql, chartThemeTypeId).QueryRows(&list)
+	err = o.Raw(sql, chartThemeTypeId).Find(&list).Error
 
 	return
 }
@@ -86,9 +85,9 @@ func GetChartThemeListByTypeId(chartThemeTypeId int) (list []*ChartTheme, err er
 // @return list []*ChartTheme
 // @return err error
 func GetAllChartThemeList() (list []*ChartTheme, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM chart_theme WHERE  is_delete=0 ORDER BY chart_theme_id ASC `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 
 	return
 }

models/data_manage/chart_theme/chart_theme_default_data.go

@@ -4,7 +4,6 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -32,8 +31,8 @@ func GetChartThemeDefaultDataList(endInfoId int) (list []*ChartThemeDefaultData,
 	sql := `SELECT * FROM chart_theme_default_data WHERE edb_info_id=? `
 
 	sql += ` ORDER BY data_time ASC `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, endInfoId).QueryRows(&list)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Raw(sql, endInfoId).Find(&list).Error
 	return
 }
 

models/data_manage/cross_variety/chart_tag.go

@@ -3,7 +3,6 @@ package cross_variety
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -52,13 +51,8 @@ func GetTagByName(name string) (item *ChartTag, err error) {
 // @param item *ChartTag
 // @return err error
 func AddTag(item *ChartTag) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-
-	item.ChartTagId = int(lastId)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Create(item).Error
 
 	return
 }
@@ -70,9 +64,9 @@ func AddTag(item *ChartTag) (err error) {
 // @return items []*ChartTag
 // @return err error
 func GetTagList() (items []*ChartTag, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM chart_tag WHERE 1 = 1 `
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Find(&items).Error
 
 	return
 }

models/data_manage/cross_variety/chart_tag_variety.go

@@ -5,7 +5,6 @@ import (
 	"eta/eta_api/models/data_manage/cross_variety/request"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -32,9 +31,9 @@ type ChartTagVariety struct {
 // @return item *ChartTagVariety
 // @return err error
 func GetChartTagVarietyByTagAndVariety(chartTagId, chartVarietyId int) (item *ChartTagVariety, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? AND chart_variety_id = ?`
-	err = o.Raw(sql, chartTagId, chartVarietyId).QueryRow(&item)
+	err = o.Raw(sql, chartTagId, chartVarietyId).First(&item).Error
 
 	return
 }
@@ -48,9 +47,9 @@ func GetChartTagVarietyByTagAndVariety(chartTagId, chartVarietyId int) (item *Ch
 // @return items []*ChartTagVariety
 // @return err error
 func GetChartTagVarietyListByTag(chartTagId int) (items []*ChartTagVariety, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? `
-	_, err = o.Raw(sql, chartTagId).QueryRows(&items)
+	err = o.Raw(sql, chartTagId).Find(&items).Error
 
 	return
 }
@@ -223,12 +222,12 @@ func SaveVarietyEdb(chartTagId int, list []request.VarietyEdbReq, sysUserId int,
 // @return total int
 // @return err error
 func GetCountByEdbInfoId(edbInfoId int) (total int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT count(1) total FROM chart_tag_variety a 
             INNER JOIN edb_info b ON a.edb_info_id=b.edb_info_id 
             INNER JOIN chart_tag AS c ON a.chart_tag_id=c.chart_tag_id
             WHERE a.edb_info_id = ?`
-	err = o.Raw(sql, edbInfoId).QueryRow(&total)
+	err = o.Raw(sql, edbInfoId).Scan(&total).Error
 
 	return
 }
@@ -254,9 +253,9 @@ func GetChartTagVarietyListByTagIdList(chartTagIdList []int) (items []*ChartTagV
 
 func DeleteChartTagVarietyByEdbInfoId(edbInfoId int) (err error) {
 	// 删除不存在的品种
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` DELETE FROM chart_tag_variety WHERE edb_info_id=?`
-	_, err = o.Raw(sql, edbInfoId, edbInfoId).Exec()
+	err = o.Exec(sql, edbInfoId).Error
 	if err != nil {
 		return
 	}

models/data_manage/cross_variety/chart_variety_mapping.go

@@ -3,7 +3,6 @@ package cross_variety
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -25,9 +24,9 @@ type ChartVarietyMapping struct {
 // @return items []*ChartVarietyMapping
 // @return err error
 func GetChartVarietyMappingList(chartInfoId int) (items []*ChartVarietyMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM chart_variety_mapping WHERE chart_info_id = ? `
-	_, err = o.Raw(sql, chartInfoId).QueryRows(&items)
+	err = o.Raw(sql, chartInfoId).Find(&items).Error
 	return
 }
 

models/data_manage/edb_data_ys.go

@@ -13,7 +13,6 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -48,10 +47,10 @@ func GetEdbDataYsMaxAndMinDate(edbCode string) (min_date, max_date string, err e
 
 // 有色
 func GetEdbDataByYs(edbCode, startDate, endDate string) (searchItem *EdbInfoSearch, err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
+	o := global.DbMap[utils.DbNameIndex]
+	to := o.Begin()
+	if to.Error != nil {
+		return nil, to.Error
 	}
 	searchItem = new(EdbInfoSearch)
 	searchItem.EdbCode = edbCode
@@ -84,7 +83,7 @@ func GetEdbDataByYs(edbCode, startDate, endDate string) (searchItem *EdbInfoSear
 		addSql = strings.TrimRight(addSql, ",")
 		addSql = utils.ReplaceDriverKeywords("", addSql)
 		utils.FileLog.Info("addSql:" + addSql)
-		_, err = to.Raw(addSql).Exec()
+		err = to.Exec(addSql).Error
 		if err != nil {
 			return searchItem, err
 		}
@@ -115,10 +114,10 @@ func GetEdbDataByYs(edbCode, startDate, endDate string) (searchItem *EdbInfoSear
 
 // 全部刷新有色数据
 func RefreshAllEdbDataByYs(edbInfoId, source, subSource int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
+	o := global.DbMap[utils.DbNameIndex]
+	to := o.Begin()
+	if to.Error != nil {
+		return to.Error
 	}
 	defer func() {
 		if err != nil {
@@ -143,7 +142,7 @@ func RefreshAllEdbDataByYs(edbInfoId, source, subSource int, edbCode, startDate,
 	dataTableName := GetEdbDataTableName(source, subSource)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	_, err = to.Raw(sql, edbInfoId).QueryRows(&existDataList)
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}
@@ -154,7 +153,7 @@ func RefreshAllEdbDataByYs(edbInfoId, source, subSource int, edbCode, startDate,
 
 	smmDateList := make([]*BaseFromSmmDataSimple, 0)
 	smmSql := ` SELECT * FROM base_from_smm_data WHERE index_code=? AND data_time>=? `
-	_, err = to.Raw(smmSql, edbCode, startDate).QueryRows(&smmDateList)
+	err = to.Raw(smmSql, edbCode, startDate).Find(&smmDateList).Error
 	if err != nil {
 		return err
 	}
@@ -175,7 +174,7 @@ func RefreshAllEdbDataByYs(edbInfoId, source, subSource int, edbCode, startDate,
 			if existVal != sv.Value {
 				sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 				sql = fmt.Sprintf(sql, dataTableName)
-				_, err = to.Raw(sql, sv.Value, edbInfoId, sv.DataTime).Exec()
+				err = to.Exec(sql, sv.Value, edbInfoId, sv.DataTime).Error
 				if err != nil {
 					return err
 				}
@@ -185,7 +184,7 @@ func RefreshAllEdbDataByYs(edbInfoId, source, subSource int, edbCode, startDate,
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		addSql = utils.ReplaceDriverKeywords("", addSql)
-		_, err = to.Raw(addSql).Exec()
+		err = to.Exec(addSql).Error
 		if err != nil {
 			return err
 		}

models/data_manage/edb_info.go

@@ -772,6 +772,17 @@ func (edbInfoMaxAndMinInfo *EdbInfoMaxAndMinInfo) AfterFind(tx *gorm.DB) (err er
 	return
 }
 
+func (edbInfoMaxAndMinInfo *EdbInfoMaxAndMinInfo) ConvertTimeStr() {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if edbInfoMaxAndMinInfo.MinDate != "" {
+			edbInfoMaxAndMinInfo.MinDate = utils.GormDateStrToDateStr(edbInfoMaxAndMinInfo.MinDate)
+		}
+		if edbInfoMaxAndMinInfo.MaxDate != "" {
+			edbInfoMaxAndMinInfo.MaxDate = utils.GormDateStrToDateStr(edbInfoMaxAndMinInfo.MaxDate)
+		}
+	}
+}
+
 // GetEdbInfoMaxAndMinInfo
 // @Description: 获取指标最大最小值
 // @author: Roc
@@ -813,6 +824,7 @@ func GetEdbInfoMaxAndMinInfoByMysql(source, subSource int, edbCode string) (item
 	if err != nil {
 		return
 	}
+	item.ConvertTimeStr()
 	var latest_value float64
 	sql = ` SELECT value AS latest_value FROM %s WHERE edb_code=? ORDER BY data_time DESC LIMIT 1 `
 	sql = fmt.Sprintf(sql, tableName)

models/data_manage/excel/excel_classify.go

@@ -4,7 +4,6 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -132,13 +131,13 @@ func GetExcelClassifyByCondition(condition string, pars []interface{}) (item *Ex
 
 // GetNextExcelClassifyByCondition 获取下一个分类
 func GetNextExcelClassifyByCondition(condition string, pars []interface{}) (item *ExcelClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM excel_classify WHERE 1=1 AND is_delete=0 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += " ORDER BY sort asc , create_time ASC LIMIT 1 "
-	err = o.Raw(sql, pars...).QueryRow(&item)
+	err = o.Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -183,9 +182,9 @@ type ExcelClassifyView struct {
 }
 
 func GetExcelClassifyViewById(classifyId int) (item *ExcelClassifyView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM excel_classify WHERE excel_classify_id=? AND is_delete=0 `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = o.Raw(sql, classifyId).First(&item).Error
 	return
 }
 
@@ -218,9 +217,9 @@ func GetAdminExcelClassifyBySource(source, adminId int) (items []*ExcelClassifyI
 }
 
 func GetExcelClassifyModelBySource(source int) (items []*ExcelClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM excel_classify WHERE source = ? AND is_delete = 0 ORDER BY sort ASC, excel_classify_id ASC`
-	_, err = o.Raw(sql, source).QueryRows(&items)
+	err = o.Raw(sql, source).Find(&items).Error
 	return
 }
 

models/data_manage/excel/excel_draft.go

@@ -3,7 +3,6 @@ package excel
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -26,8 +25,8 @@ func AddExcelDraft(excelDraft *ExcelDraft) (err error) {
 
 // GetLastExcelDraftById 根据沙盘id获取最后一条沙盘草稿详情
 func GetLastExcelDraftById(excelId int) (excelDraft *ExcelDraft, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `select * from excel_draft where excel_id = ? order by excel_draft_id desc `
-	err = o.Raw(sql, excelId).QueryRow(&excelDraft)
+	err = o.Raw(sql, excelId).First(&excelDraft).Error
 	return
 }

models/data_manage/excel/excel_edb_mapping.go

@@ -4,7 +4,6 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -20,8 +19,8 @@ type ExcelEdbMapping struct {
 
 // AddExcelEdbMappingMulti 批量添加excel与指标的关系
 func AddExcelEdbMappingMulti(items []*ExcelEdbMapping) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
@@ -40,10 +39,10 @@ func (e *ExcelEdbMapping) Update(cols []string) (err error) {
 
 // GetExcelEdbMappingByEdbInfoId 根据指标id获取配置关系
 func GetExcelEdbMappingByEdbInfoId(edbInfoId int) (items []*ExcelEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT *  FROM excel_edb_mapping WHERE 1=1 AND edb_info_id = ? `
 
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
+	err = o.Raw(sql, edbInfoId).Find(&items).Error
 	return
 }
 
@@ -86,11 +85,11 @@ func GetAllExcelEdbMappingItemByExcelInfoId(excelInfoId int) (items []*ExcelEdbM
 
 // GetNoCustomAnalysisExcelEdbMappingCount 根据指标id获取非自定义分析的关联关系
 func GetNoCustomAnalysisExcelEdbMappingCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT COUNT(1) AS count FROM excel_edb_mapping a 
                           join excel_info b on a.excel_info_id=b.excel_info_id
                           WHERE edb_info_id=? AND a.source != 4 AND b.is_delete = 0`
-	err = o.Raw(sql, edbInfoId).QueryRow(&count)
+	err = o.Raw(sql, edbInfoId).Scan(&count).Error
 	return
 }
 

models/data_manage/excel/excel_sheet.go

@@ -3,7 +3,6 @@ package excel
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -29,14 +28,9 @@ func (excelSheet *ExcelSheet) Update(cols []string) (err error) {
 
 // AddExcelSheet 新增excel表格的sheet基础信息
 func AddExcelSheet(excelInfo *ExcelSheet) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	// 表格信息入库
-	lastId, err := o.Insert(excelInfo)
-	if err != nil {
-		return
-	}
-	excelInfo.ExcelInfoId = int(lastId)
-
+	err = o.Create(excelInfo).Error
 	return
 }
 

models/data_manage/excel/excel_sheet_data.go

@@ -3,7 +3,6 @@ package excel
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -20,21 +19,16 @@ type ExcelSheetData struct {
 
 // Update 更新 excel表格的sheet基础信息
 func (ExcelSheetData *ExcelSheetData) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(ExcelSheetData, cols...)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Model(ExcelSheetData).Select(cols).Updates(ExcelSheetData).Error
 
 	return
 }
 
 // AddExcelSheetData 新增excel表格的sheet基础信息
 func AddExcelSheetData(excelInfo *ExcelSheetData) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	// 表格信息入库
-	lastId, err := o.Insert(excelInfo)
-	if err != nil {
-		return
-	}
-	excelInfo.ExcelInfoId = int(lastId)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Create(excelInfo).Error
 
 	return
 }

models/data_manage/stl/calculate_stl_config_mapping.go

@@ -5,7 +5,6 @@ import (
 
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type CalculateStlConfigMapping struct {
@@ -18,9 +17,12 @@ type CalculateStlConfigMapping struct {
 }
 
 func (c *CalculateStlConfigMapping) Insert() (insertId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	insertId, err = o.Insert(c)
-	err = global.DbMap[utils.DbNameIndex].Create(c).Error
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Create(c).Error
+	if err != nil {
+		return
+	}
+	insertId = int64(c.Id)
 	return
 }
 

models/data_manage/stl/edb_data_calculate_stl.go

@@ -4,8 +4,6 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type EdbDataCalculateStl struct {
@@ -20,9 +18,9 @@ type EdbDataCalculateStl struct {
 }
 
 func GetEdbDataCalculateStlByEdbCode(edbCode string) (items []*EdbDataCalculateStl, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM edb_data_calculate_stl WHERE edb_code =? ORDER BY data_time`
-	_, err = o.Raw(sql, edbCode).QueryRows(&items)
+	err = o.Raw(sql, edbCode).Find(&items).Error
 	return
 }
 
@@ -45,14 +43,14 @@ func DeleteAndInsertEdbDataCalculateStl(edbCode string, dataList []*EdbDataCalcu
 }
 
 func (m *EdbDataCalculateStl) GetMaxId() (maxId int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT max(edb_data_id) id FROM edb_data_calculate_stl limit 1`
-	err = o.Raw(sql).QueryRow(&maxId)
+	err = o.Raw(sql).Scan(&maxId).Error
 	return
 }
 
 func (m *EdbDataCalculateStl) BatchInsert(dataList []*EdbDataCalculateStl) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(utils.MultiAddNum, dataList)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.CreateInBatches(dataList, utils.MultiAddNum).Error
 	return
 }

models/data_manage/supply_analysis/base_from_stock_plant_data.go

@@ -3,7 +3,6 @@ package supply_analysis
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -53,7 +52,7 @@ func GetVarietyEdbDataListByIdList(varietyEdbIdList []int) (items []*BaseFromSto
 	}
 	sql := `SELECT * FROM  (SELECT * FROM base_from_stock_plant_data AS a WHERE a.variety_edb_id in (` + utils.GetOrmInReplace(num) + `) GROUP BY data_time) d ORDER BY data_time DESC `
 	//sql := ` SELECT  DT FROM edbdata WHERE TRADE_CODE IN(` + tradeCode + `)  GROUP BY DT ORDER BY DT DESC `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, varietyEdbIdList).QueryRows(&items)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Raw(sql, varietyEdbIdList).Find(&items).Error
 	return
 }

models/data_manage/trade_analysis/trade_analysis.go

@@ -3,8 +3,7 @@ package trade_analysis
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"fmt"
-	"github.com/beego/beego/v2/client/orm"
+	"fmt"	
 	"strings"
 	"time"
 )
@@ -170,8 +169,8 @@ type LastTimeItem struct {
 func GetExchangeLastTime(exchange string) (item LastTimeItem, err error) {
 	tableName := "base_from_trade_" + exchange + "_index"
 	sql := `SELECT create_time FROM ` + tableName + ` ORDER BY create_time desc`
-	o := orm.NewOrmUsingDB("data")
-	err = o.Raw(sql).QueryRow(&item)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Raw(sql).Scan(&item).Error
 
 	return
 }

models/document_manage_model/outside_report_attachment.go

@@ -5,7 +5,6 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 
-	"github.com/beego/beego/v2/client/orm"
 	"gorm.io/gorm"
 )
 
@@ -23,11 +22,6 @@ func (o *OutsideReportAttachment) AfterFind(db *gorm.DB) (err error) {
 	return
 }
 
-// 在 init 函数中注册模型
-func init() {
-	orm.RegisterModel(new(OutsideReportAttachment))
-}
-
 // SaveOutsideReportAttachment 保存附件
 func SaveOutsideReportAttachment(attachment *OutsideReportAttachment) (int64, error) {
 	o := global.DbMap[utils.DbNameReport]

models/english_policy_report.go

@@ -4,9 +4,9 @@ import (
 	sql2 "database/sql"
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 // 英文策略报告
@@ -153,9 +153,9 @@ type PullEnglishPolicyDataResp struct {
 
 // 同步报告
 func SyncEnglishPolicyReportById(id, newReportId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `UPDATE english_policy_report SET state=2, sync_time=now(),modify_time=NOW(), sync_report_id=? WHERE id = ? `
-	_, err = o.Raw(sql, newReportId, id).Exec()
+	err = o.Exec(sql, newReportId, id).Error
 	return
 }
 

models/ppt_v2_group_mapping.go

@@ -5,8 +5,6 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 // ppt目录和ppt 映射表
@@ -162,19 +160,20 @@ func GetGroupPptByPptId(pptId int) (list []*PptV2GroupMapping, err error) {
 
 // GetPublicGroupPptByPptIds 根据pptid查询公共目录下的ppt
 func GetPublicGroupPptByPptIds(pptIds []string) (list []*PptV2GroupMapping, err error) {
-	qb, _ := orm.NewQueryBuilder("mysql")
-	// 构建查询对象
-	qb.Select("p.*").
-		From("ppt_v2_group as g").
-		InnerJoin("ppt_v2_group_mapping as p").On("g.group_id = p.group_id").
-		Where("g.is_share = 1 and p.ppt_id").In(pptIds...).
-		OrderBy("g.share_time asc, p.ppt_sort asc")
-
-	// 导出 SQL 语句
-	sql := qb.String()
-
+	// qb, _ := orm.NewQueryBuilder("mysql")
+	// // 构建查询对象
+	// qb.Select("p.*").
+	// 	From("ppt_v2_group as g").
+	// 	InnerJoin("ppt_v2_group_mapping as p").On("g.group_id = p.group_id").
+	// 	Where("g.is_share = 1 and p.ppt_id").In(pptIds...).
+	// 	OrderBy("g.share_time asc, p.ppt_sort asc")
+
+	// // 导出 SQL 语句
+	// sql := qb.String()
+	sql := `select p.* from ppt_v2_group as g inner join ppt_v2_group_mapping as p on g.group_id = p.group_id where g.is_share = 1 and p.ppt_id in (?) order by g.share_time asc, p.ppt_sort asc`
+	
 	// 执行 SQL 语句
 	o := global.DbMap[utils.DbNameReport]
-	err = o.Raw(sql).Find(&list).Error
+	err = o.Raw(sql, pptIds).Find(&list).Error
 	return
 }

models/residual_analysis_model/calculate_residual_analysis_config.go

@@ -3,7 +3,6 @@ package residual_analysis_model
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -15,9 +14,6 @@ type CalculateResidualAnalysisConfig struct {
 	ModifyTime                        time.Time `orm:"column(modify_time)" description:"修改时间"`
 }
 
-func init() {
-	orm.RegisterModel(new(CalculateResidualAnalysisConfig))
-}
 
 // ResidualAnalysisReq 残差分析预览请求
 type ResidualAnalysisReq struct {

models/residual_analysis_model/calculate_residual_analysis_config_mapping.go

@@ -3,7 +3,6 @@ package residual_analysis_model
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -17,9 +16,6 @@ type CalculateResidualAnalysisConfigMapping struct {
 	ModifyTime                               time.Time `orm:"column(modify_time)" description:"修改时间"`
 }
 
-func init() {
-	orm.RegisterModel(new(CalculateResidualAnalysisConfigMapping))
-}
 
 // GetConfigMappingListByConfigId 根据配置配置id查询配置信息
 func GetConfigMappingListByConfigId(configId int) (items []CalculateResidualAnalysisConfigMapping, err error) {

models/residual_analysis_model/edb_data_residual_analysis.go

@@ -3,7 +3,6 @@ package residual_analysis_model
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -18,9 +17,6 @@ type edbDataResidualAnalysis struct {
 	DataTimeStamp int64     `orm:"column(data_timestamp)" gorm:"column:data_timestamp"`
 }
 
-func init() {
-	orm.RegisterModel(new(edbDataResidualAnalysis))
-}
 
 // DeleteResidualAnalysisDataByEdbCode 根据指标编码删除数据
 func DeleteResidualAnalysisDataByEdbCode(edbCode string) error {