清理代码

cache/crm_config_cache.go

@@ -1,27 +1 @@
 package cache
-
-//func GetIntervalFromCrmConfig(key string) int {
-//	//redis 查询key
-//	sIntervals := utils.Rc.Get(key)
-//	var interval int
-//	var err error
-//	if sIntervals == nil {
-//		//redis没查到，去数据库查
-//		interval, err = company.GetConfigValueByCode(key)
-//		if err != nil {
-//			fmt.Println("GetConfigValueByCode Err:" + err.Error())
-//		}
-//		//插入redis
-//		if !utils.Rc.SetNX(key, interval, 2*time.Hour) {
-//			fmt.Println("setNX Err")
-//		}
-//		return interval
-//	} else {
-//		intervals := fmt.Sprintf("%s", sIntervals)
-//		interval, err = strconv.Atoi(intervals)
-//		if err != nil {
-//			fmt.Println("strconv err:", err.Error())
-//		}
-//		return interval
-//	}
-//}

models/manual_edb.go

@@ -22,8 +22,6 @@ type TargetDetailResp struct {
 // @return err error
 func GetTargetByTradeCode(tradeCode string) (item *EdbInfoItem, err error) {
 	sql := `SELECT * FROM edbinfo WHERE TRADE_CODE = ?  `
-	//o := orm.NewOrmUsingDB("edb")
-	//err = o.Raw(sql, tradeCode).QueryRow(&item)
 	err = global.DmSQL["edb"].Raw(sql, tradeCode).First(&item).Error
 	return
 }
@@ -37,16 +35,12 @@ func GetTargetByTradeCode(tradeCode string) (item *EdbInfoItem, err error) {
 // @return total int
 // @return err error
 func GetCountManualUserClassify(sysUserId, classifyId int) (total int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT count(1) ct FROM manual_user_classify WHERE admin_id=? AND classify_id = ? `
-	//err = o.Raw(sql, sysUserId, classifyId).QueryRow(&total)
 	err = global.DmSQL["data"].Raw(sql, sysUserId, classifyId).Scan(&total).Error
 	return
 }
 func GetManualClassifyByClassifyId(classifyId int) (item *EdbdataClassify, err error) {
-	//o := orm.NewOrmUsingDB("edb")
 	sql := ` SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE classify_id = ?  `
-	//err = o.Raw(sql, classifyId).QueryRow(&item)
 	err = global.DmSQL["edb"].Raw(sql, classifyId).First(&item).Error
 	return
 }
@@ -60,8 +54,6 @@ func GetManualClassifyByClassifyId(classifyId int) (item *EdbdataClassify, err e
 // @return err error
 func GetEdbDataListByCode(tradeCode string) (items []*Edbdata, err error) {
 	sql := ` SELECT  TRADE_CODE,DT,round(CLOSE,4) CLOSE,modify_time  FROM edbdata WHERE TRADE_CODE = ?  GROUP BY TRADE_CODE,DT ORDER BY DT DESC `
-	//o := orm.NewOrmUsingDB("edb")
-	//_, err = o.Raw(sql, tradeCode).QueryRows(&items)
 	err = global.DmSQL["edb"].Raw(sql, tradeCode).Find(&items).Error
 	return
 }
@@ -105,7 +97,6 @@ type EdbListResp struct {
 // @return items []*Edbinfo
 // @return err error
 func GetEdbInfoList(condition string, pars []interface{}, startSize, pageSize int) (items []*EdbInfoListItem, err error) {
-	//o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT DISTINCT a.* FROM edbinfo AS a  WHERE a.classify_id > 0 `
 	if condition != "" {
 		sql += condition
@@ -118,7 +109,6 @@ func GetEdbInfoList(condition string, pars []interface{}, startSize, pageSize in
 		pars = append(pars, pageSize)
 	}
 
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	err = global.DmSQL["edb"].Raw(sql, pars...).Find(&items).Error
 	return
 }
@@ -132,14 +122,11 @@ func GetEdbInfoList(condition string, pars []interface{}, startSize, pageSize in
 // @return total int
 // @return err error
 func GetCountEdbInfoList(condition string, pars []interface{}) (total int, err error) {
-	//o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT COUNT(1) ct FROM edbinfo AS a  WHERE a.classify_id > 0 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY a.create_date DESC `
-
-	//err = o.Raw(sql, pars).QueryRow(&total)
 	err = global.DmSQL["edb"].Raw(sql, pars...).Scan(&total).Error
 	return
 }
@@ -151,8 +138,6 @@ func GetCountEdbInfoList(condition string, pars []interface{}) (total int, err e
 // @param items []*Edbdata
 // @return err error
 func OnlyMultiAddEdbdata(items []*Edbdata) (err error) {
-	//o := orm.NewOrmUsingDB("edb")
-	//_, err = o.InsertMulti(utils.MultiAddNum, items)
 	err = global.DmSQL["edb"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
@@ -170,9 +155,7 @@ func DelEdbdataByCodeAndDateList(tradeCode string, dateList []string) (err error
 		return
 	}
 
-	//o := orm.NewOrmUsingDB("edb")
 	sql := `delete from edbdata  WHERE TRADE_CODE=? AND DT in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, tradeCode, dateList).Exec()
 	err = global.DmSQL["edb"].Exec(sql, tradeCode, dateList).Error
 	return
 }
@@ -185,9 +168,7 @@ func DelEdbdataByCodeAndDateList(tradeCode string, dateList []string) (err error
 // @param isJoinEdb int 是否加入指标库
 // @return err error
 func UpdateManualIsJoinEdbStatus(edbCode string, isJoinEdb int8) (err error) {
-	//o := orm.NewOrmUsingDB("edb")
 	sql := ` UPDATE edbinfo SET is_join_edb = ? WHERE TRADE_CODE =? `
-	//_, err = o.Raw(sql, isJoinEdb, edbCode).Exec()
 	err = global.DmSQL["edb"].Exec(sql, isJoinEdb, edbCode).Error
 	return
 }
@@ -216,7 +197,6 @@ func DelManualIndexByCodeList(codeList []string) (err error) {
 	if num <= 0 {
 		return
 	}
-	//to, err := orm.NewOrmUsingDB("edb").Begin()
 	to := global.DmSQL["edb"].Begin()
 	defer func() {
 		if err != nil {
@@ -227,7 +207,6 @@ func DelManualIndexByCodeList(codeList []string) (err error) {
 	}()
 	// 删除指标
 	sql := `DELETE FROM edbinfo WHERE TRADE_CODE  in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = to.Raw(sql, codeList).Exec()
 	err = to.Exec(sql, codeList).Error
 	if err != nil {
 
@@ -235,7 +214,6 @@ func DelManualIndexByCodeList(codeList []string) (err error) {
 
 	// 删除指标数据
 	sql = `DELETE FROM edbdata WHERE TRADE_CODE  in (` + utils.GetOrmInReplace(num) + `) `
-	//	_, err = to.Raw(sql, codeList).Exec()
 	err = to.Exec(sql, codeList).Error
 	if err != nil {
 
@@ -257,8 +235,6 @@ func GetEdbinfoListBySecNameList(secNameList []string) (items []*Edbinfo, err er
 		return
 	}
 	sql := `SELECT * FROM edbinfo WHERE SEC_NAME in (` + utils.GetOrmInReplace(num) + ` ) AND REMARK='手动' `
-	//o := orm.NewOrmUsingDB("edb")
-	//_, err = o.Raw(sql, secNameList).QueryRows(&items)
 	err = global.DmSQL["edb"].Raw(sql, secNameList).Find(&items).Error
 	return
 }
@@ -275,9 +251,7 @@ func GetTargetsDataListByCodeList(tradeCodeList []string) (items []*Edbdata, err
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT * FROM edbdata WHERE TRADE_CODE in (` + utils.GetOrmInReplace(num) + ` ) ORDER BY DT ASC `
-	//_, err = o.Raw(sql, tradeCodeList).QueryRows(&items)
 	err = global.DmSQL["edb"].Raw(sql, tradeCodeList).Find(&items).Error
 	return
 }
@@ -306,8 +280,6 @@ type EdbinfoOpRecord struct {
 // @datetime 2024-07-30 16:25:55
 // @return err error
 func (m *EdbinfoOpRecord) Create() (err error) {
-	//o := orm.NewOrmUsingDB("edb")
-	//_, err = o.Insert(m)
 	err = global.DmSQL["edb"].Create(m).Error
 	return
 }
@@ -320,8 +292,6 @@ func (m *EdbinfoOpRecord) Create() (err error) {
 // @param list []*EdbinfoOpRecord
 // @return err error
 func (m *EdbinfoOpRecord) MulCreate(list []*EdbinfoOpRecord) (err error) {
-	//o := orm.NewOrmUsingDB("edb")
-	//_, err = o.InsertMulti(utils.MultiAddNum, list)
 	err = global.DmSQL["edb"].CreateInBatches(list, utils.MultiAddNum).Error
 	return
 }
@@ -353,16 +323,13 @@ type EdbinfoOpRecordListResp struct {
 // @return items []*EdbinfoOpRecordItem
 // @return err error
 func GetEdbinfoOpRecordPageList(tradeCode string, startSize, pageSize int) (total int, items []*EdbinfoOpRecordItem, err error) {
-	//o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT  count(1) FROM edbinfo_op_record AS a  WHERE TRADE_CODE = ? `
-	//err = o.Raw(sql, tradeCode).QueryRow(&total)
 	err = global.DmSQL["edb"].Raw(sql, tradeCode).Scan(&total).Error
 	if err != nil {
 		return
 	}
 
 	sql = `SELECT  a.* FROM edbinfo_op_record AS a  WHERE TRADE_CODE = ? ORDER BY a.create_time DESC LIMIT ?,?`
-	//_, err = o.Raw(sql, tradeCode, startSize, pageSize).QueryRows(&items)
 	err = global.DmSQL["edb"].Raw(sql, tradeCode, startSize, pageSize).Find(&items).Error
 	return
 }
@@ -376,12 +343,10 @@ func GetEdbinfoOpRecordPageList(tradeCode string, startSize, pageSize int) (tota
 // @return count int
 // @return err error
 func GetManualEdbCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("edb")
 	sql := ` SELECT COUNT(1) AS count FROM edbinfo WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["edb"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
@@ -393,9 +358,7 @@ func GetManualEdbCountByCondition(condition string, pars []interface{}) (count i
 // @param tradeCode string
 // @return err error
 func DelEdbinfoOpRecordByTradeCode(tradeCode string) (err error) {
-	//o := orm.NewOrmUsingDB("edb")
 	sql := ` DELETE FROM edbinfo_op_record WHERE TRADE_CODE = ? `
-	//_, err = o.Raw(sql, tradeCode).Exec()
 	err = global.DmSQL["edb"].Exec(sql, tradeCode).Error
 	return
 }

models/meeting_probabilities.go

@@ -18,16 +18,13 @@ type MeetingProbabilities struct {
 
 // GetMeetingInfoById 根据id 获取加息概率表格详情
 func GetMeetingInfoById(dateTime string) (item *MeetingProbabilities, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ``
 	if dateTime == "" {
 		sql = ` SELECT * FROM meeting_probabilities WHERE is_delete=0 ORDER BY create_time DESC LIMIT 1 `
-		//err = o.Raw(sql).QueryRow(&item)
 		err = global.DmSQL["data"].Raw(sql).First(&item).Error
 		return
 	} else {
 		sql = ` SELECT * FROM meeting_probabilities WHERE date_time=? AND is_delete=0 `
-		//err = o.Raw(sql, dateTime).QueryRow(&item)
 		err = global.DmSQL["data"].Raw(sql, dateTime).First(&item).Error
 		return
 	}

models/mgo_base.go

@@ -1,12 +1,9 @@
 package models
 
 import (
-	"context"
 	"encoding/json"
-	"errors"
 	"eta_gn/eta_api/utils"
 	"eta_gn/eta_api/utils/mgodb"
-	"fmt"
 )
 
 func init() {
@@ -16,259 +13,8 @@ func init() {
 			panic("mongodb链接失败，Err:" + e.Error())
 			return
 		}
-
 		mgoCli := mgodb.MgoNewClient(mgoConfig)
 		utils.MgoDataCli = mgoCli
 		utils.MgoDataDbName = mgoConfig.Database
-		//result, err := TestMgoFindOne("data_ths", bson.M{"edbcode": "s0033227", "datatime": "2015-12-04"})
-		//fmt.Println(time.Now())
-		//result, err := TestMgoFindOne("data_wind", bson.M{"edbcode": "s0033227", "datatime": "2007-12-29"})
-		//fmt.Println(time.Now())
-		//
-		//fmt.Println(err)
-		//fmt.Println(result)
-	}
-
-}
-
-// TestMgoFindOne
-// @Description: 获取单条数据
-// @author: Roc
-// @datetime 2024-04-25 15:44:07
-// @param colName string 集合名词：`data_ths`
-// @param whereParams interface{} bson.M{"edbcode": "s0033227", "datatime": "2015-12-04"}
-// @return result interface{}
-// @return err error
-func TestMgoFindOne(colName string, whereParams interface{}) (result interface{}, err error) {
-	if colName == "" {
-		err = errors.New("集合名称不可为空")
-		return
-	}
-	if utils.MgoDataCli == nil {
-		err = errors.New("mongodb连接失败")
-		return
-	}
-	db := utils.MgoDataCli.Database("hz_data")
-	coll := db.Collection("data_ths")
-	ctx := context.TODO()
-	if err != nil {
-		fmt.Println("MgoGetColl Err:", err.Error())
-		return
-	}
-	//err = coll.Find(ctx, whereParams).One(&result)
-	err = coll.Find(ctx, whereParams).All(&result)
-	return
-}
-
-// 创建集合
-//func MgoCreateCollection(collectionName string) (err error) {
-//	ctx := context.TODO()
-//
-//	mgoClient := mgodb.MgoNewClient()
-//
-//	defer func() {
-//		mgoClient.Close(ctx)
-//	}()
-//
-//	colName := collectionName
-//	err = mgoClient.Database("hz_data").CreateCollection(ctx, colName)
-//	return
-//}
-
-// 批量新增多条数据
-func MgoBatchInsertData(colName string, dataList interface{}) (err error) {
-	if colName == "" {
-		err = errors.New("集合名称不可为空")
-		return
-	}
-	ctx := context.TODO()
-	coll, err := mgodb.MgoGetColl(colName)
-	if err != nil {
-		fmt.Println("MgoGetColl Err:", err.Error())
-		return
-	}
-	defer func() {
-		coll.Close(ctx)
-	}()
-	_, err = coll.Collection.InsertMany(ctx, dataList)
-	if err != nil {
-		fmt.Println("InsertMany:Err:" + err.Error())
-		return
-	}
-	return
-}
-
-// 插入单条数据
-func MgoInsertData(colName string, dataItem interface{}) (insertedID interface{}, err error) {
-	if colName == "" {
-		err = errors.New("集合名称不可为空")
-		return
-	}
-	ctx := context.TODO()
-	coll, err := mgodb.MgoGetColl(colName)
-	if err != nil {
-		fmt.Println("MgoGetColl Err:", err.Error())
-		return
-	}
-	defer func() {
-		coll.Close(ctx)
-	}()
-	result, err := coll.Collection.InsertOne(ctx, dataItem)
-	if err != nil {
-		return
-	}
-	insertedID = result.InsertedID
-	return
-}
-
-/*
-删除数据
-colName := `data_gl`
-whereParams := bson.M{"edbcode": "s0033227"}
-err := MgoRemove(colName, whereParams)
-*/
-func MgoRemove(colName string, whereParams interface{}) (err error) {
-	if colName == "" {
-		err = errors.New("集合名称不可为空")
-		return
-	}
-	ctx := context.TODO()
-	coll, err := mgodb.MgoGetColl(colName)
-	if err != nil {
-		fmt.Println("MgoGetColl Err:", err.Error())
-		return
-	}
-	defer func() {
-		coll.Close(ctx)
-	}()
-	err = coll.Remove(ctx, whereParams)
-	return
-}
-
-/*
-删除多条数据
-colName := `data_gl`
-whereParams := bson.M{"edbcode": "s0033227"}
-err := MgoRemoveAll(colName, whereParams)
-*/
-func MgoRemoveAll(colName string, whereParams interface{}) (count int64, err error) {
-	if colName == "" {
-		err = errors.New("集合名称不可为空")
-		return
-	}
-	ctx := context.TODO()
-	coll, err := mgodb.MgoGetColl(colName)
-	if err != nil {
-		fmt.Println("MgoGetColl Err:", err.Error())
-		return
-	}
-	defer func() {
-		coll.Close(ctx)
-	}()
-	res, err := coll.RemoveAll(ctx, whereParams)
-	if err != nil {
-		fmt.Println("RemoveAll Err:", err.Error())
-		return
-	}
-	count = res.DeletedCount
-	return
-}
-
-/*
-修改单条数据
-colName := `data_ths`
-whereParams := bson.M{"edbcode": "s0033227", "datatime": "2015-12-04"}
-params := bson.M{"$set": bson.M{"value": "1000"}}
-*/
-func MgoUpdateData(colName string, params, whereParams interface{}) (err error) {
-	if colName == "" {
-		err = errors.New("集合名称不可为空")
-		return
-	}
-	ctx := context.TODO()
-	coll, err := mgodb.MgoGetColl(colName)
-	if err != nil {
-		fmt.Println("MgoGetColl Err:", err.Error())
-		return
-	}
-	defer func() {
-		coll.Close(ctx)
-	}()
-	err = coll.UpdateOne(ctx, whereParams, params)
-	return
-}
-
-/*
-获取单条数据
-colName := `data_ths`
-whereParams := bson.M{"edbcode": "s0033227", "datatime": "2015-12-04"}
-*/
-func MgoFindOne(colName string, whereParams interface{}) (result interface{}, err error) {
-	if colName == "" {
-		err = errors.New("集合名称不可为空")
-		return
-	}
-	ctx := context.TODO()
-	coll, err := mgodb.MgoGetColl(colName)
-	if err != nil {
-		fmt.Println("MgoGetColl Err:", err.Error())
-		return
-	}
-	defer func() {
-		coll.Close(ctx)
-	}()
-	err = coll.Find(ctx, whereParams).One(&result)
-	return
-}
-
-/*
-分页获取数据
-colName := `data_ths`
-whereParams := bson.M{"edbcode": "s0033227", "datatime": "2015-12-04"}
-
-sort:="-weight"
-skip:0
-limit:10
-*/
-func MgoBatchFind(colName, sort string, whereParams interface{}, skip, limit int64) (list []interface{}, err error) {
-	if colName == "" {
-		err = errors.New("集合名称不可为空")
-		return
-	}
-	ctx := context.TODO()
-	coll, err := mgodb.MgoGetColl(colName)
-	if err != nil {
-		fmt.Println("MgoGetColl Err:", err.Error())
-		return
-	}
-	defer func() {
-		coll.Close(ctx)
-	}()
-	err = coll.Find(ctx, whereParams).Sort(sort).Skip(skip).Limit(limit).All(&list)
-	return
-}
-
-/*
-MgoUpsertData
-更新插入数据-数据存在即更新, 否则新增
-colName := `data_ths`
-filter := bson.M{"edbcode": "s0033227", "datatime": "2015-12-04"}
-replacement := bson.M{"edb_info_id":0,"edb_code":m.EdbCode,"data_time":d.DataTime,"value":f,"create_time":now,"modify_time":now,"data_timestamp": stamp}
-*/
-func MgoUpsertData(colName string, filter, replacement interface{}) (err error) {
-	if colName == "" {
-		err = errors.New("集合名称不可为空")
-		return
-	}
-	ctx := context.TODO()
-	coll, err := mgodb.MgoGetColl(colName)
-	if err != nil {
-		fmt.Println("MgoGetColl Err:", err.Error())
-		return
 	}
-	defer func() {
-		_ = coll.Close(ctx)
-	}()
-	_, err = coll.Upsert(ctx, filter, replacement)
-	return
 }

models/out_link.go

@@ -46,25 +46,17 @@ func (ol *OutLink) TableName() string {
 }
 
 func (ol *OutLink) Create() (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Insert(ol)
-	//if err != nil {
-	//	return
-	//}
 	err = global.DEFAULT_DmSQL.Create(ol).Error
 	return
 }
 
 func (ol *OutLink) GetItemById(id int) (err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM out_link WHERE id = ? LIMIT 1`
-	//err = o.Raw(sql, id).QueryRow(&ol)
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(ol).Error
 	return
 }
 
 func (ol *OutLink) GetItemsByCondition(condition string, pars []interface{}, orderRule string) (items []*OutLink, err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM out_link WHERE 1=1 `
 	sql += condition
 	order := ` ORDER BY create_time ASC`
@@ -72,36 +64,28 @@ func (ol *OutLink) GetItemsByCondition(condition string, pars []interface{}, ord
 		order = ` ORDER BY ` + orderRule
 	}
 	sql += order
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (ol *OutLink) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(ol, cols...)
 	err = global.DEFAULT_DmSQL.Model(ol).Select(cols).Updates(ol).Error
 	return
 }
 
 func (ol *OutLink) Del() (err error) {
-	//o := orm.NewOrm()
 	sql := `DELETE FROM out_link WHERE id = ? LIMIT 1`
-	//_, err = o.Raw(sql, ol.Id).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, ol.Id).Error
 	return
 }
 
 func (ol *OutLink) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, ol.TableName(), condition)
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (ol *OutLink) GetPageItemsByCondition(startSize, pageSize int, condition string, pars []interface{}, fieldArr []string, orderRule string) (total int, items []*OutLink, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -112,12 +96,10 @@ func (ol *OutLink) GetPageItemsByCondition(startSize, pageSize int, condition st
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, ol.TableName(), condition, order)
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
 	if err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` 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

models/permission.go

@@ -17,25 +17,19 @@ type ChartPermissionSearchKeyWordMapping struct {
 }
 
 func GetPermission(classifyId int) (items []*ChartPermissionSearchKeyWordMapping, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM chart_permission_search_key_word_mapping AS a WHERE a.source_from='rddp' AND a.classify_id = ? `
-	//_, err = o.Raw(sql, classifyId).QueryRows(&items)
 	err = global.DmSQL["rddp"].Raw(sql, classifyId).Find(&items).Error
 	return
 }
 
 func GetAllPermissionMapping() (items []*ChartPermissionSearchKeyWordMapping, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM chart_permission_search_key_word_mapping AS a WHERE a.source_from='rddp'`
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DmSQL["rddp"].Raw(sql).Find(&items).Error
 	return
 }
 
 // EditChartPermissionSearchKeyWordMappingMulti 修改报告报告权限（先删除原有的权限，再添加新的权限）
 func EditChartPermissionSearchKeyWordMappingMulti(keyword string, permissionIdList []int, classifyId int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -45,7 +39,6 @@ func EditChartPermissionSearchKeyWordMappingMulti(keyword string, permissionIdLi
 		}
 	}()
 	sql := "DELETE FROM chart_permission_search_key_word_mapping WHERE source_from= 'rddp' AND classify_id = ?"
-	//_, err = to.Raw(sql, classifyId).Exec()
 	err = to.Exec(sql, classifyId).Error
 	if err != nil {
 		return
@@ -64,7 +57,6 @@ func EditChartPermissionSearchKeyWordMappingMulti(keyword string, permissionIdLi
 			}
 			chartPermissionSearchKeyWordMappingList = append(chartPermissionSearchKeyWordMappingList, tmpChartPermissionSearchKeyWordMapping)
 		}
-		//_, err = to.InsertMulti(len(chartPermissionSearchKeyWordMappingList), chartPermissionSearchKeyWordMappingList)
 		err = to.CreateInBatches(chartPermissionSearchKeyWordMappingList, utils.MultiAddNum).Error
 	}
 	return
@@ -73,16 +65,12 @@ func EditChartPermissionSearchKeyWordMappingMulti(keyword string, permissionIdLi
 func AddChartPermissionChapterMapping(chartPermissionId int, reportId int64) (err error) {
 	sql := `INSERT INTO chart_permission_chapter_mapping (chart_permission_id, report_chapter_type_id,research_type)
            VALUES(?,?,?)`
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Raw(sql, chartPermissionId, reportId, "rddp").Exec()
 	err = global.DmSQL["rddp"].Exec(sql, chartPermissionId, reportId, "rddp").Error
 	return
 }
 
 func RemoveChartPermissionChapterMapping(reportId int64) (err error) {
 	sql := ` DELETE FROM chart_permission_chapter_mapping WHERE research_type=? AND report_chapter_type_id=? `
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Raw(sql, "rddp", reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, "rddp", reportId).Error
 	return
 }
@@ -93,18 +81,14 @@ type ChartPermissionMappingIdName struct {
 }
 
 func GetChartPermissionNameFromMappingByKeyword(source string, classifyId int) (list []*ChartPermissionMappingIdName, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := " SELECT b.chart_permission_id AS permission_id,b.permission_name FROM chart_permission_search_key_word_mapping AS a INNER JOIN chart_permission AS b ON a.chart_permission_id = b.chart_permission_id WHERE a.source_from = ? AND a.classify_id = ? "
-	//_, err = o.Raw(sql, source, classifyId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, source, classifyId).Find(&list).Error
 	return
 }
 
 // UpdateChartPermissionNameFromMappingByKeyword 根据关键词及来源更新新关键词
 func UpdateChartPermissionNameFromMappingByKeyword(newKeyword string, classifyId int, source string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := " UPDATE chart_permission_search_key_word_mapping SET key_word = ? WHERE classify_id = ? AND source_from = ? "
-	//_, err = o.Raw(sql, newKeyword, classifyId, source).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, newKeyword, classifyId, source).Error
 	return
 }
@@ -127,10 +111,8 @@ type ChartPermissionSearchKeyWordMappingAndPermissionName struct {
 // @return items []*ChartPermissionSearchKeyWordMappingAndPermissionName
 // @return err error
 func GetPermissionByClassifyId(classifyId int) (items []*ChartPermissionSearchKeyWordMappingAndPermissionName, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.chart_permission_name,a.permission_name,b.chart_permission_id,b.key_word,b.classify_id FROM chart_permission AS a 
  join chart_permission_search_key_word_mapping AS b ON a.chart_permission_id=b.chart_permission_id WHERE b.source_from='rddp' AND b.classify_id = ? `
-	//_, err = o.Raw(sql, classifyId).QueryRows(&items)
 	err = global.DmSQL["rddp"].Raw(sql, classifyId).Find(&items).Error
 	return
 }

models/ppt_v2.go

@@ -60,15 +60,12 @@ type PptV2Item struct {
 }
 
 func GetPptV2List(condition string, pars []interface{}, startSize, pageSize int) (items []*PptV2Item, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2 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
@@ -76,26 +73,21 @@ func GetPptV2List(condition string, pars []interface{}, startSize, pageSize int)
 }
 
 func GetPptV2ByCondition(condition string, pars []interface{}) (items []*PptV2, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2 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 GetPptV2ListCount(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COUNT(1) AS count FROM ppt_v2 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
 }
@@ -107,8 +99,6 @@ type PptV2ListResp struct {
 
 // AddPptV2 新增PPT
 func AddPptV2(item *PptV2) (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
@@ -116,9 +106,7 @@ func AddPptV2(item *PptV2) (lastId int64, err error) {
 
 // DeletePptV2 删除ppt
 func DeletePptV2(pptId int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM ppt_v2 WHERE ppt_id=? `
-	//_, err = o.Raw(sql, pptId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, pptId).Error
 	return
 }
@@ -145,8 +133,6 @@ type AddPptResp struct {
 
 // Update 更新ppt基础信息
 func (item *PptV2) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(item, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }
@@ -162,36 +148,19 @@ type SavePptV2PathReq struct {
 }
 
 func GetPptV2ById(pptId int) (item *PptV2, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2 WHERE 1=1 AND ppt_id=? `
-	//err = o.Raw(sql, pptId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, pptId).Find(&item).Error
 	return
 }
 
 func GetPptV2ByIds(pptIds []int) (list []*PptV2, err error) {
-	//_, err = orm.NewOrmUsingDB("rddp").
-	//	QueryTable("ppt_v2").
-	//	Filter("ppt_id__in", pptIds).
-	//	All(&list)
 	err = global.DmSQL["rddp"].Table("ppt_v2").Where("ppt_id IN ?", pptIds).Find(&list).Error
-
-	return
-}
-
-func GetPptV2ByTitle(title string) (item *PptV2, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM ppt_v2 WHERE 1=1 AND title=? `
-	//err = o.Raw(sql, title).QueryRow(&item)
-	err = global.DmSQL["rddp"].Raw(sql, title).First(&item).Error
 	return
 }
 
 // EditPptV2Path 编辑Ppt的下载地址
 func EditPptV2Path(pptId int, pptxPath string) (err error) {
 	sql := `UPDATE ppt_v2 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
 }
@@ -206,8 +175,6 @@ type PptV2PublishRecord struct {
 
 // AddPptV2PublishRecord 添加发布记录，主要是记录每次发布的时候，当前的ppt
 func AddPptV2PublishRecord(item *PptV2PublishRecord) (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
@@ -232,8 +199,6 @@ type PptV2SaveLog struct {
 
 // AddPptV2SaveLog 新增PPT日志
 func AddPptV2SaveLog(item *PptV2SaveLog) (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
@@ -252,17 +217,13 @@ type PPT2ReportReq struct {
 
 // AddPptV2Multi 批量新增ppt
 func AddPptV2Multi(list []*PptV2) (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_v2"
-	//_, err = o.Raw(sql).QueryRows(&names)
 	err = global.DmSQL["rddp"].Raw(sql).Scan(&names).Error
 	return
 }
@@ -275,38 +236,31 @@ type PPT2ReportResp struct {
 
 // GetPptV2ByReportId 通过关联的报告ID获取PPT
 func GetPptV2ByReportId(reportId int) (item *PptV2, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2 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
 }
 
 // GetSharePptV2 获取公开分享的ppt
 func GetSharePptV2(IsNewPpt int) (items []*PptV2, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2 WHERE 1=1 AND is_share = 1 `
 
 	if IsNewPpt > 0 {
 		sql += ` AND ppt_version = 2 `
 	}
 	sql += `ORDER BY create_time DESC`
-	//sql += `ORDER BY create_time DESC LIMIT ?,?`
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DmSQL["rddp"].Raw(sql).Find(&items).Error
 	return
 }
 
 // GetAllPptV2List 根据条件获取所有的Ppt
 func GetAllPptV2List(condition string, pars []interface{}) (items []*PptV2Item, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2 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
 }
@@ -322,9 +276,7 @@ type BatchEnPPT2CnReq struct {
 }
 
 func GetPptV2ByTitleAndId(title string, adminId int) (item *PptV2, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2 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_v2_grant.go

@@ -17,9 +17,7 @@ type PptV2Grant struct {
 
 // GetPPtGrantInfo 获取已经有权限的ppt列表
 func GetPPtGrantInfo(pptId int) (list []*PptV2Grant, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM ppt_v2_grant WHERE ppt_id=? `
-	//_, err = o.Raw(sql, pptId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, pptId).Find(&list).Error
 	return
 }
@@ -40,8 +38,6 @@ type GrantPptReq struct {
 
 // MultiAddPptV2Grant 批量添加授权记录
 func MultiAddPptV2Grant(pptId int, list []*PptV2Grant) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -52,7 +48,6 @@ func MultiAddPptV2Grant(pptId int, list []*PptV2Grant) (err error) {
 	}()
 
 	sql := "DELETE from ppt_v2_grant where ppt_id=?"
-	//_, err = to.Raw(sql, pptId).Exec()
 	err = to.Exec(sql, pptId).Error
 	if err != nil {
 		return
@@ -60,7 +55,6 @@ func MultiAddPptV2Grant(pptId int, list []*PptV2Grant) (err error) {
 
 	// 新增授权记录
 	if len(list) > 0 {
-		//_, tmpErr := to.InsertMulti(len(list), list)
 		tmpErr := to.CreateInBatches(list, utils.MultiAddNum).Error
 		if tmpErr != nil {
 			err = tmpErr
@@ -73,42 +67,11 @@ func MultiAddPptV2Grant(pptId int, list []*PptV2Grant) (err error) {
 
 // DeletePptV2Grant 移除授权记录
 func DeletePptV2Grant(pptId int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := "DELETE from ppt_v2_grant where ppt_id=?"
-	//_, err = o.Raw(sql, pptId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, pptId).Error
 	return
 }
 
-// PptV2InfoGrantItem Ppt信息记录（包含授权信息）
-//
-//	type PptV2InfoGrantItem 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 PptV2InfoGrantItem struct {
 	PptId         int       `gorm:"column:ppt_id;primaryKey;autoIncrement" description:"ppt的Id"`
 	TemplateType  int       `gorm:"column:template_type" description:"模版类型"`
@@ -133,19 +96,16 @@ type PptV2InfoGrantItem struct {
 
 // GetAllGrantList 获取已经有权限的ppt列表
 func GetAllGrantList(sysUserId int) (list []*PptV2InfoGrantItem, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.ppt_id,a.template_type,a.background_img,a.title,a.report_type,a.ppt_date,a.ppt_url,a.pptx_url,a.content,a.create_time,a.modify_time,
 a.admin_id,a.admin_real_name,a.ppt_version,a.report_id,a.report_code,a.is_share,a.publish_time,a.cover_content,a.ppt_page,a.title_setting FROM ppt_v2 a JOIN ppt_v2_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,a.template_type,a.background_img,a.title,a.report_type,a.ppt_date,a.ppt_url,a.pptx_url,a.content,a.create_time,a.modify_time,
 a.admin_id,a.admin_real_name,a.ppt_version,a.report_id,a.report_code,a.is_share,a.publish_time,a.cover_content,a.ppt_page,a.title_setting`
-	//_, 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 []*PptV2InfoGrantItem, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.ppt_id,a.template_type,a.background_img,a.title,a.report_type,a.ppt_date,a.ppt_url,a.pptx_url,a.create_time,a.modify_time,
 a.admin_id,a.admin_real_name,a.ppt_version,a.report_id,a.report_code,a.is_share,a.publish_time,a.ppt_page,a.title_setting
 FROM ppt_v2 a JOIN ppt_v2_grant b on a.ppt_id=b.ppt_id 
@@ -154,17 +114,14 @@ FROM ppt_v2 a JOIN ppt_v2_grant b on a.ppt_id=b.ppt_id
 
 	sql += ` GROUP BY a.ppt_id,a.template_type,a.background_img,a.title,a.report_type,a.ppt_date,a.ppt_url,a.pptx_url,a.create_time,a.modify_time,
 a.admin_id,a.admin_real_name,a.ppt_version,a.report_id,a.report_code,a.is_share,a.publish_time,a.ppt_page,a.title_setting 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 *PptV2InfoGrantItem, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.* FROM ppt_v2 a JOIN ppt_v2_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_v2_group.go

@@ -21,62 +21,48 @@ type PptV2Group struct {
 
 // GetPrivatePptGroups 获取私有目录
 func GetPrivatePptGroups(adminId int) (list []*PptV2Group, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_v2_group where admin_id=? 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
 }
 
 // GetPrivatePptGroupsByAdminId 获取用户自己的私有目录
 func GetPrivatePptGroupsByAdminId(adminId int) (list []*PptV2Group, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_v2_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 []*PptV2Group, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_v2_group where is_share=1 order by share_time asc, group_id asc"
-	//_, err = o.Raw(sql).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql).Find(&list).Error
 	return
 }
 
 // GetPptGroupByName 根据目录名称查询
 func GetPptGroupByName(groupName string, adminId int) (item *PptV2Group, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_v2_group where admin_id=? and group_name=?"
-	//err = o.Raw(sql, adminId, groupName).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, adminId, groupName).Find(&item).Error
 	return
 }
 
 // GetPptGroupById 根据目录Id查询
 func GetPptGroupByGroupIdAdminId(groupId int64, adminId int) (item *PptV2Group, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_v2_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 *PptV2Group, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := "select * from ppt_v2_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 *PptV2Group) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["rddp"].Create(item).Error
 	lastId = item.GroupId
 	return
@@ -84,90 +70,60 @@ func AddPptGroup(item *PptV2Group) (lastId int64, err error) {
 
 // DeletePptGroup 删除单个ppt目录
 func DeletePptGroup(groupId int64) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM ppt_v2_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_v2_group WHERE group_id in  ` + groupIds
-	//_, err = o.Raw(sql).Exec()
 	err = global.DmSQL["rddp"].Exec(sql).Error
 	return
 }
 
 // Update 更新ppt目录基础信息
 func (item *PptV2Group) 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_v2_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_v2_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_v2_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_v2_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 []*PptV2Group) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.InsertMulti(1, list)
 	err = global.DmSQL["rddp"].CreateInBatches(list, utils.MultiAddNum).Error
 	return
 }
 
 // UpdatePptGroupSortMulti 批量更新初始排序标识
 func UpdatePptGroupSortMulti(groupIds []int64) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//p, err := o.Raw("UPDATE ppt_v2_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
-	//	}
-	//}
 	tx := global.DmSQL["rddp"].Begin()
 	for _, v := range groupIds {
 		err = tx.Exec("UPDATE ppt_v2_group SET group_sort = group_id WHERE group_id = ?", v).Error
@@ -215,10 +171,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_v2_group_mapping.go

@@ -24,8 +24,6 @@ type PptV2GroupMapping struct {
 
 // AddPptGroupMapping 新增目录和ppt的映射关系
 func AddPptGroupMapping(item *PptV2GroupMapping) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["rddp"].Create(item).Error
 	lastId = item.GroupId
 	return
@@ -33,92 +31,59 @@ func AddPptGroupMapping(item *PptV2GroupMapping) (lastId int64, err error) {
 
 // GetPptMappingCountByGroupId 查询目录下，ppt的个数
 func GetPptMappingCountByGroupId(groupId int64) (total int64, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `select count(*) from ppt_v2_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 []*PptV2GroupMapping, 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_v2_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 []*PptV2GroupMapping, err error) {
-	//_, err = orm.NewOrmUsingDB("rddp").
-	//	QueryTable("ppt_v2_group_mapping").
-	//	Filter("group_id__in", groupIds).
-	//	OrderBy("-ppt_sort", "group_ppt_id").
-	//	All(&list)
 	err = global.DmSQL["rddp"].Table("ppt_v2_group_mapping").Where("group_id in ?", groupIds).Find(&list).Error
 	return
 }
 
 // GetPptMappingByGroupPptId 查询根据映射ID，查询单个映射关系
 func GetPptMappingByGroupPptId(groupPptId int64, adminId int) (item *PptV2GroupMapping, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `select * from ppt_v2_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
 }
 
 // GetPptMappingByGroupPptId 查询根据映射ID，查询单个映射关系数量
 func GetPptMappingByGroupPptCountId(groupPptId int64, adminId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `select COUNT(*) AS count from ppt_v2_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
 }
 
 // GetPptMappingByPptId 查询根据ppt_Id, 查询当映单个映射关系
 func GetPptMappingByPptId(pptId int64) (item *PptV2GroupMapping, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` select * from ppt_v2_group_mapping where ppt_id=? `
-	//err = o.Raw(sql, pptId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, pptId).First(&item).Error
 	return
 }
 
 // Update 更新ppt目录映射的基本信息
 func (item *PptV2GroupMapping) 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 []*PptV2GroupMapping) (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_v2_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
-	//	}
-	//}
 	tx := global.DmSQL["rddp"].Begin()
 	for _, v := range groupPptIds {
 		err = tx.Exec("UPDATE ppt_v2_group_mapping SET ppt_sort = group_ppt_id WHERE group_ppt_id = ?", v).Error
@@ -133,45 +98,35 @@ func UpdatePptGroupMappingSortMulti(groupPptIds []int64) (err error) {
 
 // DeletePptGroupMapping 删除ppt目录
 func DeletePptGroupMapping(groupId int64, adminId int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `DELETE FROM ppt_v2_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_v2_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_v2_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_v2_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 []*PptV2GroupMapping, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `select * from ppt_v2_group_mapping where ppt_id=?`
-	//_, err = o.Raw(sql, pptId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, pptId).Find(&list).Error
 	return
 }
@@ -188,10 +143,6 @@ func GetPublicGroupPptByPptIds(pptIds []string) (list []*PptV2GroupMapping, err
 
 	// 导出 SQL 语句
 	sql := qb.String()
-
-	// 执行 SQL 语句
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Raw(sql).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql).Find(&list).Error
 	return
 }

models/report.go

@@ -6,7 +6,6 @@ import (
 	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"gorm.io/gorm"
 	"strings"
@@ -168,12 +167,10 @@ type ReportListResp struct {
 // @return count int
 // @return err error
 func GetReportListCountV1(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COUNT(1) AS count  FROM report as a 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
 }
@@ -189,15 +186,12 @@ func GetReportListCountV1(condition string, pars []interface{}) (count int, err
 // @return items []*ReportList
 // @return err error
 func GetReportListV1(condition string, pars []interface{}, startSize, pageSize int) (items []*ReportList, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-
 	sql := `SELECT * FROM report as a WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	// 排序：1:未发布；2:已发布；3-待提交；4-待审批；5-已驳回；6-已通过
 	sql += `ORDER BY FIELD(state,3,1,4,5,6,2), modify_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
@@ -215,10 +209,7 @@ func GetReportPvUvByReportIdList(reportIdList []int) (items []ReportPvUv, err er
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
-
 	sql := `SELECT report_id, COUNT(1) as pv_total,COUNT(DISTINCT user_id) as uv_total  FROM report_view_record  WHERE report_id in (` + utils.GetOrmInReplace(num) + `) GROUP BY report_id`
-	//_, err = o.Raw(sql, reportIdList).QueryRows(&items)
 	err = global.DmSQL["rddp"].Raw(sql, reportIdList).Find(&items).Error
 	return
 }
@@ -232,7 +223,6 @@ func GetReportPvUvByReportIdList(reportIdList []int) (items []ReportPvUv, err er
 // @return count int
 // @return err error
 func GetReportListCountByGrant(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT a.id  FROM report as a 
     JOIN report_grant b on a.id=b.report_id 
  WHERE 1=1  `
@@ -242,7 +232,6 @@ func GetReportListCountByGrant(condition string, pars []interface{}) (count int,
 	sql += " GROUP BY a.id "
 
 	sql = `SELECT COUNT(1) AS count  FROM (` + sql + `) d`
-	//err = o.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
@@ -258,8 +247,6 @@ func GetReportListCountByGrant(condition string, pars []interface{}) (count int,
 // @return items []*ReportList
 // @return err error
 func GetReportListByGrant(condition string, pars []interface{}, startSize, pageSize int) (items []*ReportList, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-
 	sql := `SELECT a.id,a.add_type,a.classify_id_first,a.classify_name_first,a.classify_id_second,a.classify_name_second,a.title,a.abstract,a.author,a.frequency,a.create_time,a.modify_time,a.state,a.publish_time,a.pre_publish_time,a.stage,a.msg_is_send,a.pre_msg_send,a.video_url,a.video_name,a.video_play_seconds,a.report_code,a.video_size,a.report_version,a.ths_msg_is_send,a.has_chapter,a.chapter_type,a.old_report_id,a.msg_send_time,a.admin_id,a.admin_real_name,a.approve_time,a.approve_id,a.detail_img_url,a.detail_pdf_url,a.last_modify_admin_id,a.last_modify_admin_name,a.content_modify_time,a.pv,a.uv,a.canvas_color,a.need_splice,a.head_resource_id,a.end_resource_id,a.classify_id_third,a.classify_name_third,a.collaborate_type,a.report_layout,a.is_public_publish,a.report_create_time,a.inherit_report_id,a.voice_generate_type FROM report as a JOIN report_grant b on a.id = b.report_id  WHERE 1=1  `
 	if condition != "" {
 		sql += condition
@@ -275,7 +262,6 @@ func GetReportListByGrant(condition string, pars []interface{}, startSize, pageS
         WHEN 6 THEN 5  
         ELSE 6  
     END, a.modify_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
@@ -283,35 +269,29 @@ func GetReportListByGrant(condition string, pars []interface{}, startSize, pageS
 }
 
 func GetReportListCount(condition string, pars []interface{}) (count int, err error) {
-	//oRddp := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COUNT(1) AS count  FROM report WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	//err = oRddp.Raw(sql, pars).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 // PublishCancelReport 取消发布报告
 func PublishCancelReport(reportId, state int, publishTimeNullFlag bool, lastModifyAdminId int, lastModifyAdminName string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	var sql string
 	if publishTimeNullFlag {
 		sql = ` UPDATE report SET state=?, publish_time=null, pre_publish_time=null, pre_msg_send=0,last_modify_admin_id=?,last_modify_admin_name=?,modify_time = NOW() WHERE id =?`
 	} else {
 		sql = ` UPDATE report SET state=?, pre_publish_time=null, pre_msg_send=0,last_modify_admin_id=?,last_modify_admin_name=?,modify_time = NOW() WHERE id =?`
 	}
-	//	_, err = o.Raw(sql, state, lastModifyAdminId, lastModifyAdminName, reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, state, lastModifyAdminId, lastModifyAdminName, reportId).Error
 	return
 }
 
 // 删除报告
 func DeleteReport(reportIds int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` DELETE FROM report WHERE id =? `
-	//_, err = o.Raw(sql, reportIds).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, reportIds).Error
 	return
 }
@@ -421,9 +401,7 @@ func GetSimpleReportByIds(reportIds []int) (list []*Report, err error) {
 	if len(reportIds) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT id, title, report_code FROM report WHERE id IN (` + utils.GetOrmInReplace(len(reportIds)) + `)`
-	//_, err = o.Raw(sql, reportIds).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, reportIds).Find(&list).Error
 	return
 }
@@ -438,7 +416,6 @@ func GetSimpleReportByIds(reportIds []int) (list []*Report, err error) {
 // @return count int
 // @return err error
 func GetReportStage(classifyIdFirst, classifyIdSecond, classifyIdThird int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	classifyId := classifyIdThird
 	if classifyId <= 0 {
 		classifyId = classifyIdSecond
@@ -460,7 +437,6 @@ func GetReportStage(classifyIdFirst, classifyIdSecond, classifyIdThird int) (cou
 	} else {
 		sql += " AND classify_id_first = ? "
 	}
-	//o.Raw(sql, yearStart, classifyId).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, yearStart, classifyId).Scan(&count).Error
 	return
 }
@@ -520,12 +496,6 @@ type AddResp struct {
 	ReportCode string `description:"报告code"`
 }
 
-func AddReport(item *Report) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	lastId, err = o.Insert(item)
-	return
-}
-
 type EditReq struct {
 	ReportId           int64  `description:"报告id"`
 	ClassifyIdFirst    int    `description:"一级分类id"`
@@ -560,7 +530,6 @@ type EditResp struct {
 }
 
 func EditReport(item *Report, reportId int64) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report
 			SET
 			  classify_id_first =?,
@@ -578,16 +547,12 @@ func EditReport(item *Report, reportId int64) (err error) {
 			  create_time = ?,
 			  modify_time = ?
 			WHERE id = ? `
-	//_, err = o.Raw(sql, item.ClassifyIdFirst, item.ClassifyNameFirst, item.ClassifyIdSecond, item.ClassifyNameSecond, item.Title,
-	//	item.Abstract, item.Author, item.Frequency, item.State, item.Content, item.ContentSub, item.Stage, item.CreateTime, time.Now(), reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, item.ClassifyIdFirst, item.ClassifyNameFirst, item.ClassifyIdSecond, item.ClassifyNameSecond, item.Title,
 		item.Abstract, item.Author, item.Frequency, item.State, item.Content, item.ContentSub, item.Stage, item.CreateTime, time.Now(), reportId).Error
 	return
 }
 
 func (m *Report) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(m, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(m).Error
 	return
 }
@@ -602,15 +567,12 @@ type ClassifyIdDetailReq struct {
 }
 
 func GetReportDetailByClassifyId(classifyIdFirst, classifyIdSecond int) (item *Report, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report WHERE 1=1 `
 	if classifyIdSecond > 0 {
 		sql = sql + ` AND classify_id_second=?   ORDER BY stage DESC LIMIT 1`
-		//err = o.Raw(sql, classifyIdSecond).QueryRow(&item)
 		err = global.DmSQL["rddp"].Raw(sql, classifyIdSecond).First(&item).Error
 	} else {
 		sql = sql + ` AND classify_id_first=?   ORDER BY stage DESC LIMIT 1`
-		//err = o.Raw(sql, classifyIdFirst).QueryRow(&item)
 		err = global.DmSQL["rddp"].Raw(sql, classifyIdFirst).First(&item).Error
 	}
 	return
@@ -628,7 +590,6 @@ type SendTemplateMsgResp struct {
 }
 
 func ModifyReportMsgIsSend(reportId int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	report, err := GetReportById(reportId)
 	if err != nil {
 		return
@@ -636,15 +597,12 @@ func ModifyReportMsgIsSend(reportId int) (err error) {
 	if report.MsgIsSend == 0 {
 		sql := `UPDATE report SET msg_is_send = 1, msg_send_time=NOW()  WHERE id = ? `
 		err = global.DmSQL["rddp"].Exec(sql, reportId).Error
-		//_, err = o.Raw(sql, reportId).Exec()
 	}
 	return
 }
 
 func ModifyReportVideo(reportId int, videoUrl, videoName, videoSize string, playSeconds float64) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report SET video_url=?,video_name=?,video_play_seconds=?,video_size=? WHERE id=? `
-	//_, err = o.Raw(sql, videoUrl, videoName, playSeconds, videoSize, reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, videoUrl, videoName, playSeconds, videoSize, reportId).Error
 	return
 }
@@ -660,9 +618,7 @@ func ModifyReportVideo(reportId int, videoUrl, videoName, videoSize string, play
 // @param playSeconds float64
 // @return err error
 func ModifyReportVideoByNoVideo(reportId int, videoUrl, videoName, videoSize string, playSeconds float64) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report SET video_url=?,video_name=?,video_play_seconds=?,video_size=? WHERE id=? AND video_url=''`
-	//_, err = o.Raw(sql, videoUrl, videoName, playSeconds, videoSize, reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, videoUrl, videoName, playSeconds, videoSize, reportId).Error
 	return
 }
@@ -692,14 +648,6 @@ type ReportItem struct {
 	ContentSub         string    `gorm:"column:content_sub" description:"内容前两个章节"`
 }
 
-func GetReportItemById(reportId int) (item *ReportItem, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM report WHERE id=?`
-	//err = o.Raw(sql, reportId).QueryRow(&item)
-	err = global.DmSQL["rddp"].Raw(sql, reportId).First(&item).Error
-	return
-}
-
 type SaveReportContent struct {
 	Content  string `description:"内容"`
 	ReportId int    `description:"报告id"`
@@ -716,28 +664,12 @@ type SaveReportContent struct {
 }
 
 func AddReportSaveLog(reportId, adminId int, content, contentSub, contentStruct, canvasColor, adminName string, headResourceId, endResourceId int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` INSERT INTO report_save_log(report_id, content,content_sub,content_struct,canvas_color,head_resource_id,end_resource_id,admin_id,admin_name) VALUES (?,?,?,?,?,?,?,?,?) `
-	//_, err = o.Raw(sql, reportId, content, contentSub, contentStruct, canvasColor, headResourceId, endResourceId, adminId, adminName).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, reportId, content, contentSub, contentStruct, canvasColor, headResourceId, endResourceId, adminId, adminName).Error
 	return
 }
 
 func MultiAddReportChaptersSaveLog(items []*ReportChapter, adminId int, adminRealName string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//p, err := o.Raw(`INSERT INTO report_save_log(report_id, report_chapter_id, content, content_sub,content_struct,admin_id, admin_name) VALUES (?,?,?,?,?,?,?)`).Prepare()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	_ = p.Close()
-	//}()
-	//for _, v := range items {
-	//	_, err = p.Exec(v.ReportId, v.ReportChapterId, v.Content, v.ContentSub, v.ContentStruct, adminId, adminRealName)
-	//	if err != nil {
-	//		return
-	//	}
-	//}
 	tx := global.DmSQL["rddp"].Begin()
 	for _, v := range items {
 		err = tx.Exec(`INSERT INTO report_save_log(report_id, report_chapter_id, content, content_sub,content_struct,admin_id, admin_name) VALUES (?,?,?,?,?,?,?)`, v.ReportId, v.ReportChapterId, v.Content, v.ContentSub, v.ContentStruct, adminId, adminRealName).Error
@@ -755,18 +687,14 @@ type SaveReportContentResp struct {
 }
 
 func ModifyReportCode(reportId int64, reportCode string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report SET report_code=? WHERE id=? `
-	//_, err = o.Raw(sql, reportCode, reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, reportCode, reportId).Error
 	return
 }
 
 func ModifyReportThsMsgIsSend(item *ReportDetail) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	if item.ThsMsgIsSend == 0 {
 		sql := `UPDATE report SET ths_msg_is_send = 1 WHERE id = ? `
-		//_, err = o.Raw(sql, item.Id).Exec()
 		err = global.DmSQL["rddp"].Exec(sql, item.Id).Error
 	}
 	return
@@ -791,17 +719,13 @@ type SaveDayWeekReportReq struct {
 
 // GetReportByReportId 主键获取报告
 func GetReportByReportId(reportId int) (item *Report, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report WHERE id = ?`
-	//err = o.Raw(sql, reportId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, reportId).First(&item).Error
 	return
 }
 
 // DeleteDayWeekReportAndChapter 删除晨周报及章节
 func DeleteDayWeekReportAndChapter(reportId int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -812,16 +736,10 @@ func DeleteDayWeekReportAndChapter(reportId int) (err error) {
 	}()
 
 	sql := ` DELETE FROM report WHERE id = ? LIMIT 1 `
-	//if _, err = to.Raw(sql, reportId).Exec(); err != nil {
-	//	return
-	//}
 	if err = to.Exec(sql, reportId).Error; err != nil {
 		return
 	}
 	sql = ` DELETE FROM report_chapter WHERE report_id = ? `
-	//if _, err = to.Raw(sql, reportId).Exec(); err != nil {
-	//	return
-	//}
 	if err = to.Exec(sql, reportId).Error; err != nil {
 		return
 	}
@@ -830,8 +748,6 @@ func DeleteDayWeekReportAndChapter(reportId int) (err error) {
 
 // UpdateReport 更新报告
 func (reportInfo *Report) UpdateReport(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(reportInfo, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(reportInfo).Error
 	return
 }
@@ -881,8 +797,6 @@ type ElasticReportDetail struct {
 
 // PublishReportAndChapter 发布报告及章节
 func PublishReportAndChapter(reportInfo *Report, isPublishReport bool, cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -893,7 +807,6 @@ func PublishReportAndChapter(reportInfo *Report, isPublishReport bool, cols []st
 	}()
 	// 更新报告
 	if isPublishReport {
-		//	_, err = to.Update(reportInfo, cols...)
 		err = to.Select(cols).Updates(reportInfo).Error
 		if err != nil {
 			return
@@ -902,36 +815,20 @@ func PublishReportAndChapter(reportInfo *Report, isPublishReport bool, cols []st
 
 	// 发布该报告的所有章节
 	sql := ` UPDATE report_chapter SET publish_state = 2, publish_time = ? WHERE report_id = ?  `
-	//_, err = to.Raw(sql, reportInfo.PublishTime, reportInfo.Id).Exec()
 	err = to.Exec(sql, reportInfo.PublishTime, reportInfo.Id).Error
-	// 发布章节
-	//if len(publishIds) > 0 {
-	//	sql := ` UPDATE report_chapter SET publish_state = 2, publish_time = ? WHERE report_id = ? AND report_chapter_id IN (` + utils.GetOrmInReplace(len(publishIds)) + `) `
-	//	_, err = to.Raw(sql, reportInfo.PublishTime, reportInfo.Id, publishIds).Exec()
-	//}
-
-	//if len(unPublishIds) > 0 {
-	//	sql := ` UPDATE report_chapter SET publish_state = 1, publish_time = NULL, is_edit = 0 WHERE report_id = ? AND report_chapter_id IN (` + utils.GetOrmInReplace(len(unPublishIds)) + `) `
-	//	_, err = to.Raw(sql, reportInfo.Id, unPublishIds).Exec()
-	//}
-
 	return
 }
 
 // PublishReportById 发布报告
 func PublishReportById(reportId int, publishTime time.Time, lastModifyAdminId int, lastModifyAdminName string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report SET state = 2, publish_time = ?, pre_publish_time=null, pre_msg_send=0, modify_time = NOW(),last_modify_admin_id=?,last_modify_admin_name=? WHERE id = ? `
-	//_, err = o.Raw(sql, publishTime, lastModifyAdminId, lastModifyAdminName, reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, publishTime, lastModifyAdminId, lastModifyAdminName, reportId).Error
 	return
 }
 
 // ResetReportById 重置报告状态
 func ResetReportById(reportId, state int, lastModifyAdminId int, lastModifyAdminName string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report SET state = ?, pre_publish_time = null, pre_msg_send = 0, modify_time = NOW(),last_modify_admin_id=?,last_modify_admin_name=? WHERE id = ?`
-	//_, err = o.Raw(sql, state, lastModifyAdminId, lastModifyAdminName, reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, state, lastModifyAdminId, lastModifyAdminName, reportId).Error
 	return
 }
@@ -969,16 +866,12 @@ type YbPcSuncode struct {
 
 // GetYbPcSunCode 获取太阳码
 func GetYbPcSunCode(scene, page string) (item *YbPcSuncode, err error) {
-	//o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM yb_pc_suncode WHERE scene = ? AND code_page = ? `
-	//err = o.Raw(sql, scene, page).QueryRow(&item)
 	err = global.DmSQL["weekly"].Raw(sql, scene, page).First(&item).Error
 	return
 }
 
 func AddYbPcSunCode(item *YbPcSuncode) (err error) {
-	//o := orm.NewOrmUsingDB("weekly")
-	//_, err = o.Insert(item)
 	err = global.DmSQL["weekly"].Create(item).Error
 	return
 }
@@ -992,35 +885,27 @@ type YbSuncodePars struct {
 }
 
 func AddYbSuncodePars(item *YbSuncodePars) (err error) {
-	//o := orm.NewOrmUsingDB("weekly")
-	//_, err = o.Insert(item)
 	err = global.DmSQL["weekly"].Create(item).Error
 	return
 }
 
 // UpdateReportSecondClassifyNameByClassifyId 更新报告分类名称字段
 func UpdateReportSecondClassifyNameByClassifyId(classifyId int, classifyName string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := " UPDATE report SET classify_name_second = ? WHERE classify_id_second = ? "
-	//_, err = o.Raw(sql, classifyName, classifyId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, classifyName, classifyId).Error
 	return
 }
 
 // UpdateReportFirstClassifyNameByClassifyId 更新报告分类一级名称字段
 func UpdateReportFirstClassifyNameByClassifyId(classifyId int, classifyName string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := " UPDATE report SET classify_name_first = ? WHERE classify_id_first = ? "
-	//_, err = o.Raw(sql, classifyName, classifyId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, classifyName, classifyId).Error
 	return
 }
 
 // UpdateReportThirdClassifyNameByClassifyId 更新报告的三级分类名称字段
 func UpdateReportThirdClassifyNameByClassifyId(classifyId int, classifyName string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := " UPDATE report SET classify_name_third = ? WHERE classify_id_third = ? "
-	//_, err = o.Raw(sql, classifyName, classifyId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, classifyName, classifyId).Error
 	return
 }
@@ -1028,13 +913,10 @@ func UpdateReportThirdClassifyNameByClassifyId(classifyId int, classifyName stri
 // ModifyReportAuthor 更改报告作者
 func ModifyReportAuthor(condition string, pars []interface{}, authorName string) (count int, err error) {
 	//产品权限
-	//oRddp := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE english_report set author = ? WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	//err = oRddp.Raw(sql, authorName, pars).QueryRow(&count)
-	//err = global.DmSQL["rddp"].Raw(sql, utils.ForwardPars(pars, authorName)...).Scan(&count).Error
 	result := global.DmSQL["rddp"].Raw(sql, utils.ForwardPars(pars, authorName)...)
 	count = int(result.RowsAffected)
 	err = result.Error
@@ -1042,31 +924,25 @@ func ModifyReportAuthor(condition string, pars []interface{}, authorName string)
 }
 
 func UpdateReportPublishTime(reportId int, videoNameDate string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql1 := ` UPDATE report SET publish_time = NOW() WHERE id = ?  `
-	//_, err = o.Raw(sql1, reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql1, reportId).Error
 	if err != nil {
 		return
 	}
 	//修改音频标题
 	sql2 := ` UPDATE report SET video_name=CONCAT(SUBSTRING_INDEX(video_name,"(",1),"` + videoNameDate + `") WHERE id = ? and (video_name !='' and video_name is not null)`
-	//_, err = o.Raw(sql2, reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql2, reportId).Error
 	return
 }
 
 func UpdateReportChapterPublishTime(reportId int, videoNameDate string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql1 := ` UPDATE report_chapter SET publish_time = NOW() WHERE report_id = ? `
-	//_, err = o.Raw(sql1, reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql1, reportId).Error
 	if err != nil {
 		return
 	}
 	//修改音频标题
 	sql2 := ` UPDATE report_chapter SET video_name=CONCAT(SUBSTRING_INDEX(video_name,"(",1),"` + videoNameDate + `") WHERE report_id = ? and (video_name !='' and video_name is not null)`
-	//_, err = o.Raw(sql2, reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql2, reportId).Error
 	return
 }
@@ -1092,7 +968,6 @@ type MarkReportItem struct {
 
 // GetReportByCondition 获取报告
 func GetReportByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, isPage bool, startSize, pageSize int) (items []*Report, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	fields := `*`
 	if len(fieldArr) > 0 {
 		fields = strings.Join(fieldArr, ",")
@@ -1106,10 +981,8 @@ func GetReportByCondition(condition string, pars []interface{}, fieldArr []strin
 	sql += order
 	if isPage {
 		sql += ` LIMIT ?,?`
-		//_, err = o.Raw(sql, pars...).QueryRows(&items)
 		err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	} else {
-		//_, err = o.Raw(sql, pars).QueryRows(&items)
 		err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	}
 	return
@@ -1117,9 +990,7 @@ func GetReportByCondition(condition string, pars []interface{}, fieldArr []strin
 
 // SetPrePublishReportById 设置定时发布
 func SetPrePublishReportById(reportId int, prePublishTime string, preMsgSend int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report SET pre_publish_time=?, pre_msg_send=? WHERE id = ? and state = 1 `
-	//_, err = o.Raw(sql, prePublishTime, preMsgSend, reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, prePublishTime, preMsgSend, reportId).Error
 	return
 }
@@ -1135,25 +1006,20 @@ type ReportCancelApproveReq struct {
 }
 
 func (m *Report) GetItemById(id int) (item *Report, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report WHERE id = ? LIMIT 1`
-	//err = o.Raw(sql, id).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
 	return
 }
 
 // GetReportStateCount 获取指定状态的报告数量
 func GetReportStateCount(state int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COUNT(1) AS count FROM report WHERE state = ?`
-	//err = o.Raw(sql, state).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, state).Scan(&count).Error
 	return
 }
 
 // UpdateReportsStateByCond 批量更新报告状态
 func UpdateReportsStateByCond(classifyFirstId, classifySecondId, classifyThirdId, oldState, newState int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	cond := ``
 	if classifyFirstId > 0 {
 		cond += fmt.Sprintf(` AND classify_id_first = %d`, classifyFirstId)
@@ -1165,7 +1031,6 @@ func UpdateReportsStateByCond(classifyFirstId, classifySecondId, classifyThirdId
 		cond += fmt.Sprintf(` AND classify_id_third = %d`, classifyThirdId)
 	}
 	sql := fmt.Sprintf(`UPDATE report SET state = ?, pre_publish_time = NULL WHERE state = ? %s`, cond)
-	//_, err = o.Raw(sql, newState, oldState).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, newState, oldState).Error
 	return
 }
@@ -1175,17 +1040,14 @@ func UpdateReportsStateBySecondIds(oldState, newState int, secondIds []int) (err
 	if len(secondIds) <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
 	// (有审批流的)未发布->待提交
 	sql := fmt.Sprintf(`UPDATE report SET state = ?, pre_publish_time = NULL WHERE state = ? AND classify_id_second IN (%s)`, utils.GetOrmInReplace(len(secondIds)))
-	//_, err = o.Raw(sql, newState, oldState, secondIds).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, newState, oldState, secondIds).Error
 	if err != nil {
 		return
 	}
 	// (无审批流的)待提交->未发布
 	sql = fmt.Sprintf(`UPDATE report SET state = ?, pre_publish_time = NULL WHERE state = ? AND classify_id_second NOT IN (%s)`, utils.GetOrmInReplace(len(secondIds)))
-	//_, err = o.Raw(sql, oldState, newState, secondIds).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, oldState, newState, secondIds).Error
 	return
 }
@@ -1198,26 +1060,20 @@ type GetReportPdfUrlReq struct {
 }
 
 func ModifyReportPdfUrl(reportId int, detailPdfUrl string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report SET detail_pdf_url=? WHERE id=? `
-	//_, err = o.Raw(sql, detailPdfUrl, reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, detailPdfUrl, reportId).Error
 	return
 }
 
 func ModifyReportImgUrl(reportId int, detailImgUrl string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report SET detail_img_url=? WHERE id=? `
-	//_, err = o.Raw(sql, detailImgUrl, reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, detailImgUrl, reportId).Error
 	return
 }
 
 // UpdatePdfUrlReportById 清空pdf相关字段
 func UpdatePdfUrlReportById(reportId int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report SET detail_img_url = '',detail_pdf_url='',modify_time=NOW() WHERE id = ? `
-	//_, err = o.Raw(sql, reportId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, reportId).Error
 	return
 }
@@ -1229,8 +1085,6 @@ func UpdatePdfUrlReportById(reportId int) (err error) {
 // @param items []*Report
 // @return err error
 func InsertMultiReport(items []*Report) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.InsertMulti(500, items)
 	err = global.DmSQL["rddp"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
@@ -1250,10 +1104,7 @@ type ReportLayout struct {
 // @return item ReportLayout
 // @return err error
 func GetReportLayoutByReportId(reportId int) (item ReportLayout, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-
 	sql := `SELECT id, report_layout  FROM report  WHERE id = ? `
-	//err = o.Raw(sql, reportId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, reportId).First(&item).Error
 	return
 }
@@ -1262,13 +1113,11 @@ func GetReportFieldsByIds(ids []int, fields []string) (items []*Report, err erro
 	if len(ids) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
 	field := " * "
 	if len(fields) > 0 {
 		field = fmt.Sprintf(" %s ", strings.Join(fields, ","))
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM report WHERE id IN (%s)`, field, utils.GetOrmInReplace(len(ids)))
-	//_, err = o.Raw(sql, ids).QueryRows(&items)
 	err = global.DmSQL["rddp"].Raw(sql, ids).Find(&items).Error
 	return
 }

models/report_author.go

@@ -18,22 +18,18 @@ type ReportAuthor struct {
 
 // GetReportAuthorList 获取报告作者列表
 func GetReportAuthorList(condition string, pars []interface{}, startSize, pageSize int) (total int, items []*ReportAuthor, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	baseSql := `  report_author WHERE is_delete=0 `
 	if condition != "" {
 		baseSql += condition
 	}
 
 	totalSql := ` SELECT count(1) total FROM ` + baseSql
-	//err = o.Raw(totalSql, pars).QueryRow(&total)
 	err = global.DmSQL["rddp"].Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
 
 	sql := ` SELECT * FROM ` + baseSql + ` ORDER BY id desc LIMIT ?,? `
-	//	_, err = o.Raw(sql, pars...).QueryRows(&items)
-
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 
@@ -43,13 +39,11 @@ func GetReportAuthorList(condition string, pars []interface{}, startSize, pageSi
 
 // GetReportAuthorCount 获取报告作者列表数
 func GetReportAuthorCount(condition string, pars []interface{}) (total int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 
 	totalSql := ` SELECT count(1) total FROM report_author WHERE 1=1 `
 	if condition != "" {
 		totalSql += condition
 	}
-	//err = o.Raw(totalSql, pars).QueryRow(&total)
 	err = global.DmSQL["rddp"].Raw(totalSql, pars...).Scan(&total).Error
 	return
 }
@@ -68,35 +62,27 @@ type AddReportAuthorReq struct {
 
 // GetReportAuthorById 根据作者id获取数据
 func GetReportAuthorById(authorId int) (item *ReportAuthor, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_author WHERE is_delete=0 AND id = ? `
-	//err = o.Raw(sql, authorId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, authorId).First(&item).Error
 	return
 }
 
 // GetReportAuthorByAuthor 根据作者名称获取数据
 func GetReportAuthorByAuthor(title string, authorType int) (item *ReportAuthor, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_author WHERE is_delete=0 AND report_author=? AND author_type = ? `
-	//err = o.Raw(sql, title, authorType).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, title, authorType).First(&item).Error
 	return
 }
 
 // GetReportAuthorByAuthorAndId 根据作者名称和作者id获取数据
 func GetReportAuthorByAuthorAndId(title string, authorType, authorId int) (item *ReportAuthor, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report_author WHERE is_delete=0 AND report_author=? AND author_type = ? AND id != ? `
-	//err = o.Raw(sql, title, authorType, authorId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, title, authorType, authorId).First(&item).Error
 	return
 }
 
 // AddReportAuthor 新增作者
 func AddReportAuthor(item *ReportAuthor) (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
@@ -104,8 +90,6 @@ func AddReportAuthor(item *ReportAuthor) (lastId int64, err error) {
 
 // Update 更新作者基础信息
 func (item *ReportAuthor) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(item, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(item).Error
 	return
 }

models/report_chapter.go

@@ -130,18 +130,14 @@ type ReportChapterResp struct {
 
 // GetChapterListByReportId 根据ReportId获取章节列表
 func GetChapterListByReportId(reportId int) (list []*ReportChapter, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter WHERE report_id = ? ORDER BY sort ASC`
-	//_, err = o.Raw(sql, reportId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&list).Error
 	return
 }
 
 // GetPublishedChapterListByReportId 根据ReportId获取已发布章节列表
 func GetPublishedChapterListByReportId(reportId int) (list []*ReportChapter, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter WHERE report_id = ? AND publish_state = 2 ORDER BY sort ASC`
-	//_, err = o.Raw(sql, reportId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&list).Error
 	return
 }
@@ -186,9 +182,7 @@ type EditTickList struct {
 
 // GetReportChapterInfoById 根据主键获取报告章节
 func GetReportChapterInfoById(reportChapterId int) (item *ReportChapter, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter WHERE report_chapter_id = ? `
-	//err = o.Raw(sql, reportChapterId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, reportChapterId).First(&item).Error
 	return
 }
@@ -201,18 +195,14 @@ func GetReportChapterInfoById(reportChapterId int) (item *ReportChapter, err err
 // @return item *ReportChapterItem
 // @return err error
 func GetReportChapterItemById(reportChapterId int) (item *ReportChapterItem, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter WHERE report_chapter_id = ? `
-	//err = o.Raw(sql, reportChapterId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, reportChapterId).First(&item).Error
 	return
 }
 
 // GetLastPublishedReportChapter 获取上一篇已发表的晨周报章节
 func GetLastPublishedReportChapter(typeId int, reportType string) (item *ReportChapter, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter WHERE publish_state = 2 AND type_id = ? AND report_type = ? ORDER BY report_chapter_id DESC limit 1 `
-	//err = o.Raw(sql, typeId, reportType).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, typeId, reportType).First(&item).Error
 	return
 }
@@ -224,20 +214,12 @@ func GetLastPublishedReportChapter(typeId int, reportType string) (item *ReportC
 // @datetime 2024-06-04 15:14:41
 // @return err error
 func (chapterChapterInfo *ReportChapter) Add() (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//lastId, err := o.Insert(chapterChapterInfo)
-	//if err != nil {
-	//	return
-	//}
-	//chapterChapterInfo.ReportChapterId = int(lastId)
 	err = global.DmSQL["rddp"].Create(chapterChapterInfo).Error
 	return
 }
 
 // UpdateChapter 更新报表章节
 func (chapterChapterInfo *ReportChapter) UpdateChapter(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(chapterChapterInfo, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(chapterChapterInfo).Error
 	return
 }
@@ -286,7 +268,6 @@ type ReportChapterVideoList struct {
 
 // GetReportChapterVideoList 获取报告章节音频列表
 func GetReportChapterVideoList(reportId int) (list []*ReportChapterVideoList, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT
 				report_id,
 				report_chapter_id,
@@ -299,7 +280,6 @@ func GetReportChapterVideoList(reportId int) (list []*ReportChapterVideoList, er
 				report_id = ? AND publish_state = 2 AND video_url != ""
 			ORDER BY
 				report_chapter_id ASC `
-	//_, err = o.Raw(sql, reportId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&list).Error
 	return
 }
@@ -309,7 +289,6 @@ func GetReportChapterVideoListByReportIds(reportIds []int) (list []*ReportChapte
 	if len(reportIds) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT
 				report_id,
 				report_chapter_id,
@@ -322,10 +301,6 @@ func GetReportChapterVideoListByReportIds(reportIds []int) (list []*ReportChapte
 				report_id IN (` + utils.GetOrmInReplace(len(reportIds)) + `) AND publish_state = 2 AND video_url != ''
 			ORDER BY
 				report_chapter_id ASC `
-	//_, err = o.Raw(sql, reportIds).QueryRows(&list)
-
-	//report_id IN (` + utils.GetOrmInReplace(len(reportIds)) + `) AND publish_state = 2 AND video_url != ""
-
 	err = global.DmSQL["rddp"].Raw(sql, reportIds).Find(&list).Error
 	return
 }
@@ -335,7 +310,6 @@ func GetReportChapterVideoListByChapterIds(chapterIds []int) (list []*ReportChap
 	if len(chapterIds) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT
 				report_id,
 				report_chapter_id,
@@ -348,7 +322,6 @@ func GetReportChapterVideoListByChapterIds(chapterIds []int) (list []*ReportChap
 				report_chapter_id IN (` + utils.GetOrmInReplace(len(chapterIds)) + `) AND publish_state = 2
 			ORDER BY
 				report_chapter_id ASC `
-	//_, err = o.Raw(sql, chapterIds).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, chapterIds).Find(&list).Error
 	return
 }
@@ -361,24 +334,7 @@ type PublishReportChapterReq struct {
 
 // CountPublishedChapterNum 获取报告已发布的章节数
 func CountPublishedChapterNum(reportId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT COUNT(1) AS ct FROM report_chapter WHERE report_id = ? AND publish_state = 2 `
-	//err = o.Raw(sql, reportId).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, reportId).Scan(&count).Error
-	return
-}
-
-// CountUnPublishedChapterNum
-// @Description: 获取报告未发布的章节数
-// @author: Roc
-// @datetime 2024-06-14 15:59:23
-// @param reportId int
-// @return count int
-// @return err error
-func CountUnPublishedChapterNum(reportId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	sql := ` SELECT COUNT(1) AS ct FROM report_chapter WHERE report_id = ? AND publish_state = 1 `
-	//err = o.Raw(sql, reportId).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, reportId).Scan(&count).Error
 	return
 }
@@ -391,9 +347,7 @@ func CountUnPublishedChapterNum(reportId int) (count int, err error) {
 // @return list []*ReportChapter
 // @return err error
 func GetUnPublishedChapterList(reportId int) (list []*ReportChapter, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT report_chapter_id,report_id,title FROM report_chapter WHERE report_id = ? AND publish_state = 1 ORDER BY sort ASC`
-	//_, err = o.Raw(sql, reportId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&list).Error
 	return
 }
@@ -403,51 +357,21 @@ func GetChapterListByChapterIds(chapterIds []int) (list []*ReportChapter, err er
 	if len(chapterIds) == 0 {
 		return
 	}
-	//	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter WHERE report_chapter_id IN (` + utils.GetOrmInReplace(len(chapterIds)) + `) ORDER BY sort ASC`
-	//_, err = o.Raw(sql, chapterIds).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, chapterIds).Find(&list).Error
 	return
 }
 
-// GetChapterSimpleListByChapterIds 根据章节ID获取章节列表
-func GetChapterSimpleListByChapterIds(chapterIds []int) (list []*ReportChapter, err error) {
-	if len(chapterIds) == 0 {
-		return
-	}
-	//o := orm.NewOrmUsingDB("rddp")
-	sql := ` SELECT report_id, report_chapter_id, title, type_name, create_time, IF(publish_time,publish_time,create_time) as publish_time FROM report_chapter WHERE report_chapter_id IN (` + utils.GetOrmInReplace(len(chapterIds)) + `) ORDER BY publish_time desc, sort ASC`
-	//	_, err = o.Raw(sql, chapterIds).QueryRows(&list)
-	err = global.DmSQL["rddp"].Raw(sql, chapterIds).Find(&list).Error
-	return
-}
-
-// GetChapterSimpleListByReportIds 根据ReportId获取章节列表
-func GetChapterSimpleListByReportIds(reportIds []int) (list []*ReportChapter, err error) {
-	if len(reportIds) == 0 {
-		return
-	}
-	//o := orm.NewOrmUsingDB("rddp")
-	sql := ` SELECT report_id, report_chapter_id, title, type_name, create_time, IF(publish_time,publish_time,create_time) as publish_time FROM report_chapter WHERE publish_state = 2 and report_id IN (` + utils.GetOrmInReplace(len(reportIds)) + `) ORDER BY publish_time desc, sort ASC`
-	//_, err = o.Raw(sql, reportIds).QueryRows(&list)
-	err = global.DmSQL["rddp"].Raw(sql, reportIds).Find(&list).Error
-	return
-}
-
 // UpdateReportChapterTypeNameByTypeId 更新章节类型名称
 func UpdateReportChapterTypeNameByTypeId(typeId int, typeName string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `UPDATE report_chapter SET type_name = ? WHERE type_id = ?`
-	//_, err = o.Raw(sql, typeName, typeId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, typeName, typeId).Error
 	return
 }
 
 // CountReportChapterByTypeId 通过章节类型ID获取章节数
 func CountReportChapterByTypeId(typeId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT COUNT(1) AS ct FROM report_chapter WHERE type_id = ?`
-	//err = o.Raw(sql, typeId).QueryRow(&count)
 	err = global.DmSQL["rddp"].Raw(sql, typeId).Scan(&count).Error
 	return
 }
@@ -477,11 +401,9 @@ type EditReportChapterBaseInfoAndPermissionReq struct {
 // @return list []int
 // @return err error
 func GetReportChapterIdList(reportId int) (list []int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT report_chapter_id FROM report_chapter
 			WHERE report_id = ? 
 			ORDER BY report_chapter_id ASC `
-	//_, err = o.Raw(sql, reportId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, reportId).Scan(&list).Error
 	return
 }
@@ -489,8 +411,7 @@ func GetReportChapterIdList(reportId int) (list []int, err error) {
 // ReportChapterMoveReq
 // @Description:  报告章节移动请求
 type ReportChapterMoveReq struct {
-	ReportChapterId int `description:"报告章节id"`
-	//	ParentChartPermissionId int `description:"父级品种id"`
+	ReportChapterId     int `description:"报告章节id"`
 	PrevReportChapterId int `description:"上一个兄弟节点报告章节id"`
 	NextReportChapterId int `description:"下一个兄弟节点报告章节id"`
 }
@@ -504,9 +425,7 @@ type ReportChapterMoveReq struct {
 // @return item *ReportChapter
 // @return err error
 func (chapterChapterInfo *ReportChapter) GetReportChapterById(reportChapterId int) (item *ReportChapter, err error) {
-	//	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter WHERE report_chapter_id = ?`
-	//err = o.Raw(sql, reportChapterId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, reportChapterId).First(&item).Error
 	return
 }
@@ -522,7 +441,6 @@ func (chapterChapterInfo *ReportChapter) GetReportChapterById(reportChapterId in
 // @param updateSort string
 // @return err error
 func (chapterChapterInfo *ReportChapter) UpdateReportChapterSortByReportId(reportId, reportChapterId, nowSort int, updateSort string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	pars := make([]interface{}, 0)
 	sql := ` update report_chapter set sort = ` + updateSort + ` WHERE report_id = ? AND sort > ?`
 	pars = append(pars, reportId, nowSort)
@@ -532,7 +450,6 @@ func (chapterChapterInfo *ReportChapter) UpdateReportChapterSortByReportId(repor
 		pars = append(pars, reportChapterId, nowSort)
 	}
 
-	//_, err = o.Raw(sql, pars).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, pars...).Error
 	return
 }
@@ -546,9 +463,7 @@ func (chapterChapterInfo *ReportChapter) UpdateReportChapterSortByReportId(repor
 // @return item *ReportChapter
 // @return err error
 func (chapterChapterInfo *ReportChapter) GetFirstReportChapterByReportId(reportId int) (item *ReportChapter, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter WHERE 1 = 1 AND report_id = ? ORDER BY sort ASC, report_chapter_id ASC LIMIT 1`
-	//err = o.Raw(sql, reportId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, reportId).First(&item).Error
 	return
 }
@@ -562,9 +477,7 @@ func (chapterChapterInfo *ReportChapter) GetFirstReportChapterByReportId(reportI
 // @return maxSort int
 // @return err error
 func (chapterChapterInfo *ReportChapter) GetMaxSortByReportId(reportId int) (maxSort int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM report_chapter WHERE report_id = ?`
-	//err = o.Raw(sql, reportId).QueryRow(&maxSort)
 	err = global.DmSQL["rddp"].Raw(sql, reportId).Scan(&maxSort).Error
 	return
 }
@@ -577,8 +490,6 @@ func (chapterChapterInfo *ReportChapter) GetMaxSortByReportId(reportId int) (max
 // @param cols []string
 // @return err error
 func (chapterChapterInfo *ReportChapter) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(chapterChapterInfo, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(chapterChapterInfo).Error
 	return
 }
@@ -591,9 +502,7 @@ type DelReportChapterReq struct {
 
 // GetAllReportChapter 获取所有的报告章节
 func GetAllReportChapter() (items []*ReportChapter, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter ORDER BY report_chapter_id asc `
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DmSQL["rddp"].Raw(sql).Find(&items).Error
 	return
 }
@@ -607,12 +516,10 @@ func GetAllReportChapter() (items []*ReportChapter, err error) {
 // @return count int
 // @return err error
 func GetCountReportChapterByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT COUNT(1) AS count FROM report_chapter 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
 }

models/report_chapter_ticker.go

@@ -17,8 +17,6 @@ type ReportChapterTicker struct {
 
 // 新增章节ticker
 func InsertChapterTicker(tickerInfo *ReportChapterTicker) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//lastId, err = o.Insert(tickerInfo)
 	err = global.DmSQL["rddp"].Create(tickerInfo).Error
 	lastId = int64(tickerInfo.Id)
 	return
@@ -26,18 +24,14 @@ func InsertChapterTicker(tickerInfo *ReportChapterTicker) (lastId int64, err err
 
 // GetTickerListByReportChapterId 根据章节ID获取ticker列表
 func GetTickerListByReportChapterId(reportChapterId int) (list []*ReportChapterTicker, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_ticker WHERE report_chapter_id = ? ORDER BY sort ASC `
-	//_, err = o.Raw(sql, reportChapterId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, reportChapterId).Find(&list).Error
 	return
 }
 
 // ClearReportChapterTicker 清空章节ticker
 func ClearReportChapterTicker(reportChapterId int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` DELETE FROM report_chapter_ticker WHERE report_chapter_id = ? `
-	//_, err = o.Raw(sql, reportChapterId).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, reportChapterId).Error
 	return
 }
@@ -60,7 +54,6 @@ type DailyBaseColumn struct {
 
 // GetDailyBaseColumnList 获取基础列列表
 func GetDailyBaseColumnList(keyword string, typeId int) (list []*DailyBaseColumn, err error) {
-	//o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM daily_base_column WHERE 1 = 1 `
 	pars := make([]interface{}, 0)
 	if keyword != "" {
@@ -69,7 +62,6 @@ func GetDailyBaseColumnList(keyword string, typeId int) (list []*DailyBaseColumn
 	}
 	pars = append(pars, typeId)
 	sql += ` AND report_chapter_type_id = ? `
-	//_, err = o.Raw(sql, pars).QueryRows(&list)
 	err = global.DmSQL["weekly"].Raw(sql, pars...).Find(&list).Error
 	return
 }

models/report_chapter_type.go

@@ -35,12 +35,6 @@ type ReportChapterType struct {
 }
 
 func (r *ReportChapterType) Create() (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//id, err := o.Insert(r)
-	//if err != nil {
-	//	return
-	//}
-	//r.ReportChapterTypeId = int(id)
 	err = global.DmSQL["rddp"].Create(r).Error
 	return
 }
@@ -56,23 +50,17 @@ func (r *ReportChapterType) MultiCreate(addList []*ReportChapterType) (err error
 	if len(addList) <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.InsertMulti(500, addList)
 	err = global.DmSQL["rddp"].CreateInBatches(addList, utils.MultiAddNum).Error
 	return
 }
 
 func (r *ReportChapterType) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(r, cols...)
 	err = global.DmSQL["rddp"].Model(r).Select(cols).Updates(r).Error
 	return
 }
 
 // DeleteReportChapterType 删除章节类型及相关权限
 func DeleteReportChapterType(typeId int, reportType string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -84,16 +72,13 @@ func DeleteReportChapterType(typeId int, reportType string) (err error) {
 
 	// 删除章节类型
 	sql := `DELETE FROM report_chapter_type WHERE report_chapter_type_id = ? LIMIT 1`
-	//_, err = to.Raw(sql, typeId).Exec()
 	err = to.Exec(sql, typeId).Error
 	// 删除章节类型权限
 	sql = `DELETE FROM report_chapter_type_permission WHERE report_chapter_type_id = ?`
-	//_, err = to.Raw(sql, typeId).Exec()
 	err = to.Exec(sql, typeId).Error
 	// 周报-删除实际权限
 	if reportType == utils.REPORT_TYPE_WEEK {
 		sql = `DELETE FROM chart_permission_chapter_mapping WHERE report_chapter_type_id = ? AND research_type = ?`
-		//_, err = to.Raw(sql, typeId, reportType).Exec()
 		err = to.Exec(sql, typeId, reportType).Error
 	}
 	return
@@ -101,53 +86,35 @@ func DeleteReportChapterType(typeId int, reportType string) (err error) {
 
 // GetReportChapterTypeById 获取章节类型
 func GetReportChapterTypeById(reportChapterTypeId int) (item *ReportChapterType, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE report_chapter_type_id = ? `
-	//err = o.Raw(sql, reportChapterTypeId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, reportChapterTypeId).First(&item).Error
 	return
 }
 
 // GetReportChapterTypeList 获取章节类型列表
 func GetReportChapterTypeList() (list []*ReportChapterType, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE enabled = 1 `
-	//_, err = o.Raw(sql).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql).Find(&list).Error
 	return
 }
 
 // GetReportChapterTypeListByResearchType 通过报告类型获取章节类型列表
 func GetReportChapterTypeListByResearchType(researchType string) (list []*ReportChapterType, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE research_type = ? AND enabled = 1`
-	//_, err = o.Raw(sql, researchType).QueryRows(&list)
-	err = global.DmSQL["rddp"].Raw(sql, researchType).Find(&list).Error
-	return
-}
-
-// GetAllReportChapterTypeListByResearchType 通过报告类型获取章节类型列表
-func GetAllReportChapterTypeListByResearchType(researchType string) (list []*ReportChapterType, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	sql := ` SELECT * FROM report_chapter_type WHERE research_type = ?`
-	//_, err = o.Raw(sql, researchType).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, researchType).Find(&list).Error
 	return
 }
 
 // GetAllReportChapterTypeList 通过传入的条件获取所有的章节类型列表
 func GetAllReportChapterTypeList(condition string, pars []interface{}) (list []*ReportChapterType, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE 1=1 `
 	sql += condition
-	//_, err = o.Raw(sql, pars).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&list).Error
 	return
 }
 
 // GetEnableReportChapterTypeList 获取未暂停的章节类型列表
 func GetEnableReportChapterTypeList(researchType string) (list []*ReportChapterType, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT
 				*
 			FROM
@@ -163,7 +130,6 @@ func GetEnableReportChapterTypeList(researchType string) (list []*ReportChapterT
 					NOW() NOT BETWEEN pause_start_time AND pause_end_time
 				)
 			) `
-	//_, err = o.Raw(sql, researchType).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, researchType).Find(&list).Error
 	return
 }
@@ -177,9 +143,7 @@ type DayWeekReportPauseTime struct {
 
 // GetDayWeekReportPauseTimeList 获取晨报周报暂停时间
 func GetDayWeekReportPauseTimeList() (list []*DayWeekReportPauseTime, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT research_type, MAX(a.pause_start_time) AS pause_start_time, MAX(a.pause_end_time) AS pause_end_time FROM report_chapter_type AS a WHERE a.is_set = 1 GROUP BY a.research_type`
-	//_, err = o.Raw(sql).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql).Find(&list).Error
 	return
 }
@@ -202,19 +166,8 @@ type SetDayWeekReportEnableUpdateRuleReq struct {
 	WeekReportChapterTypeId string `description:"章节类型ID 英文逗号拼接"`
 }
 
-// ResetDayWeekReportUpdateRule 重置章节类型的暂停时间
-func ResetDayWeekReportUpdateRule(researchType string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	sql := ` UPDATE report_chapter_type SET pause_start_time = null, pause_end_time = null, is_set = 0 WHERE research_type = ?`
-	//_, err = o.Raw(sql, researchType).Exec()
-	err = global.DmSQL["rddp"].Exec(sql, researchType).Error
-	return
-}
-
 // SetDayWeekReportUpdateRule 设置章节类型的暂停时间
 func SetDayWeekReportUpdateRule(researchType string, list []DayWeekReportUpdateRule) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -226,7 +179,6 @@ func SetDayWeekReportUpdateRule(researchType string, list []DayWeekReportUpdateR
 
 	// 先将所有品种的状态变更为启用
 	sql := ` UPDATE report_chapter_type SET pause_start_time = null, pause_end_time = null, is_set = 0 WHERE research_type = ?`
-	//_, err = to.Raw(sql, researchType).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, researchType).Error
 	if err != nil {
 		return
@@ -237,7 +189,6 @@ func SetDayWeekReportUpdateRule(researchType string, list []DayWeekReportUpdateR
 			continue
 		}
 		tmpSql := ` UPDATE report_chapter_type SET pause_start_time = ?, pause_end_time = ?, is_set = 1 WHERE research_type = ? AND report_chapter_type_id = ? `
-		//_, err = to.Raw(tmpSql, v.PauseStartTime, v.PauseEndTime, researchType, v.ReportChapterTypeId).Exec()
 		err = global.DmSQL["rddp"].Exec(tmpSql, v.PauseStartTime, v.PauseEndTime, researchType, v.ReportChapterTypeId).Error
 		if err != nil {
 			return
@@ -249,8 +200,6 @@ func SetDayWeekReportUpdateRule(researchType string, list []DayWeekReportUpdateR
 
 // SetDayWeekReportEnableUpdateRule 设置章节类型的禁用状态
 func SetDayWeekReportEnableUpdateRule(dayReportChapterTypeIdList, weekReportChapterTypeIdList []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -263,7 +212,6 @@ func SetDayWeekReportEnableUpdateRule(dayReportChapterTypeIdList, weekReportChap
 		researchType := `day`
 		// 先将所有品种的状态变更为启用
 		sql := ` UPDATE report_chapter_type SET enabled = 1 WHERE research_type = ?`
-		//_, err = to.Raw(sql, researchType).Exec()
 		err = global.DmSQL["rddp"].Exec(sql, researchType).Error
 		if err != nil {
 			return
@@ -273,7 +221,6 @@ func SetDayWeekReportEnableUpdateRule(dayReportChapterTypeIdList, weekReportChap
 		num := len(dayReportChapterTypeIdList)
 		if num > 0 {
 			sql = ` UPDATE report_chapter_type SET pause_start_time = null, pause_end_time = null, is_set = 0 , enabled = 0 WHERE research_type = ? AND report_chapter_type_id IN (` + utils.GetOrmInReplace(num) + `) `
-			//_, err = to.Raw(sql, researchType, dayReportChapterTypeIdList).Exec()
 			err = global.DmSQL["rddp"].Exec(sql, researchType, dayReportChapterTypeIdList).Error
 		}
 	}
@@ -282,7 +229,6 @@ func SetDayWeekReportEnableUpdateRule(dayReportChapterTypeIdList, weekReportChap
 		researchType := `week`
 		// 先将所有品种的状态变更为启用
 		sql := ` UPDATE report_chapter_type SET enabled = 1 WHERE research_type = ?`
-		//_, err = to.Raw(sql, researchType).Exec()
 		err = global.DmSQL["rddp"].Exec(sql, researchType).Error
 		if err != nil {
 			return
@@ -292,7 +238,6 @@ func SetDayWeekReportEnableUpdateRule(dayReportChapterTypeIdList, weekReportChap
 		num := len(weekReportChapterTypeIdList)
 		if num > 0 {
 			sql = ` UPDATE report_chapter_type SET pause_start_time = null, pause_end_time = null, is_set = 0 , enabled = 0 WHERE research_type = ? AND report_chapter_type_id IN (` + utils.GetOrmInReplace(num) + `) `
-			//_, err = to.Raw(sql, researchType, weekReportChapterTypeIdList).Exec()
 			err = global.DmSQL["rddp"].Exec(sql, researchType, weekReportChapterTypeIdList).Error
 		}
 	}
@@ -309,18 +254,14 @@ type StopUpdateReportChapterTypeResp struct {
 
 // GetStopUpdateReportChapterTypeListByResearchType 获取暂停更新章节类型列表
 func GetStopUpdateReportChapterTypeListByResearchType() (list []*ReportChapterType, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE is_set = 1 AND pause_end_time >= ? AND enabled = 1 `
-	//_, err = o.Raw(sql, time.Now().Format(utils.FormatDate)).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, time.Now().Format(utils.FormatDate)).First(&list).Error
 	return
 }
 
 // GetDisableUpdateReportChapterTypeListByResearchType 获取停止更新的章节类型列表
 func GetDisableUpdateReportChapterTypeListByResearchType() (list []*ReportChapterType, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE enabled = 0`
-	//_, err = o.Raw(sql).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql).Find(&list).Error
 	return
 }
@@ -335,23 +276,11 @@ type ReportChapterTypeListResp struct {
 	List []*ReportChapterTypeListItem
 }
 
-// GetReportChapterTypeCount 获取章节类型总数
-func GetReportChapterTypeCount(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	sql := ` SELECT COUNT(1) FROM report_chapter_type WHERE 1 = 1 `
-	sql += condition
-	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
-	return
-}
-
 // GetReportChapterTypePageList 获取章节类型列表
 func GetReportChapterTypePageList(condition string, pars []interface{}) (list []*ReportChapterType, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE 1 = 1 `
 	sql += condition
 	sql += ` ORDER BY sort ASC, created_time DESC`
-	//_, err = o.Raw(sql, pars).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&list).Error
 	return
 }
@@ -377,11 +306,6 @@ type ReportChapterTypeAddReq struct {
 	ReportChapterTypeName string `description:"报告章节类型名称"`
 	ClassifyId            int    `description:"所属报告分类id"`
 	ChartPermissionIdList []int  `description:"权限id数组"`
-	/*SelectedImage         string `description:"选中时的icon"`
-	UnselectedImage       string `description:"未选中时的icon"`
-	WordsImage            string `description:"带字的icon"`
-	EditImgUrl            string `description:"管理后台编辑时选用的图"`
-	IsShow                int    `description:"显示隐藏: 1-显示; 0-隐藏"`*/
 }
 
 // ReportChapterTypeEditReq 编辑章节类型请求体
@@ -390,11 +314,6 @@ type ReportChapterTypeEditReq struct {
 	ReportChapterTypeName string `description:"报告章节类型名称"`
 	ClassifyId            int    `description:"所属报告分类id"`
 	ChartPermissionIdList []int  `description:"权限id数组"`
-	/*SelectedImage         string `description:"选中时的icon"`
-	UnselectedImage       string `description:"未选中时的icon"`
-	WordsImage            string `description:"带字的icon"`
-	EditImgUrl            string `description:"管理后台编辑时选用的图"`
-	IsShow                int    `description:"显示隐藏: 1-显示; 0-隐藏"`*/
 }
 
 // ReportChapterTypeDelReq 删除章节类型请求体
@@ -422,69 +341,55 @@ type ReportChapterTypeEnabledReq struct {
 
 // GetReportChapterTypeByCondition 获取章节类型
 func GetReportChapterTypeByCondition(condition string, pars []interface{}) (item *ReportChapterType, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE 1 = 1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	//err = o.Raw(sql, pars).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 // GetMaxSort 获取最大的排序值
 func (r *ReportChapterType) GetMaxSort() (maxSort int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM report_chapter_type`
-	//err = o.Raw(sql).QueryRow(&maxSort)
 	err = global.DmSQL["rddp"].Raw(sql).Scan(&maxSort).Error
 	return
 }
 
 // GetMaxSortByResearchType 获取最大的排序值
 func (r *ReportChapterType) GetMaxSortByResearchType(researchType string) (maxSort int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM report_chapter_type WHERE research_type = ?`
-	//err = o.Raw(sql, researchType).QueryRow(&maxSort)
 	err = global.DmSQL["rddp"].Raw(sql, researchType).Scan(&maxSort).Error
 	return
 }
 
 // UpdateReportChapterTypeSortByResearchType 根据父类id更新排序
 func UpdateReportChapterTypeSortByResearchType(researchType string, reportChapterTypeId, nowSort int, updateSort string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` update report_chapter_type set sort = ` + updateSort + ` WHERE research_type=? AND sort > ?`
 	if reportChapterTypeId > 0 {
 		sql += ` or ( report_chapter_type_id > ` + fmt.Sprint(reportChapterTypeId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
 	}
 
-	//_, err = o.Raw(sql, researchType, nowSort).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, researchType, nowSort).Error
 	return
 }
 
 // GetFirstReportChapterTypeByParentId 获取当前父级分类下，且排序数相同 的排序第一条的数据
 func (r *ReportChapterType) GetFirstReportChapterTypeByResearchType(researchType string) (item *ReportChapterType, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE 1 = 1 AND research_type = ? ORDER BY sort ASC, report_chapter_type_id ASC LIMIT 1`
-	//err = o.Raw(sql, researchType).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, researchType).First(&item).Error
 	return
 }
 
 // GetReportChapterTypeById 获取章节类型
 func (r *ReportChapterType) GetReportChapterTypeById(reportChapterTypeId int) (item *ReportChapterType, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE report_chapter_type_id = ?`
-	//err = o.Raw(sql, reportChapterTypeId).QueryRow(&item)
 	err = global.DmSQL["rddp"].Raw(sql, reportChapterTypeId).First(&item).Error
 	return
 }
 
 // SetEnabled 更新启动禁用
 func (r *ReportChapterType) SetEnabled(id, enabled int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` update report_chapter_type set enabled = ? WHERE report_chapter_type_id = ?`
-	//_, err = o.Raw(sql, enabled, id).Exec()
 	err = global.DmSQL["rddp"].Exec(sql, enabled, id).Error
 	return
 }
@@ -497,9 +402,7 @@ func (r *ReportChapterType) SetEnabled(id, enabled int) (err error) {
 // @return list []*ReportChapterType
 // @return err error
 func GetReportChapterTypeListByClassifyId(classifyId int) (list []*ReportChapterType, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE report_classify_id = ? AND enabled = 1`
-	//_, err = o.Raw(sql, classifyId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, classifyId).Find(&list).Error
 	return
 }
@@ -512,9 +415,7 @@ func GetReportChapterTypeListByClassifyId(classifyId int) (list []*ReportChapter
 // @return list []*ReportChapterType
 // @return err error
 func GetAllReportChapterTypeListByClassifyId(classifyId int) (list []*ReportChapterType, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE report_classify_id = ? `
-	//_, err = o.Raw(sql, classifyId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, classifyId).Find(&list).Error
 	return
 }

models/report_chapter_type_permission.go

@@ -24,17 +24,13 @@ type ReportChapterTypePermission struct {
 // @return list []*ReportChapterTypePermission
 // @return err error
 func GetChapterTypePermissionByReportChapterTypeId(typeId int) (list []*ReportChapterTypePermission, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type_permission WHERE report_chapter_type_id = ?  ORDER BY chart_permission_id ASC `
-	//_, err = o.Raw(sql, typeId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, typeId).Find(&list).Error
 	return
 }
 
 // SetReportChapterTypePermission 设置报告章节类型权限
 func SetReportChapterTypePermission(chapterTypeId int, newPermissions []*ReportChapterTypePermission) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -46,7 +42,6 @@ func SetReportChapterTypePermission(chapterTypeId int, newPermissions []*ReportC
 
 	// 删除原章节类型权限
 	sql := `DELETE FROM report_chapter_type_permission WHERE report_chapter_type_id = ?`
-	//_, err = to.Raw(sql, chapterTypeId).Exec()
 	err = to.Exec(sql, chapterTypeId).Error
 	if err != nil {
 		return
@@ -54,40 +49,11 @@ func SetReportChapterTypePermission(chapterTypeId int, newPermissions []*ReportC
 
 	// 新增章节类型权限
 	if len(newPermissions) > 0 {
-		//_, err = to.InsertMulti(len(newPermissions), newPermissions)
 		err = to.CreateInBatches(newPermissions, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
 	}
-
-	// 周报章节调整chart_permission_chapter_mapping表
-	//if researchType == utils.REPORT_TYPE_WEEK {
-	//	// 删除原权限
-	//	sql = `DELETE FROM chart_permission_chapter_mapping WHERE report_chapter_type_id = ? AND research_type = ?`
-	//	_, err = to.Raw(sql, chapterTypeId, researchType).Exec()
-	//	if err != nil {
-	//		return
-	//	}
-	//
-	//	// 新增权限
-	//	if len(newWeekPermissions) > 0 {
-	//		_, err = to.InsertMulti(len(newWeekPermissions), newWeekPermissions)
-	//		if err != nil {
-	//			return
-	//		}
-	//	}
-	//}
-
-	return
-}
-
-// GetChapterTypePermissionByResearchType 根据章节类型ID及研报类型获取章节类型权限列表
-func GetChapterTypePermissionByResearchType(researchType string) (list []*ReportChapterTypePermission, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	sql := ` SELECT * FROM report_chapter_type_permission WHERE research_type = ? ORDER BY chart_permission_id ASC `
-	//_, err = o.Raw(sql, researchType).QueryRows(&list)
-	err = global.DmSQL["rddp"].Raw(sql, researchType).Find(&list).Error
 	return
 }
 
@@ -103,9 +69,7 @@ func GetChapterTypePermissionByChapterTypeIdList(chapterTypeIdList []int) (list
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type_permission WHERE report_chapter_type_id in (` + utils.GetOrmInReplace(num) + `) ORDER BY chart_permission_id ASC `
-	//_, err = o.Raw(sql, chapterTypeIdList).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, chapterTypeIdList).Find(&list).Error
 	return
 }
@@ -117,9 +81,7 @@ func GetChapterTypePermissionByChapterTypeIdList(chapterTypeIdList []int) (list
 // @return list []*ReportChapterTypePermission
 // @return err error
 func GetAllChapterTypePermission() (list []*ReportChapterTypePermission, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type_permission ORDER BY chart_permission_id ASC `
-	///_, err = o.Raw(sql).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql).Find(&list).Error
 	return
 }

models/report_grant.go

@@ -1,8 +1,6 @@
 package models
 
 import (
-	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
 	"time"
 )
 
@@ -14,54 +12,3 @@ type ReportGrant struct {
 	GrantAdminId int64     `gorm:"column:grant_admin_id"` //`description:"授权部门id"`
 	CreateTime   time.Time `gorm:"column:create_time"`    //`orm:"auto_now_add;type(datetime)" description:"创建时间"`
 }
-
-// GetReportGrantInfo 获取已经有权限的report列表
-func GetReportGrantInfo(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
-}
-
-// MultiAddReportGrant 批量添加授权记录
-func MultiAddReportGrant(reportId int, list []*ReportGrant) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
-	to := global.DmSQL["rddp"].Begin()
-	defer func() {
-		if err != nil {
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
-
-	sql := "DELETE from report_grant where report_id=?"
-	//_, err = to.Raw(sql, reportId).Exec()
-	err = to.Exec(sql, reportId).Error
-	if err != nil {
-		return
-	}
-
-	// 新增授权记录
-	if len(list) > 0 {
-		//_, tmpErr := to.InsertMulti(len(list), list)
-		tmpErr := to.CreateInBatches(list, utils.MultiAddNum).Error
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-	}
-
-	return
-}
-
-// DeleteReportGrant 移除授权记录
-func DeleteReportGrant(reportId int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	sql := "DELETE from report_grant where report_id=?"
-	//_, err = o.Raw(sql, reportId).Exec()
-	err = global.DmSQL["rddp"].Exec(sql, reportId).Error
-	return
-}

models/report_ppt_img.go

@@ -21,9 +21,6 @@ func AddAndEditMultiReportPptImg(pptId int, reportPptImgList []*ReportPptImg) (e
 	if len(reportPptImgList) < 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("rddp")
-	//
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -33,12 +30,10 @@ func AddAndEditMultiReportPptImg(pptId int, reportPptImgList []*ReportPptImg) (e
 		}
 	}()
 	sql := ` DELETE FROM report_ppt_img WHERE ppt_id = ?`
-	//_, err = to.Raw(sql, pptId).Exec()
 	err = to.Exec(sql, pptId).Error
 	if err != nil {
 		return
 	}
-	//_, err = to.InsertMulti(len(reportPptImgList), reportPptImgList)
 	err = to.CreateInBatches(reportPptImgList, utils.MultiAddNum).Error
 	return
 }

models/report_state_record.go

@@ -16,8 +16,6 @@ type ReportStateRecord struct {
 }
 
 func AddReportStateRecord(item *ReportStateRecord) (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

models/report_v2.go

@@ -17,8 +17,6 @@ import (
 // @return reportId int64
 // @return err error
 func AddReportAndChapter(reportItem *Report, allGrantUserList []*report.ReportGrant, addReportChapterList []AddReportChapter) (reportId int64, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -29,7 +27,6 @@ func AddReportAndChapter(reportItem *Report, allGrantUserList []*report.ReportGr
 	}()
 
 	// 新增报告
-	//reportId, err = to.Insert(reportItem)
 	err = to.Create(reportItem).Error
 	reportId = int64(reportItem.Id)
 	if err != nil {
@@ -42,7 +39,6 @@ func AddReportAndChapter(reportItem *Report, allGrantUserList []*report.ReportGr
 		for _, v := range allGrantUserList {
 			v.ReportId = reportItem.Id
 		}
-		//_, err = to.InsertMulti(500, allGrantUserList)
 		err = to.CreateInBatches(allGrantUserList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -106,8 +102,6 @@ func AddReportAndChapter(reportItem *Report, allGrantUserList []*report.ReportGr
 // @param delReportGrantIdList []int
 // @return err error
 func EditReportAndPermission(reportInfo *Report, updateCols []string, addReportGrantList []*report.ReportGrant, delReportGrantIdList []int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -119,7 +113,6 @@ func EditReportAndPermission(reportInfo *Report, updateCols []string, addReportG
 
 	// 变更报告章节信息
 	if len(updateCols) > 0 {
-		//_, err = to.Update(reportInfo, updateCols...)
 		err = to.Select(updateCols).Updates(reportInfo).Error
 		if err != nil {
 			return
@@ -128,7 +121,6 @@ func EditReportAndPermission(reportInfo *Report, updateCols []string, addReportG
 
 	// 新增报告授权用户
 	if len(addReportGrantList) > 0 {
-		//_, err = to.InsertMulti(500, addReportGrantList)
 		err = to.CreateInBatches(addReportGrantList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -139,7 +131,6 @@ func EditReportAndPermission(reportInfo *Report, updateCols []string, addReportG
 	delNum := len(delReportGrantIdList)
 	if delNum > 0 {
 		sql := `DELETE FROM report_grant WHERE grant_id IN (` + utils.GetOrmInReplace(delNum) + `)`
-		//_, err = to.Raw(sql, delReportGrantIdList).Exec()
 		err = to.Exec(sql, delReportGrantIdList).Error
 		if err != nil {
 			return
@@ -158,8 +149,6 @@ func EditReportAndPermission(reportInfo *Report, updateCols []string, addReportG
 // @param addChapterPermissionMap []*report.ReportChapterPermissionMapping
 // @return err error
 func AddChapterBaseInfoAndPermission(reportChapterInfo *ReportChapter, addReportChapterGrantList []*report.ReportChapterGrant, addChapterPermissionMap []*report.ReportChapterPermissionMapping) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -169,7 +158,6 @@ func AddChapterBaseInfoAndPermission(reportChapterInfo *ReportChapter, addReport
 		}
 	}()
 
-	//lastId, err := to.Insert(reportChapterInfo)
 	err = to.Create(reportChapterInfo).Error
 	if err != nil {
 		return
@@ -182,7 +170,6 @@ func AddChapterBaseInfoAndPermission(reportChapterInfo *ReportChapter, addReport
 		for k, _ := range addReportChapterGrantList {
 			addReportChapterGrantList[k].ReportChapterId = reportChapterInfo.ReportChapterId
 		}
-		//_, err = to.InsertMulti(500, addReportChapterGrantList)
 		err = to.CreateInBatches(addReportChapterGrantList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -195,7 +182,6 @@ func AddChapterBaseInfoAndPermission(reportChapterInfo *ReportChapter, addReport
 			addChapterPermissionMap[k].ReportChapterId = reportChapterInfo.ReportChapterId
 		}
 
-		//_, err = to.InsertMulti(500, addChapterPermissionMap)
 		err = to.CreateInBatches(addChapterPermissionMap, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -217,8 +203,6 @@ func AddChapterBaseInfoAndPermission(reportChapterInfo *ReportChapter, addReport
 // @param delChapterPermissionMappingIdList []int
 // @return err error
 func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *ReportChapter, updateCols []string, addReportChapterGrantList []*report.ReportChapterGrant, addChapterPermissionMap []*report.ReportChapterPermissionMapping, delReportChapterGrantIdList, delChapterPermissionMappingIdList []int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -230,7 +214,6 @@ func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *Rep
 
 	// 变更报告的最后编辑人信息
 	{
-		//_, err = to.Update(reportInfo, "LastModifyAdminId", "LastModifyAdminName", "ModifyTime")
 		err = to.Select("LastModifyAdminId", "LastModifyAdminName", "ModifyTime").Updates(reportInfo).Error
 		if err != nil {
 			return
@@ -239,7 +222,6 @@ func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *Rep
 
 	// 变更报告章节信息
 	if len(updateCols) > 0 {
-		//_, err = to.Update(reportChapterInfo, updateCols...)
 		err = to.Select(updateCols).Updates(reportChapterInfo).Error
 		if err != nil {
 			return
@@ -248,7 +230,6 @@ func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *Rep
 
 	// 新增报告章节授权用户
 	if len(addReportChapterGrantList) > 0 {
-		//_, err = to.InsertMulti(500, addReportChapterGrantList)
 		err = to.CreateInBatches(addReportChapterGrantList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -259,7 +240,6 @@ func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *Rep
 	delNum := len(delReportChapterGrantIdList)
 	if delNum > 0 {
 		sql := `DELETE FROM report_chapter_grant WHERE grant_id IN (` + utils.GetOrmInReplace(delNum) + `)`
-		//_, err = to.Raw(sql, delReportChapterGrantIdList).Exec()
 		err = to.Exec(sql, delReportChapterGrantIdList).Error
 		if err != nil {
 			return
@@ -268,7 +248,6 @@ func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *Rep
 
 	// 新增报告章节的品种配置
 	if len(addChapterPermissionMap) > 0 {
-		//_, err = to.InsertMulti(500, addChapterPermissionMap)
 		err = to.CreateInBatches(addChapterPermissionMap, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -279,7 +258,6 @@ func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *Rep
 	delNum = len(delChapterPermissionMappingIdList)
 	if delNum > 0 {
 		sql := `DELETE FROM report_chapter_permission_mapping WHERE report_chapter_permission_mapping_id IN (` + utils.GetOrmInReplace(delNum) + `)`
-		//_, err = to.Raw(sql, delChapterPermissionMappingIdList).Exec()
 		err = to.Exec(sql, delChapterPermissionMappingIdList).Error
 		if err != nil {
 			return
@@ -298,8 +276,6 @@ func EditChapterBaseInfoAndPermission(reportInfo *Report, reportChapterInfo *Rep
 // @param reportChapterInfo *ReportChapter
 // @return err error
 func DelChapterAndPermission(reportInfo *Report, updateReportCols []string, reportChapterInfo *ReportChapter) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -311,7 +287,6 @@ func DelChapterAndPermission(reportInfo *Report, updateReportCols []string, repo
 
 	// 变更报告信息
 	if len(updateReportCols) > 0 {
-		//_, err = to.Update(reportInfo, updateReportCols...)
 		err = to.Select(updateReportCols).Updates(reportInfo).Error
 		if err != nil {
 			return
@@ -320,7 +295,6 @@ func DelChapterAndPermission(reportInfo *Report, updateReportCols []string, repo
 
 	// 删除报告对应章节
 	{
-		//	_, err = to.Delete(reportChapterInfo)
 		err = to.Delete(reportChapterInfo).Error
 		if err != nil {
 			return
@@ -330,7 +304,6 @@ func DelChapterAndPermission(reportInfo *Report, updateReportCols []string, repo
 	// 删除报告章节的授权用户权限
 	{
 		sql := `DELETE FROM report_chapter_grant WHERE report_chapter_id = ? `
-		//_, err = to.Raw(sql, reportChapterInfo.ReportChapterId).Exec()
 		err = to.Exec(sql, reportChapterInfo.ReportChapterId).Error
 		if err != nil {
 			return
@@ -340,7 +313,6 @@ func DelChapterAndPermission(reportInfo *Report, updateReportCols []string, repo
 	// 删除报告章节的品种配置
 	{
 		sql := `DELETE FROM report_chapter_permission_mapping WHERE report_chapter_id = ? `
-		//_, err = to.Raw(sql, reportChapterInfo.ReportChapterId).Exec()
 		err = to.Exec(sql, reportChapterInfo.ReportChapterId).Error
 		if err != nil {
 			return
@@ -359,14 +331,11 @@ func DelChapterAndPermission(reportInfo *Report, updateReportCols []string, repo
 // @return count int
 // @return err error
 func GetReportListCountByAuthorized(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT COUNT(1) AS count  FROM report as a 
  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
 }
@@ -382,8 +351,6 @@ func GetReportListCountByAuthorized(condition string, pars []interface{}) (count
 // @return items []*ReportList
 // @return err error
 func GetReportListByAuthorized(condition string, pars []interface{}, startSize, pageSize int) (items []*ReportList, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-
 	sql := `SELECT id,classify_id_first,classify_name_first,classify_id_second,classify_name_second,classify_id_third,classify_name_third,title,stage,create_time,author,report_layout,collaborate_type,is_public_publish,abstract,has_chapter,publish_time,report_create_time FROM report as a WHERE 1=1  `
 	if condition != "" {
 		sql += condition
@@ -391,7 +358,6 @@ func GetReportListByAuthorized(condition string, pars []interface{}, startSize,
 	// 排序：1:未发布；2:已发布；3-待提交；4-待审批；5-已驳回；6-已通过
 	sql += ` GROUP BY id,classify_id_first,classify_name_first,classify_id_second,classify_name_second,classify_id_third,classify_name_third,title,stage,create_time,author,report_layout,collaborate_type,is_public_publish,abstract,has_chapter,publish_time,report_create_time
             ORDER BY  report_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
@@ -411,8 +377,6 @@ func GetReportListByAuthorized(condition string, pars []interface{}, startSize,
 // @param currClassifyName string
 // @return err error
 func ModifyReportClassifyAndReportChapterTypeByCondition(condition string, pars []interface{}, updateStr string, chapterTypeIdMap map[int]int, oldClassifyId, currClassifyId int, currClassifyName string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
 	to := global.DmSQL["rddp"].Begin()
 	defer func() {
 		if err != nil {
@@ -431,7 +395,6 @@ func ModifyReportClassifyAndReportChapterTypeByCondition(condition string, pars
 	if condition != "" {
 		sql += condition
 	}
-	//_, err = to.Raw(sql, pars).Exec()
 	err = to.Exec(sql, pars...).Error
 	if err != nil {
 		return
@@ -439,7 +402,6 @@ func ModifyReportClassifyAndReportChapterTypeByCondition(condition string, pars
 
 	// 修改历史报告中的章节分类归属
 	sql = `UPDATE report_chapter set classify_id_first=?,classify_name_first=? where classify_id_first = ?`
-	//_, err = to.Raw(sql, currClassifyId, currClassifyName, oldClassifyId).Exec()
 	err = to.Exec(sql, currClassifyId, currClassifyName, oldClassifyId).Error
 	if err != nil {
 		return
@@ -451,7 +413,6 @@ func ModifyReportClassifyAndReportChapterTypeByCondition(condition string, pars
 			continue
 		}
 		tmpSql := `UPDATE report_chapter set type_id=? where type_id = ?`
-		//_, err = to.Raw(tmpSql, currTypeId, oldTypeId).Exec()
 		err = to.Exec(tmpSql, currTypeId, oldTypeId).Error
 		if err != nil {
 			return

models/report_view_record.go

@@ -18,10 +18,7 @@ type ReportViewRecord struct {
 
 // 获取需要修复的数据列表
 func GetViewListByReportId(reportId int) (total int64, list []*ReportViewRecord, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
 	sql := `select * from report_view_record where report_id = ? order by id desc `
-
-	//total, err = o.Raw(sql, reportId).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&list).Error
 	total = int64(len(list))
 	return

models/resource.go

@@ -24,21 +24,11 @@ type ResourceResp struct {
 }
 
 func AddResource(item *Resource) (newId int64, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//newId, err = o.Insert(item)
 	err = global.DmSQL["rddp"].Create(item).Error
 	newId = int64(item.Id)
 	return
 }
 
-func GetResourceById(id string) (item *Resource, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	sql := "SELECT * FROM resource WHERE id=? "
-	//err = o.Raw(sql, id).QueryRow(&item)
-	err = global.DmSQL["rddp"].Raw(sql, id).First(&item).Error
-	return
-}
-
 type ResourceBase64Resp struct {
 	Image string `description:"图片,base64字符串"`
 }

models/search_key_word.go

@@ -18,18 +18,14 @@ type SearchKeyWord struct {
 
 // AddTrendTagKeyWord 新增趋势标签关键词
 func AddTrendTagKeyWord(trend string) (err error) {
-	//o := orm.NewOrm()
 	sql := " REPLACE INTO search_key_word (`key_word`,`from`) values (?,'trend') "
-	//_, err = o.Raw(sql, trend).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, trend).Error
 	return
 }
 
 // GetKeyWordListByFrom 根据来源获取搜索关键词列表
 func GetKeyWordListByFrom(from string) (list []*SearchKeyWord, err error) {
-	//o := orm.NewOrm()
 	sql := ` SELECT * FROM search_key_word WHERE "from" = ? ORDER BY created_time ASC `
-	//_, err = o.Raw(sql, from).QueryRows(&list)
 	err = global.DEFAULT_DmSQL.Raw(sql, from).Find(&list).Error
 	return
 }

models/user_seller_relation.go

@@ -20,9 +20,7 @@ type UserSellerRelation struct {
 
 // DeleteUserSellerRelationByProductId 根据产品id删除销售员与员工的关系
 func DeleteUserSellerRelationByProductId(userId, productId int) (err error) {
-	//o := orm.NewOrmUsingDB("weekly")
 	sql := ` DELETE FROM user_seller_relation WHERE user_id=? and product_id = ?`
-	//_, err = o.Raw(sql, userId, productId).Exec()
 	err = global.DmSQL["weekly"].Exec(sql, userId, productId).Error
 	return
 }

models/user_view_history.go

@@ -16,7 +16,6 @@ func GetPUVByResearchReportIds(reportIds []string) (list []*ResearchReportViewPU
 	if len(reportIds) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT
 				research_report_id,
 				COUNT(1) AS pv,
@@ -27,7 +26,6 @@ func GetPUVByResearchReportIds(reportIds []string) (list []*ResearchReportViewPU
 				research_report_id IN (` + utils.GetOrmInReplace(len(reportIds)) + `)
 			GROUP BY
 				research_report_id`
-	//_, err = o.Raw(sql, reportIds).QueryRows(&list)
 	err = global.DmSQL["weekly"].Raw(sql, reportIds).Scan(&list).Error
 	return
 }

models/variety_tag.go

@@ -1,145 +1,5 @@
 package models
 
-// VarietyClassify 标签库分类表
-//type VarietyClassify struct {
-//	VarietyClassifyId int       `orm:"column(variety_classify_id);pk" gorm:"primaryKey"  description:"标签分类ID"`
-//	ClassifyName      string    `json:"classify_name" description:"标签分类名称"`
-//	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:"更新时间"`
-//}
-
-//func (varietyClassify *VarietyClassify) Add() (lastId int64, err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	lastId, err = o.Insert(varietyClassify)
-//	if err != nil {
-//		return
-//	}
-//	varietyClassify.VarietyClassifyId = int(lastId)
-//	return
-//}
-
-//func (varietyClassify *VarietyClassify) Update(cols []string) (err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	_, err = o.Update(varietyClassify, cols...)
-//	return
-//}
-
-//type VarietyClassify struct {
-//	VarietyClassifyId int       `orm:"column(variety_classify_id);pk" description:"标签分类ID"`
-//	ClassifyName      string    `json:"classify_name" description:"标签分类名称"`
-//	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:"更新时间"`
-//}
-
-//func (varietyClassify *VarietyClassify) Add() (lastId int64, err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	lastId, err = o.Insert(varietyClassify)
-//	if err != nil {
-//		return
-//	}
-//	varietyClassify.VarietyClassifyId = int(lastId)
-//	return
-//}
-
-//func (varietyClassify *VarietyClassify) Update(cols []string) (err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	_, err = o.Update(varietyClassify, cols...)
-//	return
-//}
-
-// GetEnableVarietyClassifyList 获取启用的标签分类列表
-//func GetEnableVarietyClassifyList(hasForbidden bool) (list []*VarietyClassify, err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	sql := ""
-//	if hasForbidden {
-//		sql = `SELECT * FROM variety_classify ORDER BY sort ASC`
-//	} else {
-//		sql = `SELECT * FROM variety_classify WHERE state = 1 ORDER BY sort ASC`
-//	}
-//
-//	_, err = o.Raw(sql).QueryRows(&list)
-//	return
-//}
-
-// VarietyTag 标签表
-//type VarietyTag struct {
-//	VarietyTagId                int       `orm:"column(variety_tag_id);pk" gorm:"primaryKey"  description:"标签ID"`
-//	VarietyClassifyId           int       `json:"variety_classify_id" description:"标签分类ID"`
-//	VarietyClassifyName         string    `json:"variety_classify_name" description:"标签分类名称"`
-//	TagName                     string    `json:"tag_name" description:"标签名称"`
-//	ChartPermissionClassifyName string    `json:"chart_permission_classify_name" description:"品种权限分类名"`
-//	ChartPermissionId           int       `json:"chart_permission_id" description:"品种权限ID"`
-//	ChartPermissionName         string    `json:"chart_permission_name" description:"品种权限名称"`
-//	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:"更新时间"`
-//}
-
-//func (varietyTag *VarietyTag) Add() (lastId int64, err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	lastId, err = o.Insert(varietyTag)
-//	if err != nil {
-//		return
-//	}
-//	varietyTag.VarietyTagId = int(lastId)
-//	return
-//}
-
-//func (varietyTag *VarietyTag) Update(cols []string) (err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	_, err = o.Update(varietyTag, cols...)
-//	return
-//}
-
-//type VarietyTag struct {
-//	VarietyTagId                int       `orm:"column(variety_tag_id);pk" description:"标签ID"`
-//	VarietyClassifyId           int       `json:"variety_classify_id" description:"标签分类ID"`
-//	VarietyClassifyName         string    `json:"variety_classify_name" description:"标签分类名称"`
-//	TagName                     string    `json:"tag_name" description:"标签名称"`
-//	ChartPermissionClassifyName string    `json:"chart_permission_classify_name" description:"品种权限分类名"`
-//	ChartPermissionId           int       `json:"chart_permission_id" description:"品种权限ID"`
-//	ChartPermissionName         string    `json:"chart_permission_name" description:"品种权限名称"`
-//	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:"更新时间"`
-//}
-
-//func (varietyTag *VarietyTag) Add() (lastId int64, err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	lastId, err = o.Insert(varietyTag)
-//	if err != nil {
-//		return
-//	}
-//	varietyTag.VarietyTagId = int(lastId)
-//	return
-//}
-
-//func (varietyTag *VarietyTag) Update(cols []string) (err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	_, err = o.Update(varietyTag, cols...)
-//	return
-//}
-
-// GetEnableVarietyTagList 获取启用状态标签列表
-//func GetEnableVarietyTagList(hasForbidden bool) (list []*VarietyTag, err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	var sql string
-//	if hasForbidden {
-//		sql = `SELECT * FROM variety_tag ORDER BY sort`
-//	} else {
-//		sql = `SELECT * FROM variety_tag WHERE state = 1 ORDER BY sort`
-//	}
-//
-//	_, err = o.Raw(sql).QueryRows(&list)
-//	return
-//}
-
 // ResearchVarietyTagRelation 研究员标签关系表
 type ResearchVarietyTagRelation struct {
 	Id           int `gorm:"primaryKey" `
@@ -152,104 +12,3 @@ type ResearchTagRelation struct {
 	ResearchGroupId int `json:"research_group_id" description:"分组ID"`
 	AdminId         int `json:"admin_id" description:"研究员ID"`
 }
-
-//type ResearchVarietyTagRelation struct {
-//	Id           int `orm:"column(id);pk"`
-//	VarietyTagId int `json:"variety_tag_id" description:"标签ID"`
-//	AdminId      int `json:"admin_id" description:"研究员ID"`
-//}
-
-//type ResearchTagRelation struct {
-//	Id              int `json:"id"`
-//	ResearchGroupId int `json:"research_group_id" description:"分组ID"`
-//	AdminId         int `json:"admin_id" description:"研究员ID"`
-//}
-
-// ResearchTagRelationListByAdminId 根据研究员ID获取标签关系列表
-//func ResearchTagRelationListByAdminId(adminId int) (list []*ResearchTagRelation, err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	sql := `SELECT id, variety_tag_id AS research_group_id, admin_id FROM research_variety_tag_relation WHERE admin_id = ?`
-//	_, err = o.Raw(sql, adminId).QueryRows(&list)
-//	return
-//}
-
-// ResearchVarietyTagRelationItem 研究员标签关系
-//type ResearchVarietyTagRelationItem struct {
-//	VarietyTagId int    `json:"variety_tag_id" description:"标签ID"`
-//	AdminId      int    `json:"admin_id" description:"研究员ID"`
-//	AdminName    string `json:"admin_name" description:"研究员姓名"`
-//}
-
-// GetResearchVarietyTagRelationList 获取研究员标签关系列表
-//func GetResearchVarietyTagRelationList(include int) (list []*ResearchVarietyTagRelationItem, err error) {
-//	// 是否包含已禁止的研究员, 默认不包含
-//	condition := ` WHERE b.enabled = 1 `
-//	if include == 1 {
-//		condition = ` WHERE 1=1 `
-//	}
-//	o := orm.NewOrmUsingDB("weekly")
-//	sql := `SELECT
-//				a.variety_tag_id,
-//				a.admin_id,
-//				b.real_name AS admin_name
-//			FROM
-//				research_variety_tag_relation AS a
-//			INNER JOIN admin AS b ON a.admin_id = b.admin_id `
-//	sql += condition
-//	sql += ` ORDER BY
-//				a.variety_tag_id ASC,
-//				a.admin_id ASC`
-//	_, err = o.Raw(sql).QueryRows(&list)
-//	return
-//}
-
-// UpdateAdminVarietyTagRelation 更新研究员标签关系
-//func UpdateAdminVarietyTagRelation(adminId int, items []*ResearchVarietyTagRelation) (err error) {
-//	o := orm.NewOrmUsingDB("weekly")
-//	to, err := o.Begin()
-//	if err != nil {
-//		return
-//	}
-//	defer func() {
-//		if err != nil {
-//			_ = to.Rollback()
-//		} else {
-//			_ = to.Commit()
-//		}
-//	}()
-//	sql := `DELETE FROM research_variety_tag_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
-//}
-
-// AdminVarietyTagRelationList 研究员研究方向列表
-//type AdminVarietyTagRelationList struct {
-//	AdminId      int    `json:"admin_id"`
-//	GroupNameStr string `json:"group_name_str"`
-//}
-
-// GetAdminVarietyTagRelationListByAdminId 获取研究员研究方向分组列表
-//func GetAdminVarietyTagRelationListByAdminId(adminIds []int) (list []*AdminVarietyTagRelationList, err error) {
-//	if len(adminIds) == 0 {
-//		return
-//	}
-//	o := orm.NewOrmUsingDB("weekly")
-//	sql := `SELECT
-//				a.admin_id,
-//				GROUP_CONCAT(b.tag_name) AS group_name_str
-//			FROM
-//				research_variety_tag_relation AS a
-//			INNER JOIN variety_tag AS b ON a.variety_tag_id = b.variety_tag_id
-//			WHERE
-//				a.admin_id IN (` + utils.GetOrmInReplace(len(adminIds)) + `)
-//			GROUP BY
-//				a.admin_id`
-//	_, err = o.Raw(sql, adminIds).QueryRows(&list)
-//	return
-//}

models/wechat_send_msg.go

@@ -16,8 +16,6 @@ func GetOpenIdArr() (items []string, err error) {
 		INNER JOIN user_record  AS ur ON wu.user_id=ur.user_id
           WHERE ur.open_id != "" AND ur.subscribe=1 AND ur.create_platform=1 AND  d.status IN('正式','试用','永续')
          ORDER BY FIELD(c.company_id, 16) desc, ur.user_record_id asc`
-	//o := orm.NewOrmUsingDB("weekly")
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DmSQL["weekly"].Raw(sql).Scan(&items).Error
 	return
 }
@@ -34,8 +32,6 @@ func GetOpenIdArrByClassifyId(classifyId int) (items []string, err error) {
 			AND g.source_from='rddp'
 			AND g.classify_id=?
 			ORDER BY FIELD(c.company_id, 16) DESC, ur.user_record_id ASC  `
-	//o := orm.NewOrmUsingDB("weekly")
-	//_, err = o.Raw(sql, classifyId).QueryRows(&items)
 	err = global.DmSQL["weekly"].Raw(sql, classifyId).Scan(&items).Error
 	return
 }

models/wx_user.go

@@ -33,34 +33,26 @@ type WxUser struct {
 }
 
 func GetWxUserByMobile(mobile string) (item *WxUser, err error) {
-	//o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM wx_user WHERE mobile = ? LIMIT 1`
-	//err = o.Raw(sql, mobile).QueryRow(&item)
 	err = global.DmSQL["weekly"].Raw(sql, mobile).First(&item).Error
 	return
 }
 
 // Update 更新wxUser信息
 func (wxUser *WxUser) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("weekly")
-	//_, err = o.Update(wxUser, cols...)
 	err = global.DmSQL["weekly"].Select(cols).Updates(wxUser).Error
 	return
 }
 
 // GetWxUserByCompanyIdAndMobile 根据客户ID及手机号获取用户
 func GetWxUserByCompanyIdAndMobile(companyId int, mobile string) (item *WxUser, err error) {
-	//o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM wx_user WHERE company_id = ? AND mobile = ? LIMIT 1 `
-	//err = o.Raw(sql, companyId, mobile).QueryRow(&item)
 	err = global.DmSQL["weekly"].Raw(sql, companyId, mobile).First(&item).Error
 	return
 }
 
 // DeleteWxUserAndRecordByUserId 删除用户及第三方信息
 func DeleteWxUserAndRecordByUserId(userId int) (err error) {
-	//o := orm.NewOrmUsingDB("weekly")
-	//to, err := o.Begin()
 	to := global.DmSQL["weekly"].Begin()
 	defer func() {
 		if err != nil {
@@ -72,12 +64,10 @@ func DeleteWxUserAndRecordByUserId(userId int) (err error) {
 
 	// 删除wx_user
 	userSql := ` DELETE FROM wx_user WHERE user_id = ? LIMIT 1 `
-	//_, err = to.Raw(userSql, userId).Exec()
 	err = to.Exec(userSql, userId).Error
 	// 删除user_record
 	if err == nil {
 		recordSql := ` DELETE FROM user_record WHERE user_id = ? `
-		//_, err = to.Raw(recordSql, userId).Exec()
 		err = to.Exec(recordSql, userId).Error
 	}
 

services/ai_summary/ai_summary.go

@@ -125,13 +125,9 @@ func AiSummaryClassifyItemsMakeTreeV2(sysUser *system.Admin, allNode []*ai_summa
 			if has {
 				AiSummaryClassifyItemsMakeTreeV2(sysUser, allNode, v) //递归添加节点
 			} else {
-				//childrenArr := make([]*ai_summary.AiSummaryClassifyItems, 0)
-				//v.Children = childrenArr
 			}
 		}
 	} else {
-		//childrenArr := make([]*ai_summary.AiSummaryClassifyItems, 0)
-		//node.Children = childrenArr
 	}
 }
 
@@ -183,7 +179,6 @@ func SharePrompt(promptId int, adminId int) (err error) {
 	return
 }
 
-
 func GetSummaryClassifyChildIds(classifyId int, classifymap map[int]*ai_summary.AiSummaryClassifyItems, childIds *[]int) {
 	for _, item := range classifymap {
 		if item.ParentId == classifyId {
@@ -201,4 +196,4 @@ func GetSummaryParentIds(classifyId int, classifymap map[int]*ai_summary.AiSumma
 		*parentIds = append(*parentIds, item.ParentId)
 		GetSummaryParentIds(item.ParentId, classifymap, parentIds)
 	}
-}
+}

services/bi_approve/bi_approve.go

@@ -125,19 +125,11 @@ func PassBiApprove(approveId int, adminId int) (msg string, err error) {
 		for k, v := range currNode.Users {
 			// 当前审批人
 			if v.UserId == adminId && recordItem.ApproveUserSort == v.Sort {
-				//if k == (userLen - 1) {
-				//	lastRoll = true
-				//	break
-				//}
 				if (k + 1) < userLen {
 					nextUser = currNode.Users[k+1]
 				}
 			}
 		}
-		//if lastRoll && currNode.NextNodeId == 0 {
-		//	lastApprove = true
-		//}
-
 		// 当前节点下一个审批人, 生成下一个审批记录且return
 		if nextUser.UserId > 0 {
 			newRecord := new(biapprove.BiApproveRecord)

utils/mgodb/mgo_config.go

@@ -18,12 +18,6 @@ var (
 	MinPoolSize      = uint64(0)
 )
 
-//func init() {
-//	fmt.Println("start MgoNewClient")
-//	MgoNewClient()
-//	fmt.Println("end MgoNewClient")
-//}
-
 type MgoConfig struct {
 	Host          string `json:"host"`
 	Url           string `json:"url"`