Merge remote-tracking branch 'origin/dm' into dm

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
 }

models/data_manage/data_manage_permission/chart.go

@@ -1,9 +1,9 @@
 package data_manage_permission
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"time"
 )
@@ -39,15 +39,25 @@ type ChartClassifyPermission struct {
 // @return err error
 func SetIsPermissionByChartClassifyIdList(classifyIdList []int, chartClassifySource int) (err error) {
 	num := len(classifyIdList)
-	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()
 		}
 	}()
 
@@ -64,16 +74,26 @@ func SetIsPermissionByChartClassifyIdList(classifyIdList []int, chartClassifySou
 	//}
 
 	// 先将所有已经设置了涉密的分类设置为不涉密
+	//sql := `UPDATE chart_classify SET is_join_permission=?,modify_time=now() WHERE is_join_permission = 1 AND source = ?`
+	//_, err = o.Raw(sql, 0, chartClassifySource).Exec()
+	//if err != nil {
+	//	return
+	//}
 	sql := `UPDATE chart_classify SET is_join_permission=?,modify_time=now() WHERE is_join_permission = 1 AND source = ?`
-	_, err = o.Raw(sql, 0, chartClassifySource).Exec()
+	err = to.Exec(sql, 0, chartClassifySource).Error
 	if err != nil {
 		return
 	}
-
 	if num > 0 {
 		// 将对应的分类设置为涉密
+		//sql = `UPDATE chart_classify SET is_join_permission=?,modify_time=now() WHERE source = ? AND chart_classify_id in (` + utils.GetOrmInReplace(num) + `) `
+		//_, err = o.Raw(sql, 1, chartClassifySource, classifyIdList).Exec()
+		//if err != nil {
+		//	return
+		//}
+
 		sql = `UPDATE chart_classify SET is_join_permission=?,modify_time=now() WHERE source = ? AND chart_classify_id in (` + utils.GetOrmInReplace(num) + `) `
-		_, err = o.Raw(sql, 1, chartClassifySource, classifyIdList).Exec()
+		err = to.Exec(sql, 1, chartClassifySource, classifyIdList).Error
 		if err != nil {
 			return
 		}
@@ -95,22 +115,34 @@ func SetPermissionByChartIdList(chartIdList []string, userIdList []int, source i
 	if chartNum <= 0 {
 		return
 	}
-	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()
 		}
 	}()
 
 	// 获取已经配置的图表权限用户
 	chartInfoPermissionList := make([]*ChartInfoPermission, 0)
+	//sql := `SELECT * FROM chart_info_permission WHERE source = ? AND chart_info_id in (` + utils.GetOrmInReplace(chartNum) + `) `
+	//_, err = o.Raw(sql, source, chartIdList).QueryRows(&chartInfoPermissionList)
 	sql := `SELECT * FROM chart_info_permission WHERE source = ? AND chart_info_id in (` + utils.GetOrmInReplace(chartNum) + `) `
-	_, err = o.Raw(sql, source, chartIdList).QueryRows(&chartInfoPermissionList)
+	err = to.Raw(sql, source, chartIdList).Find(&chartInfoPermissionList).Error
 	if err != nil {
 		return
 	}
@@ -128,8 +160,13 @@ func SetPermissionByChartIdList(chartIdList []string, userIdList []int, source i
 			// 标记图表为不纳入权限管控
 			isJoinPermission = 0
 		}
+		//sql = `UPDATE chart_info SET is_join_permission=?,modify_time=now() WHERE source = ? AND chart_info_id in (` + utils.GetOrmInReplace(chartNum) + `) `
+		//_, err = o.Raw(sql, isJoinPermission, source, chartIdList).Exec()
+		//if err != nil {
+		//	return
+		//}
 		sql = `UPDATE chart_info SET is_join_permission=?,modify_time=now() WHERE source = ? AND chart_info_id in (` + utils.GetOrmInReplace(chartNum) + `) `
-		_, err = o.Raw(sql, isJoinPermission, source, chartIdList).Exec()
+		err = to.Exec(sql, isJoinPermission, source, chartIdList).Error
 		if err != nil {
 			return
 		}
@@ -166,7 +203,12 @@ func SetPermissionByChartIdList(chartIdList []string, userIdList []int, source i
 
 	// 添加待配置项
 	if len(addList) > 0 {
-		_, err = o.InsertMulti(500, addList)
+		//_, err = o.InsertMulti(500, addList)
+		//if err != nil {
+		//	return
+		//}
+
+		err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -182,8 +224,14 @@ func SetPermissionByChartIdList(chartIdList []string, userIdList []int, source i
 
 		deletePermissionIdNum := len(deletePermissionIdList)
 		if deletePermissionIdNum > 0 {
+			//sql = "DELETE FROM chart_info_permission WHERE chart_info_permission_id in (" + utils.GetOrmInReplace(deletePermissionIdNum) + ")"
+			//_, err = o.Raw(sql, deletePermissionIdList).Exec()
+			//if err != nil {
+			//	return
+			//}
+
 			sql = "DELETE FROM chart_info_permission WHERE chart_info_permission_id in (" + utils.GetOrmInReplace(deletePermissionIdNum) + ")"
-			_, err = o.Raw(sql, deletePermissionIdList).Exec()
+			err = to.Exec(sql, deletePermissionIdList).Error
 			if err != nil {
 				return
 			}
@@ -205,22 +253,34 @@ func SetPermissionByChartClassifyIdList(classifyIdList []int, userIdList []int,
 	if userNum <= 0 {
 		return
 	}
-	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()
 		}
 	}()
 
 	// 获取当前选择用户已经配置的图表分类权限
 	classifyPermissionList := make([]*ChartClassifyPermission, 0)
+	//sql := `SELECT * FROM chart_classify_permission WHERE source = ? AND sys_user_id in (` + utils.GetOrmInReplace(userNum) + `) `
+	//_, err = o.Raw(sql, classifyType, userIdList).QueryRows(&classifyPermissionList)
 	sql := `SELECT * FROM chart_classify_permission WHERE source = ? AND sys_user_id in (` + utils.GetOrmInReplace(userNum) + `) `
-	_, err = o.Raw(sql, classifyType, userIdList).QueryRows(&classifyPermissionList)
+	err = to.Raw(sql, classifyType, userIdList).Find(&classifyPermissionList).Error
 	if err != nil {
 		return
 	}
@@ -255,7 +315,11 @@ func SetPermissionByChartClassifyIdList(classifyIdList []int, userIdList []int,
 
 	// 添加待配置项
 	if len(addList) > 0 {
-		_, err = o.InsertMulti(500, addList)
+		//_, err = o.InsertMulti(500, addList)
+		//if err != nil {
+		//	return
+		//}
+		err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -271,8 +335,14 @@ func SetPermissionByChartClassifyIdList(classifyIdList []int, userIdList []int,
 
 		deletePermissionIdNum := len(deletePermissionIdList)
 		if deletePermissionIdNum > 0 {
+			//sql = "DELETE FROM chart_classify_permission WHERE chart_classify_permission_id in (" + utils.GetOrmInReplace(deletePermissionIdNum) + ")"
+			//_, err = o.Raw(sql, deletePermissionIdList).Exec()
+			//if err != nil {
+			//	return
+			//}
+
 			sql = "DELETE FROM chart_classify_permission WHERE chart_classify_permission_id in (" + utils.GetOrmInReplace(deletePermissionIdNum) + ")"
-			_, err = o.Raw(sql, deletePermissionIdList).Exec()
+			err = to.Exec(sql, deletePermissionIdList).Error
 			if err != nil {
 				return
 			}
@@ -291,10 +361,11 @@ func SetPermissionByChartClassifyIdList(classifyIdList []int, userIdList []int,
 // @return chartClassifyIdList []int
 // @return err error
 func GetPermissionChartClassifyIdListByUserId(userId int, classifyType int) (chartClassifyIdList []int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT chart_classify_id FROM chart_classify_permission WHERE source = ? AND sys_user_id = ? `
+	//_, err = o.Raw(sql, classifyType, userId).QueryRows(&chartClassifyIdList)
 	sql := `SELECT chart_classify_id FROM chart_classify_permission WHERE source = ? AND sys_user_id = ? `
-	_, err = o.Raw(sql, classifyType, userId).QueryRows(&chartClassifyIdList)
-
+	err = global.DmSQL["data"].Raw(sql, classifyType, userId).Find(&chartClassifyIdList).Error
 	return
 }
 
@@ -307,10 +378,11 @@ func GetPermissionChartClassifyIdListByUserId(userId int, classifyType int) (cha
 // @return chartIdList []int
 // @return err error
 func GetPermissionUserIdListByChartId(dataId int, source int) (userIdList []int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT sys_user_id FROM chart_info_permission WHERE source = ? AND chart_info_id= ? `
+	//_, err = o.Raw(sql, source, dataId).QueryRows(&userIdList)
 	sql := `SELECT sys_user_id FROM chart_info_permission WHERE source = ? AND chart_info_id= ? `
-	_, err = o.Raw(sql, source, dataId).QueryRows(&userIdList)
-
+	err = global.DmSQL["data"].Raw(sql, source, dataId).Find(&userIdList).Error
 	return
 }
 
@@ -323,10 +395,11 @@ func GetPermissionUserIdListByChartId(dataId int, source int) (userIdList []int,
 // @return userIdList []int
 // @return err error
 func GetPermissionUserIdListByChartClassifyId(classifyId int, source int) (userIdList []int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT sys_user_id FROM chart_classify_permission WHERE source = ? AND chart_classify_id= ? `
+	//_, err = o.Raw(sql, source, classifyId).QueryRows(&userIdList)
 	sql := `SELECT sys_user_id FROM chart_classify_permission WHERE source = ? AND chart_classify_id= ? `
-	_, err = o.Raw(sql, source, classifyId).QueryRows(&userIdList)
-
+	err = global.DmSQL["data"].Raw(sql, source, classifyId).Find(&userIdList).Error
 	return
 }
 
@@ -340,14 +413,20 @@ func GetPermissionUserIdListByChartClassifyId(classifyId int, source int) (userI
 // @return err error
 func GetPermissionChartIdList(userId, chartInfoId int) (idList []int, err error) {
 	pars := []interface{}{userId}
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT chart_info_id FROM chart_info_permission WHERE sys_user_id = ? `
+	//if chartInfoId > 0 {
+	//	sql += ` AND chart_info_id = ? `
+	//	pars = append(pars, chartInfoId)
+	//}
+	//_, err = o.Raw(sql, pars).QueryRows(&idList)
+
 	sql := `SELECT chart_info_id FROM chart_info_permission WHERE sys_user_id = ? `
 	if chartInfoId > 0 {
 		sql += ` AND chart_info_id = ? `
 		pars = append(pars, chartInfoId)
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&idList)
-
+	err = global.DmSQL["data"].Raw(sql, pars).Find(&idList).Error
 	return
 }
 
@@ -361,14 +440,20 @@ func GetPermissionChartIdList(userId, chartInfoId int) (idList []int, err error)
 // @return err error
 func GetPermissionChartClassifyIdList(userId, classifyId int) (idList []int, err error) {
 	pars := []interface{}{userId}
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT chart_classify_id FROM chart_classify_permission WHERE sys_user_id = ? `
+	//if classifyId > 0 {
+	//	sql += ` AND chart_classify_id = ? `
+	//	pars = append(pars, classifyId)
+	//}
+	//_, err = o.Raw(sql, pars).QueryRows(&idList)
+
 	sql := `SELECT chart_classify_id FROM chart_classify_permission WHERE sys_user_id = ? `
 	if classifyId > 0 {
 		sql += ` AND chart_classify_id = ? `
 		pars = append(pars, classifyId)
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&idList)
-
+	err = global.DmSQL["data"].Raw(sql, pars).Find(&idList).Error
 	return
 }
 
@@ -384,21 +469,37 @@ func GetPermissionChartClassifyIdList(userId, classifyId int) (idList []int, err
 // @param uniqueCode string
 // @return err error
 func InheritParentClassifyByChartClassifyId(dataSource, chartSource, classifyId, parentClassifyId int, classifyName, uniqueCode 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()
 		}
 	}()
 
 	// 将对应的分类设置为涉密
+	//sql := `UPDATE chart_classify SET is_join_permission=?,modify_time=now() WHERE source = ? AND chart_classify_id = ? `
+	//_, err = o.Raw(sql, 1, chartSource, classifyId).Exec()
+	//if err != nil {
+	//	return
+	//}
+
 	sql := `UPDATE chart_classify SET is_join_permission=?,modify_time=now() WHERE source = ? AND chart_classify_id = ? `
-	_, err = o.Raw(sql, 1, chartSource, classifyId).Exec()
+	err = to.Exec(sql, 1, chartSource, classifyId).Error
 	if err != nil {
 		return
 	}
@@ -407,8 +508,11 @@ func InheritParentClassifyByChartClassifyId(dataSource, chartSource, classifyId,
 	{
 		// 获取父级未授权的用户记录
 		var parentRecordItems []*ChartInfoClassifyPermissionNoAuthRecord
+		//sql = `SELECT * FROM data_permission_classify_no_auth_record WHERE classify_id = ? AND source = ? AND sub_source = ? ORDER BY data_permission_classify_no_auth_record_id desc LIMIT ?,? `
+		//_, err = o.Raw(sql, parentClassifyId, dataSource, chartSource).QueryRows(&parentRecordItems)
+
 		sql = `SELECT * FROM data_permission_classify_no_auth_record WHERE classify_id = ? AND source = ? AND sub_source = ? ORDER BY data_permission_classify_no_auth_record_id desc LIMIT ?,? `
-		_, err = o.Raw(sql, parentClassifyId, dataSource, chartSource).QueryRows(&parentRecordItems)
+		err = to.Raw(sql, parentClassifyId, dataSource, chartSource).Find(&parentRecordItems).Error
 
 		addNoAuthRecordItems := make([]*ChartInfoClassifyPermissionNoAuthRecord, 0)
 		for _, v := range parentRecordItems {
@@ -425,7 +529,12 @@ func InheritParentClassifyByChartClassifyId(dataSource, chartSource, classifyId,
 
 		// 添加待配置项
 		if len(addNoAuthRecordItems) > 0 {
-			_, err = o.InsertMulti(500, addNoAuthRecordItems)
+			//_, err = o.InsertMulti(500, addNoAuthRecordItems)
+			//if err != nil {
+			//	return
+			//}
+
+			err = to.CreateInBatches(addNoAuthRecordItems, len(addNoAuthRecordItems)).Error
 			if err != nil {
 				return
 			}
@@ -437,8 +546,14 @@ func InheritParentClassifyByChartClassifyId(dataSource, chartSource, classifyId,
 	{
 		// 获取父级分类已经授权的用户
 		parentClassifyPermissionList := make([]*ChartClassifyPermission, 0)
+		//sql = `SELECT * FROM chart_classify_permission WHERE source = ? AND chart_classify_id = ? `
+		//_, err = o.Raw(sql, chartSource, parentClassifyId).QueryRows(&parentClassifyPermissionList)
+		//if err != nil {
+		//	return
+		//}
+
 		sql = `SELECT * FROM chart_classify_permission WHERE source = ? AND chart_classify_id = ? `
-		_, err = o.Raw(sql, chartSource, parentClassifyId).QueryRows(&parentClassifyPermissionList)
+		err = to.Raw(sql, chartSource, parentClassifyId).Find(&parentClassifyPermissionList).Error
 		if err != nil {
 			return
 		}
@@ -457,7 +572,12 @@ func InheritParentClassifyByChartClassifyId(dataSource, chartSource, classifyId,
 		}
 		// 添加待配置项
 		if len(addList) > 0 {
-			_, err = o.InsertMulti(500, addList)
+			//_, err = o.InsertMulti(500, addList)
+			//if err != nil {
+			//	return
+			//}
+
+			err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 			if err != nil {
 				return
 			}
@@ -505,22 +625,38 @@ func AddChartInfoPermissionNoAuthRecordBySourceAndDataIdList(source, chartSource
 	if userNum <= 0 {
 		return
 	}
-	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 existList []*ChartInfoPermissionNoAuthRecord
+	//sql := `SELECT * FROM chart_info_permission_no_auth_record WHERE  source = ? AND chart_info_id in (` + utils.GetOrmInReplace(num) + `)`
+	//_, err = o.Raw(sql, chartSource, dataIdList).QueryRows(&existList)
+	//if err != nil {
+	//	return
+	//}
+
 	sql := `SELECT * FROM chart_info_permission_no_auth_record WHERE  source = ? AND chart_info_id in (` + utils.GetOrmInReplace(num) + `)`
-	_, err = o.Raw(sql, chartSource, dataIdList).QueryRows(&existList)
+	err = to.Raw(sql, chartSource, dataIdList).Find(&existList).Error
 	if err != nil {
 		return
 	}
@@ -588,7 +724,12 @@ func AddChartInfoPermissionNoAuthRecordBySourceAndDataIdList(source, chartSource
 
 	// 添加消息
 	if len(addMessageList) > 0 {
-		_, err = o.InsertMulti(500, addMessageList)
+		//_, err = o.InsertMulti(500, addMessageList)
+		//if err != nil {
+		//	return
+		//}
+
+		err = to.CreateInBatches(addMessageList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -596,7 +737,12 @@ func AddChartInfoPermissionNoAuthRecordBySourceAndDataIdList(source, chartSource
 
 	// 添加记录
 	if len(addRecordList) > 0 {
-		_, err = o.InsertMulti(500, addRecordList)
+		//_, err = o.InsertMulti(500, addRecordList)
+		//if err != nil {
+		//	return
+		//}
+
+		err = to.CreateInBatches(addRecordList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -605,8 +751,11 @@ func AddChartInfoPermissionNoAuthRecordBySourceAndDataIdList(source, chartSource
 	// 已经授权了的用户，需要删除未授权记录
 	authUserIdNum := len(authUserIdList)
 	if authUserIdNum > 0 {
+		//sql = `DELETE FROM chart_info_permission_no_auth_record WHERE  source = ? AND sys_user_id in (` + utils.GetOrmInReplace(authUserIdNum) + `) AND chart_info_id in (` + utils.GetOrmInReplace(num) + `)`
+		//_, err = o.Raw(sql, chartSource, authUserIdList, dataIdList).Exec()
+
 		sql = `DELETE FROM chart_info_permission_no_auth_record WHERE  source = ? AND sys_user_id in (` + utils.GetOrmInReplace(authUserIdNum) + `) AND chart_info_id in (` + utils.GetOrmInReplace(num) + `)`
-		_, err = o.Raw(sql, chartSource, authUserIdList, dataIdList).Exec()
+		err = to.Exec(sql, chartSource, authUserIdList, dataIdList).Error
 	}
 
 	return
@@ -624,27 +773,38 @@ func DeleteChartInfoPermissionNoAuthRecordBySourceAndDataIdList(chartSource int,
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//
+	//sql := `DELETE FROM chart_info_permission_no_auth_record WHERE source = ? AND chart_info_id in (` + utils.GetOrmInReplace(num) + `)`
+	//_, err = o.Raw(sql, chartSource, dataIdList).Exec()
 
 	sql := `DELETE FROM chart_info_permission_no_auth_record WHERE source = ? AND chart_info_id in (` + utils.GetOrmInReplace(num) + `)`
-	_, err = o.Raw(sql, chartSource, dataIdList).Exec()
-
+	err = global.DmSQL["data"].Exec(sql, chartSource, dataIdList).Error
 	return
 }
 
 func GetChartInfoDataPermissionNoAuthRecordListByUserId(userId int32, chartSource, startSize, pageSize int) (total int, items []*DataPermissionNoAuthRecord, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//
+	//// 获取总数
+	//sql := `SELECT count(1) AS total FROM chart_info_permission_no_auth_record WHERE sys_user_id = ? AND source = ? `
+	//err = o.Raw(sql, userId, chartSource).QueryRow(&total)
+	//if err != nil {
+	//	return
+	//}
+	//
+	//sql = `SELECT chart_info_permission_no_auth_record_id as data_permission_no_auth_record_id,op_unique_code,source as sub_source,chart_info_id as data_id,chart_name as data_name,sys_user_id,create_time FROM chart_info_permission_no_auth_record WHERE sys_user_id = ? AND source = ? ORDER BY chart_info_permission_no_auth_record_id desc LIMIT ?,? `
+	//_, err = o.Raw(sql, userId, chartSource, startSize, pageSize).QueryRows(&items)
 
 	// 获取总数
 	sql := `SELECT count(1) AS total FROM chart_info_permission_no_auth_record WHERE sys_user_id = ? AND source = ? `
-	err = o.Raw(sql, userId, chartSource).QueryRow(&total)
+	err = global.DmSQL["data"].Raw(sql, userId, chartSource).Scan(&total).Error
 	if err != nil {
 		return
 	}
 
 	sql = `SELECT chart_info_permission_no_auth_record_id as data_permission_no_auth_record_id,op_unique_code,source as sub_source,chart_info_id as data_id,chart_name as data_name,sys_user_id,create_time FROM chart_info_permission_no_auth_record WHERE sys_user_id = ? AND source = ? ORDER BY chart_info_permission_no_auth_record_id desc LIMIT ?,? `
-	_, err = o.Raw(sql, userId, chartSource, startSize, pageSize).QueryRows(&items)
-
+	err = global.DmSQL["data"].Raw(sql, userId, chartSource, startSize, pageSize).Find(&items).Error
 	return
 }
 
@@ -685,22 +845,38 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, chartSour
 	if userNum <= 0 {
 		return
 	}
-	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 existList []*ChartInfoClassifyPermissionNoAuthRecord
+	//sql := `SELECT * FROM chart_info_classify_permission_no_auth_record WHERE source = ? AND classify_id in (` + utils.GetOrmInReplace(num) + `)`
+	//_, err = o.Raw(sql, chartSource, classifyIdList).QueryRows(&existList)
+	//if err != nil {
+	//	return
+	//}
+
 	sql := `SELECT * FROM chart_info_classify_permission_no_auth_record WHERE source = ? AND classify_id in (` + utils.GetOrmInReplace(num) + `)`
-	_, err = o.Raw(sql, chartSource, classifyIdList).QueryRows(&existList)
+	err = to.Raw(sql, chartSource, classifyIdList).Find(&existList).Error
 	if err != nil {
 		return
 	}
@@ -768,7 +944,12 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, chartSour
 
 	// 添加消息
 	if len(addMessageList) > 0 {
-		_, err = o.InsertMulti(500, addMessageList)
+		//_, err = o.InsertMulti(500, addMessageList)
+		//if err != nil {
+		//	return
+		//}
+
+		err = to.CreateInBatches(addMessageList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -776,7 +957,12 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, chartSour
 
 	// 添加记录
 	if len(addRecordList) > 0 {
-		_, err = o.InsertMulti(500, addRecordList)
+		//_, err = o.InsertMulti(500, addRecordList)
+		//if err != nil {
+		//	return
+		//}
+
+		err = to.CreateInBatches(addRecordList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -785,8 +971,11 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, chartSour
 	// 移除已经公开了的分类权限，需要删除未授权记录
 	authUserIdNum := len(classifyIdList)
 	if authUserIdNum > 0 {
+		//sql = `DELETE FROM chart_info_classify_permission_no_auth_record WHERE source = ? AND classify_id not in (` + utils.GetOrmInReplace(num) + `)`
+		//_, err = o.Raw(sql, chartSource, classifyIdList).Exec()
+
 		sql = `DELETE FROM chart_info_classify_permission_no_auth_record WHERE source = ? AND classify_id not in (` + utils.GetOrmInReplace(num) + `)`
-		_, err = o.Raw(sql, chartSource, classifyIdList).Exec()
+		err = to.Exec(sql, chartSource, classifyIdList).Error
 	}
 
 	return
@@ -817,22 +1006,38 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndUserIdList(source, chartSource i
 	//	return
 	//}
 
-	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 existList []*ChartInfoClassifyPermissionNoAuthRecord
+	//sql := `SELECT * FROM chart_info_classify_permission_no_auth_record WHERE source = ? AND sys_user_id in (` + utils.GetOrmInReplace(configUserNum) + `)`
+	//_, err = o.Raw(sql, chartSource, configUserIdList).QueryRows(&existList)
+	//if err != nil {
+	//	return
+	//}
+
 	sql := `SELECT * FROM chart_info_classify_permission_no_auth_record WHERE source = ? AND sys_user_id in (` + utils.GetOrmInReplace(configUserNum) + `)`
-	_, err = o.Raw(sql, chartSource, configUserIdList).QueryRows(&existList)
+	err = to.Raw(sql, chartSource, configUserIdList).Find(&existList).Error
 	if err != nil {
 		return
 	}
@@ -904,7 +1109,12 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndUserIdList(source, chartSource i
 
 	// 添加消息
 	if len(addMessageList) > 0 {
-		_, err = o.InsertMulti(500, addMessageList)
+		//_, err = o.InsertMulti(500, addMessageList)
+		//if err != nil {
+		//	return
+		//}
+
+		err = to.CreateInBatches(addMessageList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -912,7 +1122,11 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndUserIdList(source, chartSource i
 
 	// 添加记录
 	if len(addRecordList) > 0 {
-		_, err = o.InsertMulti(500, addRecordList)
+		//_, err = o.InsertMulti(500, addRecordList)
+		//if err != nil {
+		//	return
+		//}
+		err = to.CreateInBatches(addRecordList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -925,8 +1139,10 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndUserIdList(source, chartSource i
 		for _, v := range delRecordIdMap {
 			delRecordIdList = append(delRecordIdList, v)
 		}
+		//sql = `DELETE FROM chart_info_classify_permission_no_auth_record WHERE chart_info_classify_permission_no_auth_record_id in (` + utils.GetOrmInReplace(delRecordIdNum) + `) `
+		//_, err = o.Raw(sql, delRecordIdList).Exec()
 		sql = `DELETE FROM chart_info_classify_permission_no_auth_record WHERE chart_info_classify_permission_no_auth_record_id in (` + utils.GetOrmInReplace(delRecordIdNum) + `) `
-		_, err = o.Raw(sql, delRecordIdList).Exec()
+		err = to.Exec(sql, delRecordIdList).Error
 	}
 
 	return
@@ -939,11 +1155,13 @@ func AddChartInfoClassifyNoAuthRecordBySourceAndUserIdList(source, chartSource i
 // @param chartSource int
 // @return err error
 func DeleteChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(chartSource int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//
+	//sql := `DELETE FROM chart_info_classify_permission_no_auth_record WHERE source = ?`
+	//_, err = o.Raw(sql, chartSource).Exec()
 
 	sql := `DELETE FROM chart_info_classify_permission_no_auth_record WHERE source = ?`
-	_, err = o.Raw(sql, chartSource).Exec()
-
+	err = global.DmSQL["data"].Exec(sql, chartSource).Error
 	return
 }
 
@@ -960,17 +1178,25 @@ func DeleteChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList(chartSource in
 // @return items []*DataPermissionClassifyNoAuthRecord
 // @return err error
 func GetChartInfoDataPermissionClassifyNoAuthRecordListByUserId(userId int32, chartSource, startSize, pageSize int) (total int, items []*DataPermissionClassifyNoAuthRecord, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//
+	//// 获取总数
+	//sql := `SELECT count(1) AS total FROM chart_info_classify_permission_no_auth_record WHERE sys_user_id = ? AND source = ? `
+	//err = o.Raw(sql, userId, chartSource).QueryRow(&total)
+	//if err != nil {
+	//	return
+	//}
+	//
+	//sql = `SELECT chart_info_classify_permission_no_auth_record_id as data_permission_classify_no_auth_record_id,source as sub_source,op_unique_code,classify_id,classify_name,sys_user_id,create_time  FROM chart_info_classify_permission_no_auth_record WHERE sys_user_id = ? AND source = ? ORDER BY chart_info_classify_permission_no_auth_record_id desc LIMIT ?,? `
+	//_, err = o.Raw(sql, userId, chartSource, startSize, pageSize).QueryRows(&items)
 
-	// 获取总数
 	sql := `SELECT count(1) AS total FROM chart_info_classify_permission_no_auth_record WHERE sys_user_id = ? AND source = ? `
-	err = o.Raw(sql, userId, chartSource).QueryRow(&total)
+	err = global.DmSQL["data"].Raw(sql, userId, chartSource).Scan(&total).Error
 	if err != nil {
 		return
 	}
 
 	sql = `SELECT chart_info_classify_permission_no_auth_record_id as data_permission_classify_no_auth_record_id,source as sub_source,op_unique_code,classify_id,classify_name,sys_user_id,create_time  FROM chart_info_classify_permission_no_auth_record WHERE sys_user_id = ? AND source = ? ORDER BY chart_info_classify_permission_no_auth_record_id desc LIMIT ?,? `
-	_, err = o.Raw(sql, userId, chartSource, startSize, pageSize).QueryRows(&items)
-
+	err = global.DmSQL["data"].Raw(sql, userId, chartSource, startSize, pageSize).Find(&items).Error
 	return
 }

models/data_manage/data_manage_permission/edb.go

@@ -1,9 +1,9 @@
 package data_manage_permission
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"time"
 )
@@ -37,15 +37,25 @@ type EdbClassifyPermission struct {
 // @param classifyIdList []int
 func SetIsPermissionEdbChartByEdbClassifyIdList(classifyIdList []int, classifyType int) (err error) {
 	num := len(classifyIdList)
-	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()
 		}
 	}()
 
@@ -62,16 +72,28 @@ func SetIsPermissionEdbChartByEdbClassifyIdList(classifyIdList []int, classifyTy
 	//}
 
 	// 先将所有已经设置了涉密的分类设置为不涉密
+	//sql := `UPDATE edb_classify SET is_join_permission=?,modify_time=now() WHERE is_join_permission = 1 AND classify_type = ?`
+	//_, err = o.Raw(sql, 0, classifyType).Exec()
+	//if err != nil {
+	//	return
+	//}
+
 	sql := `UPDATE edb_classify SET is_join_permission=?,modify_time=now() WHERE is_join_permission = 1 AND classify_type = ?`
-	_, err = o.Raw(sql, 0, classifyType).Exec()
+	err = to.Exec(sql, 0, classifyType).Error
 	if err != nil {
 		return
 	}
 
 	if num > 0 {
 		// 将对应的分类设置为涉密
+		//sql = `UPDATE edb_classify SET is_join_permission=?,modify_time=now() WHERE classify_type = ? AND classify_id in (` + utils.GetOrmInReplace(num) + `) `
+		//_, err = o.Raw(sql, 1, classifyType, classifyIdList).Exec()
+		//if err != nil {
+		//	return
+		//}
+
 		sql = `UPDATE edb_classify SET is_join_permission=?,modify_time=now() WHERE classify_type = ? AND classify_id in (` + utils.GetOrmInReplace(num) + `) `
-		_, err = o.Raw(sql, 1, classifyType, classifyIdList).Exec()
+		err = to.Exec(sql, 1, classifyType, classifyIdList).Error
 		if err != nil {
 			return
 		}
@@ -93,25 +115,42 @@ func SetPermissionByEdbIdList(edbIdList []string, userIdList []int, edbInfoType
 	if edbNum <= 0 {
 		return
 	}
-	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()
 		}
 	}()
 
 	// 获取已经配置的指标权限用户
 	edbInfoPermissionList := make([]*EdbInfoPermission, 0)
+	//sql := `SELECT * FROM edb_info_permission WHERE edb_info_type = ? AND edb_info_id in (` + utils.GetOrmInReplace(edbNum) + `) `
+	//_, err = o.Raw(sql, edbInfoType, edbIdList).QueryRows(&edbInfoPermissionList)
+	//if err != nil {
+	//	return
+	//}
+
 	sql := `SELECT * FROM edb_info_permission WHERE edb_info_type = ? AND edb_info_id in (` + utils.GetOrmInReplace(edbNum) + `) `
-	_, err = o.Raw(sql, edbInfoType, edbIdList).QueryRows(&edbInfoPermissionList)
+	err = to.Raw(sql, edbInfoType, edbIdList).Find(&edbInfoPermissionList).Error
 	if err != nil {
 		return
 	}
+
 	edbInfoPermissionMap := make(map[string]*EdbInfoPermission)
 	for _, v := range edbInfoPermissionList {
 		edbInfoPermissionMap[fmt.Sprint(v.EdbInfoId, "_", v.SysUserId)] = v
@@ -126,8 +165,14 @@ func SetPermissionByEdbIdList(edbIdList []string, userIdList []int, edbInfoType
 			// 标记指标为不纳入权限管控
 			isJoinPermission = 0
 		}
+		//sql = `UPDATE edb_info SET is_join_permission=?,modify_time=now() WHERE edb_info_type = ? AND edb_info_id in (` + utils.GetOrmInReplace(edbNum) + `) `
+		//_, err = o.Raw(sql, isJoinPermission, edbInfoType, edbIdList).Exec()
+		//if err != nil {
+		//	return
+		//}
+
 		sql = `UPDATE edb_info SET is_join_permission=?,modify_time=now() WHERE edb_info_type = ? AND edb_info_id in (` + utils.GetOrmInReplace(edbNum) + `) `
-		_, err = o.Raw(sql, isJoinPermission, edbInfoType, edbIdList).Exec()
+		err = to.Raw(sql, isJoinPermission, edbInfoType, edbIdList).Error
 		if err != nil {
 			return
 		}
@@ -164,10 +209,16 @@ func SetPermissionByEdbIdList(edbIdList []string, userIdList []int, edbInfoType
 
 	// 添加待配置项
 	if len(addList) > 0 {
-		_, err = o.InsertMulti(500, addList)
+		//_, err = o.InsertMulti(500, addList)
+		//if err != nil {
+		//	return
+		//}
+
+		err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
+
 	}
 
 	// 移除废弃的配置项
@@ -180,8 +231,14 @@ func SetPermissionByEdbIdList(edbIdList []string, userIdList []int, edbInfoType
 
 		deletePermissionIdNum := len(deletePermissionIdList)
 		if deletePermissionIdNum > 0 {
+			//sql = "DELETE FROM edb_info_permission WHERE edb_info_permission_id in (" + utils.GetOrmInReplace(deletePermissionIdNum) + ")"
+			//_, err = o.Raw(sql, deletePermissionIdList).Exec()
+			//if err != nil {
+			//	return
+			//}
+
 			sql = "DELETE FROM edb_info_permission WHERE edb_info_permission_id in (" + utils.GetOrmInReplace(deletePermissionIdNum) + ")"
-			_, err = o.Raw(sql, deletePermissionIdList).Exec()
+			err = to.Exec(sql, deletePermissionIdList).Error
 			if err != nil {
 				return
 			}
@@ -203,22 +260,32 @@ func SetPermissionByEdbClassifyIdList(classifyIdList []int, userIdList []int, cl
 	if userNum <= 0 {
 		return
 	}
-	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()
 		}
 	}()
 
 	// 获取当前选择用户已经配置的指标分类权限
 	classifyPermissionList := make([]*EdbClassifyPermission, 0)
 	sql := `SELECT * FROM edb_classify_permission WHERE edb_classify_type = ? AND sys_user_id in (` + utils.GetOrmInReplace(userNum) + `) `
-	_, err = o.Raw(sql, classifyType, userIdList).QueryRows(&classifyPermissionList)
+	err = to.Raw(sql, classifyType, userIdList).Find(&classifyPermissionList).Error
 	if err != nil {
 		return
 	}
@@ -253,7 +320,12 @@ func SetPermissionByEdbClassifyIdList(classifyIdList []int, userIdList []int, cl
 
 	// 添加待配置项
 	if len(addList) > 0 {
-		_, err = o.InsertMulti(500, addList)
+		//_, err = o.InsertMulti(500, addList)
+		//if err != nil {
+		//	return
+		//}
+
+		err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -269,8 +341,14 @@ func SetPermissionByEdbClassifyIdList(classifyIdList []int, userIdList []int, cl
 
 		deletePermissionIdNum := len(deletePermissionIdList)
 		if deletePermissionIdNum > 0 {
+			//sql = "DELETE FROM edb_classify_permission WHERE edb_classify_permission_id in (" + utils.GetOrmInReplace(deletePermissionIdNum) + ")"
+			//_, err = o.Raw(sql, deletePermissionIdList).Exec()
+			//if err != nil {
+			//	return
+			//}
+
 			sql = "DELETE FROM edb_classify_permission WHERE edb_classify_permission_id in (" + utils.GetOrmInReplace(deletePermissionIdNum) + ")"
-			_, err = o.Raw(sql, deletePermissionIdList).Exec()
+			err = to.Exec(sql, deletePermissionIdList).Error
 			if err != nil {
 				return
 			}
@@ -289,10 +367,12 @@ func SetPermissionByEdbClassifyIdList(classifyIdList []int, userIdList []int, cl
 // @return edbClassifyIdList []int
 // @return err error
 func GetPermissionEdbClassifyIdListByUserId(userId int, classifyType int) (edbClassifyIdList []int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT edb_classify_id FROM edb_classify_permission WHERE edb_classify_type = ? AND sys_user_id = ? `
-	_, err = o.Raw(sql, classifyType, userId).QueryRows(&edbClassifyIdList)
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT edb_classify_id FROM edb_classify_permission WHERE edb_classify_type = ? AND sys_user_id = ? `
+	//_, err = o.Raw(sql, classifyType, userId).QueryRows(&edbClassifyIdList)
 
+	sql := `SELECT edb_classify_id FROM edb_classify_permission WHERE edb_classify_type = ? AND sys_user_id = ? `
+	err = global.DmSQL["data"].Raw(sql, classifyType, userId).Find(&edbClassifyIdList).Error
 	return
 }
 
@@ -305,9 +385,12 @@ func GetPermissionEdbClassifyIdListByUserId(userId int, classifyType int) (edbCl
 // @return userIdList []int
 // @return err error
 func GetPermissionUserIdListByEdbId(dataId int, edbInfoType int) (userIdList []int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT sys_user_id FROM edb_info_permission WHERE edb_info_type = ? AND edb_info_id= ? `
+	//_, err = o.Raw(sql, edbInfoType, dataId).QueryRows(&userIdList)
+
 	sql := `SELECT sys_user_id FROM edb_info_permission WHERE edb_info_type = ? AND edb_info_id= ? `
-	_, err = o.Raw(sql, edbInfoType, dataId).QueryRows(&userIdList)
+	err = global.DmSQL["data"].Raw(sql, edbInfoType, dataId).Find(&userIdList).Error
 
 	return
 }
@@ -321,9 +404,12 @@ func GetPermissionUserIdListByEdbId(dataId int, edbInfoType int) (userIdList []i
 // @return userIdList []int
 // @return err error
 func GetPermissionUserIdListByEdbClassifyId(classifyId int, edbClassifyType int) (userIdList []int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT sys_user_id FROM edb_classify_permission WHERE edb_classify_type = ? AND edb_classify_id= ? `
+	//_, err = o.Raw(sql, edbClassifyType, classifyId).QueryRows(&userIdList)
+
 	sql := `SELECT sys_user_id FROM edb_classify_permission WHERE edb_classify_type = ? AND edb_classify_id= ? `
-	_, err = o.Raw(sql, edbClassifyType, classifyId).QueryRows(&userIdList)
+	err = global.DmSQL["data"].Raw(sql, edbClassifyType, classifyId).Find(&userIdList).Error
 
 	return
 }
@@ -338,13 +424,20 @@ func GetPermissionUserIdListByEdbClassifyId(classifyId int, edbClassifyType int)
 // @return err error
 func GetPermissionEdbIdList(userId, edbInfoId int) (idList []int, err error) {
 	pars := []interface{}{userId}
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT edb_info_id FROM edb_info_permission WHERE sys_user_id = ? `
+	//if edbInfoId > 0 {
+	//	sql += ` AND edb_info_id = ? `
+	//	pars = append(pars, edbInfoId)
+	//}
+	//_, err = o.Raw(sql, pars).QueryRows(&idList)
+
 	sql := `SELECT edb_info_id FROM edb_info_permission WHERE sys_user_id = ? `
 	if edbInfoId > 0 {
 		sql += ` AND edb_info_id = ? `
 		pars = append(pars, edbInfoId)
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&idList)
+	err = global.DmSQL["data"].Raw(sql, pars).Find(&idList).Error
 
 	return
 }
@@ -359,14 +452,20 @@ func GetPermissionEdbIdList(userId, edbInfoId int) (idList []int, err error) {
 // @return err error
 func GetPermissionEdbClassifyIdList(userId, classifyId int) (idList []int, err error) {
 	pars := []interface{}{userId}
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT edb_classify_id FROM edb_classify_permission WHERE sys_user_id = ? `
+	//if classifyId > 0 {
+	//	sql += ` AND edb_classify_id = ? `
+	//	pars = append(pars, classifyId)
+	//}
+	//_, err = o.Raw(sql, pars).QueryRows(&idList)
+
 	sql := `SELECT edb_classify_id FROM edb_classify_permission WHERE sys_user_id = ? `
 	if classifyId > 0 {
 		sql += ` AND edb_classify_id = ? `
 		pars = append(pars, classifyId)
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&idList)
-
+	err = global.DmSQL["data"].Raw(sql, pars).Find(&idList).Error
 	return
 }
 
@@ -382,21 +481,37 @@ func GetPermissionEdbClassifyIdList(userId, classifyId int) (idList []int, err e
 // @param uniqueCode string
 // @return err error
 func InheritParentClassifyByEdbClassifyId(source, classifyType, classifyId, parentClassifyId int, classifyName, uniqueCode 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()
 		}
 	}()
 
 	// 将对应的分类设置为涉密
+	//sql := `UPDATE edb_classify SET is_join_permission=?,modify_time=now() WHERE classify_type = ? AND classify_id = ? `
+	//_, err = o.Raw(sql, 1, classifyType, classifyId).Exec()
+	//if err != nil {
+	//	return
+	//}
+
 	sql := `UPDATE edb_classify SET is_join_permission=?,modify_time=now() WHERE classify_type = ? AND classify_id = ? `
-	_, err = o.Raw(sql, 1, classifyType, classifyId).Exec()
+	err = to.Exec(sql, 1, classifyType, classifyId).Error
 	if err != nil {
 		return
 	}
@@ -405,8 +520,11 @@ func InheritParentClassifyByEdbClassifyId(source, classifyType, classifyId, pare
 	{
 		// 获取父级未授权的用户记录
 		var parentRecordItems []*EdbInfoClassifyPermissionNoAuthRecord
+		//sql = `SELECT * FROM edb_info_classify_permission_no_auth_record WHERE classify_id = ? AND edb_classify_type = ? ORDER BY edb_info_classify_permission_no_auth_record_id desc LIMIT ?,? `
+		//_, err = o.Raw(sql, parentClassifyId, source, classifyType).QueryRows(&parentRecordItems)
+
 		sql = `SELECT * FROM edb_info_classify_permission_no_auth_record WHERE classify_id = ? AND edb_classify_type = ? ORDER BY edb_info_classify_permission_no_auth_record_id desc LIMIT ?,? `
-		_, err = o.Raw(sql, parentClassifyId, source, classifyType).QueryRows(&parentRecordItems)
+		err = to.Raw(sql, parentClassifyId, source, classifyType).Find(&parentRecordItems).Error
 
 		addNoAuthRecordItems := make([]*EdbInfoClassifyPermissionNoAuthRecord, 0)
 		for _, v := range parentRecordItems {
@@ -423,7 +541,12 @@ func InheritParentClassifyByEdbClassifyId(source, classifyType, classifyId, pare
 
 		// 添加待配置项
 		if len(addNoAuthRecordItems) > 0 {
-			_, err = o.InsertMulti(500, addNoAuthRecordItems)
+			//_, err = o.InsertMulti(500, addNoAuthRecordItems)
+			//if err != nil {
+			//	return
+			//}
+
+			err = to.CreateInBatches(addNoAuthRecordItems, utils.MultiAddNum).Error
 			if err != nil {
 				return
 			}
@@ -435,8 +558,14 @@ func InheritParentClassifyByEdbClassifyId(source, classifyType, classifyId, pare
 	{
 		// 获取父级分类已经授权的用户
 		parentClassifyPermissionList := make([]*EdbClassifyPermission, 0)
+		//sql = `SELECT * FROM edb_classify_permission WHERE edb_classify_type = ? AND edb_classify_id = ? `
+		//_, err = o.Raw(sql, classifyType, parentClassifyId).QueryRows(&parentClassifyPermissionList)
+		//if err != nil {
+		//	return
+		//}
+
 		sql = `SELECT * FROM edb_classify_permission WHERE edb_classify_type = ? AND edb_classify_id = ? `
-		_, err = o.Raw(sql, classifyType, parentClassifyId).QueryRows(&parentClassifyPermissionList)
+		err = to.Raw(sql, classifyType, parentClassifyId).Find(&parentClassifyPermissionList).Error
 		if err != nil {
 			return
 		}
@@ -455,7 +584,12 @@ func InheritParentClassifyByEdbClassifyId(source, classifyType, classifyId, pare
 		}
 		// 添加待配置项
 		if len(addList) > 0 {
-			_, err = o.InsertMulti(500, addList)
+			//_, err = o.InsertMulti(500, addList)
+			//if err != nil {
+			//	return
+			//}
+
+			err = to.CreateInBatches(addList, utils.MultiAddNum).Error
 			if err != nil {
 				return
 			}
@@ -504,22 +638,38 @@ func AddEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(source, edbInfoType i
 	if userNum <= 0 {
 		return
 	}
-	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 existList []*EdbInfoPermissionNoAuthRecord
+	//sql := `SELECT * FROM edb_info_permission_no_auth_record WHERE  edb_info_type = ? AND edb_info_id in (` + utils.GetOrmInReplace(num) + `)`
+	//_, err = o.Raw(sql, edbInfoType, dataIdList).QueryRows(&existList)
+	//if err != nil {
+	//	return
+	//}
+
 	sql := `SELECT * FROM edb_info_permission_no_auth_record WHERE  edb_info_type = ? AND edb_info_id in (` + utils.GetOrmInReplace(num) + `)`
-	_, err = o.Raw(sql, edbInfoType, dataIdList).QueryRows(&existList)
+	err = to.Raw(sql, edbInfoType, dataIdList).Find(&existList).Error
 	if err != nil {
 		return
 	}
@@ -588,7 +738,12 @@ func AddEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(source, edbInfoType i
 
 	// 添加消息
 	if len(addMessageList) > 0 {
-		_, err = o.InsertMulti(500, addMessageList)
+		//_, err = o.InsertMulti(500, addMessageList)
+		//if err != nil {
+		//	return
+		//}
+
+		err = to.CreateInBatches(addMessageList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -596,7 +751,12 @@ func AddEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(source, edbInfoType i
 
 	// 添加记录
 	if len(addRecordList) > 0 {
-		_, err = o.InsertMulti(500, addRecordList)
+		//_, err = o.InsertMulti(500, addRecordList)
+		//if err != nil {
+		//	return
+		//}
+
+		err = to.CreateInBatches(addRecordList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -605,8 +765,11 @@ func AddEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(source, edbInfoType i
 	// 已经授权了的用户，需要删除未授权记录
 	authUserIdNum := len(authUserIdList)
 	if authUserIdNum > 0 {
+		//sql = `DELETE FROM edb_info_permission_no_auth_record WHERE  edb_info_type = ? AND sys_user_id in (` + utils.GetOrmInReplace(authUserIdNum) + `) AND edb_info_id in (` + utils.GetOrmInReplace(num) + `)`
+		//_, err = o.Raw(sql, edbInfoType, authUserIdList, dataIdList).Exec()
+
 		sql = `DELETE FROM edb_info_permission_no_auth_record WHERE  edb_info_type = ? AND sys_user_id in (` + utils.GetOrmInReplace(authUserIdNum) + `) AND edb_info_id in (` + utils.GetOrmInReplace(num) + `)`
-		_, err = o.Raw(sql, edbInfoType, authUserIdList, dataIdList).Exec()
+		err = to.Exec(sql, edbInfoType, authUserIdList, dataIdList).Error
 	}
 
 	return
@@ -625,11 +788,13 @@ func DeleteEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(edbInfoType int, d
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//
+	//sql := `DELETE FROM edb_info_permission_no_auth_record WHERE edb_info_type = ? AND edb_info_id in (` + utils.GetOrmInReplace(num) + `)`
+	//_, err = o.Raw(sql, edbInfoType, dataIdList).Exec()
 
 	sql := `DELETE FROM edb_info_permission_no_auth_record WHERE edb_info_type = ? AND edb_info_id in (` + utils.GetOrmInReplace(num) + `)`
-	_, err = o.Raw(sql, edbInfoType, dataIdList).Exec()
-
+	err = global.DmSQL["data"].Exec(sql, edbInfoType, dataIdList).Error
 	return
 }
 
@@ -645,18 +810,27 @@ func DeleteEdbInfoPermissionNoAuthRecordBySourceAndDataIdList(edbInfoType int, d
 // @return items []*DataPermissionNoAuthRecord
 // @return err error
 func GetEdbInfoDataPermissionNoAuthRecordListByUserId(userId int32, edbInfoType, startSize, pageSize int) (total int, items []*DataPermissionNoAuthRecord, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//
+	//// 获取总数
+	//sql := `SELECT count(1) AS total FROM edb_info_permission_no_auth_record WHERE sys_user_id = ? AND edb_info_type = ? `
+	//err = o.Raw(sql, userId, edbInfoType).QueryRow(&total)
+	//if err != nil {
+	//	return
+	//}
+	//
+	//sql = `SELECT edb_info_permission_no_auth_record_id as data_permission_no_auth_record_id,op_unique_code,edb_info_type as sub_source,edb_info_id as data_id,edb_code as data_code,edb_name as data_name,sys_user_id,create_time FROM edb_info_permission_no_auth_record WHERE sys_user_id = ? AND edb_info_type = ? ORDER BY edb_info_permission_no_auth_record_id desc LIMIT ?,? `
+	//_, err = o.Raw(sql, userId, edbInfoType, startSize, pageSize).QueryRows(&items)
 
 	// 获取总数
 	sql := `SELECT count(1) AS total FROM edb_info_permission_no_auth_record WHERE sys_user_id = ? AND edb_info_type = ? `
-	err = o.Raw(sql, userId, edbInfoType).QueryRow(&total)
+	err = global.DmSQL["data"].Raw(sql, userId, edbInfoType).First(&total).Error
 	if err != nil {
 		return
 	}
 
 	sql = `SELECT edb_info_permission_no_auth_record_id as data_permission_no_auth_record_id,op_unique_code,edb_info_type as sub_source,edb_info_id as data_id,edb_code as data_code,edb_name as data_name,sys_user_id,create_time FROM edb_info_permission_no_auth_record WHERE sys_user_id = ? AND edb_info_type = ? ORDER BY edb_info_permission_no_auth_record_id desc LIMIT ?,? `
-	_, err = o.Raw(sql, userId, edbInfoType, startSize, pageSize).QueryRows(&items)
-
+	err = global.DmSQL["data"].Raw(sql, userId, edbInfoType, startSize, pageSize).Find(&items).Error
 	return
 }
 
@@ -697,22 +871,38 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, edbClassify
 	if userNum <= 0 {
 		return
 	}
-	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 existList []*EdbInfoClassifyPermissionNoAuthRecord
+	//sql := `SELECT * FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ? AND classify_id in (` + utils.GetOrmInReplace(num) + `)`
+	//_, err = o.Raw(sql, edbClassifyType, classifyIdList).QueryRows(&existList)
+	//if err != nil {
+	//	return
+	//}
+
 	sql := `SELECT * FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ? AND classify_id in (` + utils.GetOrmInReplace(num) + `)`
-	_, err = o.Raw(sql, edbClassifyType, classifyIdList).QueryRows(&existList)
+	err = to.Raw(sql, edbClassifyType, classifyIdList).Find(&existList).Error
 	if err != nil {
 		return
 	}
@@ -780,15 +970,24 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, edbClassify
 
 	// 添加消息
 	if len(addMessageList) > 0 {
-		_, err = o.InsertMulti(500, addMessageList)
+		//_, err = o.InsertMulti(500, addMessageList)
+		//if err != nil {
+		//	return
+		//}
+		err = to.CreateInBatches(addMessageList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
+
 	}
 
 	// 添加记录
 	if len(addRecordList) > 0 {
-		_, err = o.InsertMulti(500, addRecordList)
+		//_, err = o.InsertMulti(500, addRecordList)
+		//if err != nil {
+		//	return
+		//}
+		err = to.CreateInBatches(addRecordList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -797,8 +996,11 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(source, edbClassify
 	// 移除已经公开了的分类权限，需要删除未授权记录
 	authUserIdNum := len(classifyIdList)
 	if authUserIdNum > 0 {
+		//sql = `DELETE FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ? AND classify_id not in (` + utils.GetOrmInReplace(num) + `)`
+		//_, err = o.Raw(sql, edbClassifyType, classifyIdList).Exec()
+
 		sql = `DELETE FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ? AND classify_id not in (` + utils.GetOrmInReplace(num) + `)`
-		_, err = o.Raw(sql, edbClassifyType, classifyIdList).Exec()
+		err = to.Exec(sql, edbClassifyType, classifyIdList).Error
 	}
 
 	return
@@ -829,22 +1031,38 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType
 	//	return
 	//}
 
-	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 existList []*EdbInfoClassifyPermissionNoAuthRecord
+	//sql := `SELECT * FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ? AND sys_user_id in (` + utils.GetOrmInReplace(configUserNum) + `)`
+	//_, err = o.Raw(sql, edbClassifyType, configUserIdList).QueryRows(&existList)
+	//if err != nil {
+	//	return
+	//}
+
 	sql := `SELECT * FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ? AND sys_user_id in (` + utils.GetOrmInReplace(configUserNum) + `)`
-	_, err = o.Raw(sql, edbClassifyType, configUserIdList).QueryRows(&existList)
+	err = to.Raw(sql, edbClassifyType, configUserIdList).Find(&existList).Error
 	if err != nil {
 		return
 	}
@@ -916,7 +1134,12 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType
 
 	// 添加消息
 	if len(addMessageList) > 0 {
-		_, err = o.InsertMulti(500, addMessageList)
+		//_, err = o.InsertMulti(500, addMessageList)
+		//if err != nil {
+		//	return
+		//}
+
+		err = to.CreateInBatches(addMessageList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -924,7 +1147,12 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType
 
 	// 添加记录
 	if len(addRecordList) > 0 {
-		_, err = o.InsertMulti(500, addRecordList)
+		//_, err = o.InsertMulti(500, addRecordList)
+		//if err != nil {
+		//	return
+		//}
+
+		err = to.CreateInBatches(addRecordList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -937,8 +1165,10 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType
 		for _, v := range delRecordIdMap {
 			delRecordIdList = append(delRecordIdList, v)
 		}
+		//sql = `DELETE FROM edb_info_classify_permission_no_auth_record WHERE edb_info_classify_permission_no_auth_record_id in (` + utils.GetOrmInReplace(delRecordIdNum) + `) `
+		//_, err = o.Raw(sql, delRecordIdList).Exec()
 		sql = `DELETE FROM edb_info_classify_permission_no_auth_record WHERE edb_info_classify_permission_no_auth_record_id in (` + utils.GetOrmInReplace(delRecordIdNum) + `) `
-		_, err = o.Raw(sql, delRecordIdList).Exec()
+		err = to.Exec(sql, delRecordIdList).Error
 	}
 
 	return
@@ -952,10 +1182,13 @@ func AddEdbInfoClassifyNoAuthRecordBySourceAndUserIdList(source, edbClassifyType
 // @param edbClassifyType int
 // @return err error
 func DeleteEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(edbClassifyType int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//
+	//sql := `DELETE FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ?`
+	//_, err = o.Raw(sql, edbClassifyType).Exec()
 
 	sql := `DELETE FROM edb_info_classify_permission_no_auth_record WHERE edb_classify_type = ?`
-	_, err = o.Raw(sql, edbClassifyType).Exec()
+	err = global.DmSQL["data"].Exec(sql, edbClassifyType).Error
 
 	return
 }
@@ -973,17 +1206,26 @@ func DeleteEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList(edbClassifyType
 // @return items []*DataPermissionClassifyNoAuthRecord
 // @return err error
 func GetEdbInfoDataPermissionClassifyNoAuthRecordListByUserId(userId int32, edbClassifyType, startSize, pageSize int) (total int, items []*DataPermissionClassifyNoAuthRecord, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
+	//
+	//// 获取总数
+	//sql := `SELECT count(1) AS total FROM edb_info_classify_permission_no_auth_record WHERE sys_user_id = ? AND edb_classify_type = ? `
+	//err = o.Raw(sql, userId, edbClassifyType).QueryRow(&total)
+	//if err != nil {
+	//	return
+	//}
+	//
+	//sql = `SELECT edb_info_classify_permission_no_auth_record_id as data_permission_classify_no_auth_record_id,edb_classify_type as sub_source,op_unique_code,classify_id,classify_name,sys_user_id,create_time  FROM edb_info_classify_permission_no_auth_record WHERE sys_user_id = ? AND edb_classify_type = ? ORDER BY edb_info_classify_permission_no_auth_record_id desc LIMIT ?,? `
+	//_, err = o.Raw(sql, userId, edbClassifyType, startSize, pageSize).QueryRows(&items)
 
 	// 获取总数
 	sql := `SELECT count(1) AS total FROM edb_info_classify_permission_no_auth_record WHERE sys_user_id = ? AND edb_classify_type = ? `
-	err = o.Raw(sql, userId, edbClassifyType).QueryRow(&total)
+	err = global.DmSQL["data"].Raw(sql, userId, edbClassifyType).Scan(&total).Error
 	if err != nil {
 		return
 	}
 
 	sql = `SELECT edb_info_classify_permission_no_auth_record_id as data_permission_classify_no_auth_record_id,edb_classify_type as sub_source,op_unique_code,classify_id,classify_name,sys_user_id,create_time  FROM edb_info_classify_permission_no_auth_record WHERE sys_user_id = ? AND edb_classify_type = ? ORDER BY edb_info_classify_permission_no_auth_record_id desc LIMIT ?,? `
-	_, err = o.Raw(sql, userId, edbClassifyType, startSize, pageSize).QueryRows(&items)
-
+	err = global.DmSQL["data"].Raw(sql, userId, edbClassifyType, startSize, pageSize).Find(&items).Error
 	return
 }