|
|
@@ -3,7 +3,6 @@ package models
|
|
|
import (
|
|
|
"eta_gn/eta_index_lib/utils"
|
|
|
"fmt"
|
|
|
- "github.com/beego/beego/v2/client/orm"
|
|
|
"html"
|
|
|
"strings"
|
|
|
"time"
|
|
|
@@ -68,13 +67,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;autoIncrement"`
|
|
|
+ ConfKey string `gorm:"column:conf_key;type:varchar(128);not null;default:'';uniqueIndex:idx_conf_key"`
|
|
|
+ ConfVal string `gorm:"column:conf_val;type:text"`
|
|
|
+ ValType int `gorm:"column:val_type;not null;default:0"`
|
|
|
+ Necessary int `gorm:"column:necessary;not null;default:0"`
|
|
|
+ Remark string `gorm:"column:remark;type:varchar(128);not null;default:''"`
|
|
|
+ CreateTime *time.Time `gorm:"column:create_time"`
|
|
|
}
|
|
|
|
|
|
func (m *BusinessConf) TableName() string {
|
|
|
@@ -86,12 +85,10 @@ func (m *BusinessConf) PrimaryId() string {
|
|
|
}
|
|
|
|
|
|
func (m *BusinessConf) Create() (err error) {
|
|
|
- o := orm.NewOrmUsingDB("master")
|
|
|
- id, err := o.Insert(m)
|
|
|
+ err = DmSQL["master"].Model(m).Create(m).Error
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
- m.Id = int(id)
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -99,47 +96,42 @@ func (m *BusinessConf) CreateMulti(items []*BusinessConf) (err error) {
|
|
|
if len(items) == 0 {
|
|
|
return
|
|
|
}
|
|
|
- o := orm.NewOrmUsingDB("master")
|
|
|
- _, err = o.InsertMulti(len(items), items)
|
|
|
+ err = DmSQL["master"].Model(m).CreateInBatches(items, len(items)).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func (m *BusinessConf) Update(cols []string) (err error) {
|
|
|
- o := orm.NewOrmUsingDB("master")
|
|
|
- _, err = o.Update(m, cols...)
|
|
|
+ err = DmSQL["master"].Model(m).Select(cols).Updates(m).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func (m *BusinessConf) Del() (err error) {
|
|
|
- o := orm.NewOrmUsingDB("master")
|
|
|
sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
|
|
|
- _, err = o.Raw(sql, m.Id).Exec()
|
|
|
+ err = DmSQL["master"].Exec(sql, m.Id).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func (m *BusinessConf) GetItemById(id int) (item *BusinessConf, err error) {
|
|
|
- o := orm.NewOrmUsingDB("master")
|
|
|
sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
|
|
|
- err = o.Raw(sql, id).QueryRow(&item)
|
|
|
+ err = DmSQL["master"].Model(m).Raw(sql, id).First(&item).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func (m *BusinessConf) GetItemByCondition(condition string, pars []interface{}) (item *BusinessConf, err error) {
|
|
|
- o := orm.NewOrmUsingDB("master")
|
|
|
sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
|
|
|
- err = o.Raw(sql, pars).QueryRow(&item)
|
|
|
+ err = DmSQL["master"].Model(m).Raw(sql, pars).First(&item).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func (m *BusinessConf) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
|
|
|
- o := orm.NewOrmUsingDB("master")
|
|
|
+
|
|
|
sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
|
|
|
- err = o.Raw(sql, pars).QueryRow(&count)
|
|
|
+ err = DmSQL["master"].Model(m).Raw(sql, pars).First(&count).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func (m *BusinessConf) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BusinessConf, err error) {
|
|
|
- o := orm.NewOrmUsingDB("master")
|
|
|
+
|
|
|
fields := strings.Join(fieldArr, ",")
|
|
|
if len(fieldArr) == 0 {
|
|
|
fields = `*`
|
|
|
@@ -149,12 +141,12 @@ 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 = DmSQL["master"].Model(m).Raw(sql, pars).Scan(&items).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func (m *BusinessConf) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BusinessConf, err error) {
|
|
|
- o := orm.NewOrmUsingDB("master")
|
|
|
+
|
|
|
fields := strings.Join(fieldArr, ",")
|
|
|
if len(fieldArr) == 0 {
|
|
|
fields = `*`
|
|
|
@@ -164,7 +156,7 @@ 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 = DmSQL["master"].Model(m).Raw(sql, pars, startSize, pageSize).Scan(&items).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -173,9 +165,9 @@ func GetBusinessConf() (list map[string]string, err error) {
|
|
|
list = make(map[string]string)
|
|
|
|
|
|
var items []*BusinessConf
|
|
|
- o := orm.NewOrmUsingDB("master")
|
|
|
+
|
|
|
sql := `SELECT * FROM business_conf`
|
|
|
- _, err = o.Raw(sql).QueryRows(&items)
|
|
|
+ err = DmSQL["master"].Model(&BusinessConf{}).Raw(sql).Scan(&items).Error
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
@@ -198,16 +190,9 @@ type BusinessConfUpdate struct {
|
|
|
|
|
|
// UpdateBusinessConfMulti 批量修改配置
|
|
|
func UpdateBusinessConfMulti(items []BusinessConfUpdate) (err error) {
|
|
|
- o := orm.NewOrmUsingDB("master")
|
|
|
- p, err := o.Raw("UPDATE business_conf SET conf_val = ? WHERE conf_key = ?").Prepare()
|
|
|
- if err != nil {
|
|
|
- return
|
|
|
- }
|
|
|
- defer func() {
|
|
|
- _ = p.Close()
|
|
|
- }()
|
|
|
+ sql := "UPDATE business_conf SET conf_val = ? WHERE conf_key = ?"
|
|
|
for _, v := range items {
|
|
|
- _, err = p.Exec(v.ConfVal, v.ConfKey)
|
|
|
+ err = DmSQL["master"].Model(&BusinessConf{}).Exec(sql, v.ConfVal, v.ConfKey).Error
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
@@ -216,9 +201,8 @@ func UpdateBusinessConfMulti(items []BusinessConfUpdate) (err error) {
|
|
|
}
|
|
|
|
|
|
func GetBusinessConfByKey(key string) (item *BusinessConf, err error) {
|
|
|
- o := orm.NewOrmUsingDB("master")
|
|
|
sql := fmt.Sprintf(`SELECT * FROM business_conf WHERE conf_key = ? LIMIT 1`)
|
|
|
- err = o.Raw(sql, key).QueryRow(&item)
|
|
|
+ err = DmSQL["master"].Model(&BusinessConf{}).Raw(sql, key).Scan(&item).Error
|
|
|
return
|
|
|
}
|
|
|
|
