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

models/data_manage/excel/excel_chart_data.go

@@ -1,9 +1,10 @@
 package excel
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/models/data_manage"
+	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -25,51 +26,80 @@ func (e *ExcelChartData) TableName() string {
 
 // 新增
 func (e *ExcelChartData) Add() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Insert(e)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Insert(e)
+	//return
+	err = global.DmSQL["data"].Create(e).Error
 	return
 }
 
 // 修改
 func (e *ExcelChartData) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(e, cols...)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Update(e, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(e).Error
 	return
 }
 
 // 删除
 func (e *ExcelChartData) Delete() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Delete(e)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Delete(e)
+
+	sql := ` DELETE FROM excel_chart_data WHERE excel_chart_data_id=? `
+	err = global.DmSQL["data"].Exec(sql, e.ExcelChartDataId).Error
 	return
 }
 
 // 查询
 func GetExcelChartDataByExcelInfoId(excelInfoId int) (list []*ExcelChartData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT *
+	//         FROM excel_chart_data
+	//		 WHERE excel_info_id=?
+	//         ORDER BY excel_chart_edb_id ASC, data_time desc, excel_chart_data_id ASC `
+	//_, err = o.Raw(sql, excelInfoId).QueryRows(&list)
+
 	sql := ` SELECT *
-             FROM excel_chart_data
+	        FROM excel_chart_data
 			 WHERE excel_info_id=? 
-             ORDER BY excel_chart_edb_id ASC, data_time desc, excel_chart_data_id ASC `
-	_, err = o.Raw(sql, excelInfoId).QueryRows(&list)
+	        ORDER BY excel_chart_edb_id ASC, data_time desc, excel_chart_data_id ASC `
+	err = global.DmSQL["data"].Raw(sql, excelInfoId).Find(&list).Error
 	return
 }
 
 func BatchUpdateChartEdbData(excelInfoId int, excelEdbMap map[int]*ExcelChartEdb, excelDataMap map[int][]*data_manage.EdbDataList) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
-	}
+	//o, err := orm.NewOrmUsingDB("data").Begin()
+	//if err != nil {
+	//	return
+	//}
+	//defer func() {
+	//	if err != nil {
+	//		_ = o.Rollback()
+	//	} else {
+	//		_ = o.Commit()
+	//	}
+	//}()
+
+	to := global.DmSQL["data"].Begin()
+
 	defer func() {
 		if err != nil {
-			_ = o.Rollback()
+			_ = to.Rollback()
 		} else {
-			_ = o.Commit()
+			_ = to.Commit()
 		}
 	}()
+
 	//如果有数据则删除所有的数据
+	//sql := `delete from excel_chart_data where excel_info_id = ?`
+	//_, err = o.Raw(sql, excelInfoId).Exec()
+	//if err != nil {
+	//	return
+	//}
+
 	sql := `delete from excel_chart_data where excel_info_id = ?`
-	_, err = o.Raw(sql, excelInfoId).Exec()
+	err = to.Exec(sql, excelInfoId).Error
 	if err != nil {
 		return
 	}
@@ -96,7 +126,13 @@ func BatchUpdateChartEdbData(excelInfoId int, excelEdbMap map[int]*ExcelChartEdb
 			addList = append(addList, chartData)
 			// data信息入库
 			if len(addList) > 1000 {
-				_, err = o.InsertMulti(len(addList), addList)
+				//_, err = o.InsertMulti(len(addList), addList)
+				//if err != nil {
+				//	return
+				//}
+				//addList = addList[:0]
+
+				err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 				if err != nil {
 					return
 				}
@@ -107,7 +143,12 @@ func BatchUpdateChartEdbData(excelInfoId int, excelEdbMap map[int]*ExcelChartEdb
 
 	// data信息入库
 	if len(addList) > 0 {
-		_, err = o.InsertMulti(len(addList), addList)
+		//_, err = o.InsertMulti(len(addList), addList)
+		//if err != nil {
+		//	return
+		//}
+
+		err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -116,11 +157,17 @@ func BatchUpdateChartEdbData(excelInfoId int, excelEdbMap map[int]*ExcelChartEdb
 }
 
 func GetExcelChartDataByChartInfoId(chartInfoId int) (list []*ExcelChartData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT *
+	//         FROM excel_chart_Data
+	//		 WHERE chart_info_id=?
+	//         ORDER BY excel_chart_edb_id ASC `
+	//_, err = o.Raw(sql, chartInfoId).QueryRows(&list)
+
 	sql := ` SELECT *
-             FROM excel_chart_Data
+	        FROM excel_chart_Data
 			 WHERE chart_info_id=? 
-             ORDER BY excel_chart_edb_id ASC `
-	_, err = o.Raw(sql, chartInfoId).QueryRows(&list)
+	        ORDER BY excel_chart_edb_id ASC `
+	err = global.DmSQL["data"].Raw(sql, chartInfoId).Find(&list).Error
 	return
 }

models/data_manage/excel/excel_chart_edb.go

@@ -1,10 +1,11 @@
 package excel
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/models/data_manage"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -79,22 +80,26 @@ func (e *ExcelChartEdb) TableName() string {
 
 // 新增
 func (e *ExcelChartEdb) Add() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Insert(e)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Insert(e)
+	err = global.DmSQL["data"].Create(e).Error
 	return
 }
 
 // 修改
 func (e *ExcelChartEdb) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(e, cols...)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Update(e, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(e).Error
 	return
 }
 
 // 删除
 func (e *ExcelChartEdb) Delete() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Delete(e)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Delete(e)
+	sql := ` DELETE FROM excel_chart_edb WHERE excel_chart_edb_id=? `
+	err = global.DmSQL["data"].Exec(sql, e.ExcelChartEdbId).Error
 	return
 }
 
@@ -105,22 +110,39 @@ type AddChartEdbAndDataItem struct {
 
 // 同时添加指标和指标数据
 func (e *ExcelChartEdb) AddChartEdbAndData(list []*AddChartEdbAndDataItem, chartInfo *data_manage.ChartInfo, deleteEdbIds []int) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
-	}
+	//o, err := orm.NewOrmUsingDB("data").Begin()
+	//if err != nil {
+	//	return
+	//}
+	//defer func() {
+	//	if err != nil {
+	//		_ = o.Rollback()
+	//	} else {
+	//		_ = o.Commit()
+	//	}
+	//}()
+
+	to := global.DmSQL["data"].Begin()
+
 	defer func() {
 		if err != nil {
-			_ = o.Rollback()
+			_ = to.Rollback()
 		} else {
-			_ = o.Commit()
+			_ = to.Commit()
 		}
 	}()
 
 	// 先删除原先的绑定的指标
 	if len(deleteEdbIds) > 0 && chartInfo.ChartInfoId > 0 {
+		//sql := `DELETE FROM excel_chart_edb WHERE chart_info_id = ? AND excel_chart_edb_id in (` + utils.GetOrmInReplace(len(deleteEdbIds)) + `)`
+		//_, err = o.Raw(sql, chartInfo.ChartInfoId, deleteEdbIds).Exec()
+		//if err != nil {
+		//	err = fmt.Errorf("删除原先的指标失败：%v", err)
+		//	return
+		//}
+
 		sql := `DELETE FROM excel_chart_edb WHERE chart_info_id = ? AND excel_chart_edb_id in (` + utils.GetOrmInReplace(len(deleteEdbIds)) + `)`
-		_, err = o.Raw(sql, chartInfo.ChartInfoId, deleteEdbIds).Exec()
+		err = to.Exec(sql, chartInfo.ChartInfoId, deleteEdbIds).Error
 		if err != nil {
 			err = fmt.Errorf("删除原先的指标失败：%v", err)
 			return
@@ -130,7 +152,7 @@ func (e *ExcelChartEdb) AddChartEdbAndData(list []*AddChartEdbAndDataItem, chart
 	updateIds := make([]int, 0)
 	var edbInfoIdArrStr []string
 	for _, item := range list {
-		err = addChartEdbAndData(o, item.ChartEdb, item.DataList)
+		err = addChartEdbAndData(to, item.ChartEdb, item.DataList)
 		if err != nil {
 			return
 		}
@@ -141,14 +163,25 @@ func (e *ExcelChartEdb) AddChartEdbAndData(list []*AddChartEdbAndDataItem, chart
 	//新增图表
 	chartInfoId := chartInfo.ChartInfoId
 	if chartInfo.ChartInfoId <= 0 {
-		lastId, e := o.Insert(chartInfo)
+		//lastId, e := o.Insert(chartInfo)
+		//if e != nil {
+		//	err = fmt.Errorf("新增图表失败，AddChartEdbAndData: %v", e)
+		//	return
+		//}
+		//chartInfoId = int(lastId)
+		e := to.Create(chartInfo).Error
 		if e != nil {
 			err = fmt.Errorf("新增图表失败，AddChartEdbAndData: %v", e)
 			return
 		}
-		chartInfoId = int(lastId)
 	} else {
-		_, err = o.Update(chartInfo)
+		//_, err = o.Update(chartInfo)
+		//if err != nil {
+		//	err = fmt.Errorf("更新图表失败，AddChartEdbAndData: %v", e)
+		//	return
+		//}
+
+		err = to.Updates(chartInfo).Error
 		if err != nil {
 			err = fmt.Errorf("更新图表失败，AddChartEdbAndData: %v", e)
 			return
@@ -156,8 +189,15 @@ func (e *ExcelChartEdb) AddChartEdbAndData(list []*AddChartEdbAndDataItem, chart
 	}
 
 	//更新图表id
+	//sql := `update excel_chart_edb set chart_info_id = ? where excel_chart_edb_id in (` + utils.GetOrmInReplace(len(updateIds)) + `) and chart_info_id=0`
+	//_, err = o.Raw(sql, chartInfoId, updateIds).Exec()
+	//if err != nil {
+	//	err = fmt.Errorf("更新图表id失败，AddChartEdbAndData: %v", err)
+	//	return
+	//}
+
 	sql := `update excel_chart_edb set chart_info_id = ? where excel_chart_edb_id in (` + utils.GetOrmInReplace(len(updateIds)) + `) and chart_info_id=0`
-	_, err = o.Raw(sql, chartInfoId, updateIds).Exec()
+	err = to.Exec(sql, chartInfoId, updateIds).Error
 	if err != nil {
 		err = fmt.Errorf("更新图表id失败，AddChartEdbAndData: %v", err)
 		return
@@ -166,14 +206,23 @@ func (e *ExcelChartEdb) AddChartEdbAndData(list []*AddChartEdbAndDataItem, chart
 	if len(edbInfoIdArrStr) > 0 {
 		edbInfoIdStr := strings.Join(edbInfoIdArrStr, ",")
 		//更新图表关联的指标id
+		//sql = `update chart_info set edb_info_ids = ? where chart_info_id = ?`
+		//_, err = o.Raw(sql, edbInfoIdStr, chartInfoId).Exec()
+
 		sql = `update chart_info set edb_info_ids = ? where chart_info_id = ?`
-		_, err = o.Raw(sql, edbInfoIdStr, chartInfoId).Exec()
+		err = to.Exec(sql, edbInfoIdStr, chartInfoId).Error
 	}
 
 	if len(updateIds) > 0 {
 		//更新图表数据
+		//sql = `update excel_chart_data set chart_info_id = ? where excel_chart_edb_id in (` + utils.GetOrmInReplace(len(updateIds)) + `) and chart_info_id=0`
+		//_, err = o.Raw(sql, chartInfoId, updateIds).Exec()
+		//if err != nil {
+		//	err = fmt.Errorf("更新图表id失败，AddChartEdbAndData: %v", err)
+		//	return
+		//}
 		sql = `update excel_chart_data set chart_info_id = ? where excel_chart_edb_id in (` + utils.GetOrmInReplace(len(updateIds)) + `) and chart_info_id=0`
-		_, err = o.Raw(sql, chartInfoId, updateIds).Exec()
+		err = to.Exec(sql, chartInfoId, updateIds).Error
 		if err != nil {
 			err = fmt.Errorf("更新图表id失败，AddChartEdbAndData: %v", err)
 			return
@@ -182,25 +231,37 @@ func (e *ExcelChartEdb) AddChartEdbAndData(list []*AddChartEdbAndDataItem, chart
 	return
 }
 
-func addChartEdbAndData(o orm.TxOrmer, chartEdb *ExcelChartEdb, dataList []*ExcelChartData) (err error) {
+func addChartEdbAndData(o *gorm.DB, chartEdb *ExcelChartEdb, dataList []*ExcelChartData) (err error) {
 	// 图表指标信息入库
 	excelChartEdbId := chartEdb.ExcelChartEdbId
 	if chartEdb.ExcelChartEdbId <= 0 {
-		lastId, e := o.Insert(chartEdb)
+		e := o.Create(chartEdb).Error
 		if e != nil {
 			err = fmt.Errorf("新增指标失败，addChartEdbAndData: %v", e)
 			return
 		}
-		excelChartEdbId = int(lastId)
+		excelChartEdbId = chartEdb.ExcelChartEdbId
 	} else {
-		_, e := o.Update(chartEdb)
+		//_, e := o.Update(chartEdb)
+		//if e != nil {
+		//	err = fmt.Errorf("更新指标失败，addChartEdbAndData: %v", e)
+		//	return
+		//}
+
+		e := o.Updates(chartEdb).Error
 		if e != nil {
 			err = fmt.Errorf("更新指标失败，addChartEdbAndData: %v", e)
 			return
 		}
 		//如果有数据则删除所有的数据
+		//sql := `delete from excel_chart_data where excel_chart_edb_id = ?`
+		//_, err = o.Raw(sql, excelChartEdbId).Exec()
+		//if err != nil {
+		//	return
+		//}
+
 		sql := `delete from excel_chart_data where excel_chart_edb_id = ?`
-		_, err = o.Raw(sql, excelChartEdbId).Exec()
+		err = o.Exec(sql, excelChartEdbId).Error
 		if err != nil {
 			return
 		}
@@ -225,7 +286,13 @@ func addChartEdbAndData(o orm.TxOrmer, chartEdb *ExcelChartEdb, dataList []*Exce
 			addList = append(addList, chartData)
 			// data信息入库
 			if len(addList) > 1000 {
-				_, err = o.InsertMulti(len(addList), addList)
+				//_, err = o.InsertMulti(len(addList), addList)
+				//if err != nil {
+				//	return
+				//}
+				//addList = addList[:0]
+
+				err = o.CreateInBatches(addList, utils.MultiAddNum).Error
 				if err != nil {
 					return
 				}
@@ -236,7 +303,12 @@ func addChartEdbAndData(o orm.TxOrmer, chartEdb *ExcelChartEdb, dataList []*Exce
 
 	// data信息入库
 	if len(addList) > 0 {
-		_, err = o.InsertMulti(len(addList), addList)
+		//_, err = o.InsertMulti(len(addList), addList)
+		//if err != nil {
+		//	return
+		//}
+
+		err = o.CreateInBatches(addList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -245,75 +317,118 @@ func addChartEdbAndData(o orm.TxOrmer, chartEdb *ExcelChartEdb, dataList []*Exce
 }
 
 func GetExcelChartEdbMappingByExcelInfoId(excelInfoId int) (list []*ExcelChartEdb, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT *
+	//         FROM excel_chart_edb
+	//		 WHERE excel_info_id=?
+	//         ORDER BY chart_info_id asc, excel_chart_edb_id ASC `
+	//_, err = o.Raw(sql, excelInfoId).QueryRows(&list)
+
 	sql := ` SELECT *
-             FROM excel_chart_edb 
-			 WHERE excel_info_id=? 
-             ORDER BY chart_info_id asc, excel_chart_edb_id ASC `
-	_, err = o.Raw(sql, excelInfoId).QueryRows(&list)
+	        FROM excel_chart_edb
+			 WHERE excel_info_id=?
+	        ORDER BY chart_info_id asc, excel_chart_edb_id ASC `
+	err = global.DmSQL["data"].Raw(sql, excelInfoId).Find(&list).Error
 	return
 }
 
 func GetExcelChartEdbMappingByExcelInfoIds(excelInfoIds []int) (list []*ExcelChartEdb, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT *
+	//         FROM excel_chart_edb
+	//		 WHERE excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `)`
+	//_, err = o.Raw(sql, excelInfoIds).QueryRows(&list)
+
 	sql := ` SELECT *
-             FROM excel_chart_edb 
+	        FROM excel_chart_edb 
 			 WHERE excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `)`
-	_, err = o.Raw(sql, excelInfoIds).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, excelInfoIds).Find(&list).Error
 	return
 }
 
 func GetExcelChartEdbById(id int) (item *ExcelChartEdb, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT * FROM excel_chart_edb WHERE excel_chart_edb_id=? `
+	//err = o.Raw(sql, id).QueryRow(&item)
+
 	sql := ` SELECT * FROM excel_chart_edb WHERE excel_chart_edb_id=? `
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, id).Find(&item).Error
 	return
 }
 
 func GetExcelChartEdbMappingByChartInfoId(chartInfoId int) (list []*ExcelChartEdb, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT *
+	//         FROM excel_chart_edb
+	//		 WHERE chart_info_id=?
+	//         ORDER BY excel_chart_edb_id ASC `
+	//_, err = o.Raw(sql, chartInfoId).QueryRows(&list)
+
 	sql := ` SELECT *
-             FROM excel_chart_edb 
+	        FROM excel_chart_edb 
 			 WHERE chart_info_id=? 
-             ORDER BY excel_chart_edb_id ASC `
-	_, err = o.Raw(sql, chartInfoId).QueryRows(&list)
+	        ORDER BY excel_chart_edb_id ASC `
+	err = global.DmSQL["data"].Raw(sql, chartInfoId).Find(&list).Error
 	return
 }
 
 func GetExcelInfoByChartInfoId(chartInfoId int) (item *ExcelInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT i.*
+	//         FROM excel_chart_edb e left join excel_info i on e.excel_info_id=i.excel_info_id
+	//		 WHERE e.chart_info_id=? limit 1`
+	//err = o.Raw(sql, chartInfoId).QueryRow(&item)
+
 	sql := ` SELECT i.*
-             FROM excel_chart_edb e left join excel_info i on e.excel_info_id=i.excel_info_id
+	        FROM excel_chart_edb e left join excel_info i on e.excel_info_id=i.excel_info_id
 			 WHERE e.chart_info_id=? limit 1`
-	err = o.Raw(sql, chartInfoId).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, chartInfoId).First(&item).Error
 	return
 }
 
 // 同时删除指标和指标数据
 func DeleteExcelChartEdbAndData(excelInfoIds []int, chartInfoIds []int) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
-	}
+	//o, err := orm.NewOrmUsingDB("data").Begin()
+	//if err != nil {
+	//	return
+	//}
+	//defer func() {
+	//	if err != nil {
+	//		_ = o.Rollback()
+	//	} else {
+	//		_ = o.Commit()
+	//	}
+	//}()
+
+	to := global.DmSQL["data"].Begin()
+
 	defer func() {
 		if err != nil {
-			_ = o.Rollback()
+			_ = to.Rollback()
 		} else {
-			_ = o.Commit()
+			_ = to.Commit()
 		}
 	}()
+
 	// 把对应的表格状态改成删除状态
 	//更新图表id
 	sql := `update excel_info set is_delete = 1, modify_time = ? where excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `)`
-	_, err = o.Raw(sql, time.Now(), excelInfoIds).Exec()
+	err = to.Exec(sql, time.Now(), excelInfoIds).Error
 	if err != nil {
 		err = fmt.Errorf("更新图表id失败，AddChartEdbAndData: %v", err)
 		return
 	}
 	// 把删除图表状态
 	if len(chartInfoIds) > 0 {
+		//sql := `DELETE FROM chart_info WHERE  chart_info_id in (` + utils.GetOrmInReplace(len(chartInfoIds)) + `)`
+		//_, err = o.Raw(sql, chartInfoIds).Exec()
+		//if err != nil {
+		//	err = fmt.Errorf("删除原先的指标失败：%v", err)
+		//	return
+		//}
+
 		sql := `DELETE FROM chart_info WHERE  chart_info_id in (` + utils.GetOrmInReplace(len(chartInfoIds)) + `)`
-		_, err = o.Raw(sql, chartInfoIds).Exec()
+		err = to.Exec(sql, chartInfoIds).Error
 		if err != nil {
 			err = fmt.Errorf("删除原先的指标失败：%v", err)
 			return
@@ -322,15 +437,30 @@ func DeleteExcelChartEdbAndData(excelInfoIds []int, chartInfoIds []int) (err err
 		// todo 如果加入到我的图库中，则删除我的图库中的数据
 	}
 	// 删除原先的绑定的指标
+	//sql = `DELETE FROM excel_chart_edb WHERE  excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `)`
+	//_, err = o.Raw(sql, excelInfoIds).Exec()
+	//if err != nil {
+	//	err = fmt.Errorf("删除原先的指标失败：%v", err)
+	//	return
+	//}
+
 	sql = `DELETE FROM excel_chart_edb WHERE  excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `)`
-	_, err = o.Raw(sql, excelInfoIds).Exec()
+	err = to.Exec(sql, excelInfoIds).Error
 	if err != nil {
 		err = fmt.Errorf("删除原先的指标失败：%v", err)
 		return
 	}
+
 	// 删除指标数据
+	//sql = `DELETE FROM excel_chart_data WHERE  excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `)`
+	//_, err = o.Raw(sql, excelInfoIds).Exec()
+	//if err != nil {
+	//	err = fmt.Errorf("删除原先的指标失败：%v", err)
+	//	return
+	//}
+
 	sql = `DELETE FROM excel_chart_data WHERE  excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `)`
-	_, err = o.Raw(sql, excelInfoIds).Exec()
+	err = to.Exec(sql, excelInfoIds).Error
 	if err != nil {
 		err = fmt.Errorf("删除原先的指标失败：%v", err)
 		return
@@ -340,11 +470,21 @@ func DeleteExcelChartEdbAndData(excelInfoIds []int, chartInfoIds []int) (err err
 
 // 删除平衡表中的指标和数据
 func DeleteBalanceExcelChartInfoAndData(chartInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	//o := orm.NewOrmUsingDB("data")
+	//to, err := o.Begin()
+	//if err != nil {
+	//	return
+	//}
+	//defer func() {
+	//	if err != nil {
+	//		_ = to.Rollback()
+	//	} else {
+	//		_ = to.Commit()
+	//	}
+	//}()
+
+	to := global.DmSQL["data"].Begin()
+
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -353,34 +493,66 @@ func DeleteBalanceExcelChartInfoAndData(chartInfoId int) (err error) {
 		}
 	}()
 
+	//sql := ` DELETE FROM chart_info WHERE chart_info_id=? `
+	//_, err = to.Raw(sql, chartInfoId).Exec()
+	//if err != nil {
+	//	err = fmt.Errorf("删除平衡表图表失败 %s", err.Error())
+	//	return
+	//}
 	sql := ` DELETE FROM chart_info WHERE chart_info_id=? `
-	_, err = to.Raw(sql, chartInfoId).Exec()
+	err = to.Exec(sql, chartInfoId).Error
 	if err != nil {
 		err = fmt.Errorf("删除平衡表图表失败 %s", err.Error())
 		return
 	}
+
+	//sql = ` DELETE FROM  excel_chart_edb WHERE chart_info_id=? `
+	//_, err = to.Raw(sql, chartInfoId).Exec()
+	//if err != nil {
+	//	err = fmt.Errorf("删除平衡表图表指标失败 %s", err.Error())
+	//	return
+	//}
+
 	sql = ` DELETE FROM  excel_chart_edb WHERE chart_info_id=? `
-	_, err = to.Raw(sql, chartInfoId).Exec()
+	err = to.Exec(sql, chartInfoId).Error
 	if err != nil {
 		err = fmt.Errorf("删除平衡表图表指标失败 %s", err.Error())
 		return
 	}
+
 	// 删除表格里的数据
+	//sql = ` DELETE FROM  excel_chart_data WHERE chart_info_id=? `
+	//_, err = to.Raw(sql, chartInfoId).Exec()
+	//if err != nil {
+	//	err = fmt.Errorf("删除平衡表图表指标失败 %s", err.Error())
+	//	return
+	//}
 	sql = ` DELETE FROM  excel_chart_data WHERE chart_info_id=? `
-	_, err = to.Raw(sql, chartInfoId).Exec()
+	err = to.Exec(sql, chartInfoId).Error
 	if err != nil {
 		err = fmt.Errorf("删除平衡表图表指标失败 %s", err.Error())
 		return
 	}
+
 	return
 }
 
 func EditBalanceChartBaseInfoAndEdbEnInfo(req *data_manage.EditChartInfoBaseReq, chartItem *data_manage.ChartInfo, lang string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	//o := orm.NewOrmUsingDB("data")
+	//to, err := o.Begin()
+	//if err != nil {
+	//	return
+	//}
+	//defer func() {
+	//	if err != nil {
+	//		_ = to.Rollback()
+	//	} else {
+	//		_ = to.Commit()
+	//	}
+	//}()
+
+	to := global.DmSQL["data"].Begin()
+
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -405,7 +577,13 @@ func EditBalanceChartBaseInfoAndEdbEnInfo(req *data_manage.EditChartInfoBaseReq,
 	}
 	chartItem.ModifyTime = time.Now()
 	updateChartCols = append(updateChartCols, "ModifyTime")
-	_, err = to.Update(chartItem, updateChartCols...)
+	//_, err = to.Update(chartItem, updateChartCols...)
+	//if err != nil {
+	//	fmt.Println("UPDATE  chart_info Err:", err.Error())
+	//	return err
+	//}
+
+	err = to.Select(updateChartCols).Updates(chartItem).Error
 	if err != nil {
 		fmt.Println("UPDATE  chart_info Err:", err.Error())
 		return err
@@ -415,12 +593,20 @@ func EditBalanceChartBaseInfoAndEdbEnInfo(req *data_manage.EditChartInfoBaseReq,
 	for _, v := range req.ChartEdbInfoList {
 		edbInfoIdArr = append(edbInfoIdArr, strconv.Itoa(v.EdbInfoId))
 		var count int
+		//csql := `SELECT COUNT(1) AS count FROM excel_chart_edb WHERE chart_info_id=? AND excel_chart_edb_id=? `
+		//err = to.Raw(csql, req.ChartInfoId, v.EdbInfoId).QueryRow(&count)
+		//if err != nil {
+		//	fmt.Println("QueryRow Err:", err.Error())
+		//	return err
+		//}
+
 		csql := `SELECT COUNT(1) AS count FROM excel_chart_edb WHERE chart_info_id=? AND excel_chart_edb_id=? `
-		err = to.Raw(csql, req.ChartInfoId, v.EdbInfoId).QueryRow(&count)
+		err = to.Raw(csql, req.ChartInfoId, v.EdbInfoId).Scan(&count).Error
 		if err != nil {
 			fmt.Println("QueryRow Err:", err.Error())
 			return err
 		}
+
 		if count > 0 {
 			msql := ` UPDATE excel_chart_edb SET modify_time = NOW() `
 			pars := make([]interface{}, 0)
@@ -434,7 +620,13 @@ func EditBalanceChartBaseInfoAndEdbEnInfo(req *data_manage.EditChartInfoBaseReq,
 			}
 			msql += ` WHERE excel_chart_edb_id = ? `
 			pars = append(pars, v.EdbInfoId)
-			_, err = to.Raw(msql, pars...).Exec()
+			//_, err = to.Raw(msql, pars...).Exec()
+			//if err != nil {
+			//	fmt.Println("edb_info Err:" + err.Error())
+			//	return err
+			//}
+
+			err = to.Exec(msql, pars...).Error
 			if err != nil {
 				fmt.Println("edb_info Err:" + err.Error())
 				return err
@@ -445,11 +637,17 @@ func EditBalanceChartBaseInfoAndEdbEnInfo(req *data_manage.EditChartInfoBaseReq,
 }
 
 func GetBalanceChartEdbByCondition(condition string, pars []interface{}) (item *ExcelChartEdb, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT * FROM excel_chart_edb WHERE 1=1 `
+	//if condition != "" {
+	//	sql += condition
+	//}
+	//err = o.Raw(sql, pars).QueryRow(&item)
+
 	sql := ` SELECT * FROM excel_chart_edb WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
 	return
 }

models/data_manage/excel/excel_classify.go

@@ -1,9 +1,9 @@
 package excel
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -31,28 +31,34 @@ type ExcelClassify struct {
 
 // AddExcelClassify 添加excel分类
 func AddExcelClassify(item *ExcelClassify) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.ExcelClassifyId = int(lastId)
-
+	//o := orm.NewOrmUsingDB("data")
+	//lastId, err = o.Insert(item)
+	//if err != nil {
+	//	return
+	//}
+	//item.ExcelClassifyId = int(lastId)
+	err = global.DmSQL["data"].Create(item).Error
 	return
 }
 
 // GetExcelClassifyCount 获取同级分类下存在同名分类的数量
 func GetExcelClassifyCount(ExcelClassifyName string, parentId, source int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT COUNT(1) AS count FROM excel_classify WHERE parent_id=? AND source = ? AND excel_classify_name=? AND is_delete=0 `
+	//err = o.Raw(sql, parentId, source, ExcelClassifyName).QueryRow(&count)
+
 	sql := `SELECT COUNT(1) AS count FROM excel_classify WHERE parent_id=? AND source = ? AND excel_classify_name=? AND is_delete=0 `
-	err = o.Raw(sql, parentId, source, ExcelClassifyName).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, parentId, source, ExcelClassifyName).Scan(&count).Error
 	return
 }
 
 func GetExcelClassifyById(classifyId int) (item *ExcelClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM excel_classify WHERE excel_classify_id=? AND is_delete=0 `
+	//err = o.Raw(sql, classifyId).QueryRow(&item)
+
 	sql := `SELECT * FROM excel_classify WHERE excel_classify_id=? AND is_delete=0 `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, classifyId).First(&item).Error
 	return
 }
 
@@ -68,9 +74,12 @@ func GetExcelClassifyByIdList(classifyIdList []int) (items []*ExcelClassify, err
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM excel_classify WHERE excel_classify_id in (` + utils.GetOrmInReplace(num) + `) AND is_delete=0 `
+	//_, err = o.Raw(sql, classifyIdList).QueryRows(&items)
+
 	sql := `SELECT * FROM excel_classify WHERE excel_classify_id in (` + utils.GetOrmInReplace(num) + `) AND is_delete=0 `
-	_, err = o.Raw(sql, classifyIdList).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, classifyIdList).Find(&items).Error
 	return
 }
 
@@ -82,44 +91,61 @@ func GetExcelClassifyByIdList(classifyIdList []int) (items []*ExcelClassify, err
 // @return items []*ExcelClassify
 // @return err error
 func GetExcelClassifyBySourceAndIsJoinPermission(source, isJoinPermission int) (items []*ExcelClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM excel_classify WHERE source = ? AND is_join_permission = ? `
-	_, err = o.Raw(sql, source, isJoinPermission).QueryRows(&items)
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM excel_classify WHERE source = ? AND is_join_permission = ? `
+	//_, err = o.Raw(sql, source, isJoinPermission).QueryRows(&items)
 
+	sql := `SELECT * FROM excel_classify WHERE source = ? AND is_join_permission = ? `
+	err = global.DmSQL["data"].Raw(sql, source, isJoinPermission).Find(&items).Error
 	return
 }
 
 func GetChildClassifyById(classifyId int) (items []*ExcelClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM excel_classify WHERE parent_id=? AND is_delete=0 `
+	//_, err = o.Raw(sql, classifyId).QueryRows(&items)
+
 	sql := `SELECT * FROM excel_classify WHERE parent_id=? AND is_delete=0 `
-	_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, classifyId).Find(&items).Error
 	return
 }
 
 func GetExcelClassifyByParentId(parentId, source int) (items []*ExcelClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT * FROM excel_classify WHERE parent_id=? AND source = ? AND is_delete=0 order by sort asc,excel_classify_id asc`
+	//_, err = o.Raw(sql, parentId, source).QueryRows(&items)
+
 	sql := ` SELECT * FROM excel_classify WHERE parent_id=? AND source = ? AND is_delete=0 order by sort asc,excel_classify_id asc`
-	_, err = o.Raw(sql, parentId, source).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, parentId, source).Find(&items).Error
 	return
 }
 
 func GetExcelClassifyBySource(source int) (items []*ExcelClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//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)
+
 	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 = global.DmSQL["data"].Raw(sql, source).Find(&items).Error
 	return
 }
 
 func GetExcelClassifyBySourceOrderByLevel(source int) (items []*ExcelClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT * FROM excel_classify WHERE  source = ? AND is_delete=0 order by level asc, sort asc,excel_classify_id asc`
+	//_, err = o.Raw(sql, source).QueryRows(&items)
+
 	sql := ` SELECT * FROM excel_classify WHERE  source = ? AND is_delete=0 order by level asc, sort asc,excel_classify_id asc`
-	_, err = o.Raw(sql, source).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, source).Find(&items).Error
 	return
 }
 func GetExcelClassifyAll() (items []*ExcelClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT * FROM excel_classify WHERE parent_id<>0 AND is_delete=0 order by sort asc,excel_classify_id asc`
+	//_, err = o.Raw(sql).QueryRows(&items)
+
 	sql := ` SELECT * FROM excel_classify WHERE parent_id<>0 AND is_delete=0 order by sort asc,excel_classify_id asc`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
 	return
 }
 
@@ -142,58 +168,85 @@ type ExcelClassifyItems struct {
 }
 
 func GetExcelClassifyByCondition(condition string, pars []interface{}) (item *ExcelClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT * FROM excel_classify WHERE 1=1 AND is_delete=0 `
+	//if condition != "" {
+	//	sql += condition
+	//}
+	//err = o.Raw(sql, pars).QueryRow(&item)
+
 	sql := ` SELECT * FROM excel_classify WHERE 1=1 AND is_delete=0 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
 	return
 }
 
 // GetNextExcelClassifyByCondition 获取下一个分类
 func GetNextExcelClassifyByCondition(condition string, pars []interface{}) (item *ExcelClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//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)
+
 	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 = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
 	return
 }
 
 // GetFirstExcelClassifyByParentId 获取当前父级图表分类下的排序第一条的数据
 func GetFirstExcelClassifyByParentId(parentId int) (item *ExcelClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT * FROM excel_classify WHERE parent_id=? AND is_delete=0 order by sort asc,excel_classify_id asc limit 1`
+	//err = o.Raw(sql, parentId).QueryRow(&item)
+
 	sql := ` SELECT * FROM excel_classify WHERE parent_id=? AND is_delete=0 order by sort asc,excel_classify_id asc limit 1`
-	err = o.Raw(sql, parentId).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, parentId).First(&item).Error
 	return
 }
 
 // UpdateExcelClassifySortByParentId 根据图表父类id更新排序
 func UpdateExcelClassifySortByParentId(parentId, classifyId, nowSort int, updateSort string, source int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` update excel_classify set sort = ` + updateSort + ` WHERE parent_id=? and source=? and sort > ? AND is_delete=0 `
+	//if classifyId > 0 {
+	//	sql += ` or ( excel_classify_id > ` + fmt.Sprint(classifyId) + ` and sort= ` + fmt.Sprint(nowSort) + `)`
+	//}
+	//_, err = o.Raw(sql, parentId, source, nowSort).Exec()
+
 	sql := ` update excel_classify set sort = ` + updateSort + ` WHERE parent_id=? and source=? and sort > ? AND is_delete=0 `
 	if classifyId > 0 {
 		sql += ` or ( excel_classify_id > ` + fmt.Sprint(classifyId) + ` and sort= ` + fmt.Sprint(nowSort) + `)`
 	}
-	_, err = o.Raw(sql, parentId, source, nowSort).Exec()
+	err = global.DmSQL["data"].Exec(sql, parentId, source, nowSort).Error
 	return
 }
 
 // Update 更新图表分类基础信息
 func (ExcelClassify *ExcelClassify) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(ExcelClassify, cols...)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Update(ExcelClassify, cols...)
+
+	err = global.DmSQL["data"].Select(cols).Updates(ExcelClassify).Error
 	return
 }
 
 // GetExcelClassifyMaxSort 获取图表分类下最大的排序数
 func GetExcelClassifyMaxSort(parentId int, source int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT Max(sort) AS sort FROM excel_classify WHERE parent_id=? AND source = ? AND is_delete=0 `
+	//err = o.Raw(sql, parentId, source).QueryRow(&sort)
+
 	sql := `SELECT Max(sort) AS sort FROM excel_classify WHERE parent_id=? AND source = ? AND is_delete=0 `
-	err = o.Raw(sql, parentId, source).QueryRow(&sort)
+	err = global.DmSQL["data"].Raw(sql, parentId, source).Scan(&sort).Error
 	return
 }
 
@@ -204,9 +257,12 @@ type ExcelClassifyView struct {
 }
 
 func GetExcelClassifyViewById(classifyId int) (item *ExcelClassifyView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM excel_classify WHERE excel_classify_id=? AND is_delete=0 `
+	//err = o.Raw(sql, classifyId).QueryRow(&item)
+
 	sql := `SELECT * FROM excel_classify WHERE excel_classify_id=? AND is_delete=0 `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, classifyId).First(&item).Error
 	return
 }
 
@@ -227,30 +283,42 @@ func GetClassifyByIdList(classifyIdList []int) (items []*ExcelClassify, err erro
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM excel_classify WHERE excel_classify_id in (` + utils.GetOrmInReplace(num) + `) AND is_delete=0 `
-	_, err = o.Raw(sql, classifyIdList).QueryRows(&items)
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM excel_classify WHERE excel_classify_id in (` + utils.GetOrmInReplace(num) + `) AND is_delete=0 `
+	//_, err = o.Raw(sql, classifyIdList).QueryRows(&items)
 
+	sql := `SELECT * FROM excel_classify WHERE excel_classify_id in (` + utils.GetOrmInReplace(num) + `) AND is_delete=0 `
+	err = global.DmSQL["data"].Raw(sql, classifyIdList).Find(&items).Error
 	return
 }
 
 func GetAdminExcelClassifyBySource(source, adminId int) (items []*ExcelClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM excel_classify WHERE source = ? AND sys_user_id = ? AND is_delete = 0 ORDER BY sort ASC, excel_classify_id ASC;`
+	//_, err = o.Raw(sql, source, adminId).QueryRows(&items)
+
 	sql := `SELECT * FROM excel_classify WHERE source = ? AND sys_user_id = ? AND is_delete = 0 ORDER BY sort ASC, excel_classify_id ASC;`
-	_, err = o.Raw(sql, source, adminId).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, source, adminId).Find(&items).Error
 	return
 }
 
 func GetExcelClassifyModelBySource(source int) (items []*ExcelClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//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)
+	//return
+
 	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 = global.DmSQL["data"].Raw(sql, source).Find(&items).Error
 	return
 }
 
 func GetCustomAnalysisExcelClassifyCount(classifyName string, parentId, source, adminId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT COUNT(1) AS count FROM excel_classify WHERE parent_id = ? AND source = ? AND excel_classify_name = ? AND is_delete = 0 AND sys_user_id = ?`
+	//err = o.Raw(sql, parentId, source, classifyName, adminId).QueryRow(&count)
+
 	sql := `SELECT COUNT(1) AS count FROM excel_classify WHERE parent_id = ? AND source = ? AND excel_classify_name = ? AND is_delete = 0 AND sys_user_id = ?`
-	err = o.Raw(sql, parentId, source, classifyName, adminId).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, parentId, source, classifyName, adminId).Scan(&count).Error
 	return
 }

models/data_manage/excel/excel_draft.go

@@ -1,7 +1,7 @@
 package excel
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"time"
 )
 
@@ -18,20 +18,24 @@ type ExcelDraft struct {
 
 // AddExcelDraft 添加一个新的excel表格草稿
 func AddExcelDraft(excelDraft *ExcelDraft) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	// 新增草稿
-	id, err := o.Insert(excelDraft)
-	if err != nil {
-		return
-	}
-	excelDraft.ExcelDraftId = int(id)
+	//o := orm.NewOrmUsingDB("data")
+	//// 新增草稿
+	//id, err := o.Insert(excelDraft)
+	//if err != nil {
+	//	return
+	//}
+	//excelDraft.ExcelDraftId = int(id)
+	err = global.DmSQL["data"].Create(excelDraft).Error
 	return
 }
 
 // GetLastExcelDraftById 根据沙盘id获取最后一条沙盘草稿详情
 func GetLastExcelDraftById(excelId int) (excelDraft *ExcelDraft, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `select * from excel_draft where excel_id = ? order by excel_draft_id desc `
+	//err = o.Raw(sql, excelId).QueryRow(&excelDraft)
+
 	sql := `select * from excel_draft where excel_id = ? order by excel_draft_id desc `
-	err = o.Raw(sql, excelId).QueryRow(&excelDraft)
+	err = global.DmSQL["data"].Raw(sql, excelId).First(&excelDraft).Error
 	return
 }

models/data_manage/excel/excel_edb_mapping.go

@@ -1,9 +1,9 @@
 package excel
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -19,41 +19,54 @@ type ExcelEdbMapping struct {
 
 // AddExcelEdbMappingMulti 批量添加excel与指标的关系
 func AddExcelEdbMappingMulti(items []*ExcelEdbMapping) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 // Add 添加excel与指标的关系
 func (e *ExcelEdbMapping) Add() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Insert(e)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Insert(e)
+
+	err = global.DmSQL["data"].Create(e).Error
+
 	return
 }
 
 // Update 更新 excel表格基础信息
 func (e *ExcelEdbMapping) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(e, cols...)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Update(e, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(e).Error
 	return
 }
 
 // GetExcelEdbMappingByEdbInfoId 根据指标id获取配置关系
 func GetExcelEdbMappingByEdbInfoId(edbInfoId int) (items []*ExcelEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT *  FROM excel_edb_mapping WHERE 1=1 AND edb_info_id = ? `
+	//o := orm.NewOrmUsingDB("data")
+	//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).QueryRows(&items)
+	sql := ` SELECT *  FROM excel_edb_mapping WHERE 1=1 AND edb_info_id = ? `
+	err = global.DmSQL["data"].Raw(sql, edbInfoId).Find(&items).Error
 	return
 }
 
 // GetExcelEdbMappingByExcelInfoId 根据excel的id获取配置关系
 func GetExcelEdbMappingByExcelInfoId(excelInfoId int) (items []*ExcelEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT *  FROM excel_edb_mapping AS a 
-           join edb_info as b on a.edb_info_id = b.edb_info_id
-           WHERE 1=1 AND a.excel_info_id = ? `
-	_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT *  FROM excel_edb_mapping AS a
+	//       join edb_info as b on a.edb_info_id = b.edb_info_id
+	//       WHERE 1=1 AND a.excel_info_id = ? `
+	//_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
+
+	sql := ` SELECT *  FROM excel_edb_mapping AS a
+	      join edb_info as b on a.edb_info_id = b.edb_info_id
+	      WHERE 1=1 AND a.excel_info_id = ? `
+	err = global.DmSQL["data"].Raw(sql, excelInfoId).Find(&items).Error
 
 	return
 }
@@ -78,21 +91,32 @@ type CalculateFormula struct {
 
 // GetAllExcelEdbMappingItemByExcelInfoId 根据品种id获取所有的指标结果集
 func GetAllExcelEdbMappingItemByExcelInfoId(excelInfoId int) (items []*ExcelEdbMappingItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT a.edb_info_id,a.unique_code,a.edb_name,a.classify_id,a.frequency,a.unit,calculate_formula FROM edb_info AS a
+	//     JOIN excel_edb_mapping AS b ON a.edb_info_id=b.edb_info_id
+	//     WHERE b.excel_info_id = ? ORDER BY b.excel_edb_mapping_id ASC `
+	//_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
+
 	sql := `SELECT a.edb_info_id,a.unique_code,a.edb_name,a.classify_id,a.frequency,a.unit,calculate_formula FROM edb_info AS a 
-         JOIN excel_edb_mapping AS b ON a.edb_info_id=b.edb_info_id 
-         WHERE b.excel_info_id = ? ORDER BY b.excel_edb_mapping_id ASC `
-	_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
+	    JOIN excel_edb_mapping AS b ON a.edb_info_id=b.edb_info_id 
+	    WHERE b.excel_info_id = ? ORDER BY b.excel_edb_mapping_id ASC `
+	err = global.DmSQL["data"].Raw(sql, excelInfoId).Find(&items).Error
+
 	return
 }
 
 // GetNoCustomAnalysisExcelEdbMappingCount 根据指标id获取非自定义分析的关联关系
 func GetNoCustomAnalysisExcelEdbMappingCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//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)
+
 	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)
+	                     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 = global.DmSQL["data"].Raw(sql, edbInfoId).Scan(&count).Error
 	return
 }
 
@@ -102,38 +126,53 @@ type ExcelEdbMappingWithParentIdItem struct {
 }
 
 func GetNoCustomAnalysisExcelEdbMapping(edbInfoId int) (items []ExcelEdbMappingWithParentIdItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT b.excel_info_id, b.parent_id 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).QueryRows(&items)
 	sql := ` SELECT b.excel_info_id, b.parent_id 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).QueryRows(&items)
+	                     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 = global.DmSQL["data"].Raw(sql, edbInfoId).Find(&items).Error
 	return
 }
 
 // GetAllExcelEdbMappingByExcelInfoId 根据excel的id获取所有的指标
 func GetAllExcelEdbMappingByExcelInfoId(excelInfoId int) (items []*ExcelEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT a.* FROM  excel_edb_mapping a
+	//     WHERE a.excel_info_id = ? ORDER BY a.excel_edb_mapping_id ASC `
+	//_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
+
 	sql := `SELECT a.* FROM  excel_edb_mapping a
-         WHERE a.excel_info_id = ? ORDER BY a.excel_edb_mapping_id ASC `
-	_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
+	    WHERE a.excel_info_id = ? ORDER BY a.excel_edb_mapping_id ASC `
+	err = global.DmSQL["data"].Raw(sql, excelInfoId).Find(&items).Error
 	return
 }
 
 // GetAllExcelEdbMappingByExcelInfoIds 根据excel的id获取所有的指标
 func GetAllExcelEdbMappingByExcelInfoIds(excelInfoIds []int) (items []*ExcelEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT a.* FROM  excel_edb_mapping a
+	//     WHERE a.excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `) ORDER BY a.excel_edb_mapping_id ASC `
+	//_, err = o.Raw(sql, excelInfoIds).QueryRows(&items)
+
 	sql := `SELECT a.* FROM  excel_edb_mapping a
-         WHERE a.excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `) ORDER BY a.excel_edb_mapping_id ASC `
-	_, err = o.Raw(sql, excelInfoIds).QueryRows(&items)
+	    WHERE a.excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `) ORDER BY a.excel_edb_mapping_id ASC `
+	err = global.DmSQL["data"].Raw(sql, excelInfoIds).Find(&items).Error
 	return
 }
 
 // GetExcelEdbMappingByEdbInfoIdAndSource 根据指标id获取配置关系
 func GetExcelEdbMappingByEdbInfoIdAndSource(edbInfoId int, sources []int) (items []*ExcelEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT *  FROM excel_edb_mapping WHERE 1=1 AND edb_info_id = ? AND source in (` + utils.GetOrmInReplace(len(sources)) + `) `
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT *  FROM excel_edb_mapping WHERE 1=1 AND edb_info_id = ? AND source in (` + utils.GetOrmInReplace(len(sources)) + `) `
+	//
+	//_, err = o.Raw(sql, edbInfoId, sources).QueryRows(&items)
 
-	_, err = o.Raw(sql, edbInfoId, sources).QueryRows(&items)
+	sql := ` SELECT *  FROM excel_edb_mapping WHERE 1=1 AND edb_info_id = ? AND source in (` + utils.GetOrmInReplace(len(sources)) + `) `
+	err = global.DmSQL["data"].Raw(sql, edbInfoId, sources).Find(&items).Error
 	return
 }
 
@@ -144,16 +183,42 @@ func GetExcelEdbMappingByEdbInfoIdAndSource(edbInfoId int, sources []int) (items
 // @param edbInfoId int
 // @return err error
 func DeleteCustomAnalysisExcelEdbMappingByEdbInfoId(edbInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `DELETE FROM excel_edb_mapping WHERE source = ? AND edb_info_id = ? LIMIT 1`
-	_, err = o.Raw(sql, utils.CUSTOM_ANALYSIS_TABLE, edbInfoId).Exec()
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `DELETE FROM excel_edb_mapping WHERE source = ? AND edb_info_id = ? LIMIT 1`
+	//_, err = o.Raw(sql, utils.CUSTOM_ANALYSIS_TABLE, edbInfoId).Exec()
 
+	sql := `DELETE FROM excel_edb_mapping WHERE source = ? AND edb_info_id = ? LIMIT 1`
+	err = global.DmSQL["data"].Exec(sql, utils.CUSTOM_ANALYSIS_TABLE, edbInfoId).Error
 	return
 }
 
 // GetExcelEdbMappingItemByExcelInfoIdOrKeyword 根据表格ID或关键词获取指标
 func GetExcelEdbMappingItemByExcelInfoIdOrKeyword(excelInfoId int, keyword string) (items []*ExcelEdbMappingItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//cond := `b.excel_info_id = ?`
+	//pars := make([]interface{}, 0)
+	//pars = append(pars, excelInfoId)
+	//if keyword != "" {
+	//	cond += ` AND (a.edb_code LIKE ? OR a.edb_name LIKE ?)`
+	//	pars = append(pars, keyword, keyword)
+	//}
+	//sql := fmt.Sprintf(`SELECT
+	//		a.edb_info_id,
+	//		a.unique_code,
+	//		a.edb_name,
+	//		a.classify_id,
+	//		a.frequency,
+	//		a.unit,
+	//		calculate_formula
+	//	FROM
+	//		edb_info AS a
+	//	JOIN excel_edb_mapping AS b ON a.edb_info_id = b.edb_info_id
+	//	WHERE
+	//		%s
+	//	ORDER BY
+	//		b.excel_edb_mapping_id ASC`, cond)
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
+
 	cond := `b.excel_info_id = ?`
 	pars := make([]interface{}, 0)
 	pars = append(pars, excelInfoId)
@@ -176,6 +241,6 @@ func GetExcelEdbMappingItemByExcelInfoIdOrKeyword(excelInfoId int, keyword strin
 			%s
 		ORDER BY
 			b.excel_edb_mapping_id ASC`, cond)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
 	return
 }

models/data_manage/excel/excel_info_rule_mapping.go

@@ -1,9 +1,8 @@
 package excel
 
 import (
+	"eta_gn/eta_api/global"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type ExcelInfoRuleMapping struct {
@@ -47,36 +46,47 @@ type ExcelInfoRuleMappingView struct {
 }
 
 func (e *ExcelInfoRuleMapping) Insert() (insertId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	insertId, err = o.Insert(e)
+	//o := orm.NewOrmUsingDB("data")
+	//insertId, err = o.Insert(e)
+	err = global.DmSQL["data"].Create(e).Error
 	return
 }
 
 func (e *ExcelInfoRuleMapping) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(e, cols...)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Update(e, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(e).Error
 	return
 }
 
 // GetExcelRuleMappingByExcelInfoId 根据excelInfoId获取规则映射信息
 func GetExcelRuleMappingByExcelInfoId(id int) (items []*ExcelInfoRuleMappingView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM excel_info_rule_mapping WHERE excel_info_id = ? ORDER BY create_time ASC`
+	//_, err = o.Raw(sql, id).QueryRows(&items)
+
 	sql := `SELECT * FROM excel_info_rule_mapping WHERE excel_info_id = ? ORDER BY create_time ASC`
-	_, err = o.Raw(sql, id).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, id).Find(&items).Error
 	return
 }
 
 // GetExcelRuleMappingById 根据主键Id获取规则映射信息
 func GetExcelRuleMappingById(id int) (item *ExcelInfoRuleMappingView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM excel_info_rule_mapping WHERE excel_info_rule_mapping_id = ?`
+	//err = o.Raw(sql, id).QueryRow(&item)
+
 	sql := `SELECT * FROM excel_info_rule_mapping WHERE excel_info_rule_mapping_id = ?`
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
 	return
 }
 
 func DeleteExcelRuleMappingById(id int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `DELETE FROM excel_info_rule_mapping WHERE excel_info_rule_mapping_id = ?`
+	//_, err = o.Raw(sql, id).Exec()
+
 	sql := `DELETE FROM excel_info_rule_mapping WHERE excel_info_rule_mapping_id = ?`
-	_, err = o.Raw(sql, id).Exec()
+	err = global.DmSQL["data"].Exec(sql, id).Error
 	return
 }

models/data_manage/excel/excel_sheet.go

@@ -1,7 +1,7 @@
 package excel
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"time"
 )
 
@@ -21,32 +21,38 @@ type ExcelSheet struct {
 
 // Update 更新 excel表格的sheet基础信息
 func (excelSheet *ExcelSheet) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(excelSheet, cols...)
-
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Update(excelSheet, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(excelSheet).Error
 	return
 }
 
 // AddExcelSheet 新增excel表格的sheet基础信息
 func AddExcelSheet(excelInfo *ExcelSheet) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	// 表格信息入库
-	lastId, err := o.Insert(excelInfo)
-	if err != nil {
-		return
-	}
-	excelInfo.ExcelInfoId = int(lastId)
+	//o := orm.NewOrmUsingDB("data")
+	//// 表格信息入库
+	//lastId, err := o.Insert(excelInfo)
+	//if err != nil {
+	//	return
+	//}
+	//excelInfo.ExcelInfoId = int(lastId)
 
+	err = global.DmSQL["data"].Create(excelInfo).Error
 	return
 }
 
 // GetAllSheetList 根据excel_id获取所有的sheet
 func GetAllSheetList(excelInfoId int) (item []*ExcelSheet, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//	o := orm.NewOrmUsingDB("data")
+	//	sql := ` SELECT *
+	//FROM excel_sheet WHERE 1=1 AND excel_info_id = ? `
+	//	sql += " ORDER BY sort asc "
+	//	_, err = o.Raw(sql, excelInfoId).QueryRows(&item)
+
 	sql := ` SELECT *
-FROM excel_sheet WHERE 1=1 AND excel_info_id = ? `
+	FROM excel_sheet WHERE 1=1 AND excel_info_id = ? `
 	sql += " ORDER BY sort asc "
-	_, err = o.Raw(sql, excelInfoId).QueryRows(&item)
+	err = global.DmSQL["data"].Raw(sql, excelInfoId).Find(&item).Error
 	return
 }
 
@@ -67,21 +73,31 @@ type SheetItem struct {
 
 // GetAllSheetItemList 根据excel_id获取所有的sheet详情
 func GetAllSheetItemList(excelInfoId int) (item []*SheetItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//	o := orm.NewOrmUsingDB("data")
+	//	sql := ` SELECT *
+	//FROM excel_sheet WHERE 1=1 AND excel_info_id = ? `
+	//	sql += " ORDER BY sort asc "
+	//	_, err = o.Raw(sql, excelInfoId).QueryRows(&item)
+
 	sql := ` SELECT *
-FROM excel_sheet WHERE 1=1 AND excel_info_id = ? `
+	FROM excel_sheet WHERE 1=1 AND excel_info_id = ? `
 	sql += " ORDER BY sort asc "
-	_, err = o.Raw(sql, excelInfoId).QueryRows(&item)
+	err = global.DmSQL["data"].Raw(sql, excelInfoId).Find(&item).Error
 	return
 }
 
 // GetAllNoConfigSheetItemList 根据excel_id获取所有的sheet详情
 func GetAllNoConfigSheetItemList(excelInfoId int) (item []*SheetItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//	o := orm.NewOrmUsingDB("data")
+	//	sql := ` SELECT excel_sheet_id,excel_info_id,sheet_name,sort,page_num,create_time
+	//FROM excel_sheet WHERE 1=1 AND excel_info_id = ? `
+	//	sql += " ORDER BY sort asc "
+	//	_, err = o.Raw(sql, excelInfoId).QueryRows(&item)
+
 	sql := ` SELECT excel_sheet_id,excel_info_id,sheet_name,sort,page_num,create_time
-FROM excel_sheet WHERE 1=1 AND excel_info_id = ? `
+	FROM excel_sheet WHERE 1=1 AND excel_info_id = ? `
 	sql += " ORDER BY sort asc "
-	_, err = o.Raw(sql, excelInfoId).QueryRows(&item)
+	err = global.DmSQL["data"].Raw(sql, excelInfoId).Find(&item).Error
 	return
 }
 

models/data_manage/excel/excel_sheet_data.go

@@ -1,8 +1,8 @@
 package excel
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -19,22 +19,23 @@ type ExcelSheetData struct {
 
 // Update 更新 excel表格的sheet基础信息
 func (ExcelSheetData *ExcelSheetData) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(ExcelSheetData, cols...)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Update(ExcelSheetData, cols...)
 
+	err = global.DmSQL["data"].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 := orm.NewOrmUsingDB("data")
+	//// 表格信息入库
+	//lastId, err := o.Insert(excelInfo)
+	//if err != nil {
+	//	return
+	//}
+	//excelInfo.ExcelInfoId = int(lastId)
+	err = global.DmSQL["data"].Create(excelInfo).Error
 	return
 }
 
@@ -44,20 +45,27 @@ func GetSheetDataListBySheetIdListAndPage(excelSheetIdList []int, page int) (ite
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	//	o := orm.NewOrmUsingDB("data")
+	//	sql := ` SELECT *
+	//FROM excel_sheet_data WHERE 1=1 AND excel_sheet_id in (` + utils.GetOrmInReplace(num) + `) AND sort = ? `
+	//	_, err = o.Raw(sql, excelSheetIdList, page).QueryRows(&items)
+
 	sql := ` SELECT *
-FROM excel_sheet_data WHERE 1=1 AND excel_sheet_id in (` + utils.GetOrmInReplace(num) + `) AND sort = ? `
-	_, err = o.Raw(sql, excelSheetIdList, page).QueryRows(&items)
+	FROM excel_sheet_data WHERE 1=1 AND excel_sheet_id in (` + utils.GetOrmInReplace(num) + `) AND sort = ? `
+	err = global.DmSQL["data"].Raw(sql, excelSheetIdList, page).Find(&items).Error
 
 	return
 }
 
 // GetAllSheetDataListByExcelInfoId 根据表格id获取所有的sheet的所有数据详情
 func GetAllSheetDataListByExcelInfoId(excelInfoId int) (items []*ExcelSheetData, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT *
-FROM excel_sheet_data WHERE 1=1 AND excel_info_id = ? ORDER BY sort ASC `
-	_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
+	//	o := orm.NewOrmUsingDB("data")
+	//	sql := ` SELECT *
+	//FROM excel_sheet_data WHERE 1=1 AND excel_info_id = ? ORDER BY sort ASC `
+	//	_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
 
+	sql := ` SELECT *
+	FROM 	excel_sheet_data WHERE 1=1 AND excel_info_id = ? ORDER BY sort ASC `
+	err = global.DmSQL["data"].Raw(sql, excelInfoId).Find(&items).Error
 	return
 }

models/data_manage/excel/excel_worker.go

@@ -1,8 +1,8 @@
 package excel
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -21,62 +21,91 @@ func (e *ExcelWorker) TableName() string {
 
 // 新增 协作人
 func (e *ExcelWorker) AddWorker(excelInfoId int, addWorkers []*ExcelWorker, notDeleteWorkers []string) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
-	}
+	//o, err := orm.NewOrmUsingDB("data").Begin()
+	//if err != nil {
+	//	return
+	//}
+	//defer func() {
+	//	if err != nil {
+	//		_ = o.Rollback()
+	//	} else {
+	//		_ = o.Commit()
+	//	}
+	//}()
+
+	to := global.DmSQL["data"].Begin()
+
 	defer func() {
 		if err != nil {
-			_ = o.Rollback()
+			_ = to.Rollback()
 		} else {
-			_ = o.Commit()
+			_ = to.Commit()
 		}
 	}()
+
 	if len(notDeleteWorkers) > 0 {
 		sql := `delete from excel_worker where excel_info_id = ? and sys_user_id not in (` + utils.GetOrmInReplace(len(notDeleteWorkers)) + `)`
-		_, err = o.Raw(sql, excelInfoId, notDeleteWorkers).Exec()
+		err = to.Exec(sql, excelInfoId, notDeleteWorkers).Error
 		if err != nil {
 			return
 		}
 	} else if len(notDeleteWorkers) == 0 { // 清空协作人
+		//sql := `delete from excel_worker where excel_info_id = ? `
+		//_, err = o.Raw(sql, excelInfoId).Exec()
+		//if err != nil {
+		//	return
+		//}
+
 		sql := `delete from excel_worker where excel_info_id = ? `
-		_, err = o.Raw(sql, excelInfoId).Exec()
+		err = to.Exec(sql, excelInfoId).Error
 		if err != nil {
 			return
 		}
 	}
 	if len(addWorkers) > 0 {
-		_, err = o.InsertMulti(len(addWorkers), addWorkers)
+		//_, err = o.InsertMulti(len(addWorkers), addWorkers)
+
+		err = to.CreateInBatches(addWorkers, utils.MultiAddNum).Error
 	}
 	return
 }
 
 // 修改
 func (e *ExcelWorker) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(e, cols...)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Update(e, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(e).Error
 	return
 }
 
 // 删除
 func (e *ExcelWorker) Delete() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Delete(e)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Delete(e)
+
+	sql := ` DELETE FROM excel_worker WHERE excel_worker_id=? `
+	err = global.DmSQL["data"].Exec(sql, e.ExcelWorkerId).Error
 	return
 }
 
 // 查询
 func (e *ExcelWorker) GetByExcelInfoId(excelInfoId int) (items []*ExcelWorker, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `select * from excel_worker where excel_info_id = ? `
+	//_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
+
 	sql := `select * from excel_worker where excel_info_id = ? `
-	_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, excelInfoId).Find(&items).Error
 	return
 }
 
 // 查询
 func (e *ExcelWorker) GetBySysUserId(sysUserId int) (items []*ExcelWorker, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `select * from excel_worker where sys_user_id = ? `
+	//_, err = o.Raw(sql, sysUserId).QueryRows(&items)
+
 	sql := `select * from excel_worker where sys_user_id = ? `
-	_, err = o.Raw(sql, sysUserId).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, sysUserId).Find(&items).Error
 	return
 }