fix

controllers/data_ini.go

@@ -12,11 +12,6 @@ type DataInitController struct {
 	web.Controller
 }
 
-// InitEdbRelation
-// @Title 初始化历史的图表、表格等引用记录
-// @Description 初始化历史的图表、表格等引用记录
-// @Param	request	body fe_calendar.FeCalendarMatterSaveReq true "type json string"
-// @Success 200 string "操作成功"
 // @router /relation_init [get]
 func (c *DataInitController) InitEdbRelation() {
 	br := new(models.BaseResponse).Init()

global/dm.go

@@ -16,12 +16,9 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 )
 
-// InitDm
-// @Description: 达梦数据库初始化
 func InitDm() {
 	dmSqlMap := make(map[string]*gorm.DB)
 
-	//开启日志
 	logWriter := io.MultiWriter(utils.Binlog) //binlog日志，记录到文件中去
 	if utils.RunMode == `dev` {               // 测试环境，默认输出在控制台，不需要的话，可以注释if里面下面的这行
 		logWriter = io.MultiWriter(utils.Binlog, os.Stdout)
@@ -33,17 +30,11 @@ func InitDm() {
 		Colorful:                  true,                   //是否颜色输出
 	})
 
-	// 默认库
 	connectDm(utils.MYSQL_URL, "default", newLogger, dmSqlMap, true)
-	// 手工数据库
 	connectDm(utils.MYSQL_URL_EDB, "edb", newLogger, dmSqlMap, false)
-	// eta主库
 	connectDm(utils.MYSQL_URL, "master", newLogger, dmSqlMap, true)
-	// 指标库
 	connectDm(utils.MYSQL_URL_DATA, "data", newLogger, dmSqlMap, false)
-	// 钢联库
 	connectDm(utils.MYSQL_URL_GL, "gl", newLogger, dmSqlMap, false)
-	// rddp库
 	connectDm(utils.MYSQL_URL_RDDP, "rddp", newLogger, dmSqlMap, false)
 
 	/*initDm(utils.MYSQL_URL, "default", newLogger, dmSqlMap, true)
@@ -51,25 +42,14 @@ func InitDm() {
 	initDm(utils.MYSQL_URL_MASTER, "master", newLogger, dmSqlMap, true)
 	initDm(utils.MYSQL_URL_GL, "gl", newLogger, dmSqlMap, true)*/
 
-	//全局赋值数据库链接
 	DmSQL = dmSqlMap
 
 }
 
-// connectDm
-// @Description: 达梦数据库连接
-// @param dsn
-// @param aliasName
-// @param newLogger
-// @param dmSqlMap
-// @param isDefault
 func connectDm(dsn, aliasName string, newLogger logger.Interface, dmSqlMap map[string]*gorm.DB, isDefault bool) {
-	//fmt.Println("dsn:", dsn, "  ==  ;aliasName:", aliasName)
 	if dsn == `` {
 		return
 	}
-	//dsn := "dm://SYSDBA:SYSDBA001@8.136.199.33:30236?schema=\"eta_master\""
-	//dsn := "dm://ETA:Han6258199118%60@localhost:5236?schema=ECOLOGY_TARGET"
 	db, err := gorm.Open(dm.Open(dsn), &gorm.Config{
 		Logger: newLogger,
 		NamingStrategy: schema.NamingStrategy{
@@ -77,31 +57,24 @@ func connectDm(dsn, aliasName string, newLogger logger.Interface, dmSqlMap map[s
 		},
 	})
 	if err != nil {
-		//global.LOG.Errorf("mysql 启动异常，数据库:default;Err：", err)
 		panic(fmt.Errorf("mysql 启动异常，数据库:%s;Err:%s", aliasName, err))
 	}
 
-	//创建连接池
 	sqlDB, err := db.DB()
 	if err != nil {
-		//global.LOG.Errorf("mysql 创建连接池失败，数据库:default;Err：", err)
 		panic(fmt.Errorf("mysql 创建连接池失败，数据库:%s;Err:%s", aliasName, err))
 	}
 
 	dmSqlMap[aliasName] = db
 
-	//默认数据库连接
 	if isDefault {
 		DEFAULT_DmSQL = db
 	}
 
-	// SetMaxIdleConns 设置空闲连接池中连接的最大数量
 	sqlDB.SetMaxIdleConns(50)
 
-	// SetMaxOpenConns 设置打开数据库连接的最大数量。
 	sqlDB.SetMaxOpenConns(100)
 
-	// SetConnMaxLifetime 设置了连接可复用的最大时间。
 	sqlDB.SetConnMaxLifetime(10 * time.Minute)
 
 }

global/global.go

@@ -12,6 +12,5 @@ var (
 )
 
 func init() {
-	// 初始化达梦连接
 	InitDm()
 }

main.go

@@ -20,11 +20,9 @@ func main() {
 		web.BConfig.WebConfig.DirectoryIndex = true
 		web.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
 	}
-	// 初始化表数据入库
 	models.AfterInitTable()
 
 	go services.Task()
-	//services.TaskInit()
 	web.BConfig.RecoverFunc = Recover
 	web.Run()
 }
@@ -55,7 +53,6 @@ func Recover(ctx *context.Context, conf *web.Config) {
 			logs.Critical(fmt.Sprintf("%s:%d", file, line))
 			stack = stack + fmt.Sprintln(fmt.Sprintf("%s:%d</br>", file, line))
 		}
-		//go utils.SendEmail(utils.APPNAME+"崩了"+time.Now().Format("2006-01-02 15:04:05"), stack, utils.EmailSendToUsers)
 		go alarm_msg.SendAlarmMsg(utils.APPNAME+"崩了"+time.Now().Format("2006-01-02 15:04:05")+"\n"+stack, 3)
 	}
 	return

models/admin.go

@@ -21,8 +21,6 @@ type Admin struct {
 }
 
 func GetAdminByAdminId(adminId int) (item *Admin, err error) {
-	//sql := `SELECT * FROM admin WHERE admin_id=? `
-	//err = orm.NewOrm().Raw(sql, adminId).QueryRow(&item)
 
 	sql := `SELECT * FROM admin WHERE admin_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, adminId).Find(&item).Error
@@ -45,8 +43,3 @@ type AdminView struct {
 	Position     string `description:"职位"`
 }
 
-//func GetAdminList() (list []*AdminView, err error) {
-//	sql := `SELECT * FROM admin `
-//	_, err = orm.NewOrm().Raw(sql).QueryRows(&list)
-//	return
-//}

models/admin_operate_record.go

@@ -2,11 +2,7 @@ package models
 
 import "eta_gn/eta_task/global"
 
-// ClearAdminOperateRecord 清理用户操作日志
 func ClearAdminOperateRecord(date string) (err error) {
-	//o := orm.NewOrmUsingDB("eta")
-	//sql := `DELETE FROM admin_operate_record WHERE create_time <= ?`
-	//_, err = o.Raw(sql, date).Exec()
 
 	sql := `DELETE FROM admin_operate_record WHERE create_time <= ?`
 	err = global.DmSQL["eta"].Raw(sql, date).Error

models/business_conf.go

@@ -18,7 +18,6 @@ const (
 	BusinessConfEnPptCoverImgs = "EnPptCoverImgs"
 )
 
-// BusinessConf 商户配置表
 type BusinessConf struct {
 	Id         int    `gorm:"column:id;primaryKey"` // `orm:"column(id);pk"`
 	ConfKey    string `description:"配置Key"`
@@ -38,12 +37,6 @@ func (m *BusinessConf) PrimaryId() string {
 }
 
 func (m *BusinessConf) Create() (err error) {
-	//o := orm.NewOrmUsingDB("eta")
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.Id = int(id)
 	err = global.DmSQL["eta"].Create(m).Error
 	return
 }
@@ -52,23 +45,16 @@ func (m *BusinessConf) CreateMulti(items []*BusinessConf) (err error) {
 	if len(items) == 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("eta")
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DmSQL["eta"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *BusinessConf) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("eta")
-	//_, err = o.Update(m, cols...)
 	err = global.DmSQL["eta"].Select(cols).Updates(m).Error
 	return
 }
 
 func (m *BusinessConf) Del() (err error) {
-	//o := orm.NewOrmUsingDB("eta")
-	//sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	//_, err = o.Raw(sql, m.Id).Exec()
 
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
 	err = global.DmSQL["eta"].Exec(sql, m.Id).Error
@@ -77,9 +63,6 @@ func (m *BusinessConf) Del() (err error) {
 }
 
 func (m *BusinessConf) GetItemById(id int) (item *BusinessConf, err error) {
-	//o := orm.NewOrmUsingDB("eta")
-	//sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	//err = o.Raw(sql, id).QueryRow(&item)
 
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
 	err = global.DmSQL["eta"].Raw(sql, id).Find(&item).Error
@@ -87,9 +70,6 @@ func (m *BusinessConf) GetItemById(id int) (item *BusinessConf, err error) {
 }
 
 func (m *BusinessConf) GetItemByCondition(condition string, pars []interface{}) (item *BusinessConf, err error) {
-	//o := orm.NewOrmUsingDB("eta")
-	//sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
 	err = global.DmSQL["eta"].Raw(sql, pars...).First(&item).Error
@@ -97,9 +77,6 @@ func (m *BusinessConf) GetItemByCondition(condition string, pars []interface{})
 }
 
 func (m *BusinessConf) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("eta")
-	//sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	//err = o.Raw(sql, pars).QueryRow(&count)
 
 	sql := fmt.Sprintf(`SELECT COUNT(1) AS count FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	err = global.DmSQL["eta"].Raw(sql, pars...).Scan(&count).Error
@@ -107,17 +84,6 @@ func (m *BusinessConf) GetCountByCondition(condition string, pars []interface{})
 }
 
 func (m *BusinessConf) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BusinessConf, err error) {
-	//o := orm.NewOrmUsingDB("eta")
-	//fields := strings.Join(fieldArr, ",")
-	//if len(fieldArr) == 0 {
-	//	fields = `*`
-	//}
-	//order := `ORDER BY create_time DESC`
-	//if orderRule != "" {
-	//	order = ` ORDER BY ` + orderRule
-	//}
-	//sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
@@ -133,17 +99,6 @@ func (m *BusinessConf) GetItemsByCondition(condition string, pars []interface{},
 }
 
 func (m *BusinessConf) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BusinessConf, err error) {
-	//o := orm.NewOrmUsingDB("eta")
-	//fields := strings.Join(fieldArr, ",")
-	//if len(fieldArr) == 0 {
-	//	fields = `*`
-	//}
-	//order := `ORDER BY create_time DESC`
-	//if orderRule != "" {
-	//	order = ` ORDER BY ` + orderRule
-	//}
-	//sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
@@ -159,17 +114,10 @@ func (m *BusinessConf) GetPageItemsByCondition(condition string, pars []interfac
 	return
 }
 
-// GetBusinessConf 获取商家配置
 func GetBusinessConf() (list map[string]string, err error) {
 	list = make(map[string]string)
 
 	var items []*BusinessConf
-	//o := orm.NewOrmUsingDB("eta")
-	//sql := `SELECT * FROM business_conf`
-	//_, err = o.Raw(sql).QueryRows(&items)
-	//if err != nil {
-	//	return
-	//}
 
 	sql := `SELECT * FROM business_conf`
 	err = global.DmSQL["eta"].Raw(sql).Find(&items).Error
@@ -187,35 +135,13 @@ func GetBusinessConf() (list map[string]string, err error) {
 	return
 }
 
-// BusinessConfUpdate 更新配置
 type BusinessConfUpdate struct {
 	ConfKey string
 	ConfVal string
 }
 
-//// UpdateBusinessConfMulti 批量修改配置
-//func UpdateBusinessConfMulti(items []BusinessConfUpdate) (err error) {
-//	o := orm.NewOrmUsingDB("eta")
-//	p, err := o.Raw("UPDATE business_conf SET conf_val = ? WHERE conf_key = ?").Prepare()
-//	if err != nil {
-//		return
-//	}
-//	defer func() {
-//		_ = p.Close()
-//	}()
-//	for _, v := range items {
-//		_, err = p.Exec(v.ConfVal, v.ConfKey)
-//		if err != nil {
-//			return
-//		}
-//	}
-//	return
-//}
 
 func (m *BusinessConf) GetItemByConfKey(key string) (item *BusinessConf, err error) {
-	//o := orm.NewOrmUsingDB("eta")
-	//sql := fmt.Sprintf(`SELECT * FROM %s WHERE conf_key = ? LIMIT 1`, m.TableName())
-	//err = o.Raw(sql, key).QueryRow(&item)
 
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE conf_key = ? LIMIT 1`, m.TableName())
 	err = global.DmSQL["eta"].Raw(sql, key).First(&item).Error

models/classify.go

@@ -41,94 +41,14 @@ type ClassifyAddReq struct {
 	ClassifyLabel  string `description:"分类标签"`
 }
 
-//func GetClassifyByName(classifyName string, parentId int) (item *Classify, err error) {
-//	sql := `SELECT * FROM classify WHERE classify_name=? AND parent_id=? `
-//	o := orm.NewOrmUsingDB("rddp")
-//	err = o.Raw(sql, classifyName, parentId).QueryRow(&item)
-//	return
-//}
 
 func GetClassifyById(classifyId int) (item *Classify, err error) {
-	//sql := `SELECT * FROM classify WHERE id=? `
-	//o := orm.NewOrmUsingDB("rddp")
-	//err = o.Raw(sql, classifyId).QueryRow(&item)
 
 	sql := `SELECT * FROM classify WHERE id=? `
 	err = global.DmSQL["data"].Raw(sql, classifyId).Find(&item).Error
 	return
 }
 
-//
-//// 添加分类
-//func AddClassify(item *Classify) (err error) {
-//	o := orm.NewOrmUsingDB("rddp")
-//	_, err = o.Insert(item)
-//	return
-//}
-//
-//func GetReportCountByClassifyId(classifyId int) (count int, err error) {
-//	o := orm.NewOrmUsingDB("rddp")
-//	sql := `SELECT COUNT(1) AS count FROM report WHERE classify_id_second=? `
-//	err = o.Raw(sql, classifyId).QueryRow(&count)
-//	return
-//}
-//
-//func GetClassifySubCountByClassifyId(classifyId int) (count int, err error) {
-//	o := orm.NewOrmUsingDB("rddp")
-//	sql := `SELECT COUNT(1) as num FROM classify AS a
-//        INNER JOIN report AS b ON a.id=b.classify_id_second
-//        WHERE a.parent_id=? `
-//	err = o.Raw(sql, classifyId).QueryRow(&count)
-//	return
-//}
-//
-//func GetClassifySubCountByParentId(classifyId int) (count int, err error) {
-//	sqlCount := `
-//	SELECT COUNT(1) as num FROM classify AS a
-//	WHERE a.parent_id=? `
-//	o := orm.NewOrmUsingDB("rddp")
-//	err = o.Raw(sqlCount, classifyId).QueryRow(&count)
-//	return
-//}
-//
-//// 删除分类
-//func DeleteClassify(classifyId int) (err error) {
-//	sql := `DELETE FROM classify WHERE id=? `
-//	o := orm.NewOrmUsingDB("rddp")
-//	_, err = o.Raw(sql, classifyId).Exec()
-//	if err != nil {
-//		return
-//	}
-//	deleteImgSql := `DELETE FROM banner WHERE classify_id=? `
-//	_, err = o.Raw(deleteImgSql, classifyId).Exec()
-//	return
-//}
-//
-//// classifyName, abstract, descript string, parentId, classifyId int
-//// 修改分类
-//func EditClassify(req *EditClassifyReq) (err error) {
-//	o := orm.NewOrmUsingDB("rddp")
-//	sql := `UPDATE classify SET classify_name = ?,abstract=?, parent_id= ?,descript=?,report_author=?,author_descript=?,column_img_url=?,head_img_url=?,avatar_img_url=?,report_img_url=?,home_img_url=?,classify_label=?, modify_time= NOW() WHERE id = ? `
-//	_, err = o.Raw(sql, req.ClassifyName, req.Abstract, req.ParentId, req.Descript, req.ReportAuthor, req.AuthorDescript, req.ColumnImgUrl, req.HeadImgUrl, req.AvatarImgUrl, req.ReportImgUrl, req.HomeImgUrl, req.ClassifyLabel, req.ClassifyId).Exec()
-//	return
-//}
-//
-////获取父级分类
-//
-//func ParentClassify() (items []*Classify, err error) {
-//	sql := `SELECT * FROM classify WHERE parent_id=0 order by id desc `
-//	o := orm.NewOrmUsingDB("rddp")
-//	_, err = o.Raw(sql).QueryRows(&items)
-//	return
-//}
-//
-//// 根据id获取分类详情
-//func FindByIdClassify(classifyId int) (item *Classify, err error) {
-//	sql := `SELECT * FROM classify WHERE id=? `
-//	o := orm.NewOrmUsingDB("rddp")
-//	err = o.Raw(sql, classifyId).QueryRow(&item)
-//	return
-//}
 
 type ClassifyList struct {
 	Id            int         `gorm:"column:id;primaryKey"` // `orm:"column(id);pk"`
@@ -148,61 +68,6 @@ type ClassifyListResp struct {
 	Paging *paging.PagingItem `description:"分页数据"`
 }
 
-//
-//// 获取分类列表
-//func GetClassifyList(startSize, pageSize int, keyWord, companyType string) (items []*ClassifyList, err error) {
-//	sql := ``
-//	companyTypeSqlStr := ``
-//	if companyType == "ficc" {
-//		companyTypeSqlStr = " AND id != 40 AND parent_id != 40 "
-//	} else if companyType == "权益" {
-//		companyTypeSqlStr = " AND (id = 40 or parent_id = 40)  "
-//	}
-//	if keyWord != "" {
-//		sql = `SELECT * FROM (
-//                   SELECT * FROM classify
-//                   WHERE parent_id=0 ` + companyTypeSqlStr + `  AND classify_name LIKE '%` + keyWord + `%'
-//                   UNION
-//                   SELECT * FROM classify
-//                   WHERE id IN(SELECT parent_id FROM classify
-//                   WHERE parent_id>0 ` + companyTypeSqlStr + `  AND classify_name LIKE '%` + keyWord + `%')
-//                   )AS t
-//                   ORDER BY create_time ASC
-//                   LIMIT ?,? `
-//	} else {
-//		sql = `SELECT * FROM classify WHERE parent_id=0 ` + companyTypeSqlStr + ` ORDER BY create_time ASC LIMIT ?,? `
-//	}
-//	o := orm.NewOrmUsingDB("rddp")
-//	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
-//	return
-//}
-//
-//func GetClassifyListCount(keyWord, companyType string) (count int, err error) {
-//	sqlCount := ``
-//
-//	companyTypeSqlStr := ``
-//	if companyType == "ficc" {
-//		companyTypeSqlStr = " AND id != 40 AND parent_id != 40 "
-//	} else if companyType == "权益" {
-//		companyTypeSqlStr = " AND (id = 40 or parent_id = 40)  "
-//	}
-//	if keyWord != "" {
-//		sqlCount = `SELECT  COUNT(1) AS count FROM (
-//               SELECT * FROM classify
-//               WHERE parent_id=0 ` + companyTypeSqlStr + `  AND classify_name LIKE '%` + keyWord + `%'
-//               UNION
-//               SELECT * FROM classify
-//               WHERE id IN(SELECT parent_id FROM classify
-//               WHERE parent_id>0 ` + companyTypeSqlStr + `  AND classify_name LIKE '%` + keyWord + `%')
-//               )AS t `
-//
-//	} else {
-//		sqlCount = `SELECT COUNT(1) AS count FROM classify WHERE parent_id=0 ` + companyTypeSqlStr
-//	}
-//	o := orm.NewOrmUsingDB("rddp")
-//	err = o.Raw(sqlCount).QueryRow(&count)
-//	return
-//}
 
 type CheckDeleteClassifyReq struct {
 	ClassifyId int `description:"分类ID"`
@@ -237,14 +102,3 @@ type FindByIdClassifyReq struct {
 	ClassifyId int `description:"分类ID"`
 }
 
-//func GetClassifyChild(parentId int, keyWord string) (items []*Classify, err error) {
-//	o := orm.NewOrmUsingDB("rddp")
-//	sql := ``
-//	if keyWord != "" {
-//		sql = `SELECT * FROM classify WHERE parent_id=? AND classify_name LIKE '%` + keyWord + `%' ORDER BY create_time ASC `
-//	} else {
-//		sql = `SELECT * FROM classify WHERE parent_id=? ORDER BY create_time ASC `
-//	}
-//	_, err = o.Raw(sql, parentId).QueryRows(&items)
-//	return
-//}

models/data_manage/business_sys_interaction_log.go

@@ -5,9 +5,7 @@ import (
 	"time"
 )
 
-// BusinessSysInteractionLog 商家系统交互记录表
 type BusinessSysInteractionLog struct {
-	//ID             uint32    `orm:"column(id);pk" gorm:"primaryKey;column:id;type:int(10) unsigned;not null" json:"-"`
 	ID             uint32    `gorm:"primaryKey;column:id;type:int(10) unsigned;not null" json:"-"`
 	InteractionKey string    `gorm:"unique;column:interaction_key;type:varchar(128);not null;default:''" json:"interactionKey"` // 记录Key
 	InteractionVal string    `gorm:"column:interaction_val;type:text;default:null" json:"interactionVal"`                       // 记录值
@@ -16,12 +14,10 @@ type BusinessSysInteractionLog struct {
 	CreateTime     time.Time `gorm:"column:create_time;type:datetime;default:null" json:"createTime"`                           // 创建时间
 }
 
-// TableName get sql table name.获取数据库表名
 func (m *BusinessSysInteractionLog) TableName() string {
 	return "business_sys_interaction_log"
 }
 
-// BusinessSysInteractionLogColumns get sql column name.获取数据库列名
 var BusinessSysInteractionLogColumns = struct {
 	ID             string
 	InteractionKey string
@@ -38,14 +34,7 @@ var BusinessSysInteractionLogColumns = struct {
 	CreateTime:     "create_time",
 }
 
-// Create 添加数据
 func (m *BusinessSysInteractionLog) Create() (err error) {
-	//o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.ID = uint32(id)
 
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	if err != nil {
@@ -55,10 +44,7 @@ func (m *BusinessSysInteractionLog) Create() (err error) {
 	return
 }
 
-// Update 更新数据
 func (m *BusinessSysInteractionLog) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
@@ -68,11 +54,8 @@ var BinlogFileNameKey = "binlog_filename"            // binlog文件名
 var BinlogPositionKey = "binlog_binlog_position"     // binlog位置
 var CrmIndexLastUpdateTime = "crm_index_update_time" // crm数据
 
-// GetBusinessSysInteractionLogByKey 根据记录key获取数据
 func GetBusinessSysInteractionLogByKey(key string) (item *BusinessSysInteractionLog, err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM business_sys_interaction_log WHERE 1=1 AND interaction_key = ? LIMIT 1`
-	//err = o.Raw(sql, key).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, key).First(&item).Error
 	return
 }

models/data_manage/chart_edb_mapping.go

@@ -33,18 +33,14 @@ type ChartEdbMapping struct {
 }
 
 func GetChartEdbMappingTotal() (total int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM chart_edb_mapping `
-	//err = o.Raw(sql).QueryRow(&total)
 	err = global.DmSQL["data"].Raw(sql).Scan(&total).Error
 	return
 }
 
 func GetChartEdbMappingList(startSize, pageSize int) (items []*ChartEdbMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_edb_mapping WHERE 1=1 `
 	sql += " LIMIT ?,? "
-	//_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, startSize, pageSize).Find(&items).Error
 	return
 }
@@ -106,13 +102,11 @@ type ChartEdbInfoMapping struct {
 }
 
 func GetRelationEdbInfoListMappingByCondition(condition string, pars []interface{}) (item []*ChartEdbInfoMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.* FROM edb_info AS a 
 	JOIN edb_info_calculate_mapping AS b on a.edb_info_id = b.edb_info_id WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }

models/data_manage/chart_info.go

@@ -38,8 +38,6 @@ func GetAllChartInfo() (list []*ChartInfo, err error) {
 	return
 }
 
-// ChartInfoEdbEndDate
-// @Description: 图表指标最后更新日期
 type ChartInfoEdbEndDate struct {
 	ChartInfoId int    `orm:"column(chart_info_id);pk"`
 	EdbEndDate  string `description:"指标最后更新日期"`
@@ -62,7 +60,6 @@ func ModifyChartInfoEdbEndDate(chartInfoId int, edbEndDate string) (err error) {
 	return
 }
 
-// 根据chart_info_id数组获取图表信息
 func GetChartInfoByChartInfoIds(chartInfoIds []int) (list []*ChartInfo, err error) {
 	sql := ` SELECT * FROM chart_info  WHERE chart_info_id IN (` + utils.GetOrmInReplace(len(chartInfoIds)) + `) `
 	err = global.DmSQL["data"].Raw(sql, chartInfoIds).Find(&list).Error

models/data_manage/cross_variety/chart_info_cross_variety.go

@@ -5,8 +5,6 @@ import (
 	"time"
 )
 
-// ChartInfoCrossVariety
-// @Description: 跨品种分析配置表
 type ChartInfoCrossVariety struct {
 	Id             int       `gorm:"column:id;primaryKey"` // `orm:"column(id);pk"`
 	ChartInfoId    int       `description:"图表id"`
@@ -19,24 +17,18 @@ type ChartInfoCrossVariety struct {
 }
 
 func GetChartInfoCrossVarietyList(startSize, pageSize int) (items []*ChartInfoCrossVariety, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info_cross_variety WHERE 1=1 `
 	sql += " LIMIT ?,? "
-	//_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	err = global.DmSQL["data"].Raw(sql, startSize, pageSize).Find(&items).Error
 	return
 }
 
 func GetChartInfoCrossVarietyTotal() (total int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT count(*) FROM chart_info_cross_variety`
-	//err = o.Raw(sql).QueryRow(&total)
 	err = global.DmSQL["data"].Raw(sql).Scan(&total).Error
 	return
 }
 
-// ChartConfigReq
-// @Description: 跨品种分析的图表配置
 type ChartConfigReq struct {
 	TagX           int               `description:"X轴的标签ID"`
 	TagY           int               `description:"Y轴的标签ID"`
@@ -47,8 +39,6 @@ type ChartConfigReq struct {
 	PercentType    int               `description:"百分位：0-数据区间(兼容历史数据); 1-数据个数；"`
 }
 
-// ChartConfigDate
-// @Description: 跨品种分析的日期配置
 type ChartConfigDate struct {
 	DateType int    `description:"日期类型：1-最新日期；2-N天前；3-固定日期"`
 	Num      int    `description:"N天前的N值"`

models/data_manage/cross_variety/chart_tag_variety.go

@@ -6,8 +6,6 @@ import (
 	"time"
 )
 
-// ChartTagVariety
-// @Description: chart_tag_variety 图表标签品种关系表
 type ChartTagVariety struct {
 	Id                        int       `gorm:"column:id;primaryKey"` //   `orm:"column(id);pk"`
 	ChartTagId                int       `description:"标签id"`
@@ -20,9 +18,7 @@ type ChartTagVariety struct {
 }
 
 func GetChartTagVarietyEdbInfoIdsByTagIds(chartTagIds []int) (items []*ChartTagVariety, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_tag_variety WHERE chart_tag_id in (` + utils.GetOrmInReplace(len(chartTagIds)) + `)`
 	err = global.DmSQL["data"].Raw(sql, chartTagIds).Find(&items).Error
-	//_, err = o.Raw(sql, chartTagIds).QueryRows(&items)
 	return
 }

models/data_manage/edb_classify.go

@@ -25,30 +25,16 @@ type EdbClassify struct {
 	ClassifyNameEn         string
 }
 
-// GetAllEdbClassifyListByCondition
-// @Description: 获取分类列表
-// @author: Roc
-// @datetime 2024-02-29 10:55:38
-// @param condition string
-// @param pars []interface{}
-// @return item []*EdbInfoUpdateLog
-// @return err error
 func GetAllEdbClassifyListByCondition(condition string, pars []interface{}) (item []*EdbClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_classify WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY classify_id ASC `
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
-// AddEdbClassify
-// @Description: 新增分类
-// @param item
-// @return err
 func AddEdbClassify(item *EdbClassify) (err error) {
 	err = global.DmSQL["data"].Create(item).Error
 	if err != nil {
@@ -58,11 +44,6 @@ func AddEdbClassify(item *EdbClassify) (err error) {
 	return
 }
 
-// Update
-// @Description: 更新指定参数
-// @receiver m
-// @param cols
-// @return err
 func (m *EdbClassify) Update(cols []string) (err error) {
 	err = global.DmSQL["data"].Select(cols).Updates(m).Error
 	return

models/data_manage/edb_data_base.go

@@ -6,7 +6,6 @@ import (
 	"time"
 )
 
-// GetEdbDataTableName 指标数据->存储表
 func GetEdbDataTableName(source, subSource int) (tableName string) {
 	switch source {
 	case utils.DATA_SOURCE_THS:
@@ -173,7 +172,6 @@ func GetEdbDataTableName(source, subSource int) (tableName string) {
 	return
 }
 
-// GetSourceAndSubSourceTableName 存储表->指标数据
 func GetSourceAndSubSourceTableName(tableName, edbCode string) (source, subSource int) {
 	switch tableName {
 	case "edb_data_ths":
@@ -188,7 +186,6 @@ func GetSourceAndSubSourceTableName(tableName, edbCode string) (source, subSourc
 		subSource = utils.DATA_SUB_SOURCE_DATE
 	case "edb_data_pb":
 		source = utils.DATA_SOURCE_PB
-		// 彭博财务
 		if strings.Contains(edbCode, "&&") {
 			source = utils.DATA_SOURCE_PB_FINANCE
 		}

models/data_manage/edb_data_calculate.go

@@ -7,35 +7,26 @@ import (
 )
 
 func GetEdbDataCalculateByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	//o := orm.NewOrm()
 	sql := ` SELECT COUNT(1) AS count FROM edb_data_calculate WHERE edb_code=? AND data_time=? `
-	//err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, startDate).Scan(&count).Error
 	return
 }
 
 func ModifyEdbDataCalculate(edbInfoId int64, dataTime string, value float64) (err error) {
-	//o := orm.NewOrm()
 	sql := ` UPDATE edb_data_calculate SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-	//_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
 
 	err = global.DEFAULT_DmSQL.Exec(sql, value, edbInfoId, dataTime).Error
 	return
 }
 
 func AddEdbDataCalculateBySql(sqlStr string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sqlStr).Exec()
 
 	err = global.DEFAULT_DmSQL.Exec(sqlStr).Error
 	return
 }
 
-// DeleteEdbDataCalculateBySql 根据删除sql删除指标数据
 func DeleteEdbDataCalculateBySql(deleteStr string, edbInfoId int) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Raw(deleteStr, edbInfoId).Exec()
 
 	err = global.DEFAULT_DmSQL.Exec(deleteStr, edbInfoId).Error
 	return
@@ -59,24 +50,20 @@ type EdbInfoCalculateDetail struct {
 }
 
 func GetEdbInfoCalculateDetail(edbInfoId int) (list []*EdbInfoCalculateDetail, err error) {
-	//o := orm.NewOrm()
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? ORDER BY sort ASC `
-	//_, err = o.Raw(sql, edbInfoId).QueryRows(&list)
 	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Find(&list).Error
 	return
 }
 
 func GetEdbInfoCalculateMap(edbInfoId, source int) (list []*EdbInfoCalculateDetail, err error) {
-	//o := orm.NewOrm()
 
 	calculateTableName := GetEdbInfoCalculateTableName(source)
 	sql := ` SELECT a.*,b.start_date,b.end_date,b.edb_type FROM %s AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? ORDER BY sort ASC `
 	sql = fmt.Sprintf(sql, calculateTableName)
-	//_, err = o.Raw(sql, edbInfoId).QueryRows(&list)
 	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Find(&list).Error
 	return
 }

models/data_manage/edb_data_manual.go

@@ -10,17 +10,13 @@ import (
 )
 
 func AddEdbDataManualBySql(sqlStr string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sqlStr).Exec()
 
 	err = global.DEFAULT_DmSQL.Exec(sqlStr).Error
 	return
 }
 
 func GetEdbDataManualMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
-	//o := orm.NewOrm()
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_manual WHERE edb_code=? `
-	//err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
 	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&min_date, &max_date).Error
 	return
 }
@@ -34,40 +30,30 @@ type ManualEdbdata struct {
 
 func GetEdbdataManualByTradeCode(condition string, pars []interface{}) (item []*ManualEdbdata, err error) {
 	sql := ` SELECT  * FROM edbdata WHERE 1=1 `
-	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY DT DESC `
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 func GetEdbDataManualByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	//o := orm.NewOrm()
 	sql := ` SELECT COUNT(1) AS count FROM edb_data_manual WHERE edb_code=? AND data_time=? `
-	//err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
 	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, startDate).Scan(&count).Error
 
 	return
 }
 
 func ModifyEdbDataManual(edbInfoId int64, dataTime, value string) (err error) {
-	//	o := orm.NewOrm()
 	sql := ` UPDATE edb_data_manual SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-	//_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
 
 	err = global.DEFAULT_DmSQL.Exec(sql, value, edbInfoId, dataTime).Error
 	return
 }
 
-// 刷新手工指标数据
 func RefreshManual(item *EdbInfoList) (err error) {
-	//edbInfoId int, edbCode, startDate, endDate string
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
 
 	tx := global.DEFAULT_DmSQL.Begin()
 	if err != nil {
@@ -88,7 +74,6 @@ func RefreshManual(item *EdbInfoList) (err error) {
 		return
 	}
 	edbInfoIdStr := strconv.Itoa(edbInfoId)
-	//计算数据
 	var condition string
 	var pars []interface{}
 	if edbCode != "" {
@@ -96,7 +81,6 @@ func RefreshManual(item *EdbInfoList) (err error) {
 		pars = append(pars, edbCode)
 	}
 
-	//获取已存在的手工数据
 	manualDataList, err := GetEdbdataManualByTradeCode(condition, pars)
 
 	var existCondition string
@@ -105,7 +89,6 @@ func RefreshManual(item *EdbInfoList) (err error) {
 		existCondition += " AND edb_code=? "
 		existPars = append(existPars, edbCode)
 	}
-	//获取ETA指标库已存在的所有数据
 	existDataList, err := GetEdbDataListAll(existCondition, existPars, utils.DATA_SOURCE_MANUAL, utils.DATA_SUB_SOURCE_EDB, 0)
 	if err != nil {
 		return err
@@ -155,7 +138,6 @@ func RefreshManual(item *EdbInfoList) (err error) {
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		//_, err = tx.Raw(addSql).Exec()
 		err = tx.Exec(addSql).Error
 		if err != nil {
 			return err

models/data_manage/edb_info.go

@@ -92,7 +92,6 @@ type EdbInfoSearchDataV1 struct {
 }
 
 func GetEdbInfoByCondition(condition string, pars []interface{}, order int) (item []*EdbInfoList, err error) {
-	//o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -102,16 +101,13 @@ func GetEdbInfoByCondition(condition string, pars []interface{}, order int) (ite
 	} else {
 		sql += ` ORDER BY edb_info_id ASC `
 	}
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 func ModifyEdbDataInfoDate(edbInfoId int, maxDate string) (err error) {
-	//o := orm.NewOrm()
 	sql := ` UPDATE edb_info SET end_date=?,modify_time=NOW() WHERE edb_info_id=? `
-	//_, err = o.Raw(sql, maxDate, edbInfoId).Exec()
 
 	err = global.DEFAULT_DmSQL.Exec(sql, maxDate, edbInfoId).Error
 	return
@@ -126,7 +122,6 @@ type EdbInfoMaxAndMinInfo struct {
 }
 
 func GetEdbInfoMaxAndMinInfo(source, subSource int, edbCode string) (item *EdbInfoMaxAndMinInfo, err error) {
-	//o := orm.NewOrm()
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	if tableName == "" {
@@ -135,30 +130,24 @@ func GetEdbInfoMaxAndMinInfo(source, subSource int, edbCode string) (item *EdbIn
 	}
 	sql = ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date,MIN(value) AS min_value,MAX(value) AS max_value FROM %s WHERE edb_code=? `
 	sql = fmt.Sprintf(sql, tableName)
-	//err = o.Raw(sql, edbCode).QueryRow(&item)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&item).Error
 	var latest_value float64
 	sql = ` SELECT value AS latest_value FROM %s WHERE edb_code=? ORDER BY data_time DESC LIMIT 1 `
 	sql = fmt.Sprintf(sql, tableName)
-	//err = o.Raw(sql, edbCode).QueryRow(&latest_value)
 	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&latest_value).Error
 	item.LatestValue = latest_value
 	return
 }
 
 func ModifyEdbInfoMaxAndMinInfo(edbInfoId int, item *EdbInfoMaxAndMinInfo) (err error) {
-	//o := orm.NewOrm()
 	sql := ` UPDATE edb_info SET start_date=?,end_date=?,min_value=?,max_value=?,is_update=2,latest_date=?,latest_value=?,modify_time=NOW() WHERE edb_info_id=? `
-	//_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.MinValue, item.MaxValue, item.MaxDate, item.LatestValue, edbInfoId).Exec()
 
 	err = global.DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, item.MinValue, item.MaxValue, item.MaxDate, item.LatestValue, edbInfoId).Error
 	return
 }
 
-//order:1升序，其余值为降序
 func GetEdbDataListAll(condition string, pars []interface{}, source, subSource, order int) (item []*EdbInfoSearchData, err error) {
-	//o := orm.NewOrm()
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` SELECT * FROM %s WHERE 1=1 `
@@ -172,14 +161,12 @@ func GetEdbDataListAll(condition string, pars []interface{}, source, subSource,
 	} else {
 		sql += ` ORDER BY data_time DESC `
 	}
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 func GetEdbDataListAllV1(condition string, pars []interface{}, source, subSource, order int) (item []*EdbInfoSearchDataV1, err error) {
-	//o := orm.NewOrm()
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` SELECT * FROM %s WHERE 1=1 `
@@ -193,29 +180,19 @@ func GetEdbDataListAllV1(condition string, pars []interface{}, source, subSource
 	} else {
 		sql += ` ORDER BY data_time DESC `
 	}
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 func GetEdbInfoById(edbInfoId int) (item *EdbInfo, err error) {
-	//o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info WHERE edb_info_id=? `
-	//err = o.Raw(sql, edbInfoId).QueryRow(&item)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&item).Error
 	return
 }
 
 func GetQuarterEdbInfo() (item []*EdbInfo, err error) {
-	//o := orm.NewOrm()
-	//sql := ` SELECT c.* FROM chart_info AS a
-	//		INNER JOIN chart_edb_mapping AS b ON a.chart_info_id=b.chart_info_id
-	//		INNER JOIN edb_info AS c ON b.edb_info_id=c.edb_info_id
-	//		WHERE a.chart_type=2
-	//		GROUP BY b.edb_info_id
-	//		ORDER BY b.edb_info_id ASC  `
 	sql := `SELECT c.edb_info_id, c.edb_info_type, c.source_name, c.source, c.edb_code, c.edb_name, c.edb_name_source, c.frequency, c.unit, c.start_date, c.end_date, c.classify_id, c.sys_user_id, c.sys_user_real_name, c.create_time, c.modify_time, c.unique_code, c.min_value, c.max_value, c.calculate_formula, c.edb_type, c.is_update, c.sort, c.latest_date, c.latest_value, c.move_type, c.move_frequency, c.no_update, c.server_url, c.edb_name_en, c.unit_en, c.chart_image, c.calendar, c.empty_type, c.max_empty_type, c.data_date_type, c.manual_save, c.terminal_code, c.data_update_time, c.er_data_update_date, c.source_index_name, c.end_value, c.sub_source, c.sub_source_name, c.indicator_code, c.stock_code, c.extra, c.is_join_permission, c.base_modify_time, c.is_static_data, c.set_update_time
 			FROM chart_info AS a
 			INNER JOIN chart_edb_mapping AS b ON a.chart_info_id = b.chart_info_id
@@ -223,36 +200,24 @@ func GetQuarterEdbInfo() (item []*EdbInfo, err error) {
 			WHERE a.chart_type = 2
 			GROUP BY b.edb_info_id, c.edb_info_id, c.edb_info_type, c.source_name, c.source, c.edb_code, c.edb_name, c.edb_name_source, c.frequency, c.unit, c.start_date, c.end_date, c.classify_id, c.sys_user_id, c.sys_user_real_name, c.create_time, c.modify_time, c.unique_code, c.min_value, c.max_value, c.calculate_formula, c.edb_type, c.is_update, c.sort, c.latest_date, c.latest_value, c.move_type, c.move_frequency, c.no_update, c.server_url, c.edb_name_en, c.unit_en, c.chart_image, c.calendar, c.empty_type, c.max_empty_type, c.data_date_type, c.manual_save, c.terminal_code, c.data_update_time, c.er_data_update_date, c.source_index_name, c.end_value, c.sub_source, c.sub_source_name, c.indicator_code, c.stock_code, c.extra, c.is_join_permission, c.base_modify_time, c.is_static_data, c.set_update_time
 			ORDER BY b.edb_info_id ASC `
-	//_, err = o.Raw(sql).QueryRows(&item)
 
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&item).Error
 	return
 }
 
 func ResetEdbInfoIsUpdate() (err error) {
-	//o := orm.NewOrm()
 	sql := ` UPDATE edb_info SET is_update=1  `
-	//_, err = o.Raw(sql).Exec()
 
 	err = global.DEFAULT_DmSQL.Exec(sql).Error
 	return
 }
 
-// GetEdbInfoCalculateListByCondition 获取指标关系列表
 func GetEdbInfoCalculateListByCondition(condition string, pars []interface{}) (items []*EdbInfoCalculateMapping, err error) {
-	//o := orm.NewOrm()
-	//calculateTableName := GetEdbInfoCalculateTableName(source)
-	//if calculateTableName == "" {
-	//	err = errors.New("无效的表名")
-	//	return
-	//}
 
 	sql := ` SELECT * FROM edb_info_calculate_mapping WHERE 1=1 `
-	//sql = fmt.Sprintf(sql, calculateTableName)
 	if condition != "" {
 		sql += condition
 	}
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
@@ -263,8 +228,6 @@ func DeleteEdbDataByIdAndSource(edbDataId, source, subSource int) (err error) {
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = fmt.Sprintf(sql, tableName)
 
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, edbDataId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, edbDataId).Error
 	return
 }
@@ -282,54 +245,25 @@ type EdbInfoClassify struct {
 	ModifyTime      time.Time
 }
 
-// GetAllEdbInfoClassifyListByCondition
-// @Description: 获取指标与分类的关系列表
-// @author: Roc
-// @datetime 2024-02-29 10:55:38
-// @param condition string
-// @param pars []interface{}
-// @return item []*EdbInfoUpdateLog
-// @return err error
 func GetAllEdbInfoClassifyListByCondition(condition string, pars []interface{}) (item []*EdbInfoClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY edb_info_id ASC `
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
-// GetEdbInfoItemByCodeAndSource
-// @Description: 根据指标编码和来源id获取指标信息
-// @author: Roc
-// @datetime 2024-03-11 16:26:23
-// @param source int
-// @param edbCode string
-// @return item *EdbInfo
-// @return err error
 func GetEdbInfoItemByCodeAndSource(source int, edbCode string) (item *EdbInfoItem, err error) {
-	//o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info WHERE edb_code=? AND source = ?`
-	//err = o.Raw(sql, source, edbCode).QueryRow(&item)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, source, edbCode).First(&item).Error
 	return
 }
 
-// GetEdbInfoMaxModifyTime
-// @Description:  根据指标来源和编码获取该指标数据最晚修改时间
-// @author: Roc
-// @datetime 2024-03-11 17:01:01
-// @param source int
-// @param edbCode string
-// @return modifyTime string
-// @return err error
 func GetEdbInfoMaxModifyTime(source, subSource int, edbCode string) (modifyTime string, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	tableName := GetEdbDataTableName(source, subSource)
 	if tableName == "" {
 		err = errors.New("无效的表名称:source:" + strconv.Itoa(source))
@@ -338,7 +272,6 @@ func GetEdbInfoMaxModifyTime(source, subSource int, edbCode string) (modifyTime
 
 	sql := ` SELECT MAX(modify_time) AS modify_time FROM %s WHERE edb_code=? `
 	sql = fmt.Sprintf(sql, tableName)
-	//err = o.Raw(sql, edbCode).QueryRow(&modifyTime)
 
 	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&modifyTime).Error
 
@@ -346,25 +279,21 @@ func GetEdbInfoMaxModifyTime(source, subSource int, edbCode string) (modifyTime
 }
 
 func GetEdbInfoPageByCondition(condition string, pars []interface{}, startPage, pageSize int) (item []*EdbInfo, err error) {
-	//o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` LIMIT ?,? `
-	//_, err = o.Raw(sql, pars, startPage, pageSize).QueryRows(&item)
 	pars = append(pars, startPage, pageSize)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 func GetEdbInfoCountByCondition(condition string, pars []interface{}) (total int64, err error) {
-	//o := orm.NewOrm()
 	sql := ` SELECT count(*) FROM edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	//err = o.Raw(sql, pars).QueryRow(&total)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&total).Error
 	return
@@ -375,7 +304,6 @@ func ModifyEdbUpdateStatus(edbIdList []int, indexCodeList []string, calculateEdb
 	if idNum <= 0 {
 		return
 	}
-	//o, err := orm.NewOrmUsingDB("data").Begin()
 
 	o := global.DmSQL["data"].Begin()
 	if err != nil {
@@ -389,30 +317,22 @@ func ModifyEdbUpdateStatus(edbIdList []int, indexCodeList []string, calculateEdb
 		_ = o.Commit()
 	}()
 
-	// 更改指标的更新状态
 	sql := ` UPDATE edb_info SET no_update = 1 WHERE source in (?, ?) AND edb_info_id IN (` + utils.GetOrmInReplace(idNum) + `) AND  no_update = 0`
-	//_, err = o.Raw(sql, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, utils.DATA_SOURCE_WIND, edbIdList).Exec()
 	err = o.Exec(sql, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, utils.DATA_SOURCE_WIND, edbIdList).Error
 	if err != nil {
 		return
 	}
 
-	// 更改钢联化工指标更新状态
 	if len(indexCodeList) > 0 {
-		// 更改数据源的更新状态
 		sql = ` UPDATE base_from_mysteel_chemical_index SET is_stop = 1 WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodeList)) + `) and is_stop=0`
-		//_, err = o.Raw(sql, indexCodeList).Exec()
 		err = o.Exec(sql, indexCodeList).Error
 		if err != nil {
 			return
 		}
 	}
 
-	// 更新相关的计算指标状态
 	if len(calculateEdbInfoIds) > 0 {
-		// 批量更新相关联的指标ID
 		sql = ` UPDATE edb_info SET no_update = 1 WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(calculateEdbInfoIds)) + `) AND  no_update = 0`
-		//_, err = o.Raw(sql, calculateEdbInfoIds).Exec()
 		err = o.Exec(sql, calculateEdbInfoIds).Error
 		if err != nil {
 			return
@@ -421,23 +341,16 @@ func ModifyEdbUpdateStatus(edbIdList []int, indexCodeList []string, calculateEdb
 	return
 }
 
-// GetEdbInfoByIdList 根据指标id集合 获取 指标列表
 func GetEdbInfoByIdList(edbInfoIdList []int) (items []*EdbInfo, err error) {
 	num := len(edbInfoIdList)
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info WHERE edb_info_id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, edbInfoIdList).QueryRows(&items)
 	err = global.DmSQL["data"].Raw(sql, edbInfoIdList).Find(&items).Error
 	return
 }
 
-// GetAllBaseEdbInfo
-// @Description: 获取所有基础指标（只有国能数据节点的数据）
-// @return item
-// @return err
 func GetAllBaseEdbInfo() (item []*EdbInfo, err error) {
 	sql := ` SELECT * FROM edb_info WHERE 1=1 AND "edb_info_type" = ? AND "edb_type" = ?`
 	pars := []interface{}{utils.EDB_INFO_TYPE, utils.EdbTypeBase}
@@ -446,10 +359,6 @@ func GetAllBaseEdbInfo() (item []*EdbInfo, err error) {
 	return
 }
 
-// AddEdbInfo
-// @Description: 新增指标
-// @param item
-// @return err
 func AddEdbInfo(item *EdbInfo) (err error) {
 	err = global.DmSQL["data"].Create(item).Error
 	if err != nil {
@@ -459,11 +368,6 @@ func AddEdbInfo(item *EdbInfo) (err error) {
 	return
 }
 
-// Update
-// @Description: 更新指定参数
-// @receiver m
-// @param cols
-// @return err
 func (m *EdbInfo) Update(cols []string) (err error) {
 	err = global.DmSQL["data"].Select(cols).Updates(m).Error
 	return

models/data_manage/edb_info_calculate_mapping.go

@@ -25,21 +25,14 @@ type EdbInfoCalculateMapping struct {
 }
 
 func AddEdbInfoCalculateMappingMulti(items []*EdbInfoCalculateMapping) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.InsertMulti(1, items)
 
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func FixEdbInfoCalculateMapping() {
-	//o := orm.NewOrm()
-	//tx, err := o.Begin()
 	var err error
 	tx := global.DEFAULT_DmSQL.Begin()
-	//if err != nil {
-	//	return
-	//}
 	defer func() {
 		if err != nil {
 			tx.Rollback()
@@ -49,7 +42,6 @@ func FixEdbInfoCalculateMapping() {
 	}()
 	edbInfoList := make([]*EdbInfoList, 0)
 	sql := `SELECT * FROM edb_info WHERE edb_type=2 `
-	//_, err = o.Raw(sql).QueryRows(&edbInfoList)
 	err = tx.Raw(sql).Find(&edbInfoList).Error
 
 	if err != nil {
@@ -62,7 +54,6 @@ func FixEdbInfoCalculateMapping() {
 		sql := ` SELECT * FROM %s
 			WHERE edb_info_id=? ORDER BY sort ASC `
 		sql = fmt.Sprintf(sql, calculateTableName)
-		//_, err = tx.Raw(sql, v.EdbInfoId).QueryRows(&calculateList)
 		err = tx.Raw(sql, v.EdbInfoId).Find(&calculateList).Error
 
 		if err != nil {
@@ -70,7 +61,6 @@ func FixEdbInfoCalculateMapping() {
 			return
 		}
 		for _, cv := range calculateList {
-			//关联关系
 			calculateMappingItem := new(EdbInfoCalculateMapping)
 			calculateMappingItem.CreateTime = time.Now()
 			calculateMappingItem.ModifyTime = time.Now()
@@ -85,7 +75,6 @@ func FixEdbInfoCalculateMapping() {
 			calculateMappingItem.FromTag = cv.FromTag
 			calculateMappingItem.Source = v.Source
 			calculateMappingItem.SourceName = v.SourceName
-			//tx.Insert(calculateMappingItem)
 			tx.Create(calculateMappingItem)
 		}
 	}
@@ -114,21 +103,16 @@ type EdbInfoCalculateMappingView struct {
 }
 
 func GetEdbInfoCalculateMappingDetail(edbInfoId int) (item *EdbInfoCalculateMappingView, err error) {
-	//o := orm.NewOrm()
 	sql := ` SELECT a.*,b.start_date,b.end_date,b.calculate_formula,b.move_type,b.move_frequency FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
-	//err = o.Raw(sql, edbInfoId).QueryRow(&item)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&item).Error
 	return
 }
 
-// GetAllCalculateEdbIdsByEdbInfoIds 所依赖计算指标
 func GetAllCalculateEdbIdsByEdbInfoIds(edbInfoIds []int) (edbIds []int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	msql := ` SELECT edb_info_id FROM edb_info_calculate_mapping WHERE from_edb_info_id in (` + utils.GetOrmInReplace(len(edbInfoIds)) + `)  GROUP BY edb_info_id `
-	//_, err = o.Raw(msql, edbInfoIds).QueryRows(&edbIds)
 	err = global.DmSQL["data"].Raw(msql, edbInfoIds).Find(&edbIds).Error
 	if err != nil {
 		return
@@ -136,8 +120,6 @@ func GetAllCalculateEdbIdsByEdbInfoIds(edbInfoIds []int) (edbIds []int, err erro
 	return
 }
 
-// EdbInfoCalculateMappingInfo
-// @Description: 计算指标与基础指标关系表
 type EdbInfoCalculateMappingInfo struct {
 	EdbInfoCalculateMappingId int       `gorm:"column:edb_info_calculate_mapping_id;primaryKey"` //   `orm:"column(edb_info_calculate_mapping_id);pk"`
 	EdbInfoId                 int       `description:"计算指标id"`
@@ -161,25 +143,19 @@ type EdbInfoCalculateMappingInfo struct {
 	NoUpdate                  int8      `description:"是否停止更新，0：继续更新；1：停止更新"`
 }
 
-// GetEdbInfoCalculateMappingListByEdbInfoId 根据生成的指标id获取来源的指标id列表
 func GetEdbInfoCalculateMappingListByEdbInfoId(edbInfoId int) (items []*EdbInfoCalculateMappingInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.*,b.edb_type as from_edb_type,b.edb_info_type as from_edb_info_type, b.unique_code AS from_unique_code, b.classify_id AS from_classify_id,b.no_update FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
-	//_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
 
 	err = global.DmSQL["data"].Raw(sql, edbInfoId).Find(&items).Error
 	return
 }
 
-// GetEdbInfoCalculateMappingListByEdbInfoIds 根据生成的指标id获取来源的指标id列表
 func GetEdbInfoCalculateMappingListByEdbInfoIds(edbInfoIds []int) (items []*EdbInfoCalculateMappingInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.*,b.edb_type as from_edb_type,b.edb_info_type as from_edb_info_type, b.unique_code AS from_unique_code, b.classify_id AS from_classify_id,b.no_update FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id in (` + utils.GetOrmInReplace(len(edbInfoIds)) + `) `
-	//_, err = o.Raw(sql, edbInfoIds).QueryRows(&items)
 
 	err = global.DmSQL["data"].Raw(sql, edbInfoIds).Find(&items).Error
 	return

models/data_manage/edb_info_relation.go

@@ -30,7 +30,6 @@ func (e *EdbInfoRelation) TableName() string {
 }
 
 func AddEdbInfoRelationMulti(relationList []*EdbInfoRelation) (err error) {
-	//o, err := orm.NewOrmUsingDB("data").Begin()
 	o := global.DmSQL["data"].Begin()
 	if err != nil {
 		return
@@ -50,7 +49,6 @@ func AddEdbInfoRelationMulti(relationList []*EdbInfoRelation) (err error) {
 				relationCodesMap[relation.RelationCode] = struct{}{}
 			}
 		}
-		//_, err = o.InsertMulti(len(relationList), relationList)
 
 		err = o.CreateInBatches(relationList, utils.MultiAddNum).Error
 		if err != nil {
@@ -58,7 +56,6 @@ func AddEdbInfoRelationMulti(relationList []*EdbInfoRelation) (err error) {
 		}
 	}
 	if len(relationList) > 0 {
-		// 更新间接引用指标的关联ID
 		relationCodes := make([]string, 0)
 		for relationCode := range relationCodesMap {
 			relationCodes = append(relationCodes, relationCode)
@@ -70,7 +67,6 @@ SET e1.parent_relation_id = e2.edb_info_relation_id
 WHERE  
     e1.relation_type = 1   
     AND e2.relation_type = 0 AND e1.parent_relation_id !=e2.edb_info_relation_id AND e1.relation_code in (` + utils.GetOrmInReplace(len(relationCodes)) + `)`
-			//_, err = o.Raw(sql, relationCodes).Exec()
 			err = o.Exec(sql, relationCodes).Error
 			if err != nil {
 				return
@@ -80,11 +76,8 @@ WHERE
 	return
 }
 
-// GetEdbInfoRelationByEdbInfoIds 查询引用的指标ID
 func GetEdbInfoRelationByEdbInfoIds(edbInfoIds []int) (edbIds []int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	msql := ` SELECT edb_info_id FROM edb_info_relation WHERE edb_info_id in (` + utils.GetOrmInReplace(len(edbInfoIds)) + `)  GROUP BY edb_info_id `
-	//_, err = o.Raw(msql, edbInfoIds).QueryRows(&edbIds)
 
 	err = global.DmSQL["data"].Raw(msql, edbInfoIds).Find(&edbIds).Error
 	if err != nil {
@@ -93,11 +86,8 @@ func GetEdbInfoRelationByEdbInfoIds(edbInfoIds []int) (edbIds []int, err error)
 	return
 }
 
-// GetEdbInfoRelationByReferObjectIds 查询引用的指标ID
 func GetEdbInfoRelationByReferObjectIds(referObjectIds []int, referObjectType int) (items []*EdbInfoRelation, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	msql := ` SELECT * FROM edb_info_relation WHERE refer_object_id in (` + utils.GetOrmInReplace(len(referObjectIds)) + `) AND refer_object_type=? AND relation_type=0`
-	//_, err = o.Raw(msql, referObjectIds, referObjectType).QueryRows(&items)
 
 	err = global.DmSQL["data"].Raw(msql, referObjectIds, referObjectType).Find(&items).Error
 	return

models/data_manage/edb_info_update_log.go

@@ -39,13 +39,11 @@ type EdbInfoUpdateLog struct {
 }
 
 func GetEdbInfoUpdateLogByCondition(condition string, pars []interface{}) (item []*EdbInfoUpdateLog, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_info_update_log WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY id ASC limit 0,10  `
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }

models/data_manage/edb_refresh/edb_refresh_config.go

@@ -6,8 +6,6 @@ import (
 	"time"
 )
 
-// EdbRefreshConfig
-// @Description: 指标的刷新时间配置表
 type EdbRefreshConfig struct {
 	EdbRefreshConfigId  int       `gorm:"column:edb_refresh_config_id;primaryKey"` //  `orm:"column(edb_refresh_config_id);pk"`
 	RefreshFrequency    string    `description:"刷新频率"`
@@ -19,65 +17,26 @@ type EdbRefreshConfig struct {
 	CreateTime          time.Time `description:"添加时间"`
 }
 
-// Add
-// @Description: 添加
-// @author: Roc
-// @receiver m
-// @datetime 2023-12-14 16:11:10
-// @param cols []string
-// @return err error
 func (m *EdbRefreshConfig) Add() (err error) {
 	if m.EdbRefreshConfigId > 0 {
 		err = errors.New("该配置已存在")
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.EdbRefreshConfigId = int(lastId)
 	err = global.DmSQL["data"].Create(m).Error
 	return
 }
 
-// Update
-// @Description: 更新
-// @author: Roc
-// @receiver m
-// @datetime 2023-12-14 16:11:10
-// @param cols []string
-// @return err error
 func (m *EdbRefreshConfig) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(m, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(m).Error
 	return
 }
 
-// Delete
-// @Description: 删除
-// @author: Roc
-// @receiver m
-// @datetime 2023-12-14 16:11:10
-// @return err error
 func (m *EdbRefreshConfig) Delete() (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Delete(m)
 	err = global.DmSQL["data"].Exec("DELETE FROM edb_refresh_config WHERE edb_refresh_config_id = ?", m.EdbRefreshConfigId).Error
 	return
 }
 
-// GetEdbRefreshConfigListByCondition
-// @Description: 根据条条件获取刷新配置列表
-// @author: Roc
-// @datetime 2024-01-09 13:28:49
-// @param condition string
-// @param pars []interface{}
-// @return list []*EdbRefreshDefaultConfig
-// @return err error
 func GetEdbRefreshConfigListByCondition(condition string, pars []interface{}) (list []*EdbRefreshConfig, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_refresh_config
          WHERE 1 = 1 `
 
@@ -85,7 +44,6 @@ func GetEdbRefreshConfigListByCondition(condition string, pars []interface{}) (l
 		sql += condition
 	}
 	sql += ` ORDER BY edb_refresh_config_id ASC `
-	//_, err = o.Raw(sql, pars).QueryRows(&list)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
 	return
 }

models/data_manage/edb_refresh/edb_refresh_default_config.go

@@ -7,8 +7,6 @@ import (
 	"time"
 )
 
-// EdbRefreshDefaultConfig
-// @Description: 指标的默认刷新时间配置表
 type EdbRefreshDefaultConfig struct {
 	Id                  int       `gorm:"column:id;primaryKey"` //   `orm:"column(id);pk"`
 	Source              int       `description:"来源"`
@@ -23,85 +21,35 @@ type EdbRefreshDefaultConfig struct {
 	CreateTime          time.Time `description:"添加时间"`
 }
 
-// Add
-// @Description: 添加
-// @author: Roc
-// @receiver m
-// @datetime 2023-12-14 16:11:10
-// @param cols []string
-// @return err error
 func (m *EdbRefreshDefaultConfig) Add() (err error) {
 	if m.Id > 0 {
 		err = errors.New("该配置已存在")
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.Id = int(lastId)
 	err = global.DmSQL["data"].Create(m).Error
 	return
 }
 
-// Update
-// @Description: 更新
-// @author: Roc
-// @receiver m
-// @datetime 2023-12-14 16:11:10
-// @param cols []string
-// @return err error
 func (m *EdbRefreshDefaultConfig) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(m, cols...)
 
 	err = global.DmSQL["data"].Select(cols).Updates(m).Error
 	return
 }
 
-// Delete
-// @Description: 删除
-// @author: Roc
-// @receiver m
-// @datetime 2023-12-14 16:11:10
-// @return err error
 func (m *EdbRefreshDefaultConfig) Delete() (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Delete(m)
 	err = global.DmSQL["data"].Exec("DELETE FROM edb_refresh_default_config WHERE id = ?", m.Id).Error
 	return
 }
 
-// GetListBySourceAndFrequency
-// @Description: 根据来源和频度获取列表
-// @author: Roc
-// @datetime 2024-01-04 17:39:47
-// @param source int
-// @param subSource int
-// @param frequency string
-// @return list []*EdbRefreshDefaultConfig
-// @return err error
 func GetListBySourceAndFrequency(source, subSource int, frequency string) (list []*EdbRefreshDefaultConfig, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_refresh_default_config
          WHERE source = ? AND sub_source = ? AND frequency = ? ORDER BY id ASC `
-	//_, err = o.Raw(sql, source, subSource, frequency).QueryRows(&list)
 	err = global.DmSQL["data"].Raw(sql, source, subSource, frequency).Find(&list).Error
 
 	return
 }
 
-// GetListByCondition
-// @Description: 根据条条件获取默认配置列表
-// @author: Roc
-// @datetime 2024-01-09 13:28:49
-// @param condition string
-// @param pars []interface{}
-// @return list []*EdbRefreshDefaultConfig
-// @return err error
 func GetListByCondition(condition string, pars []interface{}) (list []*EdbRefreshDefaultConfig, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_refresh_default_config
          WHERE 1 = 1 `
 
@@ -109,31 +57,20 @@ func GetListByCondition(condition string, pars []interface{}) (list []*EdbRefres
 		sql += condition
 	}
 	sql += ` ORDER BY id ASC `
-	//_, err = o.Raw(sql, pars).QueryRows(&list)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
 
 	return
 }
 
-// GetDefaultRefreshEdbInfoListBySourceAndSubSource
-// @Description: 根据来源获取默认刷新的指标列表
-// @author: Roc
-// @datetime 2024-01-09 16:22:49
-// @param source int
-// @param subSource int
-// @return list []*data_manage.EdbInfo
-// @return err error
 func GetDefaultRefreshEdbInfoListBySourceAndSubSource(source, subSource int, frequencyList []string) (list []*EdbInfoListAndRefreshConfig, err error) {
 	num := len(frequencyList)
 	if num <= 0 {
 		return
 	}
 
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT a.* FROM edb_info a 
 LEFT JOIN edb_refresh_mapping b ON a.edb_info_id = b.edb_info_id
 WHERE a.source = ? AND a.sub_source = ? AND a.frequency IN (` + utils.GetOrmInReplace(num) + `)  AND b.edb_info_id is null`
-	//_, err = o.Raw(sql, source, subSource, frequencyList).QueryRows(&list)
 	err = global.DmSQL["data"].Raw(sql, source, subSource, frequencyList).Find(&list).Error
 	return
 }

models/data_manage/edb_refresh/edb_refresh_mapping.go

@@ -7,8 +7,6 @@ import (
 	"time"
 )
 
-// EdbRefreshMapping
-// @Description: 指标刷新时间配置关系表
 type EdbRefreshMapping struct {
 	EdbRefreshMappingId int       `gorm:"column:edb_refresh_mapping_id;primaryKey"` //  `orm:"column(edb_refresh_mapping_id);pk"`
 	Source              int       `description:"来源"`
@@ -21,51 +19,21 @@ type EdbRefreshMapping struct {
 	CreateTime          time.Time `description:"添加时间"`
 }
 
-// Add
-// @Description: 添加
-// @author: Roc
-// @receiver m
-// @datetime 2023-12-14 16:11:10
-// @param cols []string
-// @return err error
 func (m *EdbRefreshMapping) Add() (err error) {
 	if m.EdbRefreshMappingId > 0 {
 		err = errors.New("该配置已存在")
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.EdbRefreshMappingId = int(lastId)
 	err = global.DmSQL["data"].Create(m).Error
 	return
 }
 
-// Update
-// @Description: 更新
-// @author: Roc
-// @receiver m
-// @datetime 2023-12-14 16:11:10
-// @param cols []string
-// @return err error
 func (m *EdbRefreshMapping) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(m, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(m).Error
 	return
 }
 
-// Delete
-// @Description: 删除
-// @author: Roc
-// @receiver m
-// @datetime 2023-12-14 16:11:10
-// @return err error
 func (m *EdbRefreshMapping) Delete() (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Delete(m)
 
 	err = global.DmSQL["data"].Exec("DELETE FROM chart_tag WHERE edb_refresh_mapping = ?", m.EdbRefreshMappingId).Error
 	return
@@ -92,14 +60,6 @@ type EdbInfoListAndRefreshConfig struct {
 	DataRefreshNum     int       `description:"刷新的期数"`
 }
 
-// GetConfigRefreshEdbInfoListBySourceAndSubSource
-// @Description:  根据来源和配置id列表获取指标列表
-// @author: Roc
-// @datetime 2024-01-09 17:28:06
-// @param sourceList []int
-// @param configIdList []int
-// @return list []*data_manage.EdbInfoList
-// @return err error
 func GetConfigRefreshEdbInfoListBySourceAndSubSource(sourceList, configIdList []int) (list []*EdbInfoListAndRefreshConfig, err error) {
 	num := len(configIdList)
 	if num <= 0 {
@@ -108,7 +68,6 @@ func GetConfigRefreshEdbInfoListBySourceAndSubSource(sourceList, configIdList []
 
 	var pars []interface{}
 
-	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT a.*,b.edb_refresh_config_id FROM edb_info a 
  JOIN edb_refresh_mapping b ON a.edb_info_id = b.edb_info_id
 WHERE b.edb_refresh_config_id IN (` + utils.GetOrmInReplace(num) + `) `
@@ -119,7 +78,6 @@ WHERE b.edb_refresh_config_id IN (` + utils.GetOrmInReplace(num) + `) `
 		sql += ` AND b.source not in (` + utils.GetOrmInReplace(sourceNum) + `) `
 		pars = append(pars, sourceList)
 	}
-	//_, err = o.Raw(sql, pars).QueryRows(&list)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
 	return
 }

models/data_manage/edb_refresh/edb_refresh_source.go

@@ -5,8 +5,6 @@ import (
 	"time"
 )
 
-// EdbRefreshSource
-// @Description: 刷新的数据源表
 type EdbRefreshSource struct {
 	Id            int       `gorm:"column:id;primaryKey"` //`orm:"column(id);pk"`
 	Source        int       `orm:"column(source)" description:"来源"`
@@ -18,8 +16,6 @@ type EdbRefreshSource struct {
 	CreateTime    time.Time `description:"创建时间"`
 }
 
-// EdbRefreshSourceList
-// @Description: 获取刷新的数据源列表
 type EdbRefreshSourceList struct {
 	Source        int                    `orm:"column(source)" description:"来源"`
 	SourceName    string                 `description:"来源名称"`
@@ -29,16 +25,8 @@ type EdbRefreshSourceList struct {
 	HasChild      int                    `description:"是否有子来源，0：否，1：是"`
 }
 
-// GetAllList
-// @Description: 获取刷新数据源列表
-// @author: Roc
-// @datetime 2024-01-03 15:03:24
-// @return items []*EdbRefreshSource
-// @return err error
 func (m EdbRefreshSource) GetAllList() (items []*EdbRefreshSource, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM edb_refresh_source ORDER BY id ASC `
-	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
 	return
 }

models/data_manage/edb_refresh/request/edb_info_refresh.go

@@ -1,7 +1,5 @@
 package request
 
-// SaveEdbRefreshDefaultConfigReq
-// @Description: 设置默认刷新时间配置
 type SaveEdbRefreshDefaultConfigReq struct {
 	Source    int                `description:"来源"`
 	SubSource int                `description:"子来源"`
@@ -9,8 +7,6 @@ type SaveEdbRefreshDefaultConfigReq struct {
 	List      []RefreshConfigReq `description:"刷新配置项"`
 }
 
-// RefreshConfigReq
-// @Description: 刷新时间配置项
 type RefreshConfigReq struct {
 	RefreshFrequency    string `description:"刷新频率"`
 	RefreshFrequencyDay int    `description:"具体刷新的日期"`
@@ -19,8 +15,6 @@ type RefreshConfigReq struct {
 	RefreshDataNum      int    `description:"刷新单元格数"`
 }
 
-// SaveEdbRefreshConfigReq
-// @Description: 设置指标的刷新时间配置
 type SaveEdbRefreshConfigReq struct {
 	Source          int                `description:"来源"`
 	SubSource       int                `description:"子来源"`
@@ -35,8 +29,6 @@ type SaveEdbRefreshConfigReq struct {
 	List            []RefreshConfigReq `description:"刷新配置项"`
 }
 
-// SaveEdbRefreshStatusReq
-// @Description: 设置指标的刷新状态
 type SaveEdbRefreshStatusReq struct {
 	Source          int    `description:"来源"`
 	SubSource       int    `description:"子来源"`

models/data_manage/edb_source.go

@@ -16,7 +16,6 @@ var (
 	EdbNameSourceMap        map[string]*EdbSource // 数据来源名对应的指标来源
 )
 
-// EdbSource 指标来源表
 type EdbSource struct {
 	EdbSourceId      int    `gorm:"column:edb_source_id;primaryKey"` // `orm:"column(edb_source_id);pk"`
 	SourceName       string `description:"指标来源名称"`
@@ -32,9 +31,7 @@ type EdbSource struct {
 	SourceNameEn     string `gorm:"column:source_name_en;type:varchar(128);comment:指标来源名称-英文;not null;"`                     // 指标来源名称-英文
 }
 
-// GetEdbSourceItemsByCondition 获取指标来源列表
 func GetEdbSourceItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*EdbSource, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -45,22 +42,17 @@ func GetEdbSourceItemsByCondition(condition string, pars []interface{}, fieldArr
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM edb_source WHERE 1=1 %s %s`, fields, condition, order)
 
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
-// GetEdbSourceItemByCondition 获取指标来源
 func GetEdbSourceItemByCondition(condition string, pars []interface{}) (item *EdbSource, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT * FROM edb_source WHERE 1=1 %s`, condition)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 
 	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
-// InitEdbSourceVar 初始化时加载指标来源对应信息, 避免循环中查库, 注意edb_source表修改table_name的话需要重启服务
 func InitEdbSourceVar() {
 	EdbDataTableNameMap = make(map[int]string)
 	EdbDataRefreshMethodMap = make(map[int]string)
@@ -92,11 +84,6 @@ func InitEdbSourceVar() {
 	}
 }
 
-// GetEdbSourceItemsSourceId
-// @Description: 根据来源id获取指标来源
-// @param sourceId
-// @return item
-// @return err
 func GetEdbSourceItemsSourceId(sourceId int) (item *EdbSource, err error) {
 	sql := `SELECT * FROM edb_source WHERE 1=1 AND edb_source_id = ? `
 	err = global.DmSQL["data"].Raw(sql, sourceId).First(&item).Error
@@ -104,10 +91,6 @@ func GetEdbSourceItemsSourceId(sourceId int) (item *EdbSource, err error) {
 	return
 }
 
-// GetEdbSourceBySourceId
-// @Description: 根据来源id获取指标来源
-// @param sourceId
-// @return sourceItem
 func GetEdbSourceBySourceId(sourceId int) (sourceItem *EdbSource) {
 	sourceItem, ok := EdbSourceIdMap[sourceId]
 	if !ok {
@@ -118,7 +101,6 @@ func GetEdbSourceBySourceId(sourceId int) (sourceItem *EdbSource) {
 		if item.EdbSourceId > 0 {
 			sourceItem = item
 
-			// 写入到内存中
 			EdbSourceIdMap[sourceId] = sourceItem
 			EdbDataTableNameMap[sourceId] = sourceItem.TableName
 			EdbDataRefreshMethodMap[sourceItem.EdbSourceId] = sourceItem.EdbRefreshMethod
@@ -130,11 +112,6 @@ func GetEdbSourceBySourceId(sourceId int) (sourceItem *EdbSource) {
 	return
 }
 
-// GetEdbSourceItemsSourceName
-// @Description: 根据来源名称获取指标来源
-// @param sourceName
-// @return item
-// @return err
 func GetEdbSourceItemsSourceName(sourceName string) (item *EdbSource, err error) {
 	sql := `SELECT * FROM edb_source WHERE 1=1 AND source_name = ? `
 	err = global.DmSQL["data"].Raw(sql, sourceName).First(&item).Error
@@ -142,10 +119,6 @@ func GetEdbSourceItemsSourceName(sourceName string) (item *EdbSource, err error)
 	return
 }
 
-// GetEdbSourceBySourceName
-// @Description: 根据来源名称获取指标来源
-// @param sourceId
-// @return sourceItem
 func GetEdbSourceBySourceName(sourceName string) (sourceItem *EdbSource) {
 	sourceItem, ok := EdbNameSourceMap[sourceName]
 	if !ok {
@@ -156,7 +129,6 @@ func GetEdbSourceBySourceName(sourceName string) (sourceItem *EdbSource) {
 		if item.EdbSourceId > 0 {
 			sourceItem = item
 
-			// 写入到内存中
 			EdbSourceIdMap[sourceItem.EdbSourceId] = sourceItem
 			EdbDataTableNameMap[sourceItem.EdbSourceId] = sourceItem.TableName
 			EdbDataRefreshMethodMap[sourceItem.EdbSourceId] = sourceItem.EdbRefreshMethod
@@ -168,10 +140,6 @@ func GetEdbSourceBySourceName(sourceName string) (sourceItem *EdbSource) {
 	return
 }
 
-// GetEdbSourceTableNameBySourceId
-// @Description: 根据来源id获取指标来源的归属表
-// @param sourceId
-// @return sourceItem
 func GetEdbSourceTableNameBySourceId(sourceId int) (tableName string) {
 	sourceItem := GetEdbSourceBySourceId(sourceId)
 
@@ -182,10 +150,6 @@ func GetEdbSourceTableNameBySourceId(sourceId int) (tableName string) {
 	return
 }
 
-// GetEdbSourceRefreshMethodBySourceId
-// @Description: 根据来源id获取指标来源的刷新路径
-// @param sourceId
-// @return sourceItem
 func GetEdbSourceRefreshMethodBySourceId(sourceId int) (refreshMethod string) {
 	sourceItem := GetEdbSourceBySourceId(sourceId)
 
@@ -196,10 +160,6 @@ func GetEdbSourceRefreshMethodBySourceId(sourceId int) (refreshMethod string) {
 	return
 }
 
-// AddEdbSource
-// @Description: 添加一个新的数据源
-// @param item
-// @return err
 func AddEdbSource(item *EdbSource, indexNamePrefix string) (err error) {
 	o := global.DmSQL["data"].Begin()
 	if err != nil {
@@ -241,7 +201,6 @@ UNIQUE("edb_code", "data_time")) STORAGE(ON "MAIN", CLUSTERBTR) ;
 		fmt.Sprintf(`CREATE OR REPLACE  INDEX "%s" ON "%s"("edb_info_id" ASC) STORAGE(ON "MAIN", CLUSTERBTR) ;`, indexName2, item.TableName),
 	}
 
-	// 创建表和索引
 	for _, sql := range sqlStatements {
 		err = o.Exec(sql).Error
 		if err != nil {
@@ -249,7 +208,6 @@ UNIQUE("edb_code", "data_time")) STORAGE(ON "MAIN", CLUSTERBTR) ;
 		}
 	}
 
-	// 添加来源
 	err = o.Create(item).Error
 	if err != nil {
 		return

models/data_manage/edb_update_log.go

@@ -18,70 +18,34 @@ type EdbUpdateLog struct {
 	CreateTime  time.Time `json:"create_time"`
 }
 
-// GetEdbUpdateLogMaxId
-// @Description: 获取最大的数据id
-// @author: Roc
-// @datetime 2024-03-07 18:38:23
-// @param condition string
-// @param pars []interface{}
-// @return maxId int
-// @return err error
 func GetEdbUpdateLogMaxId() (maxId int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT id FROM edb_update_log WHERE 1=1 ORDER BY id desc limit 1 `
-	//err = o.Raw(sql).QueryRow(&maxId)
 	err = global.DmSQL["data"].Raw(sql).Scan(&maxId).Error
 	return
 }
 
-// GetEdbUpdateLogMaxHandleId
-// @Description: 获取已经操作了的最大的数据id
-// @author: Roc
-// @datetime 2024-03-08 17:53:29
-// @return maxId int64
-// @return err error
 func GetEdbUpdateLogMaxHandleId() (maxId int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT id FROM edb_update_log WHERE 1=1 AND is_handle = 1 ORDER BY id desc limit 1 `
-	//err = o.Raw(sql).QueryRow(&maxId)
 	err = global.DmSQL["data"].Raw(sql).Scan(&maxId).Error
 	return
 }
 
-// GetEdbUpdateLogByCondition
-// @Description: 获取指标更新列表
-// @author: Roc
-// @datetime 2024-03-07 18:36:44
-// @param condition string
-// @param pars []interface{}
-// @return item []*EdbUpdateLog
-// @return err error
 func GetEdbUpdateLogByCondition(condition string, pars []interface{}) (item []*EdbUpdateLog, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_update_log WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY id ASC limit 500 `
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
-// HandleUpdateLogByIds
-// @Description: 批量处理指标更新记录
-// @author: Roc
-// @datetime 2024-03-08 17:30:52
-// @param idList []int
-// @return err error
 func HandleUpdateLogByIds(idList []int64, modifyTime string) (err error) {
 	num := len(idList)
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE edb_update_log set is_handle=1 ,modify_time = ?  WHERE id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, modifyTime, idList).Exec()
 	err = global.DmSQL["data"].Exec(sql, modifyTime, idList).Error
 	return
 }
@@ -140,11 +104,8 @@ type EdbData struct {
 	EdbDataId int32  `gorm:"column:edb_data_id;primaryKey"  json:"edb_data_id"` // `orm:"column(edb_data_id);pk" json:"edb_data_id"`
 	EdbInfoId int32  `json:"edb_info_id"`                                       // 指标id
 	EdbCode   string `json:"edb_code"`                                          // 指标编码
-	//DataTime      time.Time `json:"data_time"`      // 数据日期
 	DataTime string  `json:"data_time"` // 数据日期
 	Value    float64 `json:"value"`     // 数据值
-	//CreateTime    time.Time `json:"create_time"`    // 创建时间
-	//ModifyTime    time.Time `json:"modify_time"`    // 修改时间
 	CreateTime    string `json:"create_time"`    // 创建时间
 	ModifyTime    string `json:"modify_time"`    // 修改时间
 	DataTimestamp int64  `json:"data_timestamp"` // 数据日期时间戳

models/data_manage/excel/excel_edb_mapping.go

@@ -6,7 +6,6 @@ import (
 	"time"
 )
 
-// ExcelEdbMapping excel与指标的关系表
 type ExcelEdbMapping struct {
 	ExcelEdbMappingId int       `gorm:"column:excel_edb_mapping_id;primaryKey"` //    `orm:"column(excel_edb_mapping_id);pk"`
 	ExcelInfoId       int       `description:"excel的id"`
@@ -16,22 +15,16 @@ type ExcelEdbMapping struct {
 	ModifyTime        time.Time `description:"修改时间"`
 }
 
-// GetExcelEdbMappingTotalBySource 根据表格类型获取总数
 func GetExcelEdbMappingTotalBySource(sources []int) (total int, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT count(*)  FROM excel_edb_mapping WHERE source in (` + utils.GetOrmInReplace(len(sources)) + `)`
 
-	//err = o.Raw(sql, sources).QueryRow(&total)
 	err = global.DmSQL["data"].Raw(sql, sources).Scan(total).Error
 	return
 }
 
-// GetExcelEdbMappingListBySource 根据表格类型获取列表
 func GetExcelEdbMappingListBySource(sources []int, pageIndex, pageSize int) (items []*ExcelEdbMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM excel_edb_mapping WHERE source in (` + utils.GetOrmInReplace(len(sources)) + `) Limit ?,? `
 
-	//_, err = o.Raw(sql, sources, pageIndex, pageSize).QueryRows(&items)
 	err = global.DmSQL["data"].Raw(sql, sources, pageIndex, pageSize).Find(&items).Error
 	return
 }

models/data_manage/factor_edb_series_chart_mapping.go

@@ -12,7 +12,6 @@ const (
 	FactorEdbSeriesChartCalculateTypeCorrelation = 1 // 相关性计算
 )
 
-// FactorEdbSeriesChartMapping 因子指标系列-图表关联
 type FactorEdbSeriesChartMapping struct {
 	FactorEdbSeriesChartMappingId int       `gorm:"column:factor_edb_series_chart_mapping_id;primaryKey"` //   `orm:"column(factor_edb_series_chart_mapping_id);pk"`
 	ChartInfoId                   int       `description:"图表ID"`
@@ -62,40 +61,25 @@ func (m *FactorEdbSeriesChartMapping) Cols() MultipleFactorSeriesChartMappingCol
 }
 
 func (m *FactorEdbSeriesChartMapping) Create() (err error) {
-	//o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.FactorEdbSeriesChartMappingId = int(id)
 
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) CreateMulti(items []*FactorEdbSeriesChartMapping) (err error) {
-	//if len(items) == 0 {
-	//	return
-	//}
-	//o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(items), items)
 
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) Remove() (err error) {
-	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	//_, err = o.Raw(sql, m.FactorEdbSeriesChartMappingId).Exec()
 
 	err = global.DEFAULT_DmSQL.Exec(sql, m.FactorEdbSeriesChartMappingId).Error
 	return
@@ -105,47 +89,38 @@ func (m *FactorEdbSeriesChartMapping) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	//_, err = o.Raw(sql, ids).Exec()
 
 	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetItemById(id int) (item *FactorEdbSeriesChartMapping, err error) {
-	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	//err = o.Raw(sql, id).QueryRow(&item)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeriesChartMapping, err error) {
-	//o := orm.NewOrm()
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	//err = o.Raw(sql, pars).QueryRow(&count)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeriesChartMapping, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -155,14 +130,12 @@ func (m *FactorEdbSeriesChartMapping) GetItemsByCondition(condition string, pars
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *FactorEdbSeriesChartMapping) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeriesChartMapping, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -172,23 +145,18 @@ func (m *FactorEdbSeriesChartMapping) GetPageItemsByCondition(condition string,
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	pars = append(pars, startSize, pageSize)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
-// GetDistinctSeriesIdByChartId 获取图表关联的系列ID
 func (m *FactorEdbSeriesChartMapping) GetDistinctSeriesIdByChartId(chartId int) (seriesIds []int, err error) {
-	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT DISTINCT %s FROM %s WHERE %s = ?`, m.Cols().FactorEdbSeriesId, m.TableName(), m.Cols().ChartInfoId)
-	//_, err = o.Raw(sql, chartId).QueryRows(&seriesIds)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, chartId).Find(&seriesIds).Error
 	return
 }
 
-// FactorEdbSeriesChartCalculateCorrelationReq 图表相关性计算参数
 type FactorEdbSeriesChartCalculateCorrelationReq struct {
 	BaseEdbInfoId  int    `description:"标的指标ID"`
 	LeadValue      int    `description:"领先期数"`

models/data_manage/factor_edb_series_mapping.go

@@ -8,7 +8,6 @@ import (
 	"time"
 )
 
-// FactorEdbSeriesMapping 因子指标系列-指标关联表
 type FactorEdbSeriesMapping struct {
 	FactorEdbSeriesMappingId int       `gorm:"column:factor_edb_series_mapping_id;primaryKey"` //  `orm:"column(factor_edb_series_mapping_id);pk"`
 	FactorEdbSeriesId        int       `description:"因子指标系列ID"`
@@ -43,12 +42,6 @@ func (m *FactorEdbSeriesMapping) Cols() FactorEdbSeriesMappingCols {
 }
 
 func (m *FactorEdbSeriesMapping) Create() (err error) {
-	//o := orm.NewOrm()
-	//id, err := o.Insert(m)
-	//if err != nil {
-	//	return
-	//}
-	//m.FactorEdbSeriesMappingId = int(id)
 
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	return
@@ -58,25 +51,19 @@ func (m *FactorEdbSeriesMapping) CreateMulti(items []*FactorEdbSeriesMapping) (e
 	if len(items) == 0 {
 		return
 	}
-	//o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(items), items)
 
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func (m *FactorEdbSeriesMapping) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
 func (m *FactorEdbSeriesMapping) Remove() (err error) {
-	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	//_, err = o.Raw(sql, m.FactorEdbSeriesMappingId).Exec()
 
 	err = global.DEFAULT_DmSQL.Exec(sql, m.FactorEdbSeriesMappingId).Error
 	return
@@ -86,9 +73,7 @@ func (m *FactorEdbSeriesMapping) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	//_, err = o.Raw(sql, ids).Exec()
 
 	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
 	return
@@ -98,47 +83,38 @@ func (m *FactorEdbSeriesMapping) RemoveByCondition(condition string, pars []inte
 	if condition == "" {
 		return
 	}
-	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	//_, err = o.Raw(sql, pars).Exec()
 
 	err = global.DEFAULT_DmSQL.Exec(sql, pars...).Error
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetItemById(id int) (item *FactorEdbSeriesMapping, err error) {
-	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	//err = o.Raw(sql, id).QueryRow(&item)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeriesMapping, err error) {
-	//o := orm.NewOrm()
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	//err = o.Raw(sql, pars).QueryRow(&count)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeriesMapping, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -148,13 +124,11 @@ func (m *FactorEdbSeriesMapping) GetItemsByCondition(condition string, pars []in
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (m *FactorEdbSeriesMapping) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeriesMapping, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -164,13 +138,11 @@ func (m *FactorEdbSeriesMapping) GetPageItemsByCondition(condition string, pars
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	pars = append(pars, startSize, pageSize)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
-// FactorEdbSeriesMappingItem 因子指标系列-指标关联信息
 type FactorEdbSeriesMappingItem struct {
 	SeriesId  int    `description:"因子指标系列ID"`
 	EdbInfoId int    `description:"指标ID"`

models/data_manage/future_good/future_good_edb_info.go

@@ -5,7 +5,6 @@ import (
 	"time"
 )
 
-// FutureGoodEdbInfo 期货指标表
 type FutureGoodEdbInfo struct {
 	FutureGoodEdbInfoId int       `gorm:"column:future_good_edb_info_id;primaryKey"` // `orm:"column(future_good_edb_info_id);pk"`
 	FutureGoodEdbCode   string    `description:"期货指标code"`
@@ -25,105 +24,76 @@ type FutureGoodEdbInfo struct {
 	ModifyTime          time.Time
 }
 
-// GetFutureGoodEdbInfo 期货指标
 func GetFutureGoodEdbInfo(edbInfoId int) (item *FutureGoodEdbInfo, err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_info WHERE future_good_edb_info_id = ? `
 	sql += ` ORDER BY future_good_edb_info_id DESC `
-	//err = o.Raw(sql, edbInfoId).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&item).Error
 	return
 }
 
-// GetFutureGoodEdbInfoList 获取指标数据列表
 func GetFutureGoodEdbInfoList(condition string, pars []interface{}) (list []*FutureGoodEdbInfo, err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY future_good_edb_info_id DESC `
-	//_, err = o.Raw(sql, pars).QueryRows(&list)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&list).Error
 	return
 }
 
-// GetAllFutureGoodEdbInfoList 获取指标数据列表
 func GetAllFutureGoodEdbInfoList() (list []*FutureGoodEdbInfo, err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_info  ORDER BY future_good_edb_info_id DESC `
-	//_, err = o.Raw(sql).QueryRows(&list)
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
 	return
 }
 
-// GetFutureGoodEdbInfoListByParentId 根据父级ID获取指标数据列表
 func GetFutureGoodEdbInfoListByParentId(parentId int) (list []*FutureGoodEdbInfo, err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_info WHERE parent_id = ?  ORDER BY future_good_edb_info_id ASC `
-	//_, err = o.Raw(sql, parentId).QueryRows(&list)
 	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Find(&list).Error
 	return
 
 }
 
-// AddFutureGoodEdbInfo 添加期货数据库指标
 func AddFutureGoodEdbInfo(item *FutureGoodEdbInfo) (err error) {
-	//o := orm.NewOrm()
-	//lastId, err := o.Insert(item)
-	//if err != nil {
-	//	return
-	//}
-	//item.FutureGoodEdbInfoId = int(lastId)
 
 	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
-// Update 更新指标基础信息
 func (FutureGoodEdbInfo *FutureGoodEdbInfo) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(FutureGoodEdbInfo, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(FutureGoodEdbInfo).Error
 	return
 }
 
-// FutureGoodEdbInfoGroupListResp 期货指标数据列表数据返回
 type FutureGoodEdbInfoGroupListResp struct {
 	FutureGoodEdbInfoId   int
 	FutureGoodEdbInfoName string
 	Child                 []FutureGoodEdbInfoGroupListResp
 }
 
-// GetFutureGoodEdbInfoGroupList 获取分組指标数据列表
 func GetFutureGoodEdbInfoGroupList(condition string, pars []interface{}) (list []*FutureGoodEdbInfo, err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM future_good_edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY future_good_edb_info_id DESC `
-	//_, err = o.Raw(sql, pars).QueryRows(&list)
 
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&list).Error
 	return
 }
 
-// BarChartInfoReq 柱方图预览请求数据
 type BarChartInfoReq struct {
 	EdbInfoIdList []BarChartInfoEdbItemReq `description:"指标信息"`
 	DateList      []BarChartInfoDateReq    `description:"日期配置"`
 	Sort          BarChartInfoSortReq      `description:"排序"`
 }
 
-// BarChartInfoEdbItemReq 柱方图预览请求数据（指标相关）
 type BarChartInfoEdbItemReq struct {
 	EdbInfoId int    `description:"指标ID"`
 	Name      string `description:"别名"`
 	Source    int    `description:"1：ETA图库；2：商品价格"`
 }
 
-// BarChartInfoDateReq 柱方图预览请求数据（日期相关）
 type BarChartInfoDateReq struct {
 	Type  int    `description:"配置类型"`
 	Date  string `description:"固定日期"`
@@ -132,7 +102,6 @@ type BarChartInfoDateReq struct {
 	Name  string `description:"别名"`
 }
 
-// BarChartInfoSortReq 柱方图预览请求数据（排序相关）
 type BarChartInfoSortReq struct {
 	Sort      int `description:"排序类型，0：默认，1：升序，2：降序"`
 	DateIndex int `description:"日期数据的下标，从0开始"`

models/data_manage/ppt_v2_save_log.go

@@ -5,9 +5,6 @@ import (
 )
 
 func DeletePPTLogByDate(date string) (err error) {
-	//sql := `DELETE FROM ppt_v2_save_log WHERE create_time<? `
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Raw(sql, date).Exec()
 
 	sql := `DELETE FROM ppt_v2_save_log WHERE create_time<? `
 	err = global.DmSQL["rddp"].Exec(sql, date).Error

models/data_manage/report_save_log.go

@@ -3,9 +3,6 @@ package data_manage
 import "eta_gn/eta_task/global"
 
 func DeleteReportLogByDate(date string) (err error) {
-	//sql := `DELETE FROM report_save_log WHERE create_time<? `
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Raw(sql, date).Exec()
 
 	sql := `DELETE FROM report_save_log WHERE create_time<? `
 	err = global.DmSQL["rddp"].Exec(sql, date).Error

models/data_manage/trade_position_analysis.go

@@ -8,7 +8,6 @@ import (
 	"unsafe"
 )
 
-// 持仓榜单表
 type TradePositionTop struct {
 	Id            uint64    `gorm:"column:id;primaryKey"` //`orm:"column(id);pk"`
 	ClassifyName  string    //分类名称
@@ -49,14 +48,12 @@ type TradePositionGuangzhouTop struct {
 }
 
 func InsertMultiTradePositionTop(exchange string, items []*TradePositionTop) (err error) {
-	//o := orm.NewOrm()
 	if exchange == "dalian" {
 		list := make([]*TradePositionDalianTop, 0)
 		for _, v := range items {
 			tmp := (*TradePositionDalianTop)(unsafe.Pointer(v))
 			list = append(list, tmp)
 		}
-		//_, err = o.InsertMulti(len(list), list)
 		err = global.DEFAULT_DmSQL.CreateInBatches(list, utils.MultiAddNum).Error
 		return
 	} else if exchange == "zhengzhou" {
@@ -65,7 +62,6 @@ func InsertMultiTradePositionTop(exchange string, items []*TradePositionTop) (er
 			tmp := (*TradePositionZhengzhouTop)(unsafe.Pointer(v))
 			list = append(list, tmp)
 		}
-		//_, err = o.InsertMulti(len(list), list)
 		err = global.DEFAULT_DmSQL.CreateInBatches(list, utils.MultiAddNum).Error
 		return
 	} else if exchange == "cffex" {
@@ -74,7 +70,6 @@ func InsertMultiTradePositionTop(exchange string, items []*TradePositionTop) (er
 			tmp := (*TradePositionCffexTop)(unsafe.Pointer(v))
 			list = append(list, tmp)
 		}
-		//_, err = o.InsertMulti(len(list), list)
 		err = global.DEFAULT_DmSQL.CreateInBatches(list, utils.MultiAddNum).Error
 		return
 	} else if exchange == "shanghai" {
@@ -83,7 +78,6 @@ func InsertMultiTradePositionTop(exchange string, items []*TradePositionTop) (er
 			tmp := (*TradePositionShanghaiTop)(unsafe.Pointer(v))
 			list = append(list, tmp)
 		}
-		//_, err = o.InsertMulti(len(list), list)
 		err = global.DEFAULT_DmSQL.CreateInBatches(list, utils.MultiAddNum).Error
 		return
 	} else if exchange == "ine" {
@@ -92,7 +86,6 @@ func InsertMultiTradePositionTop(exchange string, items []*TradePositionTop) (er
 			tmp := (*TradePositionIneTop)(unsafe.Pointer(v))
 			list = append(list, tmp)
 		}
-		//_, err = o.InsertMulti(len(list), list)
 		err = global.DEFAULT_DmSQL.CreateInBatches(list, utils.MultiAddNum).Error
 		return
 	} else if exchange == "guangzhou" {
@@ -101,7 +94,6 @@ func InsertMultiTradePositionTop(exchange string, items []*TradePositionTop) (er
 			tmp := (*TradePositionGuangzhouTop)(unsafe.Pointer(v))
 			list = append(list, tmp)
 		}
-		//_, err = o.InsertMulti(len(list), list)
 		err = global.DEFAULT_DmSQL.CreateInBatches(list, utils.MultiAddNum).Error
 		return
 	}
@@ -110,9 +102,6 @@ func InsertMultiTradePositionTop(exchange string, items []*TradePositionTop) (er
 }
 
 func GetTradePositionTopByExchangeDataTime(exchange string, startDate, endDate string) (list []*TradePositionTop, err error) {
-	//o := orm.NewOrm()
-	//sql := "SELECT * FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (1,2) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc"
-	//_, err = o.Raw(sql, startDate, endDate).QueryRows(&list)
 
 	sql := "SELECT * FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (1,2) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc"
 	err = global.DEFAULT_DmSQL.Raw(sql, startDate, endDate).Find(&list).Error
@@ -120,9 +109,6 @@ func GetTradePositionTopByExchangeDataTime(exchange string, startDate, endDate s
 }
 
 func GetTradePositionTopByExchangeDataTimeByClassify(exchange string, startDate, endDate string, classifyNames, classifyTypes []string) (list []*TradePositionTop, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT * FROM trade_position_` + exchange + `_top where data_time >= ? and data_time <= ? and deal_type in (1,2) and classify_name in (` + utils.GetOrmInReplace(len(classifyNames)) + `)  and classify_type in (` + utils.GetOrmInReplace(len(classifyTypes)) + `) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc`
-	//_, err = o.Raw(sql, startDate, endDate, classifyNames, classifyTypes).QueryRows(&list)
 
 	sql := `SELECT * FROM trade_position_` + exchange + `_top where data_time >= ? and data_time <= ? and deal_type in (1,2) and classify_name in (` + utils.GetOrmInReplace(len(classifyNames)) + `)  and classify_type in (` + utils.GetOrmInReplace(len(classifyTypes)) + `) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc`
 	err = global.DEFAULT_DmSQL.Raw(sql, startDate, endDate, classifyNames, classifyTypes).Find(&list).Error
@@ -130,9 +116,6 @@ func GetTradePositionTopByExchangeDataTimeByClassify(exchange string, startDate,
 }
 
 func GetTradePositionTopCountByExchangeDataTime(exchange string, startDate, endDate string) (count int64, err error) {
-	//o := orm.NewOrm()
-	//sql := "SELECT count(*) FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (1,2) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc"
-	//err = o.Raw(sql, startDate, endDate).QueryRow(&count)
 
 	sql := "SELECT count(*) FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (1,2) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc"
 	err = global.DEFAULT_DmSQL.Raw(sql, startDate, endDate).Scan(&count).Error
@@ -140,9 +123,6 @@ func GetTradePositionTopCountByExchangeDataTime(exchange string, startDate, endD
 }
 
 func GetTradePositionTopByExchangeSourceType(exchange string, dataTime string, sourceType int) (list []*TradePositionTop, err error) {
-	//o := orm.NewOrm()
-	//sql := "SELECT * FROM trade_position_" + exchange + "_top where data_time= ? and source_type = ? ORDER BY classify_name, classify_type, deal_type, deal_value desc"
-	//_, err = o.Raw(sql, dataTime, sourceType).QueryRows(&list)
 
 	sql := "SELECT * FROM trade_position_" + exchange + "_top where data_time= ? and source_type = ? ORDER BY classify_name, classify_type, deal_type, deal_value desc"
 	err = global.DEFAULT_DmSQL.Raw(sql, dataTime, sourceType).Find(&list).Error
@@ -150,9 +130,6 @@ func GetTradePositionTopByExchangeSourceType(exchange string, dataTime string, s
 }
 
 func GetTradePositionTopByExchangeSourceTypeClassify(exchange string, dataTime string, sourceType int, classifyNames, classifyTypes []string) (list []*TradePositionTop, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT * FROM trade_position_` + exchange + `_top where data_time= ? and source_type = ? and classify_name in (` + utils.GetOrmInReplace(len(classifyNames)) + `)  and classify_type in (` + utils.GetOrmInReplace(len(classifyTypes)) + `) ORDER BY classify_name, classify_type, deal_type, deal_value desc`
-	//_, err = o.Raw(sql, dataTime, sourceType, classifyNames, classifyTypes).QueryRows(&list)
 
 	sql := `SELECT * FROM trade_position_` + exchange + `_top where data_time= ? and source_type = ? and classify_name in (` + utils.GetOrmInReplace(len(classifyNames)) + `)  and classify_type in (` + utils.GetOrmInReplace(len(classifyTypes)) + `) ORDER BY classify_name, classify_type, deal_type, deal_value desc`
 	err = global.DEFAULT_DmSQL.Raw(sql, dataTime, sourceType, classifyNames, classifyTypes).Find(&list).Error
@@ -202,20 +179,6 @@ type UpdateChangeVal struct {
 }
 
 func MultiUpdatePositionTop(exchange string, updates []UpdateDealValueChange) (err error) {
-	//o := orm.NewOrm()
-	//p, err := o.Raw("UPDATE trade_position_" + exchange + "_top SET deal_value=?, deal_change=?, source_type=?, modify_time=? WHERE id = ?").Prepare()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	_ = p.Close() // 别忘记关闭 statement
-	//}()
-	//for _, v := range updates {
-	//	_, err = p.Exec(v.DealValue, v.DealChange, v.SourceType, v.ModifyTime, v.Id)
-	//	if err != nil {
-	//		return
-	//	}
-	//}
 
 	sql := `"UPDATE trade_position_" + exchange + "_top SET deal_value=?, deal_change=?, source_type=?, modify_time=? WHERE id = ?"`
 	for _, v := range updates {
@@ -229,9 +192,6 @@ func MultiUpdatePositionTop(exchange string, updates []UpdateDealValueChange) (e
 }
 
 func DeletePositionTopByDataTime(exchange string, dataTime string, dealType int) (err error) {
-	//o := orm.NewOrm()
-	//sql := "delete from trade_position_" + exchange + "_top WHERE data_time=? and deal_type=?"
-	//_, err = o.Raw(sql, dataTime, dealType).Exec()
 
 	sql := "delete from trade_position_" + exchange + "_top WHERE data_time=? and deal_type=?"
 	err = global.DEFAULT_DmSQL.Exec(sql, dataTime, dealType).Error
@@ -239,9 +199,6 @@ func DeletePositionTopByDataTime(exchange string, dataTime string, dealType int)
 }
 
 func DeletePositionTopByDataTimeClassify(exchange string, dataTime string, dealType int, classifyNames, classifyTypes []string) (err error) {
-	//o := orm.NewOrm()
-	//sql := `delete from trade_position_` + exchange + `_top WHERE data_time=? and deal_type=? and classify_name in (` + utils.GetOrmInReplace(len(classifyNames)) + `)  and classify_type in (` + utils.GetOrmInReplace(len(classifyTypes)) + `)`
-	//_, err = o.Raw(sql, dataTime, dealType, classifyNames, classifyTypes).Exec()
 
 	sql := `delete from trade_position_` + exchange + `_top WHERE data_time=? and deal_type=? and classify_name in (` + utils.GetOrmInReplace(len(classifyNames)) + `)  and classify_type in (` + utils.GetOrmInReplace(len(classifyTypes)) + `)`
 	err = global.DEFAULT_DmSQL.Exec(sql, dataTime, dealType, classifyNames, classifyTypes).Error
@@ -249,9 +206,6 @@ func DeletePositionTopByDataTimeClassify(exchange string, dataTime string, dealT
 }
 
 func GetTradePositionTopByExchangeDataTimeType(exchange string, dataTime string, dealType int) (list []TradePositionTop, err error) {
-	//o := orm.NewOrm()
-	//sql := "select * from trade_position_" + exchange + "_top WHERE data_time=? and deal_type=?"
-	//_, err = o.Raw(sql, dataTime, dealType).QueryRows(&list)
 
 	sql := "select * from trade_position_" + exchange + "_top WHERE data_time=? and deal_type=?"
 	err = global.DEFAULT_DmSQL.Raw(sql, dataTime, dealType).Find(&list).Error
@@ -259,9 +213,6 @@ func GetTradePositionTopByExchangeDataTimeType(exchange string, dataTime string,
 }
 
 func GetTradePositionTopByExchangeDataTimeTypeClassify(exchange string, dataTime string, dealType int, classifyNames, classifyTypes []string) (list []TradePositionTop, err error) {
-	//o := orm.NewOrm()
-	//sql := `select * from trade_position_` + exchange + `_top WHERE data_time=? and deal_type=? and classify_name in (` + utils.GetOrmInReplace(len(classifyNames)) + `)  and classify_type in (` + utils.GetOrmInReplace(len(classifyTypes)) + `)`
-	//_, err = o.Raw(sql, dataTime, dealType, classifyNames, classifyTypes).QueryRows(&list)
 
 	sql := `select * from trade_position_` + exchange + `_top WHERE data_time=? and deal_type=? and classify_name in (` + utils.GetOrmInReplace(len(classifyNames)) + `)  and classify_type in (` + utils.GetOrmInReplace(len(classifyTypes)) + `)`
 	err = global.DEFAULT_DmSQL.Raw(sql, dataTime, dealType, classifyNames, classifyTypes).Find(&list).Error
@@ -269,17 +220,6 @@ func GetTradePositionTopByExchangeDataTimeTypeClassify(exchange string, dataTime
 }
 
 func MultiInsertTradeBaseDataToTop(exchange string, startDate, endDate string) (err error) {
-	//o := orm.NewOrm()
-	//now := time.Now().Format(utils.FormatDateTime)
-	//sql1 := "INSERT INTO trade_position_" + exchange + "_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,`rank`,create_time,modify_time) " +
-	//	"SELECT classify_name,classify_type,buy_short_name,buy_value,buy_change,data_time,1,0,`rank`,?,? FROM base_from_trade_" + exchange + "_index where `rank` <50 and buy_short_name !='' and buy_short_name !=' ' and data_time between ? and ?"
-	//_, err = o.Raw(sql1, now, now, startDate, endDate).Exec()
-	//if err != nil {
-	//	return
-	//}
-	//sql2 := "INSERT INTO trade_position_" + exchange + "_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,`rank`,create_time,modify_time) " +
-	//	"SELECT classify_name,classify_type,sold_short_name,sold_value,sold_change,data_time,2,0,`rank`,?,? FROM base_from_trade_" + exchange + "_index where `rank` <50 and sold_short_name !='' and sold_short_name !=' ' and data_time between ? and ?"
-	//_, err = o.Raw(sql2, now, now, startDate, endDate).Exec()
 
 	now := time.Now().Format(utils.FormatDateTime)
 	sql1 := "INSERT INTO trade_position_" + exchange + "_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,`rank`,create_time,modify_time) " +
@@ -295,17 +235,6 @@ func MultiInsertTradeBaseDataToTop(exchange string, startDate, endDate string) (
 }
 
 func MultiInsertTradeBaseDataToTopByClassify(exchange string, startDate, endDate string, classifyNames, classifyTypes []string) (err error) {
-	//o := orm.NewOrm()
-	//now := time.Now().Format(utils.FormatDateTime)
-	//sql1 := "INSERT INTO trade_position_" + exchange + "_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,`rank`,create_time,modify_time)" +
-	//	"SELECT classify_name,classify_type,buy_short_name,buy_value,buy_change,data_time,1,0,`rank`,?,? FROM base_from_trade_" + exchange + "_index where `rank` <50 and buy_short_name !='' and buy_short_name !=' ' and data_time between ? and ? and classify_name in (" + utils.GetOrmInReplace(len(classifyNames)) + ")  and classify_type in (" + utils.GetOrmInReplace(len(classifyTypes)) + ")"
-	//_, err = o.Raw(sql1, now, now, startDate, endDate, classifyNames, classifyTypes).Exec()
-	//if err != nil {
-	//	return
-	//}
-	//sql2 := "INSERT INTO trade_position_" + exchange + "_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,`rank`,create_time,modify_time)" +
-	//	"SELECT classify_name,classify_type,sold_short_name,sold_value,sold_change,data_time,2,0,`rank`,?,? FROM base_from_trade_" + exchange + "_index where `rank` <50 and sold_short_name !='' and sold_short_name !=' ' and data_time between ? and ? and classify_name in (" + utils.GetOrmInReplace(len(classifyNames)) + ")  and classify_type in (" + utils.GetOrmInReplace(len(classifyTypes)) + ")"
-	//_, err = o.Raw(sql2, now, now, startDate, endDate, classifyNames, classifyTypes).Exec()
 
 	now := time.Now().Format(utils.FormatDateTime)
 	sql1 := "INSERT INTO trade_position_" + exchange + "_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,`rank`,create_time,modify_time)" +
@@ -320,12 +249,7 @@ func MultiInsertTradeBaseDataToTopByClassify(exchange string, startDate, endDate
 	return
 }
 
-// GetTradePositionTopOriginDataTimes 获取榜单原始数据日期-正序
 func GetTradePositionTopOriginDataTimes(exchange string) (dates []string, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT DISTINCT data_time FROM base_from_trade_%s_index ORDER BY data_time ASC`
-	//sql = fmt.Sprintf(sql, exchange)
-	//_, err = o.Raw(sql).QueryRows(&dates)
 
 	sql := `SELECT DISTINCT data_time FROM base_from_trade_%s_index ORDER BY data_time ASC`
 	sql = fmt.Sprintf(sql, exchange)
@@ -333,7 +257,6 @@ func GetTradePositionTopOriginDataTimes(exchange string) (dates []string, err er
 	return
 }
 
-// BaseFromTradeClassify 交易所分类表
 type BaseFromTradeClassify struct {
 	Id           uint64    `gorm:"column:id;primaryKey"` // `orm:"column(id);pk"`
 	ClassifyName string    //分类名称
@@ -344,33 +267,22 @@ type BaseFromTradeClassify struct {
 	ModifyTime   time.Time //修改时间
 }
 
-// GetAllBaseFromTradeClassify 获取所有的交易所分类列表
 func GetAllBaseFromTradeClassify() (list []*BaseFromTradeClassify, err error) {
-	//sql := `SELECT * FROM base_from_trade_classify   `
-	//
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql).QueryRows(&list)
 
 	sql := `SELECT * FROM base_from_trade_classify   `
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error
 	return
 }
 
-// Update 更新
 func (m *BaseFromTradeClassify) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Select(cols).Updates(m).Error
 	return
 }
 
-// MultiAddBaseFromTradeClassify 批量插入交易所分类
 func MultiAddBaseFromTradeClassify(items []*BaseFromTradeClassify) (err error) {
 	if len(items) == 0 {
 		return
 	}
-	//o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
@@ -382,18 +294,7 @@ type TradeClassifyName struct {
 	ModifyTime   time.Time //数据最近的日期
 }
 
-// GetExchangeClassify 获取交易所分类列表
 func GetExchangeClassify(exchange string) (list []TradeClassifyName, err error) {
-	//tableName := "trade_position_" + exchange + "_top"
-	//orderStr := "classify_name DESC, classify_type asc"
-	//if exchange == "zhengzhou" {
-	//	orderStr = "classify_name asc"
-	//}
-	//sql := `SELECT classify_name, classify_type,MAX(data_time) as data_time,MAX(modify_time) as modify_time FROM ` + tableName + ` GROUP BY classify_name, classify_type  `
-	//sql += ` ORDER BY ` + orderStr
-	//
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql).QueryRows(&list)
 
 	tableName := "trade_position_" + exchange + "_top"
 	orderStr := "classify_name DESC, classify_type asc"
@@ -407,44 +308,21 @@ func GetExchangeClassify(exchange string) (list []TradeClassifyName, err error)
 	return
 }
 
-// GetTradePositionTopCleanByExchangeDataTime 根据时间查询净多单和净空单的值
 func GetTradePositionTopCleanByExchangeDataTime(exchange string, startDate, endDate string) (list []*TradePositionTop, err error) {
-	//o := orm.NewOrm()
-	//sql := "SELECT * FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (3,4) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc"
-	//_, err = o.Raw(sql, startDate, endDate).QueryRows(&list)
 
 	sql := "SELECT * FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (3,4) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc"
 	err = global.DEFAULT_DmSQL.Raw(sql, startDate, endDate).Find(&list).Error
 	return
 }
 
-// GetTradePositionTopCleanByExchangeDataTimeClassify 根据时间查询净多单和净空单的值
 func GetTradePositionTopCleanByExchangeDataTimeClassify(exchange string, startDate, endDate string, classifyNames, classifyTypes []string) (list []*TradePositionTop, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT * FROM trade_position_` + exchange + `_top where data_time >= ? and data_time <= ? and deal_type in (3,4) and classify_name in (` + utils.GetOrmInReplace(len(classifyNames)) + `)  and classify_type in (` + utils.GetOrmInReplace(len(classifyTypes)) + `) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc`
-	//_, err = o.Raw(sql, startDate, endDate, classifyNames, classifyTypes).QueryRows(&list)
 
 	sql := `SELECT * FROM trade_position_` + exchange + `_top where data_time >= ? and data_time <= ? and deal_type in (3,4) and classify_name in (` + utils.GetOrmInReplace(len(classifyNames)) + `)  and classify_type in (` + utils.GetOrmInReplace(len(classifyTypes)) + `) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc`
 	err = global.DEFAULT_DmSQL.Raw(sql, startDate, endDate, classifyNames, classifyTypes).Find(&list).Error
 	return
 }
 
-// MultiUpdatePositionTopChangeVal 批量更新榜单里变化量的值
 func MultiUpdatePositionTopChangeVal(exchange string, updates []UpdateChangeVal) (err error) {
-	//o := orm.NewOrm()
-	//p, err := o.Raw("UPDATE trade_position_" + exchange + "_top SET deal_change=?, modify_time=? WHERE id = ?").Prepare()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	_ = p.Close() // 别忘记关闭 statement
-	//}()
-	//for _, v := range updates {
-	//	_, err = p.Exec(v.DealChange, v.ModifyTime, v.Id)
-	//	if err != nil {
-	//		return
-	//	}
-	//}
 
 	sql := `"UPDATE trade_position_" + exchange + "_top SET deal_change=?, modify_time=? WHERE id = ?"`
 	for _, v := range updates {
@@ -458,9 +336,6 @@ func MultiUpdatePositionTopChangeVal(exchange string, updates []UpdateChangeVal)
 }
 
 func GetTradePositionOriginClassifyCountByExchangeDataTime(exchange string, startDate, endDate string) (count int64, err error) {
-	//o := orm.NewOrm()
-	//sql := "SELECT COUNT(DISTINCT classify_name, classify_type) FROM base_from_trade_" + exchange + "_index where `rank` <50 and (buy_short_name !='' or sold_short_name !='' ) and (buy_short_name !=' ' or sold_short_name !=' ' ) and data_time >= ? and data_time <= ?"
-	//err = o.Raw(sql, startDate, endDate).QueryRow(&count)
 
 	sql := "SELECT COUNT(DISTINCT classify_name, classify_type) FROM base_from_trade_" + exchange + "_index where `rank` <50 and (buy_short_name !='' or sold_short_name !='' ) and (buy_short_name !=' ' or sold_short_name !=' ' ) and data_time >= ? and data_time <= ?"
 	err = global.DEFAULT_DmSQL.Raw(sql, startDate, endDate).Scan(&count).Error
@@ -468,9 +343,6 @@ func GetTradePositionOriginClassifyCountByExchangeDataTime(exchange string, star
 }
 
 func GetTradePositionTopClassifyCountByExchangeDataTime(exchange string, startDate, endDate string) (count int64, err error) {
-	//o := orm.NewOrm()
-	//sql := "SELECT COUNT(DISTINCT classify_name, classify_type)  FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (1,2) "
-	//err = o.Raw(sql, startDate, endDate).QueryRow(&count)
 
 	sql := "SELECT COUNT(DISTINCT classify_name, classify_type)  FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (1,2) "
 	err = global.DEFAULT_DmSQL.Raw(sql, startDate, endDate).Scan(&count).Error
@@ -483,9 +355,6 @@ type TradePositionClassifyInfo struct {
 }
 
 func GetTradePositionOriginClassifyByExchangeDataTime(exchange string, startDate, endDate string) (list []TradePositionClassifyInfo, err error) {
-	//o := orm.NewOrm()
-	//sql := "SELECT DISTINCT classify_name, classify_type FROM base_from_trade_" + exchange + "_index where `rank` <50 and (buy_short_name !='' or sold_short_name !='' ) and (buy_short_name !=' ' or sold_short_name !=' ' ) and data_time >= ? and data_time <= ?"
-	//_, err = o.Raw(sql, startDate, endDate).QueryRows(&list)
 
 	sql := "SELECT DISTINCT classify_name, classify_type FROM base_from_trade_" + exchange + "_index where `rank` <50 and (buy_short_name !='' or sold_short_name !='' ) and (buy_short_name !=' ' or sold_short_name !=' ' ) and data_time >= ? and data_time <= ?"
 	err = global.DEFAULT_DmSQL.Raw(sql, startDate, endDate).Find(&list).Error
@@ -493,20 +362,13 @@ func GetTradePositionOriginClassifyByExchangeDataTime(exchange string, startDate
 }
 
 func GetTradePositionTopClassifyByExchangeDataTime(exchange string, startDate, endDate string) (list []TradePositionClassifyInfo, err error) {
-	//o := orm.NewOrm()
-	//sql := "SELECT DISTINCT classify_name, classify_type  FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (1,2) "
-	//_, err = o.Raw(sql, startDate, endDate).QueryRows(&list)
 
 	sql := "SELECT DISTINCT classify_name, classify_type  FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (1,2) "
 	err = global.DEFAULT_DmSQL.Raw(sql, startDate, endDate).Find(&list).Error
 	return
 }
 
-// DeleteTradePositionTopAllByExchangeDataTime 删除计算数据
 func DeleteTradePositionTopAllByExchangeDataTime(exchange string, startDate, endDate string) (err error) {
-	//o := orm.NewOrm()
-	//sql := "DELETE FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? "
-	//_, err = o.Raw(sql, startDate, endDate).Exec()
 
 	sql := "DELETE FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? "
 	err = global.DEFAULT_DmSQL.Exec(sql, startDate, endDate).Error
@@ -518,9 +380,6 @@ type GetFirstBaseFromTradeIndeDate struct {
 }
 
 func GetFirstBaseFromTradeIndexByDate(exchange string) (item *GetFirstBaseFromTradeIndeDate, err error) {
-	//o := orm.NewOrm()
-	//sql := "SELECT * FROM base_from_trade_" + exchange + "_index where `rank` < 50 order by data_time asc"
-	//err = o.Raw(sql).QueryRow(&item)
 
 	sql := "SELECT * FROM base_from_trade_" + exchange + "_index where `rank` < 50 order by data_time asc"
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&item).Error

models/data_manage/trade_position_analysis_guangzhou.go

@@ -7,72 +7,9 @@ import (
 )
 
 func MultiInsertTradeGuangzhouDataToTop(exchange string, startDate, endDate string) (err error) {
-	//	o := orm.NewOrm()
-	//	now := time.Now().Format(utils.FormatDateTime)
-	//
-	//	//新增买单榜单
-	//	sql1 := `INSERT INTO trade_position_guangzhou_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,rank,create_time,modify_time)
-	//SELECT
-	//	n.classify_code,n.contract,SUBSTRING_INDEX(c.index_name, '_', 1) AS index_name,a.value,a.qty_sub,a.data_time,1,0,0,?,?
-	//FROM
-	//	base_from_trade_guangzhou_data a
-	//	LEFT JOIN base_from_trade_guangzhou_index c ON a.base_from_trade_guangzhou_index_id = c.base_from_trade_guangzhou_index_id
-	//	LEFT JOIN base_from_trade_guangzhou_contract n on c.base_from_trade_guangzhou_contract_id = n.base_from_trade_guangzhou_contract_id
-	//WHERE
-	//	a.data_time between ? and ?
-	//	and c.base_from_trade_guangzhou_classify_id in (7,8)
-	//	and c.index_name like "%持买单量%"
-	//	and c.index_name not like "%日成交持仓排名%"`
-	//	_, err = o.Raw(sql1, now, now, startDate, endDate).Exec()
-	//	if err != nil {
-	//		return
-	//	}
-	//	//新增卖单榜单
-	//	sql2 := `INSERT INTO trade_position_guangzhou_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,rank,create_time,modify_time)
-	//SELECT
-	//	n.classify_code,n.contract,SUBSTRING_INDEX(c.index_name, '_', 1) AS index_name,a.value,a.qty_sub,a.data_time,2,0,0,?,?
-	//FROM
-	//	base_from_trade_guangzhou_data a
-	//	LEFT JOIN base_from_trade_guangzhou_index c ON a.base_from_trade_guangzhou_index_id = c.base_from_trade_guangzhou_index_id
-	//	LEFT JOIN base_from_trade_guangzhou_contract n on c.base_from_trade_guangzhou_contract_id = n.base_from_trade_guangzhou_contract_id
-	//WHERE
-	//	a.data_time between ? and ?
-	//	and c.base_from_trade_guangzhou_classify_id in (7,8)
-	//	and c.index_name like "%持卖单量%"
-	//	and c.index_name not like "%日成交持仓排名%"`
-	//	_, err = o.Raw(sql2, now, now, startDate, endDate).Exec()
-	//	if err != nil {
-	//		return
-	//	}
-	//	//更新买单、卖单榜单排名字段
-	//	sql3 := `update trade_position_guangzhou_top s
-	//JOIN (
-	//SELECT
-	//  	classify_type,
-	//	deal_short_name,
-	//	data_time,
-	//	deal_type,
-	//  (@row_number := IF(@prev_year = CONCAT_WS( "_", data_time, deal_type, classify_type), @row_number + 1, 1) ) AS row_number,
-	//  @prev_year := CONCAT_WS( "_", data_time, deal_type, classify_type)
-	//FROM
-	//  trade_position_guangzhou_top,(SELECT @row_number := 0, @prev_year := NULL) r
-	//	where data_time between ? and ?
-	//ORDER BY
-	//  data_time asc,
-	//  deal_type asc,
-	//  classify_type asc,
-	//  deal_value DESC
-	//	) t
-	//	ON s.classify_type = t.classify_type AND s.deal_short_name = t.deal_short_name
-	//	AND s.data_time = t.data_time AND s.deal_type = t.deal_type
-	//SET s.rank = t.row_number where s.data_time between ? and ?;`
-	//
-	//	_, err = o.Raw(sql3, startDate, endDate, startDate, endDate).Exec()
 
-	//o := orm.NewOrm()
 	now := time.Now().Format(utils.FormatDateTime)
 
-	//新增买单榜单
 	sql1 := `INSERT INTO trade_position_guangzhou_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,rank,create_time,modify_time)
 	SELECT
 		n.classify_code,n.contract,SUBSTRING_INDEX(c.index_name, '_', 1) AS index_name,a.value,a.qty_sub,a.data_time,1,0,0,?,?
@@ -89,7 +26,6 @@ func MultiInsertTradeGuangzhouDataToTop(exchange string, startDate, endDate stri
 	if err != nil {
 		return
 	}
-	//新增卖单榜单
 	sql2 := `INSERT INTO trade_position_guangzhou_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,rank,create_time,modify_time)
 	SELECT
 		n.classify_code,n.contract,SUBSTRING_INDEX(c.index_name, '_', 1) AS index_name,a.value,a.qty_sub,a.data_time,2,0,0,?,?
@@ -106,7 +42,6 @@ func MultiInsertTradeGuangzhouDataToTop(exchange string, startDate, endDate stri
 	if err != nil {
 		return
 	}
-	//更新买单、卖单榜单排名字段
 	sql3 := `update trade_position_guangzhou_top s
 	JOIN (
 	SELECT
@@ -133,21 +68,7 @@ func MultiInsertTradeGuangzhouDataToTop(exchange string, startDate, endDate stri
 	return
 }
 
-// GetTradePositionTopOriginGuangzhouDataTimes 获取榜单原始数据日期-正序
 func GetTradePositionTopOriginGuangzhouDataTimes(exchange string) (dates []string, err error) {
-	//	o := orm.NewOrm()
-	//	sql := `SELECT
-	//	DISTINCT a.data_time
-	//FROM
-	//	base_from_trade_guangzhou_data a
-	//	LEFT JOIN base_from_trade_guangzhou_index c ON a.base_from_trade_guangzhou_index_id = c.base_from_trade_guangzhou_index_id
-	//WHERE
-	//    c.base_from_trade_guangzhou_classify_id IN ( 7, 8 )
-	//	AND ( c.index_name LIKE "%持买单量%" OR c.index_name LIKE "%持卖单量%" )
-	//	AND c.index_name NOT LIKE "%日成交持仓排名%"
-	//ORDER BY
-	//	a.data_time asc`
-	//	_, err = o.Raw(sql).QueryRows(&dates)
 
 	sql := `SELECT
 		DISTINCT a.data_time
@@ -165,21 +86,6 @@ func GetTradePositionTopOriginGuangzhouDataTimes(exchange string) (dates []strin
 }
 
 func GetTradePositionOriginGuangzhouClassifyCountByExchangeDataTime(exchange string, startDate, endDate string) (count int64, err error) {
-	//	o := orm.NewOrm()
-	//	sql := `SELECT
-	//	count(DISTINCT n.classify_code, n.contract )
-	//FROM
-	//	base_from_trade_guangzhou_data a
-	//	LEFT JOIN base_from_trade_guangzhou_index c ON a.base_from_trade_guangzhou_index_id = c.base_from_trade_guangzhou_index_id
-	//	LEFT JOIN base_from_trade_guangzhou_contract n ON c.base_from_trade_guangzhou_contract_id = n.base_from_trade_guangzhou_contract_id
-	//WHERE
-	//	a.data_time between ? and ?
-	//	AND c.base_from_trade_guangzhou_classify_id IN ( 7, 8 )
-	//	AND ( c.index_name LIKE "%持买单量%" OR c.index_name LIKE "%持卖单量%" )
-	//	AND c.index_name NOT LIKE "%日成交持仓排名%"
-	//ORDER BY
-	//	a.value DESC`
-	//	err = o.Raw(sql, startDate, endDate).QueryRow(&count)
 
 	sql := `SELECT
 		count(DISTINCT n.classify_code, n.contract )
@@ -199,19 +105,6 @@ func GetTradePositionOriginGuangzhouClassifyCountByExchangeDataTime(exchange str
 }
 
 func GetFirstBaseFromTradeGuangzhouIndexByDate(exchange string) (item *GetFirstBaseFromTradeIndeDate, err error) {
-	//	o := orm.NewOrm()
-	//	sql := `SELECT
-	//	a.data_time
-	//FROM
-	//	base_from_trade_guangzhou_data a
-	//	LEFT JOIN base_from_trade_guangzhou_index c ON a.base_from_trade_guangzhou_index_id = c.base_from_trade_guangzhou_index_id
-	//WHERE
-	//	c.base_from_trade_guangzhou_classify_id IN ( 7, 8 )
-	//	AND ( c.index_name LIKE "%持买单量%" OR c.index_name LIKE "%持卖单量%" )
-	//	AND c.index_name NOT LIKE "%日成交持仓排名%"
-	//ORDER BY
-	//	a.data_time asc`
-	//	err = o.Raw(sql).QueryRow(&item)
 
 	sql := `SELECT
 		a.data_time
@@ -229,9 +122,6 @@ func GetFirstBaseFromTradeGuangzhouIndexByDate(exchange string) (item *GetFirstB
 }
 
 func GetTradePositionOriginClassifyGuangzhouByExchangeDataTime(exchange, startDate, endDate string) (list []TradePositionClassifyInfo, err error) {
-	//o := orm.NewOrm()
-	//sql := `SELECT DISTINCT classify_code as classify_name, contract as classify_type FROM base_from_trade_guangzhou_contract where  trade_date >= ? and trade_date <= ?`
-	//_, err = o.Raw(sql, startDate, endDate).QueryRows(&list)
 
 	sql := `SELECT DISTINCT classify_code as classify_name, contract as classify_type FROM base_from_trade_guangzhou_contract where  trade_date >= ? and trade_date <= ?`
 	err = global.DEFAULT_DmSQL.Raw(sql, startDate, endDate).Find(&list).Error
@@ -239,73 +129,9 @@ func GetTradePositionOriginClassifyGuangzhouByExchangeDataTime(exchange, startDa
 }
 
 func MultiInsertTradeBaseDataToTopGuangzhouByClassify(exchange string, startDate, endDate string, classifyNames, classifyTypes []string) (err error) {
-	//	o := orm.NewOrm()
-	//	now := time.Now().Format(utils.FormatDateTime)
-	//
-	//	//新增买单榜单
-	//	sql1 := `INSERT INTO trade_position_guangzhou_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,rank,create_time,modify_time)
-	//SELECT
-	//	n.classify_code,n.contract,SUBSTRING_INDEX(c.index_name, '_', 1) AS index_name,a.value,a.qty_sub,a.data_time,1,0,0,?,?
-	//FROM
-	//	base_from_trade_guangzhou_data a
-	//	LEFT JOIN base_from_trade_guangzhou_index c ON a.base_from_trade_guangzhou_index_id = c.base_from_trade_guangzhou_index_id
-	//	LEFT JOIN base_from_trade_guangzhou_contract n on c.base_from_trade_guangzhou_contract_id = n.base_from_trade_guangzhou_contract_id
-	//WHERE
-	//	a.data_time between ? and ?
-	//	and c.base_from_trade_guangzhou_classify_id in (7,8)
-	//    and n.classify_code in (` + utils.GetOrmInReplace(len(classifyNames)) + `) and n.contract in (` + utils.GetOrmInReplace(len(classifyTypes)) + `)
-	//	and c.index_name like "%持买单量%"
-	//	and c.index_name not like "%日成交持仓排名%"`
-	//	_, err = o.Raw(sql1, now, now, startDate, endDate, classifyNames, classifyTypes).Exec()
-	//	if err != nil {
-	//		return
-	//	}
-	//	//新增卖单榜单
-	//	sql2 := `INSERT INTO trade_position_guangzhou_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,rank,create_time,modify_time)
-	//SELECT
-	//	n.classify_code,n.contract,SUBSTRING_INDEX(c.index_name, '_', 1) AS index_name,a.value,a.qty_sub,a.data_time,2,0,0,?,?
-	//FROM
-	//	base_from_trade_guangzhou_data a
-	//	LEFT JOIN base_from_trade_guangzhou_index c ON a.base_from_trade_guangzhou_index_id = c.base_from_trade_guangzhou_index_id
-	//	LEFT JOIN base_from_trade_guangzhou_contract n on c.base_from_trade_guangzhou_contract_id = n.base_from_trade_guangzhou_contract_id
-	//WHERE
-	//	a.data_time between ? and ?
-	//	and c.base_from_trade_guangzhou_classify_id in (7,8)
-	//  	and n.classify_code in (` + utils.GetOrmInReplace(len(classifyNames)) + `) and n.contract in (` + utils.GetOrmInReplace(len(classifyTypes)) + `)
-	//	and c.index_name like "%持卖单量%"
-	//	and c.index_name not like "%日成交持仓排名%"`
-	//	_, err = o.Raw(sql2, now, now, startDate, endDate, classifyNames, classifyTypes).Exec()
-	//	if err != nil {
-	//		return
-	//	}
-	//	//更新买单、卖单榜单排名字段
-	//	sql3 := `update trade_position_guangzhou_top s
-	//JOIN (
-	//SELECT
-	//  	classify_type,
-	//	deal_short_name,
-	//	data_time,
-	//	deal_type,
-	//  (@row_number := IF(@prev_year = CONCAT_WS( "_", data_time, deal_type, classify_type), @row_number + 1, 1) ) AS row_number,
-	//  @prev_year := CONCAT_WS( "_", data_time, deal_type, classify_type)
-	//FROM
-	//  trade_position_guangzhou_top,(SELECT @row_number := 0, @prev_year := NULL) r
-	//	where data_time between ? and ? and classify_type in (` + utils.GetOrmInReplace(len(classifyTypes)) + `)
-	//ORDER BY
-	//  data_time asc,
-	//  deal_type asc,
-	//  classify_type asc,
-	//  deal_value DESC
-	//	) t
-	//	ON s.classify_type = t.classify_type AND s.deal_short_name = t.deal_short_name
-	//	AND s.data_time = t.data_time AND s.deal_type = t.deal_type
-	//SET s.rank = t.row_number where s.data_time between ? and ? and s.classify_type in (` + utils.GetOrmInReplace(len(classifyTypes)) + `);`
-	//
-	//	_, err = o.Raw(sql3, startDate, endDate, classifyTypes, startDate, endDate, classifyTypes).Exec()
 
 	now := time.Now().Format(utils.FormatDateTime)
 
-	//新增买单榜单
 	sql1 := `INSERT INTO trade_position_guangzhou_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,rank,create_time,modify_time)
 	SELECT
 		n.classify_code,n.contract,SUBSTRING_INDEX(c.index_name, '_', 1) AS index_name,a.value,a.qty_sub,a.data_time,1,0,0,?,?
@@ -323,7 +149,6 @@ func MultiInsertTradeBaseDataToTopGuangzhouByClassify(exchange string, startDate
 	if err != nil {
 		return
 	}
-	//新增卖单榜单
 	sql2 := `INSERT INTO trade_position_guangzhou_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,rank,create_time,modify_time)
 	SELECT
 		n.classify_code,n.contract,SUBSTRING_INDEX(c.index_name, '_', 1) AS index_name,a.value,a.qty_sub,a.data_time,2,0,0,?,?
@@ -341,7 +166,6 @@ func MultiInsertTradeBaseDataToTopGuangzhouByClassify(exchange string, startDate
 	if err != nil {
 		return
 	}
-	//更新买单、卖单榜单排名字段
 	sql3 := `update trade_position_guangzhou_top s
 	JOIN (
 	SELECT

models/data_manage/user_record.go

@@ -1,16 +1,2 @@
 package data_manage
 
-//func GetUnSubUserOpenid(openIdstr string) (items []string, err error){
-//	sql := `SELECT open_id FROM user_record
-//          WHERE open_id IS NOT NULL AND subscribe=0 AND create_platform=1 `
-//	sql += ` AND open_id in (` + openIdstr + `) `
-//	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
-//	return
-//}
-//
-//func UpdateSubStatus(unSubIds string) (err error){
-//	sql := "UPDATE user_record SET subscribe=1,subscribe_time=NOW() WHERE create_platform=1 "
-//	sql += ` AND open_id in (` + unSubIds + `) `
-//	_, err = orm.NewOrm().Raw(sql).Exec()
-//	return
-//}

models/db.go

@@ -71,31 +71,22 @@ func initback() {
 	orm.Debug = true
 	orm.DebugLog = orm.NewLog(utils.Binlog)
 
-	// 注册Edb指标 数据表
 	initEdbDataTable()
 
-	// 注册商品期货 相关数据表
 	initFutureGoodEdbDataTable()
 
-	//注册持仓分析 数据表
 	initTradePositionTop()
 
-	// 研报数据表
 	initReport()
 
-	// 智能研报数据表
 	initSmartReport()
 
-	// 初始化指标刷新
 	initEdbRefresh()
 
-	// 初始化部分数据表变量(直接init会有顺序问题=_=!)
 	data_manage.InitEdbSourceVar()
 }
 
-// initEdbDataTable 注册Edb指标 数据表
 func initEdbDataTable() {
-	//注册对象
 	orm.RegisterModel(
 		new(data_manage.EdbInfoCalculateMapping),
 		new(data_manage.EdbInfo),                   //hz_data库的edb_info表
@@ -105,17 +96,13 @@ func initEdbDataTable() {
 	)
 }
 
-// initFutureGoodEdbDataTable 注册商品期货Edb指标 数据表
 func initFutureGoodEdbDataTable() {
-	//注册对象
 	orm.RegisterModel(
 		new(future_good.FutureGoodEdbInfo),
 	)
 }
 
-// initTradePositionTop 注册持仓分析 数据表
 func initTradePositionTop() {
-	//注册对象
 	orm.RegisterModel(
 		new(data_manage.TradePositionDalianTop),
 		new(data_manage.TradePositionZhengzhouTop),
@@ -127,7 +114,6 @@ func initTradePositionTop() {
 	)
 }
 
-// initReport 注册研报数据表
 func initReport() {
 	orm.RegisterModel(
 		new(Report),
@@ -136,7 +122,6 @@ func initReport() {
 	)
 }
 
-// initSmartReport 注册智能研报数据表
 func initSmartReport() {
 	orm.RegisterModel(
 		new(SmartReport),
@@ -144,7 +129,6 @@ func initSmartReport() {
 	)
 }
 
-// initEdbRefresh 初始化指标刷新
 func initEdbRefresh() {
 	orm.RegisterModel(
 		new(edb_refresh.EdbRefreshSource),        // 刷新的数据源表
@@ -154,9 +138,6 @@ func initEdbRefresh() {
 	)
 }
 
-// AfterInitTable
-// @Description: 系统初始化后的数据操作
 func AfterInitTable() {
-	// 初始化部分数据表变量(直接init会有顺序问题=_=!)
 	data_manage.InitEdbSourceVar()
 }

models/edbinfo_send_msg_record.go

@@ -13,15 +13,7 @@ type EdbinfoSendMsgRecord struct {
 }
 
 func AddEdbinfoSendMsgRecord(item *EdbinfoSendMsgRecord) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Insert(item)
 	err = global.DmSQL["rddp"].Create(item).Error
 	return err
 }
 
-//func GetEdbinfoSendMsgCount(userId int, tradeCode string) (count int, err error) {
-//	o := orm.NewOrmUsingDB("rddp")
-//	sql := `SELECT COUNT(1) AS count FROM edbinfo_send_msg_record WHERE user_id=? AND trade_code=? AND create_time=DATE(NOW()) `
-//	err = o.Raw(sql, userId, tradeCode).QueryRow(&count)
-//	return
-//}

models/english_report.go

@@ -89,22 +89,14 @@ type ElasticEnglishReportDetail struct {
 	Overview           string `description:"英文概述部分"`
 }
 
-// GetPrePublishedEnglishReports 获取定时发布时间为当前时间的未发布的英文报告列表
 func GetPrePublishedEnglishReports(startTime, endTime, afterDate string) (list []*EnglishReport, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := `SELECT * FROM english_report WHERE state = 1 and pre_publish_time >= ? and pre_publish_time <= ? and modify_time >= ?`
-	//_, err = o.Raw(sql, startTime, endTime, afterDate).QueryRows(&list)
 
 	sql := `SELECT * FROM english_report WHERE state = 1 and pre_publish_time >= ? and pre_publish_time <= ? and modify_time >= ?`
 	err = global.DmSQL["rddp"].Raw(sql, startTime, endTime, afterDate).Find(&list).Error
 	return
 }
 
-// PublishEnglishReportById 发布报告
 func PublishEnglishReportById(reportId int, publishTime string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := `UPDATE english_report SET state=2, publish_time=?, modify_time=NOW() WHERE id = ? `
-	//_, err = o.Raw(sql, publishTime, reportId).Exec()
 
 	sql := `UPDATE english_report SET state=2, publish_time=?, modify_time=NOW() WHERE id = ? `
 	err = global.DmSQL["rddp"].Exec(sql, publishTime, reportId).Error
@@ -112,30 +104,20 @@ func PublishEnglishReportById(reportId int, publishTime string) (err error) {
 }
 
 func GetEnglishReportById(reportId int) (item *EnglishReportDetail, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := `SELECT * FROM english_report WHERE id=?`
-	//err = o.Raw(sql, reportId).QueryRow(&item)
 
 	sql := `SELECT * FROM english_report WHERE id=?`
 	err = global.DmSQL["rddp"].Raw(sql, reportId).First(&item).Error
 	return
 }
 
-// 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)
 
 	sql := `SELECT * FROM report WHERE id = ?`
 	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&item).Error
 	return
 }
 
-// Update 更新
 func (item *EnglishReport) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(item, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(item).Error
 	return
 }

models/fe_calendar/fe_calendar_matter.go

@@ -13,7 +13,6 @@ const (
 	MatterTypePredict = 3 // 事项类型-预测指标
 )
 
-// FeCalendarMatter 外汇日历-事项表
 type FeCalendarMatter struct {
 	FeCalendarMatterId  int       `gorm:"column:fe_calendar_matter_id;primaryKey"` // `orm:"column(fe_calendar_matter_id);pk" description:"事项ID"`
 	ChartPermissionId   int       `description:"品种ID"`
@@ -84,13 +83,6 @@ func (m *FeCalendarMatter) PrimaryId() string {
 }
 
 func (m *FeCalendarMatter) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FeCalendarMatter, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//order := ``
-	//if orderRule != "" {
-	//	order = ` ORDER BY ` + orderRule
-	//}
-	//sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	//err = o.Raw(sql, pars).QueryRow(&item)
 
 	order := ``
 	if orderRule != "" {
@@ -102,9 +94,6 @@ func (m *FeCalendarMatter) GetItemByCondition(condition string, pars []interface
 }
 
 func (m *FeCalendarMatter) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	//err = o.Raw(sql, pars).QueryRow(&count)
 
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
@@ -112,17 +101,6 @@ func (m *FeCalendarMatter) GetCountByCondition(condition string, pars []interfac
 }
 
 func (m *FeCalendarMatter) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FeCalendarMatter, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//fields := strings.Join(fieldArr, ",")
-	//if len(fieldArr) == 0 {
-	//	fields = `*`
-	//}
-	//order := fmt.Sprintf(`ORDER BY %s DESC`, FeCalendarMatterCols.CreateTime)
-	//if orderRule != "" {
-	//	order = ` ORDER BY ` + orderRule
-	//}
-	//sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {

models/index_notice.go

@@ -5,7 +5,6 @@ import (
 	"time"
 )
 
-//数据录入
 
 type EdbInfo struct {
 	UserId     int
@@ -15,11 +14,7 @@ type EdbInfo struct {
 	TradeCode  string `orm:"column(TRADE_CODE);" description:"指标编码"`
 }
 
-// GetEdbInfoByFrequencyNotDay 获取频度非日度 且 提醒时间不为空 的指标数据
 func GetEdbInfoByFrequencyNotDay() (items []*EdbInfo, err error) {
-	//sql := `SELECT * FROM edbinfo WHERE frequency!="日度" AND notice_time<>'' and user_id>0 `
-	//o := orm.NewOrmUsingDB("edb")
-	//_, err = o.Raw(sql).QueryRows(&items)
 
 	sql := `SELECT * FROM edbinfo WHERE frequency!="日度" AND notice_time<>'' and user_id>0 `
 	err = global.DmSQL["edb"].Raw(sql).Find(&items).Error
@@ -33,11 +28,7 @@ type Edbdata struct {
 	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`
 }
 
-// GetLastEdbdataInfo 根据指标编号获取指标最近的一条数据
 func GetLastEdbdataInfo(tradeCode string) (item *Edbdata, err error) {
-	//sql := `SELECT * FROM edbdata WHERE TRADE_CODE=? order by DT desc `
-	//o := orm.NewOrmUsingDB("edb")
-	//err = o.Raw(sql, tradeCode).QueryRow(&item)
 
 	sql := `SELECT * FROM edbdata WHERE TRADE_CODE=? order by DT desc `
 	err = global.DmSQL["data"].Raw(sql, tradeCode).Find(&item).Error

models/report.go

@@ -37,71 +37,15 @@ type Report struct {
 	ClassifyNameThird  string `description:"三级分类名称"`
 }
 
-//
-//func GetReportById(reportId int) (item *ReportDetail, err error) {
-//	o := orm.NewOrmUsingDB("rddp")
-//	sql := `SELECT * FROM report WHERE id=?`
-//	err = o.Raw(sql, reportId).QueryRow(&item)
-//	return
-//}
-//
-//func GetReport() (items []*Report, err error) {
-//	sql := `SELECT * FROM report ORDER BY id ASC `
-//	o := orm.NewOrmUsingDB("rddp")
-//	_, err = o.Raw(sql).QueryRows(&items)
-//	return
-//}
-//
-//func ModifyReportContentSub(id int, contentSub string) (err error) {
-//	sql := `UPDATE report SET content_sub=? WHERE id=? `
-//	o := orm.NewOrmUsingDB("rddp")
-//	_, err = o.Raw(sql, contentSub, id).Exec()
-//	return
-//}
-//
-//func GetReportLimit() (items []*Report, err error) {
-//	sql := `SELECT * FROM report WHERE state=2 ORDER BY id DESC LIMIT 50 `
-//	o := orm.NewOrmUsingDB("rddp")
-//	_, err = o.Raw(sql).QueryRows(&items)
-//	return
-//}
-//
-//func EditReportContent(reportId int, content, contentSub string) (err error) {
-//	o := orm.NewOrmUsingDB("rddp")
-//	sql := ` UPDATE report SET content=?,content_sub=?,modify_time=NOW() WHERE id=? `
-//	_, err = o.Raw(sql, content, contentSub, reportId).Exec()
-//	return
-//}
-//
-//// 删除报告日志记录-保留3个月
-//func DeleteReportSaveLog() {
-//	startDateTime := time.Now().AddDate(0, -3, 0).Format(utils.FormatDateTime)
-//	fmt.Println(startDateTime)
-//}
-//
-//func EditReportContentHtml(reportId int, content string) (err error) {
-//	o := orm.NewOrmUsingDB("rddp")
-//	sql := ` UPDATE report SET content=?,modify_time=NOW() WHERE id=? `
-//	_, err = o.Raw(sql, content, reportId).Exec()
-//	return
-//}
-
-// GetPrePublishedReports 获取定时发布时间为当前时间的未发布的报告列表
+
 func GetPrePublishedReports(startTime, endTime, afterDate string) (list []*Report, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := `SELECT * FROM report WHERE state = 1 and pre_publish_time >= ? and pre_publish_time <=? and modify_time >= ?`
-	//_, err = o.Raw(sql, startTime, endTime, afterDate).QueryRows(&list)
 
 	sql := `SELECT * FROM report WHERE state = 1 and pre_publish_time >= ? and pre_publish_time <=? and modify_time >= ?`
 	err = global.DmSQL["rddp"].Raw(sql, startTime, endTime, afterDate).Find(&list).Error
 	return
 }
 
-// PublishReportById 发布报告
 func PublishReportById(reportId int, publishTime time.Time) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := `UPDATE report SET state = 2, publish_time = ?, modify_time = NOW() WHERE id = ? `
-	//_, err = o.Raw(sql, publishTime, reportId).Exec()
 
 	sql := `UPDATE report SET state = 2, publish_time = ?, modify_time = NOW() WHERE id = ? `
 	err = global.DmSQL["rddp"].Exec(sql, publishTime, reportId).Error
@@ -138,9 +82,6 @@ type ReportDetail struct {
 }
 
 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()
 
 	sql := `UPDATE report SET video_url=?,video_name=?,video_play_seconds=?,video_size=? WHERE id=? `
 	err = global.DmSQL["rddp"].Exec(sql, videoUrl, videoName, playSeconds, videoSize, reportId).Error
@@ -157,14 +98,6 @@ type ReportChapterTypePermission struct {
 	CreatedTime           time.Time `description:"创建时间"`
 }
 
-//
-//// GetChapterTypePermissionByTypeIdAndResearchType 根据章节类型ID及研报类型获取章节类型权限列表
-//func GetChapterTypePermissionByTypeIdAndResearchType(typeId int, researchType string) (list []*ReportChapterTypePermission, err error) {
-//	o := orm.NewOrm()
-//	sql := ` SELECT * FROM report_chapter_type_permission WHERE report_chapter_type_id = ? AND research_type = ? ORDER BY chart_permission_id ASC `
-//	_, err = o.Raw(sql, typeId, researchType).QueryRows(&list)
-//	return
-//}
 
 type ElasticReportDetail struct {
 	ReportId           int    `description:"报告ID"`
@@ -191,9 +124,6 @@ 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.`from` = ? AND a.classify_id = ? "
-	//_, err = o.Raw(sql, source, classifyId).QueryRows(&list)
 
 	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.`from` = ? AND a.classify_id = ? "
 	err = global.DmSQL["rddp"].Raw(sql, source, classifyId).Find(&list).Error
@@ -201,37 +131,18 @@ func GetChartPermissionNameFromMappingByKeyword(source string, classifyId int) (
 }
 
 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()
-	//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()
 
 	sql1 := ` UPDATE report SET publish_time = NOW() WHERE id = ?  `
 	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 = 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()
-	//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()
 
 	sql1 := ` UPDATE report_chapter SET publish_time = NOW() WHERE report_id = ? `
 	err = global.DmSQL["rddp"].Exec(sql1, reportId).Error
@@ -239,47 +150,26 @@ func UpdateReportChapterPublishTime(reportId int, videoNameDate string) (err err
 		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 = global.DmSQL["rddp"].Exec(sql2, reportId).Error
 	return
 }
 
 func ModifyReportMsgIsSend(reportId int) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := `UPDATE report SET msg_is_send = 1, msg_send_time=NOW()  WHERE id = ? and msg_is_send=0`
-	//_, err = o.Raw(sql, reportId).Exec()
 
 	sql := `UPDATE report SET msg_is_send = 1, msg_send_time=NOW()  WHERE id = ? and msg_is_send=0`
 	err = global.DmSQL["rddp"].Exec(sql, reportId).Error
 	return
 }
 
-// ClearReportSaveLog 清理报告保存日志
 func ClearReportSaveLog(date string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := `DELETE FROM report_save_log WHERE create_time <= ?`
-	//_, err = o.Raw(sql, date).Exec()
 
 	sql := `DELETE FROM report_save_log WHERE create_time <= ?`
 	err = global.DmSQL["rddp"].Exec(sql, date).Error
 	return
 }
 
-// PublishReportAndChapter 发布报告及章节
 func PublishReportAndChapter(reportInfo *Report, isPublishReport bool, cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
 
 	to := global.DmSQL["rddp"].Begin()
 
@@ -291,7 +181,6 @@ func PublishReportAndChapter(reportInfo *Report, isPublishReport bool, cols []st
 		}
 	}()
 
-	// 更新报告
 	if isPublishReport {
 		err = to.Select(cols).Updates(reportInfo).Error
 		if err != nil {
@@ -299,23 +188,11 @@ 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()
 
 	sql := ` UPDATE report_chapter SET publish_state = 2, publish_time = ? WHERE report_id = ?  `
 	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
 }

models/report/report_chapter_permission_mapping.go

@@ -6,8 +6,6 @@ import (
 	"time"
 )
 
-// ReportChapterPermissionMapping
-// @Description: 报告章节的权限关系表
 type ReportChapterPermissionMapping struct {
 	ReportChapterPermissionMappingId int `orm:"column(report_chapter_permission_mapping_id)"`
 	ReportChapterId                  int `description:"报告章节的id"` // 报告章节的id
@@ -15,27 +13,7 @@ type ReportChapterPermissionMapping struct {
 	CreateTime                       time.Time
 }
 
-// MultiAddReportChapterPermissionMappingPermission
-// @Description: 批量添加报告品种权限用户
-// @author: Roc
-// @receiver m
-// @datetime 2024-06-04 15:36:02
-// @param reportChapterId int
-// @param list []*ReportChapterPermissionMapping
-// @return err error
 func (m ReportChapterPermissionMapping) MultiAddReportChapterPermissionMappingPermission(reportChapterId int, list []*ReportChapterPermissionMapping) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
 	to := global.DmSQL["rddp"].Begin()
 
 	defer func() {
@@ -51,13 +29,7 @@ func (m ReportChapterPermissionMapping) MultiAddReportChapterPermissionMappingPe
 		return
 	}
 
-	// 新增品种权限记录
 	if len(list) > 0 {
-		//_, tmpErr := to.InsertMulti(500, list)
-		//if tmpErr != nil {
-		//	err = tmpErr
-		//	return
-		//}
 
 		tmpErr := to.CreateInBatches(list, utils.MultiAddNum).Error
 		if tmpErr != nil {
@@ -69,26 +41,13 @@ func (m ReportChapterPermissionMapping) MultiAddReportChapterPermissionMappingPe
 	return
 }
 
-// GetPermissionListById
-// @Description: 根据id获取品种权限列表
-// @author: Roc
-// @receiver m
-// @datetime 2024-06-04 15:33:58
-// @param reportChapterId int
-// @return list []*ReportChapterPermissionMapping
-// @return err error
 func (m ReportChapterPermissionMapping) GetPermissionListById(reportChapterId int) (list []*ReportChapterPermissionMapping, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := `SELECT * FROM report_chapter_permission_mapping WHERE report_chapter_id=? `
-	//_, err = o.Raw(sql, reportChapterId).QueryRows(&list)
 
 	sql := `SELECT * FROM report_chapter_permission_mapping WHERE report_chapter_id=? `
 	err = global.DmSQL["rddp"].Raw(sql, reportChapterId).Find(&list).Error
 	return
 }
 
-// ReportChapterPermissionItem
-// @Description: 报告章节的权限关系表（带有品种名称）
 type ReportChapterPermissionItem struct {
 	ReportChapterPermissionMappingId int    `orm:"column(report_chapter_permission_mapping_id)"`
 	ReportChapterId                  int    `description:"报告章节的id"`
@@ -97,19 +56,7 @@ type ReportChapterPermissionItem struct {
 	CreateTime                       time.Time
 }
 
-// GetPermissionItemListById
-// @Description: 根据id获取品种权限列表(带有品种名称）
-// @author: Roc
-// @receiver m
-// @datetime 2024-06-04 15:33:58
-// @param reportChapterId int
-// @return list []*ReportChapterPermissionMapping
-// @return err error
 func (m ReportChapterPermissionMapping) GetPermissionItemListById(reportChapterId int) (list []*ReportChapterPermissionItem, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := `SELECT a.*,b.chart_permission_name FROM report_chapter_permission_mapping AS a
-	//     JOIN chart_permission AS b on a.chart_permission_id=b.chart_permission_id WHERE report_chapter_id=? `
-	//_, err = o.Raw(sql, reportChapterId).QueryRows(&list)
 
 	sql := `SELECT a.*,b.chart_permission_name FROM report_chapter_permission_mapping AS a 
 	    JOIN chart_permission AS b on a.chart_permission_id=b.chart_permission_id WHERE report_chapter_id=? `
@@ -117,49 +64,19 @@ func (m ReportChapterPermissionMapping) GetPermissionItemListById(reportChapterI
 	return
 }
 
-// GetPermissionListByIdList
-// @Description: 根据id列表获取品种权限列表
-// @author: Roc
-// @receiver m
-// @datetime 2024-06-04 15:33:58
-// @param reportChapterIdList []int
-// @return list []*ReportChapterPermissionMapping
-// @return err error
 func (m ReportChapterPermissionMapping) GetPermissionListByIdList(reportChapterIdList []int) (list []*ReportChapterPermissionMapping, err error) {
 	num := len(reportChapterIdList)
 	if num <= 0 {
 		return
 	}
 
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := `SELECT * FROM report_chapter_permission_mapping WHERE report_chapter_id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, reportChapterIdList).QueryRows(&list)
 
 	sql := `SELECT * FROM report_chapter_permission_mapping WHERE report_chapter_id in (` + utils.GetOrmInReplace(num) + `) `
 	err = global.DmSQL["data"].Raw(sql, reportChapterIdList).Find(&list).Error
 	return
 }
 
-// MultiAdd
-// @Description: 批量添加
-// @author: Roc
-// @receiver m
-// @datetime 2024-06-20 18:04:33
-// @param list []*ReportChapterPermissionMapping
-// @return err error
 func (m ReportChapterPermissionMapping) MultiAdd(list []*ReportChapterPermissionMapping) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
 	to := global.DmSQL["rddp"].Begin()
 
 	defer func() {
@@ -169,7 +86,6 @@ func (m ReportChapterPermissionMapping) MultiAdd(list []*ReportChapterPermission
 			_ = to.Commit()
 		}
 	}()
-	// 新增品种权限记录
 	if len(list) > 0 {
 		err = to.CreateInBatches(list, utils.MultiAddNum).Error
 		if err != nil {

models/report_chapter.go

@@ -5,7 +5,6 @@ import (
 	"time"
 )
 
-// ReportChapter 报告章节
 type ReportChapter struct {
 	ReportChapterId   int       `gorm:"column:report_chapter_id;primaryKey"` // `orm:"column(report_chapter_id);pk" description:"报告章节ID"`
 	ReportId          int       `description:"报告ID"`
@@ -36,43 +35,22 @@ type ReportChapter struct {
 	OriginalVideoUrl  string    `description:"原始音频文件URL"`
 }
 
-// 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)
 
 	sql := ` SELECT * FROM report_chapter WHERE report_id = ? AND publish_state = 2 ORDER BY sort ASC`
 	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&list).Error
 	return
 }
 
-// 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)
 
 	sql := ` SELECT * FROM report_chapter WHERE report_id = ? ORDER BY sort ASC`
 	err = global.DmSQL["rddp"].Raw(sql, reportId).Find(&list).Error
 	return
 }
 
-//// GetChapterListByChapterIds 根据ReportId获取章节列表
-//func GetChapterListByChapterIds(chapterIds []int) (list []*ReportChapter, err error) {
-//	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)
-//	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
 }

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
 	return
 }

models/sandbox/sandbox.go

@@ -5,24 +5,6 @@ import (
 	"time"
 )
 
-// Sandbox 沙盘推演主表
-//type Sandbox struct {
-//	SandboxId           int       `orm:"column(sandbox_id);pk" description:"沙盘id"`
-//	Name                string    `description:"沙盘名称"`
-//	ChartPermissionId   int       `description:"品种id"`
-//	ChartPermissionName string    `description:"品种名称"`
-//	CurrVersion         int       `description:"当前版本"`
-//	Code                string    `description:"沙盘code"`
-//	Content             string    `description:"沙盘数据"`
-//	PicUrl              string    `description:"沙盘图片地址"`
-//	OpUserId            int       `description:"最近一次编辑操作的用户id"`
-//	OpUserName          string    `description:"最近一次编辑的用户名称（冗余字段，避免查表）"`
-//	IsDelete            int8      `description:"是否删除，0：未删除，1：已删除"`
-//	ModifyTime          time.Time `description:"修改时间"`
-//	CreateTime          time.Time `description:"创建时间"`
-//	SandboxClassifyId   int       `description:"分类id"`
-//	Sort                int       `description:"排序"`
-//}
 
 type Sandbox struct {
 	SandboxId         int       `gorm:"column:sandbox_id;primaryKey"` //`orm:"column(sandbox_id);pk" description:"沙盘id"`
@@ -42,13 +24,6 @@ type Sandbox struct {
 }
 
 func GetSandboxListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*Sandbox, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM sandbox WHERE 1=1 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += " ORDER BY create_time DESC LIMIT ?,? "
-	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&item)
 
 	sql := ` SELECT * FROM sandbox WHERE 1=1 `
 	if condition != "" {
@@ -61,12 +36,6 @@ func GetSandboxListByCondition(condition string, pars []interface{}, startSize,
 }
 
 func GetSandboxListCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count FROM sandbox WHERE 1=1 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//err = o.Raw(sql, pars).QueryRow(&count)
 
 	sql := ` SELECT COUNT(1) AS count FROM sandbox WHERE 1=1 `
 	if condition != "" {
@@ -76,7 +45,6 @@ func GetSandboxListCountByCondition(condition string, pars []interface{}) (count
 	return
 }
 
-// ContentDataStruct 沙盘内容结构体
 type ContentDataStruct struct {
 	Cells []struct {
 		Data *NodeData `json:"data,omitempty"`

models/smart_report.go

@@ -6,7 +6,6 @@ import (
 	"time"
 )
 
-// SmartReport 智能研报
 type SmartReport struct {
 	SmartReportId      int       `orm:"column(smart_report_id)" description:"智能研报ID"`
 	ReportCode         string    `description:"报告唯一编码"`
@@ -48,45 +47,31 @@ func (m *SmartReport) PrimaryId() string {
 }
 
 func (m *SmartReport) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//_, err = o.Update(m, cols...)
 	err = global.DmSQL["rddp"].Select(cols).Updates(m).Error
 	return
 }
 
 func (m *SmartReport) GetItemById(id int) (item *SmartReport, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	//err = o.Raw(sql, id).QueryRow(&item)
 
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
 	err = global.DmSQL["rddp"].Raw(sql, id).Find(&item).Error
 	return
 }
 
-// GetPrePublishSmartReports 获取定时发布时间为当前时间的未发布的报告列表
 func GetPrePublishSmartReports(startTime, endTime string) (list []*SmartReport, err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := `SELECT * FROM smart_report WHERE state = 1 AND pre_publish_time >= ? AND pre_publish_time <= ?`
-	//_, err = o.Raw(sql, startTime, endTime).QueryRows(&list)
 
 	sql := `SELECT * FROM smart_report WHERE state = 1 AND pre_publish_time >= ? AND pre_publish_time <= ?`
 	err = global.DmSQL["rddp"].Raw(sql, startTime, endTime).Find(&list).Error
 	return
 }
 
-// PublishSmartReportById 发布智能报告
 func PublishSmartReportById(reportId int, publishTime time.Time) (err error) {
-	//o := orm.NewOrmUsingDB("rddp")
-	//sql := `UPDATE smart_report SET state = 2, publish_time = ?, msg_is_send = 1, msg_send_time = NOW(), modify_time = NOW() WHERE smart_report_id = ?`
-	//_, err = o.Raw(sql, publishTime, reportId).Exec()
 
 	sql := `UPDATE smart_report SET state = 2, publish_time = ?, msg_is_send = 1, msg_send_time = NOW(), modify_time = NOW() WHERE smart_report_id = ?`
 	err = global.DmSQL["rddp"].Exec(sql, publishTime, reportId).Error
 	return
 }
 
-// ElasticSmartReport 智能研报es
 type ElasticSmartReport struct {
 	SmartReportId      int    `description:"智能研报ID"`
 	Title              string `description:"标题"`
@@ -103,7 +88,6 @@ type ElasticSmartReport struct {
 	Frequency          string `description:"频度"`
 }
 
-// Report2ImgQueueReq 报告详情生成长图队列请求体
 type Report2ImgQueueReq struct {
 	ReportType int    `description:"报告类型: 1-研报; 2-智能研报"`
 	ReportCode string `description:"报告唯一编码"`

models/wx_template_msg.go

@@ -15,40 +15,14 @@ type OpenIdList struct {
 }
 
 func DeleteTemplateRecordByDate(date string) (err error) {
-	//sql := `DELETE FROM user_template_record WHERE create_time<? `
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, date).Exec()
 
 	sql := `DELETE FROM user_template_record WHERE create_time<? `
 	err = global.DEFAULT_DmSQL.Exec(sql, date).Error
 	return
 }
 
-//// GetOpenIdListV2 2022-08-18从hongze_admin复制过来的最新的代码
-//func GetOpenIdListV2() (items []*OpenIdList, err error) {
-//	sql := `SELECT DISTINCT
-//				ur.open_id,
-//				wu.user_id
-//			FROM
-//				wx_user AS wu
-//			INNER JOIN company AS c ON c.company_id = wu.company_id
-//			INNER JOIN company_product AS d ON c.company_id = d.company_id
-//			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 ('正式', '试用', '永续') `
-//	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
-//	return
-//}
 
 func GetOpenIdArr() (items []string, err error) {
-	//sql := ` SELECT DISTINCT ur.open_id FROM wx_user AS wu
-	//      INNER JOIN company AS c ON c.company_id = wu.company_id
-	//      INNER JOIN company_product AS d ON c.company_id=d.company_id
-	//	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.NewOrm()
-	//_, err = o.Raw(sql).QueryRows(&items)
 
 	sql := ` SELECT DISTINCT ur.open_id FROM wx_user AS wu
 	     INNER JOIN company AS c ON c.company_id = wu.company_id
@@ -60,43 +34,7 @@ func GetOpenIdArr() (items []string, err error) {
 	return
 }
 
-//func GetOpenIdArrByClassifyNameSecond(classifyNameSecond string) (items []string, err error) {
-//	sql := ` SELECT DISTINCT ur.open_id FROM wx_user AS wu
-//			INNER JOIN company AS c ON c.company_id = wu.company_id
-//			INNER JOIN company_product AS d ON c.company_id=d.company_id
-//			INNER JOIN user_record  AS ur ON wu.user_id=ur.user_id
-//			INNER JOIN company_report_permission AS e ON d.company_id=e.company_id
-//			INNER JOIN chart_permission AS f ON e.chart_permission_id=f.chart_permission_id
-//			INNER JOIN chart_permission_search_key_word_mapping AS g ON f.chart_permission_id=g.chart_permission_id
-//			WHERE ur.open_id != "" AND ur.subscribe=1 AND ur.create_platform=1 AND  d.status IN('正式','试用','永续') AND  e.status IN('正式','试用','永续')
-//			AND g.from='rddp'
-//			AND g.key_word=?
-//			ORDER BY FIELD(c.company_id, 16) DESC, ur.user_record_id ASC  `
-//	o := orm.NewOrm()
-//	_, err = o.Raw(sql, classifyNameSecond).QueryRows(&items)
-//	return
-//}
 
-// GetOpenIdArrByClassifyId
-// @Description: 根据分类id获取关联的用户微信openid
-// @author: Roc
-// @datetime 2024-06-28 14:57:27
-// @param classifyId int
-// @return items []string
-// @return err error
 func GetOpenIdArrByClassifyId(classifyId int) (items []string, err error) {
-	//sql := ` SELECT DISTINCT ur.open_id FROM wx_user AS wu
-	//		INNER JOIN company AS c ON c.company_id = wu.company_id
-	//		INNER JOIN company_product AS d ON c.company_id=d.company_id
-	//		INNER JOIN user_record  AS ur ON wu.user_id=ur.user_id
-	//		INNER JOIN company_report_permission AS e ON d.company_id=e.company_id
-	//		INNER JOIN chart_permission AS f ON e.chart_permission_id=f.chart_permission_id
-	//		INNER JOIN chart_permission_search_key_word_mapping AS g ON f.chart_permission_id=g.chart_permission_id
-	//		WHERE ur.open_id != "" AND ur.subscribe=1 AND ur.create_platform=1 AND  d.status IN('正式','试用','永续') AND  e.status IN('正式','试用','永续')
-	//		AND g.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)
 	return
 }

models/xfyun.go

@@ -52,7 +52,6 @@ type EdbdataExportExcelReq struct {
 	Mobile     string
 }
 
-// 内容转音频后的结构体
 type VideoInfo struct {
 	VideoUrl         string  `description:"链接"`
 	VideoPlaySeconds float64 `description:"时长"`

routers/router.go

@@ -1,10 +1,3 @@
-// @APIVersion 1.0.0
-// @Title beego Test API
-// @Description beego has a very cool tools to autogenerate documents for your API
-// @Contact astaxie@gmail.com
-// @TermsOfServiceUrl http://beego.me/
-// @License Apache 2.0
-// @LicenseUrl http://www.apache.org/licenses/LICENSE-2.0.html
 package routers
 
 import (
@@ -13,7 +6,6 @@ import (
 )
 
 func init() {
-	//解决跨域问题
 	ns := web.NewNamespace("/v1",
 		web.NSNamespace("/data",
 			web.NSInclude(

services/admin.go

@@ -9,7 +9,6 @@ import (
 	"time"
 )
 
-// ClearAdminOperateLog 清理三个月前的用户操作日志
 func ClearAdminOperateLog(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {

services/alarm_msg/alarm_msg.go

@@ -6,13 +6,7 @@ import (
 	"github.com/rdlucklib/rdluck_tools/http"
 )
 
-// SendAlarmMsg
-// projectName-项目名称
-// runMode-运行模式
-// msgBody-消息内容
-// level:消息基本,1:提示消息,2:警告消息,3:严重错误信息,默认为1 提示消息
 func SendAlarmMsg(msgBody string, level int) {
-	// 未配置
 	if utils.AlarmMsgUrl == `` {
 		return
 	}
@@ -30,14 +24,7 @@ func SendAlarmMsg(msgBody string, level int) {
 	http.Post(utils.AlarmMsgUrl, string(param))
 }
 
-// SendAlarmMsgWithEmail 指定邮箱通知
-// projectName-项目名称
-// runMode-运行模式
-// msgBody-消息内容
-// email-需要发送的邮箱
-// level:消息基本,1:提示消息,2:警告消息,3:严重错误信息,默认为1 提示消息
 func SendAlarmMsgWithEmail(msgBody, email string, level int) {
-	// 未配置
 	if utils.AlarmMsgUrl == `` {
 		return
 	}

services/data/base_edb_lib.go

@@ -11,7 +11,6 @@ import (
 	"strings"
 )
 
-// RefreshEdbData 刷新指标数据
 func RefreshEdbData(edbInfoId, source, subSource int, edbCode, startDate string) (resp *models.BaseResponse, err error) {
 	param := make(map[string]interface{})
 	param["EdbCode"] = edbCode
@@ -19,70 +18,6 @@ func RefreshEdbData(edbInfoId, source, subSource int, edbCode, startDate string)
 	param["StartDate"] = startDate
 	param["Source"] = source
 	urlStr := ``
-	//switch source {
-	//case utils.DATA_SOURCE_THS:
-	//	if subSource == 0 {
-	//		urlStr = "ths/refresh"
-	//	} else {
-	//		urlStr = "ths/ds/refresh"
-	//	}
-	//case utils.DATA_SOURCE_WIND:
-	//	if subSource == 0 {
-	//		urlStr = "wind/refresh"
-	//	} else {
-	//		urlStr = "wind/wsd/refresh"
-	//	}
-	//case utils.DATA_SOURCE_PB:
-	//	urlStr = "pb/refresh"
-	//case utils.DATA_SOURCE_PB_FINANCE:
-	//	urlStr = "pb_finance/refresh"
-	//case utils.DATA_SOURCE_MANUAL:
-	//	urlStr = "manual/refresh"
-	//case utils.DATA_SOURCE_LZ:
-	//	urlStr = "lz/refresh"
-	//case utils.DATA_SOURCE_YS:
-	//	urlStr = "smm/refresh"
-	//case utils.DATA_SOURCE_GL:
-	//	urlStr = "mysteel/refresh"
-	//case utils.DATA_SOURCE_ZZ:
-	//	urlStr = "zz/refresh"
-	//case utils.DATA_SOURCE_DL:
-	//	urlStr = "dl/refresh"
-	//case utils.DATA_SOURCE_SH:
-	//	urlStr = "sh/refresh"
-	//case utils.DATA_SOURCE_CFFEX:
-	//	urlStr = "cffex/refresh"
-	//case utils.DATA_SOURCE_SHFE:
-	//	urlStr = "shfe/refresh"
-	//case utils.DATA_SOURCE_GIE:
-	//	urlStr = "gie/refresh"
-	//case utils.DATA_SOURCE_LT:
-	//	urlStr = "lt/refresh"
-	//case utils.DATA_SOURCE_COAL:
-	//	urlStr = "coal/refresh"
-	//case utils.DATA_SOURCE_GOOGLE_TRAVEL:
-	//	urlStr = "google_travel/refresh"
-	//case utils.DATA_SOURCE_MYSTEEL_CHEMICAL:
-	//	urlStr = "mysteel_chemical/refresh"
-	//case utils.DATA_SOURCE_EIA_STEO:
-	//	urlStr = "eia_steo/refresh"
-	//case utils.DATA_SOURCE_PREDICT:
-	//	urlStr = "predict/refresh"
-	//case utils.DATA_SOURCE_COM_TRADE:
-	//	urlStr = "com_trade/refresh"
-	//case utils.DATA_SOURCE_SCI:
-	//	urlStr = "sci/refresh"
-	//case utils.DATA_SOURCE_BAIINFO:
-	//	urlStr = "baiinfo/refresh"
-	//case utils.DATA_SOURCE_NATIONAL_STATISTICS:
-	//	urlStr = "national_statistics/refresh"
-	//case utils.DATA_SOURCE_FUBAO:
-	//	urlStr = "fubao/refresh"
-	//case utils.DATA_SOURCE_GFEX:
-	//	urlStr = "gz/refresh"
-	//default:
-	//	urlStr = data_manage.GetEdbSourceRefreshMethodBySourceId(source) // 没有对应的从edb_source中取
-	//}
 	urlStr = data_manage.GetEdbSourceRefreshMethodBySourceId(source) // 没有对应的从edb_source中取
 	if urlStr == "" {
 		err = fmt.Errorf(fmt.Sprint("source:", source, ";未实现该指标的刷新接口，请联系管理员"))
@@ -92,7 +27,6 @@ func RefreshEdbData(edbInfoId, source, subSource int, edbCode, startDate string)
 	return
 }
 
-// RefreshEdbCalculateData 刷新计算指标数据请求
 func RefreshEdbCalculateData(edbInfoId int, edbCode, startDate string) (resp *models.BaseResponse, err error) {
 	param := make(map[string]interface{})
 	param["EdbCode"] = edbCode
@@ -102,7 +36,6 @@ func RefreshEdbCalculateData(edbInfoId int, edbCode, startDate string) (resp *mo
 	return
 }
 
-// RefreshPredictEdbCalculateData 刷新 预测计算指标 数据请求
 func RefreshPredictEdbCalculateData(edbInfoId int, edbCode, startDate string) (resp *models.BaseResponse, err error) {
 	param := make(map[string]interface{})
 	param["EdbCode"] = edbCode
@@ -112,7 +45,6 @@ func RefreshPredictEdbCalculateData(edbInfoId int, edbCode, startDate string) (r
 	return
 }
 
-// postRefreshEdbData 刷新指标数据
 func postRefreshEdbData(param map[string]interface{}, urlStr string) (resp *models.BaseResponse, err error) {
 	postUrl := utils.EDB_LIB_URL + urlStr
 	postData, err := json.Marshal(param)
@@ -130,7 +62,6 @@ func postRefreshEdbData(param map[string]interface{}, urlStr string) (resp *mode
 	return resp, nil
 }
 
-// SetEdbSourceStat 指标终端更新情况定时汇总
 func SetEdbSourceStat() (resp *models.BaseResponse, err error) {
 	postUrl := utils.EDB_LIB_URL + "edb_stat/source_update"
 	result, err := HttpPost(postUrl, "", "application/json")
@@ -163,6 +94,5 @@ func HttpPost(url, postData string, params ...string) ([]byte, error) {
 	}
 	defer resp.Body.Close()
 	b, err := ioutil.ReadAll(resp.Body)
-	//fmt.Println("HttpPost:" + string(b))
 	return b, err
 }

services/data/chart_info.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 )
 
-// SetChartEdbEndDate 设置图表中，指标的最新日期
 func SetChartEdbEndDate() {
 	var err error
 	defer func() {

services/data/edb_info.go

@@ -13,7 +13,6 @@ import (
 	"time"
 )
 
-// RefreshDataFromCalculateAll 刷新所有计算指标
 func RefreshDataFromCalculateAll() (err error) {
 	errMsgList := make([]string, 0)
 	defer func() {
@@ -30,7 +29,6 @@ func RefreshDataFromCalculateAll() (err error) {
 	}()
 	var condition string
 	var pars []interface{}
-	// 查询 普通指标的计算指标
 	condition += " AND edb_type=?  AND edb_info_type=? AND no_update=0"
 	pars = append(pars, 2, 0)
 
@@ -71,7 +69,6 @@ func RefreshDataFromCalculateAll() (err error) {
 		}
 		if result.Ret != 200 {
 			errMsgList = append(errMsgList, fmt.Sprintf("指标ID：%d；指标编码：%s；msg：%s；errMsg：%s", v.EdbInfoId, v.EdbCode, result.Msg, result.ErrMsg))
-			//return err
 			continue
 		}
 
@@ -79,7 +76,6 @@ func RefreshDataFromCalculateAll() (err error) {
 	return err
 }
 
-// RefreshBasePredictDataAll 刷新所有的基础预测指标
 func RefreshBasePredictDataAll() (err error) {
 	errMsgList := make([]string, 0)
 	defer func() {
@@ -96,7 +92,6 @@ func RefreshBasePredictDataAll() (err error) {
 	}()
 	var condition string
 	var pars []interface{}
-	// 查询 普通指标的计算指标
 	condition += " AND edb_type=?  AND edb_info_type=? "
 	pars = append(pars, 1, 1)
 
@@ -126,7 +121,6 @@ func RefreshBasePredictDataAll() (err error) {
 	return err
 }
 
-// RefreshPredictDataFromCalculateAll 刷新所有预测计算指标
 func RefreshPredictDataFromCalculateAll() (err error) {
 	errMsgList := make([]string, 0)
 	defer func() {
@@ -143,7 +137,6 @@ func RefreshPredictDataFromCalculateAll() (err error) {
 	}()
 	var condition string
 	var pars []interface{}
-	// 查询 普通指标的计算指标
 	condition += " AND edb_type=?  AND edb_info_type=? "
 	pars = append(pars, 2, 1)
 
@@ -172,7 +165,6 @@ func RefreshPredictDataFromCalculateAll() (err error) {
 	return err
 }
 
-// RefreshDataFromManual 刷新手工指标数据
 func RefreshDataFromManual(wg *sync.WaitGroup) (err error) {
 	errMsgList := make([]string, 0)
 	defer func() {
@@ -217,13 +209,6 @@ func ResetEdbInfoIsUpdate(cont context.Context) (err error) {
 	return nil
 }
 
-// RefreshBaseDataFromSource
-// @Description: 刷新基础数据
-// @author: Roc
-// @datetime 2024-08-01 18:10:03
-// @param wg *sync.WaitGroup
-// @param source int
-// @return err error
 func RefreshBaseDataFromSource(wg *sync.WaitGroup, source int) (err error) {
 	errMsgList := make([]string, 0)
 	defer func() {
@@ -281,7 +266,6 @@ func RefreshBaseDataFromSource(wg *sync.WaitGroup, source int) (err error) {
 	return err
 }
 
-// RefreshDataFromTradeAnalysis 刷新持仓分析指标
 func RefreshDataFromTradeAnalysis(wg *sync.WaitGroup) (err error) {
 	utils.FileLog.Info(fmt.Sprintf("持仓分析指标刷新开始: %s", time.Now().Format(utils.FormatDateTime)))
 	errMsgList := make([]string, 0)
@@ -310,7 +294,6 @@ func RefreshDataFromTradeAnalysis(wg *sync.WaitGroup) (err error) {
 	}
 
 	for _, v := range items {
-		// 持仓分析指标只有日度
 		startDate := v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 		resp, e := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if e != nil {
@@ -326,7 +309,6 @@ func RefreshDataFromTradeAnalysis(wg *sync.WaitGroup) (err error) {
 	return err
 }
 
-// NoneConfigRefreshDataGn 刷新未配置的所有指标来源
 func NoneConfigRefreshDataGn(wg *sync.WaitGroup) (err error) {
 	errMsgList := make([]string, 0)
 	defer func() {
@@ -341,7 +323,6 @@ func NoneConfigRefreshDataGn(wg *sync.WaitGroup) (err error) {
 		wg.Done()
 	}()
 
-	// 过滤出无刷新配置的指标数据来源
 	sourceRefreshIds := make([]int, 0)
 	{
 		cond := fmt.Sprintf(" AND is_base = ?")
@@ -357,14 +338,12 @@ func NoneConfigRefreshDataGn(wg *sync.WaitGroup) (err error) {
 			sourceBaseIds = append(sourceBaseIds, v.EdbSourceId)
 		}
 
-		// 获取默认刷新中配置过的数据来源
 		hasConfigIds, e := edb_refresh.GetDistinctDefaultRefreshSourceIds()
 		if e != nil {
 			err = fmt.Errorf("获取已配置过刷新的指标来源失败, %v", e)
 			return
 		}
 
-		// 取两个[]int的差集
 		sourceRefreshIds = utils.MinusInt(sourceBaseIds, hasConfigIds)
 	}
 	if len(sourceRefreshIds) == 0 {
@@ -372,13 +351,11 @@ func NoneConfigRefreshDataGn(wg *sync.WaitGroup) (err error) {
 		return
 	}
 
-	// 根据数据源依次刷新
 	for _, sourceId := range sourceRefreshIds {
 		cond := ` AND source = ? `
 		pars := make([]interface{}, 0)
 		pars = append(pars, sourceId)
 
-		// 获取指标
 		items, e := data_manage.GetEdbInfoByCondition(cond, pars, 0)
 		if e != nil {
 			err = fmt.Errorf("获取指标失败, Source: %d, Err: %v", sourceId, e)

services/data/edb_info_notice.go

@@ -8,7 +8,6 @@ import (
 	"time"
 )
 
-// 指标更新通知
 func RefreshNotice() (err error) {
 	defer func() {
 		if err != nil {
@@ -26,7 +25,6 @@ func RefreshNotice() (err error) {
 	if err != nil {
 		return errors.New("GetEdbInfoByCondition:" + err.Error())
 	}
-	//日度
 	dayDiv := `<div style="margin-bottom: 20px;min-width: 1000px;overflow-x: scroll;">
                 <div>日度指标，超过3天未更新:</div>`
 	dayTable := `<table border="1" style="border-collapse: collapse;">
@@ -43,7 +41,6 @@ func RefreshNotice() (err error) {
     </thead>`
 	dayTableBody := `<tbody>`
 
-	//周度
 	weekDiv := `<div style="margin-bottom: 20px;min-width: 1000px;overflow-x: scroll;"><div>周度指标，超过7天未更新:</div>`
 	weekTable := `<table border="1" style="border-collapse: collapse;">
     <thead>
@@ -91,7 +88,6 @@ func RefreshNotice() (err error) {
 
 	dayDate := time.Now().AddDate(0, 0, -3)
 	weekDate := time.Now().AddDate(0, 0, -7)
-	//月度
 	monthDate := time.Now().AddDate(0, -1, 0)
 
 	for _, v := range items {
@@ -129,7 +125,6 @@ func RefreshNotice() (err error) {
 	noticeSendBody += allDiv + allTable
 
 	go utils.SendEmailByHongze("指标更新情况通知", noticeSendBody, utils.RefreshEdbInfoEmailSendToUsers, "", "")
-	//utils.SendEmailByHongze("指标更新情况通知", noticeSendBody, "317699326@qq.com", "", "")
 	return
 }
 
@@ -147,9 +142,7 @@ func getTableTr(item *data_manage.EdbInfoList, tableType int) string {
 			item.Source == utils.DATA_SOURCE_CALCULATE_TBZ ||
 			item.Source == utils.DATA_SOURCE_CALCULATE_TCZ ||
 			item.Source == utils.DATA_SOURCE_CALCULATE_NSZYDPJJS {
-			//获取依赖指标信息
 			if tableType != 4 {
-				//获取依赖指标
 				mapList, _ := data_manage.GetEdbInfoCalculateMap(item.EdbInfoId, item.Source)
 				mapStr := ""
 				for _, v := range mapList {

services/data/edb_info_sync.go

@@ -9,7 +9,6 @@ import (
 
 var manualLock sync.Mutex
 
-// SyncManualDataBase 同步手工数据
 func SyncManualDataBase() {
 	var err error
 	errMsgList := make([]string, 0)
@@ -26,7 +25,6 @@ func SyncManualDataBase() {
 	var condition string
 	var pars []interface{}
 	condition += " AND source=? "
-	//condition += " AND edb_code='W000156' "
 
 	pars = append(pars, utils.DATA_SOURCE_MANUAL)
 	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
@@ -38,12 +36,10 @@ func SyncManualDataBase() {
 		startDate := v.StartDate.Format(utils.FormatDate)
 		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if err != nil {
-			//return errors.New("RefreshEdbData Err:" + err.Error())
 			errMsgList = append(errMsgList, "RefreshEdbData Err:"+err.Error())
 			continue
 		}
 		if resp.Ret != 200 {
-			//return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
 			errMsgList = append(errMsgList, "RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
 			continue
 		}

services/data/factor_edb_series.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 )
 
-// RefreshFactorEdbCalculateData 刷新因子指标计算数据
 func RefreshFactorEdbCalculateData() (err error) {
 	defer func() {
 		if err != nil {
@@ -39,7 +38,6 @@ func RefreshFactorEdbCalculateData() (err error) {
 	return
 }
 
-// RefreshFactorEdbChartCalculateData 刷新因子指标图表计算数据
 func RefreshFactorEdbChartCalculateData() (err error) {
 	defer func() {
 		if err != nil {
@@ -69,7 +67,6 @@ func RefreshFactorEdbChartCalculateData() (err error) {
 	return
 }
 
-// PostRefreshFactorEdbRecalculate 因子指标重计算
 func PostRefreshFactorEdbRecalculate(edbInfoId int, edbCode string) (resp *models.BaseResponse, err error) {
 	param := make(map[string]interface{})
 	param["EdbInfoId"] = edbInfoId
@@ -93,7 +90,6 @@ func PostRefreshFactorEdbRecalculate(edbInfoId int, edbCode string) (resp *model
 	return
 }
 
-// PostRefreshFactorEdbChartRecalculate 因子指标图表重计算
 func PostRefreshFactorEdbChartRecalculate(chartInfoId int) (resp *models.BaseResponse, err error) {
 	param := make(map[string]interface{})
 	param["ChartInfoId"] = chartInfoId

services/data/trade_position_analysis.go

@@ -11,7 +11,6 @@ import (
 	"time"
 )
 
-// InitPositionTask 统计今日交易所的持仓分析数据
 func InitPositionTask(cont context.Context) (err error) {
 	exchanges := []string{"zhengzhou", "dalian", "shanghai", "cffex", "ine", "guangzhou"} //郑商所，大商所，上期所，中金所，上期能源，广期所
 	for i := 2; i >= 0; i-- {
@@ -44,7 +43,6 @@ func InitPositionTask(cont context.Context) (err error) {
 		}
 	}
 
-	// 处理交易所的分类
 	{
 		allBaseFromTradeClassify, tmpErr := data_manage.GetAllBaseFromTradeClassify()
 		if tmpErr != nil {
@@ -106,7 +104,6 @@ func InitPositionTask(cont context.Context) (err error) {
 	return
 }
 
-// InitGuangzhouPositionTask 初始化广期所持仓分析排名情况
 func InitGuangzhouPositionTask() (err error) {
 	exchanges := []string{"guangzhou"} //郑商所，大商所，上期所，中金所，上期能源
 	for i := 7; i >= 0; i-- {
@@ -139,7 +136,6 @@ func InitGuangzhouPositionTask() (err error) {
 		}
 	}
 
-	// 处理交易所的分类
 	{
 		allBaseFromTradeClassify, tmpErr := data_manage.GetAllBaseFromTradeClassify()
 		if tmpErr != nil {
@@ -211,16 +207,12 @@ func InitTradePosition(exchange, startDate, endDate string, tradePosition TradeP
 		}
 	}()
 
-	// 批量插入今日的初始值
 	num, err := data_manage.GetTradePositionTopCountByExchangeDataTime(exchange, startDate, endDate)
 	if err != nil {
 		errMsg = "查询原始数据失败，GetTradePositionTopCountByExchangeDataTime() Err: "
 		return
 	}
 	if num > 0 {
-		//err = fmt.Errorf("数据已存在，无需处理")
-		//数据存在不同步的情况，有些合约会提早更新，有些合约会延迟更新
-		//判断合约数是否一致
 
 		originNum, tmpErr := tradePosition.GetTradePositionOriginClassifyCountByExchangeDataTime(exchange, startDate, endDate)
 		if tmpErr != nil {
@@ -235,10 +227,8 @@ func InitTradePosition(exchange, startDate, endDate string, tradePosition TradeP
 			return
 		}
 		if originNum == topNum {
-			//err = fmt.Errorf("数据已存在，无需处理")
 			return
 		}
-		//如果合约数不一致，则删除今日数据
 		err = data_manage.DeleteTradePositionTopAllByExchangeDataTime(exchange, startDate, endDate)
 		if err != nil {
 			errMsg = "删除榜单数据失败，DeleteTradePositionTopAllByExchangeDataTime() Err: "
@@ -257,12 +247,10 @@ func InitTradePosition(exchange, startDate, endDate string, tradePosition TradeP
 		return
 	}
 	if len(originList) <= 0 {
-		// 忽略周末
 		w := time.Now().Weekday().String()
 		if w == "Saturday" || w == "Sunday" {
 			return
 		}
-		// 每天最后一个小时执行依旧无数据时, 才进行邮件提示
 		if time.Now().Hour() != 23 {
 			return
 		}
@@ -270,7 +258,6 @@ func InitTradePosition(exchange, startDate, endDate string, tradePosition TradeP
 		return
 	}
 
-	// 原始数据日期
 	dates, e := tradePosition.GetTradePositionTopOriginDataTimes(exchange)
 	if e != nil {
 		err = fmt.Errorf("GetTradePositionTopOriginDataTimes err: %s", e.Error())
@@ -311,7 +298,6 @@ func InitTradePosition(exchange, startDate, endDate string, tradePosition TradeP
 		}
 		list = make([]*data_manage.TradePositionTop, 0)
 	}
-	// 处理某个期货公司只有买单没有卖单，或者只有卖单没有买单的情况
 	for k, v := range onlyEmptyNameMap {
 		_, ok1 := onlyEmptyMap[k+"_1"]
 		_, ok2 := onlyEmptyMap[k+"_2"]
@@ -361,7 +347,6 @@ func InitTradePosition(exchange, startDate, endDate string, tradePosition TradeP
 		}
 	}
 
-	//生成净多单，净空单榜单
 	err = createAnalysisCleanTop(exchange, startDate, endDate, tradePosition)
 	if err != nil {
 		errMsg = "创建净多单，净空单数据失败，createAnalysisCleanTop() Err: "
@@ -393,20 +378,13 @@ func dealTradeOriginData(dataTimeMap map[string]*data_manage.TradePositionTop, o
 		topLastRankMap[classifyName+"_"+classifyType+"_"+dataTime+"_"+dealTypeStr] = currentItem.Rank
 	}
 	if dataTime > startDate {
-		//tmpTimeStr, tErr := getYesterdayDate(dataTime)
-		//if tErr != nil {
-		//	err = tErr
-		//	return
-		//}
 		tmpTimeStr := getPrevTradeDataDate(dataTime, dates)
 		if tmpTimeStr < startDate {
 			return
 		}
-		// 判断T-1日是否有值, 如果T-1日为空，则根据T日的值计算出T-1的值
 		if _, ok := dataTimeMap[classifyName+"_"+classifyType+"_"+dealTypeStr+"_"+dealShortName+"_"+tmpTimeStr]; !ok {
 			yesterdayVal := dealValue - dealChange
 			yesterdayChange := 0
-			//beforeYesterday, _ := getYesterdayDate(tmpTimeStr)
 			beforeYesterday := getPrevTradeDataDate(tmpTimeStr, dates)
 			beforeYesterdayItem, ok1 := dataTimeMap[classifyName+"_"+classifyType+"_"+dealTypeStr+"_"+dealShortName+"_"+beforeYesterday]
 			if ok1 {
@@ -432,9 +410,7 @@ func dealTradeOriginData(dataTimeMap map[string]*data_manage.TradePositionTop, o
 	return
 }
 
-// DealYesterdayData 更新昨日数据
 func DealYesterdayData(exchange, startDate string, tradePosition TradePositionInterface) (err error) {
-	// 查询最早的日期
 	firstItem, err := tradePosition.GetFirstBaseFromTradeIndexByDate(exchange)
 	if err != nil {
 		return
@@ -443,7 +419,6 @@ func DealYesterdayData(exchange, startDate string, tradePosition TradePositionIn
 		return
 	}
 
-	// 前一个交易日, 前两个交易日
 	dates, e := tradePosition.GetTradePositionTopOriginDataTimes(exchange)
 	if e != nil {
 		err = fmt.Errorf("GetTradePositionTopOriginDataTimes err: %s", e.Error())
@@ -452,16 +427,6 @@ func DealYesterdayData(exchange, startDate string, tradePosition TradePositionIn
 	yesterdayStr := getPrevTradeDataDate(startDate, dates)
 	beforeYesterdayStr := getPrevTradeDataDate(yesterdayStr, dates)
 
-	//yesterdayStr, err := getYesterdayDate(startDate)
-	//if err != nil {
-	//	return
-	//}
-	////查找前日的值，并更新对应的更改
-	//beforeYesterdayStr, err := getYesterdayDate(yesterdayStr)
-	//if err != nil {
-	//	return
-	//}
-	// 先查出T日最原始的数据
 	originList, err := data_manage.GetTradePositionTopByExchangeDataTime(exchange, startDate, startDate)
 	if err != nil {
 		return
@@ -480,16 +445,13 @@ func DealYesterdayData(exchange, startDate string, tradePosition TradePositionIn
 		}
 	}
 
-	// 然后查询T-1中数据来源类型是2的数据
 	changeList, err := data_manage.GetTradePositionTopByExchangeSourceType(exchange, yesterdayStr, 2)
 	if err != nil {
 		return
 	}
 	if len(changeList) <= 0 {
-		//err = fmt.Errorf("前天的数据无需修改")
 		return
 	}
-	// 查询出前日的成交量
 	beforeYesterdayList, err := data_manage.GetTradePositionTopByExchangeDataTime(exchange, beforeYesterdayStr, beforeYesterdayStr)
 	if err != nil {
 		return
@@ -509,9 +471,7 @@ func DealYesterdayData(exchange, startDate string, tradePosition TradePositionIn
 			}
 		}
 	}
-	// 根据原始数据中的值推算出最新的值
 	now := time.Now()
-	// 批量更新到分析表中，
 	var updateAnalysisData []data_manage.UpdateDealValueChange
 	for _, v := range changeList {
 		str := v.ClassifyName + "_" + v.ClassifyType + "_" + v.DealShortName
@@ -554,7 +514,6 @@ func DealYesterdayData(exchange, startDate string, tradePosition TradePositionIn
 		if err != nil {
 			return
 		}
-		//删除T-1日净多单和净空单的榜单
 		err = data_manage.DeletePositionTopByDataTime(exchange, yesterdayStr, 3)
 		if err != nil {
 			return
@@ -565,13 +524,11 @@ func DealYesterdayData(exchange, startDate string, tradePosition TradePositionIn
 			return
 		}
 
-		//重新生成净多单和净空单的榜单
 		err = createAnalysisCleanTop(exchange, yesterdayStr, yesterdayStr, tradePosition)
 		if err != nil {
 			return
 		}
 
-		//T-1日重新生成净多单和净空单的榜单后，需要更新T日净多单和净空单榜单里的变化量
 		err = updateAnalysisCleanTopChangeVal(exchange, startDate, yesterdayStr)
 		if err != nil {
 			return
@@ -581,7 +538,6 @@ func DealYesterdayData(exchange, startDate string, tradePosition TradePositionIn
 	return
 }
 
-// createAnalysisCleanTop 生成净多单，净空单榜单
 func createAnalysisCleanTop(exchange, startDate, endDate string, tradePosition TradePositionInterface) (err error) {
 	defer func() {
 		if err != nil {
@@ -596,7 +552,6 @@ func createAnalysisCleanTop(exchange, startDate, endDate string, tradePosition T
 	subChangeMap1 := make(map[string]int) //净多单map
 	subChangeMap2 := make(map[string]int) //净空单map
 
-	// 2023-05-10 此处取前一个交易日, 不一定是昨日
 	dates, e := tradePosition.GetTradePositionTopOriginDataTimes(exchange)
 	if e != nil {
 		err = fmt.Errorf("GetTradePositionTopOriginDataTimes err: %s", e.Error())
@@ -604,13 +559,7 @@ func createAnalysisCleanTop(exchange, startDate, endDate string, tradePosition T
 	}
 	yesterday := getPrevTradeDataDate(startDate, dates)
 
-	//查询所有差值数据，
-	//yesterday, err := getYesterdayDate(startDate)
-	//if err != nil {
-	//	return
-	//}
 
-	// 上一个交易日的净多单
 	yesterdayTopList1, tErr := data_manage.GetTradePositionTopByExchangeDataTimeType(exchange, yesterday, 3)
 	if tErr != nil {
 		err = tErr
@@ -623,7 +572,6 @@ func createAnalysisCleanTop(exchange, startDate, endDate string, tradePosition T
 		}
 	}
 
-	// 上一个交易日的净空单
 	yesterdayTopList2, tErr := data_manage.GetTradePositionTopByExchangeDataTimeType(exchange, yesterday, 4)
 	if tErr != nil {
 		err = tErr
@@ -636,7 +584,6 @@ func createAnalysisCleanTop(exchange, startDate, endDate string, tradePosition T
 		}
 	}
 
-	// 根据当日多单/空单数据, 生成净多单/净空单数据
 	originDataList, err := data_manage.GetTradePositionTopByExchangeDataTime(exchange, startDate, endDate)
 	if err != nil {
 		return
@@ -673,7 +620,6 @@ func createAnalysisCleanTop(exchange, startDate, endDate string, tradePosition T
 		sort.Sort(subDataList)
 	}
 
-	// 根据净多单/净空单数据, 比对上一个交易日的日期计算成交变化量, 并写入
 	var dealType int
 	rankMap := make(map[string]int)
 	for _, v := range subDataList {
@@ -697,15 +643,8 @@ func createAnalysisCleanTop(exchange, startDate, endDate string, tradePosition T
 			}
 		}
 
-		// 2023-05-10 目前看该方法的引用startDate和endDate其实是同一天, 所以前一个交易日直接用上面的yesterday
 		tmpTimeStr := yesterday
 
-		//和T-1日比较差值
-		//var tmpTimeStr string
-		//tmpTimeStr, err = getYesterdayDate(v.DataTime)
-		//if err != nil {
-		//	return
-		//}
 		yesterdayStr := v.ClassifyName + "_" + v.ClassifyType + "_" + tmpTimeStr + "_" + v.DealShortName
 		dealChange := 0
 		if dealType == 3 {
@@ -748,7 +687,6 @@ func createAnalysisCleanTop(exchange, startDate, endDate string, tradePosition T
 	return
 }
 
-// getPrevTradeDataDate 获取指定日期上一个交易日日期
 func getPrevTradeDataDate(date string, dates []string) string {
 	pre := -1
 	for k, v := range dates {
@@ -758,14 +696,12 @@ func getPrevTradeDataDate(date string, dates []string) string {
 			break
 		}
 	}
-	// 找不到就随便给个不存在日期
 	if pre == -1 {
 		return "1980-01-01"
 	}
 	return dates[pre]
 }
 
-// updateAnalysisCleanTopChangeVal T-1日重新生成净多单和净空单的榜单后，需要更新T日净多单和净空单榜单里的变化量
 func updateAnalysisCleanTopChangeVal(exchange, startDate, yesterday string) (err error) {
 	defer func() {
 		if err != nil {
@@ -773,16 +709,11 @@ func updateAnalysisCleanTopChangeVal(exchange, startDate, yesterday string) (err
 		}
 	}()
 
-	//查询T日的净多单和净空单榜单列表
-	//查询T-1日的净多单和净空单列表
-	//组装数据，计算T日与T-1日的变更值
-	//更新变更值
 	topList := make([]*data_manage.TradePositionTop, 0)      //T日和T+1日列表
 	todayTopList := make([]*data_manage.TradePositionTop, 0) //T日列表
 
 	yesterdayTopListMap := make(map[string]int) //净多单净空单持仓量map
 
-	// 查询T日和T-1日的净多单和净空单列表
 	topList, err = data_manage.GetTradePositionTopCleanByExchangeDataTime(exchange, yesterday, startDate)
 	if err != nil {
 		return
@@ -802,11 +733,9 @@ func updateAnalysisCleanTopChangeVal(exchange, startDate, yesterday string) (err
 	if len(todayTopList) == 0 {
 		return
 	}
-	// 根据净多单/净空单数据, 比对上一个交易日的日期计算成交变化量, 并写入
 	now := time.Now()
 	updateList := make([]data_manage.UpdateChangeVal, 0)
 	for _, v := range todayTopList {
-		//T日值-T-1日值
 		yesterdayStr := v.ClassifyName + "_" + v.ClassifyType + "_" + yesterday + "_" + v.DealShortName + "_" + strconv.Itoa(v.DealType)
 		dealChange := 0
 		if c, ok := yesterdayTopListMap[yesterdayStr]; ok {

services/data/trade_position_analysis_classify.go

@@ -10,14 +10,10 @@ import (
 	"time"
 )
 
-// FixPositionTask 补全缺失的合约, 注意和原先的定时任务区分开来
 func FixPositionTask() (err error) {
 	exchanges := []string{"zhengzhou", "dalian", "shanghai", "cffex", "ine", "guangzhou"} //郑商所，大商所，上期所，中金所，上期能源
-	//exchanges := []string{"guangzhou"} //郑商所，大商所，上期所，中金所，上期能源
 	for i := 194; i > 1; i-- {
-		// 定时任务避开昨日和今日的数据，以免和原先的定时任务InitPositionTask冲突
 		startDate := time.Now().AddDate(0, 0, -i).Format(utils.FormatDate)
-		//startDate := "2024-01-08"
 		endDate := startDate
 		for _, v := range exchanges {
 			exchange := v
@@ -49,7 +45,6 @@ func FixPositionTask() (err error) {
 	return
 }
 
-// InitTradePositionClassify 持仓分析补全缺失的合约
 func InitTradePositionClassify(exchange, startDate, endDate string, tradePosition TradePositionInterface) (err error, errMsg string) {
 	defer func() {
 		if err != nil {
@@ -59,7 +54,6 @@ func InitTradePositionClassify(exchange, startDate, endDate string, tradePositio
 		}
 	}()
 
-	//判断合约数与数据源是否一致
 	originClassifyList, tmpErr := tradePosition.GetTradePositionOriginClassifyByExchangeDataTime(exchange, startDate, endDate)
 	if tmpErr != nil {
 		err = tmpErr
@@ -74,7 +68,6 @@ func InitTradePositionClassify(exchange, startDate, endDate string, tradePositio
 	}
 
 	if len(originClassifyList) == len(topClassifyList) {
-		//合约数目一致，无需补全
 		return
 	}
 	if len(originClassifyList) == 0 {
@@ -103,7 +96,6 @@ func InitTradePositionClassify(exchange, startDate, endDate string, tradePositio
 		return
 	}
 
-	//批量导入缺失的合约
 	err = tradePosition.MultiInsertTradeBaseDataToTopByClassify(exchange, startDate, endDate, classifyNames, classifyTypes)
 	if err != nil {
 		errMsg = "新增原始数据失败，MultiInsertTradeBaseDataToTop() Err: "
@@ -115,12 +107,10 @@ func InitTradePositionClassify(exchange, startDate, endDate string, tradePositio
 		return
 	}
 	if len(originList) <= 0 {
-		// 忽略周末
 		w := time.Now().Weekday().String()
 		if w == "Saturday" || w == "Sunday" {
 			return
 		}
-		// 每天最后一个小时执行依旧无数据时, 才进行邮件提示
 		if time.Now().Hour() != 23 {
 			return
 		}
@@ -128,7 +118,6 @@ func InitTradePositionClassify(exchange, startDate, endDate string, tradePositio
 		return
 	}
 
-	// 原始数据日期
 	dates, e := tradePosition.GetTradePositionTopOriginDataTimes(exchange)
 	if e != nil {
 		err = fmt.Errorf("GetTradePositionTopOriginDataTimes err: %s", e.Error())
@@ -169,7 +158,6 @@ func InitTradePositionClassify(exchange, startDate, endDate string, tradePositio
 		}
 		list = make([]*data_manage.TradePositionTop, 0)
 	}
-	// 处理某个期货公司只有买单没有卖单，或者只有卖单没有买单的情况
 	for k, v := range onlyEmptyNameMap {
 		_, ok1 := onlyEmptyMap[k+"_1"]
 		_, ok2 := onlyEmptyMap[k+"_2"]
@@ -219,7 +207,6 @@ func InitTradePositionClassify(exchange, startDate, endDate string, tradePositio
 		}
 	}
 
-	//生成净多单，净空单榜单
 	err = createAnalysisCleanTopClassify(exchange, startDate, endDate, classifyNames, classifyTypes, tradePosition)
 	if err != nil {
 		errMsg = "创建净多单，净空单数据失败，createAnalysisCleanTop() Err: "
@@ -234,9 +221,7 @@ func InitTradePositionClassify(exchange, startDate, endDate string, tradePositio
 	return
 }
 
-// DealYesterdayDataClassify 更新部分合约的昨日数据
 func DealYesterdayDataClassify(exchange, startDate string, classifyNames, classifyTypes []string, tradePosition TradePositionInterface) (err error) {
-	// 查询最早的日期
 	firstItem, err := tradePosition.GetFirstBaseFromTradeIndexByDate(exchange)
 	if err != nil {
 		return
@@ -245,7 +230,6 @@ func DealYesterdayDataClassify(exchange, startDate string, classifyNames, classi
 		return
 	}
 
-	// 前一个交易日, 前两个交易日
 	dates, e := tradePosition.GetTradePositionTopOriginDataTimes(exchange)
 	if e != nil {
 		err = fmt.Errorf("GetTradePositionTopOriginDataTimes err: %s", e.Error())
@@ -254,7 +238,6 @@ func DealYesterdayDataClassify(exchange, startDate string, classifyNames, classi
 	yesterdayStr := getPrevTradeDataDate(startDate, dates)
 	beforeYesterdayStr := getPrevTradeDataDate(yesterdayStr, dates)
 
-	// 先查出T日最原始的数据
 	originList, err := data_manage.GetTradePositionTopByExchangeDataTimeByClassify(exchange, startDate, startDate, classifyNames, classifyTypes)
 	if err != nil {
 		return
@@ -273,16 +256,13 @@ func DealYesterdayDataClassify(exchange, startDate string, classifyNames, classi
 		}
 	}
 
-	// 然后查询T-1中数据来源类型是2的数据
 	changeList, err := data_manage.GetTradePositionTopByExchangeSourceTypeClassify(exchange, yesterdayStr, 2, classifyNames, classifyTypes)
 	if err != nil {
 		return
 	}
 	if len(changeList) <= 0 {
-		//err = fmt.Errorf("前天的数据无需修改")
 		return
 	}
-	// 查询出前日的成交量
 	beforeYesterdayList, err := data_manage.GetTradePositionTopByExchangeDataTimeByClassify(exchange, beforeYesterdayStr, beforeYesterdayStr, classifyNames, classifyTypes)
 	if err != nil {
 		return
@@ -302,9 +282,7 @@ func DealYesterdayDataClassify(exchange, startDate string, classifyNames, classi
 			}
 		}
 	}
-	// 根据原始数据中的值推算出最新的值
 	now := time.Now()
-	// 批量更新到分析表中，
 	var updateAnalysisData []data_manage.UpdateDealValueChange
 	for _, v := range changeList {
 		str := v.ClassifyName + "_" + v.ClassifyType + "_" + v.DealShortName
@@ -347,7 +325,6 @@ func DealYesterdayDataClassify(exchange, startDate string, classifyNames, classi
 		if err != nil {
 			return
 		}
-		//删除T-1日净多单和净空单的榜单
 		err = data_manage.DeletePositionTopByDataTimeClassify(exchange, yesterdayStr, 3, classifyNames, classifyTypes)
 		if err != nil {
 			return
@@ -358,13 +335,11 @@ func DealYesterdayDataClassify(exchange, startDate string, classifyNames, classi
 			return
 		}
 
-		//重新生成净多单和净空单的榜单
 		err = createAnalysisCleanTopClassify(exchange, yesterdayStr, yesterdayStr, classifyNames, classifyTypes, tradePosition)
 		if err != nil {
 			return
 		}
 
-		//T-1日重新生成净多单和净空单的榜单后，需要更新T日净多单和净空单榜单里的变化量
 		err = updateAnalysisCleanTopChangeValClassify(exchange, startDate, yesterdayStr, classifyNames, classifyTypes)
 		if err != nil {
 			return
@@ -374,7 +349,6 @@ func DealYesterdayDataClassify(exchange, startDate string, classifyNames, classi
 	return
 }
 
-// createAnalysisCleanTopClassify 生成部分合约的净多单，净空单榜单
 func createAnalysisCleanTopClassify(exchange, startDate, endDate string, classifyNames, classifyTypes []string, tradePosition TradePositionInterface) (err error) {
 	defer func() {
 		if err != nil {
@@ -389,7 +363,6 @@ func createAnalysisCleanTopClassify(exchange, startDate, endDate string, classif
 	subChangeMap1 := make(map[string]int) //净多单map
 	subChangeMap2 := make(map[string]int) //净空单map
 
-	// 2023-05-10 此处取前一个交易日, 不一定是昨日
 	dates, e := tradePosition.GetTradePositionTopOriginDataTimes(exchange)
 	if e != nil {
 		err = fmt.Errorf("GetTradePositionTopOriginDataTimes err: %s", e.Error())
@@ -397,7 +370,6 @@ func createAnalysisCleanTopClassify(exchange, startDate, endDate string, classif
 	}
 	yesterday := getPrevTradeDataDate(startDate, dates)
 
-	// 上一个交易日的净多单
 	yesterdayTopList1, tErr := data_manage.GetTradePositionTopByExchangeDataTimeTypeClassify(exchange, yesterday, 3, classifyNames, classifyTypes)
 	if tErr != nil {
 		err = tErr
@@ -410,7 +382,6 @@ func createAnalysisCleanTopClassify(exchange, startDate, endDate string, classif
 		}
 	}
 
-	// 上一个交易日的净空单
 	yesterdayTopList2, tErr := data_manage.GetTradePositionTopByExchangeDataTimeTypeClassify(exchange, yesterday, 4, classifyNames, classifyTypes)
 	if tErr != nil {
 		err = tErr
@@ -423,7 +394,6 @@ func createAnalysisCleanTopClassify(exchange, startDate, endDate string, classif
 		}
 	}
 
-	// 根据当日多单/空单数据, 生成净多单/净空单数据
 	originDataList, err := data_manage.GetTradePositionTopByExchangeDataTimeByClassify(exchange, startDate, endDate, classifyNames, classifyTypes)
 	if err != nil {
 		return
@@ -460,7 +430,6 @@ func createAnalysisCleanTopClassify(exchange, startDate, endDate string, classif
 		sort.Sort(subDataList)
 	}
 
-	// 根据净多单/净空单数据, 比对上一个交易日的日期计算成交变化量, 并写入
 	var dealType int
 	rankMap := make(map[string]int)
 	for _, v := range subDataList {
@@ -484,15 +453,8 @@ func createAnalysisCleanTopClassify(exchange, startDate, endDate string, classif
 			}
 		}
 
-		// 2023-05-10 目前看该方法的引用startDate和endDate其实是同一天, 所以前一个交易日直接用上面的yesterday
 		tmpTimeStr := yesterday
 
-		//和T-1日比较差值
-		//var tmpTimeStr string
-		//tmpTimeStr, err = getYesterdayDate(v.DataTime)
-		//if err != nil {
-		//	return
-		//}
 		yesterdayStr := v.ClassifyName + "_" + v.ClassifyType + "_" + tmpTimeStr + "_" + v.DealShortName
 		dealChange := 0
 		if dealType == 3 {
@@ -535,7 +497,6 @@ func createAnalysisCleanTopClassify(exchange, startDate, endDate string, classif
 	return
 }
 
-// updateAnalysisCleanTopChangeValClassify T-1日重新生成净多单和净空单的榜单后，需要更新T日净多单和净空单榜单里的变化量
 func updateAnalysisCleanTopChangeValClassify(exchange, startDate, yesterday string, classifyNames, classifyTypes []string) (err error) {
 	defer func() {
 		if err != nil {
@@ -543,16 +504,11 @@ func updateAnalysisCleanTopChangeValClassify(exchange, startDate, yesterday stri
 		}
 	}()
 
-	//查询T日的净多单和净空单榜单列表
-	//查询T-1日的净多单和净空单列表
-	//组装数据，计算T日与T-1日的变更值
-	//更新变更值
 	topList := make([]*data_manage.TradePositionTop, 0)      //T日和T+1日列表
 	todayTopList := make([]*data_manage.TradePositionTop, 0) //T日列表
 
 	yesterdayTopListMap := make(map[string]int) //净多单净空单持仓量map
 
-	// 查询T日和T-1日的净多单和净空单列表
 	topList, err = data_manage.GetTradePositionTopCleanByExchangeDataTimeClassify(exchange, yesterday, startDate, classifyNames, classifyTypes)
 	if err != nil {
 		return
@@ -572,11 +528,9 @@ func updateAnalysisCleanTopChangeValClassify(exchange, startDate, yesterday stri
 	if len(todayTopList) == 0 {
 		return
 	}
-	// 根据净多单/净空单数据, 比对上一个交易日的日期计算成交变化量, 并写入
 	now := time.Now()
 	updateList := make([]data_manage.UpdateChangeVal, 0)
 	for _, v := range todayTopList {
-		//T日值-T-1日值
 		yesterdayStr := v.ClassifyName + "_" + v.ClassifyType + "_" + yesterday + "_" + v.DealShortName + "_" + strconv.Itoa(v.DealType)
 		dealChange := 0
 		if c, ok := yesterdayTopListMap[yesterdayStr]; ok {

services/data/trade_position_analysis_interface.go

@@ -48,7 +48,6 @@ type GuangzhouTradePosition struct{}
 func (g *GuangzhouTradePosition) MultiInsertTradeBaseDataToTop(exchange, startDate, endDate string) (err error) {
 	err = data_manage.MultiInsertTradeGuangzhouDataToTop(exchange, startDate, endDate)
 
-	//查询出今日的value值
 	return
 }
 

services/data_stat/edb_info_stat.go

@@ -8,7 +8,6 @@ import (
 	"time"
 )
 
-// SetEdbSourceStatTask 设置数据源指标更新情况定时任务
 func SetEdbSourceStatTask(cont context.Context) (err error) {
 	return
 	now := time.Now().Format(utils.FormatDate)

services/edb_refresh.go

@@ -12,7 +12,6 @@ import (
 	"time"
 )
 
-// Function to merge two maps
 func mergeMaps(dst map[string][]*edb_refresh.EdbInfoListAndRefreshConfig, src map[string][]*edb_refresh.EdbInfoListAndRefreshConfig) (newMap map[string][]*edb_refresh.EdbInfoListAndRefreshConfig) {
 	if dst == nil {
 		return src
@@ -33,13 +32,6 @@ func mergeMaps(dst map[string][]*edb_refresh.EdbInfoListAndRefreshConfig, src ma
 	return newMap
 }
 
-// getDefaultRefreshData
-// @Description: 根据默认配置获取需要刷新的指标列表
-// @author: Roc
-// @datetime 2024-01-10 13:55:38
-// @param now time.Time
-// @return sourceEdbInfoListMap map[string][]*edb_refresh.EdbInfoListAndRefreshConfig
-// @return err error
 func getDefaultRefreshData(now time.Time) (sourceEdbInfoListMap map[string][]*edb_refresh.EdbInfoListAndRefreshConfig, err error) {
 	errMsgList := make([]string, 0)
 	defer func() {
@@ -53,48 +45,20 @@ func getDefaultRefreshData(now time.Time) (sourceEdbInfoListMap map[string][]*ed
 	currTimeStr := getPreviousHalfHour(now)
 	fmt.Println(currTimeStr)
 
-	// 所有默认配置刷新项
 	list := make([]*edb_refresh.EdbRefreshDefaultConfig, 0)
 
-	//刷新频率，枚举值：每自然日、每交易日、每周、每旬、每月、每季、每半年、每年
 	refreshFrequencyList := []string{"每自然日", "每交易日", "每周", "每旬", "每月", "每季", "每半年", "每年"}
 
-	//conf, err := models.GetBusinessConf()
-	//if err != nil {
-	//	fmt.Println(err)
-	//	utils.FileLog.Info("获取业务配置失败，Err:" + err.Error())
-	//	return
-	//}
-
-	// 获取钢联化工的数据获取方式
-	//mySteelChemicalDataMethod := "excel"
-	//if v, ok := conf["MySteelDataMethod"]; ok {
-	//	if v == "api" {
-	//		mySteelChemicalDataMethod = v
-	//	}
-	//}
-	//utils.FileLog.Info("获取业务配置，MySteelDataMethod:" + mySteelChemicalDataMethod)
-	// 获取各个刷新频率的配置
+
 	for _, refreshFrequency := range refreshFrequencyList {
-		// 获取刷新频率条件
 		condition, pars, isHandler := getRefreshFrequencyCondition(now, refreshFrequency)
 		if !isHandler {
-			// 可能是非交易日，所以过滤不处理
 			continue
 		}
 
 		condition += ` AND refresh_frequency = ? AND refresh_time = ?`
 		pars = append(pars, refreshFrequency, currTimeStr)
 
-		// 这两个是excel的数据源，他是从公共机更新的，需要过滤掉
-		//if mySteelChemicalDataMethod == "api" {
-		//	// 钢联化工使用api的方式获取数据的，不需要过滤
-		//	condition += ` AND source not in (?)`
-		//	pars = append(pars, utils.DATA_SOURCE_YS)
-		//} else {
-		//	condition += ` AND source not in (?,?)`
-		//	pars = append(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, utils.DATA_SOURCE_YS)
-		//}
 		tmpList, tmpErr := edb_refresh.GetListByCondition(condition, pars)
 		if tmpErr != nil {
 			err = tmpErr
@@ -103,19 +67,14 @@ func getDefaultRefreshData(now time.Time) (sourceEdbInfoListMap map[string][]*ed
 		list = append(list, tmpList...)
 	}
 
-	// 更新的单元格数
 	refreshDataNumMap := make(map[string]*edb_refresh.EdbRefreshDefaultConfig)
-	// 数据源刷新频度的列表数组
 	refreshDataFrequencyListMap := make(map[int]map[int][]string)
 
 	wgNum := 0
-	// 处理待刷新的数据源，整理成数组，方便获取对应的指标
 	for _, item := range list {
-		// 更新的单元格数
 		key := fmt.Sprintf("%d_%d_%s", item.Source, item.SubSource, item.Frequency)
 		refreshDataNumMap[key] = item
 
-		// 数据源刷新频度的列表数组
 		subSourceFrequencyList, ok := refreshDataFrequencyListMap[item.Source]
 		if !ok {
 			subSourceFrequencyList = make(map[int][]string)
@@ -137,7 +96,6 @@ func getDefaultRefreshData(now time.Time) (sourceEdbInfoListMap map[string][]*ed
 			}
 
 			for _, v := range edbList {
-				// 数据刷新的期数
 				dataRefreshNum := utils.DATA_REFRESH
 				key := fmt.Sprintf("%d_%d_%s", v.Source, v.SubSource, v.Frequency)
 				if edbRefreshDefaultConfig, ok := refreshDataNumMap[key]; ok {
@@ -159,13 +117,6 @@ func getDefaultRefreshData(now time.Time) (sourceEdbInfoListMap map[string][]*ed
 	return
 }
 
-// getConfigRefreshData
-// @Description: 根据指标配置获取需要刷新的指标列表
-// @author: Roc
-// @datetime 2024-01-10 13:55:59
-// @param now time.Time
-// @return sourceEdbInfoListMap map[string][]*edb_refresh.EdbInfoListAndRefreshConfig
-// @return err error
 func getConfigRefreshData(now time.Time) (sourceEdbInfoListMap map[string][]*edb_refresh.EdbInfoListAndRefreshConfig, err error) {
 	defer func() {
 		if err != nil {
@@ -177,18 +128,13 @@ func getConfigRefreshData(now time.Time) (sourceEdbInfoListMap map[string][]*edb
 
 	currTimeStr := getPreviousHalfHour(now)
 
-	// 所有默认配置刷新项
 	list := make([]*edb_refresh.EdbRefreshConfig, 0)
 
-	//刷新频率，枚举值：每自然日、每交易日、每周、每旬、每月、每季、每半年、每年
 	refreshFrequencyList := []string{"每自然日", "每交易日", "每周", "每旬", "每月", "每季", "每半年", "每年"}
 
-	// 获取各个刷新频率的配置
 	for _, refreshFrequency := range refreshFrequencyList {
-		// 获取刷新频率条件
 		condition, pars, isHandler := getRefreshFrequencyCondition(now, refreshFrequency)
 		if !isHandler {
-			// 可能是非交易日，所以过滤不处理
 			continue
 		}
 
@@ -203,33 +149,14 @@ func getConfigRefreshData(now time.Time) (sourceEdbInfoListMap map[string][]*edb
 		list = append(list, tmpList...)
 	}
 
-	// 配置列表
 	configIdEdbRefreshConfigMap := make(map[int]*edb_refresh.EdbRefreshConfig)
 	configIdList := make([]int, 0)
 	for _, v := range list {
 		configIdList = append(configIdList, v.EdbRefreshConfigId)
 		configIdEdbRefreshConfigMap[v.EdbRefreshConfigId] = v
 	}
-	//conf, err := models.GetBusinessConf()
-	//if err != nil {
-	//	fmt.Println(err)
-	//	return
-	//}
-
-	// 获取钢联化工的数据获取方式
-	//mySteelChemicalDataMethod := "excel"
-	//if v, ok := conf["MySteelDataMethod"]; ok {
-	//	if v == "api" {
-	//		mySteelChemicalDataMethod = v
-	//	}
-	//}
-	// 当钢联的数据获取方式是api时，不用过滤
+
 	var sourceList []int
-	//if mySteelChemicalDataMethod == "api" {
-	//	sourceList = []int{utils.DATA_SOURCE_YS}
-	//} else {
-	//	sourceList = []int{utils.DATA_SOURCE_MYSTEEL_CHEMICAL, utils.DATA_SOURCE_YS}
-	//}
 	edbInfoList, err := edb_refresh.GetConfigRefreshEdbInfoListBySourceAndSubSource(sourceList, configIdList)
 	if err != nil {
 		return
@@ -241,7 +168,6 @@ func getConfigRefreshData(now time.Time) (sourceEdbInfoListMap map[string][]*edb
 		if !ok {
 			tmpList = make([]*edb_refresh.EdbInfoListAndRefreshConfig, 0)
 		}
-		// 数据刷新的期数
 		dataRefreshNum := utils.DATA_REFRESH
 		if edbRefreshConfig, ok2 := configIdEdbRefreshConfigMap[v.EdbRefreshConfigId]; ok2 {
 			if edbRefreshConfig.RefreshAllData == 1 { // 刷新所有数据期数
@@ -258,12 +184,6 @@ func getConfigRefreshData(now time.Time) (sourceEdbInfoListMap map[string][]*edb
 	return
 }
 
-// BaseRefreshData
-// @Description: 基础数据刷新
-// @author: Roc
-// @datetime 2024-01-09 16:27:45
-// @param wg *sync.WaitGroup
-// @return err error
 func BaseRefreshData(wg *sync.WaitGroup, source, subSource int, items []*edb_refresh.EdbInfoListAndRefreshConfig) (err error) {
 	errMsgList := make([]string, 0)
 	defer func() {
@@ -279,13 +199,9 @@ func BaseRefreshData(wg *sync.WaitGroup, source, subSource int, items []*edb_ref
 		wg.Done()
 	}()
 
-	// 数据刷新的期数
 	dataRefreshNum := utils.DATA_REFRESH
-	// 是否从最开始的日期更新
-	//var isRefreshByStartDate bool
 
 	for _, v := range items {
-		// 如果暂停更新，那就过滤
 		if v.NoUpdate == 1 {
 			continue
 		}
@@ -294,9 +210,6 @@ func BaseRefreshData(wg *sync.WaitGroup, source, subSource int, items []*edb_ref
 		}
 
 		startDate := ""
-		//if isRefreshByStartDate {
-		//	startDate = v.StartDate.Format(utils.FormatDate)
-		//} else {
 		if v.EndDate.IsZero() {
 			startDate = utils.BaseEdbRefreshStartDate
 		} else {
@@ -318,10 +231,8 @@ func BaseRefreshData(wg *sync.WaitGroup, source, subSource int, items []*edb_ref
 				startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
 			}
 		}
-		//}
 		fmt.Println(startDate)
 
-		// 数据更新
 		resp, tmpErr := data.RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if tmpErr != nil {
 			errMsgList = append(errMsgList, v.EdbCode+"RefreshEdbData Err:"+tmpErr.Error())
@@ -337,28 +248,16 @@ func BaseRefreshData(wg *sync.WaitGroup, source, subSource int, items []*edb_ref
 	return err
 }
 
-// getRefreshFrequencyCondition
-// @Description: 根据时间和刷新频率获取条件
-// @author: Roc
-// @datetime 2024-01-09 16:27:11
-// @param now time.Time
-// @param refreshFrequency string
-// @return condition string
-// @return pars []interface{}
-// @return isHandler bool
 func getRefreshFrequencyCondition(now time.Time, refreshFrequency string) (condition string, pars []interface{}, isHandler bool) {
 	isHandler = true
 
 	var dayNum int
 	var isLastDay bool
 
-	//刷新频率，枚举值：每自然日、每交易日、每周、每旬、每月、每季、每半年、每年
 	switch refreshFrequency {
 	case "每自然日":
-		// 自然日不需要额外条件
 		return
 	case "每交易日":
-		// 周六日不处理
 		if now.Weekday() == time.Saturday || now.Weekday() == time.Sunday {
 			isHandler = false
 		}
@@ -374,93 +273,68 @@ func getRefreshFrequencyCondition(now time.Time, refreshFrequency string) (condi
 		currDay := now.Day()
 		if currDay <= 10 {
 			dayNum = currDay
-			// 如果是这旬的最后一天
 			if currDay == 10 {
 				isLastDay = true
 			}
 		} else if currDay <= 20 {
 			dayNum = currDay - 10
-			// 如果是这旬的最后一天
 			if currDay == 20 {
 				isLastDay = true
 			}
 		} else {
 			dayNum = currDay - 20
 
-			// 当月的最后一天
 			monthLastDay := time.Date(now.Year(), now.Month()+1, 1, 0, 0, 0, 0, time.Local).AddDate(0, 0, -1)
-			// 如果是这旬的最后一天
 			if currDay == monthLastDay.Day() {
 				isLastDay = true
 			}
 		}
 	case "每月":
-		// 当前日期
 		currDay := now.Day()
 		dayNum = currDay
 
-		// 当期的最后一天
 		monthLastDay := time.Date(now.Year(), now.Month()+1, 1, 0, 0, 0, 0, time.Local).AddDate(0, 0, -1)
 
-		// 如果是这期的最后一天
 		if currDay == monthLastDay.Day() {
 			isLastDay = true
 		}
 	case "每季":
-		// 当期的第一天  ;  当期的最后一天
 		var startDay, endDay time.Time
 		currMonth := now.Month()
 		currDay := now.Day()
 		if currMonth <= 3 {
-			// 当季的第一天
 			startDay = time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.Local)
-			// 当季的最后一天
 			endDay = time.Date(now.Year(), 4, 1, 0, 0, 0, 0, time.Local).AddDate(0, 0, -1)
 		} else if currMonth <= 6 {
-			// 当期的第一天
 			startDay = time.Date(now.Year(), 4, 1, 0, 0, 0, 0, time.Local)
-			// 当期的最后一天
 			endDay = time.Date(now.Year(), 7, 1, 0, 0, 0, 0, time.Local).AddDate(0, 0, -1)
 		} else if currMonth <= 9 {
-			// 当期的第一天
 			startDay = time.Date(now.Year(), 7, 1, 0, 0, 0, 0, time.Local)
-			// 当期的最后一天
 			endDay = time.Date(now.Year(), 10, 1, 0, 0, 0, 0, time.Local).AddDate(0, 0, -1)
 		} else {
-			// 当期的第一天
 			startDay = time.Date(now.Year(), 10, 1, 0, 0, 0, 0, time.Local)
-			// 当期的最后一天
 			endDay = time.Date(now.Year()+1, 1, 1, 0, 0, 0, 0, time.Local).AddDate(0, 0, -1)
 		}
 
-		// 计算这期的第一天和当日的天数
 		dayNum = utils.GetTimeSubDay(startDay, now) + 1
 
-		// 如果是这期的最后一天
 		if currMonth == endDay.Month() && currDay == endDay.Day() {
 			isLastDay = true
 		}
 	case "每半年":
-		// 当期的第一天  ;  当期的最后一天
 		var startDay, endDay time.Time
 		currMonth := now.Month()
 		currDay := now.Day()
 		if currMonth <= 6 {
-			// 当期的第一天
 			startDay = time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.Local)
-			// 当期的最后一天
 			endDay = time.Date(now.Year(), 7, 1, 0, 0, 0, 0, time.Local).AddDate(0, 0, -1)
 		} else {
-			// 当期的第一天
 			startDay = time.Date(now.Year(), 7, 1, 0, 0, 0, 0, time.Local)
-			// 当期的最后一天
 			endDay = time.Date(now.Year()+1, 1, 1, 0, 0, 0, 0, time.Local).AddDate(0, 0, -1)
 		}
 
-		// 计算这期的第一天和当日的天数
 		dayNum = utils.GetTimeSubDay(startDay, now) + 1
 
-		// 如果是这期的最后一天
 		if currMonth == endDay.Month() && currDay == endDay.Day() {
 			isLastDay = true
 		}
@@ -468,27 +342,21 @@ func getRefreshFrequencyCondition(now time.Time, refreshFrequency string) (condi
 		currMonth := now.Month()
 		currDay := now.Day()
 
-		// 当期的第一天
 		startDay := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.Local)
-		// 当期的最后一天
 		endDay := time.Date(now.Year()+1, 1, 1, 0, 0, 0, 0, time.Local).AddDate(0, 0, -1)
 
-		// 计算这期的第一天和当日的天数
 		dayNum = utils.GetTimeSubDay(startDay, now) + 1
 
-		// 如果是这期的最后一天
 		if currMonth == endDay.Month() && currDay == endDay.Day() {
 			isLastDay = true
 		}
 
 	}
 
-	// 如果是这期的最后一天，那么就是判断refresh_frequency_day是否配置为0，或者配置的天数大于这期的最大天数
 	if isLastDay {
 		condition += ` AND ( refresh_frequency_day = ? OR refresh_frequency_day >= ? )`
 		pars = append(pars, 0, dayNum)
 	} else {
-		// 如果不是这期的最后一天，那么就是判断refresh_frequency_day是否等于配置的天数
 		condition += ` AND refresh_frequency_day = ?  `
 		pars = append(pars, dayNum)
 	}
@@ -496,12 +364,6 @@ func getRefreshFrequencyCondition(now time.Time, refreshFrequency string) (condi
 	return
 }
 
-// getPreviousHalfHour
-// @Description: 根据传入的时间获取该时间的前整半小时的时间字符串
-// @author: Roc
-// @datetime 2024-01-09 14:27:34
-// @param now time.Time
-// @return string
 func getPreviousHalfHour(now time.Time) string {
 	minute := now.Minute()
 
@@ -511,7 +373,6 @@ func getPreviousHalfHour(now time.Time) string {
 	return fmt.Sprintf("%02d:%02d", now.Hour(), 0)
 }
 
-// ConfigRefreshDataGn 根据配置刷新指标数据
 func ConfigRefreshDataGn(cont context.Context) (err error) {
 	errMsgList := make([]string, 0)
 	defer func() {
@@ -521,7 +382,6 @@ func ConfigRefreshDataGn(cont context.Context) (err error) {
 	}()
 
 	now := time.Now()
-	//now = time.Date(2023, 12, 31, 16, 50, 59, 0, time.Local)
 	defaultSourceEdbInfoListMap, err := getDefaultRefreshData(now)
 	if err != nil {
 		errMsgList = append(errMsgList, "获取默认刷新数据失败，Err:"+err.Error())
@@ -531,7 +391,6 @@ func ConfigRefreshDataGn(cont context.Context) (err error) {
 		errMsgList = append(errMsgList, "获取指标配置刷新数据失败，Err:"+err.Error())
 	}
 
-	// 将两个合并
 	allSourceEdbInfoListMap := mergeMaps(defaultSourceEdbInfoListMap, sourceEdbInfoListMap)
 	wgNum := len(allSourceEdbInfoListMap)
 	if wgNum <= 0 {

services/edb_relation.go

@@ -25,7 +25,6 @@ func InitChartEdbRelation() {
 			go alarm_msg.SendAlarmMsg(msg, 3)
 		}
 	}()
-	//查询chart_edb_mapping 表
 	total, err := data_manage.GetChartEdbMappingTotal()
 	if err != nil {
 		err = fmt.Errorf("查询图表关联指标失败 err: %v", err)
@@ -34,11 +33,9 @@ func InitChartEdbRelation() {
 	if total == 0 {
 		return
 	}
-	//分页查询，每次处理500条记录
 	pageSize := 500
 	totalPage := (total + pageSize - 1) / pageSize // 使用整数除法，并添加一页以防有余数
 	addList := make([]*data_manage.EdbInfoRelation, 0)
-	//查询图表列表
 	for i := 0; i < totalPage; i += 1 {
 		startSize := i * pageSize
 		list, e := data_manage.GetChartEdbMappingList(startSize, pageSize)
@@ -54,7 +51,6 @@ func InitChartEdbRelation() {
 		for _, v := range list {
 			edbInfoIds = append(edbInfoIds, v.EdbInfoId)
 		}
-		// 查询指标信息表
 		edbInfoList, e := data_manage.GetEdbInfoByIdList(edbInfoIds)
 		if e != nil {
 			err = fmt.Errorf("查询指标信息列表失败 Err:%s", e)
@@ -63,20 +59,16 @@ func InitChartEdbRelation() {
 		if len(edbInfoList) == 0 {
 			continue
 		}
-		// 查询计算指标信息，并且建立关联关系
-		// 查询间接引用的指标信息
 		calculateEdbMappingListMap, calculateEdbMappingIdsMap, e := GetEdbListByEdbInfoId(edbInfoList)
 		if e != nil {
 			err = fmt.Errorf("查询计算指标信息失败，%s", e.Error())
 			return
 		}
-		// 查询指标间接引用
 		edbInfoMap := make(map[int]*data_manage.EdbInfo)
 		for _, v := range edbInfoList {
 			edbInfoMap[v.EdbInfoId] = v
 		}
 
-		// 筛选有用的图表
 		finalList := make([]*data_manage.ChartEdbMapping, 0)
 		chartIds := make([]int, 0)
 		for _, v := range list {
@@ -89,7 +81,6 @@ func InitChartEdbRelation() {
 		if len(chartIds) == 0 {
 			continue
 		}
-		// 查询图表信息
 		chartInfoList, e := data_manage.GetChartInfoByChartInfoIds(chartIds)
 		if e != nil {
 			err = fmt.Errorf("查询图表信息列表失败 Err:%s", e)
@@ -100,7 +91,6 @@ func InitChartEdbRelation() {
 			chartInfoMap[v.ChartInfoId] = v
 		}
 
-		//查询引用关系列表，
 		chartEdbRelationList, e := data_manage.GetEdbInfoRelationByReferObjectIds(chartIds, utils.EDB_RELATION_CHART)
 		if e != nil {
 			err = fmt.Errorf("查询图表引用关系列表失败 Err:%s", e)
@@ -115,7 +105,6 @@ func InitChartEdbRelation() {
 			nowTime := time.Now()
 			name := fmt.Sprintf("%d-%d", v.ChartInfoId, v.EdbInfoId)
 			if _, ok := existRelationMap[name]; !ok {
-				//查询图表信息
 				chartInfo, ok1 := chartInfoMap[v.ChartInfoId]
 				if !ok1 {
 					continue
@@ -127,7 +116,6 @@ func InitChartEdbRelation() {
 				if !ok2 {
 					continue
 				}
-				// 去掉预测指标
 				if edbInfo.EdbInfoType == 1 {
 					continue
 				}
@@ -147,7 +135,6 @@ func InitChartEdbRelation() {
 				tmp.RelationCode = fmt.Sprintf("%d_%d_%d_%d", tmp.EdbInfoId, tmp.ReferObjectId, tmp.ReferObjectType, tmp.ReferObjectSubType)
 				addList = append(addList, tmp)
 				existRelationMap[name] = struct{}{}
-				// 添加间接引用记录
 				if edbInfo.EdbType == 2 && edbInfo.EdbInfoType == 0 {
 					childEdbMappingIds, ok1 := calculateEdbMappingIdsMap[edbInfo.EdbInfoId]
 					if !ok1 {
@@ -179,7 +166,6 @@ func InitChartEdbRelation() {
 							RelationCode:       tmp.RelationCode,
 						}
 						addList = append(addList, tmp1)
-						// todo 防止重复
 					}
 				}
 
@@ -195,7 +181,6 @@ func InitChartEdbRelation() {
 			}
 		}
 	}
-	//拿到500个数据ID，判断相关的引用记录，如果已存在则直接过滤，不存在则新增
 	if len(addList) > 0 {
 		err = data_manage.AddEdbInfoRelationMulti(addList)
 		if err != nil {
@@ -208,7 +193,6 @@ func InitChartEdbRelation() {
 	return
 }
 
-// InitChartCrossVariety 处理特殊图表，跨品种分析图表
 func InitChartCrossVariety() {
 	fmt.Println("开始跨品种分析图表中的指标引用")
 	var addNum int
@@ -229,11 +213,9 @@ func InitChartCrossVariety() {
 	if total == 0 {
 		return
 	}
-	//分页查询，每次处理500条记录
 	pageSize := 500
 	totalPage := (total + pageSize - 1) / pageSize // 使用整数除法，并添加一页以防有余数
 	addList := make([]*data_manage.EdbInfoRelation, 0)
-	//查询图表列表
 	for i := 0; i < totalPage; i += 1 {
 		startSize := i * pageSize
 		list, e := cross_variety.GetChartInfoCrossVarietyList(startSize, pageSize)
@@ -281,7 +263,6 @@ func InitChartCrossVariety() {
 		}
 		chartInfoMap := make(map[int]*data_manage.ChartInfo)
 		if len(chartIds) > 0 {
-			// 查询图表信息
 			chartInfoList, e := data_manage.GetChartInfoByChartInfoIds(chartIds)
 			if e != nil {
 				err = fmt.Errorf("查询图表信息列表失败 Err:%s", e)
@@ -311,7 +292,6 @@ func InitChartCrossVariety() {
 			edbInfoIds = append(edbInfoIds, v.EdbInfoId)
 		}
 
-		// 查询指标信息表
 		edbInfoList, e := data_manage.GetEdbInfoByIdList(edbInfoIds)
 		if e != nil {
 			err = fmt.Errorf("查询指标信息列表失败 Err:%s", e)
@@ -320,8 +300,6 @@ func InitChartCrossVariety() {
 		if len(edbInfoList) == 0 {
 			continue
 		}
-		// 查询计算指标信息，并且建立关联关系
-		// 查询间接引用的指标信息
 		calculateEdbMappingListMap, calculateEdbMappingIdsMap, e := GetEdbListByEdbInfoId(edbInfoList)
 		if e != nil {
 			err = fmt.Errorf("查询计算指标信息失败，%s", e.Error())
@@ -342,7 +320,6 @@ func InitChartCrossVariety() {
 								if !chartOk { //表示图表不存在
 									continue
 								}
-								// 查询真正有用的指标ID
 								var config cross_variety.ChartConfigReq
 								e := json.Unmarshal([]byte(chartInfo.ExtraConfig), &config)
 								if e != nil {
@@ -362,7 +339,6 @@ func InitChartCrossVariety() {
 			chartInfoCrossList = make([]*cross_variety.ChartInfoCrossVariety, 0)
 		}
 
-		//查询引用关系列表，
 		chartEdbRelationList, e := data_manage.GetEdbInfoRelationByReferObjectIds(chartIds, utils.EDB_RELATION_CHART)
 		if e != nil {
 			err = fmt.Errorf("查询图表引用关系列表失败 Err:%s", e)
@@ -382,7 +358,6 @@ func InitChartCrossVariety() {
 					if !ok2 {
 						continue
 					}
-					// 去掉预测指标
 					if edbInfo.EdbInfoType == 1 {
 						continue
 					}
@@ -401,7 +376,6 @@ func InitChartCrossVariety() {
 					tmp.RelationCode = fmt.Sprintf("%d_%d_%d_%d", tmp.EdbInfoId, tmp.ReferObjectId, tmp.ReferObjectType, tmp.ReferObjectSubType)
 					addList = append(addList, tmp)
 					existRelationMap[name] = struct{}{}
-					// 添加间接引用记录
 					if edbInfo.EdbType == 2 && edbInfo.EdbInfoType == 0 {
 						childEdbMappingIds, ok1 := calculateEdbMappingIdsMap[edbInfo.EdbInfoId]
 						if !ok1 {
@@ -434,7 +408,6 @@ func InitChartCrossVariety() {
 								RelationCode:       tmp.RelationCode,
 							}
 							addList = append(addList, tmp1)
-							// todo 防止重复
 						}
 					}
 					if len(addList) > pageSize {
@@ -450,7 +423,6 @@ func InitChartCrossVariety() {
 			}
 		}
 	}
-	//拿到500个数据ID，判断相关的引用记录，如果已存在则直接过滤，不存在则新增
 	if len(addList) > 0 {
 		err = data_manage.AddEdbInfoRelationMulti(addList)
 		if err != nil {
@@ -463,7 +435,6 @@ func InitChartCrossVariety() {
 	return
 }
 
-// 初始化事件日历中的指标引用
 func InitCalendarIndicatorRelation() {
 	fmt.Println("开始处理事件日历中的指标引用")
 	var addNum int
@@ -476,7 +447,6 @@ func InitCalendarIndicatorRelation() {
 			go alarm_msg.SendAlarmMsg(msg, 3)
 		}
 	}()
-	//查询chart_edb_mapping 表
 	obj := new(fe_calendar.FeCalendarMatter)
 	condition := " AND edb_info_id > 0"
 	total, err := obj.GetCountByCondition(condition, []interface{}{})
@@ -487,11 +457,9 @@ func InitCalendarIndicatorRelation() {
 	if total == 0 {
 		return
 	}
-	//分页查询，每次处理500条记录
 	pageSize := 500
 	totalPage := (total + pageSize - 1) / pageSize // 使用整数除法，并添加一页以防有余数
 	addList := make([]*data_manage.EdbInfoRelation, 0)
-	//查询图表列表
 	for i := 0; i < totalPage; i += 1 {
 		startSize := i * pageSize
 		list, e := obj.GetPageItemsByCondition(condition, []interface{}{}, []string{}, "", startSize, pageSize)
@@ -517,7 +485,6 @@ func InitCalendarIndicatorRelation() {
 				edbInfoMatterMap[v.EdbInfoId] = items
 			}
 		}
-		// 查询指标信息表
 		edbInfoList, e := data_manage.GetEdbInfoByIdList(edbInfoIds)
 		if e != nil {
 			err = fmt.Errorf("查询指标信息列表失败 Err:%s", e)
@@ -527,8 +494,6 @@ func InitCalendarIndicatorRelation() {
 			continue
 		}
 
-		// 查询计算指标信息，并且建立关联关系
-		// 查询间接引用的指标信息
 		calculateEdbMappingListMap, calculateEdbMappingIdsMap, e := GetEdbListByEdbInfoId(edbInfoList)
 		if e != nil {
 			err = fmt.Errorf("查询计算指标信息失败，%s", e.Error())
@@ -546,7 +511,6 @@ func InitCalendarIndicatorRelation() {
 			}
 		}
 
-		//查询引用关系列表，
 		chartEdbRelationList, e := data_manage.GetEdbInfoRelationByReferObjectIds(matterIds, utils.EDB_RELATION_CALENDAR)
 		if e != nil {
 			err = fmt.Errorf("查询图表引用关系列表失败 Err:%s", e)
@@ -558,7 +522,6 @@ func InitCalendarIndicatorRelation() {
 			existRelationMap[name] = struct{}{}
 		}
 		for edbInfoId, edbInfo := range edbInfoMap {
-			// 去掉预测指标
 			if edbInfo.EdbInfoType == 1 {
 				continue
 			}
@@ -568,7 +531,6 @@ func InitCalendarIndicatorRelation() {
 				for _, v := range items {
 					name := fmt.Sprintf("%d-%d", v.FeCalendarMatterId, v.EdbInfoId)
 					if _, ok1 := existRelationMap[name]; !ok1 {
-						//todo 引用时间
 						tmp := &data_manage.EdbInfoRelation{
 							ReferObjectId:   v.FeCalendarMatterId,
 							ReferObjectType: utils.EDB_RELATION_CALENDAR,
@@ -583,7 +545,6 @@ func InitCalendarIndicatorRelation() {
 						tmp.RelationCode = fmt.Sprintf("%d_%d_%d_%d", tmp.EdbInfoId, tmp.ReferObjectId, tmp.ReferObjectType, tmp.ReferObjectSubType)
 						addList = append(addList, tmp)
 						existRelationMap[name] = struct{}{}
-						// 添加间接引用记录
 						if edbInfo.EdbType == 2 && edbInfo.EdbInfoType == 0 {
 							childEdbMappingIds, ok1 := calculateEdbMappingIdsMap[edbInfo.EdbInfoId]
 							if !ok1 {
@@ -614,7 +575,6 @@ func InitCalendarIndicatorRelation() {
 									RelationCode:    tmp.RelationCode,
 								}
 								addList = append(addList, tmp1)
-								// todo 防止重复
 							}
 						}
 						if len(addList) > pageSize {
@@ -632,7 +592,6 @@ func InitCalendarIndicatorRelation() {
 
 		}
 	}
-	//拿到500个数据ID，判断相关的引用记录，如果已存在则直接过滤，不存在则新增
 	if len(addList) > 0 {
 		err = data_manage.AddEdbInfoRelationMulti(addList)
 		if err != nil {
@@ -645,7 +604,6 @@ func InitCalendarIndicatorRelation() {
 	return
 }
 
-// 初始化表格中的指标引用
 func InitExcelEdbRelation() {
 	fmt.Println("开始处理表格中的指标引用")
 	var err error
@@ -658,7 +616,6 @@ func InitExcelEdbRelation() {
 			go alarm_msg.SendAlarmMsg(msg, 3)
 		}
 	}()
-	//查询表格指标绑定表
 	sources := []int{utils.TIME_TABLE, utils.MIXED_TABLE, utils.BALANCE_TABLE}
 	total, err := excel.GetExcelEdbMappingTotalBySource(sources)
 	if err != nil {
@@ -668,11 +625,9 @@ func InitExcelEdbRelation() {
 	if total == 0 {
 		return
 	}
-	//分页查询，每次处理100条记录
 	pageSize := 100
 	totalPage := (total + pageSize - 1) / pageSize // 使用整数除法，并添加一页以防有余数
 	addList := make([]*data_manage.EdbInfoRelation, 0)
-	//查询表格列表
 	for i := 0; i < totalPage; i += 1 {
 		startSize := i * pageSize
 		list, e := excel.GetExcelEdbMappingListBySource(sources, startSize, pageSize)
@@ -688,7 +643,6 @@ func InitExcelEdbRelation() {
 		for _, v := range list {
 			edbInfoIds = append(edbInfoIds, v.EdbInfoId)
 		}
-		// 查询指标信息表
 		edbInfoList, e := data_manage.GetEdbInfoByIdList(edbInfoIds)
 		if e != nil {
 			err = fmt.Errorf("查询指标信息列表失败 Err:%s", e)
@@ -697,26 +651,21 @@ func InitExcelEdbRelation() {
 		if len(edbInfoList) == 0 {
 			continue
 		}
-		// 查询计算指标信息，并且建立关联关系
-		// 查询间接引用的指标信息
 		calculateEdbMappingListMap, calculateEdbMappingIdsMap, e := GetEdbListByEdbInfoId(edbInfoList)
 		if e != nil {
 			err = fmt.Errorf("查询计算指标信息失败，%s", e.Error())
 			return
 		}
-		// 查询指标间接引用
 		edbInfoMap := make(map[int]*data_manage.EdbInfo)
 		for _, v := range edbInfoList {
 			edbInfoMap[v.EdbInfoId] = v
 		}
 
-		// 筛选有用的表格
 		excelIds := make([]int, 0)
 		for _, v := range list {
 			excelIds = append(excelIds, v.ExcelInfoId)
 		}
 
-		//查询引用关系列表，
 		chartEdbRelationList, e := data_manage.GetEdbInfoRelationByReferObjectIds(excelIds, utils.EDB_RELATION_TABLE)
 		if e != nil {
 			err = fmt.Errorf("查询表格引用关系列表失败 Err:%s", e)
@@ -735,7 +684,6 @@ func InitExcelEdbRelation() {
 				if !ok2 {
 					continue
 				}
-				// 去掉预测指标
 				if edbInfo.EdbInfoType == 1 {
 					continue
 				}
@@ -754,7 +702,6 @@ func InitExcelEdbRelation() {
 				tmp.RelationCode = fmt.Sprintf("%d_%d_%d_%d", tmp.EdbInfoId, tmp.ReferObjectId, tmp.ReferObjectType, tmp.ReferObjectSubType)
 				addList = append(addList, tmp)
 				existRelationMap[name] = struct{}{}
-				// 添加间接引用记录
 				if edbInfo.EdbType == 2 && edbInfo.EdbInfoType == 0 {
 					childEdbMappingIds, ok1 := calculateEdbMappingIdsMap[edbInfo.EdbInfoId]
 					if !ok1 {
@@ -786,7 +733,6 @@ func InitExcelEdbRelation() {
 							RelationCode:       tmp.RelationCode,
 						}
 						addList = append(addList, tmp1)
-						// todo 防止重复
 					}
 				}
 
@@ -802,7 +748,6 @@ func InitExcelEdbRelation() {
 			}
 		}
 	}
-	//拿到500个数据ID，判断相关的引用记录，如果已存在则直接过滤，不存在则新增
 	if len(addList) > 0 {
 		err = data_manage.AddEdbInfoRelationMulti(addList)
 		if err != nil {
@@ -815,7 +760,6 @@ func InitExcelEdbRelation() {
 	return
 }
 
-// 处理逻辑图中的指标引用
 func InitSandBoxEdbRelation() {
 	fmt.Println("开始处理逻辑图中的指标引用")
 	var err error
@@ -837,11 +781,9 @@ func InitSandBoxEdbRelation() {
 	if total == 0 {
 		return
 	}
-	//分页查询，每次处理500条记录
 	pageSize := 100
 	totalPage := (total + pageSize - 1) / pageSize // 使用整数除法，并添加一页以防有余数
 	addList := make([]*data_manage.EdbInfoRelation, 0)
-	//查询图表列表
 	for i := 0; i < totalPage; i += 1 {
 		startSize := i * pageSize
 		list, e := sandbox.GetSandboxListByCondition(condition, []interface{}{}, startSize, pageSize)
@@ -862,8 +804,6 @@ func InitSandBoxEdbRelation() {
 			edbInfoIdsTmp, e := getSandBoxEdbIdsByContent(v.Content)
 			if e != nil {
 				continue
-				//err = fmt.Errorf("查询逻辑图关联的指标Id失败 Err:%s", e)
-				//return
 			}
 			for _, edbId := range edbInfoIdsTmp {
 				edbInfoIds = append(edbInfoIds, edbId)
@@ -873,7 +813,6 @@ func InitSandBoxEdbRelation() {
 		if len(edbInfoIds) <= 0 {
 			continue
 		}
-		// 查询指标信息表
 		edbInfoList, e := data_manage.GetEdbInfoByIdList(edbInfoIds)
 		if e != nil {
 			err = fmt.Errorf("查询指标信息列表失败 Err:%s", e)
@@ -882,8 +821,6 @@ func InitSandBoxEdbRelation() {
 		if len(edbInfoList) == 0 {
 			continue
 		}
-		// 查询计算指标信息，并且建立关联关系
-		// 查询间接引用的指标信息
 		calculateEdbMappingListMap, calculateEdbMappingIdsMap, e := GetEdbListByEdbInfoId(edbInfoList)
 		if e != nil {
 			err = fmt.Errorf("查询计算指标信息失败，%s", e.Error())
@@ -900,7 +837,6 @@ func InitSandBoxEdbRelation() {
 			}
 		}
 
-		//查询引用关系列表，
 		chartEdbRelationList, e := data_manage.GetEdbInfoRelationByReferObjectIds(sandboxIds, utils.EDB_RELATION_SANDBOX)
 		if e != nil {
 			err = fmt.Errorf("查询逻辑图引用关系列表失败 Err:%s", e)
@@ -920,7 +856,6 @@ func InitSandBoxEdbRelation() {
 					if !ok2 {
 						continue
 					}
-					// 去掉预测指标
 					if edbInfo.EdbInfoType == 1 {
 						continue
 					}
@@ -938,7 +873,6 @@ func InitSandBoxEdbRelation() {
 					tmp.RelationCode = fmt.Sprintf("%d_%d_%d_%d", tmp.EdbInfoId, tmp.ReferObjectId, tmp.ReferObjectType, tmp.ReferObjectSubType)
 					addList = append(addList, tmp)
 					existRelationMap[name] = struct{}{}
-					// 添加间接引用记录
 					if edbInfo.EdbType == 2 && edbInfo.EdbInfoType == 0 {
 						childEdbMappingIds, ok1 := calculateEdbMappingIdsMap[edbInfo.EdbInfoId]
 						if !ok1 {
@@ -969,7 +903,6 @@ func InitSandBoxEdbRelation() {
 								RelationCode:    tmp.RelationCode,
 							}
 							addList = append(addList, tmp1)
-							// todo 防止重复
 						}
 					}
 					if len(addList) > pageSize {
@@ -985,7 +918,6 @@ func InitSandBoxEdbRelation() {
 			}
 		}
 	}
-	//拿到500个数据ID，判断相关的引用记录，如果已存在则直接过滤，不存在则新增
 	if len(addList) > 0 {
 		err = data_manage.AddEdbInfoRelationMulti(addList)
 		if err != nil {
@@ -1005,7 +937,6 @@ func getSandBoxEdbIdsByContent(content string) (edbInfoIds []int, err error) {
 		err = fmt.Errorf("json.Unmarshal err:%s", err.Error())
 		return
 	}
-	// 遍历所有节点
 	for _, node := range contentInfo.Cells {
 		if node.Data == nil {
 			continue
@@ -1032,7 +963,6 @@ func GetEdbListByEdbInfoId(edbInfoList []*data_manage.EdbInfo) (edbMappingListMa
 	if len(edbInfoIds) == 0 {
 		return
 	}
-	//查询指标信息
 	allEdbMappingMap := make(map[int][]*data_manage.EdbInfoCalculateMappingInfo, 0)
 	allMappingList, e := data_manage.GetEdbInfoCalculateMappingListByEdbInfoIds(edbInfoIds)
 	if e != nil {
@@ -1045,10 +975,6 @@ func GetEdbListByEdbInfoId(edbInfoList []*data_manage.EdbInfo) (edbMappingListMa
 		}
 		allEdbMappingMap[v.EdbInfoId] = append(allEdbMappingMap[v.EdbInfoId], v)
 	}
-	//查询指标映射
-	//查询所有指标数据
-	//查询这个指标相关的mapping信息放到数组里，
-	//将得到的指标ID信息放到数组里
 	hasFindMap := make(map[int]struct{})
 	edbInfoIdMap := make(map[int]struct{})
 	edbMappingList := make([]*data_manage.EdbInfoCalculateMapping, 0)
@@ -1067,8 +993,6 @@ func GetEdbListByEdbInfoId(edbInfoList []*data_manage.EdbInfo) (edbMappingListMa
 	if len(edbMappingList) == 0 {
 		return
 	}
-	// 查询指标信息
-	// 指标信息map
 	edbInfoIdList := make([]int, 0)
 	for k, _ := range edbInfoIdMap {
 		edbInfoIdList = append(edbInfoIdList, k)
@@ -1083,7 +1007,6 @@ func GetEdbListByEdbInfoId(edbInfoList []*data_manage.EdbInfo) (edbMappingListMa
 	return
 }
 
-// getCalculateEdbInfoByEdbInfoId 计算指标追溯
 func getCalculateEdbInfoByEdbInfoId(allEdbMappingMap map[int][]*data_manage.EdbInfoCalculateMappingInfo, edbInfoId int, hasFindMap map[int]struct{}, edbInfoIdMap map[int]struct{}, edbMappingList []*data_manage.EdbInfoCalculateMapping, edbMappingMap map[int]struct{}, edbInfoMappingRootIdsMap map[int][]int, rootEdbInfoId int) (newEdbMappingList []*data_manage.EdbInfoCalculateMapping, err error) {
 	newEdbMappingList = edbMappingList
 	_, ok := hasFindMap[edbInfoId]
@@ -1136,7 +1059,6 @@ func getCalculateEdbInfoByEdbInfoId(allEdbMappingMap map[int][]*data_manage.EdbI
 			}
 
 			if edbInfoId != v.FromEdbInfoId && (v.FromEdbType == 2 || v.FromEdbInfoType == 1) {
-				// 查过了就不查了
 				if _, ok2 := hasFindMap[v.FromEdbInfoId]; !ok2 {
 					newEdbMappingList, err = getCalculateEdbInfoByEdbInfoId(allEdbMappingMap, v.FromEdbInfoId, hasFindMap, edbInfoIdMap, newEdbMappingList, edbMappingMap, edbInfoMappingRootIdsMap, rootEdbInfoId)
 					if err != nil {

services/elastic.go

@@ -19,7 +19,6 @@ func NewClient() (client *elastic.Client, err error) {
 	return
 }
 
-// EsAddOrEditReport 新增编辑es报告
 func EsAddOrEditReport(indexName, docId string, item *models.ElasticReportDetail) (err error) {
 	defer func() {
 		if err != nil {
@@ -30,7 +29,6 @@ func EsAddOrEditReport(indexName, docId string, item *models.ElasticReportDetail
 	if err != nil {
 		return
 	}
-	// docId为报告ID+章节ID
 	searchById, err := client.Get().Index(indexName).Id(docId).Do(context.Background())
 	if err != nil && !strings.Contains(err.Error(), "404") {
 		fmt.Println("Get Err" + err.Error())
@@ -56,7 +54,6 @@ func EsAddOrEditReport(indexName, docId string, item *models.ElasticReportDetail
 		if err != nil {
 			return err
 		}
-		//fmt.Println(resp.Status, resp.Result)
 		if resp.Status == 0 {
 			fmt.Println("修改成功" + docId)
 			err = nil
@@ -79,7 +76,6 @@ func EsAddOrEditReport(indexName, docId string, item *models.ElasticReportDetail
 	return
 }
 
-// EsAddOrEditEnglishReport 新增编辑es英文报告
 func EsAddOrEditEnglishReport(indexName, docId string, item *models.ElasticEnglishReportDetail) (err error) {
 	defer func() {
 		if err != nil {
@@ -91,7 +87,6 @@ func EsAddOrEditEnglishReport(indexName, docId string, item *models.ElasticEngli
 	if err != nil {
 		return
 	}
-	// docId为报告ID
 	searchById, err := client.Get().Index(indexName).Id(docId).Do(context.Background())
 	if err != nil {
 		if strings.Contains(err.Error(), "404") {
@@ -127,7 +122,6 @@ func EsAddOrEditEnglishReport(indexName, docId string, item *models.ElasticEngli
 			err = e
 			return
 		}
-		//fmt.Println(resp.Status, resp.Result)
 		if resp.Status == 0 {
 			fmt.Println("修改成功" + docId)
 			err = nil

services/english_report.go

@@ -11,14 +11,12 @@ import (
 	"time"
 )
 
-// PublishEnglishReport 定时发布英文研报-每分钟
 func PublishEnglishReport(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			go alarm_msg.SendAlarmMsg("PublishEnglishReport-定时发布英文研报失败, ErrMsg:\n"+err.Error(), 3)
 		}
 	}()
-	// 获取所有未发布的语音播报
 	now := time.Now().Format(utils.FormatDateTimeMinute)
 	startTime := now + ":00"
 	endTime := now + ":59"
@@ -31,12 +29,10 @@ func PublishEnglishReport(cont context.Context) (err error) {
 	if listLen == 0 {
 		return
 	}
-	// 比对时间(分钟),时间相等则发布并推送
 	for i := 0; i < listLen; i++ {
 		item := list[i]
 		publishTime := time.Now().Format(utils.FormatDateTime)
 		if item.PublishTime != "" {
-			// 发布时间固定为首次发布时间
 			publishTime = item.PublishTime
 		}
 		if err = models.PublishEnglishReportById(item.Id, publishTime); err != nil {
@@ -49,7 +45,6 @@ func PublishEnglishReport(cont context.Context) (err error) {
 	return
 }
 
-// UpdateEnglishReportEs 更新英文报告/章节Es
 func UpdateEnglishReportEs(reportId int, publishState int) (err error) {
 	if reportId <= 0 {
 		return
@@ -58,7 +53,6 @@ func UpdateEnglishReportEs(reportId int, publishState int) (err error) {
 	if err != nil {
 		return
 	}
-	// 新增报告ES
 	esReport := &models.ElasticEnglishReportDetail{
 		Id:                 strconv.Itoa(reportInfo.Id),
 		ReportId:           reportInfo.Id,

services/eta_bridge/eta_bridge.go

@@ -11,23 +11,11 @@ import (
 	"strings"
 )
 
-// BaseEtaBridgeDataResp 基础返回参数
 type BaseEtaBridgeDataResp struct {
 	Code int    `json:"code" description:"状态码"`
 	Msg  string `json:"msg" description:"提示信息"`
-	//Data GetCrmTokenData `json:"data" description:"返回数据"`
 }
 
-// HttpEtaBridgePost
-// @Description: eta-bridge的post请求
-// @author: Roc
-// @datetime 2024-02-28 16:55:02
-// @param urlStr string
-// @param postData string
-// @param param interface{}
-// @return bResult []byte
-// @return err error
-// @return errMsg string
 func HttpEtaBridgePost(urlStr string, param interface{}) (bResult []byte, err error, errMsg string) {
 	if utils.EtaBridgeUrl == "" {
 		errMsg = `未配置第三方的桥接服务地址`
@@ -75,7 +63,6 @@ func HttpEtaBridgePost(urlStr string, param interface{}) (bResult []byte, err er
 
 	utils.FileLog.Info("桥接服务post请求返回数据:\n" + string(bResult))
 
-	// 生产环境解密, 注意有个坑前后的双引号
 	if utils.RunMode == "release" {
 		str := string(bResult)
 		str = strings.Trim(str, `"`)
@@ -97,15 +84,6 @@ func HttpEtaBridgePost(urlStr string, param interface{}) (bResult []byte, err er
 	return
 }
 
-// HttpEtaBridgeGet
-// @Description: eta-bridge的get请求
-// @author: Roc
-// @datetime 2024-02-28 16:55:02
-// @param urlStr string
-// @param postData string
-// @return bResult []byte
-// @return err error
-// @return errMsg string
 func HttpEtaBridgeGet(urlStr string) (bResult []byte, err error, errMsg string) {
 	if utils.EtaBridgeUrl == "" {
 		errMsg = `未配置第三方的桥接服务地址`
@@ -144,7 +122,6 @@ func HttpEtaBridgeGet(urlStr string) (bResult []byte, err error, errMsg string)
 		err = fmt.Errorf("resp body is empty")
 		return
 	}
-	// 生产环境解密, 注意有个坑前后的双引号
 	if utils.RunMode == "release" {
 		str := string(bResult)
 		str = strings.Trim(str, `"`)
@@ -166,7 +143,6 @@ func HttpEtaBridgeGet(urlStr string) (bResult []byte, err error, errMsg string)
 	return
 }
 
-// EtaBridgeDataRespAndBusinessData 基础返回参数
 type EtaBridgeDataRespAndBusinessData struct {
 	Code int                 `json:"code" description:"状态码"`
 	Msg  string              `json:"msg" description:"提示信息"`
@@ -178,8 +154,6 @@ type GetBusinessDataResp struct {
 	Paging *paging.PagingItem `description:"分页数据"`
 }
 
-// PushBusinessIndex
-// @Description:  添加外部指标（商家）请求
 type PushBusinessIndex struct {
 	IndexCode            string            `description:"指标编码"`
 	IndexName            string            `description:"指标名称"`
@@ -191,8 +165,6 @@ type PushBusinessIndex struct {
 	DataList             []AddBusinessData `description:"指标数据"`
 }
 
-// AddBusinessData
-// @Description: 外部指标（商家系统）数据
 type AddBusinessData struct {
 	Value float64 `description:"值"`
 	Date  string  `description:"日期"`

services/eta_bridge/gn.go

@@ -17,15 +17,12 @@ import (
 	"time"
 )
 
-// 同步指标信息锁
 var lockSyncGnIndex sync.Mutex
 
 const GnEdbListUri = `/index_data/gn/edb/list` // 国能指标列表接口
 
-// CurrLevelParentClassifyMap 当前层级分类map
 var CurrLevelParentClassifyMap map[int64]map[int64]map[string]CurrClassify
 
-// CurrEdbInfoMap 当前库里已有的指标map
 var CurrEdbInfoMap map[string]*data_manage.EdbInfo
 
 type CurrClassify struct {
@@ -34,12 +31,6 @@ type CurrClassify struct {
 	ClassifyName string
 }
 
-// SyncGnIndex
-// @Description: 定时同步指标信息
-// @author: Roc
-// @datetime 2024-03-07 17:39:34
-// @param cont context.Context
-// @return err error
 func SyncGnIndex(cont context.Context) (err error) {
 	fmt.Println("准备同步指标")
 	lockSyncGnIndex.Lock()
@@ -67,36 +58,13 @@ func SyncGnIndex(cont context.Context) (err error) {
 
 	err, errMsgList = syncGnIndex(1, utils.SyncCrmIndexNum, lastUpdateTimeStr)
 
-	// 下面的用完整体注释掉就行
-	//indexIds, e := LoadGnTempIndexIds()
-	//if e != nil {
-	//	err = fmt.Errorf("读取IDs配置文件失败, %v", e)
-	//	return
-	//}
-	//if len(indexIds) == 0 {
-	//	fmt.Println("IndexIds为空")
-	//	return
-	//}
-	//for _, v := range indexIds {
-	//	strId := strconv.Itoa(v)
-	//	fmt.Printf("正在同步IndexId: %s\n", strId)
-	//	err, errMsgList = syncGnIndexV2(1, 1, lastUpdateTimeStr, strId)
-	//	if err != nil {
-	//		errMsg := strings.Join(errMsgList, "\n")
-	//		fmt.Printf("IndexId: %s, 同步失败, ErrMsg: %s", strId, errMsg)
-	//		continue
-	//	}
-	//}
 	return
 }
 
-// initCurrLevelParentClassifyMap
-// @Description: 初始化当前层级分类map
 func initCurrLevelParentClassifyMap() {
 	var condition string
 	var pars []interface{}
 
-	// 普通指标分类
 	condition = " AND classify_type = ? "
 	pars = append(pars, 0)
 
@@ -106,7 +74,6 @@ func initCurrLevelParentClassifyMap() {
 		return
 	}
 
-	// 清空缓存
 	CurrLevelParentClassifyMap = make(map[int64]map[int64]map[string]CurrClassify)
 
 	for _, v := range classifyList {
@@ -130,17 +97,13 @@ func initCurrLevelParentClassifyMap() {
 	}
 }
 
-// initCurrEdbInfoMap
-// @Description: 初始化当前指标map
 func initCurrEdbInfoMap() {
-	// 获取指标列表
 	edbInfoList, err := data_manage.GetAllBaseEdbInfo()
 	if err != nil {
 		utils.FileLog.Error("获取指标列表数据失败:" + err.Error())
 		return
 	}
 
-	// 清空缓存
 	CurrEdbInfoMap = make(map[string]*data_manage.EdbInfo)
 
 	for _, v := range edbInfoList {
@@ -148,23 +111,17 @@ func initCurrEdbInfoMap() {
 	}
 }
 
-// EtaBridgeGnIndexListResp
-// @Description: 指标列表返回数据
 type EtaBridgeGnIndexListResp struct {
 	Code int           `json:"code" description:"状态码"`
 	Msg  string        `json:"msg" description:"提示信息"`
 	Data IndexListResp `json:"data" description:"返回数据"`
 }
 
-// IndexListResp
-// @Description: 指标列表数据
 type IndexListResp struct {
 	Page paging.PagingItem `description:"分页数据"`
 	List []IndexInfo
 }
 
-// IndexInfo
-// @Description: 指标信息
 type IndexInfo struct {
 	ClassifyNameOne   string `description:"一级目录"`
 	ClassifyNameTwo   string `description:"二级目录"`
@@ -178,8 +135,6 @@ type IndexInfo struct {
 	SourceCode        string `description:"来源编码"`
 }
 
-// BridgeGnIndexParams
-// @Description: 桥接服务-获取国能指标数据入参
 type BridgeGnIndexParams struct {
 	LastModifyTime string `json:"last_modify_time" description:"最近一次更新时间"`
 	PageIndex      int    `json:"page_index" description:"当前页码"`
@@ -187,16 +142,6 @@ type BridgeGnIndexParams struct {
 	IndexId        string `json:"index_id" description:"指标ID,不为空时表示只取该指标"`
 }
 
-// syncCrmIndex
-// @Description: 开始同步CRM指标信息
-// @author: Roc
-// @datetime 2024-05-17 15:55:11
-// @param assetPkgCd string
-// @param currIndex int
-// @param pageSize int
-// @param lastUpdateTimeStr string
-// @return err error
-// @return errMsgList []string
 func syncGnIndex(currIndex, pageSize int, baseLastUpdateTimeStr string) (err error, errMsgList []string) {
 	fmt.Println("开始第", currIndex, "页的更新")
 	errMsgList = make([]string, 0)
@@ -223,9 +168,7 @@ func syncGnIndex(currIndex, pageSize int, baseLastUpdateTimeStr string) (err err
 		return
 	}
 
-	//totalPage := result.Data.Paging.Pages
 
-	// 处理指标信息
 	for _, v := range result.Data.List {
 		tmpErr := handleIndex(v)
 		if tmpErr != nil {
@@ -234,7 +177,6 @@ func syncGnIndex(currIndex, pageSize int, baseLastUpdateTimeStr string) (err err
 	}
 
 	fmt.Println(currIndex, "是否已结束：", result.Data.Page.IsEnd)
-	// 如果还有下一页，那么就继续请求下一页
 	if !result.Data.Page.IsEnd {
 		_, tmpErrMsgList := syncGnIndex(currIndex+1, utils.SyncCrmIndexNum, baseLastUpdateTimeStr)
 		errMsgList = append(errMsgList, tmpErrMsgList...)
@@ -243,12 +185,7 @@ func syncGnIndex(currIndex, pageSize int, baseLastUpdateTimeStr string) (err err
 	return
 }
 
-// handleIndex
-// @Description: 指标处理
-// @param index
-// @return err
 func handleIndex(index IndexInfo) (err error) {
-	// 处理分类（如果不存在就创建）
 	oneClassifyId, twoClassifyId, thirdClassifyId, err := handleClassify(index)
 	if err != nil {
 		return
@@ -261,19 +198,11 @@ func handleIndex(index IndexInfo) (err error) {
 	if classifyId <= 0 {
 		classifyId = oneClassifyId
 	}
-	// 处理指标（如果不存在就创建）
 	err = handleEdbInfo(index, classifyId)
 
 	return
 }
 
-// handleClassify
-// @Description: 分类处理
-// @param index
-// @return firstClassifyId
-// @return secondClassifyId
-// @return thirdClassifyId
-// @return err
 func handleClassify(index IndexInfo) (firstClassifyId, secondClassifyId, thirdClassifyId int64, err error) {
 	firstClassifyName := getClassifyName(index.ClassifyNameOne)
 	secondClassifyName := getClassifyName(index.ClassifyNameTwo)
@@ -284,31 +213,26 @@ func handleClassify(index IndexInfo) (firstClassifyId, secondClassifyId, thirdCl
 	twoLevel = 2
 	threeLevel = 3
 
-	// 一级分类
 	{
 		var parentId int64
 		parentId = 0
 		classifyName := firstClassifyName
 		level := oneLevel
 
-		// 获取层级下的父级分类map
 		currParentClassifyMap, ok := CurrLevelParentClassifyMap[level]
 		if !ok {
 			currParentClassifyMap = make(map[int64]map[string]CurrClassify)
 		}
 
-		// 获取父级id下的分类列表
 		currClassifyListMap, ok := currParentClassifyMap[parentId]
 		if !ok {
 			currClassifyListMap = make(map[string]CurrClassify)
 		}
 
-		// 根据分类名称获取分类
 		currClassify, ok := currClassifyListMap[classifyName]
 		if !ok {
 			timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 			classifyInfo := &data_manage.EdbClassify{
-				//ClassifyId:      0,
 				ClassifyType:    0,
 				ClassifyName:    classifyName,
 				ClassifyNameEn:  classifyName,
@@ -348,7 +272,6 @@ func handleClassify(index IndexInfo) (firstClassifyId, secondClassifyId, thirdCl
 
 	}
 
-	// 二级分类
 	{
 		parentId := firstClassifyId
 		classifyName := secondClassifyName
@@ -358,24 +281,20 @@ func handleClassify(index IndexInfo) (firstClassifyId, secondClassifyId, thirdCl
 			return
 		}
 
-		// 获取层级下的父级分类map
 		currParentClassifyMap, ok := CurrLevelParentClassifyMap[level]
 		if !ok {
 			currParentClassifyMap = make(map[int64]map[string]CurrClassify)
 		}
 
-		// 获取父级id下的分类列表
 		currClassifyListMap, ok := currParentClassifyMap[parentId]
 		if !ok {
 			currClassifyListMap = make(map[string]CurrClassify)
 		}
 
-		// 根据分类名称获取分类
 		currClassify, ok := currClassifyListMap[classifyName]
 		if !ok {
 			timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 			classifyInfo := &data_manage.EdbClassify{
-				//ClassifyId:      0,
 				ClassifyType:    0,
 				ClassifyName:    classifyName,
 				ClassifyNameEn:  classifyName,
@@ -409,7 +328,6 @@ func handleClassify(index IndexInfo) (firstClassifyId, secondClassifyId, thirdCl
 
 	}
 
-	// 三级分类
 	{
 		parentId := secondClassifyId
 		classifyName := thirdClassifyName
@@ -419,24 +337,20 @@ func handleClassify(index IndexInfo) (firstClassifyId, secondClassifyId, thirdCl
 			return
 		}
 
-		// 获取层级下的父级分类map
 		currParentClassifyMap, ok := CurrLevelParentClassifyMap[level]
 		if !ok {
 			currParentClassifyMap = make(map[int64]map[string]CurrClassify)
 		}
 
-		// 获取父级id下的分类列表
 		currClassifyListMap, ok := currParentClassifyMap[parentId]
 		if !ok {
 			currClassifyListMap = make(map[string]CurrClassify)
 		}
 
-		// 根据分类名称获取分类
 		currClassify, ok := currClassifyListMap[classifyName]
 		if !ok {
 			timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 			classifyInfo := &data_manage.EdbClassify{
-				//ClassifyId:      0,
 				ClassifyType:    0,
 				ClassifyName:    classifyName,
 				ClassifyNameEn:  classifyName,
@@ -480,7 +394,6 @@ func getClassifyName(classifyName string) string {
 		return classifyName
 	}
 
-	// 如果不是“其它指标”，那么就是处理掉带有序号的、
 	if classifyName != `其它指标` {
 		classifyNameList := strings.Split(classifyName, `、`)
 		if len(classifyNameList) > 0 {
@@ -491,11 +404,6 @@ func getClassifyName(classifyName string) string {
 	return classifyName
 }
 
-// handleEdbInfo
-// @Description: 处理指标
-// @param index
-// @param thirdClassifyId
-// @return err
 func handleEdbInfo(index IndexInfo, thirdClassifyId int64) (err error) {
 	edbInfo, ok := CurrEdbInfoMap[index.DataIndexCode]
 	frequency := Frequency(strings.TrimSpace(index.Frequency))
@@ -568,7 +476,6 @@ func handleEdbInfo(index IndexInfo, thirdClassifyId int64) (err error) {
 
 		CurrEdbInfoMap[index.DataIndexCode] = edbInfo
 
-		// TODO 刷新指标明细数据
 		fmt.Println(data.RefreshEdbData(edbInfo.EdbInfoId, edbInfo.Source, edbInfo.SubSource, edbInfo.EdbCode, edbInfo.EndDate.Format(utils.FormatDate)))
 		return
 	}
@@ -606,10 +513,6 @@ func handleEdbInfo(index IndexInfo, thirdClassifyId int64) (err error) {
 	return
 }
 
-// Frequency
-// @Description: 获取频度
-// @param unit
-// @return string
 func Frequency(unit string) string {
 	switch unit {
 	case "半月度":
@@ -625,13 +528,6 @@ func Frequency(unit string) string {
 
 }
 
-// GetSource
-// @Description: 获取来源
-// @param sourceName
-// @return gnSourceName
-// @return sourceCode
-// @return source
-// @return err
 func GetSource(sourceName, sourceCode string) (gnSourceName string, source int, err error) {
 	gnSourceName = sourceName
 	var tableNameSuffix, indexNamePrefix string
@@ -647,25 +543,12 @@ func GetSource(sourceName, sourceCode string) (gnSourceName string, source int,
 		tableNameSuffix = "sci"
 	case "CCI":
 		tableNameSuffix = "cci"
-		//return
 	default:
-		// 来源编码前缀把还是
 		tableNameSuffix = strings.ToLower(sourceCode)
 
-		//if strings.Contains(sourceName, "国能购销辅助决策系统") {
-		//	gnSourceName = `国能购销辅助决策系统`
-		//	tableNameSuffix = "purchase_sales"
-		//} else if strings.Contains(sourceName, "国能市场分析平台") {
-		//	gnSourceName = `国能市场分析平台`
-		//	tableNameSuffix = "market_analysis"
-		//} else {
-		//	// TODO 自动生成表名（暂时以时间作为表名后缀，如果客户提前告知了，那么可以直接先建data表，以及edb_source表写入新的source）
-		//	tableNameSuffix = fmt.Sprint(time.Now().Format(utils.FormatDateTimeUnSpace))
-		//}
 	}
 
 	sourceItem := data_manage.GetEdbSourceBySourceName(gnSourceName)
-	// 如果找不到，说明是
 	if sourceItem == nil {
 		indexNamePrefix = strings.ToUpper(tableNameSuffix)
 
@@ -722,9 +605,7 @@ func syncGnIndexV2(currIndex, pageSize int, baseLastUpdateTimeStr string, indexI
 		return
 	}
 
-	//totalPage := result.Data.Paging.Pages
 
-	// 处理指标信息
 	for _, v := range result.Data.List {
 		tmpErr := handleIndex(v)
 		if tmpErr != nil {
@@ -733,11 +614,6 @@ func syncGnIndexV2(currIndex, pageSize int, baseLastUpdateTimeStr string, indexI
 	}
 
 	fmt.Println(currIndex, "是否已结束：", result.Data.Page.IsEnd)
-	// 如果还有下一页，那么就继续请求下一页
-	//if !result.Data.Paging.IsEnd {
-	//	_, tmpErrMsgList := syncGnIndex(currIndex+1, utils.SyncCrmIndexNum, baseLastUpdateTimeStr)
-	//	errMsgList = append(errMsgList, tmpErrMsgList...)
-	//}
 
 	return
 }
@@ -756,7 +632,6 @@ func LoadGnTempIndexIds() (indexIds []int, err error) {
 	return
 }
 
-// 用户同步的锁
 var lockSyncUser sync.Mutex
 
 func SyncGnUser(cont context.Context) (err error) {
@@ -780,10 +655,6 @@ func SyncGnUser(cont context.Context) (err error) {
 	return
 }
 
-// InitRefreshEdb
-// @Description: 初始化明细数据指标
-// @param cont
-// @return err
 func InitRefreshEdb(cont context.Context) (err error) {
 	fmt.Println("准备更新指标明细数据")
 	lockSyncGnIndex.Lock()
@@ -810,10 +681,6 @@ func InitRefreshEdb(cont context.Context) (err error) {
 		count--
 		fmt.Println("剩余：", count, "条数据待初始化")
 
-		// 未初始化明细数据的指标
-		//if !v.EndDate.IsZero() {
-		//	continue
-		//}
 		fmt.Println(data.RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, utils.BaseEdbRefreshStartDate))
 	}
 	return

services/eta_hub/edb.go

@@ -12,7 +12,6 @@ import (
 	"time"
 )
 
-// BaseEtaHubDataResp 基础返回参数
 type BaseEtaHubDataResp struct {
 	Ret         int
 	Msg         string
@@ -24,16 +23,6 @@ type BaseEtaHubDataResp struct {
 	IsAddLog    bool `json:"-" description:"true 新增操作日志，false 不新增操作日志" `
 }
 
-// HttpEtaHubPost
-// @Description: eta-bridge的post请求
-// @author: Roc
-// @datetime 2024-02-28 16:55:02
-// @param urlStr string
-// @param postData string
-// @param param interface{}
-// @return bResult []byte
-// @return err error
-// @return errMsg string
 func HttpEtaHubPost(urlStr string, param interface{}) (bResult []byte, err error, errMsg string) {
 	if utils.EtaHubUrl == "" {
 		errMsg = `未配置第三方的桥接服务地址`
@@ -56,7 +45,6 @@ func HttpEtaHubPost(urlStr string, param interface{}) (bResult []byte, err error
 		return
 	}
 
-	// 随机字符串
 	nonce := utils.GetRandStringNoSpecialChar(16)
 	timestamp := fmt.Sprint(time.Now().Second())
 	sign := GetSign(nonce, timestamp)
@@ -101,15 +89,6 @@ func HttpEtaHubPost(urlStr string, param interface{}) (bResult []byte, err error
 	return
 }
 
-// HttpEtaHubGet
-// @Description: eta-bridge的get请求
-// @author: Roc
-// @datetime 2024-02-28 16:55:02
-// @param urlStr string
-// @param postData string
-// @return bResult []byte
-// @return err error
-// @return errMsg string
 func HttpEtaHubGet(urlStr string) (bResult []byte, err error, errMsg string) {
 	if utils.EtaHubUrl == "" {
 		errMsg = `未配置第三方的桥接服务地址`
@@ -127,7 +106,6 @@ func HttpEtaHubGet(urlStr string) (bResult []byte, err error, errMsg string) {
 	}
 
 	contentType := "application/json;charset=utf-8"
-	// 随机字符串
 	nonce := utils.GetRandStringNoSpecialChar(16)
 	timestamp := fmt.Sprint(time.Now().Second())
 	sign := GetSign(nonce, timestamp)
@@ -187,8 +165,6 @@ func GetSign(nonce, timestamp string) (sign string) {
 		signStr += k + "=" + signStrMap[k] + "&"
 	}
 	signStr = strings.Trim(signStr, "&")
-	//fmt.Println("signStr:" + signStr)
 	sign = utils.HmacSha256ToBase64(utils.SECRET, signStr)
-	//fmt.Println("sign:" + sign)
 	return
 }

services/index_notice.go

@@ -12,21 +12,15 @@ import (
 	"time"
 )
 
-// EdbTaskNameMap 手工指标定时任务名称map集合
 var EdbTaskNameMap map[string]map[string]bool
 
-// EdbTaskNameChannel 手工指标定时任务名称channel
 var EdbTaskNameChannel chan string
 
-// EdbTaskStopChannel 手工指标定时任务停止channel
 var EdbTaskStopChannel chan string
 
-// EdbTaskRunNum 手工指标定时任务开始次数
 var EdbTaskRunNum int
 
-// AddEdbTask 新增手工指标数据录入提醒
 func AddEdbTask(cont context.Context) (err error) {
-	//失败列表
 	failList := make([]string, 0)
 
 	defer func() {
@@ -42,46 +36,30 @@ func AddEdbTask(cont context.Context) (err error) {
 	if err != nil {
 		fmt.Println("查询获取频度非日度 且 提醒时间不为空 的指标数据失败，Err：", err.Error())
 	}
-	//如果还没有初始化map，那么先初始
 	if EdbTaskNameMap == nil {
 		EdbTaskNameMap = make(map[string]map[string]bool)
 	}
 	tmpEdbTaskNameMap := make(map[string]bool)
 
-	// 今天的日期字符串（格式：2021-10-25）
 	todayStr := time.Now().Format(utils.FormatDate)
 
-	//当前周的周一与周日
 	nowWeekFirstDay := utils.GetNowWeekMonday()
 	nowWeekLastDay := utils.GetNowWeekLastDay()
 
-	//当前月的一号与最后一天
 	nowMonthFirstDay := utils.GetNowMonthFirstDay()
 	nowMonthLastDay := utils.GetNowMonthLastDay()
 
-	//当前季度的第一天与最后一天
 	nowQuarterFirstDay := utils.GetNowQuarterFirstDay()
 	nowQuarterLastDay := utils.GetNowQuarterLastDay()
 
-	//当前半年的第一天与最后一天
 	nowHalfYearFirstDay := utils.GetNowHalfYearFirstDay()
 	nowHalfYearLastDay := utils.GetNowHalfYearLastDay()
 
-	// 当前年的第一天与最后一天
 	nowYearFirstDay := utils.GetNowYearFirstDay()
 	nowYearLastDay := utils.GetNowYearLastDay()
 
 	debugNoticeUserId := 0 //测试环境，需要发送消息的用户
-	//测试环境也不发了
-	//if utils.RunMode == "debug" {
-	//	tmpWxUser, tmpErr := models.GetWxUserByMobile("17634786714")
-	//	if tmpErr == nil && tmpWxUser != nil {
-	//		//debugNoticeUserId = 44078 //测试环境的话，发送邮箱给颜鹏
-	//		debugNoticeUserId = int(tmpWxUser.UserId) //测试环境的话，发送邮箱给嘉豪
-	//	}
-	//}
-
-	//task.globalTaskManager.adminTaskList
+
 	for _, edb := range list {
 		if edb.UserId <= 0 {
 			continue //没有配置user_id的话，那么不需要提醒
@@ -99,7 +77,6 @@ func AddEdbTask(cont context.Context) (err error) {
 			}
 		}
 
-		//如果确实是有数据的
 		if edbData != nil {
 			tmpDataDtTime, _ := time.ParseInLocation(utils.FormatDate, edbData.Dt, time.Now().Location())
 			dataDtTime = tmpDataDtTime
@@ -134,7 +111,6 @@ func AddEdbTask(cont context.Context) (err error) {
 				modifyDate = modifyDate.AddDate(0, 0, addDay-7)
 			}
 
-			//如果正好是提醒日，同时本周没有过记录，那么需要提醒
 			if todayStr == modifyDate.Format(utils.FormatDate) && !nowWeekFirstDay.Before(dataDtTime) {
 				isNotice = true
 			}
@@ -154,46 +130,36 @@ func AddEdbTask(cont context.Context) (err error) {
 				modifyDate = nowMonthFirstDay.AddDate(0, 0, addDay)
 			}
 
-			//如果正好是提醒日，同时本月没有过记录，那么需要提醒
 			if todayStr == modifyDate.Format(utils.FormatDate) && !nowMonthFirstDay.Before(dataDtTime) {
 				isNotice = true
 			}
 		case "季度":
-			//提醒时间
 			if tmpEdb.NoticeTime != "" {
 				noticeArr := strings.Split(tmpEdb.NoticeTime, " ")
 				if len(noticeArr) >= 2 {
 					noticeTime = noticeArr[1]
 				}
 			}
-			//每季度更新数据时间
-			//如果正好是提醒日（每季度最后一天），同时本季度没有过记录，那么需要提醒
 			if todayStr == nowQuarterLastDay.Format(utils.FormatDate) && !nowQuarterFirstDay.Before(dataDtTime) {
 				isNotice = true
 			}
 		case "半年度":
-			//提醒时间
 			if tmpEdb.NoticeTime != "" {
 				noticeArr := strings.Split(tmpEdb.NoticeTime, " ")
 				if len(noticeArr) >= 2 {
 					noticeTime = noticeArr[1]
 				}
 			}
-			//每半年度更新数据时间
-			//如果正好是提醒日（每半年度最后一天），同时本半年度没有过记录，那么需要提醒
 			if todayStr == nowHalfYearLastDay.Format(utils.FormatDate) && !nowHalfYearFirstDay.Before(dataDtTime) {
 				isNotice = true
 			}
 		case "年度":
-			//提醒时间
 			if tmpEdb.NoticeTime != "" {
 				noticeArr := strings.Split(tmpEdb.NoticeTime, " ")
 				if len(noticeArr) >= 2 {
 					noticeTime = noticeArr[1]
 				}
 			}
-			//每年度更新数据时间
-			//如果正好是提醒日（每年度最后一天），同时半年度没有过记录，那么需要提醒
 			if todayStr == nowYearLastDay.Format(utils.FormatDate) && !nowYearFirstDay.Before(dataDtTime) {
 				isNotice = true
 			}
@@ -201,17 +167,12 @@ func AddEdbTask(cont context.Context) (err error) {
 
 		if isNotice {
 			taskName := "edb_task_" + todayStr + ":" + fmt.Sprint(tmpEdb.TradeCode)
-			//fmt.Println(taskName, ";", tmpEdb.SecName)
 
-			//定时任务
 			tmpTaskFunc := func(ctx context.Context) (funcErr error) {
-				//方法执行结束后，移除定时任务
 				defer func() {
 					EdbTaskNameChannel <- taskName
 				}()
-				// 匿名方法内判断是否发送提醒，因为可能时间到的时候，发现
 				funcIsNotice := false
-				// 再次获取指标数据详情
 				edbData, tmpErr := models.GetLastEdbdataInfo(tmpEdb.TradeCode)
 				if tmpErr != nil {
 					if tmpErr.Error() != utils.ErrNoRow() {
@@ -223,15 +184,12 @@ func AddEdbTask(cont context.Context) (err error) {
 					tmpEdb.UserId = debugNoticeUserId //测试环境的话，发送邮箱给嘉豪
 				}
 
-				//数据过期时间
 				var funcDataDtTime time.Time
-				//如果确实是有数据的
 				if edbData != nil {
 					tmpDataDtTime, _ := time.ParseInLocation(utils.FormatDate, edbData.Dt, time.Now().Location())
 					funcDataDtTime = tmpDataDtTime
 				}
 
-				//提示频度文案
 				notifyFrequency := "每日"
 
 				switch tmpEdb.Frequency {
@@ -264,7 +222,6 @@ func AddEdbTask(cont context.Context) (err error) {
 						modifyDate = modifyDate.AddDate(0, 0, addDay-7)
 					}
 
-					//如果正好是提醒日，同时本周没有过记录，那么需要提醒
 					if todayStr == modifyDate.Format(utils.FormatDate) && !nowWeekFirstDay.Before(funcDataDtTime) {
 						funcIsNotice = true
 					}
@@ -285,61 +242,47 @@ func AddEdbTask(cont context.Context) (err error) {
 						modifyDate = nowMonthFirstDay.AddDate(0, 0, addDay)
 					}
 
-					//如果正好是提醒日，同时本月没有过记录，那么需要提醒
 					if todayStr == modifyDate.Format(utils.FormatDate) && !nowMonthFirstDay.Before(funcDataDtTime) {
 						funcIsNotice = true
 					}
 				case "季度":
 					notifyFrequency = "每季度"
-					//提醒时间
 					if tmpEdb.NoticeTime != "" {
 						noticeArr := strings.Split(tmpEdb.NoticeTime, " ")
 						if len(noticeArr) >= 2 {
 							noticeTime = noticeArr[1]
 						}
 					}
-					//每季度更新数据时间
-					//如果正好是提醒日（每季度最后一天），同时本季度没有过记录，那么需要提醒
 					if todayStr == nowQuarterLastDay.Format(utils.FormatDate) && !nowQuarterFirstDay.Before(funcDataDtTime) {
 						funcIsNotice = true
 					}
 				case "半年度":
 					notifyFrequency = "每半年度"
-					//提醒时间
 					if tmpEdb.NoticeTime != "" {
 						noticeArr := strings.Split(tmpEdb.NoticeTime, " ")
 						if len(noticeArr) >= 2 {
 							noticeTime = noticeArr[1]
 						}
 					}
-					//每半年度更新数据时间
-					//如果正好是提醒日（每半年度最后一天），同时本半年度没有过记录，那么需要提醒
 					if todayStr == nowHalfYearLastDay.Format(utils.FormatDate) && !nowHalfYearFirstDay.Before(funcDataDtTime) {
 						funcIsNotice = true
 					}
 				case "年度":
 					notifyFrequency = "每年"
-					//提醒时间
 					if tmpEdb.NoticeTime != "" {
 						noticeArr := strings.Split(tmpEdb.NoticeTime, " ")
 						if len(noticeArr) >= 2 {
 							noticeTime = noticeArr[1]
 						}
 					}
-					//每年度更新数据时间
-					//如果正好是提醒日（每年度最后一天），同时半年度没有过记录，那么需要提醒
 					if todayStr == nowYearLastDay.Format(utils.FormatDate) && !nowYearFirstDay.Before(funcDataDtTime) {
 						funcIsNotice = true
 					}
 				}
 
-				//fmt.Println(tmpEdb.TradeCode, " funcIsNotice:", funcIsNotice)
-				//如果还是要提醒
 				if funcIsNotice {
-					//用户微信openid列表数据
 					openIdList := make([]*models.OpenIdList, 0)
 
-					//获取用户信息
 					admin, err := models.GetAdminByAdminId(tmpEdb.UserId)
 					if err != nil {
 						if err.Error() == utils.ErrNoRow() {
@@ -353,7 +296,6 @@ func AddEdbTask(cont context.Context) (err error) {
 						funcErr = errors.New("openId 列表为空" + strconv.Itoa(tmpEdb.UserId))
 						return
 					}
-					//发送消息
 					if admin.OpenId == "" {
 						funcErr = errors.New("openId 列表为空" + strconv.Itoa(tmpEdb.UserId))
 						return
@@ -371,7 +313,6 @@ func AddEdbTask(cont context.Context) (err error) {
 					if err != nil {
 						return err
 					}
-					//发送成功，记录发送日志
 					{
 						sendRecord := new(models.EdbinfoSendMsgRecord)
 						sendRecord.UserId = tmpEdb.UserId
@@ -386,15 +327,12 @@ func AddEdbTask(cont context.Context) (err error) {
 				return
 			}
 
-			//添加定时任务（没有设置通知时间就不进行定时任务通知了）
 			spec := ``
 			if noticeTime != "" {
 				noticeArr := strings.Split(noticeTime, ":")
 				if len(noticeArr) == 3 {
-					//spec = ` */20 * * * * * `
 					spec = fmt.Sprintf(` %s %s %s * * * `, noticeArr[2], noticeArr[1], noticeArr[0])
 
-					//定时任务开始的时间
 					tmpTask := task.NewTask(taskName, spec, tmpTaskFunc)
 
 					task.AddTask(taskName, tmpTask)
@@ -405,23 +343,16 @@ func AddEdbTask(cont context.Context) (err error) {
 		}
 	}
 
-	//将当天的手工指标加入到手工指标池去
 	EdbTaskNameMap[todayStr] = tmpEdbTaskNameMap
-	//开启协程，用来清除定时任务
 	go deleteTask()
 
-	//如果当前定时任务执行次数大于0次，那么需要往手工指标定时任务停止channel写入数据，用来关闭昨天没有执行的的定时任务
 	if EdbTaskRunNum > 0 {
-		//清除昨天的数据
 		EdbTaskStopChannel <- time.Now().AddDate(0, 0, -1).Format(utils.FormatDate)
 	}
-	//手工指标定时任务开始次数累加
 	EdbTaskRunNum++
 	return
-	//fmt.Println(task.NewMapSorter())
 }
 
-// deleteTask 清除已通知的任务
 func deleteTask() {
 	for {
 		select {

services/init_base.go

@@ -1,12 +1,2 @@
 package services
 
-// InitEs 数据初始化的时候，用来更新es信息
-//func InitEs() {
-//	err := RefreshData(nil)
-//	if err != nil {
-//		fmt.Println("更新指标信息失败,err:", err)
-//		return
-//	}
-//
-//	fmt.Println("更新成功")
-//}

services/oss.go

@@ -8,7 +8,6 @@ import (
 	"eta_gn/eta_task/utils"
 )
 
-// UploadAudioAliyun 音频上传到阿里云
 func UploadAudioAliyun(filename, filepath string) (string, error) {
 	if utils.AccessKeyId == `` {
 		return "0", errors.New("阿里云信息未配置")

services/report.go

@@ -14,7 +14,6 @@ import (
 	"time"
 )
 
-// UpdateReportEs 更新报告/章节Es
 func UpdateReportEs(reportId int, publishState int) (err error) {
 	if reportId <= 0 {
 		return
@@ -25,13 +24,11 @@ func UpdateReportEs(reportId int, publishState int) (err error) {
 	}
 	categories := ""
 	if reportInfo.HasChapter == 1 {
-		// 晨周报
 		chapterList, tmpErr := models.GetPublishedChapterListByReportId(reportInfo.Id)
 		if tmpErr != nil {
 			return
 		}
 		if len(chapterList) > 0 {
-			// 更新章节的es数据
 			for _, chapterInfo := range chapterList {
 				err = updateReportChapterEsByChapter(chapterInfo)
 				if err != nil {
@@ -40,7 +37,6 @@ func UpdateReportEs(reportId int, publishState int) (err error) {
 			}
 		}
 	} else {
-		//if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
 		permissionList, tmpErr := models.GetChartPermissionNameFromMappingByKeyword("rddp", reportInfo.ClassifyIdSecond)
 		if tmpErr != nil {
 			return
@@ -51,16 +47,13 @@ func UpdateReportEs(reportId int, publishState int) (err error) {
 		}
 		aliasArr, _ := addCategoryAliasToArr(categoryArr)
 		categories = strings.Join(aliasArr, ",")
-		//}
 	}
 
-	// 最小单位的分类id
 	minClassifyId, minClassifyName, err := getMinClassify(reportInfo)
 	if err != nil {
 		return
 	}
 
-	// 新增报告ES
 	esReport := &models.ElasticReportDetail{
 		ReportId:           reportInfo.Id,
 		ReportChapterId:    0,
@@ -87,7 +80,6 @@ func UpdateReportEs(reportId int, publishState int) (err error) {
 	return
 }
 
-// addCategoryAliasToArr 品种别名
 func addCategoryAliasToArr(categoryArr []string) (aliasArr []string, err error) {
 	aliasArr = categoryArr
 	if len(categoryArr) > 0 {
@@ -121,14 +113,7 @@ func addCategoryAliasToArr(categoryArr []string) (aliasArr []string, err error)
 	return
 }
 
-// updateReportChapterEsByChapter
-// @Description: 通过章节详情更新报告章节ES
-// @author: Roc
-// @datetime 2024-06-20 13:16:11
-// @param chapterInfo *models.ReportChapter
-// @return err error
 func updateReportChapterEsByChapter(chapterInfo *models.ReportChapter) (err error) {
-	// 章节对应的品种
 	obj := report.ReportChapterPermissionMapping{}
 	permissionList, tmpErr := obj.GetPermissionItemListById(chapterInfo.ReportChapterId)
 	if tmpErr != nil {
@@ -142,7 +127,6 @@ func updateReportChapterEsByChapter(chapterInfo *models.ReportChapter) (err erro
 	}
 	aliasArr, _ := addCategoryAliasToArr(categoryArr)
 	categories := strings.Join(aliasArr, ",")
-	// 新增/编辑ES
 
 	esChapter := &models.ElasticReportDetail{
 		ReportId:           chapterInfo.ReportId,
@@ -170,7 +154,6 @@ func updateReportChapterEsByChapter(chapterInfo *models.ReportChapter) (err erro
 	return
 }
 
-// PublishReport 定时发布研报-每秒
 func PublishReport(cont context.Context) (err error) {
 	errMsgList := make([]string, 0)
 	defer func() {
@@ -191,7 +174,6 @@ func PublishReport(cont context.Context) (err error) {
 	if listLen == 0 {
 		return
 	}
-	// 比对时间(分钟),时间相等则发布并推送
 	for i := 0; i < listLen; i++ {
 		item := list[i]
 		var publishTime time.Time
@@ -200,13 +182,9 @@ func PublishReport(cont context.Context) (err error) {
 		} else {
 			publishTime = time.Now()
 		}
-		//if item.HasChapter == 1 && (item.ChapterType == utils.REPORT_TYPE_DAY || item.ChapterType == utils.REPORT_TYPE_WEEK) {
-		//	continue
-		//}
 
 		var tmpErr error
 		if item.HasChapter == 1 { // 章节类型的报告
-			// 发布报告和章节
 			item.State = 2
 			item.PublishTime = publishTime
 			item.ModifyTime = time.Now().Local()
@@ -226,13 +204,6 @@ func PublishReport(cont context.Context) (err error) {
 	return
 }
 
-// handleByPublishReport
-// @Description: 报告发布
-// @author: Roc
-// @datetime 2024-06-28 13:26:51
-// @param item *models.Report
-// @param publishTime time.Time
-// @return err error
 func handleByPublishReport(item *models.Report) {
 	recordItem := &models.ReportStateRecord{
 		ReportId:   item.Id,
@@ -243,26 +214,21 @@ func handleByPublishReport(item *models.Report) {
 		CreateTime: time.Now(),
 	}
 
-	// 添加记录
 	_, _ = models.AddReportStateRecord(recordItem)
 
 	if item.HasChapter == 1 {
-		// 生产报告章节音频
 		_ = UpdateChaptersVideoByReportId(item.Id)
 	} else {
-		// 生成音频
 		if item.VideoUrl == "" {
 			_ = CreateVideo(item)
 		}
 	}
 
-	// 更新报告Es
 	err := UpdateReportEs(item.Id, 2)
 	if err != nil {
 		utils.FileLog.Error("UpdateReportEs, 更新报告Es失败, ReportId:%s, Err:%s", item.Id, err.Error())
 	}
 
-	// 判断是否未发送模版消息，并且配置了立即推送模版消息的报告需要推送
 	if utils.SendWxTemplateEnable == "1" {
 		if item.MsgIsSend == 0 && item.PreMsgSend == 1 {
 			_ = ReportSendTemplateMsg(item.Id)
@@ -318,7 +284,6 @@ func ReportSendTemplateMsg(reportId int) (err error) {
 	return
 }
 
-// sendMiniProgramReportWxMsg 推送报告微信模板消息-小程序链接
 func sendMiniProgramReportWxMsg(report *models.Report) (err error) {
 	reportId := report.Id
 	var msg string
@@ -328,7 +293,6 @@ func sendMiniProgramReportWxMsg(report *models.Report) (err error) {
 			fmt.Println("msg:", msg)
 			utils.FileLog.Error(fmt.Sprintf("SendMiniProgramReportWxMsg, 发送报告模版消息失败, ReportId:%s, Err:%s", reportIdStr, err.Error()))
 			go alarm_msg.SendAlarmMsg("SendMiniProgramReportWxMsg发送报告模版消息失败;"+"ReportId:"+reportIdStr+"，Err："+err.Error()+";msg:"+msg, 3)
-			//go utils.SendEmail("SendMiniProgramReportWxMsg发送报告模版消息失败"+"【"+utils.APPNAME+"】"+"【"+utils.RunMode+"】"+time.Now().Format("2006-01-02 15:04:05"), "ReportId:"+reportIdStr+";"+msg+";Err:"+err.Error(), toUser)
 		}
 	}()
 	utils.FileLog.Info("%s", "services SendMsg")
@@ -345,25 +309,21 @@ func sendMiniProgramReportWxMsg(report *models.Report) (err error) {
 		return err
 	}
 
-	// 判断分类是否存在
 	_, err = models.GetClassifyById(minClassifyId)
 	if err != nil {
 		msg = "获取报告分类失败 err:" + err.Error()
 		return err
 	}
-	// 获取该分类关联的openid列表
 	openIdArr, err = models.GetOpenIdArrByClassifyId(minClassifyId)
 	if err != nil {
 		msg = "GetOpenIdArrByClassifyNameSecond err:" + err.Error()
 		return err
 	}
 
-	// TODO 弘则的文案是不是要去掉
 	title := fmt.Sprintf("弘则%s", report.ClassifyNameFirst)
 	if CheckTwoWeekOrMonthReport(report.ClassifyIdFirst, report.ClassifyNameFirst) {
 		title = fmt.Sprintf("弘则%s", report.ClassifyNameSecond)
 	}
-	//redirectUrl := utils.TemplateRedirectUrl + strconv.Itoa(reportId)
 	first := fmt.Sprintf("Hi,最新一期%s已上线，欢迎查看", report.ClassifyNameFirst)
 	keyword1 := title
 	keyword2 := report.Title
@@ -394,7 +354,6 @@ func sendMiniProgramReportWxMsg(report *models.Report) (err error) {
 	return
 }
 
-// CheckTwoWeekOrMonthReport 校验推送报告是否为双周报或者月报
 func CheckTwoWeekOrMonthReport(classifyId int, classifyName string) (ok bool) {
 	if utils.RunMode == "debug" {
 		miniStrArr := []string{
@@ -404,7 +363,6 @@ func CheckTwoWeekOrMonthReport(classifyId int, classifyName string) (ok bool) {
 			ok = true
 		}
 	} else {
-		// 此处生产环境用ID主要是担心分类改了名字...
 		IdArr := []int{
 			96, 112,
 		}
@@ -415,7 +373,6 @@ func CheckTwoWeekOrMonthReport(classifyId int, classifyName string) (ok bool) {
 	return
 }
 
-// ClearReportSaveLog 每天清理两周前的报告保存日志
 func ClearReportSaveLog(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
@@ -433,12 +390,6 @@ func ClearReportSaveLog(cont context.Context) (err error) {
 	return
 }
 
-// UpdateChaptersVideoByReportId
-// @Description: 更新报告章节音频
-// @author: Roc
-// @datetime 2024-06-28 13:52:56
-// @param reportId int
-// @return err error
 func UpdateChaptersVideoByReportId(reportId int) (err error) {
 	defer func() {
 		if err != nil {
@@ -450,13 +401,11 @@ func UpdateChaptersVideoByReportId(reportId int) (err error) {
 	if err != nil {
 		return
 	}
-	// 生成video
 	nowTime := time.Now()
 	updateCols := make([]string, 0)
 	updateCols = append(updateCols, "VideoUrl", "VideoName", "VideoSize", "VideoPlaySeconds")
 	for i := 0; i < len(chapterList); i++ {
 		item := chapterList[i]
-		// 忽略已有音频的章节
 		if item.VideoUrl != "" && item.VideoName != "" && item.VideoSize != "" && item.VideoPlaySeconds != "" {
 			continue
 		}
@@ -477,14 +426,6 @@ func UpdateChaptersVideoByReportId(reportId int) (err error) {
 	return
 }
 
-// getMinClassify
-// @Description: 获取最小分类ID
-// @author: Roc
-// @datetime 2024-06-20 09:23:19
-// @param reportInfo *models.Report
-// @return minClassifyId int
-// @return minClassifyName string
-// @return err error
 func getMinClassify(reportInfo *models.Report) (minClassifyId int, minClassifyName string, err error) {
 	defer func() {
 		if err != nil {

services/task.go

@@ -14,16 +14,13 @@ import (
 
 func Task() {
 	fmt.Println("task start")
-	// 如果开启了需要走生产环境的配置，才需要走这些任务
 	if utils.RunMode == "release" || utils.IsStartReleaseTask {
 		releaseTask()
 	}
 
-	// 定时发布研报
 	publishReport := task.NewTask("publishReport", "0 */1 * * * *", PublishReport)
 	task.AddTask("定时发布研报", publishReport)
 
-	// 定时汇总数据源终端指标更新情况
 	setEdbSourceStatTask := task.NewTask("setEdbSourceStatTask", "0 20 19,23 * * *", data_stat.SetEdbSourceStatTask)
 	task.AddTask("数据源统计表", setEdbSourceStatTask)
 
@@ -33,40 +30,31 @@ func Task() {
 	fmt.Println("task end")
 }
 
-// 生产环境需要走的任务
 func releaseTask() {
-	// 定时统计交易所的持仓分析数据
 	initPositionTask := task.NewTask("initPositionTask", "0 20,40 16-19 * * *", data.InitPositionTask)
 	task.AddTask("initPositionTask", initPositionTask)
 
-	//刷新指标数据
 	refreshData := task.NewTask("refreshData", "0 30 0,19 * * *", RefreshData)
 	task.AddTask("refreshData", refreshData)
 
-	// 根据配置刷新指标数据
 	configRefreshData := task.NewTask("syncBaseDataExt", "0 */30 * * * * ", ConfigRefreshDataGn)
 	task.AddTask("configRefreshData", configRefreshData)
 
 	syncBaseDataExt := task.NewTask("syncBaseDataExt", "0 */30 * * * * ", SyncBaseDataExt)
 	task.AddTask("syncBaseDataExt", syncBaseDataExt)
 
-	//初始化指标更新状态
 	resetEdbInfoIsUpdate := task.NewTask("resetEdbInfoIsUpdate", "0 0 0 * * *", data.ResetEdbInfoIsUpdate)
 	task.AddTask("resetEdbInfoIsUpdate", resetEdbInfoIsUpdate)
 
-	//删除日志 report_save_log，ppt_v2_save_log，保留一个月的
 	deleteLog := task.NewTask("syncSubStatus", "0 0 2 2 * *", DeleteLog)
 	task.AddTask("deleteLog", deleteLog)
 
-	// 定时发布英文研报
 	publishEnglishReport := task.NewTask("publishEnglishReport", "0 */1 * * * *", PublishEnglishReport)
 	task.AddTask("定时发布英文研报", publishEnglishReport)
 
-	// 每天清理两周前的报告保存日志
 	clearReportSaveLog := task.NewTask("clearReportSaveLog", "0 15 23 * * *", ClearReportSaveLog)
 	task.AddTask("定时清理报告保存日志", clearReportSaveLog)
 
-	// 每天清理三个月前的用户操作日志
 	clearAdminOperateLog := task.NewTask("clearAdminOperateLog", "0 20 23 * * *", ClearAdminOperateLog)
 	task.AddTask("定时清理用户操作日志", clearAdminOperateLog)
 }
@@ -74,56 +62,40 @@ func releaseTask() {
 func RefreshData(cont context.Context) (err error) {
 	wg := sync.WaitGroup{}
 
-	//手工数据
 	go func() {
 		wg.Add(1)
 		data.RefreshDataFromManual(&wg)
 	}()
 
-	// 持仓分析
-	//go func() {
-	//	wg.Add(1)
-	//	_ = data.RefreshDataFromTradeAnalysis(&wg)
-	//}()
 
-	// 刷新未配置刷新时间点的来源(可能含未知的来源, 统一在这个时间刷新)
 	go func() {
 		wg.Add(1)
 		data.NoneConfigRefreshDataGn(&wg)
 	}()
 
 	wg.Wait()
-	////计算指标
 	data.RefreshDataFromCalculateAll()
 
-	// 刷新所有的基础预测指标
 	data.RefreshBasePredictDataAll()
 
-	// 预测计算指标
 	data.RefreshPredictDataFromCalculateAll()
 
-	// 指标系列计算数据
 	_ = data.RefreshFactorEdbCalculateData()
 
-	// 指标系列图表计算数据
 	_ = data.RefreshFactorEdbChartCalculateData()
 
 	time.Sleep(5 * time.Second)
-	//data.RefreshNotice()
 
 	fmt.Println("Refresh End")
 	return
 }
 
-// SyncBaseDataExt 刷新基础数据
 func SyncBaseDataExt(cont context.Context) (err error) {
 	now := time.Now()
 	if now.Hour() == 0 || now.Hour() == 19 {
 		return nil
 	}
-	//同步手工数据
 	go data.SyncManualDataBase()
-	//刷新图表中，指标的最新日期
 	go data.SetChartEdbEndDate()
 	return
 }

services/task_gn.go

@@ -7,13 +7,8 @@ import (
 )
 
 func GnTask() {
-	// 初始化一次
-	//fmt.Println(eta_bridge.SyncGnIndex(nil))
-	//fmt.Println(eta_bridge.InitRefreshEdb(nil))
 
-	// 指标相关
 
-	// 每小时同步一次指标列表
 	if utils.SyncIndexPath != `` {
 		syncIndexTime := utils.SyncIndexTime
 		if syncIndexTime == `` {
@@ -23,7 +18,6 @@ func GnTask() {
 		task.AddTask("定时同步指标信息", syncIndex)
 	}
 
-	// 每小时同步一次OA用户信息
 	syncOaUserTime := utils.SyncOaUserTime
 	if syncOaUserTime == `` {
 		syncOaUserTime = "0 0 * * * *"

services/video.go

@@ -26,11 +26,9 @@ func CreateVideo(report *models.Report) (err error) {
 		if err != nil {
 			utils.FileLog.Error("CreateVideo Err:%s", err.Error())
 			go alarm_msg.SendAlarmMsg("CreateVideo, Err:"+err.Error(), 3)
-			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "Err:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
 
-	// 获取基础配置, 若未配置则直接返回
 	conf, e := models.GetBusinessConf()
 	if e != nil {
 		err = fmt.Errorf("获取基础配置失败, Err: " + e.Error())
@@ -78,11 +76,7 @@ func CreateVideo(report *models.Report) (err error) {
 
 	saveName := utils.GetRandStringNoSpecialChar(16) + ".mp3"
 	savePath := "./" + saveName
-	//if utils.FileIsExist(savePath) {
-	//	os.Remove(savePath)
-	//}
 
-	// 如果没有文本内容，那么就不生成了
 	videoContent = strings.TrimSpace(videoContent)
 	if videoContent == `` {
 		return
@@ -152,19 +146,16 @@ func GetChineseCount(str1 string) []string {
 	return fontArr
 }
 
-// BoxHeader 信息头
 type BoxHeader struct {
 	Size       uint32
 	FourccType [4]byte
 	Size64     uint64
 }
 
-// GetMP4Duration 获取视频时长，以秒计
 func GetMP4Duration(reader io.ReaderAt) (lengthOfTime uint32, err error) {
 	var info = make([]byte, 0x10)
 	var boxHeader BoxHeader
 	var offset int64 = 0
-	// 获取moov结构偏移
 	for {
 		_, err = reader.ReadAt(info, offset)
 		if err != nil {
@@ -175,7 +166,6 @@ func GetMP4Duration(reader io.ReaderAt) (lengthOfTime uint32, err error) {
 		if fourccType == "moov" {
 			break
 		}
-		// 有一部分mp4 mdat尺寸过大需要特殊处理
 		if fourccType == "mdat" {
 			if boxHeader.Size == 1 {
 				offset += int64(boxHeader.Size64)
@@ -184,13 +174,11 @@ func GetMP4Duration(reader io.ReaderAt) (lengthOfTime uint32, err error) {
 		}
 		offset += int64(boxHeader.Size)
 	}
-	// 获取moov结构开头一部分
 	moovStartBytes := make([]byte, 0x100)
 	_, err = reader.ReadAt(moovStartBytes, offset)
 	if err != nil {
 		return
 	}
-	// 定义timeScale与Duration偏移
 	timeScaleOffset := 0x1C
 	durationOffest := 0x20
 	timeScale := binary.BigEndian.Uint32(moovStartBytes[timeScaleOffset : timeScaleOffset+4])
@@ -199,33 +187,28 @@ func GetMP4Duration(reader io.ReaderAt) (lengthOfTime uint32, err error) {
 	return
 }
 
-// getHeaderBoxInfo 获取头信息
 func getHeaderBoxInfo(data []byte) (boxHeader BoxHeader) {
 	buf := bytes.NewBuffer(data)
 	binary.Read(buf, binary.BigEndian, &boxHeader)
 	return
 }
 
-// getFourccType 获取信息头类型
 func getFourccType(boxHeader BoxHeader) (fourccType string) {
 	fourccType = string(boxHeader.FourccType[:])
 	return
 }
 
-// CreateReportVideo 生成报告video
 func CreateReportVideo(reportTitle, reportContent, reportTime string) (uploadUrl, videoName, sizeStr string, playSeconds float64, err error) {
 	defer func() {
 		if err != nil {
 			utils.FileLog.Error("CreateReportVideo Err:%s", err.Error())
 			go alarm_msg.SendAlarmMsg("CreateReportVideo, reportTitle:"+reportTitle+", Err:"+err.Error(), 3)
-			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "CreateReportVideo, reportTitle:" + reportTitle +", Err:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
 	if reportContent == "" {
 		return
 	}
 
-	// 获取基础配置, 若未配置则直接返回
 	conf, e := models.GetBusinessConf()
 	if e != nil {
 		err = fmt.Errorf("获取基础配置失败, Err: " + e.Error())
@@ -276,9 +259,6 @@ func CreateReportVideo(reportTitle, reportContent, reportTime string) (uploadUrl
 
 	saveName := utils.GetRandStringNoSpecialChar(16) + ".mp3"
 	savePath := "./" + saveName
-	//if utils.FileIsExist(savePath) {
-	//	os.Remove(savePath)
-	//}
 	contentArr := GetChineseCount(videoContent)
 	for _, v := range contentArr {
 		newText := v

services/wx_template_msg.go

@@ -62,7 +62,6 @@ type SendWxTemplate struct {
 	OpenIdArr      []string `description:"消息接收者openid"`
 }
 
-// 推送模板消息
 func SendTemplateMsgV2(sendInfo *SendWxTemplate) (err error) {
 	postData, err := json.Marshal(sendInfo)
 	if err != nil {

services/xfyun.go

@@ -20,7 +20,6 @@ type XfParams struct {
 	XfAPISecret string
 }
 
-// 科大讯飞，语音合成
 func GetXfVideo(body []byte, savePath string, req XfParams) (err error) {
 	path, err := assembleAuthUrl(req)
 	if err != nil {
@@ -66,7 +65,6 @@ func GetXfVideo(body []byte, savePath string, req XfParams) (err error) {
 				if err != nil {
 					fmt.Println("文件保存失败", err.Error())
 					goto webSocketClose
-					//return
 				}
 				fmt.Println("goto close")
 				goto webSocketClose
@@ -82,33 +80,23 @@ webSocketClose:
 	return nil
 }
 
-// @hosturl :  like  wss://iat-api.xfyun.cn/v2/iat
-// @apikey : apiKey
-// @apiSecret : apiSecret
 func assembleAuthUrl(req XfParams) (callUrl string, err error) {
 	ul, err := url.Parse(utils.XfHostUrl)
 	if err != nil {
 		return
 	}
-	//签名时间
 	date := time.Now().UTC().Format(time.RFC1123)
-	//参与签名的字段 host ,date, request-line
 	signString := []string{"host: " + ul.Host, "date: " + date, "GET " + ul.Path + " HTTP/1.1"}
-	//拼接签名字符串
 	sign := strings.Join(signString, "\n")
 	fmt.Println("sign:", sign)
-	//签名结果
 	sha := crypt.HmacSha256EncryptToBase64([]byte(sign), []byte(req.XfAPISecret))
-	//构建请求参数 此时不需要urlencoding
 	authUrl := fmt.Sprintf("api_key=\"%s\", algorithm=\"%s\", headers=\"%s\", signature=\"%s\"", req.XfAPIKey,
 		"hmac-sha256", "host date request-line", sha)
-	//将请求参数使用base64编码
 	authorization := base64.StdEncoding.EncodeToString([]byte(authUrl))
 	v := url.Values{}
 	v.Add("host", ul.Host)
 	v.Add("date", date)
 	v.Add("authorization", authorization)
-	//将编码后的字符串url encode后添加到url后面
 	callUrl = utils.XfHostUrl + "?" + v.Encode()
 	return
 }

utils/common.go

@@ -23,7 +23,6 @@ import (
 	"time"
 )
 
-// 随机数种子
 var rnd = rand.New(rand.NewSource(time.Now().UnixNano()))
 
 func GetRandString(size int) string {
@@ -60,31 +59,26 @@ func StringsToJSON(str string) string {
 	return jsons
 }
 
-// 序列化
 func ToString(v interface{}) string {
 	data, _ := json.Marshal(v)
 	return string(data)
 }
 
-// md5加密
 func MD5(data string) string {
 	m := md5.Sum([]byte(data))
 	return hex.EncodeToString(m[:])
 }
 
-// HmacMd5 HmacMd5加密
 func HmacMd5(key, data string) string {
 	h := hmac.New(md5.New, []byte(key))
 	h.Write([]byte(data))
 	return hex.EncodeToString(h.Sum([]byte("")))
 }
 
-// 获取数字随机字符
 func GetRandDigit(n int) string {
 	return fmt.Sprintf("%0"+strconv.Itoa(n)+"d", rnd.Intn(int(math.Pow10(n))))
 }
 
-// 获取随机数
 func GetRandNumber(n int) int {
 	return rnd.Intn(n)
 }
@@ -101,14 +95,12 @@ func GetToday(format string) string {
 	return today
 }
 
-// 获取今天剩余秒数
 func GetTodayLastSecond() time.Duration {
 	today := GetToday(FormatDate) + " 23:59:59"
 	end, _ := time.ParseInLocation(FormatDateTime, today, time.Local)
 	return time.Duration(end.Unix()-time.Now().Local().Unix()) * time.Second
 }
 
-// 处理出生日期函数
 func GetBrithDate(idcard string) string {
 	l := len(idcard)
 	var s string
@@ -123,7 +115,6 @@ func GetBrithDate(idcard string) string {
 	return GetToday(FormatDate)
 }
 
-// 处理性别
 func WhichSexByIdcard(idcard string) string {
 	var sexs = [2]string{"女", "男"}
 	length := len(idcard)
@@ -137,7 +128,6 @@ func WhichSexByIdcard(idcard string) string {
 	return "男"
 }
 
-// 截取小数点后几位
 func SubFloatToString(f float64, m int) string {
 	n := strconv.FormatFloat(f, 'f', -1, 64)
 	if n == "" {
@@ -156,14 +146,12 @@ func SubFloatToString(f float64, m int) string {
 	return newn[0] + "." + newn[1][:m]
 }
 
-// 截取小数点后几位
 func SubFloatToFloat(f float64, m int) float64 {
 	newn := SubFloatToString(f, m)
 	newf, _ := strconv.ParseFloat(newn, 64)
 	return newf
 }
 
-// 获取相差时间-年
 func GetYearDiffer(start_time, end_time string) int {
 	t1, _ := time.ParseInLocation("2006-01-02", start_time, time.Local)
 	t2, _ := time.ParseInLocation("2006-01-02", end_time, time.Local)
@@ -174,7 +162,6 @@ func GetYearDiffer(start_time, end_time string) int {
 	return age
 }
 
-// 获取相差时间-秒
 func GetSecondDifferByTime(start_time, end_time time.Time) int64 {
 	diff := end_time.Unix() - start_time.Unix()
 	return diff
@@ -186,7 +173,6 @@ func FixFloat(f float64, m int) float64 {
 	return newf
 }
 
-// 将字符串数组转化为逗号分割的字符串形式  ["str1","str2","str3"] >>> "str1,str2,str3"
 func StrListToString(strList []string) (str string) {
 	if len(strList) > 0 {
 		for k, v := range strList {
@@ -201,30 +187,25 @@ func StrListToString(strList []string) (str string) {
 	return ""
 }
 
-// 数据没有记录
 func ErrNoRow() string {
 	return "<QuerySeter> no row found"
 }
 
-// 校验邮箱格式
 func ValidateEmailFormatat(email string) bool {
 	reg := regexp.MustCompile(RegularEmail)
 	return reg.MatchString(email)
 }
 
-// 验证是否是手机号
 func ValidateMobileFormatat(mobileNum string) bool {
 	reg := regexp.MustCompile(RegularMobile)
 	return reg.MatchString(mobileNum)
 }
 
-// 判断文件是否存在
 func FileIsExist(filePath string) bool {
 	_, err := os.Stat(filePath)
 	return err == nil || os.IsExist(err)
 }
 
-// 获取图片扩展名
 func GetImgExt(file string) (ext string, err error) {
 	var headerByte []byte
 	headerByte = make([]byte, 8)
@@ -267,17 +248,13 @@ func GetImgExt(file string) (ext string, err error) {
 	return ext, nil
 }
 
-// 保存图片
 func SaveImage(path string, img image.Image) (err error) {
-	//需要保持的文件
 	imgfile, err := os.Create(path)
 	defer imgfile.Close()
-	// 以PNG格式保存文件
 	err = png.Encode(imgfile, img)
 	return err
 }
 
-// 保存base64数据为文件
 func SaveBase64ToFile(content, path string) error {
 	data, err := base64.StdEncoding.DecodeString(content)
 	if err != nil {
@@ -304,7 +281,6 @@ func SaveBase64ToFileBySeek(content, path string) (err error) {
 			return err
 		}
 		n, _ := f.Seek(0, 2)
-		// 从末尾的偏移量开始写入内容
 		_, err = f.WriteAt([]byte(data), n)
 		defer f.Close()
 	} else {
@@ -313,7 +289,6 @@ func SaveBase64ToFileBySeek(content, path string) (err error) {
 			return err
 		}
 		n, _ := f.Seek(0, 2)
-		// 从末尾的偏移量开始写入内容
 		_, err = f.WriteAt([]byte(data), n)
 		defer f.Close()
 	}
@@ -347,7 +322,6 @@ func PageCount(count, pagesize int) int {
 }
 
 func TrimHtml(src string) string {
-	//将HTML标签全转换成小写
 	re, _ := regexp.Compile("\\<[\\S\\s]+?\\>")
 	src = re.ReplaceAllStringFunc(src, strings.ToLower)
 
@@ -361,8 +335,6 @@ func TrimHtml(src string) string {
 	return strings.TrimSpace(src)
 }
 
-//1556164246  ->  2019-04-25 03:50:46 +0000
-//timestamp
 
 func TimeToTimestamp() {
 	fmt.Println(time.Unix(1556164246, 0).Format("2006-01-02 15:04:05"))
@@ -398,7 +370,6 @@ func toFixed(num float64, precision int) float64 {
 	return float64(round(num*output)) / output
 }
 
-// GetWilsonScore returns Wilson Score
 func GetWilsonScore(p, n float64) float64 {
 	if p == 0 && n == 0 {
 		return 0
@@ -407,7 +378,6 @@ func GetWilsonScore(p, n float64) float64 {
 	return toFixed(((p+1.9208)/(p+n)-1.96*math.Sqrt(p*n/(p+n)+0.9604)/(p+n))/(1+3.8416/(p+n)), 2)
 }
 
-// 将中文数字转化成数字，比如 第三百四十五章，返回第345章 不支持一亿及以上
 func ChangeWordsToNum(str string) (numStr string) {
 	words := ([]rune)(str)
 	num := 0
@@ -522,7 +492,6 @@ func GetWeekDay() (weekStr string) {
 	return
 }
 
-// GetNowWeekMonday 获取本周周一的时间
 func GetNowWeekMonday() time.Time {
 	offset := int(time.Monday - time.Now().Weekday())
 	if offset == 1 { //正好是周日，但是按照中国人的理解，周日是一周最后一天，而不是一周开始的第一天
@@ -533,7 +502,6 @@ func GetNowWeekMonday() time.Time {
 	return mondayTime
 }
 
-// GetLastWeekMonday 获取上周周一的时间
 func GetLastWeekMonday() time.Time {
 	offset := int(time.Monday - time.Now().Weekday())
 	if offset == 1 { //正好是周日，但是按照中国人的理解，周日是一周最后一天，而不是一周开始的第一天
@@ -544,7 +512,6 @@ func GetLastWeekMonday() time.Time {
 	return mondayTime
 }
 
-// GetNowWeekTuesday 获取本周周二的时间
 func GetNowWeekTuesday() time.Time {
 	offset := int(time.Tuesday - time.Now().Weekday())
 	if offset == 1 { //正好是周日，但是按照中国人的理解，周日是一周最后一天，而不是一周开始的第一天
@@ -555,7 +522,6 @@ func GetNowWeekTuesday() time.Time {
 	return mondayTime
 }
 
-// GetLastWeekTuesday 获取上周周二的时间
 func GetLastWeekTuesday() time.Time {
 	offset := int(time.Tuesday - time.Now().Weekday())
 	if offset == 1 { //正好是周日，但是按照中国人的理解，周日是一周最后一天，而不是一周开始的第一天
@@ -566,7 +532,6 @@ func GetLastWeekTuesday() time.Time {
 	return mondayTime
 }
 
-// GetNowWeekFriday 获取本周周四的时间
 func GetNowWeekThursday() time.Time {
 	offset := int(time.Thursday - time.Now().Weekday())
 	if offset == 1 { //正好是周日，但是按照中国人的理解，周日是一周最后一天，而不是一周开始的第一天
@@ -577,7 +542,6 @@ func GetNowWeekThursday() time.Time {
 	return fridayTime
 }
 
-// GetLastWeekFriday 获取上周周四的时间
 func GetLastWeekThursday() time.Time {
 	offset := int(time.Thursday - time.Now().Weekday())
 	if offset == 1 { //正好是周日，但是按照中国人的理解，周日是一周最后一天，而不是一周开始的第一天
@@ -588,7 +552,6 @@ func GetLastWeekThursday() time.Time {
 	return fridayTime
 }
 
-// GetNowWeekFriday 获取本周周五的时间
 func GetNowWeekFriday() time.Time {
 	offset := int(time.Friday - time.Now().Weekday())
 	if offset == 1 { //正好是周日，但是按照中国人的理解，周日是一周最后一天，而不是一周开始的第一天
@@ -599,7 +562,6 @@ func GetNowWeekFriday() time.Time {
 	return fridayTime
 }
 
-// GetLastWeekFriday 获取上周周五的时间
 func GetLastWeekFriday() time.Time {
 	offset := int(time.Friday - time.Now().Weekday())
 	if offset == 1 { //正好是周日，但是按照中国人的理解，周日是一周最后一天，而不是一周开始的第一天
@@ -610,7 +572,6 @@ func GetLastWeekFriday() time.Time {
 	return fridayTime
 }
 
-// GetNowWeekLastDay 获取本周最后一天的时间
 func GetNowWeekLastDay() time.Time {
 	offset := int(time.Monday - time.Now().Weekday())
 	if offset == 1 { //正好是周日，但是按照中国人的理解，周日是一周最后一天，而不是一周开始的第一天
@@ -623,28 +584,23 @@ func GetNowWeekLastDay() time.Time {
 	return lastDayTime
 }
 
-// GetNowMonthFirstDay 获取本月第一天的时间
 func GetNowMonthFirstDay() time.Time {
 	nowMonthFirstDay := time.Date(time.Now().Year(), time.Now().Month(), 1, 0, 0, 0, 0, time.Now().Location())
 	return nowMonthFirstDay
 }
 
-// GetNowMonthLastDay 获取本月最后一天的时间
 func GetNowMonthLastDay() time.Time {
 	nowMonthLastDay := time.Date(time.Now().Year(), time.Now().Month(), 1, 0, 0, 0, 0, time.Now().Location()).AddDate(0, 1, -1)
 	nowMonthLastDay = time.Date(nowMonthLastDay.Year(), nowMonthLastDay.Month(), nowMonthLastDay.Day(), 23, 59, 59, 0, nowMonthLastDay.Location())
 	return nowMonthLastDay
 }
 
-// GetNowQuarterFirstDay 获取本季度第一天的时间
 func GetNowQuarterFirstDay() time.Time {
 	month := int(time.Now().Month())
 	var nowQuarterFirstDay time.Time
 	if month >= 1 && month <= 3 {
-		//1月1号
 		nowQuarterFirstDay = time.Date(time.Now().Year(), 1, 1, 0, 0, 0, 0, time.Now().Location())
 	} else if month >= 4 && month <= 6 {
-		//4月1号
 		nowQuarterFirstDay = time.Date(time.Now().Year(), 4, 1, 0, 0, 0, 0, time.Now().Location())
 	} else if month >= 7 && month <= 9 {
 		nowQuarterFirstDay = time.Date(time.Now().Year(), 7, 1, 0, 0, 0, 0, time.Now().Location())
@@ -654,96 +610,71 @@ func GetNowQuarterFirstDay() time.Time {
 	return nowQuarterFirstDay
 }
 
-// GetNowQuarterLastDay 获取本季度最后一天的时间
 func GetNowQuarterLastDay() time.Time {
 	month := int(time.Now().Month())
 	var nowQuarterLastDay time.Time
 	if month >= 1 && month <= 3 {
-		//03-31 23:59:59
 		nowQuarterLastDay = time.Date(time.Now().Year(), 3, 31, 23, 59, 59, 0, time.Now().Location())
 	} else if month >= 4 && month <= 6 {
-		//06-30 23:59:59
 		nowQuarterLastDay = time.Date(time.Now().Year(), 6, 30, 23, 59, 59, 0, time.Now().Location())
 	} else if month >= 7 && month <= 9 {
-		//09-30 23:59:59
 		nowQuarterLastDay = time.Date(time.Now().Year(), 9, 30, 23, 59, 59, 0, time.Now().Location())
 	} else {
-		//12-31 23:59:59
 		nowQuarterLastDay = time.Date(time.Now().Year(), 12, 31, 23, 59, 59, 0, time.Now().Location())
 	}
 	return nowQuarterLastDay
 }
 
-// GetNowHalfYearFirstDay 获取当前半年的第一天的时间
 func GetNowHalfYearFirstDay() time.Time {
 	month := int(time.Now().Month())
 	var nowHalfYearLastDay time.Time
 	if month >= 1 && month <= 6 {
-		//03-31 23:59:59
 		nowHalfYearLastDay = time.Date(time.Now().Year(), 1, 1, 0, 0, 0, 0, time.Now().Location())
 	} else {
-		//12-31 23:59:59
 		nowHalfYearLastDay = time.Date(time.Now().Year(), 7, 1, 0, 0, 0, 0, time.Now().Location())
 	}
 	return nowHalfYearLastDay
 }
 
-// GetNowHalfYearLastDay 获取当前半年的最后一天的时间
 func GetNowHalfYearLastDay() time.Time {
 	month := int(time.Now().Month())
 	var nowHalfYearLastDay time.Time
 	if month >= 1 && month <= 6 {
-		//03-31 23:59:59
 		nowHalfYearLastDay = time.Date(time.Now().Year(), 6, 30, 23, 59, 59, 0, time.Now().Location())
 	} else {
-		//12-31 23:59:59
 		nowHalfYearLastDay = time.Date(time.Now().Year(), 12, 31, 23, 59, 59, 0, time.Now().Location())
 	}
 	return nowHalfYearLastDay
 }
 
-// GetNowYearFirstDay 获取当前年的最后一天的时间
 func GetNowYearFirstDay() time.Time {
-	//12-31 23:59:59
 	nowYearFirstDay := time.Date(time.Now().Year(), 1, 1, 0, 0, 0, 0, time.Now().Location())
 	return nowYearFirstDay
 }
 
-// GetNowYearLastDay 获取当前年的最后一天的时间
 func GetNowYearLastDay() time.Time {
-	//12-31 23:59:59
 	nowYearLastDay := time.Date(time.Now().Year(), 12, 31, 23, 59, 59, 0, time.Now().Location())
 	return nowYearLastDay
 }
 
-// CalculationDate 计算两个日期之间相差n年m月y天
 func CalculationDate(startDate, endDate time.Time) (beetweenDay string, err error) {
-	//startDate := time.Date(2021, 3, 28, 0, 0, 0, 0, time.Now().Location())
-	//endDate := time.Date(2022, 3, 31, 0, 0, 0, 0, time.Now().Location())
 	numYear := endDate.Year() - startDate.Year()
 
 	numMonth := int(endDate.Month()) - int(startDate.Month())
 
 	numDay := 0
-	//获取截止月的总天数
 	endDateDays := getMonthDay(endDate.Year(), int(endDate.Month()))
 
-	//获取截止月的前一个月
 	endDatePrevMonthDate := endDate.AddDate(0, -1, 0)
-	//获取截止日期的上一个月的总天数
 	endDatePrevMonthDays := getMonthDay(endDatePrevMonthDate.Year(), int(endDatePrevMonthDate.Month()))
-	//获取开始日期的的月份总天数
 	startDateMonthDays := getMonthDay(startDate.Year(), int(startDate.Month()))
 
-	//判断，截止月是否完全被选中，如果相等，那么代表截止月份全部天数被选择
 	if endDate.Day() == endDateDays {
 		numDay = startDateMonthDays - startDate.Day() + 1
 
-		//如果剩余天数正好与开始日期的天数是一致的，那么月份加1
 		if numDay == startDateMonthDays {
 			numMonth++
 			numDay = 0
-			//超过月份了，那么年份加1
 			if numMonth == 12 {
 				numYear++
 				numMonth = 0
@@ -753,21 +684,15 @@ func CalculationDate(startDate, endDate time.Time) (beetweenDay string, err erro
 		numDay = endDate.Day() - startDate.Day() + 1
 	}
 
-	//天数小于0，那么向月份借一位
 	if numDay < 0 {
-		//向上一个月借一个月的天数
 		numDay += endDatePrevMonthDays
 
-		//总月份减去一个月
 		numMonth = numMonth - 1
 	}
 
-	//月份小于0，那么向年份借一位
 	if numMonth < 0 {
-		//向上一个年借12个月
 		numMonth += 12
 
-		//总年份减去一年
 		numYear = numYear - 1
 	}
 	if numYear < 0 {
@@ -787,7 +712,6 @@ func CalculationDate(startDate, endDate time.Time) (beetweenDay string, err erro
 	return
 }
 
-// getMonthDay 获取某年某月有多少天
 func getMonthDay(year, month int) (days int) {
 	if month != 2 {
 		if month == 4 || month == 6 || month == 9 || month == 11 {
@@ -806,7 +730,6 @@ func getMonthDay(year, month int) (days int) {
 	return
 }
 
-// SubStr 截取字符串（中文）
 func SubStr(str string, subLen int) string {
 	strRune := []rune(str)
 	bodyRuneLen := len(strRune)
@@ -817,7 +740,6 @@ func SubStr(str string, subLen int) string {
 	return str
 }
 
-// InArrayByInt php中的in_array（判断Int类型的切片中是否存在该int值）
 func InArrayByInt(idIntList []int, searchId int) (has bool) {
 	for _, id := range idIntList {
 		if id == searchId {
@@ -828,7 +750,6 @@ func InArrayByInt(idIntList []int, searchId int) (has bool) {
 	return
 }
 
-// InArrayByStr php中的in_array（判断String类型的切片中是否存在该string值）
 func InArrayByStr(idStrList []string, searchId string) (has bool) {
 	for _, id := range idStrList {
 		if id == searchId {
@@ -860,13 +781,11 @@ func GetLocalIP() (ip string, err error) {
 	return
 }
 
-// 富文本字段过滤处理
 func GetRichText(content string) (contentSub string) {
 	contentSub = strings.Replace(content, "<p data-f-id=\"pbf\" style=\"text-align: center; font-size: 14px; margin-top: 30px; opacity: 0.65; font-family: sans-serif;\">Powered by <a href=\"https://www.froala.com/wysiwyg-editor?pb=1\" title=\"Froala Editor\">Froala Editor</a></p>", "", -1)
 	return
 }
 
-// GetOrmInReplace 获取orm的in查询替换?的方法
 func GetOrmInReplace(num int) string {
 	template := make([]string, num)
 	for i := 0; i < num; i++ {
@@ -875,7 +794,6 @@ func GetOrmInReplace(num int) string {
 	return strings.Join(template, ",")
 }
 
-// SubFloatToFloatStr 截取小数点后几位
 func SubFloatToFloatStr(f float64, m int) string {
 	newn := SubFloatToString(f, m)
 	return newn
@@ -914,7 +832,6 @@ func GetVideoPlaySeconds(videoPath string) (playSeconds float64, err error) {
 	return
 }
 
-// GetTimeSubDay 计算两个时间的自然日期差（后面减去前面）
 func GetTimeSubDay(t1, t2 time.Time) int {
 	var day int
 	swap := false
@@ -925,7 +842,6 @@ func GetTimeSubDay(t1, t2 time.Time) int {
 
 	t1_ := t1.Add(time.Duration(t2.Sub(t1).Milliseconds()%86400000) * time.Millisecond)
 	day = int(t2.Sub(t1).Hours() / 24)
-	// 计算在t1+两个时间的余数之后天数是否有变化
 	if t1_.Day() != t1.Day() {
 		day += 1
 	}
@@ -937,9 +853,6 @@ func GetTimeSubDay(t1, t2 time.Time) int {
 	return day
 }
 
-// HmacSha256 计算HmacSha256
-// key 是加密所使用的key
-// data 是加密的内容
 func HmacSha256(key string, data string) []byte {
 	mac := hmac.New(sha256.New, []byte(key))
 	_, _ = mac.Write([]byte(data))
@@ -947,12 +860,10 @@ func HmacSha256(key string, data string) []byte {
 	return mac.Sum(nil)
 }
 
-// HmacSha256ToBase64 将加密后的二进制转Base64字符串
 func HmacSha256ToBase64(key string, data string) string {
 	return base64.URLEncoding.EncodeToString(HmacSha256(key, data))
 }
 
-// MinusInt 获取两个[]int差集
 func MinusInt(a []int, b []int) []int {
 	var diff []int
 	mpA, mpB := make(map[int]bool), make(map[int]bool)

utils/config.go

@@ -17,7 +17,6 @@ var (
 	MYSQL_URL_ETA  string
 
 	REDIS_CACHE string //缓存地址
-	//Rc          *cache.Cache //redis缓存
 	Re error       //redis错误
 	Rc RedisClient //redis缓存
 )
@@ -34,19 +33,16 @@ var (
 	APPNAME                        string //项目中文名称
 	EmailSendToUsers               string // 邮件提醒人员
 	RefreshEdbInfoEmailSendToUsers string // 刷新完成通知邮件人员
-	// AlarmMsgUrl 报警服务地址
 	AlarmMsgUrl        string
 	IsStartReleaseTask bool // 是否开启正式的定时任务刷新
 )
 
-// 经济数据库
 var (
 	EDB_LIB_URL         string
 	APP_EDB_LIB_NAME_EN string
 	EDB_LIB_Md5_KEY     string
 )
 
-// 公共数据服务接口参数
 var (
 	APPID  string
 	SECRET string
@@ -63,31 +59,26 @@ var (
 
 	WxYbAppId string //微信研报小程序
 
-	//内部员工公众号（弘则部门）
 	AdminWxAppId     string
 	AdminWxAppSecret string
 )
 
-// 模板消息推送
 var (
 	SendWxTemplateMsgUrl string
 )
 
-// ES配置
 var (
 	ES_URL      string // ES服务器地址
 	ES_USERNAME string // ES账号
 	ES_PASSWORD string // ES密码
 )
 
-// ES索引配置
 var (
 	EsReportIndexName        string //研报ES索引
 	EsEnglishReportIndexName string //英文研报ES索引
 	SmartReportIndexName     string //智能研报ES索引
 )
 
-// 科大讯飞--语音合成
 var (
 	XfHostUrl string
 )
@@ -96,7 +87,6 @@ var (
 	TemplateIdByProduct string //产品运行报告通知-模板ID
 )
 
-// 阿里云配置
 var (
 	Bucketname       string
 	Endpoint         string
@@ -145,7 +135,6 @@ func init() {
 		} else {
 			RunMode = "release"
 		}
-		//RunMode = "release"
 		configPath := `/home/code/config/eta_gn/eta_task/conf/app.conf`
 		err = web.LoadAppConfig("ini", configPath)
 		if err != nil {
@@ -170,12 +159,6 @@ func init() {
 	if len(REDIS_CACHE) <= 0 {
 		panic(any("redis链接参数没有配置"))
 	}
-	//Rc, Re = cache.NewCache(REDIS_CACHE) //初始化缓存
-	//if Re != nil {
-	//	fmt.Println(Re)
-	//	panic(any(Re))
-	//}
-	// 初始化缓存
 	redisClient, err := initRedis(config["redis_type"], config["beego_cache"])
 	if err != nil {
 		fmt.Println("redis链接异常：", err)
@@ -183,7 +166,6 @@ func init() {
 	}
 	Rc = redisClient
 
-	// 项目中文名称
 	appNameCn, err := web.AppConfig.String("app_name_cn")
 	if err != nil {
 		panic(any("配置文件读取app_name_cn错误 " + err.Error()))
@@ -198,16 +180,12 @@ func init() {
 		logMaxDaysStr := config["log_max_day"]
 		LogMaxDays, _ = strconv.Atoi(logMaxDaysStr)
 	}
-	// 邮件提醒人员
 	EmailSendToUsers = config["email_send_to_users"]
 
-	// 刷新完成通知邮件人员
 	RefreshEdbInfoEmailSendToUsers = config["refresh_edb_info_email_send_to_users"]
 
-	// 报警服务地址
 	AlarmMsgUrl = config["alarm_msg_url"]
 
-	// 公共指标库相关
 	{
 		EDB_LIB_URL = config["edb_lib_url"]
 		APP_EDB_LIB_NAME_EN = config["app_edb_lib_name_en"]
@@ -217,26 +195,22 @@ func init() {
 	APPID = config["appid"]
 	SECRET = config["secret"]
 
-	// ES配置
 	{
 		ES_URL = config["es_url"]
 		ES_USERNAME = config["es_username"]
 		ES_PASSWORD = config["es_password"]
 	}
 
-	// ES 索引
 	{
 		EsReportIndexName = config["es_report_index_name"]
 		EsEnglishReportIndexName = config["es_english_report_index_name"]
 		SmartReportIndexName = config["es_smart_report_index_name"]
 	}
 
-	// 科大讯飞
 	{
 		XfHostUrl = config["xf_host_url"]
 	}
 
-	// OSS相关
 	{
 		Endpoint = config["endpoint"]
 		Bucketname = config["bucket_name"]
@@ -247,17 +221,14 @@ func init() {
 		AccessKeySecret = config["access_key_secret"]
 	}
 
-	// 微信模版消息
 	{
 		SendWxTemplateEnable = config["send_wx_template_enable"]
 	}
 
-	// 是否执行生产环境的定时任务
 	if config["is_start_release_task"] == `true` {
 		IsStartReleaseTask = true
 	}
 
-	// 桥接服务
 	{
 		EtaBridgeUrl = config["eta_bridge_url"]                     // 桥接服务地址
 		EtaBridgeAppNameEn = config["eta_bridge_app_name_en"]       // 桥接服务英文名称-鉴权用
@@ -283,7 +254,6 @@ func init() {
 		}
 	}
 
-	// 公共服务
 	{
 		EtaHubUrl = config["eta_hub_url"] // 公共服务地址
 	}

utils/constants.go

@@ -1,6 +1,5 @@
 package utils
 
-// 常量定义
 const (
 	FormatTime              = "15:04:05"                //时间格式
 	FormatDate              = "2006-01-02"              //日期格式
@@ -18,13 +17,11 @@ const (
 	PageSize30              = 30
 )
 
-// 手机号，电子邮箱正则
 const (
 	RegularMobile = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0-9])|(17[0-9])|(16[0-9])|(19[0-9]))\\d{8}$" //手机号码
 	RegularEmail  = `\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*`                                             //匹配电子邮箱
 )
 
-// 数据来源渠道
 const (
 	DATA_SOURCE_THS                                  = iota + 1 //同花顺
 	DATA_SOURCE_WIND                                            //wind->2
@@ -109,7 +106,6 @@ const (
 	DATA_SOURCE_TRADE_ANALYSIS                       = 92       // 持仓分析
 )
 
-// 数据刷新频率
 const (
 	DATA_REFRESH        = 7 //7个单位，日/周/月/季度/年
 	DATA_END_DATE_LIMIT = 4 //数据结束日期为，当前日期，加上4年时间
@@ -119,12 +115,10 @@ const (
 	SendTemplateMsgAuthorization = "dc855fce962a639faa779cbdd4cd332f"
 )
 
-// 模板消息推送类型
 const (
 	TEMPLATE_MSG_YB_VOICE_BROADCAST = 20 //研报语音播报
 )
 
-// 研报类型标识
 var (
 	REPORT_TYPE_DAY      = "day"
 	REPORT_TYPE_WEEK     = "week"
@@ -133,17 +127,14 @@ var (
 	REPORT_TYPE_OTHER    = "other"
 )
 
-// 模板消息推送类型
 const (
 	TEMPLATE_MSG_REPORT = iota + 1 //日度点评报告推送
 )
 
-// 缓存key
 const (
 	CACHE_CREATE_REPORT_IMGPDF_QUEUE = "eta_report:report_img_pdf_queue" // 生成报告长图PDF队列
 )
 
-// 商户号
 const (
 	BusinessCodeSandbox = "E2023080700" // 试用平台
 	BusinessCodeRelease = "E2023080900" // 生产环境
@@ -152,16 +143,13 @@ const (
 	BusinessCodeZhongJi = "E2023110300" // 中基宁波
 )
 
-// 子数据来源渠道
 const (
 	DATA_SUB_SOURCE_EDB  = iota //经济数据库
 	DATA_SUB_SOURCE_DATE        //日期序列
 )
 
-// 已经处理了的变更id
 const CACHE_EDB_UPDATE_LOG_ID = "eta:edb_update_log:id"
 
-// 指标引用对象
 const (
 	EDB_RELATION_CHART    = 1 // 图表
 	EDB_RELATION_SANDBOX  = 2 // ETA逻辑
@@ -169,7 +157,6 @@ const (
 	EDB_RELATION_TABLE    = 4 // 表格
 )
 
-// 图表类型
 const (
 	CHART_SOURCE_DEFAULT                         = 1
 	CHART_SOURCE_FUTURE_GOOD                     = 2
@@ -184,7 +171,6 @@ const (
 	CHART_SOURCE_BALANCE_EXCEL                   = 11 // 平衡表图表
 )
 
-// ETA表格
 const (
 	EXCEL_DEFAULT         = 1 // 自定义excel
 	TIME_TABLE            = 2 // 时间序列表格
@@ -193,7 +179,6 @@ const (
 	BALANCE_TABLE         = 5 // 平衡表
 )
 
-// MultiAddNum 批量插入的数据量
 const MultiAddNum = 500
 
 const (
@@ -202,7 +187,6 @@ const (
 	EXCEL_DATA_PREFIX = "hz_excel_data"
 )
 
-// 指标类型
 const (
 	EDB_INFO_TYPE         = 0 //指标类型 0：普通指标
 	PREDICT_EDB_INFO_TYPE = 1 //指标类型 1：预测指标
@@ -213,7 +197,5 @@ const (
 	EdbTypeCalculate = 2 // 指标类型-计算指标
 )
 
-//const END_DATE = time.Date(1900, 1, 1, 0, 0, 0, 0, time.Local)
 
-// BaseEdbRefreshStartDate 指标的基础刷新开始日期
 const BaseEdbRefreshStartDate = `1899-01-01`

utils/des3.go

@@ -1,4 +1,3 @@
-// 加密工具类，用了3des和base64
 package utils
 
 import (
@@ -11,7 +10,6 @@ import (
 	"strings"
 )
 
-// des3 + base64 encrypt
 func DesBase64Encrypt(origData []byte, desKey string) []byte {
 	result, err := TripleDesEncrypt(origData, []byte(desKey))
 	if err != nil {
@@ -36,21 +34,18 @@ func DesBase64Decrypt(crypted []byte, desKey string) []byte {
 	return origData
 }
 
-// 3DES加密
 func TripleDesEncrypt(origData, key []byte) ([]byte, error) {
 	block, err := des.NewTripleDESCipher(key)
 	if err != nil {
 		return nil, err
 	}
 	origData = PKCS5Padding(origData, block.BlockSize())
-	// origData = ZeroPadding(origData, block.BlockSize())
 	blockMode := cipher.NewCBCEncrypter(block, key[:8])
 	crypted := make([]byte, len(origData))
 	blockMode.CryptBlocks(crypted, origData)
 	return crypted, nil
 }
 
-// 3DES解密
 func TripleDesDecrypt(crypted, key []byte) ([]byte, error) {
 	block, err := des.NewTripleDESCipher(key)
 	if err != nil {
@@ -58,10 +53,8 @@ func TripleDesDecrypt(crypted, key []byte) ([]byte, error) {
 	}
 	blockMode := cipher.NewCBCDecrypter(block, key[:8])
 	origData := make([]byte, len(crypted))
-	// origData := crypted
 	blockMode.CryptBlocks(origData, crypted)
 	origData = PKCS5UnPadding(origData)
-	// origData = ZeroUnPadding(origData)
 	return origData, nil
 }
 
@@ -85,12 +78,10 @@ func PKCS5Padding(ciphertext []byte, blockSize int) []byte {
 
 func PKCS5UnPadding(origData []byte) []byte {
 	length := len(origData)
-	// 去掉最后一个字节 unpadding 次
 	unpadding := int(origData[length-1])
 	return origData[:(length - unpadding)]
 }
 
-// DES加密
 func DesEncrypt(content string, key string) string {
 	contents := []byte(content)
 	keys := []byte(key)
@@ -117,7 +108,6 @@ func byteToHexString(bytes []byte) string {
 	return str
 }
 
-// DES解密
 func DesDecrypt(content string, key string) string {
 	contentBytes, err := hex.DecodeString(content)
 	if err != nil {
@@ -135,7 +125,6 @@ func DesDecrypt(content string, key string) string {
 	return string(origData)
 }
 
-// DES ECB PKCK5Padding
 func EntryptDesECB(data, key []byte) (string, error) {
 	if len(key) > 8 {
 		key = key[:8]

utils/email.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 )
 
-//发送邮件
 func SendEmail(title, content string, touser string) bool {
 	var arr []string
 	sub := strings.Index(touser, ";")
@@ -19,26 +18,14 @@ func SendEmail(title, content string, touser string) bool {
 	} else {
 		arr = append(arr, touser)
 	}
-	//mailConn := map[string]string{
-	//	"user": "18170239278@163.com",
-	//	"pass": "JYWLATLVZJROWMWZ",
-	//	"host": "smtp.163.com",
-	//	"port": "465",
-	//}
-	//mailPort, _ := strconv.Atoi(mailConn["port"]) //转换端口类型为int
 
 	m := gomail.NewMessage()
-	//m.SetHeader("From", mailConn["user"])
 	m.SetHeader("From", m.FormatAddress("qunao007@qq.com", APPNAME)) //这种方式可以添加别名，即“XX官方”
-	// 说明：如果是用网易邮箱账号发送，以下方法别名可以是中文，如果是qq企业邮箱，以下方法用中文别名，会报错，需要用上面此方法转码
-	//m.SetHeader("From", "FB Sample"+"<"+mailConn["user"]+">") //这种方式可以添加别名，即“FB Sample”， 也可以直接用<code>m.SetHeader("From",mailConn["user"])</code> 读者可以自行实验下效果
-	//m.SetHeader("From", mailConn["user"])
 
 	m.SetHeader("To", arr...)
 	m.SetHeader("Subject", title+" "+GetRandString(16))
 	m.SetBody("text/html", content)
 	d := gomail.NewDialer("smtp.qq.com", 587, "qunao007@qq.com", "cyhjgffhaobteihd")
-	//d := gomail.NewDialer(mailConn["host"], mailPort, mailConn["user"], mailConn["pass"])
 
 	if err := d.DialAndSend(m); err != nil {
 		fmt.Println("err:", err)
@@ -47,7 +34,6 @@ func SendEmail(title, content string, touser string) bool {
 	return true
 }
 
-//发送邮件
 func SendEmailByHongze(title, content string, touser, attachPath, attachName string) bool {
 	var arr []string
 	sub := strings.Index(touser, ";")
@@ -66,7 +52,6 @@ func SendEmailByHongze(title, content string, touser, attachPath, attachName str
 	m.SetHeader("Subject", title+" "+GetRandStringNoSpecialChar(8))
 	m.SetBody("text/html", content)
 
-	//body := new(bytes.Buffer)
 	if attachPath != "" {
 		m.Attach(attachPath,
 			gomail.Rename(attachName),

utils/jwt.go

@@ -12,7 +12,6 @@ var (
 	KEY = []byte("5Mb5Gdmb5x")
 )
 
-// 发放token
 func GenToken(account string) string {
 	token := jwt.New(jwt.SigningMethodHS256)
 	token.Claims = &jwt.StandardClaims{
@@ -29,7 +28,6 @@ func GenToken(account string) string {
 	return ss
 }
 
-// 校验token
 func CheckToken(account, token string) bool {
 	t, err := jwt.Parse(token, func(*jwt.Token) (interface{}, error) {
 		return KEY, nil

utils/logs.go

@@ -29,7 +29,6 @@ func init() {
 	}
 	os.MkdirAll(logPath, os.ModePerm)
 
-	// 打开文件
 	logFileName := path.Join(logPath, logFile)
 	FileLog = logs.NewLogger(1000000)
 	logConf := getDefaultLogConfig()
@@ -51,12 +50,9 @@ type logConfig struct {
 	Rotate   bool   `json:"rotate" description:"是否开启 logrotate，默认是 true"`
 	Level    int    `json:"level" description:"日志保存的时候的级别，默认是 Trace 级别"`
 	Color    bool   `json:"color" description:"日志是否输出颜色"`
-	//Perm     string `json:"perm" description:"日志文件权限"`
 }
 
 func initBinlog() {
-	//binlog日志
-	//binlog日志
 	binlogPath := BinLogPath
 	if binlogPath == "" {
 		binlogPath = DefaultBinlogPath
@@ -71,8 +67,6 @@ func initBinlog() {
 	logConf := getDefaultLogConfig()
 
 	logConf.FileName = logFileName
-	//logConf.MaxLines = 10000000
-	//logConf.Rotate = true
 	b, _ := json.Marshal(logConf)
 	Binlog.SetLogger(logs.AdapterFile, string(b))
 	Binlog.EnableFuncCallDepth(true)
@@ -87,6 +81,5 @@ func getDefaultLogConfig() logConfig {
 		MaxDays:  LogMaxDays, //我就是喜欢31天，咋滴，不喜欢你就自己改-_-!
 		Rotate:   true,
 		Level:    logs.LevelTrace,
-		//Perm:     "",
 	}
 }

utils/redis.go

@@ -35,5 +35,4 @@ func initRedis(redisType string, conf string) (redisClient RedisClient, err erro
 	return
 }
 
-// RedisNoKeyErr redis没有key的错误
 const RedisNoKeyErr = "redis: nil"

utils/redis/cluster_redis.go

@@ -10,30 +10,19 @@ import (
 	"time"
 )
 
-// ClusterRedisClient
-// @Description: 集群的redis客户端
 type ClusterRedisClient struct {
 	redisClient *redis.ClusterClient
 }
 
 var DefaultKey = "zcmRedis"
 
-// InitClusterRedis
-// @Description: 初始化集群redis客户端
-// @param config
-// @return clusterRedisClient
-// @return err
 func InitClusterRedis(config string) (clusterRedisClient *ClusterRedisClient, err error) {
 	var cf map[string]string
 	err = json.Unmarshal([]byte(config), &cf)
 	if err != nil {
 		return
 	}
-	//if _, ok := cf["key"]; !ok {
-	//	cf["key"] = DefaultKey
-	//}
 
-	// 集群地址
 	connList := make([]string, 0)
 	if _, ok := cf["conn"]; !ok {
 		err = errors.New("config has no conn key")
@@ -46,21 +35,17 @@ func InitClusterRedis(config string) (clusterRedisClient *ClusterRedisClient, er
 		}
 	}
 
-	// 密码
 	if _, ok := cf["password"]; !ok {
 		cf["password"] = ""
 	}
 
-	// 创建 Redis 客户端配置对象
 	clusterOptions := &redis.ClusterOptions{
 		Addrs:    connList, // 设置 Redis 节点的 IP 地址和端口号
 		Password: cf["password"],
 	}
 
-	// 创建 Redis 集群客户端
 	client := redis.NewClusterClient(clusterOptions)
 
-	// 测试连接并获取信息
 	_, err = client.Ping(context.TODO()).Result()
 	if err != nil {
 		err = errors.New("redis 链接失败:" + err.Error())
@@ -72,11 +57,6 @@ func InitClusterRedis(config string) (clusterRedisClient *ClusterRedisClient, er
 	return
 }
 
-// Get
-// @Description: 根据key获取数据（其实是返回的字节编码）
-// @receiver rc
-// @param key
-// @return interface{}
 func (rc *ClusterRedisClient) Get(key string) interface{} {
 	data, err := rc.redisClient.Get(context.TODO(), key).Bytes()
 	if err != nil {
@@ -86,78 +66,36 @@ func (rc *ClusterRedisClient) Get(key string) interface{} {
 	return data
 }
 
-// GetStr
-// @Description: 根据key获取字符串数据
-// @receiver rc
-// @param key
-// @return string
 func (rc *ClusterRedisClient) GetStr(key string) string {
 	return rc.redisClient.Get(context.TODO(), key).Val()
 }
 
-// GetInt
-// @Description: 根据key获取int数据
-// @receiver rc
-// @param key
-// @return int
-// @return error
 func (rc *ClusterRedisClient) GetInt64(key string) (int64, error) {
 	return rc.redisClient.Get(context.TODO(), key).Int64()
 }
 
-// GetInt
-// @Description: 根据key获取int数据
-// @receiver rc
-// @param key
-// @return int
-// @return error
 func (rc *ClusterRedisClient) GetUInt64(key string) (uint64, error) {
 	return rc.redisClient.Get(context.TODO(), key).Uint64()
 }
 
-// RedisBytes
-// @Description: 根据key获取字节编码数据
-// @receiver rc
-// @param key
-// @return data
-// @return err
 func (rc *ClusterRedisClient) RedisBytes(key string) (data []byte, err error) {
 	data, err = rc.redisClient.Get(context.TODO(), key).Bytes()
 
 	return
 }
 
-// RedisString
-// @Description: 根据key获取字符串数据
-// @receiver rc
-// @param key
-// @return data
-// @return err
 func (rc *ClusterRedisClient) RedisString(key string) (data string, err error) {
 	data, err = rc.redisClient.Get(context.TODO(), key).Result()
 
 	return
 }
 
-// RedisInt
-// @Description: 根据key获取int数据
-// @receiver rc
-// @param key
-// @return data
-// @return err
 func (rc *ClusterRedisClient) RedisInt(key string) (data int, err error) {
 	data, err = rc.redisClient.Get(context.TODO(), key).Int()
 
 	return
 }
 
-// Put
-// @Description: put一个数据到redis
-// @receiver rc
-// @param key
-// @param val
-// @param timeout
-// @return error
 func (rc *ClusterRedisClient) Put(key string, val interface{}, timeout time.Duration) error {
 	var err error
 	err = rc.redisClient.SetEX(context.TODO(), key, val, timeout).Err()
@@ -170,13 +108,6 @@ func (rc *ClusterRedisClient) Put(key string, val interface{}, timeout time.Dura
 	return err
 }
 
-// SetNX
-// @Description: 设置一个会过期时间的值
-// @receiver rc
-// @param key
-// @param val
-// @param timeout
-// @return bool
 func (rc *ClusterRedisClient) SetNX(key string, val interface{}, timeout time.Duration) bool {
 	result, err := rc.redisClient.SetNX(context.TODO(), key, val, timeout).Result()
 	if err != nil {
@@ -186,11 +117,6 @@ func (rc *ClusterRedisClient) SetNX(key string, val interface{}, timeout time.Du
 	return result
 }
 
-// Delete
-// @Description: 删除redis中的键值对
-// @receiver rc
-// @param key
-// @return error
 func (rc *ClusterRedisClient) Delete(key string) error {
 	var err error
 
@@ -204,11 +130,6 @@ func (rc *ClusterRedisClient) Delete(key string) error {
 	return err
 }
 
-// IsExist
-// @Description: 根据key判断是否写入缓存中
-// @receiver rc
-// @param key
-// @return bool
 func (rc *ClusterRedisClient) IsExist(key string) bool {
 	result, err := rc.redisClient.Exists(context.TODO(), key).Result()
 	if err != nil {
@@ -222,12 +143,6 @@ func (rc *ClusterRedisClient) IsExist(key string) bool {
 	return true
 }
 
-// LPush
-// @Description: 写入list
-// @receiver rc
-// @param key
-// @param val
-// @return error
 func (rc *ClusterRedisClient) LPush(key string, val interface{}) error {
 	data, _ := json.Marshal(val)
 	err := rc.redisClient.LPush(context.TODO(), key, data).Err()
@@ -235,11 +150,6 @@ func (rc *ClusterRedisClient) LPush(key string, val interface{}) error {
 	return err
 }
 
-// Brpop
-// @Description: 从list中读取
-// @receiver rc
-// @param key
-// @param callback
 func (rc *ClusterRedisClient) Brpop(key string, callback func([]byte)) {
 	values, err := rc.redisClient.BRPop(context.TODO(), 1*time.Second, key).Result()
 	if err != nil {
@@ -254,11 +164,6 @@ func (rc *ClusterRedisClient) Brpop(key string, callback func([]byte)) {
 
 }
 
-// GetRedisTTL
-// @Description: 获取key的过期时间
-// @receiver rc
-// @param key
-// @return time.Duration
 func (rc *ClusterRedisClient) GetRedisTTL(key string) time.Duration {
 	value, err := rc.redisClient.TTL(context.TODO(), key).Result()
 	if err != nil {
@@ -269,24 +174,10 @@ func (rc *ClusterRedisClient) GetRedisTTL(key string) time.Duration {
 
 }
 
-// Incrby
-// @Description: 设置自增值
-// @receiver rc
-// @param key
-// @param num
-// @return interface{}
-// @return error
 func (rc *ClusterRedisClient) Incrby(key string, num int) (interface{}, error) {
 	return rc.redisClient.IncrBy(context.TODO(), key, int64(num)).Result()
 }
 
-// Do
-// @Description: cmd执行redis命令
-// @receiver rc
-// @param commandName
-// @param args
-// @return reply
-// @return err
 func (rc *ClusterRedisClient) Do(commandName string, args ...interface{}) (reply interface{}, err error) {
 	newArgs := []interface{}{commandName}
 	newArgs = append(newArgs, args...)

utils/redis/standalone_redis.go

@@ -10,8 +10,6 @@ import (
 	"time"
 )
 
-// StandaloneRedisClient
-// @Description: 单机redis客户端
 type StandaloneRedisClient struct {
 	redisClient *redis.Client
 }
@@ -22,18 +20,13 @@ func InitStandaloneRedis(config string) (standaloneRedis *StandaloneRedisClient,
 	if err != nil {
 		return
 	}
-	//if _, ok := cf["key"]; !ok {
-	//	cf["key"] = DefaultKey
-	//}
 
 	if _, ok := cf["conn"]; !ok {
 		err = errors.New("config has no conn key")
 		return
 	}
 
-	// db库
 	dbNum := 0
-	// 如果指定了db库
 	if _, ok := cf["dbNum"]; ok {
 		dbNum, err = strconv.Atoi(cf["dbNum"])
 		if err != nil {
@@ -41,7 +34,6 @@ func InitStandaloneRedis(config string) (standaloneRedis *StandaloneRedisClient,
 		}
 	}
 
-	// 密码
 	if _, ok := cf["password"]; !ok {
 		cf["password"] = ""
 	}
@@ -50,7 +42,6 @@ func InitStandaloneRedis(config string) (standaloneRedis *StandaloneRedisClient,
 		Addr:     cf["conn"],
 		Password: cf["password"],
 		DB:       dbNum,
-		//PoolSize: 10, //连接池最大socket连接数，默认为10倍CPU数， 10 * runtime.NumCPU（暂不配置）
 	})
 
 	_, err = client.Ping(context.TODO()).Result()
@@ -64,11 +55,6 @@ func InitStandaloneRedis(config string) (standaloneRedis *StandaloneRedisClient,
 	return
 }
 
-// Get
-// @Description: 根据key获取数据（其实是返回的字节编码）
-// @receiver rc
-// @param key
-// @return interface{}
 func (rc *StandaloneRedisClient) Get(key string) interface{} {
 	data, err := rc.redisClient.Get(context.TODO(), key).Bytes()
 	if err != nil {
@@ -78,78 +64,36 @@ func (rc *StandaloneRedisClient) Get(key string) interface{} {
 	return data
 }
 
-// GetStr
-// @Description: 根据key获取字符串数据
-// @receiver rc
-// @param key
-// @return string
 func (rc *StandaloneRedisClient) GetStr(key string) string {
 	return rc.redisClient.Get(context.TODO(), key).Val()
 }
 
-// GetInt
-// @Description: 根据key获取int数据
-// @receiver rc
-// @param key
-// @return int
-// @return error
 func (rc *StandaloneRedisClient) GetInt64(key string) (int64, error) {
 	return rc.redisClient.Get(context.TODO(), key).Int64()
 }
 
-// GetInt
-// @Description: 根据key获取int数据
-// @receiver rc
-// @param key
-// @return int
-// @return error
 func (rc *StandaloneRedisClient) GetUInt64(key string) (uint64, error) {
 	return rc.redisClient.Get(context.TODO(), key).Uint64()
 }
 
-// RedisBytes
-// @Description: 根据key获取字节编码数据
-// @receiver rc
-// @param key
-// @return data
-// @return err
 func (rc *StandaloneRedisClient) RedisBytes(key string) (data []byte, err error) {
 	data, err = rc.redisClient.Get(context.TODO(), key).Bytes()
 
 	return
 }
 
-// RedisString
-// @Description: 根据key获取字符串数据
-// @receiver rc
-// @param key
-// @return data
-// @return err
 func (rc *StandaloneRedisClient) RedisString(key string) (data string, err error) {
 	data, err = rc.redisClient.Get(context.TODO(), key).Result()
 
 	return
 }
 
-// RedisInt
-// @Description: 根据key获取int数据
-// @receiver rc
-// @param key
-// @return data
-// @return err
 func (rc *StandaloneRedisClient) RedisInt(key string) (data int, err error) {
 	data, err = rc.redisClient.Get(context.TODO(), key).Int()
 
 	return
 }
 
-// Put
-// @Description: put一个数据到redis
-// @receiver rc
-// @param key
-// @param val
-// @param timeout
-// @return error
 func (rc *StandaloneRedisClient) Put(key string, val interface{}, timeout time.Duration) error {
 	var err error
 	err = rc.redisClient.SetEX(context.TODO(), key, val, timeout).Err()
@@ -162,13 +106,6 @@ func (rc *StandaloneRedisClient) Put(key string, val interface{}, timeout time.D
 	return err
 }
 
-// SetNX
-// @Description: 设置一个会过期时间的值
-// @receiver rc
-// @param key
-// @param val
-// @param timeout
-// @return bool
 func (rc *StandaloneRedisClient) SetNX(key string, val interface{}, timeout time.Duration) bool {
 	result, err := rc.redisClient.SetNX(context.TODO(), key, val, timeout).Result()
 	if err != nil {
@@ -178,11 +115,6 @@ func (rc *StandaloneRedisClient) SetNX(key string, val interface{}, timeout time
 	return result
 }
 
-// Delete
-// @Description: 删除redis中的键值对
-// @receiver rc
-// @param key
-// @return error
 func (rc *StandaloneRedisClient) Delete(key string) error {
 	var err error
 
@@ -196,11 +128,6 @@ func (rc *StandaloneRedisClient) Delete(key string) error {
 	return err
 }
 
-// IsExist
-// @Description: 根据key判断是否写入缓存中
-// @receiver rc
-// @param key
-// @return bool
 func (rc *StandaloneRedisClient) IsExist(key string) bool {
 	result, err := rc.redisClient.Exists(context.TODO(), key).Result()
 	if err != nil {
@@ -214,12 +141,6 @@ func (rc *StandaloneRedisClient) IsExist(key string) bool {
 	return true
 }
 
-// LPush
-// @Description: 写入list
-// @receiver rc
-// @param key
-// @param val
-// @return error
 func (rc *StandaloneRedisClient) LPush(key string, val interface{}) error {
 	data, _ := json.Marshal(val)
 	err := rc.redisClient.LPush(context.TODO(), key, data).Err()
@@ -227,11 +148,6 @@ func (rc *StandaloneRedisClient) LPush(key string, val interface{}) error {
 	return err
 }
 
-// Brpop
-// @Description: 从list中读取
-// @receiver rc
-// @param key
-// @param callback
 func (rc *StandaloneRedisClient) Brpop(key string, callback func([]byte)) {
 	values, err := rc.redisClient.BRPop(context.TODO(), 1*time.Second, key).Result()
 	if err != nil {
@@ -246,11 +162,6 @@ func (rc *StandaloneRedisClient) Brpop(key string, callback func([]byte)) {
 
 }
 
-// GetRedisTTL
-// @Description: 获取key的过期时间
-// @receiver rc
-// @param key
-// @return time.Duration
 func (rc *StandaloneRedisClient) GetRedisTTL(key string) time.Duration {
 	value, err := rc.redisClient.TTL(context.TODO(), key).Result()
 	if err != nil {
@@ -261,24 +172,10 @@ func (rc *StandaloneRedisClient) GetRedisTTL(key string) time.Duration {
 
 }
 
-// Incrby
-// @Description: 设置自增值
-// @receiver rc
-// @param key
-// @param num
-// @return interface{}
-// @return error
 func (rc *StandaloneRedisClient) Incrby(key string, num int) (interface{}, error) {
 	return rc.redisClient.IncrBy(context.TODO(), key, int64(num)).Result()
 }
 
-// Do
-// @Description: cmd执行redis命令
-// @receiver rc
-// @param commandName
-// @param args
-// @return reply
-// @return err
 func (rc *StandaloneRedisClient) Do(commandName string, args ...interface{}) (reply interface{}, err error) {
 	newArgs := []interface{}{commandName}
 	newArgs = append(newArgs, args...)