|
@@ -1,6 +1,7 @@
|
|
package models
|
|
package models
|
|
|
|
|
|
import (
|
|
import (
|
|
|
|
+ "eta_gn/eta_api/global"
|
|
"eta_gn/eta_api/utils"
|
|
"eta_gn/eta_api/utils"
|
|
"fmt"
|
|
"fmt"
|
|
"time"
|
|
"time"
|
|
@@ -53,7 +54,7 @@ type ChartPermissionItem struct {
|
|
func (c *ChartPermission) Update(cols []string) (err error) {
|
|
func (c *ChartPermission) Update(cols []string) (err error) {
|
|
//o := orm.NewOrmUsingDB("rddp")
|
|
//o := orm.NewOrmUsingDB("rddp")
|
|
//_, err = o.Update(c, cols...)
|
|
//_, err = o.Update(c, cols...)
|
|
- err = DmSQL["rddp"].Select(cols).Updates(c).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Select(cols).Updates(c).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -88,7 +89,7 @@ type PermissionMoveReq struct {
|
|
func (c *ChartPermission) SetEnabled(id, enabled int) (err error) {
|
|
func (c *ChartPermission) SetEnabled(id, enabled int) (err error) {
|
|
//o := orm.NewOrmUsingDB("rddp")
|
|
//o := orm.NewOrmUsingDB("rddp")
|
|
//to, err := o.Begin()
|
|
//to, err := o.Begin()
|
|
- to := DmSQL["rddp"].Begin()
|
|
|
|
|
|
+ to := global.DmSQL["rddp"].Begin()
|
|
if err != nil {
|
|
if err != nil {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -122,7 +123,7 @@ func (c *ChartPermission) Create() (err error) {
|
|
// return
|
|
// return
|
|
//}
|
|
//}
|
|
//c.ChartPermissionId = int(id)
|
|
//c.ChartPermissionId = int(id)
|
|
- err = DmSQL["rddp"].Create(c).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Create(c).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -132,7 +133,7 @@ func (c *ChartPermission) SetIsPublic(ids []int, parentId, isPublic int) (err er
|
|
//sql := `update chart_permission set is_public=? WHERE parent_id = ? and chart_permission_id IN (` + utils.GetOrmInReplace(len(ids)) + `)`
|
|
//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 = 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)) + `)`
|
|
sql := `update chart_permission set is_public=? WHERE parent_id = ? and chart_permission_id IN (` + utils.GetOrmInReplace(len(ids)) + `)`
|
|
- err = DmSQL["rddp"].Exec(sql, isPublic, parentId, ids).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Exec(sql, isPublic, parentId, ids).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -142,7 +143,7 @@ func (c *ChartPermission) UpdateClassifyNameByParentId(parentId int, classifyNam
|
|
//sql := `update chart_permission set classify_name=? WHERE parent_id = ?`
|
|
//sql := `update chart_permission set classify_name=? WHERE parent_id = ?`
|
|
//_, err = o.Raw(sql, classifyName, parentId).Exec()
|
|
//_, err = o.Raw(sql, classifyName, parentId).Exec()
|
|
sql := `update chart_permission set classify_name=? WHERE parent_id = ?`
|
|
sql := `update chart_permission set classify_name=? WHERE parent_id = ?`
|
|
- err = DmSQL["rddp"].Exec(sql, classifyName, parentId).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Exec(sql, classifyName, parentId).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -152,7 +153,7 @@ func (c *ChartPermission) SetEnabledByParentId(parentId, enabled int) (err error
|
|
//sql := ` UPDATE chart_permission SET enabled =? WHERE parent_id = ?`
|
|
//sql := ` UPDATE chart_permission SET enabled =? WHERE parent_id = ?`
|
|
//_, err = o.Raw(sql, enabled, parentId).Exec()
|
|
//_, err = o.Raw(sql, enabled, parentId).Exec()
|
|
sql := ` UPDATE chart_permission SET enabled =? WHERE parent_id = ?`
|
|
sql := ` UPDATE chart_permission SET enabled =? WHERE parent_id = ?`
|
|
- err = DmSQL["rddp"].Exec(sql, enabled, parentId).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Exec(sql, enabled, parentId).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -162,7 +163,7 @@ func (c *ChartPermission) SetEnabledByChartPermissionId(chartPermissionId, enabl
|
|
//sql := ` UPDATE chart_permission SET enabled =? WHERE chart_permission_id = ?`
|
|
//sql := ` UPDATE chart_permission SET enabled =? WHERE chart_permission_id = ?`
|
|
//_, err = o.Raw(sql, enabled, chartPermissionId).Exec()
|
|
//_, err = o.Raw(sql, enabled, chartPermissionId).Exec()
|
|
sql := ` UPDATE chart_permission SET enabled =? WHERE chart_permission_id = ?`
|
|
sql := ` UPDATE chart_permission SET enabled =? WHERE chart_permission_id = ?`
|
|
- err = DmSQL["rddp"].Exec(sql, enabled, chartPermissionId).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Exec(sql, enabled, chartPermissionId).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -172,7 +173,7 @@ func (c *ChartPermission) GetItemById(chartPermissionId int) (item *ChartPermiss
|
|
//sql := `select * from chart_permission WHERE chart_permission_id = ?`
|
|
//sql := `select * from chart_permission WHERE chart_permission_id = ?`
|
|
//err = o.Raw(sql, chartPermissionId).QueryRow(&item)
|
|
//err = o.Raw(sql, chartPermissionId).QueryRow(&item)
|
|
sql := `select * from chart_permission WHERE chart_permission_id = ?`
|
|
sql := `select * from chart_permission WHERE chart_permission_id = ?`
|
|
- err = DmSQL["rddp"].Raw(sql, chartPermissionId).First(&item).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Raw(sql, chartPermissionId).First(&item).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -182,7 +183,7 @@ func (c *ChartPermission) GetItemsByCondition(condition string, pars []interface
|
|
//sql := `select * from chart_permission WHERE 1=1 ` + condition + ` order by sort asc, chart_permission_id asc`
|
|
//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 = o.Raw(sql, pars).QueryRows(&items)
|
|
sql := `select * from chart_permission WHERE 1=1 ` + condition + ` order by sort asc, chart_permission_id asc`
|
|
sql := `select * from chart_permission WHERE 1=1 ` + condition + ` order by sort asc, chart_permission_id asc`
|
|
- err = DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -192,7 +193,7 @@ func (c *ChartPermission) GetItemByCondition(condition string, pars []interface{
|
|
//sql := `select * from chart_permission WHERE 1=1 ` + condition
|
|
//sql := `select * from chart_permission WHERE 1=1 ` + condition
|
|
//err = o.Raw(sql, pars).QueryRow(&item)
|
|
//err = o.Raw(sql, pars).QueryRow(&item)
|
|
sql := `select * from chart_permission WHERE 1=1 ` + condition
|
|
sql := `select * from chart_permission WHERE 1=1 ` + condition
|
|
- err = DmSQL["rddp"].Raw(sql, pars).First(&item).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -207,7 +208,7 @@ func UpdateChartPermissionSortByParentId(parentId, chartPermissionId, nowSort in
|
|
}
|
|
}
|
|
//o := orm.NewOrmUsingDB("rddp")
|
|
//o := orm.NewOrmUsingDB("rddp")
|
|
//_, err = o.Raw(sql, parentId, productId, nowSort).Exec()
|
|
//_, err = o.Raw(sql, parentId, productId, nowSort).Exec()
|
|
- err = DmSQL["rddp"].Exec(sql, parentId, productId, nowSort).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Exec(sql, parentId, productId, nowSort).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -217,7 +218,7 @@ func (c *ChartPermission) GetMaxSort() (maxSort int, err error) {
|
|
//sql := `select max(sort) from chart_permission `
|
|
//sql := `select max(sort) from chart_permission `
|
|
//err = o.Raw(sql).QueryRow(&maxSort)
|
|
//err = o.Raw(sql).QueryRow(&maxSort)
|
|
sql := `select max(sort) from chart_permission `
|
|
sql := `select max(sort) from chart_permission `
|
|
- err = DmSQL["rddp"].Raw(sql).Scan(&maxSort).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Raw(sql).Scan(&maxSort).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -227,7 +228,7 @@ func (c *ChartPermission) GetMaxSortByParentId(parentId int) (maxSort int, err e
|
|
//sql := `select max(sort) from chart_permission WHERE parent_id=? `
|
|
//sql := `select max(sort) from chart_permission WHERE parent_id=? `
|
|
//err = o.Raw(sql, parentId).QueryRow(&maxSort)
|
|
//err = o.Raw(sql, parentId).QueryRow(&maxSort)
|
|
sql := `select max(sort) from chart_permission WHERE parent_id=? `
|
|
sql := `select max(sort) from chart_permission WHERE parent_id=? `
|
|
- err = DmSQL["rddp"].Raw(sql, parentId).Scan(&maxSort).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Raw(sql, parentId).Scan(&maxSort).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -237,7 +238,7 @@ func (c *ChartPermission) GetFirstChartPermissionByParentId(parentId int) (item
|
|
//sql := `select * from chart_permission WHERE parent_id=? ORDER BY sort ASC, chart_permission_id ASC LIMIT 1`
|
|
//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 = o.Raw(sql, parentId).QueryRow(&item)
|
|
sql := `select * from chart_permission WHERE parent_id=? ORDER BY sort ASC, chart_permission_id ASC LIMIT 1`
|
|
sql := `select * from chart_permission WHERE parent_id=? ORDER BY sort ASC, chart_permission_id ASC LIMIT 1`
|
|
- err = DmSQL["rddp"].Raw(sql, parentId).First(&item).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Raw(sql, parentId).First(&item).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -247,7 +248,7 @@ func GetChartPermissionById(permissionId int) (item *ChartPermission, err error)
|
|
//sql := `SELECT * FROM chart_permission WHERE chart_permission_id = ?`
|
|
//sql := `SELECT * FROM chart_permission WHERE chart_permission_id = ?`
|
|
//err = o.Raw(sql, permissionId).QueryRow(&item)
|
|
//err = o.Raw(sql, permissionId).QueryRow(&item)
|
|
sql := `SELECT * FROM chart_permission WHERE chart_permission_id = ?`
|
|
sql := `SELECT * FROM chart_permission WHERE chart_permission_id = ?`
|
|
- err = DmSQL["rddp"].Raw(sql, permissionId).First(&item).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Raw(sql, permissionId).First(&item).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -257,7 +258,7 @@ func GetSecondaryChartPermissions() (list []*ChartPermission, err error) {
|
|
//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`
|
|
//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 = 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`
|
|
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 = DmSQL["rddp"].Raw(sql, FiccProductId).Find(&list).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Raw(sql, FiccProductId).Find(&list).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -286,7 +287,7 @@ func GetChartPermissionsByProductId() (list []*ChartPermission, err error) {
|
|
//sql := `SELECT * FROM chart_permission WHERE product_id = ? AND enabled = 1 ORDER BY parent_id ASC, sort ASC, created_time ASC`
|
|
//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 = 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`
|
|
sql := `SELECT * FROM chart_permission WHERE product_id = ? AND enabled = 1 ORDER BY parent_id ASC, sort ASC, created_time ASC`
|
|
- err = DmSQL["rddp"].Raw(sql, FiccProductId).Find(&list).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Raw(sql, FiccProductId).Find(&list).Error
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -306,6 +307,6 @@ func GetChartPermissionByIdList(permissionIdList []int) (items []*ChartPermissio
|
|
//sql := `SELECT * FROM chart_permission WHERE chart_permission_id in (` + utils.GetOrmInReplace(num) + `) `
|
|
//sql := `SELECT * FROM chart_permission WHERE chart_permission_id in (` + utils.GetOrmInReplace(num) + `) `
|
|
//_, err = o.Raw(sql, permissionIdList).QueryRows(&items)
|
|
//_, err = o.Raw(sql, permissionIdList).QueryRows(&items)
|
|
sql := `SELECT * FROM chart_permission WHERE chart_permission_id in (` + utils.GetOrmInReplace(num) + `) `
|
|
sql := `SELECT * FROM chart_permission WHERE chart_permission_id in (` + utils.GetOrmInReplace(num) + `) `
|
|
- err = DmSQL["rddp"].Raw(sql, permissionIdList).Find(&items).Error
|
|
|
|
|
|
+ err = global.DmSQL["rddp"].Raw(sql, permissionIdList).Find(&items).Error
|
|
return
|
|
return
|
|
}
|
|
}
|