|
|
@@ -1,9 +1,9 @@
|
|
|
package models
|
|
|
|
|
|
import (
|
|
|
+ "eta/eta_index_lib/global"
|
|
|
"eta/eta_index_lib/utils"
|
|
|
"fmt"
|
|
|
- "github.com/beego/beego/v2/client/orm"
|
|
|
"html"
|
|
|
"strings"
|
|
|
"time"
|
|
|
@@ -86,12 +86,8 @@ func (m *BusinessConf) PrimaryId() string {
|
|
|
}
|
|
|
|
|
|
func (m *BusinessConf) Create() (err error) {
|
|
|
- o := orm.NewOrmUsingDB("master")
|
|
|
- id, err := o.Insert(m)
|
|
|
- if err != nil {
|
|
|
- return
|
|
|
- }
|
|
|
- m.Id = int(id)
|
|
|
+ err = global.DbMap[utils.DbNameMaster].Create(m).Error
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -99,47 +95,46 @@ func (m *BusinessConf) CreateMulti(items []*BusinessConf) (err error) {
|
|
|
if len(items) == 0 {
|
|
|
return
|
|
|
}
|
|
|
- o := orm.NewOrmUsingDB("master")
|
|
|
- _, err = o.InsertMulti(len(items), items)
|
|
|
+ err = global.DbMap[utils.DbNameMaster].CreateInBatches(items, utils.MultiAddNum).Error
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func (m *BusinessConf) Update(cols []string) (err error) {
|
|
|
- o := orm.NewOrmUsingDB("master")
|
|
|
- _, err = o.Update(m, cols...)
|
|
|
+ err = global.DbMap[utils.DbNameMaster].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 = global.DbMap[utils.DbNameMaster].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 = global.DbMap[utils.DbNameMaster].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 = global.DbMap[utils.DbNameMaster].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 = global.DbMap[utils.DbNameMaster].Raw(sql, pars...).Scan(&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 +144,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 = global.DbMap[utils.DbNameMaster].Raw(sql, pars...).Find(&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 +159,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)
|
|
|
+ pars = append(pars, startSize, pageSize)
|
|
|
+ err = global.DbMap[utils.DbNameMaster].Raw(sql, pars...).Find(&items).Error
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -173,9 +170,8 @@ 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 = global.DbMap[utils.DbNameMaster].Raw(sql).Find(&items).Error
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
@@ -198,27 +194,22 @@ 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()
|
|
|
- }()
|
|
|
+ tx := global.DbMap[utils.DbNameMaster].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
|
|
|
}
|
|
|
|
|
|
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 = global.DbMap[utils.DbNameMaster].Raw(sql, key).First(&item).Error
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|
