修改orm

models/data_manage/cross_variety/chart_tag_variety.go

@@ -1,10 +1,10 @@
 package cross_variety
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/models/data_manage/cross_variety/request"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -31,10 +31,11 @@ type ChartTagVariety struct {
 // @return item *ChartTagVariety
 // @return err error
 func GetChartTagVarietyByTagAndVariety(chartTagId, chartVarietyId int) (item *ChartTagVariety, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? AND chart_variety_id = ?`
+	//err = o.Raw(sql, chartTagId, chartVarietyId).QueryRow(&item)
 	sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? AND chart_variety_id = ?`
-	err = o.Raw(sql, chartTagId, chartVarietyId).QueryRow(&item)
-
+	err = global.DmSQL["data"].Raw(sql, chartTagId, chartVarietyId).First(&item).Error
 	return
 }
 
@@ -47,10 +48,12 @@ 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")
-	sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? `
-	_, err = o.Raw(sql, chartTagId).QueryRows(&items)
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? `
+	//_, err = o.Raw(sql, chartTagId).QueryRows(&items)
 
+	sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? `
+	err = global.DmSQL["data"].Raw(sql, chartTagId).Find(&items).Error
 	return
 }
 
@@ -67,10 +70,11 @@ func GetChartTagVarietyListByTagAndVariety(chartTagId int, varietyIdList []int)
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? AND chart_variety_id in (` + utils.GetOrmInReplace(num) + `) `
+	//_, err = o.Raw(sql, chartTagId, varietyIdList).QueryRows(&items)
 	sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? AND chart_variety_id in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, chartTagId, varietyIdList).QueryRows(&items)
-
+	err = global.DmSQL["data"].Raw(sql, chartTagId, varietyIdList).Find(&items).Error
 	return
 }
 
@@ -96,11 +100,14 @@ type ChartTagVarietyItem struct {
 // @return items []*ChartTagVariety
 // @return err error
 func GetChartTagVarietyItemListByTag(chartTagId int) (items []*ChartTagVarietyItem, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT a.*,b.edb_code,b.edb_name,b.end_date,b.end_value FROM chart_tag_variety a 
-         join edb_info b on a.edb_info_id=b.edb_info_id WHERE chart_tag_id = ? `
-	_, err = o.Raw(sql, chartTagId).QueryRows(&items)
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT a.*,b.edb_code,b.edb_name,b.end_date,b.end_value FROM chart_tag_variety a
+	//     join edb_info b on a.edb_info_id=b.edb_info_id WHERE chart_tag_id = ? `
+	//_, err = o.Raw(sql, chartTagId).QueryRows(&items)
 
+	sql := `SELECT a.*,b.edb_code,b.edb_name,b.end_date,b.end_value FROM chart_tag_variety a 
+	    join edb_info b on a.edb_info_id=b.edb_info_id WHERE chart_tag_id = ? `
+	err = global.DmSQL["data"].Raw(sql, chartTagId).Find(&items).Error
 	return
 }
 
@@ -118,11 +125,14 @@ type ChartTagVarietyCount struct {
 // @return items []*ChartTagVarietyCount
 // @return err error
 func GetCountChartTagVarietyItemListByTag() (items []*ChartTagVarietyCount, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT chart_tag_id,count(1) total FROM chart_tag_variety a 
-         join edb_info b on a.edb_info_id=b.edb_info_id  group by chart_tag_id`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT chart_tag_id,count(1) total FROM chart_tag_variety a
+	//     join edb_info b on a.edb_info_id=b.edb_info_id  group by chart_tag_id`
+	//_, err = o.Raw(sql).QueryRows(&items)
 
+	sql := `SELECT chart_tag_id,count(1) total FROM chart_tag_variety a 
+	    join edb_info b on a.edb_info_id=b.edb_info_id  group by chart_tag_id`
+	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
 	return
 }
 
@@ -136,22 +146,32 @@ func GetCountChartTagVarietyItemListByTag() (items []*ChartTagVarietyCount, err
 // @param sysUserName string
 // @return err error
 func SaveVarietyEdb(chartTagId int, list []request.VarietyEdbReq, sysUserId int, sysUserName 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()
 		}
 	}()
 
 	// 查找现在已经存在的品种和指标的关系
 	var items []*ChartTagVariety
 	sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id = ? `
-	_, err = o.Raw(sql, chartTagId).QueryRows(&items)
+	err = to.Raw(sql, chartTagId).Find(&items).Error
 	if err != nil {
 		return
 	}
@@ -191,7 +211,7 @@ func SaveVarietyEdb(chartTagId int, list []request.VarietyEdbReq, sysUserId int,
 			tmpChartTagVariety.LastUpdateSysUserId = sysUserId
 			tmpChartTagVariety.LastUpdateSysUserRealName = sysUserName
 			tmpChartTagVariety.ModifyTime = time.Now()
-			_, err = o.Update(tmpChartTagVariety, "EdbInfoId", "LastUpdateSysUserId", "LastUpdateSysUserRealName", "ModifyTime")
+			err = to.Select("EdbInfoId", "LastUpdateSysUserId", "LastUpdateSysUserRealName", "ModifyTime").Updates(tmpChartTagVariety).Error
 			if err != nil {
 				return
 			}
@@ -206,7 +226,7 @@ func SaveVarietyEdb(chartTagId int, list []request.VarietyEdbReq, sysUserId int,
 		}
 		removeIdStr := strings.Join(idStrList, `,`)
 		sql = fmt.Sprintf(` DELETE FROM chart_tag_variety WHERE id in (%s) `, removeIdStr)
-		_, err = o.Raw(sql).Exec()
+		err = to.Exec(sql).Error
 		if err != nil {
 			return
 		}
@@ -214,7 +234,7 @@ func SaveVarietyEdb(chartTagId int, list []request.VarietyEdbReq, sysUserId int,
 
 	// 添加配置
 	if len(addList) > 0 {
-		_, err = o.InsertMulti(len(addList), addList)
+		err = to.CreateInBatches(addList, len(addList)).Error
 		if err != nil {
 			return
 		}
@@ -230,13 +250,18 @@ 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")
-	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)
+	//o := orm.NewOrmUsingDB("data")
+	//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)
 
+	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 = global.DmSQL["data"].Raw(sql).Scan(&total).Error
 	return
 }
 
@@ -253,21 +278,26 @@ func GetChartTagVarietyListByTagIdList(chartTagIdList []int) (items []*ChartTagV
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT a.* FROM chart_tag_variety a 
-         join chart_variety b on a.chart_variety_id=b.chart_variety_id WHERE chart_tag_id in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, chartTagIdList).QueryRows(&items)
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT a.* FROM chart_tag_variety a
+	//     join chart_variety b on a.chart_variety_id=b.chart_variety_id WHERE chart_tag_id in (` + utils.GetOrmInReplace(num) + `) `
+	//_, err = o.Raw(sql, chartTagIdList).QueryRows(&items)
 
+	sql := `SELECT a.* FROM chart_tag_variety a 
+	     join chart_variety b on a.chart_variety_id=b.chart_variety_id WHERE chart_tag_id in (` + utils.GetOrmInReplace(num) + `) `
+	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
 	return
 }
 
 func DeleteChartTagVarietyByEdbInfoId(edbInfoId int) (err error) {
 	// 删除不存在的品种
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` DELETE FROM chart_tag_variety WHERE edb_info_id=?`
+	//_, err = o.Raw(sql, edbInfoId, edbInfoId).Exec()
+	//if err != nil {
+	//	return
+	//}
 	sql := ` DELETE FROM chart_tag_variety WHERE edb_info_id=?`
-	_, err = o.Raw(sql, edbInfoId, edbInfoId).Exec()
-	if err != nil {
-		return
-	}
+	err = global.DmSQL["data"].Exec(sql, edbInfoId).Error
 	return
 }

models/data_manage/cross_variety/chart_variety.go

@@ -1,8 +1,8 @@
 package cross_variety
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -26,10 +26,11 @@ type ChartVariety struct {
 // @return item *ChartVariety
 // @return err error
 func GetVarietyById(id int) (item *ChartVariety, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM chart_variety WHERE chart_variety_id = ?`
+	//err = o.Raw(sql, id).QueryRow(&item)
 	sql := `SELECT * FROM chart_variety WHERE chart_variety_id = ?`
-	err = o.Raw(sql, id).QueryRow(&item)
-
+	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
 	return
 }
 
@@ -41,10 +42,11 @@ func GetVarietyById(id int) (item *ChartVariety, err error) {
 // @return item *ChartVariety
 // @return err error
 func GetVarietyByName(name string) (item *ChartVariety, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM chart_variety WHERE chart_variety_name = ?`
+	//err = o.Raw(sql, name).QueryRow(&item)
 	sql := `SELECT * FROM chart_variety WHERE chart_variety_name = ?`
-	err = o.Raw(sql, name).QueryRow(&item)
-
+	err = global.DmSQL["data"].Raw(sql, name).First(&item).Error
 	return
 }
 
@@ -55,14 +57,14 @@ func GetVarietyByName(name string) (item *ChartVariety, err error) {
 // @param item *ChartVariety
 // @return err error
 func AddVariety(item *ChartVariety) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-
-	item.ChartVarietyId = int(lastId)
-
+	//o := orm.NewOrmUsingDB("data")
+	//lastId, err := o.Insert(item)
+	//if err != nil {
+	//	return
+	//}
+	//
+	//item.ChartVarietyId = int(lastId)
+	err = global.DmSQL["data"].Create(item).Error
 	return
 }
 
@@ -74,16 +76,18 @@ func AddVariety(item *ChartVariety) (err error) {
 // @param updateColList []string
 // @return err error
 func (item *ChartVariety) Update(updateColList []string) (err error) {
-	to := orm.NewOrmUsingDB("data")
-	_, err = to.Update(item, updateColList...)
-
+	//to := orm.NewOrmUsingDB("data")
+	//_, err = to.Update(item, updateColList...)
+	err = global.DmSQL["data"].Select(updateColList).Updates(item).Error
 	return
 }
 
 // Delete 删除
 func (item *ChartVariety) Delete() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Delete(item)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Delete(item)
+	sql := ` DELETE FROM chart_variety WHERE chart_variety_id=? `
+	err = global.DmSQL["data"].Exec(sql, item.ChartVarietyId).Error
 	return
 }
 
@@ -94,10 +98,11 @@ func (item *ChartVariety) Delete() (err error) {
 // @return items []*ChartVariety
 // @return err error
 func GetVarietyList() (items []*ChartVariety, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM chart_variety WHERE 1 = 1 `
+	//_, err = o.Raw(sql).QueryRows(&items)
 	sql := `SELECT * FROM chart_variety WHERE 1 = 1 `
-	_, err = o.Raw(sql).QueryRows(&items)
-
+	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
 	return
 }
 
@@ -113,9 +118,10 @@ func GetVarietyListByIdList(idList []int) (items []*ChartVariety, err error) {
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM chart_variety WHERE 1 = 1 AND chart_variety_id in (` + utils.GetOrmInReplace(num) + `)`
+	//_, err = o.Raw(sql, idList).QueryRows(&items)
 	sql := `SELECT * FROM chart_variety WHERE 1 = 1 AND chart_variety_id in (` + utils.GetOrmInReplace(num) + `)`
-	_, err = o.Raw(sql, idList).QueryRows(&items)
-
+	err = global.DmSQL["data"].Raw(sql, idList).Find(&items).Error
 	return
 }

models/data_manage/cross_variety/chart_variety_mapping.go

@@ -1,8 +1,8 @@
 package cross_variety
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -24,9 +24,12 @@ type ChartVarietyMapping struct {
 // @return items []*ChartVarietyMapping
 // @return err error
 func GetChartVarietyMappingList(chartInfoId int) (items []*ChartVarietyMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM chart_variety_mapping WHERE chart_info_id = ? `
+	//_, err = o.Raw(sql, chartInfoId).QueryRows(&items)
+
 	sql := `SELECT * FROM chart_variety_mapping WHERE chart_info_id = ? `
-	_, err = o.Raw(sql, chartInfoId).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, chartInfoId).Find(&items).Error
 	return
 }
 
@@ -38,12 +41,16 @@ func GetChartVarietyMappingList(chartInfoId int) (items []*ChartVarietyMapping,
 // @return total int64
 // @return err error
 func GetCountChartByVarietyId(varietyId int) (total int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT count(1) total FROM chart_info AS a JOIN
-    chart_variety_mapping AS b on a.chart_info_id = b.chart_info_id 
-    WHERE b.chart_variety_id = ? `
-	err = o.Raw(sql, varietyId).QueryRow(&total)
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT count(1) total FROM chart_info AS a JOIN
+	//chart_variety_mapping AS b on a.chart_info_id = b.chart_info_id
+	//WHERE b.chart_variety_id = ? `
+	//err = o.Raw(sql, varietyId).QueryRow(&total)
 
+	sql := `SELECT count(1) total FROM chart_info AS a JOIN
+	chart_variety_mapping AS b on a.chart_info_id = b.chart_info_id
+	WHERE b.chart_variety_id = ? `
+	err = global.DmSQL["data"].Raw(sql, varietyId).Scan(&total).Error
 	return
 }
 
@@ -59,9 +66,11 @@ func GetChartVarietyMappingListByChartInfoIdList(chartInfoIdList []int) (items [
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM chart_variety_mapping WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, chartInfoIdList).QueryRows(&items)
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM chart_variety_mapping WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) `
+	//_, err = o.Raw(sql, chartInfoIdList).QueryRows(&items)
 
+	sql := `SELECT * FROM chart_variety_mapping WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) `
+	err = global.DmSQL["data"].Raw(sql, chartInfoIdList).Find(&chartInfoIdList).Error
 	return
 }