orm->grom

models/api_uri.go

@@ -1,31 +1,31 @@
 package models
 
-import "github.com/beego/beego/v2/client/orm"
-
 type ApiUriTest struct {
-	ApiUri         string
-	ParentUri      string
-	Method         string
-	Description    string
-	MenuId         string
-	ParentMenu     string // 一级菜单
-	ChildMenu      string // 二级菜单
-	ButtonName     string // 按钮名称
-	Id             int    `orm:"column(id);pk"`
-	IsPublic       int    // 是否公共api，0否，1是
-	ChildChildMenu string // 三级菜单
+	ApiUri         string `gorm:"column:api_uri"`
+	ParentUri      string `gorm:"column:parent_uri"`
+	Method         string `gorm:"column:method"`
+	Description    string `gorm:"column:description"`
+	MenuId         string `gorm:"column:menu_id"`
+	ParentMenu     string `gorm:"column:parent_menu"`      // 一级菜单
+	ChildMenu      string `gorm:"column:child_menu"`       // 二级菜单
+	ButtonName     string `gorm:"column:button_name"`      // 按钮名称
+	Id             int    `gorm:"column:id;primaryKey"`    // `orm:"column(id);pk"`
+	IsPublic       int    `gorm:"column:is_public"`        // 是否公共api，0否，1是
+	ChildChildMenu string `gorm:"column:child_child_menu"` // 三级菜单
 }
 
 func GetApiUriTest() (items []*ApiUriTest, err error) {
-	o := orm.NewOrmUsingDB("weekly")
-	sql := ` SELECT * FROM api_uri_test `
-	_,err = o.Raw(sql).QueryRows(&items)
+	err = DEFAULT_DmSQL.Raw("SELECT * FROM api_uri_test").Find(&items).Error
+	//o := orm.NewOrmUsingDB("weekly")
+	//sql := ` SELECT * FROM api_uri_test `
+	//_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 func UpdateApiUriTest(api string, menuId int) (err error) {
-	o := orm.NewOrm()
-	sql := ` UPDATE sys_menu SET api = ? where menu_id = ?`
-	_, err = o.Raw(sql, api, menuId).Exec()
+	err = DEFAULT_DmSQL.Exec("UPDATE sys_menu SET api = ? where menu_id = ?", api, menuId).Error
+	//o := orm.NewOrm()
+	//sql := ` UPDATE sys_menu SET api = ? where menu_id = ?`
+	//_, err = o.Raw(sql, api, menuId).Exec()
 	return
-}
+}

models/business_conf.go

@@ -3,7 +3,6 @@ package models
 import (
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"html"
 	"strings"
 	"time"
@@ -70,13 +69,13 @@ var FromSceneMap = map[int]string{
 
 // BusinessConf 商户配置表
 type BusinessConf struct {
-	Id         int    `orm:"column(id);pk"`
-	ConfKey    string `description:"配置Key"`
-	ConfVal    string `description:"配置值"`
-	ValType    int    `description:"1-字符串；2-数值；3-字符串数组；4-富文本；"`
-	Necessary  int    `description:"是否必填：0-否；1-是"`
-	Remark     string `description:"备注"`
-	CreateTime time.Time
+	Id         int       `gorm:"column:id;primaryKey"` //`orm:"column(id);pk"`
+	ConfKey    string    `gorm:"column:conf_key"`      //`description:"配置Key"`
+	ConfVal    string    `gorm:"column:conf_val"`      //`description:"配置值"`
+	ValType    int       `gorm:"column:val_type"`      //`description:"1-字符串；2-数值；3-字符串数组；4-富文本；"`
+	Necessary  int       `gorm:"column:necessary"`     //`description:"是否必填：0-否；1-是"`
+	Remark     string    `gorm:"column:remark"`        // `description:"备注"`
+	CreateTime time.Time `gorm:"column:create_time"`
 }
 
 func (m *BusinessConf) TableName() string {
@@ -88,12 +87,13 @@ func (m *BusinessConf) PrimaryId() string {
 }
 
 func (m *BusinessConf) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.Id = int(id)
+	err = DEFAULT_DmSQL.Create(m).Error
+	//o := orm.NewOrm()
+	//id, err := o.Insert(m)
+	//if err != nil {
+	//	return
+	//}
+	//m.Id = int(id)
 	return
 }
 
@@ -101,47 +101,57 @@ func (m *BusinessConf) CreateMulti(items []*BusinessConf) (err error) {
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+	err = DEFAULT_DmSQL.CreateInBatches(items, len(items)).Error
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(len(items), items)
 	return
 }
 
 func (m *BusinessConf) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+	err = DEFAULT_DmSQL.Select(cols).Updates(m).Error
+	//o := orm.NewOrm()
+	//_, err = o.Update(m, cols...)
 	return
 }
 
 func (m *BusinessConf) Del() (err error) {
-	o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	_, err = o.Raw(sql, m.Id).Exec()
+	err = DEFAULT_DmSQL.Exec(sql, m.Id).Error
+	//o := orm.NewOrm()
+	//sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
+	//_, err = o.Raw(sql, m.Id).Exec()
 	return
 }
 
 func (m *BusinessConf) GetItemById(id int) (item *BusinessConf, err error) {
-	o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = DEFAULT_DmSQL.Raw(sql, id).Find(&item).Error
+	//o := orm.NewOrm()
+	//sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
+	//err = o.Raw(sql, id).QueryRow(&item)
 	return
 }
 
 func (m *BusinessConf) GetItemByCondition(condition string, pars []interface{}) (item *BusinessConf, err error) {
-	o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	//o := orm.NewOrm()
+	//sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
+	//err = o.Raw(sql, pars).QueryRow(&item)
 	return
 }
 
 func (m *BusinessConf) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	//o := orm.NewOrm()
+	//sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
+	//err = o.Raw(sql, pars).QueryRow(&count)
 	return
 }
 
 func (m *BusinessConf) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BusinessConf, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -151,12 +161,14 @@ func (m *BusinessConf) GetItemsByCondition(condition string, pars []interface{},
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	//o := orm.NewOrm()
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 
 func (m *BusinessConf) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BusinessConf, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -166,7 +178,9 @@ func (m *BusinessConf) GetPageItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Find(&items).Error
+	//o := orm.NewOrm()
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }
 
@@ -175,9 +189,11 @@ func GetBusinessConf() (list map[string]string, err error) {
 	list = make(map[string]string)
 
 	var items []*BusinessConf
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
+	//sql := `SELECT * FROM business_conf`
+	//_, err = o.Raw(sql).QueryRows(&items)
 	sql := `SELECT * FROM business_conf`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	if err != nil {
 		return
 	}
@@ -200,27 +216,39 @@ type BusinessConfUpdate struct {
 
 // UpdateBusinessConfMulti 批量修改配置
 func UpdateBusinessConfMulti(items []BusinessConfUpdate) (err error) {
-	o := orm.NewOrm()
-	p, err := o.Raw("UPDATE business_conf SET conf_val = ? WHERE conf_key = ?").Prepare()
-	if err != nil {
-		return
-	}
-	defer func() {
-		_ = p.Close()
-	}()
+	tx := DEFAULT_DmSQL.Begin()
 	for _, v := range items {
-		_, err = p.Exec(v.ConfVal, v.ConfKey)
+		err = tx.Exec("UPDATE business_conf SET conf_val = ? WHERE conf_key = ?", v.ConfVal, v.ConfKey).Error
 		if err != nil {
+			tx.Rollback()
 			return
 		}
 	}
+	tx.Commit()
 	return
+	//o := orm.NewOrm()
+	//p, err := o.Raw("UPDATE business_conf SET conf_val = ? WHERE conf_key = ?").Prepare()
+	//if err != nil {
+	//	return
+	//}
+	//defer func() {
+	//	_ = p.Close()
+	//}()
+	//for _, v := range items {
+	//	_, err = p.Exec(v.ConfVal, v.ConfKey)
+	//	if err != nil {
+	//		return
+	//	}
+	//}
+	//return
 }
 
 func GetBusinessConfByKey(key string) (item *BusinessConf, err error) {
-	o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM business_conf WHERE conf_key = ? LIMIT 1`)
-	err = o.Raw(sql, key).QueryRow(&item)
+	err = DEFAULT_DmSQL.Raw(sql, key).First(&item).Error
+	//o := orm.NewOrm()
+	//sql := fmt.Sprintf(`SELECT * FROM business_conf WHERE conf_key = ? LIMIT 1`)
+	//err = o.Raw(sql, key).QueryRow(&item)
 	return
 }
 

models/business_conf_operation_record.go

@@ -2,18 +2,17 @@ package models
 
 import (
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
 
 // BusinessConfOperationRecord 商户配置操作记录表
 type BusinessConfOperationRecord struct {
-	Id          int       `orm:"column(id);pk"`
-	SysUserId   int       `description:"操作人ID"`
-	SysRealName string    `description:"操作人姓名"`
-	Content     string    `description:"操作数据"`
-	CreateTime  time.Time `description:"操作时间"`
+	Id          int       //`orm:"column(id);pk"`
+	SysUserId   int       //`description:"操作人ID"`
+	SysRealName string    //`description:"操作人姓名"`
+	Content     string    //`description:"操作数据"`
+	CreateTime  time.Time //`description:"操作时间"`
 }
 
 func (m *BusinessConfOperationRecord) TableName() string {
@@ -25,12 +24,13 @@ func (m *BusinessConfOperationRecord) PrimaryId() string {
 }
 
 func (m *BusinessConfOperationRecord) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.Id = int(id)
+	//o := orm.NewOrm()
+	//id, err := o.Insert(m)
+	//if err != nil {
+	//	return
+	//}
+	//m.Id = int(id)
+	err = DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
@@ -38,47 +38,57 @@ func (m *BusinessConfOperationRecord) CreateMulti(items []*BusinessConfOperation
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(len(items), items)
+	err = DEFAULT_DmSQL.CreateInBatches(items, len(items)).Error
 	return
 }
 
 func (m *BusinessConfOperationRecord) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(m, cols...)
+	err = DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *BusinessConfOperationRecord) Del() (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
+	//sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
+	//_, err = o.Raw(sql, m.Id).Exec()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	_, err = o.Raw(sql, m.Id).Exec()
+	err = DEFAULT_DmSQL.Exec(sql, m.Id).Error
 	return
 }
 
 func (m *BusinessConfOperationRecord) GetItemById(id int) (item *BusinessConfOperationRecord, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
+	//sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
+	//err = o.Raw(sql, id).QueryRow(&item)
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *BusinessConfOperationRecord) GetItemByCondition(condition string, pars []interface{}) (item *BusinessConfOperationRecord, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
+	//sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
+	//err = o.Raw(sql, pars).QueryRow(&item)
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *BusinessConfOperationRecord) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
+	//sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
+	//err = o.Raw(sql, pars).QueryRow(&count)
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func (m *BusinessConfOperationRecord) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BusinessConfOperationRecord, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -88,12 +98,15 @@ func (m *BusinessConfOperationRecord) GetItemsByCondition(condition string, pars
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	//sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
+	//o := orm.NewOrm()
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 
 func (m *BusinessConfOperationRecord) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BusinessConfOperationRecord, err error) {
-	o := orm.NewOrm()
+
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -103,6 +116,8 @@ func (m *BusinessConfOperationRecord) GetPageItemsByCondition(condition string,
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	//o := orm.NewOrm()
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Find(&items).Error
 	return
 }

models/chart_permission.go

@@ -3,7 +3,6 @@ package models
 import (
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -13,30 +12,30 @@ const (
 
 // ChartPermission 报告权限表
 type ChartPermission struct {
-	ChartPermissionId     int       `orm:"column(chart_permission_id);pk" description:"问题ID" json:"chart_permission_id"`
-	ChartPermissionName   string    `description:"名称" json:"chart_permission_name"`
-	PermissionName        string    `description:"权限名" json:"permission_name"`
-	Sort                  int       `description:"排序" json:"sort"`
-	Enabled               int       `description:"是否可用" json:"enabled"`
-	CreatedTime           time.Time `description:"创建时间" json:"created_time"`
-	LastUpdatedTime       time.Time `description:"更新时间" json:"last_updated_time"`
-	TeleconferenceSort    int       `description:"电话会类型排序" json:"teleconference_sort"`
-	Remark                string    `description:"备注" json:"remark"`
-	ClassifyName          string    `description:"分类名称" json:"classify_name"`
-	ProductName           string    `description:"产品名称" json:"product_name"`
-	ProductId             int       `description:"产品ID" json:"product_id"`
-	ImageURL              string    `orm:"column(image_url);" description:"图片地址" json:"image_url"`
-	ShowType              int       `description:"1:查研观向小程序展示" json:"show_type"`
-	IsOther               int       `description:"是否是其他，用于查研观向小程序后台展示" json:"is_other"`
-	IsReport              int       `description:"是否是报告，用于查研观向小程序前台报告展示" json:"is_report"`
-	CygxAuth              int       `description:"是否是权限，用于查研观向小程序前台权限校验" json:"cygx_auth"`
-	PermissionType        int       `description:"1主观，2客观" json:"permission_type"`
-	YbImgUrl              string    `description:"研报小程序报告列表icon" json:"yb_img_url"`
-	ProductPermissionName string    `description:"种类权限名称" json:"product_permission_name"`
-	PriceDrivenState      int       `description:"品种价格驱动开启状态 0-关闭 1-开启" json:"price_driven_state"`
-	ImageUrlM             string    `description:"图片地址(查研观向移动端)" json:"image_url_m"`
-	ParentId              int       `description:"父级权限id" json:"parent_id"`
-	IsPublic              int       `description:"是否是公有权限1:公有权限，0私有权限" json:"is_public"`
+	ChartPermissionId     int       `gorm:"column:chart_permission_id"`     //`orm:"column(chart_permission_id);pk" description:"问题ID" json:"chart_permission_id"`
+	ChartPermissionName   string    `gorm:"column:chart_permission_name"`   //`description:"名称" json:"chart_permission_name"`
+	PermissionName        string    `gorm:"column:permission_name"`         //`description:"权限名" json:"permission_name"`
+	Sort                  int       `gorm:"column:sort"`                    //`description:"排序" json:"sort"`
+	Enabled               int       `gorm:"column:enabled"`                 //`description:"是否可用" json:"enabled"`
+	CreatedTime           time.Time `gorm:"column:created_time"`            //`description:"创建时间" json:"created_time"`
+	LastUpdatedTime       time.Time `gorm:"column:last_updated_time"`       //`description:"更新时间" json:"last_updated_time"`
+	TeleconferenceSort    int       `gorm:"column:teleconference_sort"`     //`description:"电话会类型排序" json:"teleconference_sort"`
+	Remark                string    `gorm:"column:remark"`                  //`description:"备注" json:"remark"`
+	ClassifyName          string    `gorm:"column:classify_name"`           //`description:"分类名称" json:"classify_name"`
+	ProductName           string    `gorm:"column:product_name"`            //`description:"产品名称" json:"product_name"`
+	ProductId             int       `gorm:"column:product_id"`              //`description:"产品ID" json:"product_id"`
+	ImageURL              string    `gorm:"column:image_url"`               //`orm:"column(image_url);" description:"图片地址" json:"image_url"`
+	ShowType              int       `gorm:"column:show_type"`               //`description:"1:查研观向小程序展示" json:"show_type"`
+	IsOther               int       `gorm:"column:is_other"`                //`description:"是否是其他，用于查研观向小程序后台展示" json:"is_other"`
+	IsReport              int       `gorm:"column:is_report"`               //`description:"是否是报告，用于查研观向小程序前台报告展示" json:"is_report"`
+	CygxAuth              int       `gorm:"column:cygx_auth"`               //`description:"是否是权限，用于查研观向小程序前台权限校验" json:"cygx_auth"`
+	PermissionType        int       `gorm:"column:permission_type"`         //`description:"1主观，2客观" json:"permission_type"`
+	YbImgUrl              string    `gorm:"column:yb_img_url"`              //`description:"研报小程序报告列表icon" json:"yb_img_url"`
+	ProductPermissionName string    `gorm:"column:product_permission_name"` //`description:"种类权限名称" json:"product_permission_name"`
+	PriceDrivenState      int       `gorm:"column:price_driven_state"`      //`description:"品种价格驱动开启状态 0-关闭 1-开启" json:"price_driven_state"`
+	ImageUrlM             string    `gorm:"column:image_url_m"`             //`description:"图片地址(查研观向移动端)" json:"image_url_m"`
+	ParentId              int       `gorm:"column:parent_id"`               //`description:"父级权限id" json:"parent_id"`
+	IsPublic              int       `gorm:"column:is_public"`               //`description:"是否是公有权限1:公有权限，0私有权限" json:"is_public"`
 }
 
 type ChartPermissionItem struct {
@@ -52,8 +51,9 @@ type ChartPermissionItem struct {
 
 // Update 更新
 func (c *ChartPermission) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Update(c, cols...)
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Update(c, cols...)
+	err = DmSQL["rddp"].Select(cols).Updates(c).Error
 	return
 }
 
@@ -86,8 +86,9 @@ type PermissionMoveReq struct {
 }
 
 func (c *ChartPermission) SetEnabled(id, enabled int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	to, err := o.Begin()
+	//o := orm.NewOrmUsingDB("rddp")
+	//to, err := o.Begin()
+	to := DmSQL["rddp"].Begin()
 	if err != nil {
 		return
 	}
@@ -99,12 +100,14 @@ func (c *ChartPermission) SetEnabled(id, enabled int) (err error) {
 		}
 	}()
 	sql := ` UPDATE chart_permission SET enabled =?  WHERE id = ?`
-	_, err = to.Raw(sql, enabled, id).Exec()
+	//_, err = to.Raw(sql, enabled, id).Exec()
+	err = to.Exec(sql, enabled, id).Error
 	if err != nil {
 		return
 	}
 	sql = ` UPDATE chart_permission SET enabled =?  WHERE parent_id = ?`
-	_, err = to.Raw(sql, enabled, id).Exec()
+	//_, err = to.Raw(sql, enabled, id).Exec()
+	err = to.Exec(sql, enabled, id).Error
 	if err != nil {
 		return
 	}
@@ -113,121 +116,148 @@ func (c *ChartPermission) SetEnabled(id, enabled int) (err error) {
 
 // Create 新增权限
 func (c *ChartPermission) Create() (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	id, err := o.Insert(c)
-	if err != nil {
-		return
-	}
-	c.ChartPermissionId = int(id)
+	//o := orm.NewOrmUsingDB("rddp")
+	//id, err := o.Insert(c)
+	//if err != nil {
+	//	return
+	//}
+	//c.ChartPermissionId = int(id)
+	err = DmSQL["rddp"].Create(c).Error
 	return
 }
 
 // SetIsPublic 更新公有私有权限
 func (c *ChartPermission) SetIsPublic(ids []int, parentId, isPublic int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `update chart_permission set is_public=? WHERE parent_id = ?  and  chart_permission_id IN (` + utils.GetOrmInReplace(len(ids)) + `)`
+	//_, err = o.Raw(sql, isPublic, parentId, ids).Exec()
 	sql := `update chart_permission set is_public=? WHERE parent_id = ?  and  chart_permission_id IN (` + utils.GetOrmInReplace(len(ids)) + `)`
-	_, err = o.Raw(sql, isPublic, parentId, ids).Exec()
+	err = DmSQL["rddp"].Exec(sql, isPublic, parentId, ids).Error
 	return
 }
 
 // UpdatesByParentId 更新启动禁用
 func (c *ChartPermission) UpdateClassifyNameByParentId(parentId int, classifyName string) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `update chart_permission set classify_name=? WHERE parent_id = ?`
+	//_, err = o.Raw(sql, classifyName, parentId).Exec()
 	sql := `update chart_permission set classify_name=? WHERE parent_id = ?`
-	_, err = o.Raw(sql, classifyName, parentId).Exec()
+	err = DmSQL["rddp"].Exec(sql, classifyName, parentId).Error
 	return
 }
 
 // SetEnabledByParentId 更新启动禁用
 func (c *ChartPermission) SetEnabledByParentId(parentId, enabled int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := ` UPDATE chart_permission SET enabled =?  WHERE parent_id = ?`
+	//_, err = o.Raw(sql, enabled, parentId).Exec()
 	sql := ` UPDATE chart_permission SET enabled =?  WHERE parent_id = ?`
-	_, err = o.Raw(sql, enabled, parentId).Exec()
+	err = DmSQL["rddp"].Exec(sql, enabled, parentId).Error
 	return
 }
 
 // SetEnabledByChartPermissionId 更新启动禁用
 func (c *ChartPermission) SetEnabledByChartPermissionId(chartPermissionId, enabled int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := ` UPDATE chart_permission SET enabled =?  WHERE chart_permission_id = ?`
+	//_, err = o.Raw(sql, enabled, chartPermissionId).Exec()
 	sql := ` UPDATE chart_permission SET enabled =?  WHERE chart_permission_id = ?`
-	_, err = o.Raw(sql, enabled, chartPermissionId).Exec()
+	err = DmSQL["rddp"].Exec(sql, enabled, chartPermissionId).Error
 	return
 }
 
 // GetItemById 查询品种
 func (c *ChartPermission) GetItemById(chartPermissionId int) (item *ChartPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `select * from chart_permission WHERE chart_permission_id = ?`
+	//err = o.Raw(sql, chartPermissionId).QueryRow(&item)
 	sql := `select * from chart_permission WHERE chart_permission_id = ?`
-	err = o.Raw(sql, chartPermissionId).QueryRow(&item)
+	err = DmSQL["rddp"].Raw(sql, chartPermissionId).First(&item).Error
 	return
 }
 
 // GetItemsByCondition 查询列表
 func (c *ChartPermission) GetItemsByCondition(condition string, pars []interface{}) (items []*ChartPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `select * from chart_permission WHERE 1=1 ` + condition + ` order by sort asc, chart_permission_id asc`
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	sql := `select * from chart_permission WHERE 1=1 ` + condition + ` order by sort asc, chart_permission_id asc`
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
 	return
 }
 
 // GetItemByCondition 查询列表
 func (c *ChartPermission) GetItemByCondition(condition string, pars []interface{}) (item *ChartPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `select * from chart_permission WHERE 1=1 ` + condition
+	//err = o.Raw(sql, pars).QueryRow(&item)
 	sql := `select * from chart_permission WHERE 1=1 ` + condition
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = DmSQL["rddp"].Raw(sql, pars).First(&item).Error
 	return
 }
 
 // UpdateChartPermissionSortByParentId 根据父类id更新排序
 func UpdateChartPermissionSortByParentId(parentId, chartPermissionId, nowSort int, updateSort string, productId int) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
+
 	sql := ` update chart_permission set sort = ` + updateSort + ` WHERE parent_id=? AND product_id = ? AND (sort > ? `
 	if chartPermissionId > 0 {
 		sql += ` or ( chart_permission_id > ` + fmt.Sprint(chartPermissionId) + ` and sort = ` + fmt.Sprint(nowSort) + `))`
 	} else {
 		sql += `)`
 	}
-	_, err = o.Raw(sql, parentId, productId, nowSort).Exec()
+	//o := orm.NewOrmUsingDB("rddp")
+	//_, err = o.Raw(sql, parentId, productId, nowSort).Exec()
+	err = DmSQL["rddp"].Exec(sql, parentId, productId, nowSort).Error
 	return
 }
 
 // GetMaxSort 获取最大的排序值
 func (c *ChartPermission) GetMaxSort() (maxSort int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `select max(sort) from chart_permission `
+	//err = o.Raw(sql).QueryRow(&maxSort)
 	sql := `select max(sort) from chart_permission `
-	err = o.Raw(sql).QueryRow(&maxSort)
+	err = DmSQL["rddp"].Raw(sql).Scan(&maxSort).Error
 	return
 }
 
 // GetMaxSortByParentId 获取最大的排序值
 func (c *ChartPermission) GetMaxSortByParentId(parentId int) (maxSort int, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `select max(sort) from chart_permission WHERE parent_id=? `
+	//err = o.Raw(sql, parentId).QueryRow(&maxSort)
 	sql := `select max(sort) from chart_permission WHERE parent_id=? `
-	err = o.Raw(sql, parentId).QueryRow(&maxSort)
+	err = DmSQL["rddp"].Raw(sql, parentId).Scan(&maxSort).Error
 	return
 }
 
 // GetFirstChartPermissionByParentId 获取当前父级分类下，且排序数相同 的排序第一条的数据
 func (c *ChartPermission) GetFirstChartPermissionByParentId(parentId int) (item *ChartPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `select * from chart_permission WHERE parent_id=? ORDER BY sort ASC, chart_permission_id ASC LIMIT 1`
+	//err = o.Raw(sql, parentId).QueryRow(&item)
 	sql := `select * from chart_permission WHERE parent_id=? ORDER BY sort ASC, chart_permission_id ASC LIMIT 1`
-	err = o.Raw(sql, parentId).QueryRow(&item)
+	err = DmSQL["rddp"].Raw(sql, parentId).First(&item).Error
 	return
 }
 
 // GetChartPermissionById 主键获取品种
 func GetChartPermissionById(permissionId int) (item *ChartPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `SELECT * FROM chart_permission WHERE chart_permission_id = ?`
+	//err = o.Raw(sql, permissionId).QueryRow(&item)
 	sql := `SELECT * FROM chart_permission WHERE chart_permission_id = ?`
-	err = o.Raw(sql, permissionId).QueryRow(&item)
+	err = DmSQL["rddp"].Raw(sql, permissionId).First(&item).Error
 	return
 }
 
 // GetSecondaryChartPermissions 获取二级权限列表
 func GetSecondaryChartPermissions() (list []*ChartPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `SELECT * FROM chart_permission WHERE product_id = ? AND parent_id > 0 AND enabled = 1 ORDER BY parent_id ASC, sort ASC, created_time ASC`
+	//_, err = o.Raw(sql, FiccProductId).QueryRows(&list)
 	sql := `SELECT * FROM chart_permission WHERE product_id = ? AND parent_id > 0 AND enabled = 1 ORDER BY parent_id ASC, sort ASC, created_time ASC`
-	_, err = o.Raw(sql, FiccProductId).QueryRows(&list)
+	err = DmSQL["rddp"].Raw(sql, FiccProductId).Find(&list).Error
 	return
 }
 
@@ -252,10 +282,11 @@ func FormatChartPermission2Simple(origin *ChartPermission) (item *SimpleChartPer
 
 // GetChartPermissionsByProductId 获取权限列表
 func GetChartPermissionsByProductId() (list []*ChartPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `SELECT * FROM chart_permission WHERE product_id = ? AND enabled = 1 ORDER BY parent_id ASC, sort ASC, created_time ASC`
+	//_, err = o.Raw(sql, FiccProductId).QueryRows(&list)
 	sql := `SELECT * FROM chart_permission WHERE product_id = ? AND enabled = 1 ORDER BY parent_id ASC, sort ASC, created_time ASC`
-	_, err = o.Raw(sql, FiccProductId).QueryRows(&list)
-
+	err = DmSQL["rddp"].Raw(sql, FiccProductId).Find(&list).Error
 	return
 }
 
@@ -271,9 +302,10 @@ func GetChartPermissionByIdList(permissionIdList []int) (items []*ChartPermissio
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("rddp")
+	//o := orm.NewOrmUsingDB("rddp")
+	//sql := `SELECT * FROM chart_permission WHERE chart_permission_id in (` + utils.GetOrmInReplace(num) + `) `
+	//_, err = o.Raw(sql, permissionIdList).QueryRows(&items)
 	sql := `SELECT * FROM chart_permission WHERE chart_permission_id in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, permissionIdList).QueryRows(&items)
-
+	err = DmSQL["rddp"].Raw(sql, permissionIdList).Find(&items).Error
 	return
 }