清理代码

models/api_uri.go

@@ -18,16 +18,10 @@ type ApiUriTest struct {
 
 func GetApiUriTest() (items []*ApiUriTest, err error) {
 	err = global.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) {
 	err = global.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

@@ -90,12 +90,6 @@ func (m *BusinessConf) PrimaryId() string {
 
 func (m *BusinessConf) Create() (err error) {
 	err = global.DEFAULT_DmSQL.Create(m).Error
-	//o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.Id = int(id)
 	return
 }
 
@@ -104,51 +98,35 @@ func (m *BusinessConf) CreateMulti(items []*BusinessConf) (err error) {
 		return
 	}
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
-	//o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(items), items)
 	return
 }
 
 func (m *BusinessConf) Update(cols []string) (err error) {
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
-	//o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	return
 }
 
 func (m *BusinessConf) Del() (err error) {
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
 	err = global.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) {
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
 	err = global.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) {
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
 	err = global.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) {
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	err = global.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
 }
 
@@ -164,8 +142,6 @@ func (m *BusinessConf) GetItemsByCondition(condition string, pars []interface{},
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 
@@ -183,8 +159,6 @@ func (m *BusinessConf) GetPageItemsByCondition(condition string, pars []interfac
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	return
 }
 
@@ -193,9 +167,6 @@ func GetBusinessConf() (list map[string]string, err error) {
 	list = make(map[string]string)
 
 	var items []*BusinessConf
-	//o := orm.NewOrm()
-	//sql := `SELECT * FROM business_conf`
-	//_, err = o.Raw(sql).QueryRows(&items)
 	sql := `SELECT * FROM business_conf`
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	if err != nil {
@@ -230,29 +201,11 @@ func UpdateBusinessConfMulti(items []BusinessConfUpdate) (err error) {
 	}
 	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) {
 	sql := fmt.Sprintf(`SELECT * FROM business_conf WHERE conf_key = ? LIMIT 1`)
 	err = global.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

@@ -26,12 +26,6 @@ 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)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
@@ -40,50 +34,34 @@ func (m *BusinessConfOperationRecord) CreateMulti(items []*BusinessConfOperation
 	if len(items) == 0 {
 		return
 	}
-	//o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *BusinessConfOperationRecord) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *BusinessConfOperationRecord) 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()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
 	err = global.DEFAULT_DmSQL.Exec(sql, m.Id).Error
 	return
 }
 
 func (m *BusinessConfOperationRecord) GetItemById(id int) (item *BusinessConfOperationRecord, 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)
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *BusinessConfOperationRecord) GetItemByCondition(condition string, pars []interface{}) (item *BusinessConfOperationRecord, 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)
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *BusinessConfOperationRecord) 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)
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
@@ -101,9 +79,6 @@ func (m *BusinessConfOperationRecord) GetItemsByCondition(condition string, pars
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	err = global.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
 }
 
@@ -118,9 +93,6 @@ 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)
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
-
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error

models/chart_permission.go

@@ -52,8 +52,6 @@ type ChartPermissionItem struct {
 
 // Update 更新
 func (c *ChartPermission) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(c, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(c).Error
 	return
 }
@@ -80,15 +78,12 @@ type PermissionEnabledReq struct {
 }
 
 type PermissionMoveReq struct {
-	PermissionId int `description:"品种id"`
-	//	ParentChartPermissionId int `description:"父级品种id"`
+	PermissionId     int `description:"品种id"`
 	PrevPermissionId int `description:"上一个兄弟节点品种id"`
 	NextPermissionId int `description:"下一个兄弟节点品种id"`
 }
 
 func (c *ChartPermission) SetEnabled(id, enabled int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -98,13 +93,11 @@ 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.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.Exec(sql, enabled, id).Error
 	if err != nil {
 		return
@@ -114,21 +107,12 @@ 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)
 	err = global.DmSQL["rddp"].Create(c).Error
 	return
 }
 
 // SetIsPublic 更新公有私有权限
 func (c *ChartPermission) SetIsPublic(ids []int, parentId, isPublic int) (err error) {
-	//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 = global.DmSQL["rddp"].Exec(sql, isPublic, parentId, ids).Error
 	return
@@ -136,9 +120,6 @@ func (c *ChartPermission) SetIsPublic(ids []int, parentId, isPublic int) (err er
 
 // UpdatesByParentId 更新启动禁用
 func (c *ChartPermission) UpdateClassifyNameByParentId(parentId int, classifyName string) (err error) {
-	//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 = global.DmSQL["rddp"].Exec(sql, classifyName, parentId).Error
 	return
@@ -146,9 +127,6 @@ func (c *ChartPermission) UpdateClassifyNameByParentId(parentId int, classifyNam
 
 // SetEnabledByParentId 更新启动禁用
 func (c *ChartPermission) SetEnabledByParentId(parentId, enabled int) (err error) {
-	//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 = global.DmSQL["rddp"].Exec(sql, enabled, parentId).Error
 	return
@@ -156,9 +134,6 @@ func (c *ChartPermission) SetEnabledByParentId(parentId, enabled int) (err error
 
 // SetEnabledByChartPermissionId 更新启动禁用
 func (c *ChartPermission) SetEnabledByChartPermissionId(chartPermissionId, enabled int) (err error) {
-	//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 = global.DmSQL["rddp"].Exec(sql, enabled, chartPermissionId).Error
 	return
@@ -166,9 +141,6 @@ func (c *ChartPermission) SetEnabledByChartPermissionId(chartPermissionId, enabl
 
 // GetItemById 查询品种
 func (c *ChartPermission) GetItemById(chartPermissionId int) (item *ChartPermission, err error) {
-	//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 = global.DmSQL["rddp"].Raw(sql, chartPermissionId).First(&item).Error
 	return
@@ -176,9 +148,6 @@ func (c *ChartPermission) GetItemById(chartPermissionId int) (item *ChartPermiss
 
 // GetItemsByCondition 查询列表
 func (c *ChartPermission) GetItemsByCondition(condition string, pars []interface{}) (items []*ChartPermission, err error) {
-	//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 = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
@@ -186,9 +155,6 @@ func (c *ChartPermission) GetItemsByCondition(condition string, pars []interface
 
 // GetItemByCondition 查询列表
 func (c *ChartPermission) GetItemByCondition(condition string, pars []interface{}) (item *ChartPermission, err error) {
-	//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 = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
@@ -203,17 +169,12 @@ func UpdateChartPermissionSortByParentId(parentId, chartPermissionId, nowSort in
 	} else {
 		sql += `)`
 	}
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Raw(sql, parentId, productId, nowSort).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, parentId, productId, nowSort).Error
 	return
 }
 
 // GetMaxSort 获取最大的排序值
 func (c *ChartPermission) GetMaxSort() (maxSort int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := `select max(sort) from chart_permission `
-	//err = o.Raw(sql).QueryRow(&maxSort)
 	sql := `select COALESCE(MAX(sort), 0) as max_sort from chart_permission `
 	err = global.DmSQL["rddp"].Raw(sql).Scan(&maxSort).Error
 	return
@@ -221,9 +182,6 @@ func (c *ChartPermission) GetMaxSort() (maxSort int, err error) {
 
 // GetMaxSortByParentId 获取最大的排序值
 func (c *ChartPermission) GetMaxSortByParentId(parentId int) (maxSort int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := `select max(sort) from chart_permission WHERE parent_id=? `
-	//err = o.Raw(sql, parentId).QueryRow(&maxSort)
 	sql := `select  COALESCE(MAX(sort), 0) as max_sort from chart_permission WHERE parent_id=? `
 	err = global.DmSQL["rddp"].Raw(sql, parentId).Scan(&maxSort).Error
 	return
@@ -231,9 +189,6 @@ func (c *ChartPermission) GetMaxSortByParentId(parentId int) (maxSort int, err e
 
 // GetFirstChartPermissionByParentId 获取当前父级分类下，且排序数相同 的排序第一条的数据
 func (c *ChartPermission) GetFirstChartPermissionByParentId(parentId int) (item *ChartPermission, err error) {
-	//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 = global.DmSQL["rddp"].Raw(sql, parentId).First(&item).Error
 	return
@@ -241,24 +196,11 @@ func (c *ChartPermission) GetFirstChartPermissionByParentId(parentId int) (item
 
 // GetChartPermissionById 主键获取品种
 func GetChartPermissionById(permissionId int) (item *ChartPermission, err error) {
-	//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 = global.DmSQL["rddp"].Raw(sql, permissionId).First(&item).Error
 	return
 }
 
-// GetSecondaryChartPermissions 获取二级权限列表
-func GetSecondaryChartPermissions() (list []*ChartPermission, err error) {
-	//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 = global.DmSQL["rddp"].Raw(sql, FiccProductId).Find(&list).Error
-	return
-}
-
 type SimpleChartPermission struct {
 	ChartPermissionId   int                      `description:"品种ID"`
 	ChartPermissionName string                   `description:"品种名称"`
@@ -280,9 +222,6 @@ func FormatChartPermission2Simple(origin *ChartPermission) (item *SimpleChartPer
 
 // GetChartPermissionsByProductId 获取权限列表
 func GetChartPermissionsByProductId() (list []*ChartPermission, err error) {
-	//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 = global.DmSQL["rddp"].Raw(sql, FiccProductId).Find(&list).Error
 	return
@@ -300,9 +239,6 @@ func GetChartPermissionByIdList(permissionIdList []int) (items []*ChartPermissio
 	if num <= 0 {
 		return
 	}
-	//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 = global.DmSQL["rddp"].Raw(sql, permissionIdList).Find(&items).Error
 	return

models/data_source/base_from_sci99.go

@@ -6,39 +6,6 @@ import (
 	"time"
 )
 
-// BaseFromSci99Index 代表卓创资讯-原始指标表的结构
-//type BaseFromSci99Index struct {
-//	BaseFromSciIndexId int       `orm:"column(base_from_sci_index_id);pk"` // 主键，自动递增
-//	IndexCode          string    // 指标编码
-//	IndexName          string    // 指标名称
-//	ClassifyId         int       // 分类Id
-//	Unit               string    // 单位
-//	Frequency          string    // 频度
-//	Describe           string    // 指标描述
-//	CreateTime         time.Time // 创建时间
-//	ModifyTime         time.Time // 修改时间
-//}
-
-// BaseFromSci99Data 代表卓创资讯-原始指标数据表的结构
-//type BaseFromSci99Data struct {
-//	BaseFromSciDataId  int       `orm:"column(base_from_sci_data_id);pk"` // 主键，自动递增
-//	BaseFromSciIndexId int       // 指标id
-//	IndexCode          string    // 指标编码
-//	DataTime           string    // 数据日期
-//	Value              float64   // 数据值
-//	CreateTime         time.Time // 创建时间
-//	ModifyTime         time.Time // 修改时间
-//}
-
-// BaseFromSci99Classify 代表卓创资讯-原始指标分类表的结构
-//type BaseFromSci99Classify struct {
-//	BaseFromSciClassifyId int       `orm:"column(base_from_sci_classify_id);pk"` // 主键，自动递增
-//	ClassifyName          string    // 分类名称
-//	Sort                  int       // 排序
-//	CreateTime            time.Time // 创建时间
-//	ModifyTime            time.Time // 修改时间
-//}
-
 // BaseFromSci99Classify 代表卓创资讯-原始指标分类表的结构
 type BaseFromSci99Classify struct {
 	BaseFromSciClassifyId int       `gorm:"primaryKey;column:base_from_sci_classify_id;type:int(10) unsigned;not null"` // 分类ID
@@ -48,16 +15,6 @@ type BaseFromSci99Classify struct {
 	ModifyTime            time.Time `gorm:"column:modify_time;type:datetime"`                                           // 修改时间
 }
 
-//type BaseFromSci99DataItem struct {
-//	BaseFromSciDataId  int     `orm:"column(base_from_sci_data_id);pk"` // 主键，自动递增
-//	BaseFromSciIndexId int     // 指标id
-//	IndexCode          string  // 指标编码
-//	DataTime           string  // 数据日期
-//	Value              float64 // 数据值
-//	CreateTime         string  // 创建时间
-//	ModifyTime         string  // 修改时间
-//}
-
 type BaseFromSci99DataItem struct {
 	BaseFromSciDataId  int     `gorm:"primaryKey;column:base_from_sci_data_id;type:int(10) unsigned;not null"`
 	BaseFromSciIndexId int     `gorm:"index:idx_index_id;column:base_from_sci_index_id;type:int(10) unsigned;not null"` // 指标id
@@ -68,20 +25,6 @@ type BaseFromSci99DataItem struct {
 	ModifyTime         string  `gorm:"column:modify_time;type:datetime"`                                                // 修改时间
 }
 
-//type BaseFromSci99IndexList struct {
-//	BaseFromSciIndexId int    `orm:"column(base_from_sci_index_id);pk"` // 主键，自动递增
-//	IndexCode          string // 指标编码
-//	IndexName          string // 指标名称
-//	ClassifyId         int    // 分类Id
-//	Unit               string // 单位
-//	Frequency          string // 频度
-//	Describe           string // 指标描述
-//	CreateTime         string // 创建时间
-//	ModifyTime         string // 修改时间
-//	DataList           []*BaseFromSci99DataItem
-//	Paging             *paging.PagingItem `description:"分页数据"`
-//}
-
 type BaseFromSci99IndexList struct {
 	BaseFromSciIndexId int                      `gorm:"primaryKey;column:base_from_sci_index_id;type:int(10) unsigned;not null"`
 	IndexCode          string                   `gorm:"index:idx_index_code;column:index_code;type:varchar(128);not null;default:''"` // 指标编码
@@ -96,42 +39,13 @@ type BaseFromSci99IndexList struct {
 	Paging             *paging.PagingItem       `description:"分页数据" gorm:"-"`
 }
 
-// 添加数据
-//func AddBaseFromSci99Index(item *BaseFromSci99Index) (lastId int64, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	lastId, err = o.Insert(item)
-//	return
-//}
-
-//func AddBaseFromSci99Classify(item *BaseFromSci99Classify) (lastId int64, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	lastId, err = o.Insert(item)
-//	return
-//}
-
-//func AddBaseFromSci99DataMulti(item []*BaseFromSci99Data) (err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	_, err = o.InsertMulti(1000, item)
-//	return
-//}
-
 func GetBaseFromSci99Classify() (list []*BaseFromSci99Classify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM base_from_sci99_classify `
-	//_, err = o.Raw(sql).QueryRows(&list)
 	sql := `SELECT * FROM base_from_sci99_classify `
 	err = global.DmSQL["data"].Raw(sql).Find(&list).Error
 	return
 }
 
 func GetSci99Index(condition string, pars []interface{}) (items []*BaseFromSci99IndexList, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM base_from_sci99_index WHERE 1=1  `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += `ORDER BY base_from_sci_index_id ASC `
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	sql := ` SELECT * FROM base_from_sci99_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
@@ -142,32 +56,18 @@ func GetSci99Index(condition string, pars []interface{}) (items []*BaseFromSci99
 }
 
 func GetSci99IndexDataCount(indexCode string) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count  FROM base_from_sci99_data WHERE index_code=? `
-	//err = o.Raw(sql, indexCode).QueryRow(&count)
 	sql := ` SELECT COUNT(1) AS count  FROM base_from_sci99_data WHERE index_code=? `
 	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&count).Error
 	return
 }
 
 func GetSci99IndexData(indexCode string, startSize, pageSize int) (items []*BaseFromSci99DataItem, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT *  FROM base_from_sci99_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	//_, err = o.Raw(sql, indexCode, startSize, pageSize).QueryRows(&items)
 	sql := ` SELECT *  FROM base_from_sci99_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
 	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Find(&items).Error
 	return
 }
 
 func GetSci99DataMaxCount(classifyId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT MAX(t.num) AS count FROM (
-	//			SELECT COUNT(1) AS num  FROM base_from_icpi_index AS a
-	//			INNER JOIN base_from_icpi_data AS b ON a.base_from_icpi_index_id=b.base_from_icpi_index_id
-	//			WHERE a.base_from_icpi_classify_id=?
-	//			GROUP BY a.base_from_icpi_index_id
-	//		)AS t `
-	//err = o.Raw(sql, classifyId).QueryRow(&count)
 	sql := `SELECT MAX(t.num) AS count FROM (
 				SELECT COUNT(1) AS num  FROM base_from_icpi_index AS a
 				INNER JOIN base_from_icpi_data AS b ON a.base_from_icpi_index_id=b.base_from_icpi_index_id
@@ -179,18 +79,12 @@ func GetSci99DataMaxCount(classifyId int) (count int, err error) {
 }
 
 func GetSci99IndexDataByCode(indexCode string) (items []*BaseFromSci99DataItem, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT *  FROM base_from_sci99_data WHERE index_code=? ORDER BY data_time DESC  `
-	//_, err = o.Raw(sql, indexCode).QueryRows(&items)
 	sql := ` SELECT *  FROM base_from_sci99_data WHERE index_code=? ORDER BY data_time DESC  `
 	err = global.DmSQL["data"].Raw(sql, indexCode).Find(&items).Error
 	return
 }
 
 func GetSci99IndexLatestDate(indexCode string) (ModifyTime string, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT modify_time FROM base_from_sci99_data WHERE index_code=? ORDER BY modify_time DESC limit 1 `
-	//err = o.Raw(sql, indexCode).QueryRow(&ModifyTime)
 	sql := ` SELECT modify_time FROM base_from_sci99_data WHERE index_code=? ORDER BY modify_time DESC limit 1 `
 	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&ModifyTime).Error
 	return

models/data_source/guagnzhouqihuo.go

@@ -5,15 +5,6 @@ import (
 	"time"
 )
 
-//type BaseFromTradeGuangzhouClassify struct {
-//	BaseFromTradeGuangzhouClassifyId int       `orm:"column(base_from_trade_guangzhou_classify_id);pk"`
-//	ClassifyName                     string    `description:"分类名称"`
-//	ClassifyCode                     string    `description:"分类编码"`
-//	ParentId                         int       `description:"分类父级id"`
-//	ModifyTime                       time.Time `description:"修改时间"`
-//	CreateTime                       time.Time `description:"创建时间"`
-//}
-
 type BaseFromTradeGuangzhouClassify struct {
 	BaseFromTradeGuangzhouClassifyId int       `gorm:"primaryKey;column:base_from_trade_guangzhou_classify_id;type:int(11);not null"`
 	ClassifyName                     string    `gorm:"column:classify_name;type:varchar(255);not null;default:''"` // 分类名称
@@ -23,19 +14,6 @@ type BaseFromTradeGuangzhouClassify struct {
 	CreateTime                       time.Time `gorm:"column:create_time;type:datetime"`                           // 创建时间
 }
 
-//type BaseFromTradeGuangzhouIndex struct {
-//	BaseFromTradeGuangzhouIndexId    int       `orm:"column(base_from_trade_guangzhou_index_id);pk"`
-//	BaseFromTradeGuangzhouClassifyId int       `description:"分类id"`
-//	IndexCode                        string    `description:"指标编码"`
-//	IndexName                        string    `description:"指标名称"`
-//	Frequency                        string    `description:"频率"`
-//	Unit                             string    `description:"单位"`
-//	StartDate                        string    `description:"开始日期"`
-//	EndDate                          string    `description:"结束日期"`
-//	CreateTime                       time.Time `description:"创建日期"`
-//	ModifyTime                       time.Time `description:"修改日期"`
-//}
-
 type BaseFromTradeGuangzhouIndex struct {
 	BaseFromTradeGuangzhouIndexId    int       `gorm:"primaryKey;column:base_from_trade_guangzhou_index_id;type:int(11);not null"`
 	BaseFromTradeGuangzhouClassifyId int       `gorm:"column:base_from_trade_guangzhou_classify_id;type:int(11);default:0"` // 分类id/指标id
@@ -51,17 +29,6 @@ type BaseFromTradeGuangzhouIndex struct {
 	Value                            float64   `gorm:"column:value;type:double;default:0"`                                  // 数据值
 }
 
-//type BaseFromTradeGuangzhouData struct {
-//	BaseFromTradeGuangzhouDataId  int       `orm:"column(base_from_trade_guangzhou_data_id);pk"`
-//	BaseFromTradeGuangzhouIndexId int       `description:"指标id"`
-//	IndexCode                     string    `description:"指标编码"`
-//	DataTime                      string    `description:"数据日期"`
-//	Value                         float64   `description:"数据值"`
-//	QtySub                        float64   `description:"增减"`
-//	CreateTime                    time.Time `description:"创建日期"`
-//	ModifyTime                    time.Time `description:"修改日期"`
-//}
-
 type BaseFromTradeGuangzhouData struct {
 	BaseFromTradeGuangzhouDataId  int       `gorm:"primaryKey;index:idx_index_id;column:base_from_trade_guangzhou_data_id;type:int(10) unsigned;not null"`
 	BaseFromTradeGuangzhouIndexId int       `gorm:"column:base_from_trade_guangzhou_index_id;type:int(11) unsigned;not null;default:0"`                     // 指标ID
@@ -73,14 +40,6 @@ type BaseFromTradeGuangzhouData struct {
 	ModifyTime                    time.Time `gorm:"column:modify_time;type:datetime"`                                                                       // 更新时间
 }
 
-//type BaseFromTradeGuangzhouClassifyView struct {
-//	BaseFromTradeGuangzhouClassifyId int    `orm:"column(base_from_trade_guangzhou_classify_id);pk"`
-//	ClassifyName                     string `description:"分类名称"`
-//	ClassifyCode                     string `description:"分类编码"`
-//	ParentId                         int    `description:"分类父级id"`
-//	Children                         []*BaseFromTradeGuangzhouClassifyView
-//}
-
 type BaseFromTradeGuangzhouClassifyView struct {
 	BaseFromTradeGuangzhouClassifyId int                                   `gorm:"column:base_from_trade_guangzhou_classify_id;type:int(11);not null"`
 	ClassifyName                     string                                `gorm:"column:classify_name;type:varchar(255);not null;default:''"` // 分类名称
@@ -89,14 +48,6 @@ type BaseFromTradeGuangzhouClassifyView struct {
 	Children                         []*BaseFromTradeGuangzhouClassifyView `gorm:"-"`
 }
 
-//type BaseFromTradeGuangzhouContract struct {
-//	BaseFromTradeGuangzhouContractId int    `orm:"column(base_from_trade_guangzhou_contract_id);pk"`
-//	BaseFromTradeGuangzhouClassifyId int    `description:"分类id"`
-//	ClassifyCode                     string `description:"分类编码"`
-//	Contract                         string `description:"合约编码"`
-//	TradeDate                        string `description:"合约日期"`
-//}
-
 type BaseFromTradeGuangzhouContract struct {
 	BaseFromTradeGuangzhouContractId int    `gorm:"primaryKey;column:base_from_trade_guangzhou_contract_id;type:int(11);not null"`
 	BaseFromTradeGuangzhouClassifyId int    `gorm:"column:base_from_trade_guangzhou_classify_id;type:int(11);default:0"` // 分类id
@@ -106,44 +57,23 @@ type BaseFromTradeGuangzhouContract struct {
 }
 
 func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouClassifyAll() (list []*BaseFromTradeGuangzhouClassifyView, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM base_from_trade_guangzhou_classify`
-	//_, err = o.Raw(sql).QueryRows(&list)
 	sql := `SELECT * FROM base_from_trade_guangzhou_classify`
 	err = global.DmSQL["data"].Raw(sql).Find(&list).Error
 	return list, err
 }
 
 func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouMaxDate() (max_date string, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT MAX(a.end_date) AS max_date FROM base_from_trade_guangzhou_index AS a `
-	//err = o.Raw(sql).QueryRow(&max_date)
 	sql := ` SELECT MAX(a.end_date) AS max_date FROM base_from_trade_guangzhou_index AS a `
 	err = global.DmSQL["data"].Raw(sql).Scan(&max_date).Error
 	return max_date, err
 }
 
 func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouContract(classifyId int, tradeDate string) (list []*BaseFromTradeGuangzhouContract, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM base_from_trade_guangzhou_contract AS a WHERE base_from_trade_guangzhou_classify_id=? AND trade_date=? `
-	//_, err = o.Raw(sql, classifyId, tradeDate).QueryRows(&list)
 	sql := ` SELECT * FROM base_from_trade_guangzhou_contract AS a WHERE base_from_trade_guangzhou_classify_id=? AND trade_date=? `
 	err = global.DmSQL["data"].Raw(sql, classifyId, tradeDate).Find(&list).Error
 	return
 }
 
-//type BaseFromTradeGuangzhouIndexView struct {
-//	BaseFromTradeGuangzhouIndexId    int     `description:"指标id"`
-//	BaseFromTradeGuangzhouClassifyId int     `description:"分类id"`
-//	IndexCode                        string  `description:"指标编码"`
-//	IndexName                        string  `description:"指标名称"`
-//	Frequency                        string  `description:"频率"`
-//	Unit                             string  `description:"单位"`
-//	StartDate                        string  `description:"开始日期"`
-//	EndDate                          string  `description:"结束日期"`
-//	Value                            float64 `description:"数据"`
-//}
-
 type BaseFromTradeGuangzhouIndexView struct {
 	BaseFromTradeGuangzhouIndexId    int     `gorm:"column:base_from_trade_guangzhou_index_id;type:int(11);not null"`
 	BaseFromTradeGuangzhouClassifyId int     `gorm:"column:base_from_trade_guangzhou_classify_id;type:int(11);default:0"` // 分类id/指标id
@@ -157,7 +87,6 @@ type BaseFromTradeGuangzhouIndexView struct {
 }
 
 func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouIndex(condition string, pars []interface{}, baseFromTradeGuangzhouContractId int) (list []*BaseFromTradeGuangzhouIndexView, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	if baseFromTradeGuangzhouContractId <= 0 {
 		sql := ` SELECT b.base_from_trade_guangzhou_index_id,b.index_code,b.index_name,b.unit,b.frequency,b.start_date,b.end_date,a.value,c.base_from_trade_guangzhou_contract_id 
  FROM base_from_trade_guangzhou_data AS a
@@ -168,7 +97,6 @@ WHERE `
 			sql += condition
 		}
 		sql += ` ORDER BY a.index_code ASC `
-		//_, err = o.Raw(sql, pars).QueryRows(&list)
 		err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
 		return
 	} else {
@@ -184,14 +112,12 @@ WHERE `
 			sql += condition
 		}
 		sql += ` ORDER BY a.index_code ASC `
-		//_, err = o.Raw(sql, pars).QueryRows(&list)
 		err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
 		return
 	}
 }
 
 func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouIndexDetail(condition string, pars []interface{}) (list []*BaseFromTradeGuangzhouIndexView, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.*
  FROM base_from_trade_guangzhou_index AS a
 WHERE `
@@ -200,7 +126,6 @@ WHERE `
 		sql += condition
 	}
 	sql += ` ORDER BY a.index_code ASC `
-	//_, err = o.Raw(sql, pars).QueryRows(&list)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
 	return
 }

models/data_source/icpi.go

@@ -6,18 +6,6 @@ import (
 	"time"
 )
 
-//type BaseFromIcpiIndex struct {
-//	BaseFromIcpiIndexId    int       `orm:"column(base_from_icpi_index_id);pk"`
-//	BaseFromIcpiClassifyId int       `description:"分类id"`
-//	IndexCode              string    `description:"指标编码"`
-//	IndexName              string    `description:"指标名称"`
-//	Frequency              string    `description:"频度"`
-//	StartDate              time.Time `description:"开始日期"`
-//	EndDate                time.Time `description:"结束日期"`
-//	CreateTime             time.Time `description:"创建时间"`
-//	ModifyTime             time.Time `description:"修改时间"`
-//}
-
 type BaseFromIcpiIndex struct {
 	BaseFromIcpiIndexId    int       `gorm:"primaryKey;column:base_from_icpi_index_id;type:int(11);not null"`
 	BaseFromIcpiClassifyId int       `gorm:"column:base_from_icpi_classify_id;type:int(11);default:0"` // 分类
@@ -31,16 +19,6 @@ type BaseFromIcpiIndex struct {
 	ModifyTime             time.Time `gorm:"column:modify_time;type:datetime"`                         // 修改时间
 }
 
-//type BaseFromIcpiData struct {
-//	BaseFromIcpiDataId  int       `orm:"column(base_from_icpi_data_id);pk"`
-//	BaseFromIcpiIndexId int       `description:"指标id"`
-//	IndexCode           string    `description:"指标编码"`
-//	DataTime            string    `description:"日期"`
-//	Value               string    `description:"值"`
-//	CreateTime          time.Time `description:"创建时间"`
-//	ModifyTime          time.Time `description:"修改时间"`
-//}
-
 type BaseFromIcpiData struct {
 	BaseFromIcpiDataId  int       `gorm:"primaryKey;column:base_from_icpi_data_id;type:int(11);not null"`
 	BaseFromIcpiIndexId int       `gorm:"index:idx_base_from_icpi_index_id;column:base_from_icpi_index_id;type:int(11);default:0"`        // 指标id
@@ -51,15 +29,6 @@ type BaseFromIcpiData struct {
 	ModifyTime          time.Time `gorm:"column:modify_time;type:datetime"`                                                               // 修改时间
 }
 
-//type BaseFromIcpiClassify struct {
-//	BaseFromIcpiClassifyId int    `orm:"column(base_from_icpi_classify_id);pk"`
-//	ClassifyName           string `description:"分类名称"`
-//	ClassifyNameEn         string `description:"英文名称"`
-//	ParentId               int    `description:"上级id"`
-//	CreateTime             string `description:"创建时间"`
-//	ModifyTime             string `description:"修改时间"`
-//}
-
 type BaseFromIcpiClassify struct {
 	BaseFromIcpiClassifyId int    `gorm:"primaryKey;column:base_from_icpi_classify_id;type:int(11);not null"`
 	ClassifyName           string `gorm:"column:classify_name;type:varchar(255);not null;default:''"` // 分类名称
@@ -70,23 +39,11 @@ type BaseFromIcpiClassify struct {
 }
 
 func (obj *BaseFromIcpiIndex) GetBaseFromIcpiClassifyAll() (list []*BaseFromIcpiClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_icpi_classify `
-	//_, err = o.Raw(sql).QueryRows(&list)
 	err = global.DmSQL["data"].Raw(sql).Find(&list).Error
 	return
 }
 
-//type BaseFromIcpiDataView struct {
-//	BaseFromIcpiDataId  int       `orm:"column(base_from_icpi_data_id);pk"`
-//	BaseFromIcpiIndexId int       `description:"指标id"`
-//	IndexCode           string    `description:"指标编码"`
-//	DataTime            string    `description:"日期"`
-//	Value               string    `description:"值"`
-//	CreateTime          time.Time `description:"创建时间"`
-//	ModifyTime          time.Time `description:"修改时间"`
-//}
-
 type BaseFromIcpiDataView struct {
 	BaseFromIcpiDataId  int       `gorm:"primaryKey;column:base_from_icpi_data_id;type:int(11);not null"`
 	BaseFromIcpiIndexId int       `gorm:"index:idx_base_from_icpi_index_id;column:base_from_icpi_index_id;type:int(11);default:0"`        // 指标id
@@ -97,21 +54,6 @@ type BaseFromIcpiDataView struct {
 	ModifyTime          time.Time `gorm:"column:modify_time;type:datetime"`                                                               // 修改时间
 }
 
-//type BaseFromIcpiIndexView struct {
-//	BaseFromIcpiIndexId    int    `description:"指标id"`
-//	BaseFromIcpiClassifyId int    `description:"分类id"`
-//	IndexCode              string `description:"指标编码"`
-//	IndexName              string `description:"指标名称"`
-//	Frequency              string `description:"频度"`
-//	Unit                   string `description:"单位"`
-//	StartDate              string `description:"开始日期"`
-//	EndDate                string `description:"结束日期"`
-//	CreateTime             string `description:"创建时间"`
-//	ModifyTime             string `description:"修改时间"`
-//	DataList               []*BaseFromIcpiDataView
-//	Paging                 *paging.PagingItem `description:"分页数据"`
-//}
-
 type BaseFromIcpiIndexView struct {
 	BaseFromIcpiIndexId    int                     `gorm:"primaryKey;column:base_from_icpi_index_id;type:int(11);not null"`
 	BaseFromIcpiClassifyId int                     `gorm:"column:base_from_icpi_classify_id;type:int(11);default:0"` // 分类
@@ -128,50 +70,40 @@ type BaseFromIcpiIndexView struct {
 }
 
 func (obj *BaseFromIcpiIndex) GetIcpiIndex(condition string, pars []interface{}) (items []*BaseFromIcpiIndexView, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_icpi_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY base_from_icpi_index_id ASC `
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (obj *BaseFromIcpiIndex) GetIcpiIndexDataCount(indexCode string) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count  FROM base_from_icpi_data WHERE index_code=? `
-	//err = o.Raw(sql, indexCode).QueryRow(&count)
 	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&count).Error
 	return
 }
 
 func (obj *BaseFromIcpiIndex) GetIcpiIndexData(indexCode string, startSize, pageSize int) (items []*BaseFromIcpiDataView, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM base_from_icpi_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	//_, err = o.Raw(sql, indexCode, startSize, pageSize).QueryRows(&items)
 	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Find(&items).Error
 	return
 }
 
 func (obj *BaseFromIcpiIndex) GetIcpiDataMaxCount(classifyId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT MAX(t.num) AS count FROM (
 				SELECT COUNT(1) AS num  FROM base_from_icpi_index AS a
 				INNER JOIN base_from_icpi_data AS b ON a.base_from_icpi_index_id=b.base_from_icpi_index_id
 				WHERE a.base_from_icpi_classify_id=?
 				GROUP BY a.base_from_icpi_index_id
 			)AS t `
-	//err = o.Raw(sql, classifyId).QueryRow(&count)
 	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&count).Error
 	return
 }
 
 func (obj *BaseFromIcpiIndex) GetIcpiIndexDataByCode(indexCode string) (items []*BaseFromIcpiDataView, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM base_from_icpi_data WHERE index_code=? ORDER BY data_time DESC  `
-	//_, err = o.Raw(sql, indexCode).QueryRows(&items)
 	err = global.DmSQL["data"].Raw(sql, indexCode).Find(&items).Error
 	return
 }

models/data_source/longzhong.go

@@ -7,67 +7,32 @@ import (
 	"time"
 )
 
-//type Longzhonginfo struct {
-//	LongzhonginfoId int
-//	TradeCode       string
-//	SecName         string
-//	Unit            string
-//	Frequency       string
-//	LastModifyDate  string
-//}
-
 type Longzhonginfo struct {
 	LongzhonginfoId int    `gorm:"primaryKey;column:longzhonginfo_id;type:int(11);not null"`
 	TradeCode       string `gorm:"unique;column:trade_code;type:varchar(32);default:''"` // 指标唯一编码
 	SecName         string `gorm:"unique;column:sec_name;type:varchar(180);default:''"`  // 指标名称
 	Unit            string `gorm:"column:unit;type:varchar(100);default:''"`             // 单位
 	Frequency       string `gorm:"column:frequency;type:varchar(20);default:''"`         // 频度
-	//ClassifyId      int       `gorm:"index:idx_classify_id;column:classify_id;type:int(11);default:0"` // 分类id
-	//ClassifyName    string    `gorm:"column:classify_name;type:varchar(20);default:''"`
-	//CreateTime      time.Time `gorm:"column:create_time;type:datetime;default:CURRENT_TIMESTAMP"`
-	//Remark          string    `gorm:"column:remark;type:varchar(100);default:''"`
-	LastModifyDate string `gorm:"column:last_modify_date;type:date"` // 最后更新时间
-	//Unitid          int       `gorm:"index:idx_unitid;column:unitid;type:bigint(20)"` // 隆众id
-	//TempID          int       `gorm:"column:temp_id;type:bigint(20)"`                 // 隆众数据单元组id
-	//TempName        string    `gorm:"column:temp_name;type:varchar(255)"`             // 隆众数据单元组id
-	//IsNormal        string    `gorm:"column:is_normal;type:varchar(10)"`              // 是否正常更新，0：停更，1：更新
-	//ModifyTime      time.Time `gorm:"column:modify_time;type:datetime;default:CURRENT_TIMESTAMP"`
+	LastModifyDate  string `gorm:"column:last_modify_date;type:date"`                    // 最后更新时间
 }
 
 func GetLongzhonginfoByClassifyId(classifyId int) (items []*Longzhonginfo, err error) {
 	sql := `SELECT * FROM longzhonginfo WHERE classify_id=? ORDER BY longzhonginfo_id ASC `
-	//o := orm.NewOrmUsingDB("edb")
-	//_, err = o.Raw(sql, classifyId).QueryRows(&items)
 	err = global.DmSQL["edb"].Raw(sql, classifyId).Find(&items).Error
 	return
 }
 
 func GetLongzhongDataMaxCount(classifyId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT MAX(t.num) AS count FROM (
 				SELECT COUNT(1) AS num  FROM longzhonginfo AS a
 				INNER JOIN longzhongdata AS b ON a.longzhonginfo_id=b.longzhonginfo_id
 				WHERE a.classify_id=?
 				GROUP BY a.longzhonginfo_id
 			)AS t `
-	//err = o.Raw(sql, classifyId).QueryRow(&count)
 	err = global.DmSQL["edb"].Raw(sql, classifyId).Scan(&count).Error
 	return
 }
 
-//type Longzhongdata struct {
-//	LongzhongdataId int `orm:"column(longzhongdata_id);pk"`
-//	LongzhonginfoId int
-//	TradeCode       string
-//	Dt              string
-//	Close           float64
-//	CreateTime      time.Time
-//	ModifyTime      time.Time
-//	UnitDesc        string
-//	UpdTime         string
-//	DisplayTime     string
-//}
-
 type Longzhongdata struct {
 	LongzhongdataId int       `gorm:"primaryKey;column:longzhongdata_id;type:int(11);not null"`
 	LongzhonginfoId int       `gorm:"uniqueIndex:idx_longzhonginfo_id;column:longzhonginfo_id;type:int(11);default:0"`
@@ -78,40 +43,33 @@ type Longzhongdata struct {
 	ModifyTime      time.Time `gorm:"column:modify_time;type:datetime;default:CURRENT_TIMESTAMP"`
 	UnitDesc        string    `gorm:"column:unit_desc;type:varchar(255);default:''"` // 描述
 	UpdTime         string    `gorm:"column:upd_time;type:varchar(20);default:''"`   // 更新时间
-	//AddTime         string    `gorm:"column:add_time;type:varchar(30);default:''"`
-	DisplayTime string `gorm:"column:display_time;type:varchar(30);default:''"`
+	DisplayTime     string    `gorm:"column:display_time;type:varchar(30);default:''"`
 }
 
 func GetLongzhongDataById(lzInfoId int) (items []*Longzhongdata, err error) {
-	//o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT * FROM longzhongdata WHERE longzhonginfo_id=? ORDER BY dt DESC `
-	//_, err = o.Raw(sql, lzInfoId).QueryRows(&items)
 	err = global.DmSQL["edb"].Raw(sql, lzInfoId).Find(&items).Error
 	return
 }
 
 func GetLongzhongSurveyDataMaxCount(classifyName string) (count int, err error) {
-	//o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT MAX(t.num) AS count FROM (
 				SELECT COUNT(1) AS num  FROM longzhong_survey_product AS a
 				INNER JOIN longzhong_survey_data AS b ON a.survey_product_id=b.survey_product_id
 				WHERE a.breed_name=?
 				GROUP BY a.survey_product_id
 			)AS t `
-	//err = o.Raw(sql, classifyName).QueryRow(&count)
 	err = global.DmSQL["edb"].Raw(sql, classifyName).Scan(&count).Error
 	return
 }
 
 func GetLongzhongSurveyDataMaxCountByFrequency(classifyName string, frequency int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT MAX(t.num) AS count FROM (
 				SELECT COUNT(1) AS num  FROM longzhong_survey_product AS a
 				INNER JOIN longzhong_survey_data AS b ON a.survey_product_id=b.survey_product_id
 				WHERE a.breed_name=? AND a.frequency=?
 				GROUP BY a.survey_product_id
 			)AS t `
-	//err = o.Raw(sql, classifyName, frequency).QueryRow(&count)
 	err = global.DmSQL["edb"].Raw(sql, classifyName, frequency).Scan(&count).Error
 	return
 }
@@ -125,7 +83,6 @@ func GetExportLzSurveyDataMaxCount(breedIds []string) (items []ExportLzSurveyDat
 	if len(breedIds) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("edb")
 	sql := ` SELECT
 				MAX(t.num) AS count,
 				t.breed_id
@@ -144,7 +101,6 @@ func GetExportLzSurveyDataMaxCount(breedIds []string) (items []ExportLzSurveyDat
 				) AS t
 			GROUP BY
 				t.breed_id `
-	//_, err = o.Raw(sql, breedIds).QueryRows(&items)
 	err = global.DmSQL["edb"].Raw(sql, breedIds).Find(&items).Error
 	return
 }
@@ -153,48 +109,12 @@ func GetExportLzSurveyDataByBreedIds(breedIds []string) (items []*LongzhongSurve
 	if len(breedIds) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("edb")
 	fields := ` survey_product_id, breed_id, input_value, data_time `
 	sql := `SELECT ` + fields + ` FROM longzhong_survey_data WHERE breed_id IN (` + utils.GetOrmInReplace(len(breedIds)) + `) ORDER BY breed_id ASC, survey_product_id ASC, data_time DESC `
-	//_, err = o.Raw(sql, breedIds).QueryRows(&items)
 	err = global.DmSQL["edb"].Raw(sql, breedIds).Find(&items).Error
 	return
 }
 
-//type LongzhongSurveyData struct {
-//	SurveyDataId         int `orm:"column(survey_data_id);pk"`
-//	SurveyProductId      int
-//	ProjectQuotaId       int64
-//	BreedId              string
-//	BreedName            string
-//	QuotaId              string
-//	QuotaName            string
-//	UnitId               string
-//	UnitName             string
-//	SampleType           int64
-//	SampleId             string
-//	SampleName           string
-//	DeviceId             string
-//	Device               string
-//	ProductCraftId       string
-//	ProductCraft         string
-//	ProductLine          string
-//	InputMode            int64
-//	Frequency            int64
-//	InputValue           float64
-//	TaskShouldFinishTime int64
-//	CustomId             string
-//	CustomType           int64
-//	Custom               string
-//	QuotaSampleId        int64
-//	TaskActualFinishTime int64
-//	AreaName             string
-//	ProvinceName         string
-//	ResearchStartData    int64
-//	ResearchStopData     int64
-//	DataTime             string
-//}
-
 type LongzhongSurveyData struct {
 	SurveyDataId         int     `gorm:"primaryKey;column:survey_data_id;type:int(11);not null"`
 	SurveyProductId      int     `gorm:"column:survey_product_id;type:int(11)"`                    // 本地指标id
@@ -230,51 +150,29 @@ type LongzhongSurveyData struct {
 }
 
 func GetLongzhongSurveyDataById(lzInfoId int) (items []*LongzhongSurveyData, err error) {
-	//o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT * FROM longzhong_survey_data WHERE survey_product_id=? ORDER BY data_time DESC `
-	//_, err = o.Raw(sql, lzInfoId).QueryRows(&items)
 	err = global.DmSQL["edb"].Raw(sql, lzInfoId).Find(&items).Error
 	return
 }
 
 // GetLzItemList 模糊查询隆众数据库指标列表
 func GetLzItemList(keyword string) (items []*data_manage.LongzhongSurveyProduct, err error) {
-	//o := orm.NewOrmUsingDB("edb")
 	sql := "SELECT * FROM longzhong_survey_product WHERE CONCAT(sample_name,breed_name,custom,quota_name,lz_code) LIKE ? "
-	//_, err = o.Raw(sql, utils.GetLikeKeyword(keyword)).QueryRows(&items)
 	err = global.DmSQL["edb"].Raw(sql, utils.GetLikeKeyword(keyword)).Find(&items).Error
 	return
 
 }
 
-//type lzSurveyData struct {
-//	DataTime   string `orm:"column(data_time)" description:"日期"`
-//	InputValue string `orm:"column(input_value)" description:"值"`
-//}
-
-// GetLzItemListByCode 根据code查询隆众数据列表
-//func GetLzItemListByCode(lzCode string) (items []*lzSurveyData, err error) {
-//	o := orm.NewOrmUsingDB("edb")
-//
-//	sql := "SELECT * FROM longzhong_survey_data WHERE survey_product_id=? GROUP BY data_time DESC"
-//	_, err = o.Raw(sql, lzCode).QueryRows(&items)
-//	return
-//}
-
 // GetLzProductIdByCode 根据code查询隆众数据列表
 func GetLzProductIdByCode(lzCode string) (productId int, err error) {
-	//o := orm.NewOrmUsingDB("edb")
 	sql := "SELECT survey_product_id FROM longzhong_survey_product WHERE lz_code=?"
-	//err = o.Raw(sql, lzCode).QueryRow(&productId)
 	err = global.DmSQL["edb"].Raw(sql, lzCode).Scan(&productId).Error
 	return
 }
 
 // GetLzSurveyDataMaxCountByProductId 根据code查询隆众数据列表
 func GetLzSurveyDataMaxCountByProductId(surveyProductId int) (productId int, err error) {
-	//o := orm.NewOrmUsingDB("edb")
 	sql := "SELECT COUNT(1) FROM longzhong_survey_data WHERE survey_product_id=?"
-	//err = o.Raw(sql, surveyProductId).QueryRow(&productId)
 	err = global.DmSQL["edb"].Raw(sql, surveyProductId).Scan(&productId).Error
 	return
 }

models/data_stat/edb_info_delete_log.go

@@ -5,48 +5,6 @@ import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-// EdbInfoDeleteLog 指标删除日志表
-//type EdbInfoDeleteLog struct {
-//	Id                 int  `orm:"column(id);pk"`
-//	EdbInfoId          int     `description:"指标ID"`
-//	EdbInfoType        int     `description:"指标类型，0：普通指标，1：预测指标"`
-//	SourceName         string  `description:"来源名称"`
-//	Source             int     `description:"来源id"`
-//	EdbCode            string  `description:"指标编码"`
-//	EdbName            string  `description:"指标名称"`
-//	EdbNameEn          string  `description:"英文指标名称"`
-//	EdbNameSource      string  `description:"指标名称来源"`
-//	Frequency          string  `description:"频率"`
-//	Unit               string  `description:"单位"`
-//	UnitEn             string  `description:"英文单位"`
-//	StartDate          string  `description:"起始日期"`
-//	EndDate            string  `description:"终止日期"`
-//	SysUserId          int     `description:"创建人ID"`
-//	SysUserRealName    string  `description:"创建人姓名"`
-//	UniqueCode         string  `description:"指标唯一编码"`
-//	EdbCreateTime      string  `description:"指标创建时间"`
-//	EdbModifyTime      string  `description:"指标修改时间"`
-//	CreateTime         string  `description:"创建时间即删除时间"`
-//	MinValue           float64 `description:"指标最小值"`
-//	MaxValue           float64 `description:"指标最大值"`
-//	CalculateFormula   string  `description:"计算公式"`
-//	EdbType            int     `description:"指标类型:1:基础指标,2:计算指标"`
-//	LatestDate         string  `description:"数据最新日期"`
-//	LatestValue        float64 `description:"数据最新值"`
-//	MoveType           int     `description:"移动方式:1:领先(默认),2:滞后"`
-//	MoveFrequency      string  `description:"移动频度"`
-//	NoUpdate           int8    `description:"是否停止更新，0：继续更新；1：停止更新"`
-//	ChartImage         string  `description:"图表图片"`
-//	Calendar           string  `description:"公历/农历" orm:"default(公历);"`
-//	DataDateType       string  `orm:"column(data_date_type);size(255);null;default(交易日)"`
-//	ManualSave         int     `description:"是否有手动保存过上下限: 0-否; 1-是"`
-//	TerminalCode       string  `description:"终端编码，用于配置在机器上"`
-//	DelSysUserId       int     `description:"删除人ID"`
-//	DelSysUserRealName string  `description:"删除人姓名"`
-//	DataUpdateTime     string  `description:"最近一次数据发生变化的时间"`
-//	ErDataUpdateDate   string  `description:"本次更新，数据发生变化的最早日期"`
-//}
-
 type EdbInfoDeleteLog struct {
 	Id                 int     `gorm:"primaryKey;unique;column:id;type:bigint(20) unsigned;not null"`    // 自增id
 	EdbInfoId          int     `gorm:"column:edb_info_id;type:int(11);not null"`                         // 指标id
@@ -116,8 +74,6 @@ type EdbInfoDeleteLogItem struct {
 }
 
 func AddEdbDeleteLog(item *EdbInfoDeleteLog) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["data"].Create(item).Error
 	lastId = int64(item.Id)
 	return
@@ -129,7 +85,6 @@ type GetEdbDeleteLogResp struct {
 }
 
 func GetEdbDeleteLogByCondition(condition string, pars []interface{}, orderStr string, pageSize, startSize int) (item []*EdbInfoDeleteLog, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info_delete_log WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -141,7 +96,6 @@ func GetEdbDeleteLogByCondition(condition string, pars []interface{}, orderStr s
 	}
 
 	sql += ` LIMIT ?,? `
-	//_, err = o.Raw(sql, pars...).QueryRows(&item)
 
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
@@ -151,12 +105,10 @@ func GetEdbDeleteLogByCondition(condition string, pars []interface{}, orderStr s
 
 // GetEdbDeleteLogCount
 func GetEdbDeleteLogCount(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT count(*) FROM edb_info_delete_log WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }

models/data_stat/edb_info_stat_column.go

@@ -4,21 +4,6 @@ import (
 	"eta_gn/eta_api/global"
 )
 
-// EdbInfoStatColumn 数据源统计表自定义列
-//type EdbInfoStatColumn struct {
-//	Id           int    `orm:"column(id);pk" description:"自增id"`
-//	ColumnName   string `description:"字段名称"`
-//	ColumnKey    string `description:"字段"`
-//	CreateTime   string `description:" 创建时间"`
-//	ModifyTime   string `description:"修改时间"`
-//	Type         int    `description:"列表类型：1数据源明细表，2数据源统计表，3删除指标列表，4指标信息变更表"`
-//	Sort         int    `description:"列排序"`
-//	IsMust       int    `description:"是否必选列: 0非必选 1必须"`
-//	IsSort       int    `description:"是否是允许排序的列，0否，1是"`
-//	IsShow       int    `description:"是否展示：1展示，0不展示"`
-//	ColumnNameEn string `description:"英文字段名称"`
-//}
-
 type EdbInfoStatColumn struct {
 	Id           int    `gorm:"primaryKey;column:id;type:int(11) unsigned;not null"` // 自增id
 	ColumnName   string `gorm:"column:column_name;type:varchar(100);not null"`       // 字段名称
@@ -58,38 +43,20 @@ type EdbInfoStatColumnListReq struct {
 
 // GetStatColumn 获取自定义列
 func GetStatColumn(columnType int) (list []EdbInfoStatColumn, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_info_stat_column WHERE type=? ORDER BY sort asc, id asc `
-	//_, err = o.Raw(sql, columnType).QueryRows(&list)
 	err = global.DmSQL["data"].Raw(sql, columnType).Find(&list).Error
 	return
 }
 
 // GetAllStatColumn 获取所有自定义列
 func GetAllStatColumn() (list []EdbInfoStatColumn, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_info_stat_column ORDER BY sort asc, id asc  `
-	//_, err = o.Raw(sql).QueryRows(&list)
 	err = global.DmSQL["data"].Raw(sql).Find(&list).Error
 	return
 }
 
 // UpdateStatColumn 批量更新自定义列
 func UpdateStatColumn(list []*EdbInfoStatColumn) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//p, err := o.Raw("UPDATE edb_info_stat_column SET is_show = ?, sort=? WHERE id = ?").Prepare()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	_ = p.Close() // 别忘记关闭 statement
-	//}()
-	//for _, v := range list {
-	//	_, err = p.Exec(v.IsShow, v.Sort, v.Id)
-	//	if err != nil {
-	//		return
-	//	}
-	//}
 	tx := global.DmSQL["data"].Begin()
 	for _, v := range list {
 		err = tx.Exec("UPDATE edb_info_stat_column SET is_show = ?, sort=? WHERE id = ?", v.IsShow, v.Sort, v.Id).Error

models/data_stat/edb_info_update_log.go

@@ -6,40 +6,6 @@ import (
 	"time"
 )
 
-// EdbInfoUpdateLog 指标更新/刷新日志列表
-//type EdbInfoUpdateLog struct {
-//	Id                     uint64    `orm:"column(id);pk"`
-//	EdbInfoId              int       `description:"指标ID"`
-//	SourceName             string    `description:"来源名称"`
-//	Source                 int       `description:"来源id"`
-//	EdbCode                string    `description:"指标编码"`
-//	EdbName                string    `description:"指标名称"`
-//	EdbNameSource          string    `description:"指标名称来源"`
-//	Frequency              string    `description:"频率"`
-//	Unit                   string    `description:"单位"`
-//	StartDate              string    `description:"起始日期"`
-//	EndDate                string    `description:"终止日期"`
-//	SysUserId              int       `description:"创建人ID"`
-//	SysUserRealName        string    `description:"创建人姓名"`
-//	UniqueCode             string    `description:"指标唯一编码"`
-//	EdbCreateTime          time.Time `description:"指标创建时间"`
-//	EdbModifyTime          time.Time `description:"指标修改时间"`
-//	CreateTime             time.Time `description:"创建时间"`
-//	UpdateSysUserId        int       `description:"变更人ID"`
-//	UpdateSysUserRealName  string    `description:"变更人姓名"`
-//	LatestDate             string    `description:"数据最新日期"`
-//	LatestValue            float64   `description:"数据最新值"`
-//	TerminalCode           string    `description:"终端编码，用于配置在机器上"`
-//	ErDataUpdateDate       string    `description:"本次更新，数据发生变化的最早日期"`
-//	UpdateResult           int       `description:"本次刷新操作结果：1成功，2失败"`
-//	UpdateFailedReason     string    `description:"刷新失败原因"`
-//	DataUpdateResult       int       `description:"数据更新结果：1成功，2失败"`
-//	DataUpdateFailedReason string    `description:"数据未正常更新原因"`
-//	DataUpdateTime         string    `description:"数据更新时间"`
-//	IsSourceRefresh        int       `description:"是否为终端刷新到数据源的刷新操作：0否，1是"`
-//	UpdateType             int       `description:"变更类型，0:数据明细变更，1:基础信息变更, 2:新增指标"`
-//}
-
 type EdbInfoUpdateLog struct {
 	Id                     uint64    `gorm:"primaryKey;unique;column:id;type:bigint(20) unsigned;not null"` // 自增id
 	EdbInfoId              int       `gorm:"column:edb_info_id;type:int(11);not null"`                      // 指标id
@@ -100,8 +66,6 @@ type EdbInfoUpdateLogItem struct {
 }
 
 func AddEdbUpdateLog(item *EdbInfoUpdateLog) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["data"].Create(item).Error
 	lastId = int64(item.Id)
 	return
@@ -113,7 +77,6 @@ type GetEdbUpdateLogResp struct {
 }
 
 func GetEdbUpdateLogByCondition(condition string, pars []interface{}, orderStr string, pageSize, startSize int) (item []*EdbInfoUpdateLog, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info_update_log WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -125,8 +88,6 @@ func GetEdbUpdateLogByCondition(condition string, pars []interface{}, orderStr s
 	}
 
 	sql += ` LIMIT ?,? `
-	//_, err = o.Raw(sql, pars...).QueryRows(&item)
-
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
@@ -135,12 +96,10 @@ func GetEdbUpdateLogByCondition(condition string, pars []interface{}, orderStr s
 
 // GetEdbUpdateLogCount
 func GetEdbUpdateLogCount(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT count(*) FROM edb_info_update_log WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }

models/data_stat/edb_info_update_stat.go

@@ -6,41 +6,6 @@ import (
 	"time"
 )
 
-// EdbInfoUpdateStat 指标更新/刷新 汇总表（数据源明细表）
-//type EdbInfoUpdateStat struct {
-//	Id                     uint64    `orm:"column(id);pk"`
-//	EdbInfoId              int       `description:"指标ID"`
-//	SourceName             string    `description:"来源名称"`
-//	Source                 int       `description:"来源id"`
-//	EdbCode                string    `description:"指标编码"`
-//	EdbName                string    `description:"指标名称"`
-//	EdbNameSource          string    `description:"指标名称来源"`
-//	Frequency              string    `description:"频率"`
-//	Unit                   string    `description:"单位"`
-//	StartDate              string    `description:"起始日期"`
-//	EndDate                string    `description:"终止日期"`
-//	SysUserId              int       `description:"创建人ID"`
-//	SysUserRealName        string    `description:"创建人姓名"`
-//	UniqueCode             string    `description:"指标唯一编码"`
-//	EdbCreateTime          time.Time `description:"指标创建时间"`
-//	EdbModifyTime          time.Time `description:"指标修改时间"`
-//	CreateTime             time.Time
-//	UpdateTime             string  `description:"刷新时间"`
-//	LatestDate             string  `description:"数据最新日期"`
-//	LatestValue            float64 `description:"数据最新值"`
-//	TerminalCode           string  `description:"终端编码，用于配置在机器上"`
-//	ErDataUpdateDate       string  `description:"本次更新，数据发生变化的最早日期"`
-//	DataUpdateResult       int     `description:"数据更新结果：1成功，2失败"`
-//	DataUpdateFailedReason string  `description:"数据未正常更新原因"`
-//	DataUpdateTime         string  `description:"数据更新时间"`
-//	UpdateResult           int     `description:"本次刷新操作结果：1成功，2失败"`
-//	UpdateFailedReason     string  `description:"刷新失败原因"`
-//	ModifyTime             string  `description:"修改时间"`
-//	IsAdd                  int8    `description:"是否是当日新增的指标：1是，2否"`
-//	NeedRefresh            int8    `description:"今日是否需要定时刷新，1需要，0不需要"` //todo 确认该字段
-//	HasRefresh             int8    `description:"今日是否已刷新，1是，0否"`
-//}
-
 type EdbInfoUpdateStat struct {
 	Id                     uint64    `gorm:"primaryKey;unique;column:id;type:bigint(20) unsigned;not null"` // 自增id
 	EdbInfoId              int       `gorm:"column:edb_info_id;type:int(11);not null"`                      // 指标id
@@ -115,7 +80,6 @@ type GetEdbUpdateStatResp struct {
 }
 
 func GetEdbUpdateStatByCondition(condition string, pars []interface{}, orderStr string, pageSize, startSize int) (item []*EdbInfoUpdateStat, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info_update_stat WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -127,7 +91,6 @@ func GetEdbUpdateStatByCondition(condition string, pars []interface{}, orderStr
 	}
 
 	sql += ` LIMIT ?,? `
-	//_, err = o.Raw(sql, pars...).QueryRows(&item)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
@@ -136,12 +99,10 @@ func GetEdbUpdateStatByCondition(condition string, pars []interface{}, orderStr
 
 // GetEdbUpdateStatCount
 func GetEdbUpdateStatCount(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT count(*) FROM edb_info_update_stat WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
@@ -164,7 +125,6 @@ type GetEdbUpdateFailedResp struct {
 }
 
 func GetEdbUpdateStatFailedGroupByCondition(condition string, pars []interface{}) (item []*EdbUpdateFailedList, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT
 	terminal_code,
 	data_update_result as source_update_result,
@@ -183,7 +143,6 @@ WHERE
 	frequency,
 	data_update_failed_reason
 	ORDER BY count(*) desc`
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }

models/data_stat/edb_source_stat.go

@@ -6,25 +6,6 @@ import (
 	"time"
 )
 
-// EdbSourceStat 数据源统计表
-//type EdbSourceStat struct {
-//	Id                uint64    `orm:"column(id);pk"`
-//	SourceName        string    `description:"来源名称"`
-//	Source            int       `description:"来源id"`
-//	TerminalCode      string    `description:"终端编码，用于配置在机器上"`
-//	EdbNum            int32     `description:"指标总数"`
-//	EdbNewNum         int32     `description:"今日新增指标数"`
-//	EdbDelNum         int32     `description:"今日删除指标数"`
-//	NeedRefreshNum    int       `description:"今日需刷新指标"`
-//	HasRefreshNum     int       `description:"今日发起刷新任务指标数"`
-//	UpdateSuccessNum  int       `description:"今日已更新成功指标数"`
-//	UpdateFailedNum   int       `description:"今日已更新失败指标数"`
-//	RefreshSuccessNum int       `description:"今日已刷新成功指标数"`
-//	RefreshFailedNum  int       `description:"今日已刷新失败指标数"`
-//	CreateTime        time.Time `description:"创建时间"`
-//	ModifyTime        time.Time `description:"修改时间"`
-//}
-
 type EdbSourceStat struct {
 	Id                uint64    `gorm:"primaryKey;unique;column:id;type:bigint(20) unsigned;not null"` // 自增id
 	SourceName        string    `gorm:"column:source_name;type:varchar(100)"`                          // 来源名称
@@ -65,7 +46,6 @@ type GetEdbSourceStatResp struct {
 }
 
 func GetEdbSourceStatByCondition(condition string, pars []interface{}, orderStr string, pageSize, startSize int) (item []*EdbSourceStat, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_source_stat WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -77,7 +57,6 @@ func GetEdbSourceStatByCondition(condition string, pars []interface{}, orderStr
 	}
 
 	sql += ` LIMIT ?,? `
-	//_, err = o.Raw(sql, pars...).QueryRows(&item)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
@@ -86,12 +65,10 @@ func GetEdbSourceStatByCondition(condition string, pars []interface{}, orderStr
 
 // GetEdbSourceStatCount
 func GetEdbSourceStatCount(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT count(*) FROM edb_source_stat WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }

models/eta_trial/questionnaire_fill_record.go

@@ -1,35 +0,0 @@
-package eta_trial
-
-// QuestionnaireFillRecord 问卷填写记录表
-//type QuestionnaireFillRecord struct {
-//	RecordId   int    `orm:"column(fill_record_id);pk" description:"记录id"`
-//	Mobile     string `description:"手机"`
-//	IsFill     int    `description:"0未点过 1稍后再填 2已填写"`
-//	CreateTime time.Time
-//	ModifyTime time.Time
-//}
-
-// GetQuestionnaireFillRecordCountByMobile 手机号获取问卷填写记录
-//func GetQuestionnaireFillRecordCountByMobile(mobile string) (item *QuestionnaireFillRecord, err error) {
-//	if utils.BusinessCode != utils.BusinessCodeSandbox {
-//		return
-//	}
-//	o := orm.NewOrm()
-//	sql := `SELECT * FROM questionnaire_fill_record WHERE mobile=? ORDER BY create_time DESC LIMIT 1`
-//	err = o.Raw(sql, mobile).QueryRow(&item)
-//	return
-//}
-
-// AddQuestionnaireFillRecord 新增问卷填写记录
-//func AddQuestionnaireFillRecord(item *QuestionnaireFillRecord) (err error) {
-//	if utils.BusinessCode != utils.BusinessCodeSandbox {
-//		return
-//	}
-//	o := orm.NewOrm()
-//	id, err := o.Insert(item)
-//	if err != nil {
-//		return
-//	}
-//	item.RecordId = int(id)
-//	return
-//}

models/fe_calendar/fe_calendar_matter.go

@@ -14,28 +14,6 @@ const (
 	MatterTypePredict = 3 // 事项类型-预测指标
 )
 
-// FeCalendarMatter 外汇日历-事项表
-//type FeCalendarMatter struct {
-//	FeCalendarMatterId  int       `orm:"column(fe_calendar_matter_id);pk" description:"事项ID"`
-//	ChartPermissionId   int       `description:"品种ID"`
-//	ChartPermissionName string    `description:"品种名称"`
-//	MatterMonth         string    `description:"事项年月：格式2006-01"`
-//	MatterDate          time.Time `description:"事项日期"`
-//	Title               string    `description:"标题"`
-//	MatterType          int       `description:"事项类型：1-自定义事项；2-基础指标；3-预测指标"`
-//	EdbInfoId           int       `description:"指标ID"`
-//	EdbUniqueCode       string    `description:"指标唯一编码"`
-//	EdbCode             string    `description:"指标编码"`
-//	FontColor           string    `description:"字体颜色"`
-//	FillingColor        string    `description:"填充颜色"`
-//	FontBold            int       `description:"字体加粗：0-否；1-是"`
-//	Sort                int       `description:"排序"`
-//	SysUserId           int       `description:"创建人ID"`
-//	SysUserName         string    `description:"创建人姓名"`
-//	CreateTime          time.Time `description:"创建时间"`
-//	ModifyTime          time.Time `description:"更新时间"`
-//}
-
 type FeCalendarMatter struct {
 	FeCalendarMatterId  int       `gorm:"primaryKey;column:fe_calendar_matter_id;type:int(10) unsigned;not null"`                            // 事项Id
 	ChartPermissionId   int       `gorm:"index:idx_chart_permission_id;column:chart_permission_id;type:int(10) unsigned;not null;default:0"` // 品种Id
@@ -105,75 +83,7 @@ func (m *FeCalendarMatter) PrimaryId() string {
 	return FeCalendarMatterCols.FeCalendarMatterId
 }
 
-//func (m *FeCalendarMatter) Create() (err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	id, err := o.Insert(m)
-//	if err != nil {
-//		return
-//	}
-//	m.FeCalendarMatterId = int(id)
-//	return
-//}
-
-//func (m *FeCalendarMatter) CreateMulti(items []*FeCalendarMatter) (err error) {
-//	if len(items) == 0 {
-//		return
-//	}
-//	o := orm.NewOrmUsingDB("data")
-//	_, err = o.InsertMulti(len(items), items)
-//	return
-//}
-
-//func (m *FeCalendarMatter) Update(cols []string) (err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	_, err = o.Update(m, cols...)
-//	return
-//}
-
-//func (m *FeCalendarMatter) Del() (err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-//	_, err = o.Raw(sql, m.FeCalendarMatterId).Exec()
-//	return
-//}
-
-//func (m *FeCalendarMatter) MultiDel(menuIds []int) (err error) {
-//	if len(menuIds) == 0 {
-//		return
-//	}
-//	o := orm.NewOrmUsingDB("data")
-//	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-//	_, err = o.Raw(sql, menuIds).Exec()
-//	return
-//}
-
-//func (m *FeCalendarMatter) GetItemById(id int) (item *FeCalendarMatter, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-//	err = o.Raw(sql, id).QueryRow(&item)
-//	return
-//}
-
-//func (m *FeCalendarMatter) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FeCalendarMatter, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	order := ``
-//	if orderRule != "" {
-//		order = ` ORDER BY ` + orderRule
-//	}
-//	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-//	err = o.Raw(sql, pars).QueryRow(&item)
-//	return
-//}
-
-//func (m *FeCalendarMatter) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	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 *FeCalendarMatter) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FeCalendarMatter, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -183,26 +93,10 @@ func (m *FeCalendarMatter) GetItemsByCondition(condition string, pars []interfac
 		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.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
-//func (m *FeCalendarMatter) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FeCalendarMatter, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	fields := strings.Join(fieldArr, ",")
-//	if len(fieldArr) == 0 {
-//		fields = `*`
-//	}
-//	order := fmt.Sprintf(`ORDER BY %s DESC`, FeCalendarMatterCols.CreateTime)
-//	if orderRule != "" {
-//		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...).QueryRows(&items)
-//	return
-//}
-
 type FeCalendarMatterItem struct {
 	FeCalendarMatterId  int    `description:"事项ID"`
 	ChartPermissionId   int    `description:"品种ID"`
@@ -274,54 +168,6 @@ type FeCalendarMatterSaveItem struct {
 }
 
 func (m *FeCalendarMatter) Save(addMatters, editMatters, removeMatters []*FeCalendarMatter, updateCols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//tx, e := o.Begin()
-	//if e != nil {
-	//	err = fmt.Errorf("begin tx err: %s", e.Error())
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//		return
-	//	}
-	//	_ = tx.Commit()
-	//}()
-
-	//if len(addMatters) > 0 {
-	//	_, e = tx.InsertMulti(len(addMatters), addMatters)
-	//	if e != nil {
-	//		err = fmt.Errorf("insert multi err: %s", e.Error())
-	//		return
-	//	}
-	//}
-	//if len(editMatters) > 0 {
-	//	for _, v := range editMatters {
-	//		_, e = tx.Update(v, updateCols...)
-	//		if e != nil {
-	//			err = fmt.Errorf("update err: %s", e.Error())
-	//			return
-	//		}
-	//	}
-	//}
-	//if len(removeMatters) > 0 {
-	//	p, e := tx.Raw(fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())).Prepare()
-	//	if e != nil {
-	//		err = fmt.Errorf("remove prepare err: %s", e.Error())
-	//		return
-	//	}
-	//	defer func() {
-	//		_ = p.Close()
-	//	}()
-	//	for _, v := range removeMatters {
-	//		_, e = p.Exec(v.FeCalendarMatterId)
-	//		if e != nil {
-	//			err = fmt.Errorf("remove exec err: %s", e.Error())
-	//			return
-	//		}
-	//	}
-	//}
-
 	tx := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {

models/knowledge/knowledge_classify.go

@@ -17,7 +17,6 @@ type KnowledgeClassify struct {
 	Enabled      int       `gorm:"column:enabled;default:1;type:tinyint"`
 	Level        int       `gorm:"column:level;default:0;type:bigint"`
 	ResourceType int       `gorm:"column:resource_type;default:0;not null;type:tinyint"`
-	//HasChild     int       `gorm:"column:has_child;default:0;type:int"`
 }
 
 func (k *KnowledgeClassify) TableName() string {

models/knowledge/knowledge_resource.go

@@ -65,12 +65,6 @@ type KnowledgeResourceList struct {
 	EndTime             string `gorm:"column:end_time"`
 	ClassifyFullName    string
 	TagName             string
-	// todo 是否需要记录最后更新人
-	/*DetailImgUrl        string    `gorm:"column:detail_img_url" description:"事件详情长图地址"`
-	DetailPdfUrl        string    `gorm:"column:detail_pdf_url" description:"事件详情PDF地址"`
-	LastModifyAdminId   int       `gorm:"column:last_modify_admin_id" description:"最后更新人ID"`
-	LastModifyAdminName string    `gorm:"column:last_modify_admin_name" description:"最后更新人姓名"`
-	ContentModifyTime   time.Time `gorm:"column:content_modify_time" description:"内容更新时间"`*/
 }
 
 type KnowledgeResourceListResp struct {
@@ -181,14 +175,6 @@ type SaveReportContent struct {
 	EndResourceId  int    `description:"版尾资源ID"`
 }
 
-func AddReportSaveLog(knowledgeResourceId, adminId int, content, contentSub, contentStruct, canvasColor, adminName string, headResourceId, endResourceId int) (err error) {
-
-	sql := ` INSERT INTO  knowledge_resource_save_log(knowledge_resource_id, content,content_sub,content_struct,canvas_color,head_resource_id,end_resource_id,admin_id,admin_name) VALUES (?,?,?,?,?,?,?,?,?) `
-	//_, err = o.Raw(sql, knowledgeResourceId, content, contentSub, contentStruct, canvasColor, headResourceId, endResourceId, adminId, adminName).Exec()
-	err = global.DmSQL["rddp"].Exec(sql, knowledgeResourceId, content, contentSub, contentStruct, canvasColor, headResourceId, endResourceId, adminId, adminName).Error
-	return
-}
-
 type SaveReportContentResp struct {
 	KnowledgeResourceId int `description:"事件id"`
 }

models/mgo/base_from_business_data.go

@@ -410,9 +410,6 @@ func (m *BaseFromBusinessData) GetLatestValue(whereParams, selectParam interface
 		fmt.Println("MgoGetColl Err:", err.Error())
 		return
 	}
-
-	//var result interface{}
-	//err = coll.Find(ctx, whereParams).Select(selectParam).One(&result)
 	err = coll.Find(ctx, whereParams).Select(selectParam).One(&latestValue)
 
 	return

models/mgo/base_from_ths_hf_data.go

@@ -399,9 +399,6 @@ func (m *BaseFromThsHfData) GetLatestValue(whereParams, selectParam interface{})
 		fmt.Println("MgoGetColl Err:", err.Error())
 		return
 	}
-
-	//var result interface{}
-	//err = coll.Find(ctx, whereParams).Select(selectParam).One(&result)
 	err = coll.Find(ctx, whereParams).Select(selectParam).One(&latestValue)
 	return
 }

models/mgo/edb_data_business.go

@@ -502,9 +502,6 @@ func (m *EdbDataBusiness) GetLatestValue(whereParams, selectParam interface{}) (
 		fmt.Println("MgoGetColl Err:", err.Error())
 		return
 	}
-
-	//var result interface{}
-	//err = coll.Find(ctx, whereParams).Select(selectParam).One(&result)
 	err = coll.Find(ctx, whereParams).Select(selectParam).One(&latestValue)
 
 	return

models/mgo/edb_data_ths_hf.go

@@ -502,9 +502,6 @@ func (m *EdbDataThsHf) GetLatestValue(whereParams, selectParam interface{}) (lat
 		fmt.Println("MgoGetColl Err:", err.Error())
 		return
 	}
-
-	//var result interface{}
-	//err = coll.Find(ctx, whereParams).Select(selectParam).One(&result)
 	err = coll.Find(ctx, whereParams).Select(selectParam).One(&latestValue)
 	return
 }

models/ppt_english/ppt_english.go

@@ -9,29 +9,6 @@ import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-// PptEnglish 表
-//type PptEnglish struct {
-//	PptId         int       `orm:"column(ppt_id);pk;auto" description:"ppt的Id"`
-//	TemplateType  int       `description:"模版类型"`
-//	BackgroundImg string    `description:"背景图片"`
-//	Title         string    `description:"标题"`
-//	ReportType    string    `description:"报告类型"`
-//	PptDate       string    `description:"选择日期"`
-//	Content       string    `description:"ppt内容"`
-//	PptxUrl       string    `description:"pptx下载地址"`
-//	CreateTime    time.Time `description:"创建时间"`
-//	ModifyTime    time.Time `description:"修改时间"`
-//	AdminId       int       `description:"系统用户id"`
-//	AdminRealName string    `description:"系统用户名称"`
-//	ReportId      int       `description:"关联的报告ID"`
-//	ReportCode    string    `description:"关联的报告code"`
-//	IsShare       int8      `description:"是否分享，0：不分享，1：分享"`
-//	PublishTime   time.Time `description:"发布时间"`
-//	CoverContent  string    `description:"PPT内容-JSON"`
-//	PptPage       int       `description:"PPT页数"`
-//	TitleSetting  string    `description:"PPT标题设置"`
-//}
-
 type PptEnglish struct {
 	PptId         int       `gorm:"primaryKey;column:ppt_id;type:int(11) unsigned;not null"`
 	TemplateType  int       `gorm:"column:template_type;type:int(9) unsigned;default:1"`                           // 模板类型
@@ -56,29 +33,6 @@ type PptEnglish struct {
 	TitleSetting  string    `gorm:"column:title_setting;type:varchar(255);default:''"`                             // 标题设置
 }
 
-//type PptEnglishItem struct {
-//	PptId         int       `orm:"column(ppt_id);pk" description:"ppt的Id"`
-//	TemplateType  int       `description:"模版类型"`
-//	BackgroundImg string    `description:"背景图片"`
-//	Title         string    `description:"标题"`
-//	ReportType    string    `description:"报告类型"`
-//	PptDate       string    `description:"选择日期"`
-//	Content       string    `description:"ppt内容"`
-//	PptxUrl       string    `description:"pptx下载地址"`
-//	CreateTime    time.Time `description:"创建时间"`
-//	ModifyTime    time.Time `description:"修改时间"`
-//	AdminId       int       `description:"系统用户id"`
-//	AdminRealName string    `description:"系统用户名称"`
-//	IsAuth        bool      `description:"true:有操作权限，false:无操作权限"`
-//	ReportId      int       `description:"报告ID"`
-//	ReportCode    string    `description:"关联的报告code"`
-//	IsShare       int8      `description:"是否分享，0：不分享，1：分享"`
-//	PublishTime   time.Time `description:"发布时间"`
-//	CoverContent  string    `description:"PPT内容-JSON"`
-//	PptPage       int       `description:"PPT页数"`
-//	TitleSetting  string    `description:"PPT标题设置"`
-//}
-
 type PptEnglishItem struct {
 	PptId         int       `gorm:"primaryKey;column:ppt_id;type:int(11) unsigned;not null"`
 	TemplateType  int       `gorm:"column:template_type;type:int(9) unsigned;default:1"`                           // 模板类型
@@ -105,15 +59,12 @@ type PptEnglishItem struct {
 }
 
 func GetPptEnglishList(condition string, pars []interface{}, startSize, pageSize int) (items []*PptEnglishItem, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_english WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	//
 	sql += `ORDER BY modify_time DESC LIMIT ?,?`
-	//sql += `ORDER BY create_time DESC LIMIT ?,?`
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
@@ -121,26 +72,21 @@ func GetPptEnglishList(condition string, pars []interface{}, startSize, pageSize
 }
 
 func GetPptEnglishByCondition(condition string, pars []interface{}) (items []*PptEnglish, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_english WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	//
 	sql += `ORDER BY modify_time DESC`
-	//sql += `ORDER BY create_time DESC LIMIT ?,?`
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func GetPptEnglishListCount(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COUNT(1) AS count FROM ppt_english WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
@@ -152,8 +98,6 @@ type PptEnglishListResp struct {
 
 // AddPptEnglish 新增PPT
 func AddPptEnglish(item *PptEnglish) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["rddp"].Create(item).Error
 	lastId = int64(item.PptId)
 	return
@@ -161,9 +105,7 @@ func AddPptEnglish(item *PptEnglish) (lastId int64, err error) {
 
 // DeletePptEnglish 删除ppt
 func DeletePptEnglish(pptId int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM ppt_english WHERE ppt_id=? `
-	//_, err = o.Raw(sql, pptId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, pptId).Error
 	return
 }
@@ -211,21 +153,10 @@ type EditPptEnglishReq struct {
 
 // Update 更新ppt基础信息
 func (item *PptEnglish) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(item, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }
 
-// EditPptEnglish 编辑ppt
-//func EditPptEnglish(item *PptEnglish) (err error) {
-//	//o := orm.NewOrmUsingDB("rddp")
-//	sql := `UPDATE ppt_english SET title = ?,ppt_date= ?, report_type=?,modify_time=NOW()  WHERE ppt_id = ? `
-//	//_, err = o.Raw(sql, item.Title, item.PptDate, item.ReportType, item.PptId).Exec()
-//	err = global.DmSQL["rddp"].Exec(sql, item.Title, item.PptDate, item.ReportType, item.PptId).Error
-//	return
-//}
-
 type DeletePptEnglishReq struct {
 	PptId int `description:"PptId" `
 }
@@ -237,18 +168,12 @@ type SavePptEnglishPathReq struct {
 }
 
 func GetPptEnglishById(pptId int) (item *PptEnglish, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_english WHERE 1=1 AND ppt_id=? `
-	//err = o.Raw(sql, pptId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, pptId).First(&item).Error
 	return
 }
 
 func GetPptEnglishByIds(pptIds []int) (list []*PptEnglish, err error) {
-	//_, err = orm.NewOrmUsingDB("rddp").
-	//	QueryTable("ppt_english").
-	//	Filter("ppt_id__in", pptIds).
-	//	All(&list)
 	if len(pptIds) == 0 {
 		return
 	}
@@ -257,13 +182,6 @@ func GetPptEnglishByIds(pptIds []int) (list []*PptEnglish, err error) {
 	return
 }
 
-//func GetPptEnglishByTitle(title string) (item *PptEnglish, err error) {
-//	o := orm.NewOrmUsingDB("rddp")
-//	sql := `SELECT * FROM ppt_english WHERE 1=1 AND title=? `
-//	err = o.Raw(sql, title).QueryRow(&item)
-//	return
-//}
-
 type PptPages struct {
 	PptPagesId int       `orm:"column(ppt_pages_id);pk" description:"报告章节Id"`
 	PptId      int64     `description:"ppt_id"`
@@ -292,20 +210,10 @@ type PptEnglishPublishReq struct {
 // EditPptEnglishPath 编辑Ppt的下载地址
 func EditPptEnglishPath(pptId int, pptxPath string) (err error) {
 	sql := `UPDATE ppt_english SET pptx_url=?,modify_time=NOW(),publish_time=NOW() WHERE ppt_id=? `
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Raw(sql, pptxPath, pptId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, pptxPath, pptId).Error
 	return
 }
 
-// PptEnglishPublishRecord 发布记录表
-//type PptEnglishPublishRecord struct {
-//	Id         int `orm:"column(id);pk"`
-//	PptId      int
-//	PptUrl     string
-//	CreateTime time.Time
-//}
-
 type PptEnglishPublishRecord struct {
 	Id         int       `gorm:"primaryKey;column:id;type:int(11);not null"`
 	PptId      int       `gorm:"column:ppt_id;type:int(11)"`                                 // 英文ppt id
@@ -315,30 +223,11 @@ type PptEnglishPublishRecord struct {
 
 // AddPptEnglishPublishRecord 添加发布记录，主要是记录每次发布的时候，当前的ppt
 func AddPptEnglishPublishRecord(item *PptEnglishPublishRecord) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["rddp"].Create(item).Error
 	lastId = int64(item.Id)
 	return
 }
 
-// PptEnglishSaveLog ppt记录表
-//type PptEnglishSaveLog struct {
-//	Id            int       `orm:"column(id);pk" description:"自增Id"`
-//	PptId         int       `orm:"column(ppt_id)" description:"ppt的Id"`
-//	TemplateType  int       `description:"模版类型"`
-//	BackgroundImg string    `description:"背景图片"`
-//	Title         string    `description:"标题"`
-//	ReportType    string    `description:"报告类型"`
-//	PptDate       string    `description:"选择日期"`
-//	Content       string    `description:"ppt内容"`
-//	AdminId       int       `description:"系统用户id"`
-//	AdminRealName string    `description:"系统用户名称"`
-//	CreateTime    time.Time `description:"创建时间"`
-//	CoverContent  string    `description:"PPT内容-JSON"`
-//	TitleSetting  string    `description:"PPT标题设置"`
-//}
-
 type PptEnglishSaveLog struct {
 	Id            int       `gorm:"primaryKey;column:id;type:int(11);not null"`                   // 主键Id
 	PptId         int       `gorm:"index:idx_ppt_id;column:ppt_id;type:int(11);not null"`         // ppt Id
@@ -357,8 +246,6 @@ type PptEnglishSaveLog struct {
 
 // AddPptEnglishSaveLog 新增PPT日志
 func AddPptEnglishSaveLog(item *PptEnglishSaveLog) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["rddp"].Create(item).Error
 	lastId = int64(item.Id)
 	return
@@ -377,17 +264,13 @@ type PPT2ReportReq struct {
 
 // AddPptEnglishMulti 批量新增ppt
 func AddPptEnglishMulti(list []*PptEnglish) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.InsertMulti(1, list)
 	err = global.DmSQL["rddp"].CreateInBatches(list, utils.MultiAddNum).Error
 	return
 }
 
 // GetAllPptTitle 获取当前目录的所有名称
 func GetAllPptTitle() (names []string, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select title from ppt_english"
-	//_, err = o.Raw(sql).QueryRows(&names)
 	err = global.DmSQL["rddp"].Raw(sql).Scan(&names).Error
 	return
 }
@@ -400,49 +283,33 @@ type PPT2ReportResp struct {
 
 // GetPptEnglishByReportId 通过关联的报告ID获取PPT
 func GetPptEnglishByReportId(reportId int) (item *PptEnglish, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_english WHERE 1=1 AND report_id=? LIMIT 1`
-	//err = o.Raw(sql, reportId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, reportId).First(&item).Error
 	return
 }
 
 // GetSharePptEnglish 获取公开分享的ppt
 func GetSharePptEnglish() (items []*PptEnglish, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_english WHERE 1=1 AND is_share = 1 ORDER BY create_time DESC `
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DmSQL["rddp"].Raw(sql).Find(&items).Error
 	return
 }
 
 // GetAllPptEnglishList 根据条件获取所有的Ppt
 func GetAllPptEnglishList(condition string, pars []interface{}) (items []*PptEnglishItem, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_english WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	//
 	sql += `ORDER BY modify_time DESC `
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
 	return
 }
 
-// GetSyncReportPptList 获取所有已经同步了报告的ppt
-//func GetSyncReportPptList() (list []*PptEnglish, err error) {
-//	sql := `SELECT * FROM ppt_english WHERE report_id>0 `
-//	o := orm.NewOrmUsingDB("rddp")
-//	_, err = o.Raw(sql).QueryRows(&list)
-//	return
-//}
-
 // GetPPTTitleList 获取PPT标题列表
 func GetPPTTitleList() (list []string, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT title FROM ppt_english`
-	//_, err = o.Raw(sql).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql).Scan(&list).Error
 	return
 }
@@ -457,9 +324,7 @@ type EnglishPPT2ReportReq struct {
 }
 
 func GetPptEnglishByTitleAndId(title string, adminId int) (item *PptEnglish, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_english WHERE 1=1 AND title=? AND admin_id=? `
-	//err = o.Raw(sql, title, adminId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, title, adminId).First(&item).Error
 	return
 }

models/ppt_english/ppt_english_grant.go

@@ -6,15 +6,6 @@ import (
 	"time"
 )
 
-// PptEnglishGrant Ppt授权表
-//type PptEnglishGrant struct {
-//	GrantId      int64     `orm:"column(grant_id);pk;auto" description:"自增序号"`
-//	PptId        int64     `description:"ppt ID"`
-//	DepartmentId int64     `description:"授权部门id"`
-//	GrantAdminId int64     `description:"授权部门id"`
-//	CreateTime   time.Time `orm:"auto_now_add;type(datetime)" description:"创建时间"`
-//}
-
 type PptEnglishGrant struct {
 	GrantId      int64     `gorm:"primaryKey;column:grant_id;type:int(9) unsigned;not null"`              // 授权id
 	PptId        int64     `gorm:"index:idx_pptid;column:ppt_id;type:int(9) unsigned;not null;default:0"` // ppt_id
@@ -25,9 +16,7 @@ type PptEnglishGrant struct {
 
 // GetPPtGrantInfo 获取已经有权限的ppt列表
 func GetPPtGrantInfo(pptId int) (list []*PptEnglishGrant, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_english_grant WHERE ppt_id=? `
-	//_, err = o.Raw(sql, pptId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, pptId).Find(&list).Error
 	return
 }
@@ -48,34 +37,6 @@ type GrantPptReq struct {
 
 // MultiAddPptEnglishGrant 批量添加授权记录
 func MultiAddPptEnglishGrant(pptId int, list []*PptEnglishGrant) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-	//
-	//sql := "DELETE from ppt_english_grant where ppt_id=?"
-	//_, err = to.Raw(sql, pptId).Exec()
-	//if err != nil {
-	//	return
-	//}
-	//
-	//// 新增授权记录
-	//if len(list) > 0 {
-	//	_, tmpErr := to.InsertMulti(len(list), list)
-	//	if tmpErr != nil {
-	//		err = tmpErr
-	//		return
-	//	}
-	//}
-
 	tx := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -103,41 +64,11 @@ func MultiAddPptEnglishGrant(pptId int, list []*PptEnglishGrant) (err error) {
 
 // DeletePptEnglishGrant 移除授权记录
 func DeletePptEnglishGrant(pptId int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := "DELETE from ppt_english_grant where ppt_id=?"
-	//_, err = o.Raw(sql, pptId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, pptId).Error
 	return
 }
 
-// PptEnglishInfoGrantItem Ppt信息记录（包含授权信息）
-//type PptEnglishInfoGrantItem struct {
-//	PptId         int       `orm:"column(ppt_id);pk;auto" description:"ppt的Id"`
-//	TemplateType  int       `description:"模版类型"`
-//	BackgroundImg string    `description:"背景图片"`
-//	Title         string    `description:"标题"`
-//	ReportType    string    `description:"报告类型"`
-//	PptDate       string    `description:"选择日期"`
-//	Content       string    `description:"ppt内容"`
-//	PptUrl        string    `description:"ppt下载地址"`
-//	PptxUrl       string    `description:"pptx下载地址"`
-//	CreateTime    time.Time `description:"创建时间"`
-//	ModifyTime    time.Time `description:"修改时间"`
-//	AdminId       int       `description:"系统用户id"`
-//	AdminRealName string    `description:"系统用户名称"`
-//	PptVersion    int8      `description:"是否ppt的旧版本；1：旧的，2：新的"`
-//	ReportId      int       `description:"关联的报告ID"`
-//	ReportCode    string    `description:"关联的报告code"`
-//	IsShare       int8      `description:"是否分享，0：不分享，1：分享"`
-//	PublishTime   time.Time `description:"发布时间"`
-//	PptPage       int       `description:"PPT页数"`
-//	//GrantId      int64     `orm:"column(grant_id);pk;auto" description:"自增序号"`
-//	//PptId        int64     `description:"ppt ID"`
-//	//DepartmentId int64     `description:"授权部门id"`
-//	//GrantAdminId int64     `description:"授权部门id"`
-//	//CreateTime   time.Time `orm:"auto_now_add;type(datetime)" description:"创建时间"`
-//}
-
 type PptEnglishInfoGrantItem struct {
 	PptId         int       `gorm:"column:ppt_id;type:int(11) unsigned;not null"`
 	TemplateType  int       `gorm:"column:template_type;type:int(9) unsigned;default:1"`        // 模板类型
@@ -162,33 +93,27 @@ type PptEnglishInfoGrantItem struct {
 
 // GetAllGrantList 获取已经有权限的ppt列表
 func GetAllGrantList(sysUserId int) (list []*PptEnglishInfoGrantItem, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.* FROM ppt_english a JOIN ppt_english_grant b on a.ppt_id=b.ppt_id 
  WHERE a.admin_id=? OR b.department_id=1 OR b.grant_admin_id=? GROUP BY a.ppt_id`
-	//_, err = o.Raw(sql, sysUserId, sysUserId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, sysUserId, sysUserId).Find(&list).Error
 	return
 }
 
 // GetGrantList 获取我共享出去/别人共享给我的的ppt列表
 func GetGrantList(condition string, pars []interface{}) (list []*PptEnglishInfoGrantItem, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.* FROM ppt_english a JOIN ppt_english_grant b on a.ppt_id=b.ppt_id 
  WHERE 1=1 `
 	sql += condition
 
 	sql += ` GROUP BY a.ppt_id ORDER BY a.modify_time DESC `
-	//_, err = o.Raw(sql, pars).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&list).Error
 	return
 }
 
 // GetPPtGrantConf 根据ppt_id和操作人获取ppt权限配置
 func GetPPtGrantConf(pptId, sysUserId int) (item *PptEnglishInfoGrantItem, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.* FROM ppt_english a JOIN ppt_english_grant b on a.ppt_id=b.ppt_id 
  WHERE a.ppt_id=?  AND (b.department_id=1 OR b.grant_admin_id=?) GROUP BY a.ppt_id`
-	//err = o.Raw(sql, pptId, sysUserId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, pptId, sysUserId).First(&item).Error
 	return
 }

models/ppt_english/ppt_english_group.go

@@ -5,18 +5,6 @@ import (
 	"time"
 )
 
-//type PptEnglishGroup struct {
-//	GroupId    int64     `orm:"column(group_id);pk;auto" description:"ppt目录ID"`
-//	GroupName  string    `description:"目录名称"`
-//	AdminId    int       `description:"目录创建者账号ID"`
-//	IsShare    int8      `description:"是否共享，0私有，1共享"`
-//	GroupSort  int64     `description:"目录排序标识"`
-//	IsShareAdd int8      `description:"是否是通过单个ppt共享生成的目录，0不是，1-是"`
-//	CreateTime time.Time `orm:"auto_now_add;type(datetime)" description:"创建时间"`
-//	ModifyTime time.Time `orm:"auto_now;type(datetime)" description:"修改时间"`
-//	ShareTime  time.Time `description:"分享时间"`
-//}
-
 type PptEnglishGroup struct {
 	GroupId    int64     `gorm:"primaryKey;column:group_id;type:int(11) unsigned;not null"`           // ppt目录Id
 	GroupName  string    `gorm:"column:group_name;type:varchar(100);not null"`                        // 目录名称
@@ -29,62 +17,36 @@ type PptEnglishGroup struct {
 	IsShareAdd int8      `gorm:"column:is_share_add;type:tinyint(2);not null;default:0"`              // 是否是通过单个ppt共享生成的目录，0不是，1-是
 }
 
-// GetPrivatePptGroups 获取私有目录
-//func GetPrivatePptGroups(adminId int) (list []*PptEnglishGroup, err error) {
-//	o := orm.NewOrmUsingDB("rddp")
-//	sql := "select * from ppt_english_group where admin_id=? order by group_sort asc, group_id asc"
-//	_, err = o.Raw(sql, adminId).QueryRows(&list)
-//	return
-//}
-
 // GetPrivatePptGroupsByAdminId 获取用户自己的私有目录
 func GetPrivatePptGroupsByAdminId(adminId int) (list []*PptEnglishGroup, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_english_group where admin_id=? AND is_share_add=0 order by group_sort asc, group_id asc"
-	//_, err = o.Raw(sql, adminId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, adminId).Find(&list).Error
 	return
 }
 
-// GetPublicPptGroups 获取ppt公共目录
-//func GetPublicPptGroups() (list []*PptEnglishGroup, err error) {
-//	o := orm.NewOrmUsingDB("rddp")
-//	sql := "select * from ppt_english_group where is_share=1 order by share_time asc, group_id asc"
-//	_, err = o.Raw(sql).QueryRows(&list)
-//	return
-//}
-
 // GetPptGroupByName 根据目录名称查询
 func GetPptGroupByName(groupName string, adminId int) (item *PptEnglishGroup, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_english_group where admin_id=? and group_name=?"
-	//err = o.Raw(sql, adminId, groupName).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, adminId, groupName).First(&item).Error
 	return
 }
 
 // GetPptGroupByGroupIdAdminId 根据目录Id查询
 func GetPptGroupByGroupIdAdminId(groupId int64, adminId int) (item *PptEnglishGroup, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_english_group where admin_id=? and group_id=?"
-	//err = o.Raw(sql, adminId, groupId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, adminId, groupId).First(&item).Error
 	return
 }
 
 // GetPptGroupByGroupId 根据目录Id查询
 func GetPptGroupByGroupId(groupId int64) (item *PptEnglishGroup, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_english_group where group_id=?"
-	//err = o.Raw(sql, groupId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, groupId).First(&item).Error
 	return
 }
 
 // AddPptGroup 新增目录
 func AddPptGroup(item *PptEnglishGroup) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["rddp"].Create(item).Error
 	lastId = int64(item.GroupId)
 	return
@@ -92,92 +54,52 @@ func AddPptGroup(item *PptEnglishGroup) (lastId int64, err error) {
 
 // DeletePptGroup 删除单个ppt目录
 func DeletePptGroup(groupId int64) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM ppt_english_group WHERE group_id=? `
-	//_, err = o.Raw(sql, groupId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, groupId).Error
 	return
 }
 
 // DeletePptGroupByGroupIds 删除单个ppt目录
 func DeletePptGroupByGroupIds(groupIds string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM ppt_english_group WHERE group_id in  ` + groupIds
-	//_, err = o.Raw(sql).Exec()
 	err = global.DmSQL["rddp"].Exec(sql).Error
 	return
 }
 
 // Update 更新ppt目录基础信息
 func (item *PptEnglishGroup) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(item, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }
 
 // MoveUpGroupBySort 往上移动目录
 func MoveUpGroupBySort(nextSort, currentSort int64) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `update ppt_english_group set group_sort = group_sort + 1 where group_sort >= ? and group_sort< ?`
-	//_, err = o.Raw(sql, nextSort, currentSort).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, nextSort, currentSort).Error
 	return
 }
 
 // MoveDownGroupBySort 往下移动目录
 func MoveDownGroupBySort(prevSort, currentSort int64) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `update ppt_english_group set group_sort = group_sort - 1 where group_sort <= ? and group_sort> ? `
-	//_, err = o.Raw(sql, prevSort, currentSort).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, prevSort, currentSort).Error
 	return
 }
 
 // GetPptGroupNamesByAdminId 获取当前目录的所有名称
 func GetPptGroupNamesByAdminId(adminId int) (names []string, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select group_name from ppt_english_group  where admin_id = ?"
-	//_, err = o.Raw(sql, adminId).QueryRows(&names)
 	err = global.DmSQL["rddp"].Raw(sql, adminId).Scan(&names).Error
 	return
 }
 
 // GetPptGroupIdAndGroupNameByAdminId 查找分组名称和标识
 func GetPptGroupIdAndGroupNameByAdminId(adminId int) (list []*RespPptGroupName, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select group_id, group_name from ppt_english_group where admin_id = ? and is_share_add != 1 order by group_sort asc, group_id asc"
-	//_, err = o.Raw(sql, adminId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, adminId).Find(&list).Error
 	return
 }
 
-// AddPptGroupMappingMulti 批量新增ppt和目录的映射关系
-//func AddPptGroupMulti(list []*PptEnglishGroup) (err error) {
-//	o := orm.NewOrmUsingDB("rddp")
-//	_, err = o.InsertMulti(1, list)
-//	return
-//}
-
-// UpdatePptGroupSortMulti 批量更新初始排序标识
-//func UpdatePptGroupSortMulti(groupIds []int64) (err error) {
-//	o := orm.NewOrmUsingDB("rddp")
-//	p, err := o.Raw("UPDATE ppt_english_group SET group_sort = group_id WHERE group_id = ?").Prepare()
-//	if err != nil {
-//		return
-//	}
-//	defer func() {
-//		_ = p.Close() // 别忘记关闭 statement
-//	}()
-//	for _, v := range groupIds {
-//		_, err = p.Exec(v)
-//		if err != nil {
-//			return
-//		}
-//	}
-//	return
-//}
-
 type ReqAddPptGroup struct {
 	GroupName string `description:"目录名称"`
 }
@@ -213,10 +135,6 @@ type RespGroupListItem struct {
 	IsShare   int8   `description:"是否共享，0私有，1共享"`
 	OnlyOld   bool   `description:"是否只包含ppt旧版本的目录,只包含旧版的ppt：true，否则 false"`
 	PptList   []*RespGroupPptNameListItem
-	//GroupSort  int64  `description:"目录排序标识"`
-	//IsShareAdd int8   `description:"是否是通过单个ppt共享生成的目录，0不是，1-是"`
-	//CreateTime string `description:"创建时间"`
-	//ModifyTime string `description:"修改时间"`
 }
 
 type RespGroupPptNameListItem struct {

models/ppt_english/ppt_english_group_mapping.go

@@ -7,20 +7,6 @@ import (
 	"time"
 )
 
-// PptEnglishGroupMapping ppt目录和ppt 映射表
-//type PptEnglishGroupMapping struct {
-//	GroupPptId      int64     `orm:"column(group_ppt_id);pk;auto" description:"自增序号"`
-//	GroupId         int64     `description:"ppt目录ID"`
-//	PptSort         int64     `description:"Ppt的排序"`
-//	PptId           int64     `description:"ppt ID"`
-//	CreateTime      time.Time `orm:"auto_now_add;type(datetime)" description:"创建时间"`
-//	ModifyTime      time.Time `orm:"auto_now;type(datetime)" description:"修改时间"`
-//	AdminId         int       `description:"移动ppt到该目录的系统用户id"`
-//	AdminRealName   string    `description:"系统用户名称"`
-//	ChildGroupPptId int64     `description:"设置共享后的新映射ID"`
-//	IsMoved         bool      `description:"true表示改PPT被人为移动过"`
-//}
-
 type PptEnglishGroupMapping struct {
 	GroupPptId      int64     `gorm:"primaryKey;column:group_ppt_id;type:int(11) unsigned;not null"`       // 自增序号
 	GroupId         int64     `gorm:"column:group_id;type:int(11) unsigned;not null"`                      // ppt目录Id
@@ -36,8 +22,6 @@ type PptEnglishGroupMapping struct {
 
 // AddPptGroupMapping 新增目录和ppt的映射关系
 func AddPptGroupMapping(item *PptEnglishGroupMapping) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["rddp"].Create(item).Error
 	lastId = int64(item.GroupPptId)
 	return
@@ -45,29 +29,20 @@ func AddPptGroupMapping(item *PptEnglishGroupMapping) (lastId int64, err error)
 
 // GetPptMappingCountByGroupId 查询目录下，ppt的个数
 func GetPptMappingCountByGroupId(groupId int64) (total int64, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `select count(*) from ppt_english_group_mapping where group_id=?`
-	//err = o.Raw(sql, groupId).QueryRow(&total)
 	err = global.DmSQL["rddp"].Raw(sql, groupId).Scan(&total).Error
 	return
 }
 
 // GetPptMappingListByGroupId 查询目录下，ppt列表
 func GetPptMappingListByGroupId(groupId int64) (list []*PptEnglishGroupMapping, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `select group_ppt_id, group_id, ppt_id, ppt_sort, admin_id, admin_real_name, create_time from ppt_english_group_mapping where group_id=? order by ppt_sort asc, group_ppt_id asc `
-	//_, err = o.Raw(sql, groupId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, groupId).Find(&list).Error
 	return
 }
 
 // GetPptMappingListByGroupIds 根据分组ID查找
 func GetPptMappingListByGroupIds(groupIds []int64) (list []*PptEnglishGroupMapping, err error) {
-	//_, err = orm.NewOrmUsingDB("rddp").
-	//	QueryTable("ppt_english_group_mapping").
-	//	Filter("group_id__in", groupIds).
-	//	OrderBy("-ppt_sort", "group_ppt_id").
-	//	All(&list)
 	if len(groupIds) == 0 {
 		return
 	}
@@ -78,72 +53,46 @@ func GetPptMappingListByGroupIds(groupIds []int64) (list []*PptEnglishGroupMappi
 
 // GetPptMappingByPptId 查询目录下, pptId对应的目录映射关系
 func GetPptMappingByPptId(pptId int64) (item *PptEnglishGroupMapping, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` select * from ppt_english_group_mapping where ppt_id=? `
-	//err = o.Raw(sql, pptId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, pptId).First(&item).Error
 	return
 }
 
 // GetPptMappingListByGroupIdDesc 查询目录下，ppt列表, 降序排列
 func GetPptMappingListByGroupIdDesc(groupId int64) (list []*PptEnglishGroupMapping, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `select group_ppt_id, group_id, ppt_id, ppt_sort, admin_id, admin_real_name, create_time from ppt_english_group_mapping where group_id=? order by ppt_sort desc, group_ppt_id desc `
-	//_, err = o.Raw(sql, groupId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, groupId).Find(&list).Error
 	return
 }
 
 // GetPptMappingByGroupPptId 查询根据映射ID，查询单个映射关系
 func GetPptMappingByGroupPptId(groupPptId int64, adminId int) (item *PptEnglishGroupMapping, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `select * from ppt_english_group_mapping where group_ppt_id=? and admin_id=?`
-	//err = o.Raw(sql, groupPptId, adminId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, groupPptId, adminId).First(&item).Error
 	return
 }
 
 // GetPptMappingCountByGroupPptId 查询根据映射ID，查询单个映射关系数量
 func GetPptMappingCountByGroupPptId(groupPptId int64, adminId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `select COUNT(*) AS count from ppt_english_group_mapping where group_ppt_id=? and admin_id=?`
-	//err = o.Raw(sql, groupPptId, adminId).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, groupPptId, adminId).Scan(&count).Error
 	return
 }
 
 // Update 更新ppt目录映射的基本信息
 func (item *PptEnglishGroupMapping) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(item, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }
 
 // AddPptGroupMappingMulti 批量新增ppt和目录的映射关系
 func AddPptGroupMappingMulti(list []*PptEnglishGroupMapping) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.InsertMulti(1, list)
 	err = global.DmSQL["rddp"].CreateInBatches(list, utils.MultiAddNum).Error
 	return
 }
 
 // UpdatePptGroupMappingSortMulti 批量更新初始排序标识
 func UpdatePptGroupMappingSortMulti(groupPptIds []int64) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//p, err := o.Raw("UPDATE ppt_english_group_mapping SET ppt_sort = group_ppt_id WHERE group_ppt_id = ?").Prepare()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	_ = p.Close() // 别忘记关闭 statement
-	//}()
-	//for _, v := range groupPptIds {
-	//	_, err = p.Exec(v)
-	//	if err != nil {
-	//		return
-	//	}
-	//}
 	sql := fmt.Sprintf(`UPDATE ppt_english_group_mapping SET ppt_sort = group_ppt_id WHERE group_ppt_id = ?`)
 	for _, v := range groupPptIds {
 		e := global.DmSQL["rddp"].Exec(sql, v).Error
@@ -157,66 +106,41 @@ func UpdatePptGroupMappingSortMulti(groupPptIds []int64) (err error) {
 
 // DeletePptGroupMapping 删除ppt目录
 func DeletePptGroupMapping(groupId int64, adminId int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM ppt_english_group_mapping WHERE group_ppt_id=? and admin_id=? `
-	//_, err = o.Raw(sql, groupId, adminId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, groupId, adminId).Error
 	return
 }
 
 // DeletePptGroupMappingByPptId 删除ppt目录
 func DeletePptGroupMappingByPptId(pptId int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM ppt_english_group_mapping WHERE ppt_id=?`
-	//_, err = o.Raw(sql, pptId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, pptId).Error
 	return
 }
 
 // MoveUpGroupPptBySort 往上移动ppt
 func MoveUpGroupPptBySort(groupId, nextSort, currentSort int64) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `update ppt_english_group_mapping set ppt_sort = ppt_sort + 1 where group_id=? and ppt_sort >= ? and ppt_sort< ?`
-	//_, err = o.Raw(sql, groupId, nextSort, currentSort).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, groupId, nextSort, currentSort).Error
 	return
 }
 
 // MoveDownGroupPptBySort 往下移动ppt
 func MoveDownGroupPptBySort(groupId, prevSort, currentSort int64) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `update ppt_english_group_mapping set ppt_sort = ppt_sort - 1 where group_id=? and ppt_sort <= ? and ppt_sort> ? `
-	//_, err = o.Raw(sql, groupId, prevSort, currentSort).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, groupId, prevSort, currentSort).Error
 	return
 }
 
 // GetGroupPptByPptId 根据pptID 查找各个目录下的ppt
 func GetGroupPptByPptId(pptId int) (list []*PptEnglishGroupMapping, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `select * from ppt_english_group_mapping where ppt_id=?`
-	//_, err = o.Raw(sql, pptId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, pptId).Find(&list).Error
 	return
 }
 
 // GetPublicGroupPptByPptIds 根据pptid查询公共目录下的ppt
 func GetPublicGroupPptByPptIds(pptIds []string) (list []*PptEnglishGroupMapping, err error) {
-	//qb, _ := orm.NewQueryBuilder("mysql")
-	//// 构建查询对象
-	//qb.Select("p.*").
-	//	From("ppt_english_group as g").
-	//	InnerJoin("ppt_english_group_mapping as p").On("g.group_id = p.group_id").
-	//	Where("g.is_share = 1 and p.ppt_id").In(pptIds...).
-	//	OrderBy("g.share_time asc, p.ppt_sort asc")
-	//
-	//// 导出 SQL 语句
-	//sql := qb.String()
-	//
-	//// 执行 SQL 语句
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Raw(sql).QueryRows(&list)
-
 	if len(pptIds) == 0 {
 		return
 	}

models/ppt_english/report_ppt_english_img.go

@@ -1,38 +0,0 @@
-package ppt_english
-
-// ReportPptEnglishImg Ppt转报告的图片记录表
-//type ReportPptEnglishImg struct {
-//	ReportPptImgId  int       `orm:"column(report_ppt_img_id);pk;auto" description:"自增id"`
-//	PptId           int       `description:"ppt的id"`
-//	ReportId        int       `description:"关联的报告ID"`
-//	ReportChapterId int       `description:"关联的报告章节ID"`
-//	ImgUrl          string    `description:"ppt图片地址"`
-//	CreateTime      time.Time `description:"创建时间"`
-//}
-
-// AddAndEditMultiReportPptEnglishImg 批量添加Ppt转报告的图片记录
-//func AddAndEditMultiReportPptEnglishImg(pptId int, reportPptEnglishImgList []*ReportPptEnglishImg) (err error) {
-//	if len(reportPptEnglishImgList) < 0 {
-//		return
-//	}
-//	o := orm.NewOrmUsingDB("rddp")
-//
-//	to, err := o.Begin()
-//	if err != nil {
-//		return
-//	}
-//	defer func() {
-//		if err != nil {
-//			_ = to.Rollback()
-//		} else {
-//			_ = to.Commit()
-//		}
-//	}()
-//	sql := ` DELETE FROM report_ppt_english_img WHERE ppt_id = ?`
-//	_, err = to.Raw(sql, pptId).Exec()
-//	if err != nil {
-//		return
-//	}
-//	_, err = to.InsertMulti(len(reportPptEnglishImgList), reportPptEnglishImgList)
-//	return
-//}

models/report/report_chapter_grant.go

@@ -6,15 +6,6 @@ import (
 	"time"
 )
 
-// ReportChapterGrant
-// @Description: 报告章节授权用户表
-//type ReportChapterGrant struct {
-//	GrantId         int       `orm:"column(grant_id)"` // 授权id
-//	ReportChapterId int       `description:"报告章节id"`
-//	AdminId         int       `description:"授权的用户id"`
-//	CreateTime      time.Time `description:"授权时间"`
-//}
-
 type ReportChapterGrant struct {
 	GrantId         int       `gorm:"primaryKey;column:grant_id;type:int(9) unsigned;not null"`                                    // 授权id
 	ReportChapterId int       `gorm:"index:idx_report_chapterid;column:report_chapter_id;type:int(9) unsigned;not null;default:0"` // 报告章节id
@@ -31,34 +22,6 @@ type ReportChapterGrant struct {
 // @param list []*ReportChapterGrant
 // @return err error
 func (m ReportChapterGrant) MultiAddReportChapterGrantGrant(reportChapterId int, list []*ReportChapterGrant) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-	//
-	//sql := "DELETE from report_chapter_grant where report_chapter_id=?"
-	//_, err = to.Raw(sql, reportChapterId).Exec()
-	//if err != nil {
-	//	return
-	//}
-	//
-	//// 新增授权记录
-	//if len(list) > 0 {
-	//	_, tmpErr := to.InsertMulti(500, list)
-	//	if tmpErr != nil {
-	//		err = tmpErr
-	//		return
-	//	}
-	//}
-
 	tx := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -95,9 +58,7 @@ func (m ReportChapterGrant) MultiAddReportChapterGrantGrant(reportChapterId int,
 // @return list []*ReportChapterGrant
 // @return err error
 func (m ReportChapterGrant) GetGrantListById(reportChapterId int) (list []*ReportChapterGrant, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_chapter_grant WHERE report_chapter_id=? `
-	//_, err = o.Raw(sql, reportChapterId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, reportChapterId).Find(&list).Error
 	return
 }
@@ -116,9 +77,7 @@ func (m ReportChapterGrant) GetGrantListByIdList(reportChapterIdList []int) (lis
 		return
 	}
 
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_chapter_grant WHERE report_chapter_id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, reportChapterIdList).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, reportChapterIdList).Find(&list).Error
 	return
 }
@@ -133,9 +92,7 @@ func (m ReportChapterGrant) GetGrantListByIdList(reportChapterIdList []int) (lis
 // @return item *ReportGrant
 // @return err error
 func (m ReportChapterGrant) GetGrantByIdAndAdmin(reportChapterId, sysUserId int) (item *ReportGrant, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_chapter_grant WHERE report_chapter_id = ? AND admin_id = ? `
-	//err = o.Raw(sql, reportChapterId, sysUserId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, reportChapterId, sysUserId).First(&item).Error
 	return
 }

models/report/report_chapter_permission_mapping.go

@@ -31,34 +31,6 @@ type ReportChapterPermissionMapping struct {
 // @param list []*ReportChapterPermissionMapping
 // @return err error
 func (m ReportChapterPermissionMapping) MultiAddReportChapterPermissionMappingPermission(reportChapterId int, list []*ReportChapterPermissionMapping) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-	//
-	//sql := "DELETE from report_chapter_permission_mapping where report_chapter_id=?"
-	//_, err = to.Raw(sql, reportChapterId).Exec()
-	//if err != nil {
-	//	return
-	//}
-	//
-	//// 新增品种权限记录
-	//if len(list) > 0 {
-	//	_, tmpErr := to.InsertMulti(500, list)
-	//	if tmpErr != nil {
-	//		err = tmpErr
-	//		return
-	//	}
-	//}
-
 	tx := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -94,9 +66,7 @@ func (m ReportChapterPermissionMapping) MultiAddReportChapterPermissionMappingPe
 // @return list []*ReportChapterPermissionMapping
 // @return err error
 func (m ReportChapterPermissionMapping) GetPermissionListById(reportChapterId int) (list []*ReportChapterPermissionMapping, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_chapter_permission_mapping WHERE report_chapter_id=? `
-	//_, err = o.Raw(sql, reportChapterId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, reportChapterId).Find(&list).Error
 	return
 }
@@ -128,10 +98,8 @@ type ReportChapterPermissionItem struct {
 // @return list []*ReportChapterPermissionMapping
 // @return err error
 func (m ReportChapterPermissionMapping) GetPermissionItemListById(reportChapterId int) (list []*ReportChapterPermissionItem, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.*,b.chart_permission_name FROM report_chapter_permission_mapping AS a 
          JOIN chart_permission AS b on a.chart_permission_id=b.chart_permission_id WHERE report_chapter_id=? `
-	//_, err = o.Raw(sql, reportChapterId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, reportChapterId).Find(&list).Error
 	return
 }
@@ -150,9 +118,7 @@ func (m ReportChapterPermissionMapping) GetPermissionListByIdList(reportChapterI
 		return
 	}
 
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_chapter_permission_mapping WHERE report_chapter_id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, reportChapterIdList).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, reportChapterIdList).Find(&list).Error
 	return
 }
@@ -165,27 +131,6 @@ func (m ReportChapterPermissionMapping) GetPermissionListByIdList(reportChapterI
 // @param list []*ReportChapterPermissionMapping
 // @return err error
 func (m ReportChapterPermissionMapping) MultiAdd(list []*ReportChapterPermissionMapping) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-
-	// 新增品种权限记录
-	//if len(list) > 0 {
-	//	_, err = to.InsertMulti(500, list)
-	//	if err != nil {
-	//		return
-	//	}
-	//}
-
 	err = global.DmSQL["rddp"].CreateInBatches(list, utils.MultiAddNum).Error
 	return
 }

models/report/report_grant.go

@@ -31,34 +31,6 @@ type ReportGrant struct {
 // @param list []*ReportGrant
 // @return err error
 func (m ReportGrant) MultiAddReportGrantGrant(reportId int, list []*ReportGrant) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-	//
-	//sql := "DELETE from report_grant where report_id=?"
-	//_, err = to.Raw(sql, reportId).Exec()
-	//if err != nil {
-	//	return
-	//}
-	//
-	//// 新增授权记录
-	//if len(list) > 0 {
-	//	_, tmpErr := to.InsertMulti(500, list)
-	//	if tmpErr != nil {
-	//		err = tmpErr
-	//		return
-	//	}
-	//}
-
 	tx := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -94,9 +66,7 @@ func (m ReportGrant) MultiAddReportGrantGrant(reportId int, list []*ReportGrant)
 // @return list []*ReportGrant
 // @return err error
 func (m ReportGrant) GetGrantListById(reportId int) (list []*ReportGrant, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_grant WHERE report_id=? `
-	//_, err = o.Raw(sql, reportId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&list).Error
 	return
 }
@@ -115,9 +85,7 @@ func (m ReportGrant) GetGrantListByIdList(reportIdList []int) (list []*ReportGra
 		return
 	}
 
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_grant WHERE report_id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, reportIdList).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, reportIdList).Find(&list).Error
 	return
 }
@@ -132,9 +100,7 @@ func (m ReportGrant) GetGrantListByIdList(reportIdList []int) (list []*ReportGra
 // @return item *ReportGrant
 // @return err error
 func (m ReportGrant) GetGrantByIdAndAdmin(reportId, sysUserId int) (item *ReportGrant, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_grant WHERE report_id = ? AND admin_id = ? `
-	//err = o.Raw(sql, reportId, sysUserId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, reportId, sysUserId).First(&item).Error
 	return
 }
@@ -148,9 +114,7 @@ func (m ReportGrant) GetGrantByIdAndAdmin(reportId, sysUserId int) (item *Report
 // @return list []*ReportGrant
 // @return err error
 func (m ReportGrant) GetGrantListByAdminId(adminId int) (list []*ReportGrant, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_grant WHERE admin_id=? `
-	//_, err = o.Raw(sql, adminId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, adminId).Find(&list).Error
 	return
 }

models/report_approve/report_approve.go

@@ -10,28 +10,6 @@ import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-// ReportApprove 报告审批表
-//type ReportApprove struct {
-//	ReportApproveId  int       `orm:"column(report_approve_id);pk" description:"审批ID"`
-//	ReportType       int       `description:"报告类型：1-中文研报；2-英文研报；3-智能研报"`
-//	ReportId         int       `description:"报告ID"`
-//	ReportTitle      string    `description:"报告标题"`
-//	ClassifyFirstId  int       `description:"一级分类ID"`
-//	ClassifySecondId int       `description:"二级分类ID"`
-//	ClassifyThirdId  int       `description:"三级分类ID"`
-//	State            int       `description:"审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"`
-//	FlowId           int       `description:"审批流ID"`
-//	FlowVersion      int       `description:"审批流版本"`
-//	StartNodeId      int       `description:"开始节点ID"`
-//	CurrNodeId       int       `description:"当前节点ID"`
-//	ApplyUserId      int       `description:"申请人ID"`
-//	ApplyUserName    string    `description:"申请人姓名"`
-//	ApproveRemark    string    `description:"审批备注"`
-//	ApproveTime      time.Time `description:"审批时间"`
-//	CreateTime       time.Time `description:"创建时间"`
-//	ModifyTime       time.Time `description:"修改时间"`
-//}
-
 type ReportApprove struct {
 	ReportApproveId  int       `gorm:"primaryKey;column:report_approve_id;type:int(10) unsigned;not null"`                      // 审批ID
 	ReportType       int       `gorm:"column:report_type;type:tinyint(4) unsigned;not null;default:0"`                          // 报告类型：1-中文研报；2-英文研报；3-智能研报
@@ -102,12 +80,6 @@ func (m *ReportApprove) PrimaryId() string {
 }
 
 func (m *ReportApprove) Create() (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.ReportApproveId = int(id)
 	err = global.DmSQL["rddp"].Create(m).Error
 	return
 }
@@ -116,23 +88,17 @@ func (m *ReportApprove) CreateMulti(items []*ReportApprove) (err error) {
 	if len(items) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DmSQL["rddp"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *ReportApprove) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(m, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(m).Error
 	return
 }
 
 func (m *ReportApprove) Del() (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	//_, err = o.Raw(sql, m.ReportApproveId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, m.ReportApproveId).Error
 	return
 }
@@ -141,43 +107,34 @@ func (m *ReportApprove) MultiDel(menuIds []int) (err error) {
 	if len(menuIds) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	//_, err = o.Raw(sql, menuIds).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, menuIds).Error
 	return
 }
 
 func (m *ReportApprove) GetItemById(id int) (item *ReportApprove, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	//err = o.Raw(sql, id).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *ReportApprove) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *ReportApprove, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
 	return
 }
 
 func (m *ReportApprove) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *ReportApprove) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*ReportApprove, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -187,13 +144,11 @@ func (m *ReportApprove) 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.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *ReportApprove) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*ReportApprove, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -203,7 +158,6 @@ func (m *ReportApprove) GetPageItemsByCondition(condition string, pars []interfa
 		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...).QueryRows(&items)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
@@ -318,20 +272,17 @@ type ReportApproveItemOrm struct {
 
 // GetApprovingReportApproveCount 获取待处理的审批分页列表总数
 func GetApprovingReportApproveCount(cond string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	base := fmt.Sprintf(`SELECT a.report_approve_record_id
 		FROM report_approve_record AS a
 		JOIN report_approve AS b ON a.report_approve_id = b.report_approve_id AND a.node_id = b.curr_node_id
 		WHERE 1 = 1 %s`, cond)
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM (%s) t`, base)
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 // GetApprovingReportApprovePageList 获取待处理的审批列表-分页
 func GetApprovingReportApprovePageList(cond string, pars []interface{}, orderRule string, startSize, pageSize int) (items []*ReportApproveItemOrm, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	order := `ORDER BY a.create_time DESC`
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
@@ -341,7 +292,6 @@ func GetApprovingReportApprovePageList(cond string, pars []interface{}, orderRul
 		JOIN report_approve AS b ON a.report_approve_id = b.report_approve_id AND a.node_id = b.curr_node_id
 		WHERE 1 = 1 %s %s
 		LIMIT ?,?`, cond, order)
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	pars = append(pars, startSize, pageSize)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
@@ -349,20 +299,17 @@ func GetApprovingReportApprovePageList(cond string, pars []interface{}, orderRul
 
 // GetApprovedReportApproveCount 获取已处理的审批分页列表总数
 func GetApprovedReportApproveCount(cond string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	base := fmt.Sprintf(`SELECT a.report_approve_record_id
 		FROM report_approve_record AS a
 		JOIN report_approve AS b ON a.report_approve_id = b.report_approve_id
 		WHERE 1 = 1 %s`, cond)
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM (%s) t`, base)
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 // GetApprovedReportApprovePageList 获取已处理的审批列表-分页
 func GetApprovedReportApprovePageList(cond string, pars []interface{}, orderRule string, startSize, pageSize int) (items []*ReportApproveItemOrm, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	order := `ORDER BY a.create_time DESC`
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
@@ -372,7 +319,6 @@ func GetApprovedReportApprovePageList(cond string, pars []interface{}, orderRule
 		JOIN report_approve AS b ON a.report_approve_id = b.report_approve_id
 		WHERE 1 = 1 %s %s
 		LIMIT ?,?`, cond, order)
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	pars = append(pars, startSize, pageSize)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
@@ -380,23 +326,19 @@ func GetApprovedReportApprovePageList(cond string, pars []interface{}, orderRule
 
 // GetApplyReportApproveCount 获取我发起的审批分页列表总数
 func GetApplyReportApproveCount(cond string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	base := fmt.Sprintf(`SELECT a.* FROM report_approve AS a WHERE 1 = 1 %s`, cond)
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM (%s) t`, base)
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 // GetApplyReportApprovePageList 获取我发起的审批列表-分页
 func GetApplyReportApprovePageList(cond string, pars []interface{}, orderRule string, startSize, pageSize int) (items []*ReportApproveItemOrm, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	order := `ORDER BY a.create_time DESC`
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT a.* FROM report_approve AS a WHERE 1 = 1 %s %s LIMIT ?,?`, cond, order)
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
@@ -408,7 +350,6 @@ type ReportApproveDetail struct {
 	Report           *ReportApproveDetailReport  `description:"报告信息"`
 	Approve          *ReportApproveDetailItem    `description:"审批信息"`
 	ApproveFlowNodes []*ReportApproveDetailNodes `description:"审批节点信息"`
-	//ApproveFlow      *ReportApproveFlowItem      `description:"审批流信息"`
 }
 
 // ReportApproveDetailItem 审批详情-审批信息
@@ -434,9 +375,6 @@ type ReportApproveDetailReport struct {
 	ReportCode     string `description:"报告code"`
 	ReportClassify string `description:"报告分类"`
 	ReportLayout   int8   `description:"报告布局，1：常规布局，2：智能布局。默认：1"`
-	//ClassifyFirstId  int    `description:"一级分类ID"`
-	//ClassifySecondId int    `description:"二级分类ID"`
-	//Content          string `description:"报告内容"`
 }
 
 // CreateApproveAndRecord 新增审批和记录
@@ -445,37 +383,6 @@ func (m *ReportApprove) CreateApproveAndRecord(approveItem *ReportApprove, recor
 		err = fmt.Errorf("approve is nil")
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
-	//tx, e := o.Begin()
-	//if e != nil {
-	//	err = fmt.Errorf("orm begin err: %s", e.Error())
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//		return
-	//	}
-	//	_ = tx.Commit()
-	//}()
-	//
-	//lastId, e := tx.Insert(approveItem)
-	//if e != nil {
-	//	err = fmt.Errorf("insert approve err: %s", e.Error())
-	//	return
-	//}
-	//approveItem.ReportApproveId = int(lastId)
-	//
-	//if len(recordItems) > 0 {
-	//	for _, v := range recordItems {
-	//		v.ReportApproveId = approveItem.ReportApproveId
-	//	}
-	//	_, e = tx.InsertMulti(len(recordItems), recordItems)
-	//	if e != nil {
-	//		err = fmt.Errorf("insert records err: %s", e.Error())
-	//		return
-	//	}
-	//}
 
 	tx := global.DmSQL["data"].Begin()
 	defer func() {

models/report_approve/report_approve_flow.go

@@ -10,20 +10,6 @@ import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-// ReportApproveFlow 报告审批流表
-//type ReportApproveFlow struct {
-//	ReportApproveFlowId int       `orm:"column(report_approve_flow_id);pk" description:"审批流ID"`
-//	FlowName            string    `description:"审批流名称"`
-//	ReportType          int       `description:"报告类型：1-中文研报；2-英文研报；3-智能研报"`
-//	ClassifyFirstId     int       `description:"一级分类ID"`
-//	ClassifySecondId    int       `description:"二级分类ID"`
-//	ClassifyThirdId     int       `description:"三级分类ID"`
-//	CurrVersion         int       `description:"当前版本号"`
-//	CreateTime          time.Time `description:"创建时间"`
-//	ModifyTime          time.Time `description:"修改时间"`
-//	Enabled             int       `description:"1:有效，0:禁用"`
-//}
-
 type ReportApproveFlow struct {
 	ReportApproveFlowId int       `gorm:"primaryKey;column:report_approve_flow_id;type:int(10) unsigned;not null"`
 	FlowName            string    `gorm:"column:flow_name;type:varchar(128);not null;default:''"`             // 审批流名称
@@ -70,12 +56,6 @@ func (m *ReportApproveFlow) PrimaryId() string {
 }
 
 func (m *ReportApproveFlow) Create() (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.ReportApproveFlowId = int(id)
 	err = global.DmSQL["rddp"].Create(m).Error
 	return
 }
@@ -84,23 +64,17 @@ func (m *ReportApproveFlow) CreateMulti(items []*ReportApproveFlow) (err error)
 	if len(items) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DmSQL["rddp"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *ReportApproveFlow) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(m, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(m).Error
 	return
 }
 
 func (m *ReportApproveFlow) Del() (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	//_, err = o.Raw(sql, m.ReportApproveFlowId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, m.ReportApproveFlowId).Error
 	return
 }
@@ -109,43 +83,34 @@ func (m *ReportApproveFlow) MultiDel(menuIds []int) (err error) {
 	if len(menuIds) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	//_, err = o.Raw(sql, menuIds).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, menuIds).Error
 	return
 }
 
 func (m *ReportApproveFlow) GetItemById(id int) (item *ReportApproveFlow, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	//err = o.Raw(sql, id).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *ReportApproveFlow) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *ReportApproveFlow, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *ReportApproveFlow) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *ReportApproveFlow) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*ReportApproveFlow, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -155,13 +120,11 @@ func (m *ReportApproveFlow) GetItemsByCondition(condition string, pars []interfa
 		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.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *ReportApproveFlow) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*ReportApproveFlow, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -171,7 +134,6 @@ func (m *ReportApproveFlow) GetPageItemsByCondition(condition string, pars []int
 		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...).QueryRows(&items)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
@@ -243,58 +205,6 @@ func (m *ReportApproveFlow) CreateFlowAndNodes(flowItem *ReportApproveFlow, node
 		err = fmt.Errorf("flow is nil")
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
-	//tx, e := o.Begin()
-	//if e != nil {
-	//	err = fmt.Errorf("orm begin err: %s", e.Error())
-	//	return
-	//}
-	//prevNodes := make([]*ReportApproveNode, 0)
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//		return
-	//	}
-	//	_ = tx.Commit()
-	//	// 更新每个节点的下一个节点信息, 放在事务中会更新失败
-	//	if e = m.UpdateNextNodes(prevNodes); e != nil {
-	//		err = fmt.Errorf("UpdatePrevNodes err: %s", e.Error())
-	//		return
-	//	}
-	//}()
-	//
-	//lastId, e := tx.Insert(flowItem)
-	//if e != nil {
-	//	err = fmt.Errorf("insert flow err: %s", e.Error())
-	//	return
-	//}
-	//flowItem.ReportApproveFlowId = int(lastId)
-	//
-	//nodesLen := len(nodeItems)
-	//if nodesLen == 0 {
-	//	return
-	//}
-	//prevId := 0
-	//prevNode := new(ReportApproveNode)
-	//for k, v := range nodeItems {
-	//	v.ReportApproveFlowId = flowItem.ReportApproveFlowId
-	//	v.PrevNodeId = prevId
-	//	id, e := tx.Insert(v)
-	//	if e != nil {
-	//		err = fmt.Errorf("insert node err: %s", e.Error())
-	//		return
-	//	}
-	//	v.ReportApproveNodeId = int(id)
-	//	prevId = v.ReportApproveNodeId
-	//
-	//	// 下一个节点
-	//	if prevNode != nil && k > 0 && k < nodesLen {
-	//		prevNode.NextNodeId = int(id)
-	//		prevNodes = append(prevNodes, prevNode)
-	//	}
-	//	prevNode = v
-	//}
-
 	tx := global.DmSQL["rddp"].Begin()
 	prevNodes := make([]*ReportApproveNode, 0)
 	defer func() {
@@ -347,13 +257,6 @@ func (m *ReportApproveFlow) UpdateNextNodes(nodes []*ReportApproveNode) (err err
 		return
 	}
 	updateCols := []string{"NextNodeId"}
-	//for _, v := range nodes {
-	//	e := v.Update(updateCols)
-	//	if e != nil {
-	//		err = fmt.Errorf("prev node update err: %s", e.Error())
-	//		return
-	//	}
-	//}
 	for _, v := range nodes {
 		e := global.DmSQL["rddp"].Select(updateCols).Updates(v).Error
 		if e != nil {
@@ -370,59 +273,6 @@ func (m *ReportApproveFlow) UpdateFlowAndNodes(flowItem *ReportApproveFlow, node
 		err = fmt.Errorf("flow is nil")
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
-	//tx, e := o.Begin()
-	//if e != nil {
-	//	err = fmt.Errorf("orm begin err: %s", e.Error())
-	//	return
-	//}
-	//prevNodes := make([]*ReportApproveNode, 0)
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//		return
-	//	}
-	//	_ = tx.Commit()
-	//	// 更新每个节点的下一个节点信息, 放在事务中会更新失败
-	//	if e = m.UpdateNextNodes(prevNodes); e != nil {
-	//		err = fmt.Errorf("UpdatePrevNodes err: %s", e.Error())
-	//		return
-	//	}
-	//}()
-	//
-	//// 更新审批流
-	//updateCols := []string{"FlowName", "ReportType", "ClassifyFirstId", "ClassifySecondId", "ClassifyThirdId", "CurrVersion", "ModifyTime"}
-	//if e = flowItem.Update(updateCols); e != nil {
-	//	err = fmt.Errorf("update flow err: %s", e.Error())
-	//	return
-	//}
-	//
-	//// 新增节点(旧版的节点不删除, 根据版本号区分)
-	//nodesLen := len(nodeItems)
-	//if nodesLen == 0 {
-	//	return
-	//}
-	//prevId := 0
-	//prevNode := new(ReportApproveNode)
-	//for k, v := range nodeItems {
-	//	v.ReportApproveFlowId = flowItem.ReportApproveFlowId
-	//	v.PrevNodeId = prevId
-	//	id, e := tx.Insert(v)
-	//	if e != nil {
-	//		err = fmt.Errorf("insert node err: %s", e.Error())
-	//		return
-	//	}
-	//	v.ReportApproveNodeId = int(id)
-	//	prevId = v.ReportApproveNodeId
-	//
-	//	// 下一个节点
-	//	if prevNode != nil && k > 0 && k < nodesLen {
-	//		prevNode.NextNodeId = int(id)
-	//		prevNodes = append(prevNodes, prevNode)
-	//	}
-	//	prevNode = v
-	//}
-
 	tx := global.DmSQL["rddp"].Begin()
 	prevNodes := make([]*ReportApproveNode, 0)
 	defer func() {

models/report_approve/report_approve_message.go

@@ -10,20 +10,6 @@ import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-// ReportApproveMessage 报告审批消息表
-//type ReportApproveMessage struct {
-//	Id              int       `orm:"column(id);pk"`
-//	SendUserId      int       `description:"发送人ID"`
-//	ReceiveUserId   int       `description:"接收者ID"`
-//	Content         string    `description:"消息内容"`
-//	Remark          string    `description:"备注信息"`
-//	ReportApproveId int       `description:"审批ID"`
-//	ApproveState    int       `description:"审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"`
-//	IsRead          int       `description:"是否已读：0-未读；1-已读"`
-//	CreateTime      time.Time `description:"创建时间"`
-//	ModifyTime      time.Time `description:"修改时间"`
-//}
-
 type ReportApproveMessage struct {
 	Id              int       `gorm:"primaryKey;column:id;type:int(10) unsigned;not null"`
 	SendUserId      int       `gorm:"column:send_user_id;type:int(10) unsigned;not null;default:0"`                              // 发送人Id
@@ -70,12 +56,6 @@ func (m *ReportApproveMessage) PrimaryId() string {
 }
 
 func (m *ReportApproveMessage) Create() (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.Id = int(id)
 	err = global.DmSQL["rddp"].Create(m).Error
 	return
 }
@@ -84,23 +64,17 @@ func (m *ReportApproveMessage) CreateMulti(items []*ReportApproveMessage) (err e
 	if len(items) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DmSQL["rddp"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *ReportApproveMessage) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(m, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(m).Error
 	return
 }
 
 func (m *ReportApproveMessage) Del() (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	//_, err = o.Raw(sql, m.Id).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, m.Id).Error
 	return
 }
@@ -109,43 +83,34 @@ func (m *ReportApproveMessage) MultiDel(menuIds []int) (err error) {
 	if len(menuIds) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	//_, err = o.Raw(sql, menuIds).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, menuIds).Error
 	return
 }
 
 func (m *ReportApproveMessage) GetItemById(id int) (item *ReportApproveMessage, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	//err = o.Raw(sql, id).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *ReportApproveMessage) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *ReportApproveMessage, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *ReportApproveMessage) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *ReportApproveMessage) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*ReportApproveMessage, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -155,13 +120,11 @@ func (m *ReportApproveMessage) GetItemsByCondition(condition string, pars []inte
 		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.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *ReportApproveMessage) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*ReportApproveMessage, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -171,7 +134,6 @@ func (m *ReportApproveMessage) GetPageItemsByCondition(condition string, pars []
 		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...).QueryRows(&items)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error

models/report_approve/report_approve_node.go

@@ -9,19 +9,6 @@ import (
 	"time"
 )
 
-// ReportApproveNode 报告审批节点表
-//type ReportApproveNode struct {
-//	ReportApproveNodeId int       `orm:"column(report_approve_node_id);pk" description:"报告审批节点ID"`
-//	ReportApproveFlowId int       `description:"报告审批流ID"`
-//	PrevNodeId          int       `description:"上一个节点ID（0为开始节点）"`
-//	NextNodeId          int       `description:"下一个节点ID（0为结束节点）"`
-//	NodeType            int       `description:"节点类型：0-审批；1-抄送"`
-//	ApproveType         int       `description:"审批类型：1-依次审批；2-会签；3-或签"`
-//	Users               string    `description:"审批人信息-JSON，user_type：user-用户；role-角色，user_id：用户/角色ID"`
-//	CurrVersion         int       `description:"当前版本号"`
-//	CreateTime          time.Time `description:"创建时间"`
-//}
-
 type ReportApproveNode struct {
 	ReportApproveNodeId int       `gorm:"primaryKey;column:report_approve_node_id;type:int(10) unsigned;not null"`                  // 报告审批节点Id
 	ReportApproveFlowId int       `gorm:"index:idx_flow_id;column:report_approve_flow_id;type:int(10) unsigned;not null;default:0"` // 报告审批流Id
@@ -65,12 +52,6 @@ func (m *ReportApproveNode) PrimaryId() string {
 }
 
 func (m *ReportApproveNode) Create() (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.ReportApproveNodeId = int(id)
 	err = global.DmSQL["rddp"].Create(m).Error
 	return
 }
@@ -79,23 +60,17 @@ func (m *ReportApproveNode) CreateMulti(items []*ReportApproveNode) (err error)
 	if len(items) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DmSQL["rddp"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *ReportApproveNode) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(m, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(m).Error
 	return
 }
 
 func (m *ReportApproveNode) Del() (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	//_, err = o.Raw(sql, m.ReportApproveNodeId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, m.ReportApproveNodeId).Error
 	return
 }
@@ -104,43 +79,34 @@ func (m *ReportApproveNode) MultiDel(menuIds []int) (err error) {
 	if len(menuIds) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	//_, err = o.Raw(sql, menuIds).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, menuIds).Error
 	return
 }
 
 func (m *ReportApproveNode) GetItemById(id int) (item *ReportApproveNode, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	//err = o.Raw(sql, id).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *ReportApproveNode) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *ReportApproveNode, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *ReportApproveNode) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *ReportApproveNode) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*ReportApproveNode, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -150,13 +116,11 @@ func (m *ReportApproveNode) GetItemsByCondition(condition string, pars []interfa
 		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.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *ReportApproveNode) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*ReportApproveNode, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -166,7 +130,6 @@ func (m *ReportApproveNode) GetPageItemsByCondition(condition string, pars []int
 		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...).QueryRows(&items)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }

models/report_approve/report_approve_record.go

@@ -8,29 +8,6 @@ import (
 	"time"
 )
 
-// ReportApproveRecord 报告审批记录表
-//type ReportApproveRecord struct {
-//	ReportApproveRecordId int       `orm:"column(report_approve_record_id);pk" description:"审批记录ID"`
-//	ReportApproveId       int       `description:"审批ID"`
-//	State                 int       `description:"审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"`
-//	NodeId                int       `description:"节点ID"`
-//	NodeType              int       `description:"节点类型：0-审批；1-抄送"`
-//	PrevNodeId            int       `description:"上级节点ID"`
-//	NextNodeId            int       `description:"下级节点ID"`
-//	ApproveType           int       `description:"审批类型：1-依次审批；2-会签；3-或签"`
-//	ApproveUserId         int       `description:"审批人ID"`
-//	ApproveUserName       string    `description:"审批人姓名"`
-//	ApproveUserSort       int       `description:"依次审批：用户的审批顺序"`
-//	ApproveRemark         string    `description:"审批备注（驳回备注等）"`
-//	ApproveTime           time.Time `description:"审批时间"`
-//	CreateTime            time.Time `description:"创建时间"`
-//	ModifyTime            time.Time `description:"修改时间"`
-//	NodeState             int       `description:"当前节点审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"`
-//	NodeApproveUserId     int       `description:"当前节点审批人ID"`
-//	NodeApproveUserName   string    `description:"当前节点审批人姓名"`
-//	NodeApproveTime       time.Time `description:"当前节点审批时间"`
-//}
-
 type ReportApproveRecord struct {
 	ReportApproveRecordId int       `gorm:"primaryKey;column:report_approve_record_id;type:int(10) unsigned;not null"`              // 审批记录Id
 	ReportApproveId       int       `gorm:"index:idx_approve_id;column:report_approve_id;type:int(10) unsigned;not null;default:0"` // 审批Id
@@ -104,12 +81,6 @@ func (m *ReportApproveRecord) PrimaryId() string {
 }
 
 func (m *ReportApproveRecord) Create() (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.ReportApproveRecordId = int(id)
 	err = global.DmSQL["rddp"].Create(m).Error
 	return
 }
@@ -118,23 +89,17 @@ func (m *ReportApproveRecord) CreateMulti(items []*ReportApproveRecord) (err err
 	if len(items) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DmSQL["rddp"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *ReportApproveRecord) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(m, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(m).Error
 	return
 }
 
 func (m *ReportApproveRecord) Del() (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	//_, err = o.Raw(sql, m.ReportApproveRecordId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, m.ReportApproveRecordId).Error
 	return
 }
@@ -143,43 +108,34 @@ func (m *ReportApproveRecord) MultiDel(menuIds []int) (err error) {
 	if len(menuIds) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	//_, err = o.Raw(sql, menuIds).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, menuIds).Error
 	return
 }
 
 func (m *ReportApproveRecord) GetItemById(id int) (item *ReportApproveRecord, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	//err = o.Raw(sql, id).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *ReportApproveRecord) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *ReportApproveRecord, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *ReportApproveRecord) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *ReportApproveRecord) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*ReportApproveRecord, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -189,13 +145,11 @@ func (m *ReportApproveRecord) GetItemsByCondition(condition string, pars []inter
 		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.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *ReportApproveRecord) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*ReportApproveRecord, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -205,7 +159,6 @@ func (m *ReportApproveRecord) GetPageItemsByCondition(condition string, pars []i
 		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...).QueryRows(&items)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
@@ -229,30 +182,6 @@ type ReportApproveRecordItem struct {
 	ModifyTime            string `description:"修改时间"`
 }
 
-// FormatReportApproveRecord2Item 格式化报告审批记录
-func FormatReportApproveRecord2Item(origin *ReportApproveRecord) (item *ReportApproveRecordItem) {
-	item = new(ReportApproveRecordItem)
-	if origin == nil {
-		return
-	}
-	item.ReportApproveRecordId = origin.ReportApproveRecordId
-	item.ReportApproveId = origin.ReportApproveId
-	item.State = origin.State
-	item.NodeId = origin.NodeId
-	item.NodeType = origin.NodeType
-	item.PrevNodeId = origin.PrevNodeId
-	item.NextNodeId = origin.NextNodeId
-	item.ApproveType = origin.ApproveType
-	item.ApproveUserId = origin.ApproveUserId
-	item.ApproveUserName = origin.ApproveUserName
-	item.ApproveUserSort = origin.ApproveUserSort
-	item.ApproveRemark = origin.ApproveRemark
-	item.ApproveTime = utils.TimeTransferString(utils.FormatDateTime, origin.ApproveTime)
-	item.CreateTime = utils.TimeTransferString(utils.FormatDateTime, origin.CreateTime)
-	item.ModifyTime = utils.TimeTransferString(utils.FormatDateTime, origin.ModifyTime)
-	return
-}
-
 // UpdateNodeState
 // @Description: 将该审批的同一个节点的记录标记为已审批
 // @author: Roc
@@ -273,9 +202,7 @@ func (m *ReportApproveRecord) UpdateNodeState(reportApproveId, nodeId, nodeState
 	whereParas := []interface{}{reportApproveId, nodeId}
 	pars = append(pars, whereParas...)
 
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`UPDATE %s SET node_state=?,node_approve_user_id=?,node_approve_user_name=?,node_approve_time=? WHERE report_approve_id = ? AND node_id = ?`, m.TableName())
-	//_, err = o.Raw(sql, pars).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, pars...).Error
 	return
 }

models/roadshow/calendar.go

@@ -13,26 +13,3 @@ type ResearcherGroup struct {
 	GroupName      string `description:"分组名称"`
 	ResearcherList []*Researcher
 }
-
-//func GetResearcherGroup() (list []*ResearcherGroup, err error) {
-//	o := orm.NewOrm()
-//	sql := ` SELECT group_id,group_name FROM admin AS a
-//			WHERE a.role_type_code IN('researcher','ficc_researcher','ficc_admin')
-//			AND a.enabled=1
-//			AND a.group_id>0
-//			AND a.group_name<>'无'
-//			GROUP BY a.group_id
-//            ORDER BY a.group_id ASC `
-//	_, err = o.Raw(sql).QueryRows(&list)
-//	return
-//}
-
-//func GetResearcher() (list []*Researcher, err error) {
-//	o := orm.NewOrm()
-//	//sql := ` SELECT * FROM admin AS a
-//	//		WHERE a.role_type_code IN('researcher','rai_researcher','ficc_researcher','ficc_admin')
-//	//		AND a.enabled=1 AND a.real_name<>'于菲' `
-//	sql := ` SELECT * FROM admin AS a WHERE a.enabled=1 `
-//	_, err = o.Raw(sql).QueryRows(&list)
-//	return
-//}

models/sandbox/sandbox.go

@@ -8,42 +8,6 @@ import (
 	"time"
 )
 
-// Sandbox 沙盘推演主表
-//type Sandbox struct {
-//	SandboxId           int       `orm:"column(sandbox_id);pk" description:"沙盘id"`
-//	Name                string    `description:"沙盘名称"`
-//	ChartPermissionId   int       `description:"品种id"`
-//	ChartPermissionName string    `description:"品种名称"`
-//	CurrVersion         int       `description:"当前版本"`
-//	Code                string    `description:"沙盘code"`
-//	Content             string    `description:"沙盘数据"`
-//	PicUrl              string    `description:"沙盘图片地址"`
-//	OpUserId            int       `description:"最近一次编辑操作的用户id"`
-//	OpUserName          string    `description:"最近一次编辑的用户名称（冗余字段，避免查表）"`
-//	IsDelete            int8      `description:"是否删除，0：未删除，1：已删除"`
-//	ModifyTime          time.Time `description:"修改时间"`
-//	CreateTime          time.Time `description:"创建时间"`
-//	SandboxClassifyId   int       `description:"分类id"`
-//	Sort                int       `description:"排序"`
-//}
-
-//type Sandbox struct {
-//	SandboxId         int       `orm:"column(sandbox_id);pk" description:"沙盘id"`
-//	Name              string    `description:"沙盘名称"`
-//	Code              string    `description:"沙盘code"`
-//	Content           string    `description:"沙盘数据"`
-//	MindmapData       string    `description:"思维导图数据"`
-//	PicUrl            string    `description:"沙盘图片地址"`
-//	SysUserId         int       `description:"作者id"`
-//	SysUserName       string    `description:"作者名称"`
-//	IsDelete          int8      `description:"是否删除，0：未删除，1：已删除"`
-//	ModifyTime        time.Time `description:"修改时间"`
-//	CreateTime        time.Time `description:"创建时间"`
-//	SandboxClassifyId int       `description:"分类id"`
-//	Sort              int       `description:"排序"`
-//	Style             int       `description:"风格"`
-//}
-
 type Sandbox struct {
 	SandboxId           int       `gorm:"primaryKey;column:sandbox_id;type:int(9) unsigned;not null"`         // 沙盘id
 	Name                string    `gorm:"index:idx_name;column:name;type:varchar(64);not null;default:''"`    // 沙盘名称
@@ -65,134 +29,17 @@ type Sandbox struct {
 
 // Update 沙盘字段变更
 func (sandbox *Sandbox) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(sandbox, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(sandbox).Error
 	return
 }
 
 // GetSandboxById 根据沙盘id获取沙盘详情
 func GetSandboxById(sandboxId int) (sandboxInfo *Sandbox, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `select * from sandbox where sandbox_id = ? and is_delete = 0`
-	//err = o.Raw(sql, sandboxId).QueryRow(&sandboxInfo)
 	err = global.DmSQL["data"].Raw(sql, sandboxId).First(&sandboxInfo).Error
 	return
 }
 
-// AddNewSandbox 添加一个新的沙盘
-//func AddNewSandbox(sandboxInfo *Sandbox, sandboxVersion *SandboxVersion, sandboxDraft *SandboxDraft) (err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	to, err := o.Begin()
-//	if err != nil {
-//		return
-//	}
-//	defer func() {
-//		if err != nil {
-//			_ = to.Rollback()
-//		} else {
-//			_ = to.Commit()
-//		}
-//	}()
-//
-//	id, err := to.Insert(sandboxInfo)
-//	if err != nil {
-//		return
-//	}
-//	sandboxInfo.SandboxId = int(id)
-//
-//	// 新增版本
-//	sandboxVersion.SandboxId = sandboxInfo.SandboxId
-//	id, err = to.Insert(sandboxVersion)
-//	if err != nil {
-//		return
-//	}
-//	sandboxVersion.SandboxVersionId = int(id)
-//
-//	// 新增草稿
-//	sandboxDraft.SandboxId = sandboxInfo.SandboxId
-//	id, err = to.Insert(sandboxDraft)
-//	if err != nil {
-//		return
-//	}
-//	sandboxDraft.SandboxDraftId = int(id)
-//	return
-//}
-
-// UpdateSandbox 更新沙盘
-//func UpdateSandbox(sandboxInfo *Sandbox, updateSandboxColumn []string, sandboxVersion *SandboxVersion, sandboxDraft *SandboxDraft) (err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	to, err := o.Begin()
-//	if err != nil {
-//		return
-//	}
-//	defer func() {
-//		if err != nil {
-//			_ = to.Rollback()
-//		} else {
-//			_ = to.Commit()
-//		}
-//	}()
-//
-//	_, err = to.Update(sandboxInfo, updateSandboxColumn...)
-//	if err != nil {
-//		return
-//	}
-//
-//	// 新增版本
-//	sandboxVersion.SandboxId = sandboxInfo.SandboxId
-//	id, err := to.Insert(sandboxVersion)
-//	if err != nil {
-//		return
-//	}
-//	sandboxVersion.SandboxVersionId = int(id)
-//
-//	// 新增草稿
-//	sandboxDraft.SandboxId = sandboxInfo.SandboxId
-//	id, err = to.Insert(sandboxDraft)
-//	if err != nil {
-//		return
-//	}
-//	sandboxDraft.SandboxDraftId = int(id)
-//	return
-//}
-
-// UpdateSandboxName 更新沙盘（仅仅更新名称）
-//func UpdateSandboxName(sandboxInfo *Sandbox, sandboxVersion *SandboxVersion, sandboxDraft *SandboxDraft, updateSandboxColumn, updateSandboxVersionColumn []string) (err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	to, err := o.Begin()
-//	if err != nil {
-//		return
-//	}
-//	defer func() {
-//		if err != nil {
-//			_ = to.Rollback()
-//		} else {
-//			_ = to.Commit()
-//		}
-//	}()
-//
-//	_, err = to.Update(sandboxInfo, updateSandboxColumn...)
-//	if err != nil {
-//		return
-//	}
-//
-//	// 更新版本
-//	_, err = to.Update(sandboxVersion, updateSandboxVersionColumn...)
-//	if err != nil {
-//		return
-//	}
-//
-//	// 新增草稿
-//	sandboxDraft.SandboxId = sandboxInfo.SandboxId
-//	id, err := to.Insert(sandboxDraft)
-//	if err != nil {
-//		return
-//	}
-//	sandboxDraft.SandboxDraftId = int(id)
-//	return
-//}
-
 // SandboxListItem 沙盘推演列表数据
 type SandboxListItem struct {
 	SandboxId           int    `description:"沙盘id"`
@@ -216,19 +63,16 @@ type SandboxListItem struct {
 
 // GetList 获取沙盘列表页
 func GetList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*Sandbox, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := "select a.sandbox_id,a.name,a.code,a.pic_url,a.sys_user_id,a.sys_user_name,a.modify_time,a.create_time from sandbox as a where 1=1 AND a.is_delete = 0 "
 	sql += condition
 	sql += ` order by a.modify_time desc,a.sandbox_id desc`
 
 	totalSql := `select count(1) total from (` + sql + `) z `
 	err = global.DmSQL["data"].Raw(totalSql, pars...).Scan(&total).Error
-	//err = o.Raw(totalSql, pars).QueryRow(&total)
 	if err != nil {
 		return
 	}
 	sql += ` LIMIT ?,? `
-	//_, err = o.Raw(sql, pars...).QueryRows(&list)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
@@ -241,74 +85,26 @@ type SandboxSaveResp struct {
 	VersionCode string `description:"版本号"`
 }
 
-//func GetSandboxAll() (list []*SandboxClassifyItems, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := `SELECT sandbox_id,sandbox_classify_id,name AS sandbox_classify_name, sort
-//		FROM sandbox `
-//	_, err = o.Raw(sql).QueryRows(&list)
-//	return
-//}
-
-// CheckOpSandboxPermission 判断沙盘操作权限
-//func CheckOpSandboxPermission(sysUser *system.Admin, createUserId int) (ok bool) {
-//	if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_ADMIN || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN {
-//		ok = true
-//	}
-//	// 如果图表创建人与当前操作人相同的话，那么就是允许操作
-//	if ok == false && createUserId == sysUser.AdminId {
-//		ok = true
-//	}
-//	// 如果图表权限id 是 1 ，那么允许编辑
-//	if ok == false && sysUser.ChartPermission == 1 {
-//		ok = true
-//	}
-//	return
-//}
-
 // GetSandboxInfoByAdminId 获取所有我创建的沙盘，用于分类展示
 func GetSandboxInfoByAdminId(adminId int) (items []*SandboxClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT sandbox_id,sandbox_classify_id,name AS sandbox_classify_name,code,
              sys_user_id,sys_user_name
             FROM sandbox where sys_user_id = ? ORDER BY sort asc,create_time ASC `
-	//_, err = o.Raw(sql, adminId).QueryRows(&items)
 	err = global.DmSQL["data"].Raw(sql, adminId).Find(&items).Error
 	return
 }
 
-func GetSandboxClassify(sandboxClassifyId int) (sandbox_classify_id string, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	sql := `SELECT GROUP_CONCAT(t.sandbox_classify_id) AS sandbox_classify_id FROM (
-			SELECT a.sandbox_classify_id FROM sandbox_classify AS a 
-			WHERE a.sandbox_classify_id=?
-			UNION ALL
-			SELECT a.sandbox_classify_id FROM sandbox_classify AS a 
-			WHERE a.parent_id=? UNION ALL
-	SELECT
-		sandbox_classify_id 
-	FROM
-		sandbox_classify 
-WHERE
-	parent_id IN ( SELECT sandbox_classify_id FROM sandbox_classify WHERE parent_id = ? )
-			)AS t`
-	//err = o.Raw(sql, sandboxClassifyId, sandboxClassifyId, sandboxClassifyId).QueryRow(&sandbox_classify_id)
-	err = global.DmSQL["data"].Raw(sql, sandboxClassifyId, sandboxClassifyId, sandboxClassifyId).Scan(&sandbox_classify_id).Error
-	return
-}
-
 type SandboxListItems struct {
 	Sandbox
 	ParentIds string `gorm:"-"`
 }
 
 func GetSandboxListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*SandboxListItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM sandbox WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += " ORDER BY create_time DESC LIMIT ?,? "
-	//_, err = o.Raw(sql, pars...).QueryRows(&item)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
@@ -316,12 +112,10 @@ func GetSandboxListByCondition(condition string, pars []interface{}, startSize,
 }
 
 func GetSandboxListCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM sandbox WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
@@ -332,58 +126,10 @@ type SandboxListResp struct {
 }
 
 func AddSandbox(item *Sandbox) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }
 
-//func GetSandboxItemsByClassifyId(sandboxClassifyId int) (list []*SandboxClassifyItems, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := `SELECT sandbox_id,sandbox_classify_id,name AS sandbox_classify_name, sort
-//		FROM sandbox  WHERE sandbox_classify_id = ? AND is_delete = 0  ORDER BY sort `
-//	_, err = o.Raw(sql, sandboxClassifyId).QueryRows(&list)
-//	return
-//}
-
-func GetSandboxAllParentByClassifyId(sandboxClassifyId int) (ids string, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	sql := `SELECT
-	GROUP_CONCAT(DISTINCT m.sandbox_classify_id  ORDER BY m.level) AS ids 
-FROM
-	(
-	SELECT
-		@id AS _id,(
-		SELECT
-			@id := parent_id 
-		FROM
-			sandbox_classify 
-		WHERE
-			sandbox_classify_id = _id 
-		) 
-	FROM
-		(
-		SELECT
-			@id :=(
-			SELECT
-				parent_id 
-			FROM
-				sandbox_classify 
-			WHERE
-				sandbox_classify_id = ? 
-			)) vm,
-		sandbox_classify m 
-	WHERE
-		@id IS NOT NULL 
-	) vm
-	INNER JOIN sandbox_classify m 
-WHERE
-	sandbox_classify_id = vm._id `
-	//err = o.Raw(sql, sandboxClassifyId).QueryRow(&ids)
-	err = global.DmSQL["data"].Raw(sql, sandboxClassifyId).Scan(&ids).Error
-	return
-}
-
 type MoveSandboxReq struct {
 	SandboxId         int `description:"沙盘ID"`
 	PrevSandboxId     int `description:"上一个沙盘ID"`
@@ -392,61 +138,43 @@ type MoveSandboxReq struct {
 }
 
 func GetSandboxClassifyCountById(classifyId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT count(1) AS count FROM sandbox_classify WHERE sandbox_classify_id=? `
-	//err = o.Raw(sql, classifyId).QueryRow(&count)
 	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&count).Error
 	return
 }
 
-// GetSandboxByClassifyIdAndName 根据分类id和沙盘名获取图表信息
-//func GetSandboxByClassifyIdAndName(classifyId int, name string) (item *Sandbox, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT * FROM sandbox WHERE sandbox_classify_id = ? and name=? `
-//	err = o.Raw(sql, classifyId, name).QueryRow(&item)
-//	return
-//}
-
 // GetSandboxNameByIds 根据沙盘名称
 func GetSandboxNameByIds(ids []int) (items []*Sandbox, err error) {
 	if len(ids) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT sandbox_id, name FROM sandbox WHERE sandbox_id in (` + utils.GetOrmInReplace(len(ids)) + `) `
-	//_, err = o.Raw(sql, ids).QueryRows(&items)
 	err = global.DmSQL["data"].Raw(sql, ids).Find(&items).Error
 	return
 }
 
 func MoveSandbox(sandboxId, classifyId int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE  sandbox
 			SET
 			  sandbox_classify_id = ?
 			WHERE sandbox_id = ?`
-	//_, err = o.Raw(sql, classifyId, sandboxId).Exec()
 	err = global.DmSQL["data"].Exec(sql, classifyId, sandboxId).Error
 	return
 }
 
 // UpdateSandboxSortByClassifyId 根据沙盘id更新排序
 func UpdateSandboxSortByClassifyId(classifyId, nowSort, prevSandboxId int, updateSort string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` update sandbox set sort = ` + updateSort + ` WHERE sandbox_classify_id=?  AND `
 	if prevSandboxId > 0 {
 		sql += ` (sort > ? or (sandbox_id > ` + fmt.Sprint(prevSandboxId) + ` and sort = ` + fmt.Sprint(nowSort) + `))`
 	}
-	//_, err = o.Raw(sql, classifyId, nowSort).Exec()
 	err = global.DmSQL["data"].Exec(sql, classifyId, nowSort).Error
 	return
 }
 
 // GetFirstSandboxByClassifyId 获取当前分类下，且排序数相同 的排序第一条的数据
 func GetFirstSandboxByClassifyId(classifyId int) (item *Sandbox, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM sandbox WHERE sandbox_classify_id=? order by sort asc,sandbox_id asc limit 1`
-	//err = o.Raw(sql, classifyId).QueryRow(&item)
 	err = global.DmSQL["data"].Raw(sql, classifyId).First(&item).Error
 	return
 }
@@ -481,27 +209,6 @@ type DetailParams struct {
 
 // UpdateSandboxContent 更新沙盘内容
 func UpdateSandboxContent(list []Sandbox) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-	//
-	////循环更新沙盘内容
-	//for _, sandbox := range list {
-	//	_, err = to.Update(&sandbox, "Content", "ModifyTime")
-	//	if err != nil {
-	//		return
-	//	}
-	//}
-
 	tx := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {

models/sandbox/sandbox_classify.go

@@ -6,21 +6,6 @@ import (
 	"time"
 )
 
-//type SandboxClassify struct {
-//	SandboxClassifyId   int       `orm:"column(sandbox_classify_id);pk"`
-//	SandboxClassifyName string    `description:"分类名称"`
-//	ParentId            int       `description:"父级id"`
-//	HasData             int       `description:"是否含有指标数据"`
-//	CreateTime          time.Time `description:"创建时间"`
-//	ModifyTime          time.Time `description:"修改时间"`
-//	SysUserId           int       `description:"创建人id"`
-//	SysUserRealName     string    `description:"创建人姓名"`
-//	Level               int       `description:"层级"`
-//	ChartPermissionId   int       `description:"品种id"`
-//	ChartPermissionName string    `description:"品种名称"`
-//	Sort                int       `description:"排序字段，越小越靠前，默认值：10"`
-//}
-
 type SandboxClassify struct {
 	SandboxClassifyId   int       `gorm:"primaryKey;column:sandbox_classify_id;type:int(11);not null"`
 	SandboxClassifyName string    `gorm:"column:sandbox_classify_name;type:varchar(255);not null;default:''"` // 分类名称
@@ -37,47 +22,24 @@ type SandboxClassify struct {
 }
 
 func AddSandboxClassify(item *SandboxClassify) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }
 
 // GetSandboxClassifyByParentId
 func GetSandboxClassifyByParentId(parentId int) (items []*SandboxClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM sandbox_classify WHERE parent_id=? order by sort asc,sandbox_classify_id asc`
-	//_, err = o.Raw(sql, parentId).QueryRows(&items)
 	err = global.DmSQL["data"].Raw(sql, parentId).Find(&items).Error
 	return
 }
 
 // GetSandboxClassifyAll
 func GetSandboxClassifyAll() (items []*SandboxClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM sandbox_classify WHERE parent_id<>0 order by sort asc,sandbox_classify_id asc`
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
 	return
 }
 
-//type SandboxClassifyItems struct {
-//	SandboxClassifyId   int       `orm:"column(sandbox_classify_id);pk"`
-//	SandboxClassifyName string    `description:"分类名称"`
-//	ParentId            int       `description:"父级id"`
-//	HasData             int       `description:"是否含有指标数据"`
-//	CreateTime          time.Time `description:"创建时间"`
-//	ModifyTime          time.Time `description:"修改时间"`
-//	SysUserId           int       `description:"创建人id"`
-//	SysUserName         string    `description:"创建人姓名"`
-//	Level               int       `description:"层级"`
-//	Sort                int       `description:"排序字段，越小越靠前，默认值：10"`
-//	SandboxId           int       `description:"沙盘id"`
-//	ChartPermissionId   int       `description:"品种id"`
-//	ChartPermissionName string    `description:"品种名称"`
-//	Children            []*SandboxClassifyItems
-//}
-
 type SandboxClassifyItems struct {
 	SandboxClassifyId   int                     `gorm:"primaryKey;column:sandbox_classify_id;type:int(11);not null"`
 	SandboxClassifyName string                  `gorm:"column:sandbox_classify_name;type:varchar(255);not null;default:''"` // 分类名称
@@ -108,18 +70,14 @@ type AddSandboxClassifyReq struct {
 }
 
 func GetSandboxClassifyCount(sandboxClassifyName string, parentId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT COUNT(1) AS count FROM sandbox_classify WHERE parent_id=? AND sandbox_classify_name=? `
-	//err = o.Raw(sql, parentId, sandboxClassifyName).QueryRow(&count)
 	err = global.DmSQL["data"].Raw(sql, parentId, sandboxClassifyName).Scan(&count).Error
 	return
 }
 
 // GetSandboxClassifyMaxSort 获取沙盘分类下最大的排序数
 func GetSandboxClassifyMaxSort(parentId int) (sort int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM sandbox_classify WHERE parent_id=? `
-	//err = o.Raw(sql, parentId).QueryRow(&sort)
 	err = global.DmSQL["data"].Raw(sql, parentId).Scan(&sort).Error
 	return
 }
@@ -132,17 +90,13 @@ type EditSandboxClassifyReq struct {
 }
 
 func GetSandboxClassifyById(classifyId int) (item *SandboxClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM sandbox_classify WHERE sandbox_classify_id=? `
-	//err = o.Raw(sql, classifyId).QueryRow(&item)
 	err = global.DmSQL["data"].Raw(sql, classifyId).First(&item).Error
 	return
 }
 
 func EditSandboxClassify(classifyId, ChartPermissionId int, sandboxClassifyName, ChartPermissionName string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE sandbox_classify SET sandbox_classify_name=?,chart_permission_id = ?, chart_permission_name = ?, modify_time=NOW() WHERE sandbox_classify_id=? `
-	//_, err = o.Raw(sql, sandboxClassifyName, ChartPermissionId, ChartPermissionName, classifyId).Exec()
 	err = global.DmSQL["data"].Exec(sql, sandboxClassifyName, ChartPermissionId, ChartPermissionName, classifyId).Error
 	return
 }
@@ -152,7 +106,6 @@ type SandboxClassifyDeleteCheckReq struct {
 }
 
 func GetSandboxInfoCountByClassifyId(classifyId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM sandbox AS a
 				WHERE a.sandbox_classify_id IN(
 				SELECT t.sandbox_classify_id FROM 
@@ -165,7 +118,6 @@ func GetSandboxInfoCountByClassifyId(classifyId int) (count int, err error) {
 				UNION SELECT * FROM sandbox_classify WHERE sandbox_classify_id = @pid 
 				)AS t
 				) AND a.is_delete = 0 `
-	//err = o.Raw(sql, classifyId).QueryRow(&count)
 	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&count).Error
 	return
 }
@@ -181,7 +133,6 @@ type DeleteSandboxClassifyReq struct {
 }
 
 func DeleteSandboxClassify(classifyId int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` DELETE FROM sandbox_classify
 				WHERE sandbox_classify_id IN(
 				SELECT t.sandbox_classify_id FROM
@@ -194,7 +145,6 @@ func DeleteSandboxClassify(classifyId int) (err error) {
 				UNION SELECT * FROM sandbox_classify WHERE sandbox_classify_id = @pid
 				)AS t
 				) `
-	//_, err = o.Raw(sql, classifyId).Exec()
 	err = global.DmSQL["data"].Exec(sql, classifyId).Error
 	return
 }
@@ -212,36 +162,29 @@ type MoveSandboxClassifyReq struct {
 
 // UpdateSandboxClassifySortByParentId 根据沙盘父类id更新排序
 func UpdateSandboxClassifySortByParentId(parentId, classifyId, nowSort int, updateSort string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` update sandbox_classify set sort = ` + updateSort + ` WHERE parent_id=? and sort > ? `
 	if classifyId > 0 {
 		sql += ` or ( sandbox_classify_id > ` + fmt.Sprint(classifyId) + ` and sort= ` + fmt.Sprint(nowSort) + `)`
 	}
-	//_, err = o.Raw(sql, parentId, nowSort).Exec()
 	err = global.DmSQL["data"].Exec(sql, parentId, nowSort).Error
 	return
 }
 
 // GetFirstSandboxClassifyByParentId 获取当前父级沙盘分类下的排序第一条的数据
 func GetFirstSandboxClassifyByParentId(parentId int) (item *SandboxClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM sandbox_classify WHERE parent_id=? order by sort asc,sandbox_classify_id asc limit 1`
-	//err = o.Raw(sql, parentId).QueryRow(&item)
 	err = global.DmSQL["data"].Raw(sql, parentId).First(&item).Error
 	return
 }
 
 // Update 更新沙盘分类基础信息
 func (sandboxClassify *SandboxClassify) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(sandboxClassify, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(sandboxClassify).Error
 	return
 }
 
 // GetSandboxClassifyAndInfoByParentId
 func GetSandboxClassifyAndInfoByParentId(parentId int) (items []*SandboxClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT
 	0 AS sandbox_id,
 	sandbox_classify_id,
@@ -281,7 +224,6 @@ WHERE
 ORDER BY
 	sort ASC,
 	sandbox_classify_id ASC`
-	//_, err = o.Raw(sql, parentId, parentId).QueryRows(&items)
 	err = global.DmSQL["data"].Raw(sql, parentId, parentId).Find(&items).Error
 	return
 }
@@ -307,18 +249,6 @@ type SandboxLinkCheckResp struct {
 
 // GetSandboxClassifySubcategories 获取所有子级分类id
 func GetSandboxClassifySubcategories(classifyId int) (Ids string, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//	sql := `SELECT GROUP_CONCAT(sandbox_classify_id) AS ids
-	//FROM (
-	//SELECT @pv := ? AS sandbox_classify_id
-	//UNION ALL
-	//SELECT sc.sandbox_classify_id
-	//FROM sandbox_classify sc
-	//JOIN (SELECT @pv := ?) initial
-	//WHERE sc.parent_id = @pv
-	//) subcategories; `
-	//err = o.Raw(sql, classifyId, classifyId).QueryRow(&Ids)
-
 	sql := `WITH RECURSIVE Subcategories (sandbox_classify_id) AS (  
     SELECT ? AS sandbox_classify_id  
     FROM DUAL  
@@ -336,18 +266,14 @@ FROM Subcategories;`
 
 // UpdateSandboxClassifyChartPermissionById 根据沙盘id更新品种
 func UpdateSandboxClassifyChartPermissionById(ChartPermissionId int, ChartPermissionName, Ids string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE sandbox_classify SET chart_permission_id = ?, chart_permission_name = ? WHERE sandbox_classify_id IN ( ` + Ids + ` ) `
-	//_, err = o.Raw(sql, ChartPermissionId, ChartPermissionName).Exec()
 	err = global.DmSQL["data"].Exec(sql, ChartPermissionId, ChartPermissionName).Error
 	return
 }
 
 // GetAllSandboxClassify
 func GetAllSandboxClassify() (items []*SandboxClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM sandbox_classify `
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
 	return
 }

models/sandbox/sandbox_draft.go

@@ -5,20 +5,6 @@ import (
 	"time"
 )
 
-// SandboxDraft 沙盘推演草稿表
-//type SandboxDraft struct {
-//	SandboxDraftId      int       `orm:"column(sandbox_draft_id);pk" description:"沙盘草稿记录id"`
-//	SandboxId           int       `description:"沙盘id"`
-//	Name                string    `description:"沙盘名称"`
-//	ChartPermissionId   int       `description:"品种id"`
-//	ChartPermissionName string    `description:"品种名称"`
-//	CurrVersion         int       `description:"当前版本"`
-//	Content             string    `description:"沙盘数据"`
-//	OpUserId            int       `description:"最近一次编辑操作的用户id"`
-//	OpUserName          string    `description:"最近一次编辑的用户名称（冗余字段，避免查表）"`
-//	CreateTime          time.Time `description:"创建时间"`
-//}
-
 type SandboxDraft struct {
 	SandboxDraftId      int       `gorm:"primaryKey;column:sandbox_draft_id;type:int(9) unsigned;not null"`                     // 沙盘草稿记录id
 	SandboxId           int       `gorm:"index:idx_sandbox_user_id;column:sandbox_id;type:int(9) unsigned;not null;default:0"`  // 沙盘id
@@ -34,22 +20,13 @@ type SandboxDraft struct {
 
 // AddSandboxDraft 添加一个新的沙盘草稿
 func AddSandboxDraft(sandboxDraft *SandboxDraft) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//// 新增草稿
-	//id, err := o.Insert(sandboxDraft)
-	//if err != nil {
-	//	return
-	//}
-	//sandboxDraft.SandboxDraftId = int(id)
 	err = global.DmSQL["data"].Create(sandboxDraft).Error
 	return
 }
 
 // GetLastSandboxDraftById 根据沙盘id获取最后一条沙盘草稿详情
 func GetLastSandboxDraftById(sandboxId int) (sandboxDraft *SandboxDraft, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `select * from sandbox_draft where sandbox_id = ? order by sandbox_draft_id desc `
-	//err = o.Raw(sql, sandboxId).QueryRow(&sandboxDraft)
 	err = global.DmSQL["data"].Raw(sql, sandboxId).First(&sandboxDraft).Error
 	return
 }

models/sandbox/sandbox_version.go

@@ -5,24 +5,6 @@ import (
 	"time"
 )
 
-// SandboxVersion 沙盘推演版本表
-//type SandboxVersion struct {
-//	SandboxVersionId    int       `orm:"column(sandbox_version_id);pk" description:"沙盘版本记录id"`
-//	SandboxId           int       `description:"沙盘id"`
-//	Name                string    `description:"沙盘名称"`
-//	ChartPermissionId   int       `description:"品种id"`
-//	ChartPermissionName string    `description:"品种名称"`
-//	CurrVersion         int       `description:"当前版本"`
-//	Content             string    `description:"沙盘数据"`
-//	SvgData             string    `description:"沙盘svg图片数据"`
-//	PicUrl              string    `description:"沙盘图片地址"`
-//	OpUserId            int       `description:"最近一次编辑操作的用户id"`
-//	OpUserName          string    `description:"最近一次编辑的用户名称（冗余字段，避免查表）"`
-//	VersionCode         string    `description:"沙盘版本code，对外开放使用"`
-//	IsDelete            int8      `description:"是否删除，0：未删除，1：已删除"`
-//	CreateTime          time.Time `description:"创建时间"`
-//}
-
 type SandboxVersion struct {
 	SandboxVersionId    int       `gorm:"primaryKey;column:sandbox_version_id;type:int(9) unsigned;not null"`                                // 沙盘版本记录id
 	SandboxId           int       `gorm:"index:idx_sandbox_version_id;column:sandbox_id;type:int(9) unsigned;not null;default:0"`            // 沙盘id
@@ -42,20 +24,10 @@ type SandboxVersion struct {
 
 // Update 沙盘版本字段变更
 func (item *SandboxVersion) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(item, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(item).Error
 	return
 }
 
-// GetSandboxVersionBySandbox2VersionId 根据沙盘id和版本id获取沙盘版本详情
-//func GetSandboxVersionBySandbox2VersionId(sandboxId, sandboxVersion int) (sandboxVersionInfo *SandboxVersion, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := `select b.* from sandbox a join sandbox_version b on a.sandbox_id=b.sandbox_id where a.sandbox_id = ? and a.is_delete = 0 and b.is_delete = 0 and b.curr_version = ?`
-//	err = o.Raw(sql, sandboxId, sandboxVersion).QueryRow(&sandboxVersionInfo)
-//	return
-//}
-
 // GetSandboxVersionBySandboxVersionCode 根据沙盘版本code获取沙盘版本详情
 func GetSandboxVersionBySandboxVersionCode(sandboxVersionCode string) (sandboxVersionInfo *SandboxVersion, err error) {
 	//o := orm.NewOrmUsingDB("data")
@@ -65,33 +37,6 @@ func GetSandboxVersionBySandboxVersionCode(sandboxVersionCode string) (sandboxVe
 	return
 }
 
-// GetLastSandboxVersionBySandbox2VersionId 根据沙盘id和版本id获取距离最新的沙盘版本详情
-//func GetLastSandboxVersionBySandbox2VersionId(sandboxId, sandboxVersion int) (sandboxVersionInfo *SandboxVersion, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := `select b.* from sandbox a join sandbox_version b on a.sandbox_id=b.sandbox_id where a.sandbox_id = ? and a.is_delete = 0 and b.is_delete = 0  and b.curr_version < ? order by b.curr_version desc`
-//	err = o.Raw(sql, sandboxId, sandboxVersion).QueryRow(&sandboxVersionInfo)
-//	return
-//}
-
-// SandboxVersionListItem 沙盘推演版本列表数据
-//type SandboxVersionListItem struct {
-//	SandboxVersionId    int    `orm:"column(sandbox_version_id);pk" description:"沙盘版本记录id"`
-//	SandboxId           int    `description:"沙盘id"`
-//	Name                string `description:"沙盘名称"`
-//	ChartPermissionId   int    `description:"品种id"`
-//	ChartPermissionName string `description:"品种名称"`
-//	CurrVersion         int    `description:"当前版本"`
-//	//Content             string    `description:"沙盘数据"`
-//	PicUrl      string    `description:"沙盘图片地址"`
-//	OpUserId    int       `description:"最近一次编辑操作的用户id"`
-//	OpUserName  string    `description:"最近一次编辑的用户名称（冗余字段，避免查表）"`
-//	VersionCode string    `description:"沙盘版本code，对外开放使用"`
-//	IsDelete    int8      `description:"是否删除，0：未删除，1：已删除" json:"-"`
-//	CanEdit     bool      `description:"是否可编辑"`
-//	ModifyTime  time.Time `description:"最后一次修改时间"`
-//	CreateTime  time.Time `description:"创建时间"`
-//}
-
 // SandboxVersionListItem 沙盘推演版本列表数据
 type SandboxVersionListItem struct {
 	SandboxVersionId    int    `gorm:"primaryKey;column:sandbox_version_id;type:int(9) unsigned;not null"`                                // 沙盘版本记录id
@@ -114,46 +59,23 @@ type SandboxVersionListItem struct {
 
 // GetVersionList 获取沙盘版本列表页
 func GetVersionList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*SandboxVersionListItem, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := "select b.sandbox_version_id,b.sandbox_id,b.name,b.chart_permission_id,b.chart_permission_name,b.curr_version,b.version_code,b.pic_url,b.op_user_id,b.op_user_name,b.create_time from sandbox as a join sandbox_version b on a.sandbox_id=b.sandbox_id where 1=1 AND a.is_delete = 0  AND b.is_delete = 0 "
 	sql += condition
 	sql += ` order by b.sandbox_version_id desc`
 
 	totalSql := `select count(1) total from (` + sql + `) z `
-	//err = o.Raw(totalSql, pars).QueryRow(&total)
 	err = global.DmSQL["data"].Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
 	sql += ` LIMIT ?,? `
-	//_, err = o.Raw(sql, pars...).QueryRows(&list)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
 	return
 }
 
-// GetTotalSandboxVersionBySandboxId 根据沙盘id获取沙盘版本数量
-//func GetTotalSandboxVersionBySandboxId(sandboxId int) (sandboxVersionInfo *SandboxVersion, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := `select count(1) total from sandbox_version b where b.sandbox_id = ? and b.is_delete = 0 `
-//	err = o.Raw(sql, sandboxId).QueryRow(&sandboxVersionInfo)
-//	return
-//}
-
 type TotalSandboxVersion struct {
 	SandboxId int `description:"沙盘id"`
 	Total     int `description:"沙盘版本数量"`
 }
-
-// GetTotalSandboxVersionBySandboxIdList 根据沙盘id获取沙盘版本数量
-//func GetTotalSandboxVersionBySandboxIdList(sandboxIdList []int) (items []*TotalSandboxVersion, err error) {
-//	num := len(sandboxIdList)
-//	if num <= 0 {
-//		return
-//	}
-//	o := orm.NewOrmUsingDB("data")
-//	sql := `select sandbox_id,count(1) AS total from sandbox_version b where b.sandbox_id in (` + utils.GetOrmInReplace(num) + `) and b.is_delete = 0 GROUP BY sandbox_id`
-//	_, err = o.Raw(sql, sandboxIdList).QueryRows(&items)
-//	return
-//}

models/semantic_analysis/sa_compare.go

@@ -9,19 +9,6 @@ import (
 	"time"
 )
 
-//type SaCompare struct {
-//	SaCompareId  int       `orm:"column(sa_compare_id);pk" description:"比对ID"`
-//	ClassifyId   int       `description:"比对分类ID"`
-//	ClassifyName string    `description:"比对分类名称"`
-//	Title        string    `description:"标题"`
-//	ResultImg    string    `description:"比对结果图片"`
-//	SysAdminId   int       `description:"创建人ID"`
-//	SysAdminName string    `description:"创建人姓名"`
-//	Sort         int       `description:"排序"`
-//	CreateTime   time.Time `description:"创建时间"`
-//	ModifyTime   time.Time `description:"修改时间"`
-//}
-
 type SaCompare struct {
 	SaCompareId  int       `gorm:"primaryKey;column:sa_compare_id;type:int(10) unsigned;not null"`                    // 语义分析-比对Id
 	ClassifyId   int       `gorm:"index:idx_classify_id;column:classify_id;type:int(10) unsigned;not null;default:0"` // 比对分类Id
@@ -64,59 +51,42 @@ func (m *SaCompare) TableName() string {
 }
 
 func (m *SaCompare) Create() (err error) {
-	//o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.SaCompareId = int(id)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
 func (m *SaCompare) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SaCompare) Del() (err error) {
-	//o := orm.NewOrm()
 	sql := `DELETE FROM sa_compare WHERE sa_compare_id = ? LIMIT 1`
-	//_, err = o.Raw(sql, m.SaCompareId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, m.SaCompareId).Error
 	return
 }
 
 func (m *SaCompare) GetItemById(id int) (err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM sa_compare WHERE sa_compare_id = ? LIMIT 1`
-	//err = o.Raw(sql, id).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&m).Error
 	return
 }
 
 func (m *SaCompare) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM sa_compare WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	//err = o.Raw(sql, pars).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
 func (m *SaCompare) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *SaCompare) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SaCompare, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -126,13 +96,11 @@ func (m *SaCompare) GetItemsByCondition(condition string, pars []interface{}, fi
 		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.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SaCompare) GetPageItemsByCondition(startSize, pageSize int, condition string, pars []interface{}, fieldArr []string, orderRule string) (total int, items []*SaCompare, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -143,15 +111,11 @@ func (m *SaCompare) GetPageItemsByCondition(startSize, pageSize int, condition s
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
-	//	return
-	//}
 	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	pars = append(pars, startSize, pageSize)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
@@ -180,7 +144,6 @@ type SaCompareSaveResp struct {
 	SaCompareId int                       `description:"比对ID"`
 	TitleList   []string                  `description:"标题列表"`
 	LabelList   []*SaCompareSaveRespLabel `description:"标签列表"`
-	//ThemeList   []string                  `description:"主题列表"`
 }
 
 // SaCompareSaveRespLabel 比对响应标签
@@ -240,58 +203,13 @@ type SaCompareUpdateResultImgReq struct {
 
 // UpdateSaCompareClassifyByClassifyId 更新比对分类信息
 func UpdateSaCompareClassifyByClassifyId(classifyId int, classifyName string) (err error) {
-	//o := orm.NewOrm()
 	sql := `UPDATE sa_compare SET classify_name = ? WHERE classify_id = ?`
-	//_, err = o.Raw(sql, classifyName, classifyId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, classifyName, classifyId).Error
 	return
 }
 
 // CreateSaCompare 新增比对、比对段落和比对标签
 func CreateSaCompare(compareItem *SaCompare, compareDocs []*SaCompareDoc, compareLabels []*SaCompareLabel) (err error) {
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//	} else {
-	//		_ = tx.Commit()
-	//	}
-	//}()
-	//
-	//// 新增比对
-	//lastId, err := tx.Insert(compareItem)
-	//if err != nil {
-	//	return
-	//}
-	//compareId := int(lastId)
-	//compareItem.SaCompareId = compareId
-	//
-	//// 新增比对段落
-	//if len(compareDocs) > 0 {
-	//	for i := range compareDocs {
-	//		compareDocs[i].CompareId = compareId
-	//	}
-	//	if _, e := tx.InsertMulti(len(compareDocs), compareDocs); e != nil {
-	//		err = e
-	//		return
-	//	}
-	//}
-	//
-	//// 新增比对标签
-	//if len(compareLabels) > 0 {
-	//	for i := range compareLabels {
-	//		compareLabels[i].CompareId = compareId
-	//	}
-	//	if _, e := tx.InsertMulti(len(compareLabels), compareLabels); e != nil {
-	//		err = e
-	//		return
-	//	}
-	//}
-
 	tx := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -336,59 +254,6 @@ func CreateSaCompare(compareItem *SaCompare, compareDocs []*SaCompareDoc, compar
 
 // UpdateSaCompare 保存比对、比对段落和比对标签
 func UpdateSaCompare(compareItem *SaCompare, compareDocs []*SaCompareDoc, compareLabels []*SaCompareLabel, compareUpCols []string) (err error) {
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//	} else {
-	//		_ = tx.Commit()
-	//	}
-	//}()
-	//
-	//// 删除比对段落和标签
-	//sql := `DELETE FROM sa_compare_doc WHERE compare_id = ?`
-	//_, err = tx.Raw(sql, compareItem.SaCompareId).Exec()
-	//if err != nil {
-	//	return
-	//}
-	//sql = `DELETE FROM sa_compare_label WHERE compare_id = ?`
-	//_, err = tx.Raw(sql, compareItem.SaCompareId).Exec()
-	//if err != nil {
-	//	return
-	//}
-	//
-	//// 更新比对
-	//_, err = tx.Update(compareItem, compareUpCols...)
-	//if err != nil {
-	//	return
-	//}
-	//
-	//// 新增比对段落
-	//if len(compareDocs) > 0 {
-	//	for i := range compareDocs {
-	//		compareDocs[i].CompareId = compareItem.SaCompareId
-	//	}
-	//	if _, e := tx.InsertMulti(len(compareDocs), compareDocs); e != nil {
-	//		err = e
-	//		return
-	//	}
-	//}
-	//
-	//// 新增比对标签
-	//if len(compareLabels) > 0 {
-	//	for i := range compareLabels {
-	//		compareLabels[i].CompareId = compareItem.SaCompareId
-	//	}
-	//	if _, e := tx.InsertMulti(len(compareLabels), compareLabels); e != nil {
-	//		err = e
-	//		return
-	//	}
-	//}
-
 	tx := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -490,32 +355,6 @@ type SaCompareDelReq struct {
 
 // DelSaCompare 删除文档和段落
 func DelSaCompare(compareId int) (err error) {
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//	} else {
-	//		_ = tx.Commit()
-	//	}
-	//}()
-	//
-	//sql := `DELETE FROM sa_compare WHERE sa_compare_id = ? LIMIT 1`
-	//_, err = tx.Raw(sql, compareId).Exec()
-	//if err != nil {
-	//	return
-	//}
-	//sql = `DELETE FROM sa_compare_doc WHERE compare_id = ?`
-	//_, err = tx.Raw(sql, compareId).Exec()
-	//if err != nil {
-	//	return
-	//}
-	//sql = `DELETE FROM sa_compare_label WHERE compare_id = ?`
-	//_, err = tx.Raw(sql, compareId).Exec()
-
 	tx := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -556,21 +395,17 @@ type SaCompareMoveReq struct {
 
 // UpdateSaCompareSort 根据分类ID更新排序
 func UpdateSaCompareSort(classifyId, nowSort int, prevId int, updateSort string) (err error) {
-	//o := orm.NewOrm()
 	sql := ` UPDATE sa_compare SET sort = ` + updateSort + ` WHERE classify_id = ? AND `
 	if prevId > 0 {
 		sql += ` ( sort > ? or ( sa_compare_id > ` + fmt.Sprint(prevId) + ` and sort = ` + fmt.Sprint(nowSort) + ` )) `
 	}
-	//_, err = o.Raw(sql, classifyId, nowSort).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, classifyId, nowSort).Error
 	return
 }
 
 // GetFirstSortSaCompare 获取排序最前的比对
 func GetFirstSortSaCompare(classifyId int) (item *SaCompare, err error) {
-	//o := orm.NewOrm()
 	sql := ` SELECT * FROM sa_compare WHERE classify_id = ? ORDER BY sort ASC,sa_compare_id ASC LIMIT 1`
-	//err = o.Raw(sql, classifyId).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, classifyId).Find(&item).Error
 	return
 }

models/semantic_analysis/sa_compare_classify.go

@@ -8,15 +8,6 @@ import (
 	"time"
 )
 
-//type SaCompareClassify struct {
-//	SaCompareClassifyId int       `orm:"column(sa_compare_classify_id);pk" description:"分类ID"`
-//	ClassifyName        string    `description:"分类名称"`
-//	SysAdminId          int       `description:"创建人ID"`
-//	SysAdminName        string    `description:"创建人姓名"`
-//	CreateTime          time.Time `description:"创建时间"`
-//	ModifyTime          time.Time `description:"修改时间"`
-//}
-
 type SaCompareClassify struct {
 	SaCompareClassifyId int       `gorm:"primaryKey;column:sa_compare_classify_id;type:int(10) unsigned;not null"` // 语义分析-文档分类Id
 	ClassifyName        string    `gorm:"column:classify_name;type:varchar(128);not null;default:''"`              // 分类名称
@@ -47,59 +38,42 @@ func (m *SaCompareClassify) TableName() string {
 }
 
 func (m *SaCompareClassify) Create() (err error) {
-	//o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.SaCompareClassifyId = int(id)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
 func (m *SaCompareClassify) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SaCompareClassify) Del() (err error) {
-	//o := orm.NewOrm()
 	sql := `DELETE FROM sa_compare_classify WHERE sa_compare_classify_id = ? LIMIT 1`
-	//_, err = o.Raw(sql, m.SaCompareClassifyId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, m.SaCompareClassifyId).Error
 	return
 }
 
 func (m *SaCompareClassify) GetItemById(id int) (err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM sa_compare_classify WHERE sa_compare_classify_id = ? LIMIT 1`
-	//err = o.Raw(sql, id).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&m).Error
 	return
 }
 
 func (m *SaCompareClassify) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM sa_compare_classify WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	//err = o.Raw(sql, pars).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
 func (m *SaCompareClassify) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *SaCompareClassify) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SaCompareClassify, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -109,13 +83,11 @@ func (m *SaCompareClassify) GetItemsByCondition(condition string, pars []interfa
 		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.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SaCompareClassify) GetPageItemsByCondition(startSize, pageSize int, condition string, pars []interface{}, fieldArr []string, orderRule string) (total int, items []*SaCompareClassify, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -126,15 +98,11 @@ func (m *SaCompareClassify) GetPageItemsByCondition(startSize, pageSize int, con
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
-	//	return
-	//}
 	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }

models/semantic_analysis/sa_compare_doc.go

@@ -6,12 +6,6 @@ import (
 	"strings"
 )
 
-//type SaCompareDoc struct {
-//	SaCompareDocId int `orm:"column(sa_compare_doc_id);pk"`
-//	CompareId      int `description:"比对ID"`
-//	DocId          int `description:"文档ID"`
-//}
-
 type SaCompareDoc struct {
 	SaCompareDocId int `gorm:"primaryKey;column:sa_compare_doc_id;type:int(10) unsigned;not null"`              // 比对文档Id
 	CompareId      int `gorm:"index:idx_compare_id;column:compare_id;type:int(10) unsigned;not null;default:0"` // 比对Id
@@ -32,54 +26,7 @@ func (m *SaCompareDoc) TableName() string {
 	return "sa_compare_doc"
 }
 
-//func (m *SaCompareDoc) Create() (err error) {
-//	o := orm.NewOrm()
-//	id, err := o.Insert(m)
-//	if err != nil {
-//		return
-//	}
-//	m.SaCompareDocId = int(id)
-//	return
-//}
-
-//func (m *SaCompareDoc) Update(cols []string) (err error) {
-//	o := orm.NewOrm()
-//	_, err = o.Update(m, cols...)
-//	return
-//}
-
-//func (m *SaCompareDoc) Del() (err error) {
-//	o := orm.NewOrm()
-//	sql := `DELETE FROM sa_compare_doc WHERE sa_compare_doc_id = ? LIMIT 1`
-//	_, err = o.Raw(sql, m.SaCompareDocId).Exec()
-//	return
-//}
-
-//func (m *SaCompareDoc) GetItemById(id int) (err error) {
-//	o := orm.NewOrm()
-//	sql := `SELECT * FROM sa_compare_doc WHERE sa_compare_doc_id = ? LIMIT 1`
-//	err = o.Raw(sql, id).QueryRow(&m)
-//	return
-//}
-
-//func (m *SaCompareDoc) GetItemByCondition(condition string, pars []interface{}) (err error) {
-//	o := orm.NewOrm()
-//	sql := `SELECT * FROM sa_compare_doc WHERE 1=1 `
-//	sql += condition
-//	sql += ` LIMIT 1`
-//	err = o.Raw(sql, pars).QueryRow(&m)
-//	return
-//}
-
-//func (m *SaCompareDoc) 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)
-//	return
-//}
-
 func (m *SaCompareDoc) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SaCompareDoc, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -89,31 +36,10 @@ func (m *SaCompareDoc) 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.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
-//func (m *SaCompareDoc) GetPageItemsByCondition(startSize, pageSize int, condition string, pars []interface{}, fieldArr []string, orderRule string) (total int, items []*SaCompareDoc, err error) {
-//	o := orm.NewOrm()
-//	fields := strings.Join(fieldArr, ",")
-//	if len(fieldArr) == 0 {
-//		fields = `*`
-//	}
-//	order := ``
-//	if orderRule != "" {
-//		order = ` ORDER BY ` + orderRule
-//	}
-//	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-//	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
-//	if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
-//		return
-//	}
-//	sql += ` LIMIT ?,?`
-//	_, err = o.Raw(sql, pars...).QueryRows(&items)
-//	return
-//}
-
 // SaCompareDocSection 比对文档段落信息
 type SaCompareDocSection struct {
 	DocId        int    `description:"文档ID"`
@@ -124,27 +50,3 @@ type SaCompareDocSection struct {
 	Content      string `description:"段落内容"`
 	Sort         int    `description:"段落排序"`
 }
-
-// GetSaCompareDocAndSections 获取比对关联的文档段落
-//func GetSaCompareDocAndSections(compareId int) (items []*SaCompareDocSection, err error) {
-//	o := orm.NewOrm()
-//	sql := `SELECT
-//				a.doc_id,
-//				b.title,
-//				b.theme,
-//				b.classify_name,
-//				c.sa_doc_section_id AS section_id,
-//				c.content,
-//				c.sort
-//			FROM
-//				sa_compare_doc AS a
-//			JOIN sa_doc AS b ON a.doc_id = b.sa_doc_id
-//			JOIN sa_doc_section AS c ON a.doc_id = c.doc_id
-//			WHERE
-//				a.compare_id = ?
-//			ORDER BY
-//				a.doc_id,
-//				c.sort ASC`
-//	_, err = o.Raw(sql, compareId).QueryRows(&items)
-//	return
-//}

models/semantic_analysis/sa_compare_label.go

@@ -7,22 +7,6 @@ import (
 	"time"
 )
 
-//type SaCompareLabel struct {
-//	SaCompareLabelId int       `orm:"column(sa_compare_label_id);pk" description:"段落标签ID"`
-//	CompareId        int       `description:"比对ID"`
-//	DocId            int       `description:"文档ID"`
-//	SectionId        int       `description:"段落ID"`
-//	LabelId          int       `description:"标签ID"`
-//	LabelName        string    `description:"标签名称"`
-//	IsPart           int       `description:"是否为片段: 0-整段; 1-片段"`
-//	StartIndex       int       `description:"片段开始下标"`
-//	EndIndex         int       `description:"片段结束下标"`
-//	Content          string    `description:"内容"`
-//	SysAdminId       int       `description:"创建人ID"`
-//	SysAdminName     string    `description:"创建人姓名"`
-//	CreateTime       time.Time `description:"创建时间"`
-//}
-
 type SaCompareLabel struct {
 	SaCompareLabelId int       `gorm:"primaryKey;column:sa_compare_label_id;type:int(10) unsigned;not null"`            // 语义分析-文档段落标签Id
 	CompareId        int       `gorm:"index:idx_compare_id;column:compare_id;type:int(10) unsigned;not null;default:0"` // 比对Id
@@ -73,53 +57,39 @@ func (m *SaCompareLabel) TableName() string {
 }
 
 func (m *SaCompareLabel) Create() (err error) {
-	//o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.SaCompareLabelId = int(id)
+
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
 func (m *SaCompareLabel) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
+
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SaCompareLabel) Del() (err error) {
-	//o := orm.NewOrm()
 	sql := `DELETE FROM sa_compare_label WHERE sa_compare_label_id = ? LIMIT 1`
-	//_, err = o.Raw(sql, m.SaCompareLabelId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, m.SaCompareLabelId).Error
 	return
 }
 
 func (m *SaCompareLabel) GetItemById(id int) (err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM sa_compare_label WHERE sa_compare_label_id = ? LIMIT 1`
-	//err = o.Raw(sql, id).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&m).Error
 	return
 }
 
 func (m *SaCompareLabel) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM sa_compare_label WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	//err = o.Raw(sql, pars).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
 func (m *SaCompareLabel) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
@@ -132,15 +102,12 @@ type SaCompareLabelGroupCount struct {
 }
 
 func (m *SaCompareLabel) GetGroupCountByCondition(condition string, pars []interface{}, groupRule string) (items []*SaCompareLabelGroupCount, err error) {
-	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) AS use_num, %s FROM %s WHERE 1=1 %s GROUP BY %s`, groupRule, m.TableName(), condition, groupRule)
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SaCompareLabel) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SaCompareLabel, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -150,13 +117,11 @@ func (m *SaCompareLabel) 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.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SaCompareLabel) GetPageItemsByCondition(startSize, pageSize int, condition string, pars []interface{}, fieldArr []string, orderRule string) (total int, items []*SaCompareLabel, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -167,24 +132,18 @@ func (m *SaCompareLabel) GetPageItemsByCondition(startSize, pageSize int, condit
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
-	//	return
-	//}
 	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // UpdateSaCompareLabelByLabelId 更新比对标签信息
 func UpdateSaCompareLabelByLabelId(labelId int, labelName string) (err error) {
-	//o := orm.NewOrm()
 	sql := `UPDATE sa_compare_label SET label_name = ? WHERE label_id = ?`
-	//_, err = o.Raw(sql, labelName, labelId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, labelName, labelId).Error
 	return
 }
@@ -205,7 +164,6 @@ type SaCompareLabelItem struct {
 
 // GetSaCompareLabelByCond 获取比对标签
 func GetSaCompareLabelByCond(condition string, pars []interface{}) (items []*SaCompareLabelItem, err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT
 				a.sa_compare_label_id,
 				a.label_id,
@@ -227,7 +185,6 @@ func GetSaCompareLabelByCond(condition string, pars []interface{}) (items []*SaC
 				a.doc_id,
 				c.sort ASC`
 	sql = fmt.Sprintf(sql, condition)
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }

models/semantic_analysis/sa_compare_search_keyword.go

@@ -8,14 +8,6 @@ import (
 	"time"
 )
 
-// SaCompareSearchKeyword 文档比对搜索关键词表
-//type SaCompareSearchKeyword struct {
-//	SaCompareSearchKeywordId int       `orm:"column(sa_compare_search_keyword_id);pk"`
-//	CompareId                int       `description:"文档比对ID"`
-//	Keyword                  string    `description:"关键词"`
-//	CreateTime               time.Time `description:"创建时间"`
-//}
-
 type SaCompareSearchKeyword struct {
 	SaCompareSearchKeywordId int       `gorm:"primaryKey;column:sa_compare_search_keyword_id;type:int(10) unsigned;not null"`
 	CompareId                int       `gorm:"index:idx_compare_id;column:compare_id;type:int(10) unsigned;not null;default:0"` // 比对Id
@@ -40,59 +32,42 @@ func (m *SaCompareSearchKeyword) TableName() string {
 }
 
 func (m *SaCompareSearchKeyword) Create() (err error) {
-	//o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.SaCompareSearchKeywordId = int(id)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
 func (m *SaCompareSearchKeyword) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SaCompareSearchKeyword) Del() (err error) {
-	//o := orm.NewOrm()
 	sql := `DELETE FROM sa_compare_search_keyword WHERE sa_compare_search_keyword_id = ? LIMIT 1`
-	//_, err = o.Raw(sql, m.SaCompareSearchKeywordId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, m.SaCompareSearchKeywordId).Error
 	return
 }
 
 func (m *SaCompareSearchKeyword) GetItemById(id int) (err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM sa_compare_search_keyword WHERE sa_compare_search_keyword_id = ? LIMIT 1`
-	//err = o.Raw(sql, id).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&m).Error
 	return
 }
 
 func (m *SaCompareSearchKeyword) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM sa_compare_search_keyword WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	//err = o.Raw(sql, pars).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
 func (m *SaCompareSearchKeyword) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *SaCompareSearchKeyword) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SaCompareSearchKeyword, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -102,13 +77,11 @@ func (m *SaCompareSearchKeyword) GetItemsByCondition(condition string, pars []in
 		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.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SaCompareSearchKeyword) GetPageItemsByCondition(startSize, pageSize int, condition string, pars []interface{}, fieldArr []string, orderRule string) (total int, items []*SaCompareSearchKeyword, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -119,15 +92,11 @@ func (m *SaCompareSearchKeyword) GetPageItemsByCondition(startSize, pageSize int
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
-	//	return
-	//}
 	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
@@ -138,37 +107,6 @@ type SaCompareSearchKeywordSaveReq struct {
 }
 
 func (m *SaCompareSearchKeyword) DelAndCreateSearchKeywords(compareId int, keywords []string) (err error) {
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//		return
-	//	}
-	//	_ = tx.Commit()
-	//}()
-	//
-	//sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ?`, m.TableName(), SaCompareSearchKeywordColumns.CompareId)
-	//if _, e := o.Raw(sql, compareId).Exec(); e != nil {
-	//	return e
-	//}
-	//if len(keywords) > 0 {
-	//	items := make([]*SaCompareSearchKeyword, 0)
-	//	for _, v := range keywords {
-	//		items = append(items, &SaCompareSearchKeyword{
-	//			CompareId:  compareId,
-	//			Keyword:    v,
-	//			CreateTime: time.Now().Local(),
-	//		})
-	//	}
-	//	if _, e := o.InsertMulti(len(items), items); e != nil {
-	//		return e
-	//	}
-	//}
-
 	tx := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {

models/semantic_analysis/sa_doc.go

@@ -9,21 +9,6 @@ import (
 	"time"
 )
 
-//type SaDoc struct {
-//	SaDocId      int       `orm:"column(sa_doc_id);pk" description:"文档ID"`
-//	ClassifyId   int       `description:"文档分类ID"`
-//	ClassifyName string    `description:"分类名称"`
-//	Title        string    `description:"标题"`
-//	Theme        string    `description:"主题"`
-//	CoverImg     string    `description:"封面图"`
-//	ContentMd5   string    `description:"内容md5, 用于内容去重"`
-//	SysAdminId   int       `description:"创建人ID"`
-//	SysAdminName string    `description:"创建人姓名"`
-//	Sort         int       `description:"排序"`
-//	CreateTime   time.Time `description:"创建时间"`
-//	ModifyTime   time.Time `description:"修改时间"`
-//}
-
 type SaDoc struct {
 	SaDocId      int       `gorm:"primaryKey;column:sa_doc_id;type:int(10) unsigned;not null"`                        // 语义分析-文档Id
 	ClassifyId   int       `gorm:"index:idx_classify_id;column:classify_id;type:int(10) unsigned;not null;default:0"` // 文档分类Id
@@ -72,59 +57,42 @@ func (m *SaDoc) TableName() string {
 }
 
 func (m *SaDoc) Create() (err error) {
-	//// o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.SaDocId = int(id)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
 func (m *SaDoc) Update(cols []string) (err error) {
-	//// o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SaDoc) Del() (err error) {
-	//// o := orm.NewOrm()
 	sql := `DELETE FROM sa_doc WHERE sa_doc_id = ? LIMIT 1`
-	//_, err = o.Raw(sql, m.SaDocId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, m.SaDocId).Error
 	return
 }
 
 func (m *SaDoc) GetItemById(id int) (err error) {
-	//// o := orm.NewOrm()
 	sql := `SELECT * FROM sa_doc WHERE sa_doc_id = ? LIMIT 1`
-	//err = o.Raw(sql, id).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&m).Error
 	return
 }
 
 func (m *SaDoc) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	//// o := orm.NewOrm()
 	sql := `SELECT * FROM sa_doc WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	//err = o.Raw(sql, pars).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
 func (m *SaDoc) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *SaDoc) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SaDoc, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -134,13 +102,11 @@ func (m *SaDoc) GetItemsByCondition(condition string, pars []interface{}, fieldA
 		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.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SaDoc) GetPageItemsByCondition(startSize, pageSize int, condition string, pars []interface{}, fieldArr []string, orderRule string) (total int, items []*SaDoc, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -151,15 +117,12 @@ func (m *SaDoc) GetPageItemsByCondition(startSize, pageSize int, condition strin
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
-	//	return
-	//}
+
 	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	pars = append(pars, startSize, pageSize)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
@@ -167,37 +130,6 @@ func (m *SaDoc) GetPageItemsByCondition(startSize, pageSize int, condition strin
 
 // InsertSaDocAndSections 新增文档及段落
 func InsertSaDocAndSections(doc *SaDoc, sections []*SaDocSection) (err error) {
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//	} else {
-	//		_ = tx.Commit()
-	//	}
-	//}()
-	//
-	//lastId, err := tx.Insert(doc)
-	//if err != nil {
-	//	return
-	//}
-	//doc.SaDocId = int(lastId)
-	//
-	//if len(sections) > 0 {
-	//	for i := range sections {
-	//		sections[i].DocId = int(lastId)
-	//		secId, e := tx.Insert(sections[i])
-	//		if e != nil {
-	//			err = e
-	//			return
-	//		}
-	//		sections[i].SaDocSectionId = int(secId)
-	//	}
-	//}
-
 	tx := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -228,27 +160,6 @@ func InsertSaDocAndSections(doc *SaDoc, sections []*SaDocSection) (err error) {
 
 // DelSaDocAndSections 删除文档和段落
 func DelSaDocAndSections(docId int) (err error) {
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//	} else {
-	//		_ = tx.Commit()
-	//	}
-	//}()
-	//
-	//sql := `DELETE FROM sa_doc WHERE sa_doc_id = ? LIMIT 1`
-	//_, err = tx.Raw(sql, docId).Exec()
-	//if err != nil {
-	//	return
-	//}
-	//sql = `DELETE FROM sa_doc_section WHERE doc_id = ?`
-	//_, err = tx.Raw(sql, docId).Exec()
-
 	tx := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -326,49 +237,13 @@ type SaDocDetail struct {
 
 // UpdateSaDocClassifyByClassifyId 更新文档分类信息
 func UpdateSaDocClassifyByClassifyId(classifyId int, classifyName string) (err error) {
-	// o := orm.NewOrm()
 	sql := `UPDATE sa_doc SET classify_name = ? WHERE classify_id = ?`
-	//_, err = o.Raw(sql, classifyName, classifyId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, classifyName, classifyId).Error
 	return
 }
 
 // UpdateSaDocAndSections 更新文档和段落
 func UpdateSaDocAndSections(docItem *SaDoc, insertSecs, updateSecs []*SaDocSection, delSecIds []int, updateCols, updateSecCols []string) (err error) {
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//	} else {
-	//		_ = tx.Commit()
-	//	}
-	//}()
-	//
-	//// 更新文档
-	//if _, err = tx.Update(docItem, updateCols...); err != nil {
-	//	return
-	//}
-	//// 段落-新增/更新/删除
-	//if len(insertSecs) > 0 {
-	//	if _, err = tx.InsertMulti(len(insertSecs), insertSecs); err != nil {
-	//		return
-	//	}
-	//}
-	//for _, s := range updateSecs {
-	//	if _, err = tx.Update(s, updateSecCols...); err != nil {
-	//		return
-	//	}
-	//}
-	//if len(delSecIds) > 0 {
-	//	sql := `DELETE FROM sa_doc_section WHERE doc_id = ? AND sa_doc_section_id IN (%s)`
-	//	sql = fmt.Sprintf(sql, utils.GetOrmInReplace(len(delSecIds)))
-	//	_, err = tx.Raw(sql, docItem.SaDocId, delSecIds).Exec()
-	//}
-
 	tx := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -426,7 +301,6 @@ type ElasticSaDoc struct {
 
 // GetSaDocsWithUseNumByCondition 获取文档及引用数
 func GetSaDocsWithUseNumByCondition(condition string, pars []interface{}) (items []*SaDocItem, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT
 				a.sa_doc_id,a.classify_id,a.classify_name,a.title,a.theme,a.cover_img,a.content_md5,a.sys_admin_id,a.sys_admin_name,a.sort,a.create_time,a.modify_time, COUNT(b.sa_compare_label_id) AS use_num
 			FROM
@@ -439,28 +313,23 @@ func GetSaDocsWithUseNumByCondition(condition string, pars []interface{}) (items
 			ORDER BY
 			    a.sort ASC, a.create_time DESC, a.sa_doc_id ASC`
 	sql = fmt.Sprintf(sql, condition)
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // UpdateSaDocSort 根据分类ID更新排序
 func UpdateSaDocSort(classifyId, nowSort int, prevId int, updateSort string) (err error) {
-	// o := orm.NewOrm()
 	sql := ` UPDATE sa_doc SET sort = ` + updateSort + ` WHERE classify_id = ? AND `
 	if prevId > 0 {
 		sql += ` ( sort > ? or ( sa_doc_id > ` + fmt.Sprint(prevId) + ` and sort = ` + fmt.Sprint(nowSort) + ` )) `
 	}
-	//_, err = o.Raw(sql, classifyId, nowSort).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, classifyId, nowSort).Error
 	return
 }
 
 // GetFirstSortSaDoc 获取排序最前的文档
 func GetFirstSortSaDoc(classifyId int) (item *SaDoc, err error) {
-	// o := orm.NewOrm()
 	sql := ` SELECT * FROM sa_doc WHERE classify_id = ? ORDER BY sort ASC,sa_doc_id ASC LIMIT 1`
-	//err = o.Raw(sql, classifyId).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, classifyId).First(&item).Error
 	return
 }

models/semantic_analysis/sa_doc_classify.go

@@ -8,16 +8,6 @@ import (
 	"time"
 )
 
-//type SaDocClassify struct {
-//	SaDocClassifyId int       `orm:"column(sa_doc_classify_id);pk" description:"分类ID"`
-//	ClassifyName    string    `description:"分类名称"`
-//	CoverImg        string    `description:"封面图"`
-//	SysAdminId      int       `description:"创建人ID"`
-//	SysAdminName    string    `description:"创建人名称"`
-//	CreateTime      time.Time `description:"创建时间"`
-//	ModifyTime      time.Time `description:"修改时间"`
-//}
-
 type SaDocClassify struct {
 	SaDocClassifyId int       `gorm:"primaryKey;column:sa_doc_classify_id;type:int(10) unsigned;not null"` // 语义分析-文档分类Id
 	ClassifyName    string    `gorm:"column:classify_name;type:varchar(128);not null;default:''"`          // 分类名称
@@ -51,59 +41,42 @@ func (m *SaDocClassify) TableName() string {
 }
 
 func (m *SaDocClassify) Create() (err error) {
-	//o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.SaDocClassifyId = int(id)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
 func (m *SaDocClassify) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SaDocClassify) Del() (err error) {
-	//o := orm.NewOrm()
 	sql := `DELETE FROM sa_doc_classify WHERE sa_doc_classify_id = ? LIMIT 1`
-	//_, err = o.Raw(sql, m.SaDocClassifyId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, m.SaDocClassifyId).Error
 	return
 }
 
 func (m *SaDocClassify) GetItemById(id int) (err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM sa_doc_classify WHERE sa_doc_classify_id = ? LIMIT 1`
-	//err = o.Raw(sql, id).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&m).Error
 	return
 }
 
 func (m *SaDocClassify) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM sa_doc_classify WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	//err = o.Raw(sql, pars).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
 func (m *SaDocClassify) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *SaDocClassify) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SaDocClassify, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -113,13 +86,11 @@ func (m *SaDocClassify) 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.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SaDocClassify) GetPageItemsByCondition(startSize, pageSize int, condition string, pars []interface{}, fieldArr []string, orderRule string) (total int, items []*SaDocClassify, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -130,15 +101,11 @@ func (m *SaDocClassify) GetPageItemsByCondition(startSize, pageSize int, conditi
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
-	//	return
-	//}
 	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }

models/semantic_analysis/sa_doc_section.go

@@ -6,13 +6,6 @@ import (
 	"strings"
 )
 
-//type SaDocSection struct {
-//	SaDocSectionId int    `orm:"column(sa_doc_section_id);pk" description:"段落ID"`
-//	DocId          int    `description:"文档ID"`
-//	Content        string `description:"段落内容"`
-//	Sort           int    `description:"排序"`
-//}
-
 type SaDocSection struct {
 	SaDocSectionId int    `gorm:"primaryKey;column:sa_doc_section_id;type:int(10) unsigned;not null"`      // 语义分析-文档段落表
 	DocId          int    `gorm:"index:idx_doc_id;column:doc_id;type:int(10) unsigned;not null;default:0"` // 文档Id
@@ -37,59 +30,42 @@ func (m *SaDocSection) TableName() string {
 }
 
 func (m *SaDocSection) Create() (err error) {
-	// o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.SaDocSectionId = int(id)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
 func (m *SaDocSection) Update(cols []string) (err error) {
-	// o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SaDocSection) Del() (err error) {
-	// o := orm.NewOrm()
 	sql := `DELETE FROM sa_doc_section WHERE sa_doc_section_id = ? LIMIT 1`
-	//_, err = o.Raw(sql, m.SaDocSectionId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, m.SaDocSectionId).Error
 	return
 }
 
 func (m *SaDocSection) GetItemById(id int) (err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM sa_doc_section WHERE sa_doc_section_id = ? LIMIT 1`
-	//err = o.Raw(sql, id).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&m).Error
 	return
 }
 
 func (m *SaDocSection) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM sa_doc_section WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	//err = o.Raw(sql, pars).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
 func (m *SaDocSection) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *SaDocSection) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SaDocSection, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -99,13 +75,11 @@ func (m *SaDocSection) 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.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SaDocSection) GetPageItemsByCondition(startSize, pageSize int, condition string, pars []interface{}, fieldArr []string, orderRule string) (total int, items []*SaDocSection, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -116,15 +90,11 @@ func (m *SaDocSection) GetPageItemsByCondition(startSize, pageSize int, conditio
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
-	//	return
-	//}
 	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }

models/semantic_analysis/sa_label.go

@@ -8,15 +8,6 @@ import (
 	"time"
 )
 
-//type SaLabel struct {
-//	SaLabelId    int       `orm:"column(sa_label_id);pk" description:"标签ID"`
-//	LabelName    string    `description:"标签名称"`
-//	SysAdminId   int       `description:"创建人ID"`
-//	SysAdminName string    `description:"创建人名称"`
-//	CreateTime   time.Time `description:"创建时间"`
-//	ModifyTime   time.Time `description:"修改时间"`
-//}
-
 type SaLabel struct {
 	SaLabelId    int       `gorm:"primaryKey;column:sa_label_id;type:int(10) unsigned;not null"` // 语义分析-标签Id
 	LabelName    string    `gorm:"column:label_name;type:varchar(128);not null;default:''"`      // 标签名称
@@ -47,59 +38,42 @@ func (m *SaLabel) TableName() string {
 }
 
 func (m *SaLabel) Create() (err error) {
-	// o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.SaLabelId = int(id)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
 func (m *SaLabel) Update(cols []string) (err error) {
-	// o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SaLabel) Del() (err error) {
-	// o := orm.NewOrm()
 	sql := `DELETE FROM sa_label WHERE sa_label_id = ? LIMIT 1`
-	//_, err = o.Raw(sql, m.SaLabelId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, m.SaLabelId).Error
 	return
 }
 
 func (m *SaLabel) GetItemById(id int) (err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM sa_label WHERE sa_label_id = ? LIMIT 1`
-	//err = o.Raw(sql, id).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&m).Error
 	return
 }
 
 func (m *SaLabel) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM sa_label WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	//err = o.Raw(sql, pars).QueryRow(&m)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
 func (m *SaLabel) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *SaLabel) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SaLabel, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -109,13 +83,11 @@ func (m *SaLabel) GetItemsByCondition(condition string, pars []interface{}, fiel
 		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.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SaLabel) GetPageItemsByCondition(startSize, pageSize int, condition string, pars []interface{}, fieldArr []string, orderRule string) (total int, items []*SaLabel, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -126,15 +98,11 @@ func (m *SaLabel) GetPageItemsByCondition(startSize, pageSize int, condition str
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
-	//	return
-	//}
 	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }

models/smart_report/smart_report.go

@@ -16,54 +16,6 @@ const (
 	SmartReportStatePublished   = 2
 )
 
-// SmartReport 智能研报
-// type SmartReport struct {
-// 	SmartReportId       int       `orm:"column(smart_report_id);pk" gorm:"primaryKey"  description:"智能研报ID"`
-// 	ReportCode          string    `description:"报告唯一编码"`
-// 	ClassifyIdFirst     int       `description:"一级分类ID"`
-// 	ClassifyNameFirst   string    `description:"一级分类名称"`
-// 	ClassifyIdSecond    int       `description:"二级分类ID"`
-// 	ClassifyNameSecond  string    `description:"二级分类名称"`
-// 	AddType             int       `description:"新增方式：1-新增报告；2-继承报告"`
-// 	Title               string    `description:"标题"`
-// 	Abstract            string    `description:"摘要"`
-// 	Author              string    `description:"作者"`
-// 	Frequency           string    `description:"频度"`
-// 	Stage               int       `description:"期数"`
-// 	Content             string    `description:"内容"`
-// 	ContentSub          string    `description:"内容前两个章节"`
-// 	ContentStruct       string    `description:"内容组件"`
-// 	VideoUrl            string    `description:"音频文件URL"`
-// 	VideoName           string    `description:"音频文件名称"`
-// 	VideoPlaySeconds    float64   `description:"音频播放时长"`
-// 	VideoSize           string    `description:"音频文件大小，单位M"`
-// 	AdminId             int       `description:"创建者ID"`
-// 	AdminRealName       string    `description:"创建者姓名"`
-// 	State               int       `description:"1:未发布；2:已发布；3-待提交；4-待审批；5-已驳回；6-已通过"`
-// 	LastModifyAdminId   int       `description:"最后更新人ID"`
-// 	LastModifyAdminName string    `description:"最后更新人姓名"`
-// 	ContentModifyTime   time.Time `description:"内容更新时间"`
-// 	Pv                  int       `description:"pv"`
-// 	Uv                  int       `description:"uv"`
-// 	PublishTime         time.Time `description:"发布时间"`
-// 	PrePublishTime      time.Time `description:"预发布时间"`
-// 	PreMsgSend          int       `description:"定时发布后是否推送模版消息：0-否；1-是"`
-// 	MsgIsSend           int       `description:"消息是否已发送：0-否；1-是"`
-// 	MsgSendTime         time.Time `description:"模版消息发送时间"`
-// 	DetailImgUrl        string    `description:"报告详情长图地址"`
-// 	DetailPdfUrl        string    `description:"报告详情PDF地址"`
-// 	CreateTime          time.Time `description:"创建时间"`
-// 	ModifyTime          time.Time `description:"修改时间"`
-// 	HeadImg             string    `description:"报告头图地址"`
-// 	EndImg              string    `description:"报告尾图地址"`
-// 	CanvasColor         string    `description:"画布颜色"`
-// 	ApproveTime         time.Time `description:"审批时间"`
-// 	ApproveId           int       `description:"审批ID"`
-// 	NeedSplice          int       `description:"0-不需要 1-需要"`
-// 	HeadResourceId      int       `description:"版头资源ID"`
-// 	EndResourceId       int       `description:"版尾资源ID"`
-// }
-
 type SmartReport struct {
 	SmartReportId       int       `orm:"column(smart_report_id);pk" gorm:"column:smart_report_id;primaryKey" description:"智能研报ID"`
 	ReportCode          string    `gorm:"column:report_code" description:"报告唯一编码"`

models/smart_report/smart_report_save_log.go

@@ -8,18 +8,6 @@ import (
 	"time"
 )
 
-// SmartReportSaveLog 智能研报保存记录
-//
-//	type SmartReportSaveLog struct {
-//		Id            int       `orm:"column(id);pk" gorm:"primaryKey" `
-//		SmartReportId int       `description:"智能研报ID"`
-//		Content       string    `description:"内容"`
-//		ContentSub    string    `description:"内容前两个章节"`
-//		ContentStruct string    `description:"内容组件"`
-//		AdminId       int       `description:"操作人ID"`
-//		AdminName     string    `description:"操作人姓名"`
-//		CreateTime    time.Time `description:"创建时间"`
-//	}
 type SmartReportSaveLog struct {
 	Id            int       `orm:"column(id);pk" gorm:"column:id;primaryKey" description:"日志ID"`
 	SmartReportId int       `gorm:"column:smart_report_id" description:"智能研报ID"`

models/smart_report/smart_resource.go

@@ -9,14 +9,6 @@ import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
-//	type SmartReportResource struct {
-//		ResourceId int       `orm:"column(resource_id);pk" gorm:"primaryKey"  description:"智能研报资源ID"`
-//		ImgUrl     string    // 图片链接
-//		Style      string    // 版图样式
-//		ImgName    string    // 图片名称
-//		Type       int       // 类型 1-版头 2-版尾
-//		CreateTime time.Time // 创建时间
-//	}
 type SmartReportResource struct {
 	ResourceId int       `orm:"column(resource_id);pk" gorm:"column:resource_id;primaryKey" description:"智能研报资源ID"`
 	ImgUrl     string    `gorm:"column:img_url" description:"图片链接"`      // 图片链接
@@ -53,14 +45,6 @@ func (m *SmartReportResource) Del() (err error) {
 	return
 }
 
-//	type SmartReportResourceItem struct {
-//		ResourceId int    `orm:"column(resource_id);pk" gorm:"primaryKey"  description:"智能研报资源ID"`
-//		ImgUrl     string // 图片链接
-//		ImgName    string // 图片名称
-//		Style      string // 版图样式
-//		Type       int    // 类型 1-版头 2-版尾
-//		CreateTime string // 创建时间
-//	}
 type SmartReportResourceItem struct {
 	ResourceId int    `orm:"column(resource_id);pk" gorm:"column:resource_id;primaryKey" description:"智能研报资源ID"`
 	ImgUrl     string `gorm:"column:img_url" description:"图片链接"`      // 图片链接

models/speech_recognition/speech_recognition.go

@@ -17,26 +17,6 @@ const (
 	SpeechRecognitionStateFail    = 3
 )
 
-// SpeechRecognition 语音识别主表
-//type SpeechRecognition struct {
-//	SpeechRecognitionId int       `orm:"column(speech_recognition_id);pk"`
-//	UniqueCode          string    `description:"唯一编码"`
-//	FileName            string    `description:"文件名称"`
-//	ResourceUrl         string    `description:"文件路径"`
-//	MenuId              int       `description:"目录ID"`
-//	SysUserId           int       `description:"创建人ID"`
-//	SysUserName         string    `description:"创建人姓名"`
-//	State               int       `description:"状态：1-待转换；2-转换完成；3-转换失败"`
-//	Abstract            string    `description:"摘要，取前几段内容"`
-//	Sort                int       `description:"目录下的排序"`
-//	FileState           int       `description:"文件(非语音识别)删除状态：0-正常；1-删除(该字段作为软删标识)"`
-//	FileSecond          int       `description:"文件时长（秒）"`
-//	FileSize            int       `description:"文件大小（byte）"`
-//	ConvertRemark       string    `description:"转写备注-失败原因"`
-//	CreateTime          time.Time `description:"创建时间"`
-//	ModifyTime          time.Time `description:"修改时间"`
-//}
-
 type SpeechRecognition struct {
 	SpeechRecognitionId int       `gorm:"primaryKey;column:speech_recognition_id;type:int(10) unsigned;not null"`    // 语音识别Id
 	UniqueCode          string    `gorm:"column:unique_code;type:varchar(64);not null;default:''"`                   // 唯一编码
@@ -103,12 +83,6 @@ func (m *SpeechRecognition) PrimaryId() string {
 }
 
 func (m *SpeechRecognition) Create() (err error) {
-	// o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.SpeechRecognitionId = int(id)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
@@ -117,23 +91,17 @@ func (m *SpeechRecognition) CreateMulti(items []*SpeechRecognition) (err error)
 	if len(items) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *SpeechRecognition) Update(cols []string) (err error) {
-	// o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SpeechRecognition) 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.SpeechRecognitionId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, m.SpeechRecognitionId).Error
 	return
 }
@@ -142,43 +110,34 @@ func (m *SpeechRecognition) MultiDel(menuIds []int) (err error) {
 	if len(menuIds) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	//_, err = o.Raw(sql, menuIds).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, menuIds).Error
 	return
 }
 
 func (m *SpeechRecognition) GetItemById(id int) (item *SpeechRecognition, 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 = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *SpeechRecognition) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *SpeechRecognition, err error) {
-	// o := orm.NewOrm()
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *SpeechRecognition) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *SpeechRecognition) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SpeechRecognition, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -188,13 +147,11 @@ func (m *SpeechRecognition) GetItemsByCondition(condition string, pars []interfa
 		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.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SpeechRecognition) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*SpeechRecognition, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -204,7 +161,6 @@ func (m *SpeechRecognition) GetPageItemsByCondition(condition string, pars []int
 		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...).QueryRows(&items)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
@@ -308,30 +264,6 @@ func UpdateSpeechAndApiLog(speechItem *SpeechRecognition, speechCols []string, a
 		err = fmt.Errorf("speechItem nil or apiLogItem nil")
 		return
 	}
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//	} else {
-	//		_ = tx.Commit()
-	//	}
-	//}()
-	//
-	//_, e := tx.Update(speechItem, speechCols...)
-	//if e != nil {
-	//	err = fmt.Errorf("update speech err: %s", e.Error())
-	//	return
-	//}
-	//_, e = tx.Update(apiLogItem, logCols...)
-	//if e != nil {
-	//	err = fmt.Errorf("update api log err: %s", e.Error())
-	//	return
-	//}
-
 	tx := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -360,37 +292,6 @@ func CreateContentAndUpdateSpeechAndApiLog(contents []*SpeechRecognitionContent,
 		err = fmt.Errorf("speechItem nil or apiLogItem nil")
 		return
 	}
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//	} else {
-	//		_ = tx.Commit()
-	//	}
-	//}()
-	//
-	//_, e := tx.Update(speechItem, speechCols...)
-	//if e != nil {
-	//	err = fmt.Errorf("update speech err: %s", e.Error())
-	//	return
-	//}
-	//_, e = tx.Update(apiLogItem, logCols...)
-	//if e != nil {
-	//	err = fmt.Errorf("update api log err: %s", e.Error())
-	//	return
-	//}
-	//if len(contents) > 0 {
-	//	_, e = tx.InsertMulti(len(contents), contents)
-	//	if e != nil {
-	//		err = fmt.Errorf("insert multi contents err: %s", e.Error())
-	//		return
-	//	}
-	//}
-
 	tx := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -483,11 +384,9 @@ type SpeechRecognitionDetailTag struct {
 
 // GetSpeechRecognitionTagBySpeechId 获取语音识别标签
 func GetSpeechRecognitionTagBySpeechId(speechId int) (items []*SpeechRecognitionDetailTag, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT a.speech_recognition_tag_id AS tag_id, a.tag_name FROM speech_recognition_tag AS a
 		JOIN speech_recognition_tag_mapping AS b ON a.speech_recognition_tag_id = b.tag_id
 		WHERE b.speech_recognition_id = ?`
-	//_, err = o.Raw(sql, speechId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, speechId).Find(&items).Error
 	return
 }
@@ -504,11 +403,9 @@ func GetSpeechRecognitionTagsBySpeechIds(speechIds []int) (items []*SpeechRecogn
 	if len(speechIds) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT a.speech_recognition_id, a.tag_id, b.tag_name FROM speech_recognition_tag_mapping AS a
 		JOIN speech_recognition_tag AS b ON a.tag_id = b.speech_recognition_tag_id
 		WHERE a.speech_recognition_id IN (%s)`, utils.GetOrmInReplace(len(speechIds)))
-	//_, err = o.Raw(sql, speechIds).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, speechIds).Find(&items).Error
 	return
 }
@@ -542,33 +439,26 @@ type SpeechRecognitionContentExportReq struct {
 
 // UpdateSortByMenuId 根据分类ID更新排序
 func (m *SpeechRecognition) UpdateSortByMenuId(menuId, nowSort int, prevSpeechId int, updateSort string) (err error) {
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`UPDATE %s SET %s = %s WHERE %s = ? `, m.TableName(), SpeechRecognitionCols.Sort, updateSort, SpeechRecognitionCols.MenuId)
 	if prevSpeechId > 0 {
 		sql += fmt.Sprintf(` AND (%s > ? OR (%s > %d AND %s = %d))`, SpeechRecognitionCols.Sort, SpeechRecognitionCols.SpeechRecognitionId, prevSpeechId, SpeechRecognitionCols.Sort, nowSort)
 	} else {
 		sql += fmt.Sprintf(` AND %s > ?`, SpeechRecognitionCols.Sort)
 	}
-	//_, err = o.Raw(sql, menuId, nowSort).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, menuId, nowSort).Error
 	return
 }
 
 // GetMaxSortByMenuId 获取分类下最大Sort
 func (m *SpeechRecognition) GetMaxSortByMenuId(menuId int) (sort int, err error) {
-	// o := orm.NewOrm()
-	//sql := fmt.Sprintf(`SELECT MAX(sort) AS sort FROM %s WHERE %s = ?`, m.TableName(), SpeechRecognitionCols.MenuId)
 	sql := fmt.Sprintf(`SELECT COALESCE(MAX(sort),0) AS sort FROM %s WHERE %s = ?`, m.TableName(), SpeechRecognitionCols.MenuId)
-	//err = o.Raw(sql, menuId).QueryRow(&sort)
 	err = global.DEFAULT_DmSQL.Raw(sql, menuId).Scan(&sort).Error
 	return
 }
 
 // GetFirstByMenuId 获取目录下排序第一的数据
 func (m *SpeechRecognition) GetFirstByMenuId(menuId int) (item *SpeechRecognition, err error) {
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? ORDER BY %s ASC, %s ASC LIMIT 1`, m.TableName(), SpeechRecognitionCols.MenuId, SpeechRecognitionCols.Sort, SpeechRecognitionCols.SpeechRecognitionId)
-	//err = o.Raw(sql, menuId).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, menuId).First(&item).Error
 	return
 }
@@ -584,64 +474,6 @@ func (m *SpeechRecognition) SpeechSave(speechItem *SpeechRecognition, speechCols
 		err = fmt.Errorf("speech nil")
 		return
 	}
-	//o := orm.NewOrm()
-	//tx, e := o.Begin()
-	//if e != nil {
-	//	err = fmt.Errorf("transaction begin err: %s", e.Error())
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//		return
-	//	}
-	//	_ = tx.Commit()
-	//}()
-	//
-	//// 转写文件
-	//if len(speechCols) > 0 {
-	//	_, e = tx.Update(speechItem, speechCols...)
-	//	if e != nil {
-	//		err = fmt.Errorf("update speech err: %s", e.Error())
-	//		return
-	//	}
-	//}
-	//
-	//// 转写内容
-	//if len(contents) > 0 {
-	//	sql := fmt.Sprintf(`UPDATE %s SET %s = ?, %s = 1, %s = NOW() WHERE %s = ?`, "speech_recognition_content", SpeechRecognitionContentCols.Content, SpeechRecognitionContentCols.IsUpdate, SpeechRecognitionContentCols.ModifyTime, SpeechRecognitionContentCols.SpeechRecognitionContentId)
-	//	p, e := tx.Raw(sql).Prepare()
-	//	if e != nil {
-	//		err = fmt.Errorf("update prepare err: %s", e.Error())
-	//		return
-	//	}
-	//	defer func() {
-	//		_ = p.Close()
-	//	}()
-	//	for _, v := range contents {
-	//		_, e = p.Exec(v.Content, v.SpeechRecognitionContentId)
-	//		if e != nil {
-	//			err = fmt.Errorf("update exec err: %s", e.Error())
-	//			return
-	//		}
-	//	}
-	//}
-	//
-	//// 标签
-	//sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ?`, "speech_recognition_tag_mapping", SpeechRecognitionTagMappingCols.SpeechRecognitionId)
-	//_, e = tx.Raw(sql, speechItem.SpeechRecognitionId).Exec()
-	//if e != nil {
-	//	err = fmt.Errorf("remove tag mappings err: %s", e.Error())
-	//	return
-	//}
-	//if len(tagMappings) > 0 {
-	//	_, e = tx.InsertMulti(len(tagMappings), tagMappings)
-	//	if e != nil {
-	//		err = fmt.Errorf("insert tag mappings err: %s", e.Error())
-	//		return
-	//	}
-	//}
-
 	tx := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {

models/speech_recognition/speech_recognition_api_log.go

@@ -24,17 +24,6 @@ var ApiErrMsgMapping = map[int]string{
 	10007: "音频下载失败",
 }
 
-// SpeechRecognitionApiLog 语音识别-API请求日志
-//type SpeechRecognitionApiLog struct {
-//	Id                  int       `orm:"column(id);pk"`
-//	SpeechRecognitionId int       `description:"报告类型：1-中文研报；2-英文研报；3-智能研报"`
-//	RequestId           string    `description:"API请求的唯一标识TaskId"`
-//	RequestCode         int       `description:"API请求结果状态码：-1-待请求；0-成功；其他-失败"`
-//	RequestResult       string    `description:"API请求结果-JSON"`
-//	CreateTime          time.Time `description:"创建时间"`
-//	ModifyTime          time.Time `description:"修改时间"`
-//}
-
 type SpeechRecognitionApiLog struct {
 	Id                  int       `gorm:"primaryKey;column:id;type:int(10) unsigned;not null"`
 	SpeechRecognitionId int       `gorm:"index:idx_speech_id;column:speech_recognition_id;type:int(10) unsigned;not null;default:0"` // 语音识别Id
@@ -72,12 +61,6 @@ func (m *SpeechRecognitionApiLog) PrimaryId() string {
 }
 
 func (m *SpeechRecognitionApiLog) Create() (err error) {
-	// o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.Id = int(id)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
@@ -86,23 +69,17 @@ func (m *SpeechRecognitionApiLog) CreateMulti(items []*SpeechRecognitionApiLog)
 	if len(items) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *SpeechRecognitionApiLog) Update(cols []string) (err error) {
-	// o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SpeechRecognitionApiLog) 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 = global.DEFAULT_DmSQL.Exec(sql, m.Id).Error
 	return
 }
@@ -111,43 +88,34 @@ func (m *SpeechRecognitionApiLog) MultiDel(menuIds []int) (err error) {
 	if len(menuIds) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	//_, err = o.Raw(sql, menuIds).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, menuIds).Error
 	return
 }
 
 func (m *SpeechRecognitionApiLog) GetItemById(id int) (item *SpeechRecognitionApiLog, 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 = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *SpeechRecognitionApiLog) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *SpeechRecognitionApiLog, err error) {
-	// o := orm.NewOrm()
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *SpeechRecognitionApiLog) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *SpeechRecognitionApiLog) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SpeechRecognitionApiLog, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -157,13 +125,11 @@ func (m *SpeechRecognitionApiLog) GetItemsByCondition(condition string, pars []i
 		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.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SpeechRecognitionApiLog) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*SpeechRecognitionApiLog, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -173,7 +139,6 @@ func (m *SpeechRecognitionApiLog) GetPageItemsByCondition(condition string, pars
 		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...).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }

models/speech_recognition/speech_recognition_content.go

@@ -8,19 +8,6 @@ import (
 	"time"
 )
 
-// SpeechRecognitionContent 语音识别-内容表
-//type SpeechRecognitionContent struct {
-//	SpeechRecognitionContentId int       `orm:"column(speech_recognition_content_id);pk"`
-//	SpeechRecognitionId        int       `description:"语音识别ID"`
-//	Sort                       int       `description:"段落排序"`
-//	Content                    string    `description:"段落内容"`
-//	StartMs                    int       `description:"单句开始时间（毫秒）"`
-//	EndMs                      int       `description:"单句结束时间（毫秒）"`
-//	IsUpdate                   int       `description:"是否手动修改过：0-否；1-是"`
-//	CreateTime                 time.Time `description:"创建时间"`
-//	ModifyTime                 time.Time `description:"修改时间"`
-//}
-
 type SpeechRecognitionContent struct {
 	SpeechRecognitionContentId int       `gorm:"primaryKey;column:speech_recognition_content_id;type:int(10) unsigned;not null"`
 	SpeechRecognitionId        int       `gorm:"index:idx_speech_id;column:speech_recognition_id;type:int(10) unsigned;not null;default:0"` // 语音识别Id
@@ -64,12 +51,6 @@ func (m *SpeechRecognitionContent) PrimaryId() string {
 }
 
 func (m *SpeechRecognitionContent) Create() (err error) {
-	// o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.SpeechRecognitionContentId = int(id)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
@@ -78,23 +59,17 @@ func (m *SpeechRecognitionContent) CreateMulti(items []*SpeechRecognitionContent
 	if len(items) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *SpeechRecognitionContent) Update(cols []string) (err error) {
-	// o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SpeechRecognitionContent) 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.SpeechRecognitionContentId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, m.SpeechRecognitionContentId).Error
 	return
 }
@@ -103,43 +78,34 @@ func (m *SpeechRecognitionContent) MultiDel(menuIds []int) (err error) {
 	if len(menuIds) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	//_, err = o.Raw(sql, menuIds).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, menuIds).Error
 	return
 }
 
 func (m *SpeechRecognitionContent) GetItemById(id int) (item *SpeechRecognitionContent, 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 = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *SpeechRecognitionContent) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *SpeechRecognitionContent, err error) {
-	// o := orm.NewOrm()
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *SpeechRecognitionContent) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *SpeechRecognitionContent) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SpeechRecognitionContent, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -149,13 +115,11 @@ func (m *SpeechRecognitionContent) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SpeechRecognitionContent) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*SpeechRecognitionContent, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -165,7 +129,6 @@ func (m *SpeechRecognitionContent) GetPageItemsByCondition(condition string, par
 		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...).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
@@ -206,17 +169,8 @@ func (m *SpeechRecognitionContent) BatchUpdateContents(contents []SpeechRecognit
 	if len(contents) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`UPDATE %s SET %s = ?, %s = 1, %s = NOW() WHERE %s = ?`, m.TableName(), SpeechRecognitionContentCols.Content, SpeechRecognitionContentCols.IsUpdate, SpeechRecognitionContentCols.ModifyTime, SpeechRecognitionContentCols.SpeechRecognitionContentId)
-	//p, err := o.Raw(sql).Prepare()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	_ = p.Close()
-	//}()
 	for _, v := range contents {
-		//_, err = p.Exec(v.Content, v.SpeechRecognitionContentId)
 		err = global.DEFAULT_DmSQL.Exec(sql, v.Content, v.SpeechRecognitionContentId).Error
 		if err != nil {
 			return
@@ -227,9 +181,7 @@ func (m *SpeechRecognitionContent) BatchUpdateContents(contents []SpeechRecognit
 
 // ClearContentBySpeechId 清除转写文件内容
 func (m *SpeechRecognitionContent) ClearContentBySpeechId(speechId int) (err error) {
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ?`, m.TableName(), SpeechRecognitionContentCols.SpeechRecognitionId)
-	//_, err = o.Raw(sql, speechId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, speechId).Error
 	return
 }

models/speech_recognition/speech_recognition_menu.go

@@ -13,19 +13,6 @@ const (
 	SpeechRecognitionMenuNodeTypeSpeech  = 1
 )
 
-// SpeechRecognitionMenu 语音识别-目录表
-//type SpeechRecognitionMenu struct {
-//	SpeechRecognitionMenuId int       `orm:"column(speech_recognition_menu_id);pk"`
-//	UniqueCode              string    `description:"唯一编码"`
-//	MenuName                string    `description:"目录名称"`
-//	ParentId                int       `description:"父级ID"`
-//	Level                   int       `description:"目录层级"`
-//	Sort                    int       `description:"排序"`
-//	RootId                  int       `description:"顶级ID"`
-//	CreateTime              time.Time `description:"创建时间"`
-//	ModifyTime              time.Time `description:"修改时间"`
-//}
-
 type SpeechRecognitionMenu struct {
 	SpeechRecognitionMenuId int       `gorm:"primaryKey;column:speech_recognition_menu_id;type:int(10) unsigned;not null"` // 语音识别目录Id
 	UniqueCode              string    `gorm:"column:unique_code;type:varchar(64);not null;default:''"`                     // 唯一编码
@@ -69,12 +56,6 @@ func (m *SpeechRecognitionMenu) PrimaryId() string {
 }
 
 func (m *SpeechRecognitionMenu) Create() (err error) {
-	// o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.SpeechRecognitionMenuId = int(id)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
@@ -83,23 +64,17 @@ func (m *SpeechRecognitionMenu) CreateMulti(items []*SpeechRecognitionMenu) (err
 	if len(items) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *SpeechRecognitionMenu) Update(cols []string) (err error) {
-	// o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SpeechRecognitionMenu) 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.SpeechRecognitionMenuId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, m.SpeechRecognitionMenuId).Error
 	return
 }
@@ -108,43 +83,34 @@ func (m *SpeechRecognitionMenu) MultiDel(menuIds []int) (err error) {
 	if len(menuIds) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	//_, err = o.Raw(sql, menuIds).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, menuIds).Error
 	return
 }
 
 func (m *SpeechRecognitionMenu) GetItemById(id int) (item *SpeechRecognitionMenu, 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 = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *SpeechRecognitionMenu) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *SpeechRecognitionMenu, err error) {
-	// o := orm.NewOrm()
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *SpeechRecognitionMenu) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *SpeechRecognitionMenu) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SpeechRecognitionMenu, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -154,13 +120,11 @@ func (m *SpeechRecognitionMenu) GetItemsByCondition(condition string, pars []int
 		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.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SpeechRecognitionMenu) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*SpeechRecognitionMenu, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -170,7 +134,6 @@ func (m *SpeechRecognitionMenu) GetPageItemsByCondition(condition string, pars [
 		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...).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
@@ -238,31 +201,24 @@ type SpeechRecognitionMenuMoveReq struct {
 
 // UpdateSortByParentId 根据父级ID更新排序
 func (m *SpeechRecognitionMenu) UpdateSortByParentId(parentId, menuId, nowSort int, updateSort string) (err error) {
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`UPDATE %s SET %s = %s WHERE %s = ? AND %s > ?`, m.TableName(), SpeechRecognitionMenuCols.Sort, updateSort, SpeechRecognitionMenuCols.ParentId, SpeechRecognitionMenuCols.Sort)
 	if menuId > 0 {
 		sql += fmt.Sprintf(` OR (%s > %d AND %s = %d)`, SpeechRecognitionMenuCols.SpeechRecognitionMenuId, menuId, SpeechRecognitionMenuCols.Sort, nowSort)
 	}
-	//_, err = o.Raw(sql, parentId, nowSort).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, parentId, nowSort).Error
 	return
 }
 
 // GetMaxSortByParentId 获取父级分类下最大Sort
 func (m *SpeechRecognitionMenu) GetMaxSortByParentId(parentId int) (sort int, err error) {
-	// o := orm.NewOrm()
-	//sql := fmt.Sprintf(`SELECT  MAX(sort) AS sort FROM %s WHERE %s = ?`, m.TableName(), SpeechRecognitionMenuCols.ParentId)
 	sql := fmt.Sprintf(`SELECT COALESCE(MAX(sort),0) AS sort FROM %s WHERE %s = ?`, m.TableName(), SpeechRecognitionMenuCols.ParentId)
-	//err = o.Raw(sql, parentId).QueryRow(&sort)
 	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Scan(&sort).Error
 	return
 }
 
 // GetFirstByParentId 获取父级目录下排序第一的目录
 func (m *SpeechRecognitionMenu) GetFirstByParentId(parentId int) (item *SpeechRecognitionMenu, err error) {
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? ORDER BY %s ASC, %s ASC LIMIT 1`, m.TableName(), SpeechRecognitionMenuCols.ParentId, SpeechRecognitionMenuCols.Sort, SpeechRecognitionMenuCols.SpeechRecognitionMenuId)
-	//err = o.Raw(sql, parentId).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, parentId).First(&item).Error
 	return
 }
@@ -272,12 +228,10 @@ func (m *SpeechRecognitionMenu) UpdateChildByParentMenuId(menuIds []int, rootId
 	if len(menuIds) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	var pars []interface{}
 	pars = append(pars, rootId, levelStep)
 	pars = append(pars, menuIds)
 	sql := fmt.Sprintf(`UPDATE %s SET %s = ?, %s = %s + ? WHERE %s IN (%s)`, m.TableName(), SpeechRecognitionMenuCols.RootId, SpeechRecognitionMenuCols.Level, SpeechRecognitionMenuCols.Level, SpeechRecognitionMenuCols.SpeechRecognitionMenuId, utils.GetOrmInReplace(len(menuIds)))
-	//_, err = o.Raw(sql, pars).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, pars...).Error
 	return
 }

models/speech_recognition/speech_recognition_tag.go

@@ -8,17 +8,6 @@ import (
 	"time"
 )
 
-// SpeechRecognitionTag 语音识别-标签表
-//type SpeechRecognitionTag struct {
-//	SpeechRecognitionTagId int       `orm:"column(speech_recognition_tag_id);pk"`
-//	UniqueCode             string    `description:"唯一编码"`
-//	TagName                string    `description:"标签名称"`
-//	MenuId                 int       `description:"目录ID"`
-//	Sort                   int       `description:"排序"`
-//	CreateTime             time.Time `description:"创建时间"`
-//	ModifyTime             time.Time `description:"修改时间"`
-//}
-
 type SpeechRecognitionTag struct {
 	SpeechRecognitionTagId int       `gorm:"primaryKey;column:speech_recognition_tag_id;type:int(10) unsigned;not null"`
 	UniqueCode             string    `gorm:"column:unique_code;type:varchar(64);not null;default:''"`                   // 唯一编码
@@ -58,12 +47,6 @@ func (m *SpeechRecognitionTag) PrimaryId() string {
 }
 
 func (m *SpeechRecognitionTag) Create() (err error) {
-	// o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.SpeechRecognitionTagId = int(id)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
@@ -72,23 +55,17 @@ func (m *SpeechRecognitionTag) CreateMulti(items []*SpeechRecognitionTag) (err e
 	if len(items) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *SpeechRecognitionTag) Update(cols []string) (err error) {
-	// o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SpeechRecognitionTag) 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.SpeechRecognitionTagId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, m.SpeechRecognitionTagId).Error
 	return
 }
@@ -97,43 +74,34 @@ func (m *SpeechRecognitionTag) MultiDel(menuIds []int) (err error) {
 	if len(menuIds) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	//_, err = o.Raw(sql, menuIds).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, menuIds).Error
 	return
 }
 
 func (m *SpeechRecognitionTag) GetItemById(id int) (item *SpeechRecognitionTag, 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 = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *SpeechRecognitionTag) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *SpeechRecognitionTag, err error) {
-	// o := orm.NewOrm()
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *SpeechRecognitionTag) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *SpeechRecognitionTag) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SpeechRecognitionTag, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -143,13 +111,11 @@ func (m *SpeechRecognitionTag) GetItemsByCondition(condition string, pars []inte
 		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.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SpeechRecognitionTag) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*SpeechRecognitionTag, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -159,7 +125,6 @@ func (m *SpeechRecognitionTag) GetPageItemsByCondition(condition string, pars []
 		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...).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
@@ -207,32 +172,26 @@ type SpeechRecognitionTagRemoveReq struct {
 
 // UpdateSortByMenuId 根据分类ID更新排序
 func (m *SpeechRecognitionTag) UpdateSortByMenuId(menuId, nowSort int, prevTagId int, updateSort string) (err error) {
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`UPDATE %s SET %s = %s WHERE %s = ? `, m.TableName(), SpeechRecognitionTagCols.Sort, updateSort, SpeechRecognitionTagCols.MenuId)
 	if prevTagId > 0 {
 		sql += fmt.Sprintf(` AND (%s > ? OR (%s > %d AND %s = %d))`, SpeechRecognitionTagCols.Sort, SpeechRecognitionTagCols.SpeechRecognitionTagId, prevTagId, SpeechRecognitionTagCols.Sort, nowSort)
 	} else {
 		sql += fmt.Sprintf(` AND %s > ?`, SpeechRecognitionTagCols.Sort)
 	}
-	//_, err = o.Raw(sql, menuId, nowSort).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, menuId, nowSort).Error
 	return
 }
 
 // GetMaxSortByMenuId 获取分类下最大Sort
 func (m *SpeechRecognitionTag) GetMaxSortByMenuId(menuId int) (sort int, err error) {
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COALESCE(MAX(sort), 0) AS sort FROM %s WHERE %s = ?`, m.TableName(), SpeechRecognitionTagCols.MenuId)
-	//err = o.Raw(sql, menuId).QueryRow(&sort)
 	err = global.DEFAULT_DmSQL.Raw(sql, menuId).Scan(&sort).Error
 	return
 }
 
 // GetFirstByMenuId 获取目录下排序第一的数据
 func (m *SpeechRecognitionTag) GetFirstByMenuId(menuId int) (item *SpeechRecognitionTag, err error) {
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? ORDER BY %s ASC, %s ASC LIMIT 1`, m.TableName(), SpeechRecognitionTagCols.MenuId, SpeechRecognitionTagCols.Sort, SpeechRecognitionTagCols.SpeechRecognitionTagId)
-	//err = o.Raw(sql, menuId).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, menuId).First(&item).Error
 	return
 }
@@ -241,9 +200,7 @@ func (m *SpeechRecognitionTag) GetTagIdsByMenuIds(menuIds []int) (tagIds []int,
 	if len(menuIds) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE %s IN (%s) GROUP BY %s`, SpeechRecognitionTagCols.SpeechRecognitionTagId, m.TableName(), SpeechRecognitionTagCols.MenuId, utils.GetOrmInReplace(len(menuIds)), SpeechRecognitionTagCols.SpeechRecognitionTagId)
-	//_, err = o.Raw(sql, menuIds).QueryRows(&tagIds)
 	err = global.DEFAULT_DmSQL.Raw(sql, menuIds).Scan(&tagIds).Error
 	return
 }

models/speech_recognition/speech_recognition_tag_mapping.go

@@ -7,13 +7,6 @@ import (
 	"strings"
 )
 
-// SpeechRecognitionTagMapping 语音识别-标签关联表
-//type SpeechRecognitionTagMapping struct {
-//	Id                  int `orm:"column(id);pk"`
-//	SpeechRecognitionId int `description:"语音识别ID"`
-//	TagId               int `description:"标签ID"`
-//}
-
 type SpeechRecognitionTagMapping struct {
 	Id                  int `gorm:"primaryKey;column:id;type:int(10) unsigned;not null"`
 	SpeechRecognitionId int `gorm:"index:idx_speech_id;column:speech_recognition_id;type:int(10) unsigned;not null;default:0"` // 语音识别Id
@@ -39,12 +32,6 @@ func (m *SpeechRecognitionTagMapping) PrimaryId() string {
 }
 
 func (m *SpeechRecognitionTagMapping) Create() (err error) {
-	// o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.Id = int(id)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
@@ -53,23 +40,17 @@ func (m *SpeechRecognitionTagMapping) CreateMulti(items []*SpeechRecognitionTagM
 	if len(items) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *SpeechRecognitionTagMapping) Update(cols []string) (err error) {
-	// o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SpeechRecognitionTagMapping) 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 = global.DEFAULT_DmSQL.Exec(sql, m.SpeechRecognitionId).Error
 	return
 }
@@ -78,43 +59,34 @@ func (m *SpeechRecognitionTagMapping) MultiDel(menuIds []int) (err error) {
 	if len(menuIds) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	//_, err = o.Raw(sql, menuIds).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, menuIds).Error
 	return
 }
 
 func (m *SpeechRecognitionTagMapping) GetItemById(id int) (item *SpeechRecognitionTagMapping, 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 = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *SpeechRecognitionTagMapping) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *SpeechRecognitionTagMapping, err error) {
-	// o := orm.NewOrm()
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *SpeechRecognitionTagMapping) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *SpeechRecognitionTagMapping) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SpeechRecognitionTagMapping, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -124,13 +96,11 @@ func (m *SpeechRecognitionTagMapping) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SpeechRecognitionTagMapping) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*SpeechRecognitionTagMapping, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -140,16 +110,13 @@ func (m *SpeechRecognitionTagMapping) 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...).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // ClearMappingBySpeechId 清除转写文件标签关联
 func (m *SpeechRecognitionTagMapping) ClearMappingBySpeechId(speechId int) (err error) {
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ?`, m.TableName(), SpeechRecognitionTagMappingCols.SpeechRecognitionId)
-	//_, err = o.Raw(sql, speechId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, speechId).Error
 	return
 }
@@ -158,9 +125,7 @@ func (m *SpeechRecognitionTagMapping) GetSpeechIdsByTagIds(tagIds []int) (speech
 	if len(tagIds) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE %s IN (%s) GROUP BY %s`, SpeechRecognitionTagMappingCols.SpeechRecognitionId, m.TableName(), SpeechRecognitionTagMappingCols.TagId, utils.GetOrmInReplace(len(tagIds)), SpeechRecognitionTagMappingCols.SpeechRecognitionId)
-	//_, err = o.Raw(sql, tagIds).QueryRows(&speechIds)
 	err = global.DEFAULT_DmSQL.Raw(sql, tagIds).Scan(&speechIds).Error
 	return
 }

models/speech_recognition/speech_recognition_tag_menu.go

@@ -13,19 +13,6 @@ const (
 	SpeechRecognitionTagMenuNodeTypeTag     = 1
 )
 
-// SpeechRecognitionTagMenu 标签目录表
-//type SpeechRecognitionTagMenu struct {
-//	SpeechRecognitionTagMenuId int       `orm:"column(speech_recognition_tag_menu_id);pk"`
-//	UniqueCode                 string    `description:"唯一编码"`
-//	MenuName                   string    `description:"目录名称"`
-//	ParentId                   int       `description:"父级ID"`
-//	Level                      int       `description:"目录层级"`
-//	Sort                       int       `description:"排序"`
-//	RootId                     int       `description:"顶级ID"`
-//	CreateTime                 time.Time `description:"创建时间"`
-//	ModifyTime                 time.Time `description:"修改时间"`
-//}
-
 type SpeechRecognitionTagMenu struct {
 	SpeechRecognitionTagMenuId int       `gorm:"primaryKey;column:speech_recognition_tag_menu_id;type:int(10) unsigned;not null"` // 语音识别目录Id
 	UniqueCode                 string    `gorm:"column:unique_code;type:varchar(64);not null;default:''"`                         // 唯一编码
@@ -69,12 +56,6 @@ func (m *SpeechRecognitionTagMenu) PrimaryId() string {
 }
 
 func (m *SpeechRecognitionTagMenu) Create() (err error) {
-	// o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.SpeechRecognitionTagMenuId = int(id)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
@@ -83,23 +64,17 @@ func (m *SpeechRecognitionTagMenu) CreateMulti(items []*SpeechRecognitionTagMenu
 	if len(items) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *SpeechRecognitionTagMenu) Update(cols []string) (err error) {
-	// o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SpeechRecognitionTagMenu) 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.SpeechRecognitionTagMenuId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, m.SpeechRecognitionTagMenuId).Error
 	return
 }
@@ -108,43 +83,34 @@ func (m *SpeechRecognitionTagMenu) MultiDel(menuIds []int) (err error) {
 	if len(menuIds) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	//_, err = o.Raw(sql, menuIds).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, menuIds).Error
 	return
 }
 
 func (m *SpeechRecognitionTagMenu) GetItemById(id int) (item *SpeechRecognitionTagMenu, 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 = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *SpeechRecognitionTagMenu) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *SpeechRecognitionTagMenu, err error) {
-	// o := orm.NewOrm()
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *SpeechRecognitionTagMenu) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *SpeechRecognitionTagMenu) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*SpeechRecognitionTagMenu, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -154,13 +120,11 @@ func (m *SpeechRecognitionTagMenu) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *SpeechRecognitionTagMenu) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*SpeechRecognitionTagMenu, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -170,7 +134,6 @@ func (m *SpeechRecognitionTagMenu) GetPageItemsByCondition(condition string, par
 		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...).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
@@ -232,30 +195,24 @@ type SpeechRecognitionTagMenuMoveReq struct {
 
 // UpdateSortByParentId 根据父级ID更新排序
 func (m *SpeechRecognitionTagMenu) UpdateSortByParentId(parentId, menuId, nowSort int, updateSort string) (err error) {
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`UPDATE %s SET %s = %s WHERE %s = ? AND %s > ?`, m.TableName(), SpeechRecognitionTagMenuCols.Sort, updateSort, SpeechRecognitionTagMenuCols.ParentId, SpeechRecognitionTagMenuCols.Sort)
 	if menuId > 0 {
 		sql += fmt.Sprintf(` OR (%s > %d AND %s = %d)`, SpeechRecognitionTagMenuCols.SpeechRecognitionTagMenuId, menuId, SpeechRecognitionTagMenuCols.Sort, nowSort)
 	}
-	//_, err = o.Raw(sql, parentId, nowSort).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, parentId, nowSort).Error
 	return
 }
 
 // GetMaxSortByParentId 获取父级分类下最大Sort
 func (m *SpeechRecognitionTagMenu) GetMaxSortByParentId(parentId int) (sort int, err error) {
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COALESCE(MAX(sort), 0) AS sort FROM %s WHERE %s = ?`, m.TableName(), SpeechRecognitionTagMenuCols.ParentId)
-	//err = o.Raw(sql, parentId).QueryRow(&sort)
 	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Scan(&sort).Error
 	return
 }
 
 // GetFirstByParentId 获取父级目录下排序第一的目录
 func (m *SpeechRecognitionTagMenu) GetFirstByParentId(parentId int) (item *SpeechRecognitionTagMenu, err error) {
-	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? ORDER BY %s ASC, %s ASC LIMIT 1`, m.TableName(), SpeechRecognitionTagMenuCols.ParentId, SpeechRecognitionTagMenuCols.Sort, SpeechRecognitionTagMenuCols.SpeechRecognitionTagMenuId)
-	//err = o.Raw(sql, parentId).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, parentId).First(&item).Error
 	return
 }
@@ -265,12 +222,10 @@ func (m *SpeechRecognitionTagMenu) UpdateChildByParentMenuId(menuIds []int, root
 	if len(menuIds) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	var pars []interface{}
 	pars = append(pars, rootId, levelStep)
 	pars = append(pars, menuIds)
 	sql := fmt.Sprintf(`UPDATE %s SET %s = ?, %s = %s + ? WHERE %s IN (%s)`, m.TableName(), SpeechRecognitionTagMenuCols.RootId, SpeechRecognitionTagMenuCols.Level, SpeechRecognitionTagMenuCols.Level, SpeechRecognitionTagMenuCols.SpeechRecognitionTagMenuId, utils.GetOrmInReplace(len(menuIds)))
-	//_, err = o.Raw(sql, pars).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
 	return
 }

models/system/admin_config.go

@@ -5,15 +5,6 @@ import (
 	"time"
 )
 
-//type AdminConfig struct {
-//	ConfigId    int       `orm:"column(config_id);pk" description:"配置id"`
-//	AdminId     int       `description:"系统客户id"`
-//	ConfigCode  string    `description:"配置编码"`
-//	ConfigValue string    `description:"配置值"`
-//	Remark      string    `description:"备注信息"`
-//	CreateTime  time.Time `description:"创建时间"`
-//}
-
 type AdminConfig struct {
 	ConfigId    int       `gorm:"primaryKey;column:config_id;type:int(11);not null"`
 	AdminId     int       `gorm:"column:admin_id;type:int(11);not null;default:0"` // 系统客户id
@@ -25,19 +16,11 @@ type AdminConfig struct {
 
 // Update 更新基础信息
 func (item *AdminConfig) Update(cols []string) (err error) {
-	// o := orm.NewOrm()
-	//_, err = o.Update(item, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(item).Error
 	return
 }
 
 func (item *AdminConfig) Create() (err error) {
-	// o := orm.NewOrm()
-	//id, err := o.Insert(item)
-	//if err != nil {
-	//	return
-	//}
-	//item.ConfigId = int(id)
 	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
@@ -48,18 +31,14 @@ var ChartLanguageVar = `chart_language`
 
 // GetConfigDetailByCode 获取详情
 func GetConfigDetailByCode(adminId int, configCode string) (item *AdminConfig, err error) {
-	// o := orm.NewOrm()
 	sql := ` SELECT * FROM admin_config WHERE admin_id = ? AND  config_code=? `
-	//err = o.Raw(sql, adminId, configCode).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, adminId, configCode).First(&item).Error
 	return
 }
 
 // GetDefaultConfigDetailByCode 获取默认配置详情
 func GetDefaultConfigDetailByCode(configCode string) (item *AdminConfig, err error) {
-	// o := orm.NewOrm()
 	sql := ` SELECT * FROM admin_config WHERE admin_id = ? AND  config_code=? `
-	//err = o.Raw(sql, 0, configCode).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, 0, configCode).First(&item).Error
 	return
 }

models/system/admin_operate_record.go

@@ -6,19 +6,6 @@ import (
 	"time"
 )
 
-//type AdminOperateRecord struct {
-//	AdminOperateRecordId int       `gorm:"primaryKey" orm:"column(admin_operate_record_id);pk" description:"id"`
-//	AdminId              int       `description:"系统客户id"`
-//	RealName             string    `description:"配置编码"`
-//	Uuid                 string    `description:"配置值"`
-//	Uri                  string    `description:"地址"`
-//	Params               string    `description:"参数"`
-//	Ip                   string    `description:"IP"`
-//	UserAgent            string    `description:"用户代理信息"`
-//	CreateTime           time.Time `description:"创建时间"`
-//	Header               string
-//}
-
 type AdminOperateRecord struct {
 	AdminOperateRecordId int       `gorm:"primaryKey;column:admin_operate_record_id;type:int(11);not null"`
 	AdminId              int       `gorm:"index:idx_admin_id;column:admin_id;type:int(11)"`        // 系统用户id,

models/system/admin_verify_code_record.go

@@ -20,22 +20,6 @@ const (
 	AdminVerifyCodeRecordStatusFail    = 2 // 验证码发送状态-发送失败
 )
 
-// AdminVerifyCodeRecord 短信邮箱验证码记录表
-//type AdminVerifyCodeRecord struct {
-//	Id          int       `orm:"column(id);pk"`
-//	VerifyType  int       `description:"验证方式：1-手机号；2-邮箱"`
-//	Source      int       `description:"来源：1-登录；2-异常登录校验；3-忘记密码"`
-//	Mobile      string    `description:"手机号"`
-//	Email       string    `description:"邮箱"`
-//	Code        string    `description:"验证码"`
-//	ExpiredTime time.Time `description:"验证码过期时间"`
-//	SendResult  string    `description:"发送结果"`
-//	SendStatus  int       `description:"发送状态：0-待发送；1-已发送；2-发送失败"`
-//	RequestId   string    `description:"请求ID"`
-//	CreateTime  time.Time `description:"创建时间"`
-//	ModifyTime  time.Time `description:"更新时间"`
-//}
-
 type AdminVerifyCodeRecord struct {
 	Id          int       `gorm:"primaryKey;column:id;type:int(10) unsigned;not null"`
 	VerifyType  int       `gorm:"column:verify_type;type:tinyint(4) unsigned;not null;default:0"` // 验证方式：1-手机号；2-邮箱
@@ -60,12 +44,6 @@ func (m *AdminVerifyCodeRecord) PrimaryId() string {
 }
 
 func (m *AdminVerifyCodeRecord) Create() (err error) {
-	// o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.Id = int(id)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
@@ -74,53 +52,40 @@ func (m *AdminVerifyCodeRecord) CreateMulti(items []*AdminVerifyCodeRecord) (err
 	if len(items) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *AdminVerifyCodeRecord) Update(cols []string) (err error) {
-	// o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *AdminVerifyCodeRecord) 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 = global.DEFAULT_DmSQL.Exec(sql, m.Id).Error
 	return
 }
 
 func (m *AdminVerifyCodeRecord) GetItemById(id int) (item *AdminVerifyCodeRecord, 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 = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *AdminVerifyCodeRecord) GetItemByCondition(condition string, pars []interface{}) (item *AdminVerifyCodeRecord, 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).Find(&item).Error
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *AdminVerifyCodeRecord) 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 = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *AdminVerifyCodeRecord) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*AdminVerifyCodeRecord, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -130,13 +95,11 @@ func (m *AdminVerifyCodeRecord) GetItemsByCondition(condition string, pars []int
 		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.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *AdminVerifyCodeRecord) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*AdminVerifyCodeRecord, err error) {
-	// o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -146,7 +109,6 @@ func (m *AdminVerifyCodeRecord) GetPageItemsByCondition(condition string, pars [
 		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...).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }

models/system/research_group.go

@@ -1,125 +0,0 @@
-package system
-
-// ResearchGroup 研究方向分组表
-//type ResearchGroup struct {
-//	ResearchGroupId   int       `orm:"column(research_group_id);pk" description:"研究方向分组ID"`
-//	ResearchGroupName string    `json:"research_group_name" description:"研究方向分组名称"`
-//	ParentId          int       `json:"parent_id" description:"父类ID"`
-//	ChartPermissionId int       `json:"chart_permission_id" description:"品种权限ID"`
-//	Sort              int       `json:"sort" description:"排序"`
-//	State             int       `json:"state" description:"显示状态 0-不显示 1-显示"`
-//	CreateTime        time.Time `json:"create_time" description:"创建时间"`
-//	ModifyTime        time.Time `json:"modify_time" description:"更新时间"`
-//}
-
-// GetResearchGroupList 获取研究方向分组列表
-//func GetResearchGroupList() (list []*ResearchGroup, err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	sql := `SELECT * FROM research_group WHERE state = 1 ORDER BY sort`
-//	_, err = o.Raw(sql).QueryRows(&list)
-//	return
-//}
-
-// GetResearchGroupById 主键获取分组
-//func GetResearchGroupById(groupId int) (item *ResearchGroup, err error) {
-//	o := orm.NewOrm()
-//	sql := `SELECT * FROM research_group WHERE research_group_id = ? LIMIT 1`
-//	err = o.Raw(sql, groupId).QueryRow(&item)
-//	return
-//}
-
-// ResearchGroupRelation 研究方向关系表
-//type ResearchGroupRelation struct {
-//	Id              int `orm:"column(id);pk"`
-//	ResearchGroupId int `json:"research_group_id" description:"分组ID"`
-//	AdminId         int `json:"admin_id" description:"研究员ID"`
-//}
-
-// ResearchGroupRelationListByAdminId 根据研究员ID获取研究方向分组关系列表
-//func ResearchGroupRelationListByAdminId(adminId int) (list []*ResearchGroupRelation, err error) {
-//	o := orm.NewOrm()
-//	sql := `SELECT * FROM research_group_relation WHERE admin_id = ?`
-//	_, err = o.Raw(sql, adminId).QueryRows(&list)
-//	return
-//}
-
-// ResearchGroupRelationItem 研究方向分组关系表
-//type ResearchGroupRelationItem struct {
-//	ResearchGroupId int    `json:"research_group_id" description:"研究方向分组ID"`
-//	AdminId         int    `json:"admin_id" description:"研究员ID"`
-//	AdminName       string `json:"admin_name" description:"研究员姓名"`
-//}
-
-// GetResearchGroupRelationList 获取研究方向分组关系列表
-//func GetResearchGroupRelationList(include int) (list []*ResearchGroupRelationItem, err error) {
-//	// 是否包含已禁止的研究员, 默认不包含
-//	condition := ` WHERE b.enabled = 1 `
-//	if include == 1 {
-//		condition = ` WHERE 1=1 `
-//	}
-//	o := orm.NewOrm()
-//	sql := `SELECT
-//				a.research_group_id,
-//				a.admin_id,
-//				b.real_name AS admin_name
-//			FROM
-//				research_group_relation AS a
-//			INNER JOIN admin AS b ON a.admin_id = b.admin_id `
-//	sql += condition
-//	sql += ` ORDER BY
-//				a.research_group_id ASC,
-//				a.admin_id ASC`
-//	_, err = o.Raw(sql).QueryRows(&list)
-//	return
-//}
-
-// UpdateAdminResearchGroup 更新研究员研究方向分组
-//func UpdateAdminResearchGroup(adminId int, items []*ResearchGroupRelation) (err error) {
-//	o := orm.NewOrm()
-//	to, err := o.Begin()
-//	if err != nil {
-//		return
-//	}
-//	defer func() {
-//		if err != nil {
-//			_ = to.Rollback()
-//		} else {
-//			_ = to.Commit()
-//		}
-//	}()
-//	sql := `DELETE FROM research_group_relation WHERE admin_id = ?`
-//	if _, err = o.Raw(sql, adminId).Exec(); err != nil {
-//		return
-//	}
-//	itemsLen := len(items)
-//	if itemsLen > 0 {
-//		_, err = o.InsertMulti(itemsLen, items)
-//	}
-//	return
-//}
-
-// AdminResearchGroupList 研究员研究方向分组列表
-//type AdminResearchGroupList struct {
-//	AdminId      int    `json:"admin_id"`
-//	GroupNameStr string `json:"group_name_str"`
-//}
-
-// GetAdminResearchGroupListByAdminId 获取研究员研究方向分组列表
-//func GetAdminResearchGroupListByAdminId(adminIds []int) (list []*AdminResearchGroupList, err error) {
-//	if len(adminIds) == 0 {
-//		return
-//	}
-//	o := orm.NewOrm()
-//	sql := `SELECT
-//				a.admin_id,
-//				GROUP_CONCAT(b.research_group_name) AS group_name_str
-//			FROM
-//				research_group_relation AS a
-//			INNER JOIN research_group AS b ON a.research_group_id = b.research_group_id
-//			WHERE
-//				a.admin_id IN (` + utils.GetOrmInReplace(len(adminIds)) + `)
-//			GROUP BY
-//				a.admin_id`
-//	_, err = o.Raw(sql, adminIds).QueryRows(&list)
-//	return
-//}

models/system/sys_admin.go

@@ -2,7 +2,6 @@ package system
 
 import (
 	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
 	"fmt"
 	"strings"
 	"time"
@@ -47,13 +46,11 @@ type AdminItem struct {
 }
 
 func GetSysuserList(condition string, pars []interface{}, startSize, pageSize int) (items []*AdminItem, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM "admin" WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY enabled DESC, last_updated_time DESC, created_time DESC LIMIT ?,?`
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
@@ -61,12 +58,10 @@ func GetSysuserList(condition string, pars []interface{}, startSize, pageSize in
 }
 
 func GetSysuserListCount(condition string, pars []interface{}) (count int, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT COUNT(1) AS count FROM "admin" WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
@@ -130,32 +125,23 @@ type SysuserAddReq struct {
 
 func GetSysAdminCount(adminName string) (count int, err error) {
 	sql := `SELECT COUNT(1) AS count FROM "admin" WHERE admin_name=? `
-	// o := orm.NewOrm()
-	//err = o.Raw(sql, adminName).QueryRow(&count)
 	err = global.DEFAULT_DmSQL.Raw(sql, adminName).Scan(&count).Error
 	return
 }
 
 func GetSysAdminByName(adminName string) (item *Admin, err error) {
 	sql := `SELECT * FROM "admin" WHERE admin_name=? `
-	// o := orm.NewOrm()
-	//err = o.Raw(sql, adminName).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, adminName).First(&item).Error
 	return
 }
 
 func GetSysAdminById(adminId int) (item *Admin, err error) {
 	sql := `SELECT * FROM "admin" WHERE admin_id=? `
-	// o := orm.NewOrm()
-	//err = o.Raw(sql, adminId).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, adminId).First(&item).Error
 	return
 }
 
 func AddAdmin(item *Admin) (err error) {
-	// o := orm.NewOrm()
-	//adminId, err := o.Insert(item)
-	//item.AdminId = int(adminId)
 	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
@@ -200,22 +186,18 @@ type SysuserEditEnabledReq struct {
 
 // 变更状态
 func EditAdminEnabled(item *Admin) (err error) {
-	// o := orm.NewOrm()
 	sql := `UPDATE "admin"
 			SET
 			  last_updated_time = NOW(),enabled=? WHERE admin_id = ? `
-	//_, err = o.Raw(sql, item.Enabled, item.AdminId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, item.Enabled, item.AdminId).Error
 	return
 }
 
 // DisableAdmin 禁用用户
 func DisableAdmin(adminId int) (err error) {
-	// o := orm.NewOrm()
 	sql := `UPDATE "admin"
 			SET
 			  last_updated_time = NOW(),disable_time=now(),enabled=0 WHERE admin_id = ? `
-	//_, err = o.Raw(sql, adminId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, adminId).Error
 	return
 }
@@ -226,8 +208,6 @@ type SysuserDeleteReq struct {
 
 func DeleteSysuser(adminId int) (err error) {
 	sql := `DELETE FROM "admin" WHERE admin_id=? `
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql, adminId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, adminId).Error
 	return
 }
@@ -238,49 +218,40 @@ func GetSysAdminCountByMobile(mobile string, adminId int) (count int, err error)
 	if adminId > 0 {
 		sql += ` AND admin_id != ` + fmt.Sprint(adminId)
 	}
-	// o := orm.NewOrm()
-	//err = o.Raw(sql, mobile).QueryRow(&count)
 	err = global.DEFAULT_DmSQL.Raw(sql, mobile).First(&count).Error
 	return
 }
 
 func GetSysUserItems(condition string, pars []interface{}) (items []*AdminItem, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM "admin" WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY last_updated_time DESC `
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // GetGroupSysUserList 根据分组id获取系统用户列表
 func GetGroupSysUserList(groupId int) (items []*AdminItem, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM "admin" WHERE group_id=? ORDER BY created_time DESC `
-	//_, err = o.Raw(sql, groupId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, groupId).Find(&items).Error
 	return
 }
 
 // GetDepartmentGroupSysUserList 根据部门id和分组id获取系统用户列表
 func GetDepartmentGroupSysUserList(departmentId, groupId int, roleTypeCodes string) (items []*AdminItem, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM "admin" WHERE department_id = ? and group_id=? and enabled=1 `
 	if roleTypeCodes != "" {
 		sql += ` and role_type_code in (` + roleTypeCodes + `) `
 	}
 	sql += ` ORDER BY created_time asc `
-	//_, err = o.Raw(sql, departmentId, groupId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, departmentId, groupId).Find(&items).Error
 	return
 }
 
 // GetGrooupsysUserList 根据大组id和小组id获取系统用户列表
 func GetGrooupsysUserList(groupId int, roleTypeCodes string, enabled int) (items []*AdminItem, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM "admin" WHERE group_id = ? `
 	if roleTypeCodes != "" {
 		sql += ` and role_type_code in (` + roleTypeCodes + `) `
@@ -289,7 +260,6 @@ func GetGrooupsysUserList(groupId int, roleTypeCodes string, enabled int) (items
 		sql += fmt.Sprint(` AND enabled=`, enabled, ` `)
 	}
 	sql += ` ORDER BY created_time asc `
-	//_, err = o.Raw(sql, groupId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, groupId).Find(&items).Error
 	return
 }
@@ -300,37 +270,23 @@ func GetSysAdminByIdSlice(adminIdList []string) (items []*Admin, err error) {
 		return
 	}
 	sql := `SELECT * FROM "admin" WHERE admin_id in (` + strings.Join(adminIdList, ",") + `) `
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
 
 // GetTeamSysUserList 根据小组id获取系统用户列表
 func GetTeamSysUserList(teamId, enabled int) (items []*AdminItem, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM "admin" WHERE group_id=? `
 	if enabled >= 0 {
 		sql += fmt.Sprint(` AND enabled=`, enabled, ` `)
 	}
 	sql += ` ORDER BY created_time DESC `
-	//_, err = o.Raw(sql, teamId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, teamId).Find(&items).Error
 	return
 }
 
 func GetGroupIdByParentId(groupId int) (items []*string, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT group_id FROM sys_group WHERE parent_id=? ORDER BY create_time DESC `
-	//_, err = o.Raw(sql, groupId).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, groupId).Find(&items).Error
-	return
-}
-
-func GetAdminByGroupId(groupId int) (items []*AdminItem, err error) {
-	// o := orm.NewOrm()
-	sql := `SELECT * FROM "admin" WHERE group_id=? ORDER BY created_time DESC`
-	//_, err = o.Raw(sql, groupId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, groupId).Find(&items).Error
 	return
 }
@@ -342,7 +298,6 @@ type OpenIdList struct {
 
 // GetRaiAdmin 获取权益内部人员(技术组+私募组)
 func GetRaiAdmin() (items []*AdminItem, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT
 				admin_id,
 				real_name,
@@ -357,7 +312,6 @@ func GetRaiAdmin() (items []*AdminItem, err error) {
 				department_name = '产品技术部'
 				AND enabled = 1
 			)`
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
@@ -397,28 +351,6 @@ func GetSysAdminList(condition string, pars []interface{}, fieldArr []string, or
 		order = orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM "admin" WHERE 1=1 %s ORDER BY %s`, fields, condition, order)
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
-
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
-
-// GetSysAdminByIdList
-// @Description: 根据账户id列表获取账户信息列表
-// @author: Roc
-// @datetime 2024-06-05 10:49:50
-// @param adminIdList []int
-// @return items []*Admin
-// @return err error
-func GetSysAdminByIdList(adminIdList []int) (items []*Admin, err error) {
-	num := len(adminIdList)
-	if num <= 0 {
-		return
-	}
-	sql := `SELECT * FROM "admin" WHERE admin_id in (` + utils.GetOrmInReplace(num) + `) `
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql, adminIdList).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, adminIdList).Find(&items).Error
-	return
-}

models/system/sys_department.go

@@ -18,15 +18,11 @@ type SysDepartment struct {
 
 func GetSysDepartmentCount(departmentName string) (count int, err error) {
 	sql := `SELECT COUNT(1) AS count FROM sys_department WHERE department_name=? `
-	// o := orm.NewOrm()
-	//err = o.Raw(sql, departmentName).QueryRow(&count)
 	err = global.DEFAULT_DmSQL.Raw(sql, departmentName).Scan(&count).Error
 	return
 }
 
 func AddSysDepartment(item *SysDepartment) (lastId int64, err error) {
-	// o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
 	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
@@ -38,41 +34,17 @@ type SysDepartmentEditReq struct {
 
 func GetSysDepartmentById(departmentId int) (item *SysDepartment, err error) {
 	sql := `SELECT * FROM sys_department WHERE department_id=? `
-	// o := orm.NewOrm()
-	//err = o.Raw(sql, departmentId).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, departmentId).First(&item).Error
 	return
 }
 
 func GetSysDepartmentByName(departmentName string) (item *SysDepartment, err error) {
 	sql := `SELECT * FROM sys_department WHERE department_name=? `
-	// o := orm.NewOrm()
-	//err = o.Raw(sql, departmentName).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, departmentName).First(&item).Error
 	return
 }
 
 func ModifySysDepartment(departmentName string, departmentId int) (err error) {
-	// o := orm.NewOrm()
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-	//sql := `UPDATE sys_department SET department_name=? WHERE department_id=? `
-	//_, err = to.Raw(sql, departmentName, departmentId).Exec()
-	//if err != nil {
-	//	return
-	//}
-	//sql = `UPDATE admin SET department_name=? WHERE department_id=? `
-	//_, err = to.Raw(sql, departmentName, departmentId).Exec()
-
 	tx := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -82,13 +54,11 @@ func ModifySysDepartment(departmentName string, departmentId int) (err error) {
 		_ = tx.Commit()
 	}()
 	sql := `UPDATE sys_department SET department_name=? WHERE department_id=? `
-	//_, err = to.Raw(sql, departmentName, departmentId).Exec()
 	err = tx.Exec(sql, departmentName, departmentId).Error
 	if err != nil {
 		return
 	}
 	sql = `UPDATE "admin" SET department_name=? WHERE department_id=? `
-	//_, err = to.Raw(sql, departmentName, departmentId).Exec()
 	err = tx.Exec(sql, departmentName, departmentId).Error
 	return
 }
@@ -99,8 +69,6 @@ type SysDepartmentDeleteReq struct {
 
 func DeleteSysDepartment(departmentId int) (err error) {
 	sql := `DELETE FROM sys_department WHERE department_id=? `
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql, departmentId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, departmentId).Error
 	return
 }
@@ -114,22 +82,18 @@ type SysDepartmentList struct {
 }
 
 func GetDepartmentList() (items []*SysDepartmentList, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM sys_department ORDER BY sort ASC, create_time ASC `
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
 
 // GetDepartmentListByIds 根据部门id集合获取部门列表信息
 func GetDepartmentListByIds(departmentIds string) (items []*SysDepartmentList, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM sys_department where 1 = 1 `
 	if departmentIds != "" {
 		sql += `and department_id in(` + departmentIds + `) `
 	}
 	sql += ` ORDER BY sort ASC, create_time ASC `
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
@@ -140,8 +104,6 @@ type SysDepartmentListResp struct {
 
 func GetSysDepartmentAll() (item []*SysDepartment, err error) {
 	sql := `SELECT * FROM sys_department ORDER BY sort ASC, department_id ASC `
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql).QueryRows(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&item).Error
 	return
 }
@@ -155,21 +117,7 @@ func MultiUpdateDepartmentSort(items []*DepartmentSort) (err error) {
 	if len(items) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	sql := "UPDATE sys_department SET sort = ? WHERE department_id = ?"
-	//p, err := o.Raw("UPDATE sys_department SET sort = ? WHERE department_id = ?").Prepare()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	_ = p.Close()
-	//}()
-	//for _, v := range items {
-	//	_, err = p.Exec(v.Sort, v.DepartmentId)
-	//	if err != nil {
-	//		return
-	//	}
-	//}
 	for _, v := range items {
 		err = global.DEFAULT_DmSQL.Exec(sql, v.Sort, v.DepartmentId).Error
 		if err != nil {

models/system/sys_group.go

@@ -21,15 +21,11 @@ type SysGroup struct {
 
 func GetSysGroupCount(departmentId int, groupName string) (count int, err error) {
 	sql := `SELECT COUNT(1) AS count FROM sys_group WHERE department_id=? AND group_name=? `
-	// o := orm.NewOrm()
-	//err = o.Raw(sql, departmentId, groupName).QueryRow(&count)
 	err = global.DEFAULT_DmSQL.Raw(sql, departmentId, groupName).Scan(&count).Error
 	return
 }
 
 func AddSysGroup(item *SysGroup) (lastId int64, err error) {
-	// o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
 	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
@@ -41,38 +37,17 @@ type SysGroupEditReq struct {
 
 func GetSysGroupById(groupId int) (item *SysGroup, err error) {
 	sql := `SELECT * FROM sys_group WHERE group_id=? `
-	// o := orm.NewOrm()
-	//err = o.Raw(sql, groupId).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, groupId).First(&item).Error
 	return
 }
 
 func GetSysGroupByName(groupName string) (item *SysGroup, err error) {
 	sql := `SELECT * FROM sys_group WHERE group_name=? `
-	// o := orm.NewOrm()
-	//err = o.Raw(sql, groupName).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, groupName).First(&item).Error
 	return
 }
 
 func ModifySysGroup(groupName string, groupId int) (err error) {
-	// o := orm.NewOrm()
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-	//sql := `UPDATE sys_group SET group_name=? WHERE group_id=? `
-	//_, err = to.Raw(sql, groupName, groupId).Exec()
-	//sql = `UPDATE admin SET group_name=? WHERE group_id=? `
-	//_, err = to.Raw(sql, groupName, groupId).Exec()
-
 	tx := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -82,13 +57,11 @@ func ModifySysGroup(groupName string, groupId int) (err error) {
 		_ = tx.Commit()
 	}()
 	sql := `UPDATE sys_group SET group_name=? WHERE group_id=? `
-	//_, err = to.Raw(sql, groupName, groupId).Exec()
 	err = tx.Exec(sql, groupName, groupId).Error
 	if err != nil {
 		return
 	}
 	sql = `UPDATE "admin" SET group_name=? WHERE group_id=? `
-	//_, err = to.Raw(sql, groupName, groupId).Exec()
 	err = tx.Exec(sql, groupName, groupId).Error
 	return
 }
@@ -99,8 +72,6 @@ type SysGroupDeleteReq struct {
 
 func DeleteSysGroup(groupId int) (err error) {
 	sql := `DELETE FROM sys_group WHERE group_id=? `
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql, groupId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, groupId).Error
 	return
 }
@@ -117,17 +88,13 @@ type SysGroupList struct {
 }
 
 func GetSysGroupList() (items []*SysGroupList, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM sys_group ORDER BY sort ASC, create_time ASC `
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
 
 func GetSysGroupByDepartmentId(departmentId int) (items []*SysGroupList, err error) {
 	sql := `SELECT * FROM sys_group WHERE department_id=? AND parent_id=0 ORDER BY sort ASC, create_time ASC`
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql, departmentId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, departmentId).Find(&items).Error
 	return
 }
@@ -135,24 +102,18 @@ func GetSysGroupByDepartmentId(departmentId int) (items []*SysGroupList, err err
 // GetSysGroupListByDepartmentId 获取该部门下的所有分组（包含大小分组，不包含 “无” 这个分组）
 func GetSysGroupListByDepartmentId(departmentId int) (items []*SysGroupList, err error) {
 	sql := `SELECT * FROM sys_group WHERE department_id=? AND group_name<>'无' ORDER BY sort ASC, create_time ASC`
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql, departmentId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, departmentId).Find(&items).Error
 	return
 }
 
 func ClearSysUserGroup(groupId int) (err error) {
 	sql := `UPDATE "admin" SET group_id=0,group_name='' WHERE group_id=? `
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql, groupId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, groupId).Error
 	return
 }
 
 func GetSysGroupByDirectorId(directorId int) (items []*SysGroupList, err error) {
 	sql := `SELECT * FROM sys_group WHERE group_id=? ORDER BY sort ASC, create_time ASC`
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql, directorId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, directorId).Find(&items).Error
 	return
 }
@@ -160,17 +121,6 @@ func GetSysGroupByDirectorId(directorId int) (items []*SysGroupList, err error)
 // GetSysGroupByGroupId 销售主管用，查找销售主管所在大组的名称
 func GetSysGroupByGroupId(groupId int) (items []*SysGroupList, err error) {
 	sql := `SELECT * FROM sys_group WHERE department_id=2 AND parent_id=0 AND group_id=? ORDER BY sort ASC, create_time ASC`
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql, groupId).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, groupId).Find(&items).Error
-	return
-}
-
-// GetChildSysGroupByGroupId 通过上级分组id获取下级的分组id
-func GetChildSysGroupByGroupId(groupId int) (items []*SysGroup, err error) {
-	sql := `SELECT * FROM sys_group WHERE parent_id=? ORDER BY sort ASC, create_time ASC`
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql, groupId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, groupId).Find(&items).Error
 	return
 }
@@ -191,14 +141,11 @@ func GetFullGroup() (list []*SysFullGroup, err error) {
 from sys_group s 
 LEFT JOIN sys_group g on s.parent_id=g.group_id
 LEFT JOIN sys_department d on s.department_id=d.department_id ORDER BY s.sort ASC, s.create_time ASC`
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql).QueryRows(&list)
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
 	return
 }
 
 type SysGroupSortReq struct {
-	//ParentId      int   `description:"上级部门/分组ID"`
 	DepartmentIds []int `description:"移动后的一级ID排序"`
 	GroupIds      []int `description:"移动后的二级ID排序"`
 	TeamIds       []int `description:"移动后的三级ID排序"`
@@ -213,20 +160,6 @@ func MultiUpdateGroupSort(items []*GroupSort) (err error) {
 	if len(items) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
-	//p, err := o.Raw("UPDATE sys_group SET sort = ? WHERE group_id = ?").Prepare()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	_ = p.Close()
-	//}()
-	//for _, v := range items {
-	//	_, err = p.Exec(v.Sort, v.GroupId)
-	//	if err != nil {
-	//		return
-	//	}
-	//}
 	sql := "UPDATE sys_group SET sort = ? WHERE group_id = ?"
 	for _, v := range items {
 		err = global.DEFAULT_DmSQL.Exec(sql, v.Sort, v.GroupId).Error
@@ -237,24 +170,6 @@ func MultiUpdateGroupSort(items []*GroupSort) (err error) {
 	return
 }
 
-//func GetGroupByDepartmentId(departmentId int) (list []*SysFullGroup, err error) {
-//	sql := `SELECT
-//				s.*, g.group_name AS parent_group_name,
-//				d.department_name
-//			FROM
-//				sys_group s
-//			LEFT JOIN sys_group g ON s.parent_id = g.group_id
-//			LEFT JOIN sys_department d ON s.department_id = d.department_id
-//			WHERE
-//				s.department_id = ?
-//			ORDER BY
-//				s.sort ASC,
-//				s.create_time ASC`
-//	o := orm.NewOrm()
-//	_, err = o.Raw(sql, departmentId).QueryRows(&list)
-//	return
-//}
-
 type RoadshowGroupResp struct {
 	List []RoadshowGroups
 }

models/system/sys_menu.go

@@ -80,36 +80,8 @@ type MenuListResp struct {
 	List []*MenuList
 }
 
-//func GetMenuList(roleId int) (items []*MenuList, err error) {
-//	sql := ` SELECT a.* FROM sys_menu AS a
-//			INNER JOIN sys_role_menu AS b ON a.menu_id=b.menu_id
-//			INNER JOIN sys_role AS c ON b.role_id=c.role_id
-//			WHERE c.role_id=?
-//			AND a.parent_id=0
-//            ORDER BY sort ASC `
-//	_, err = orm.NewOrm().Raw(sql, roleId).QueryRows(&items)
-//	return
-//}
-
-//func GetMenuByParentId(roleId, parentId int) (items []*ChildMenu, err error) {
-//	sql := ` SELECT a.* FROM sys_menu AS a
-//			INNER JOIN sys_role_menu AS b ON a.menu_id=b.menu_id
-//			INNER JOIN sys_role AS c ON b.role_id=c.role_id
-//			WHERE c.role_id=?
-//			AND a.parent_id=?
-//            ORDER BY sort ASC `
-//	_, err = orm.NewOrm().Raw(sql, roleId, parentId).QueryRows(&items)
-//	return
-//}
-
 // GetMenuListByRoleIds 根据管理员多个角色查询菜单ID
 func GetMenuListByRoleIds(roleIds string) (items []*MenuList, err error) {
-	//sql := ` SELECT DISTINCT a.* FROM sys_menu AS a
-	//		INNER JOIN sys_role_menu AS b ON a.menu_id=b.menu_id AND b.type = 0
-	//		INNER JOIN sys_role AS c ON b.role_id=c.role_id
-	//		WHERE c.role_id in (` + roleIds + `)
-	//		AND a.parent_id=0
-	//        ORDER BY sort ASC `
 	sql := ` SELECT a.* FROM sys_menu AS a
 			INNER JOIN sys_role_menu AS b ON a.menu_id=b.menu_id AND b.type = 0
 			INNER JOIN sys_role AS c ON b.role_id=c.role_id
@@ -121,18 +93,6 @@ func GetMenuListByRoleIds(roleIds string) (items []*MenuList, err error) {
 	return
 }
 
-// GetMenuByParentIdRoleIds 根据管理员多个角色查询子菜单ID
-//func GetMenuByParentIdRoleIds(roleIds string, parentId int) (items []*ChildMenu, err error) {
-//	sql := ` SELECT DISTINCT a.* FROM sys_menu AS a
-//			INNER JOIN sys_role_menu AS b ON a.menu_id=b.menu_id AND b.type = 0
-//			INNER JOIN sys_role AS c ON b.role_id=c.role_id
-//			WHERE c.role_id in (` + roleIds + `)
-//			AND a.parent_id=?
-//            ORDER BY a.sort ASC, create_time DESC, menu_id DESC`
-//	_, err = orm.NewOrm().Raw(sql, parentId).QueryRows(&items)
-//	return
-//}
-
 // GetMenuButtonsByRoleId 获取角色按钮菜单
 func GetMenuButtonsByRoleId(roleId int) (items []*SysMenu, err error) {
 	sql := `SELECT
@@ -145,7 +105,6 @@ func GetMenuButtonsByRoleId(roleId int) (items []*SysMenu, err error) {
 			ORDER BY
 				r.sort ASC,
 				r.create_time DESC`
-	//_, err = orm.NewOrm().Raw(sql, roleId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, roleId).Find(&items).Error
 	return
 }
@@ -206,19 +165,12 @@ func GetMenuButtonApisByRoleId(roleId int) (items []*SysMenu, err error) {
 
 // GetMenuListAllByRoleIds 根据管理员多个角色查询菜单ID
 func GetMenuListAllByRoleIds(roleIds string) (items []*MenuList, err error) {
-	//sql := ` SELECT DISTINCT a.* FROM sys_menu AS a
-	//		INNER JOIN sys_role_menu AS b ON a.menu_id=b.menu_id AND b.type = 0
-	//		INNER JOIN sys_role AS c ON b.role_id=c.role_id
-	//		WHERE c.role_id in (` + roleIds + `)
-	//        AND a.menu_type=0
-	//        ORDER BY menu_id ASC `
 	sql := ` SELECT a.* FROM sys_menu AS a
 			INNER JOIN sys_role_menu AS b ON a.menu_id=b.menu_id AND b.type = 0
 			INNER JOIN sys_role AS c ON b.role_id=c.role_id
 			WHERE c.role_id in (` + roleIds + `)
             AND a.menu_type=0
             ORDER BY menu_id ASC `
-	//_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }

models/system/sys_menu_button.go

@@ -30,12 +30,6 @@ type MenuButtonsResp struct {
 	CheckList []*int
 }
 
-//func AddSysMenuButton(item *SysMenuButton) (lastId int64, err error) {
-//	o := orm.NewOrm()
-//	lastId, err = o.Insert(item)
-//	return
-//}
-
 type SysRoleButton struct {
 	Id           int `gorm:"primaryKey" description:"关联id"`
 	RoleId       int
@@ -44,8 +38,6 @@ type SysRoleButton struct {
 }
 
 func AddSysRoleButton(item *SysRoleButton) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
 	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
@@ -54,8 +46,6 @@ func GetRoleButtonCheck(roleId int) (items []*SysRoleButton, err error) {
 	sql := `SELECT b.* FROM  sys_menu_button AS a
 			INNER JOIN sys_role_button AS b ON a.menu_button_id=b.menu_button_id
 			WHERE b.role_id=?`
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, roleId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, roleId).Find(&items).Error
 	return
 }
@@ -70,24 +60,18 @@ func GetButtonMenu() (items []*ButtonMenu, err error) {
 	sql := `SELECT b.menu_id,b.name FROM sys_menu_button AS a
 			INNER JOIN sys_menu AS b ON a.menu_id=b.menu_id
 			GROUP BY  b.menu_id `
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
 
 func DeleteSysRoleButton(roleId int) (err error) {
-	//o := orm.NewOrm()
 	sql := `DELETE FROM sys_role_button WHERE role_id=? `
-	//_, err = o.Raw(sql, roleId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, roleId).Error
 	return
 }
 
 func GetSysRoleButtonCount(roleId, buttonId int) (count int, err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT COUNT(1) AS count FROM sys_role_button WHERE role_id=? AND menu_button_id=? `
-	//_, err = o.Raw(sql, roleId, buttonId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, roleId, buttonId).Error
 	return
 }

models/system/sys_role.go

@@ -32,15 +32,11 @@ type SysRoleItem struct {
 
 func GetSysRoleCount(roleName string) (count int, err error) {
 	sql := `SELECT COUNT(1) AS count FROM sys_role WHERE role_name=? `
-	// o := orm.NewOrm()
-	//err = o.Raw(sql, roleName).QueryRow(&count)
 	err = global.DEFAULT_DmSQL.Raw(sql, roleName).First(&count).Error
 	return
 }
 
 func AddSysRole(item *SysRole) (lastId int64, err error) {
-	// o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
 	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
@@ -53,16 +49,12 @@ type SysRoleEditReq struct {
 
 func GetSysRoleById(roleId int) (item *SysRoleItem, err error) {
 	sql := `SELECT * FROM sys_role WHERE role_id=? `
-	// o := orm.NewOrm()
-	//err = o.Raw(sql, roleId).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, roleId).First(&item).Error
 	return
 }
 
 func GetSysRoleByName(roleName string) (item *SysRoleItem, err error) {
 	sql := `SELECT * FROM sys_role WHERE role_name=? `
-	// o := orm.NewOrm()
-	//err = o.Raw(sql, roleName).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, roleName).First(&item).Error
 	return
 }
@@ -70,15 +62,11 @@ func GetSysRoleByName(roleName string) (item *SysRoleItem, err error) {
 // GetSysRoleByRoleTypeCode role_type_code
 func GetSysRoleByRoleTypeCode(roleTypeCode string) (item *SysRoleItem, err error) {
 	sql := `SELECT * FROM sys_role WHERE role_type_code=? `
-	// o := orm.NewOrm()
-	//err = o.Raw(sql, roleTypeCode).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, roleTypeCode).First(&item).Error
 	return
 }
 func ModifySysRole(roleName, roleType, roleTypeCode string, groupId int) (err error) {
 	sql := `UPDATE sys_role SET role_name=?,role_type=?,role_type_code=?,modify_time=NOW() WHERE role_id=? `
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql, roleName, roleType, roleTypeCode, groupId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, roleName, roleType, roleTypeCode, groupId).Error
 	return
 }
@@ -89,31 +77,25 @@ type SysRoleDeleteReq struct {
 
 func DeleteSysRole(roleId int) (err error) {
 	sql := `DELETE FROM sys_role WHERE role_id=? `
-	// o := orm.NewOrm()
-	//_, err = o.Raw(sql, roleId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, roleId).Error
 	return
 }
 
 func GetSysRoleListCount(condition string, pars []interface{}) (count int, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT COUNT(1) AS count FROM sys_role WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func GetSysRoleList(condition string, pars []interface{}, startSize, pageSize int) (items []*SysRoleItem, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM sys_role WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY modify_time DESC LIMIT ?,?`
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 
@@ -146,14 +128,12 @@ type RoleMenuListResp struct {
 
 func GetRoleMenuList() (items []*RoleMenuList, err error) {
 	sql := `SELECT * FROM sys_menu WHERE parent_id=0 ORDER BY sort ASC `
-	//_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
 
 func GetRoleMenuByParentId(parentId int) (items []*RoleMenu, err error) {
 	sql := `SELECT * FROM sys_menu WHERE parent_id=? ORDER BY sort ASC `
-	//_, err = orm.NewOrm().Raw(sql, parentId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Find(&items).Error
 	return
 }
@@ -163,7 +143,6 @@ func GetCheckListRoleMenu(roleId, parentId int) (items []*RoleMenuList, err erro
 				INNER JOIN sys_menu AS b ON a.menu_id=b.menu_id
 				WHERE a.role_id=? AND a.type = 0
 				AND b.parent_id=? `
-	//_, err = orm.NewOrm().Raw(sql, roleId, parentId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, roleId, parentId).Find(&items).Error
 	return
 }
@@ -176,7 +155,6 @@ type RoleMenusAddReq struct {
 
 func DeleteRoleMenuByRoleId(roleId int) (err error) {
 	sql := `DELETE FROM sys_role_menu WHERE role_id=? `
-	//_, err = orm.NewOrm().Raw(sql, roleId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, roleId).Error
 	return
 
@@ -190,8 +168,6 @@ type SysRoleMenu struct {
 }
 
 func AddSysRoleMenu(item *SysRoleMenu) (lastId int64, err error) {
-	// o := orm.NewOrm()
-	//lastId, err = o.Insert(item)
 	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
@@ -201,29 +177,6 @@ func CreateMultiSysRoleMenu(roleId int, items []*SysRoleMenu) (err error) {
 	if roleId == 0 {
 		return
 	}
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//		return
-	//	}
-	//	_ = tx.Commit()
-	//}()
-	//
-	//sql := `DELETE FROM sys_role_menu WHERE role_id = ?`
-	//_, err = tx.Raw(sql, roleId).Exec()
-	//if err != nil {
-	//	return
-	//}
-	//
-	//if len(items) > 0 {
-	//	_, err = tx.InsertMulti(len(items), items)
-	//}
-
 	tx := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -234,27 +187,23 @@ func CreateMultiSysRoleMenu(roleId int, items []*SysRoleMenu) (err error) {
 	}()
 
 	sql := `DELETE FROM sys_role_menu WHERE role_id = ?`
-	//_, err = tx.Raw(sql, roleId).Exec()
 	err = tx.Exec(sql, roleId).Error
 	if err != nil {
 		return
 	}
 
 	if len(items) > 0 {
-		//_, err = tx.InsertMulti(len(items), items)
 		err = tx.CreateInBatches(items, utils.MultiAddNum).Error
 	}
 	return
 }
 
 func GetSysRoleAll(levelFlag bool) (items []*SysRoleItem, err error) {
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM sys_role WHERE 1=1`
 	if levelFlag {
 		sql += ` and role_level = 0`
 	}
 	sql += ` ORDER BY create_time DESC `
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
@@ -268,9 +217,7 @@ func GetEnglishAuthRoleIds(roleCodes []string) (roleIds []int, err error) {
 	if len(roleCodes) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	sql := `SELECT role_id FROM sys_role WHERE role_type_code IN (` + utils.GetOrmInReplace(len(roleCodes)) + `)`
-	//_, err = o.Raw(sql, roleCodes).QueryRows(&roleIds)
 	err = global.DEFAULT_DmSQL.Raw(sql, roleCodes).Scan(&roleIds).Error
 	return
 }
@@ -283,7 +230,6 @@ func GetSysRoleMenuByRoleId(roleId int) (items []*SysRoleMenu, err error) {
 				sys_role_menu
 			WHERE
 				role_id = ?`
-	//_, err = orm.NewOrm().Raw(sql, roleId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, roleId).Find(&items).Error
 	return
 }
@@ -293,9 +239,7 @@ func GetEnglishAuthRoleItems(roleCodes []string) (items []*SysRole, err error) {
 	if len(roleCodes) == 0 {
 		return
 	}
-	// o := orm.NewOrm()
 	sql := `SELECT * FROM sys_role WHERE role_type_code IN (` + utils.GetOrmInReplace(len(roleCodes)) + `)`
-	//_, err = o.Raw(sql, roleCodes).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, roleCodes).Find(&items).Error
 	return
 }

models/system/sys_role_admin.go

@@ -39,19 +39,10 @@ func (sa *SysRoleAdmin) TableName() string {
 // GetRoleIdsByAdminId 根据管理员账号查询角色ID
 func GetRoleIdsByAdminId(adminId int) (items []*SysRoleAdmin, err error) {
 	sql := `SELECT * from sys_role_admin where admin_id = ?`
-	//_, err = orm.NewOrm().Raw(sql, adminId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, adminId).Find(&items).Error
 	return
 }
 
-// GetRoleIdsByAdminIdRoleId 根据管理员账号和角色查询
-func GetRoleIdsByAdminIdRoleId(adminId int, roleId int) (item *SysRoleAdmin, err error) {
-	sql := `SELECT * from sys_role_admin where admin_id = ? and role_id=?`
-	//err = orm.NewOrm().Raw(sql, adminId, roleId).QueryRow(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, adminId, roleId).First(&item).Error
-	return
-}
-
 // GetRoleAdminList 查询对应角色绑定的管理员列表
 func GetRoleAdminList(condition string, pars []interface{}, startSize, pageSize int) (list []*RoleAdminItem, err error) {
 	sql := `SELECT
@@ -114,8 +105,6 @@ where s.role_id=? and s.admin_id in (` + adminIds + `)`
 
 // AddRoleAdminBatch 批量新增留言版管理员
 func AddRoleAdminBatch(admins []*SysRoleAdmin) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(admins), admins)
 	err = global.DEFAULT_DmSQL.CreateInBatches(admins, utils.MultiAddNum).Error
 	return
 }
@@ -123,26 +112,12 @@ func AddRoleAdminBatch(admins []*SysRoleAdmin) (err error) {
 // DeleteRoleAdmin 删除管理员和角色的绑定
 func DeleteRoleAdmin(SysRoleAdminId int) (err error) {
 	sql := `DELETE FROM sys_role_admin WHERE id=? `
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, SysRoleAdminId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, SysRoleAdminId).Error
 	return
 }
 
-// GetRoleAdminById 根据ID查询绑定记录
-//func GetRoleAdminById(SysRoleAdminId int) (item *SysRoleAdmin, err error) {
-//	sql := `SELECT
-//	*
-//FROM
-//	sys_role_admin
-//where id=?`
-//	err = orm.NewOrm().Raw(sql, SysRoleAdminId).QueryRow(&item)
-//	return
-//}
-
 // GetEnglishAuthRoleAdminList 查询英文权限管理员列表
 func GetEnglishAuthRoleAdminList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*RoleAdminItem, err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT
 				s.id as sys_role_admin_id,
 				a.admin_id,
@@ -167,16 +142,12 @@ func GetEnglishAuthRoleAdminList(condition string, pars []interface{}, startSize
 	sql += ` GROUP BY s.admin_id `
 
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
-	//	return
-	//}
 	err = global.DEFAULT_DmSQL.Raw(totalSQl, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
 
 	sql += ` ORDER BY s.create_time DESC,s.admin_id ASC LIMIT ?,? `
-	//_, err = o.Raw(sql, pars...).QueryRows(&list)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&list).Error
 	return
 }
@@ -186,9 +157,7 @@ func DeleteRoleAdminByAdminIdAndRoleIds(adminId int, roleIds []int) (err error)
 	if len(roleIds) == 0 {
 		return
 	}
-	//o := orm.NewOrm()
 	sql := `DELETE FROM sys_role_admin WHERE admin_id = ? AND role_id IN (` + utils.GetOrmInReplace(len(roleIds)) + `) `
-	//_, err = o.Raw(sql, adminId, roleIds).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, adminId, roleIds).Error
 	return
 }
@@ -198,7 +167,6 @@ func CheckEnglishAuthRoleAdminByAdminIds(adminIds []int, roleCodes []string) (li
 	if len(adminIds) == 0 || len(roleCodes) == 0 {
 		return
 	}
-	//o := orm.NewOrm()
 	sql := `SELECT
 				s.*
 			FROM
@@ -209,7 +177,6 @@ func CheckEnglishAuthRoleAdminByAdminIds(adminIds []int, roleCodes []string) (li
 				s.admin_id IN (` + utils.GetOrmInReplace(len(adminIds)) + `) AND r.role_type_code IN (` + utils.GetOrmInReplace(len(roleCodes)) + `)
 			GROUP BY
 				s.admin_id`
-	//_, err = o.Raw(sql, adminIds, roleCodes).QueryRows(&list)
 	err = global.DEFAULT_DmSQL.Raw(sql, adminIds, roleCodes).Find(&list).Error
 	return
 }
@@ -225,7 +192,6 @@ func GetAdminEnglishAuthRoleDetail(adminId int, roleCodes []string) (list []*Eng
 	if len(roleCodes) == 0 {
 		return
 	}
-	//o := orm.NewOrm()
 	sql := `SELECT
 				s.admin_id, r.role_type_code
 			FROM
@@ -234,36 +200,12 @@ func GetAdminEnglishAuthRoleDetail(adminId int, roleCodes []string) (list []*Eng
 			JOIN admin AS a ON s.admin_id = a.admin_id
 			WHERE
 				s.admin_id = ? AND r.role_type_code IN (` + utils.GetOrmInReplace(len(roleCodes)) + `)`
-	//_, err = o.Raw(sql, adminId, roleCodes).QueryRows(&list)
 	err = global.DEFAULT_DmSQL.Raw(sql, adminId, roleCodes).Find(&list).Error
 	return
 }
 
 // EditEnglishAuthRoleAdmin 编辑管理员英文权限
 func EditEnglishAuthRoleAdmin(adminId int, englishRoleIds []int, roleAdmins []*SysRoleAdmin) (err error) {
-	//o := orm.NewOrm()
-	//tx, e := o.Begin()
-	//if e != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = tx.Rollback()
-	//	} else {
-	//		_ = tx.Commit()
-	//	}
-	//}()
-	//
-	//// 删除原绑定关系
-	//sql := `DELETE FROM sys_role_admin WHERE admin_id = ? AND role_id IN (` + utils.GetOrmInReplace(len(englishRoleIds)) + `)`
-	//_, err = tx.Raw(sql, adminId, englishRoleIds).Exec()
-	//if err != nil {
-	//	return
-	//}
-	//
-	//// 新增绑定关系
-	//_, err = tx.InsertMulti(len(roleAdmins), roleAdmins)
-
 	tx := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -275,14 +217,12 @@ func EditEnglishAuthRoleAdmin(adminId int, englishRoleIds []int, roleAdmins []*S
 
 	// 删除原绑定关系
 	sql := `DELETE FROM sys_role_admin WHERE admin_id = ? AND role_id IN (` + utils.GetOrmInReplace(len(englishRoleIds)) + `)`
-	//_, err = tx.Raw(sql, adminId, englishRoleIds).Exec()
 	err = tx.Exec(sql, adminId, englishRoleIds).Error
 	if err != nil {
 		return
 	}
 
 	// 新增绑定关系
-	//_, err = tx.InsertMulti(len(roleAdmins), roleAdmins)
 	err = tx.CreateInBatches(roleAdmins, utils.MultiAddNum).Error
 	return
 }

models/system/sys_session.go

@@ -16,10 +16,6 @@ type SysSession struct {
 	LastUpdatedTime time.Time
 }
 
-//func (m *SysSession) TableName() string {
-//	return "sys_session"
-//}
-
 // AddSysSession 新增用户登录session信息
 func AddSysSession(item *SysSession) (err error) {
 	o := global.DEFAULT_DmSQL
@@ -28,13 +24,6 @@ func AddSysSession(item *SysSession) (err error) {
 	return
 }
 
-//func GetSysSessionBySysUserId(sysUserId int) (item *SysSession, err error) {
-//	sql := `SELECT * FROM sys_session WHERE sys_user_id=? AND expired_time> NOW() ORDER BY expired_time DESC LIMIT 1 `
-//	o := orm.NewOrm()
-//	err = o.Raw(sql, sysUserId).QueryRow(&item)
-//	return
-//}
-
 // GetSysSessionByToken 根据token获取session
 func GetSysSessionByToken(token string) (item *SysSession, err error) {
 	sql := `SELECT * FROM sys_session WHERE access_token=? AND expired_time> NOW() ORDER BY expired_time DESC LIMIT 1 `
@@ -53,9 +42,7 @@ func ExpiredSysSessionByAdminId(adminId int) (err error) {
 
 // UnBindAdminRecordByUserId 根据系统用户id解除绑定用户关系
 func UnBindAdminRecordByUserId(userId int) (err error) {
-	//o := orm.NewOrm()
 	msql := ` UPDATE admin_record SET user_id = 0 WHERE user_id = ? `
-	//_, err = o.Raw(msql, userId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(msql, userId).Error
 	return
 }

models/system/sys_team.go

@@ -21,8 +21,6 @@ type SysTeam struct {
 
 func GetSysTeamCount(groupId int, teamName string) (count int, err error) {
 	sql := `SELECT COUNT(1) AS count FROM sys_group WHERE parent_id=? AND group_name=? `
-	//o := orm.NewOrm()
-	//err = o.Raw(sql, groupId, teamName).QueryRow(&count)
 	err = global.DEFAULT_DmSQL.Raw(sql, groupId, teamName).Scan(&count).Error
 	return
 }
@@ -34,30 +32,11 @@ type SysTeamEditReq struct {
 
 func GetSysTeamByName(teamName string) (item *SysGroup, err error) {
 	sql := `SELECT * FROM sys_group WHERE group_name=? `
-	//o := orm.NewOrm()
-	//err = o.Raw(sql, teamName).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, teamName).First(&item).Error
 	return
 }
 
 func ModifySysTeam(teamName string, teamId int) (err error) {
-	//o := orm.NewOrm()
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-	//sql := `UPDATE sys_group SET group_name=? WHERE group_id=? `
-	//_, err = to.Raw(sql, teamName, teamId).Exec()
-	//sql = `UPDATE admin SET group_name=? WHERE group_id=? `
-	//_, err = to.Raw(sql, teamName, teamId).Exec()
-
 	tx := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -67,13 +46,11 @@ func ModifySysTeam(teamName string, teamId int) (err error) {
 		_ = tx.Commit()
 	}()
 	sql := `UPDATE sys_group SET group_name=? WHERE group_id=? `
-	//_, err = to.Raw(sql, teamName, teamId).Exec()
 	err = tx.Exec(sql, teamName, teamId).Error
 	if err != nil {
 		return
 	}
 	sql = `UPDATE "admin" SET group_name=? WHERE group_id=? `
-	//_, err = to.Raw(sql, teamName, teamId).Exec()
 	err = tx.Exec(sql, teamName, teamId).Error
 	return
 }
@@ -91,16 +68,12 @@ type SysTeamList struct {
 
 func GetSysTeamByDepartmentId(groupId int) (items []*SysTeamList, err error) {
 	sql := `SELECT * FROM sys_group WHERE parent_id=? ORDER BY sort ASC, create_time ASC`
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, groupId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, groupId).Find(&items).Error
 	return
 }
 
 func ClearSysUserTeam(groupId int) (err error) {
 	sql := `UPDATE "admin" SET group_id=0,group_name='' WHERE group_id=? `
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, groupId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, groupId).Error
 	return
 }

models/system/sys_user.go

@@ -69,17 +69,13 @@ type Admin struct {
 
 // Update 更新用户基础信息
 func (item *Admin) Update(cols []string) (err error) {
-	//o := global.DEFAULT_DmSQL
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(*item).Error
-
 	return
 }
 
 func CheckSysUser(userName, password string) (item *Admin, err error) {
 	sql := ` SELECT a.*,b.role_type_code FROM "admin" AS a
 			 INNER JOIN sys_role AS b ON a.role_id=b.role_id WHERE a.admin_name=? AND a.password=? LIMIT 1`
-	//o := orm.NewOrm()
-	//err = o.Raw(sql, userName, password).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, userName, password).First(&item).Error
 	return
 }
@@ -87,14 +83,11 @@ func CheckSysUser(userName, password string) (item *Admin, err error) {
 func GetSysUserById(sysUserId int) (item *Admin, err error) {
 	sql := `SELECT * FROM "admin" WHERE admin_id=? LIMIT 1`
 	err = global.DEFAULT_DmSQL.Raw(sql, sysUserId).First(&item).Error
-
 	return
 }
 
 func ModifyPwd(sysUserId int, newPwd string) (err error) {
 	sql := `UPDATE "admin" SET password=?,last_updated_time=NOW() WHERE admin_id=? `
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, newPwd, sysUserId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, newPwd, sysUserId).Error
 	return
 }
@@ -119,8 +112,6 @@ func GetAdminListByIdList(idList []int) (items []*Admin, err error) {
 		return
 	}
 	sql := `SELECT * FROM "admin" WHERE admin_id in (` + utils.GetOrmInReplace(lenNum) + `) and enabled=1 `
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, idList).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, idList).Find(&items).Error
 	return
 }
@@ -132,22 +123,17 @@ func GetAdminListByIdListWithoutEnable(idList []int) (items []*Admin, err error)
 		return
 	}
 	sql := `SELECT * FROM "admin" WHERE admin_id in (` + utils.GetOrmInReplace(lenNum) + `) `
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, idList).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, idList).Find(&items).Error
 	return
 }
 
 func (item *Admin) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM "admin" WHERE 1=1 %s`, condition)
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (item *Admin) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*Admin, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -157,14 +143,12 @@ func (item *Admin) GetItemsByCondition(condition string, pars []interface{}, fie
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM "admin" WHERE 1=1 %s %s`, fields, condition, order)
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // GetSysUserByMobile 手机号获取用户
 func GetSysUserByMobile(mobile string) (item *Admin, err error) {
-	//o := global.DEFAULT_DmSQL
 	sql := `SELECT
 				a.*, b.role_type_code
 			FROM
@@ -173,14 +157,12 @@ func GetSysUserByMobile(mobile string) (item *Admin, err error) {
 			WHERE
 				a.mobile = ?
 			LIMIT 1`
-	//err = o.Raw(sql, mobile).Find(&item).Error
 	err = global.DEFAULT_DmSQL.Raw(sql, mobile).First(&item).Error
 	return
 }
 
 // GetSysUserByEmail 邮箱获取用户
 func GetSysUserByEmail(email string) (item *Admin, err error) {
-	//o := global.DEFAULT_DmSQL
 	sql := `SELECT
 				a.*, b.role_type_code
 			FROM
@@ -189,7 +171,6 @@ func GetSysUserByEmail(email string) (item *Admin, err error) {
 			WHERE
 				a.email = ?
 			LIMIT 1`
-	//err = o.Raw(sql, email).Find(&item).Error
 	err = global.DEFAULT_DmSQL.Raw(sql, email).First(&item).Error
 	return
 }

models/system/sys_user_login_record.go

@@ -14,13 +14,8 @@ type SysUserLoginRecord struct {
 	CreateTime time.Time
 }
 
-//func (m *SysUserLoginRecord) TableName() string {
-//	return "sys_user_login_record"
-//}
-
 // AddSysUserLoginRecord 新增登录记录
 func AddSysUserLoginRecord(item *SysUserLoginRecord) (err error) {
 	err = global.DEFAULT_DmSQL.Create(item).Error
-
 	return
 }

models/yb/price_driven.go

@@ -1,76 +0,0 @@
-package yb
-
-// PriceDriven 价格驱动表
-//type PriceDriven struct {
-//	PriceDrivenId int `orm:"column(price_driven_id);pk" description:"价格驱动ID"`
-//	//ChartPermissionId   int       `json:"chart_permission_id" description:"品种权限ID"`
-//	VarietyTagId        int       `json:"variety_tag_id" description:"标签ID"`
-//	VarietyTagName      string    `json:"variety_tag_name" description:"标签名称"`
-//	MainVariable        string    `json:"main_variable" description:"关键变量"`
-//	CoreDrivenType      int       `json:"core_driven_type" description:"核心驱动类型 0-多 1-空"`
-//	CoreDrivenContent   string    `json:"core_driven_content" description:"核心驱动内容"`
-//	CoreContent         string    `json:"core_content" description:"核心内容"`
-//	LastUpdateAdminId   int       `json:"last_update_admin_id" description:"最后更新人ID"`
-//	LastUpdateAdminName string    `json:"last_update_admin_name" description:"最后更新人名称"`
-//	ThsMsgState         int       `json:"ths_msg_state" description:"同花顺推送状态：0-未推送 1-已推送"`
-//	TemplateMsgState    int       `json:"template_msg_state" description:"模板消息推送状态：0-未推送 1-已推送"`
-//	PublishState        int       `json:"publish_state" description:"发布状态：0-未发布 1-已发布"`
-//	SendThsMsgTime      time.Time `json:"last_ths_msg_time" description:"最后推送同花顺客群消息时间"`
-//	SendTemplateMsgTime time.Time `json:"last_template_msg_time" description:"最后推送模板消息时间"`
-//	CreateTime          time.Time `json:"create_time" description:"创建时间"`
-//	ModifyTime          time.Time `json:"modify_time" description:"更新时间"`
-//}
-
-// TableName 表名变更
-//func (priceDrivenInfo *PriceDriven) TableName() string {
-//	return "yb_price_driven"
-//}
-
-// Add 新增
-//func (priceDrivenInfo *PriceDriven) Add() (err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	id, err := o.Insert(priceDrivenInfo)
-//	if err != nil {
-//		return
-//	}
-//	priceDrivenInfo.PriceDrivenId = int(id)
-//	return
-//}
-
-// Update 更新
-//func (priceDrivenInfo *PriceDriven) Update(cols []string) (err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	_, err = o.Update(priceDrivenInfo, cols...)
-//	return
-//}
-
-// PriceDrivenSaveLog 价格驱动保存记录表
-//type PriceDrivenSaveLog struct {
-//	Id            int `orm:"column(id);pk"`
-//	PriceDrivenId int `json:"price_driven_id" description:"价格驱动ID"`
-//	//ChartPermissionId int       `json:"chart_permission_id" description:"品种权限ID"`
-//	VarietyTagId      int       `json:"variety_tag_id" description:"标签ID"`
-//	MainVariable      string    `json:"main_variable" description:"关键变量"`
-//	CoreDrivenType    int       `json:"core_driven_type" description:"核心驱动类型 0-多 1-空"`
-//	CoreDrivenContent string    `json:"core_driven_content" description:"核心驱动内容"`
-//	CoreContent       string    `json:"core_content" description:"核心内容"`
-//	AdminId           int       `json:"admin_id" description:"更新人ID"`
-//	AdminName         string    `json:"admin_name" description:"更新人名称"`
-//	CreateTime        time.Time `json:"create_time" description:"创建时间"`
-//}
-
-// TableName 表名变更
-//func (priceDrivenSaveLogInfo *PriceDrivenSaveLog) TableName() string {
-//	return "yb_price_driven_save_log"
-//}
-
-// Add 新增保存记录
-//func (priceDrivenSaveLogInfo *PriceDrivenSaveLog) Add() (err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	lastId, err := o.Insert(priceDrivenSaveLogInfo)
-//	if err != nil {
-//		return
-//	}
-//	priceDrivenSaveLogInfo.PriceDrivenId = int(lastId)
-//	return
-//}

models/yb/price_driven_tag.go

@@ -1,24 +0,0 @@
-package yb
-
-// PriceDrivenTag 标签库分类表
-//type PriceDrivenTag struct {
-//	Id             int       `orm:"column(id);pk" `
-//	VarietyTagId   int       `json:"variety_tag_id" description:"标签ID"`
-//	VarietyTagName string    `json:"variety_tag_name" description:"标签名称"`
-//	State          int       `json:"state" description:"显示状态 0-禁用 1-启用"`
-//	CreateTime     time.Time `json:"create_time" description:"创建时间"`
-//	ModifyTime     time.Time `json:"modify_time" description:"更新时间"`
-//}
-
-// TableName 表名变更
-//func (priceDrivenTag *PriceDrivenTag) TableName() string {
-//	return "yb_price_driven_tag"
-//}
-
-// GetPriceDrivenTagList 获取价格驱动标签列表
-//func GetPriceDrivenTagList() (list []*PriceDrivenTag, err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	sql := `SELECT * FROM yb_price_driven_tag`
-//	_, err = o.Raw(sql).QueryRows(&list)
-//	return
-//}

models/yb/yb_community_question_process.go

@@ -1,63 +0,0 @@
-package yb
-
-//const (
-//	// 流程类型: 1-分配; 2-转移
-//	ProcessTypeDistribute = 1
-//	ProcessTypeTransfer   = 2
-//)
-
-// CommunityQuestionProcess 问答社区流程表
-//type CommunityQuestionProcess struct {
-//	Id                  int       `orm:"column(id);pk" json:"-"`
-//	CommunityQuestionId int       `json:"community_question_id"`
-//	TransferUserId      int       `json:"transfer_user_id"`
-//	TransferAdminId     int       `json:"transfer_admin_id"`
-//	TransferAdminName   string    `json:"transfer_admin_name"`
-//	ReplierUserId       int       `json:"replier_user_id"`
-//	ReplierAdminId      int       `json:"replier_admin_id"`
-//	ReplierAdminName    string    `json:"replier_admin_name"`
-//	Remark              string    `json:"remark"`
-//	ProcessType         int       `json:"process_type"`
-//	CreateTime          time.Time `json:"create_time"`
-//	VarietyClassifyId   int       `json:"variety_classify_id"`
-//	VarietyTagId        int       `json:"variety_tag_id"`
-//}
-
-//func (item *CommunityQuestionProcess) TableName() string {
-//	return "yb_community_question_process"
-//}
-
-//func (item *CommunityQuestionProcess) Create() (err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	id, err := o.Insert(item)
-//	if err != nil {
-//		return
-//	}
-//	item.Id = int(id)
-//	return
-//}
-
-// CommunityQuestionProcessItem 问答社区流程
-//type CommunityQuestionProcessItem struct {
-//	CommunityQuestionId int
-//	TransferUserId      int
-//	TransferAdminId     int
-//	TransferAdminName   string
-//	ReplierUserId       int
-//	ReplierAdminId      int
-//	ReplierAdminName    string
-//	Remark              string
-//	ProcessType         int
-//	CreateTime          string
-//	VarietyClassifyId   int
-//	VarietyTagId        int
-//}
-
-// GetCommunityQuestionProcessItemList 根据问答ID获取流程
-//func GetCommunityQuestionProcessItemList(questionId int) (list []*CommunityQuestionProcessItem, err error) {
-//	list = make([]*CommunityQuestionProcessItem, 0)
-//	o := orm.NewOrmUsingDB("weekly")
-//	sql := `SELECT * FROM yb_community_question_process WHERE community_question_id = ? ORDER BY create_time DESC`
-//	_, err = o.Raw(sql, questionId).QueryRows(&list)
-//	return
-//}