移除未使用的代码和注释

- 删除了多个文件中未使用的类型定义和函数
-移除了大量注释掉的代码片段
- 简化了一些函数的实现，去除了不必要的逻辑

models/base_from_adjust.go

@@ -5,7 +5,6 @@ import (
 	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
@@ -77,13 +76,11 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 			EdbType:         2,
 			Sort:            GetAddEdbMaxSortByClassifyId(req.ClassifyId, utils.EDB_INFO_TYPE),
 		}
-		//newEdbInfoId, tmpErr := to.Insert(edbInfo)
 		tmpErr := to.Create(edbInfo).Error
 		if tmpErr != nil {
 			err = tmpErr
 			return
 		}
-		//edbInfo.EdbInfoId = int(newEdbInfoId)
 
 		// 获取来源指标
 		fromEdbInfo, tmpErr := GetEdbInfoById(req.FromEdbInfoId)
@@ -158,7 +155,6 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 		dataTableName := GetEdbDataTableName(utils.DATA_SOURCE_CALCULATE_ADJUST, edbInfo.SubSource)
 		deleteSql := ` DELETE FROM %s WHERE edb_info_id=? `
 		deleteSql = fmt.Sprintf(deleteSql, dataTableName)
-		//_, err = to.Raw(deleteSql, req.EdbInfoId).Exec()
 		err = to.Exec(deleteSql, req.EdbInfoId).Error
 		if err != nil {
 			return
@@ -187,7 +183,6 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 			// 获取之前的配置
 			var edbAdjustConf *EdbAdjustConf
 			sql := ` SELECT * FROM edb_adjust_conf WHERE edb_info_id=? `
-			//err = o.Raw(sql, edbInfo.EdbInfoId).QueryRow(&edbAdjustConf)
 			err = to.Raw(sql, edbInfo.EdbInfoId).Scan(&edbAdjustConf).Error
 			if err != nil {
 				errMsg = "获取指标配置失败"
@@ -197,7 +192,6 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 			// 修改配置的最晚日期
 			edbAdjustConf.SourceEndDate = fromEdbEndDate
 			edbAdjustConf.ModifyTime = time.Now()
-			//_, err = to.Update(edbAdjustConf, "SourceEndDate", "ModifyTime")
 			err = to.Model(edbAdjustConf).Updates(edbAdjustConf).Error
 			if err != nil {
 				errMsg = "更新指标配置失败"
@@ -244,7 +238,6 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		//_, err = to.Raw(addSql).Exec()
 		err = to.Exec(addSql).Error
 		if err != nil {
 			return
@@ -276,7 +269,6 @@ func RefreshAllAdjustEdb(edbInfo *EdbInfo, fromEdbInfo *EdbInfo) (err error) {
 	// 获取之前的配置
 	var edbAdjustConf *EdbAdjustConf
 	sql := ` SELECT * FROM edb_adjust_conf WHERE edb_info_id=? `
-	//err = o.Raw(sql, edbInfo.EdbInfoId).QueryRow(&edbAdjustConf)
 	err = to.Raw(sql, edbInfo.EdbInfoId).Scan(&edbAdjustConf).Error
 	if err != nil {
 		err = errors.New("获取指标配置失败")
@@ -334,7 +326,6 @@ func RefreshAllAdjustEdb(edbInfo *EdbInfo, fromEdbInfo *EdbInfo) (err error) {
 			if existVal != item.Value {
 				sql = ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 				sql = fmt.Sprintf(sql, dataTableName)
-				//_, err = to.Raw(sql, saveVal, edbInfo.EdbInfoId, currDay).Exec()
 				err = to.Exec(sql, saveVal, edbInfo.EdbInfoId, currDay).Error
 				if err != nil {
 					return err
@@ -345,7 +336,6 @@ func RefreshAllAdjustEdb(edbInfo *EdbInfo, fromEdbInfo *EdbInfo) (err error) {
 	}
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		//_, err = to.Raw(addSql).Exec()
 		err = to.Exec(addSql).Error
 		if err != nil {
 			return
@@ -359,7 +349,6 @@ func RefreshAllAdjustEdb(edbInfo *EdbInfo, fromEdbInfo *EdbInfo) (err error) {
 			}
 			edbAdjustConf.SourceEndDate = fromEdbEndDate
 			edbAdjustConf.ModifyTime = time.Now()
-			//_, err = to.Update(edbAdjustConf, "SourceEndDate", "ModifyTime")
 			err = to.Model(edbAdjustConf).Updates(edbAdjustConf).Error
 		}
 	}
@@ -385,43 +374,3 @@ type SaveAdjustEdbDataReq struct {
 	Date  string  `description:"数据日期"`
 	Value float64 `description:"数据值"`
 }
-
-// FixData 修复数据
-func FixData() {
-	var list []*EdbInfo
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM edb_info WHERE source=? `
-	_, err := o.Raw(sql, 40).QueryRows(&list)
-	for _, edbInfo := range list {
-		// 获取来源指标
-		calculateMapping, tmpErr := GetEdbInfoCalculateMappingDetail(edbInfo.EdbInfoId)
-		if tmpErr != nil {
-			fmt.Println(edbInfo.EdbInfoId, "关联指标获取异常；err:", tmpErr)
-			continue
-		}
-		fromEdbInfo, tmpErr := GetEdbInfoById(calculateMapping.FromEdbInfoId)
-		if tmpErr != nil {
-			fmt.Println(edbInfo.EdbInfoId, "来源指标不存在；err:", tmpErr)
-			continue
-		}
-		var fromEdbEndDate time.Time
-		if fromEdbInfo.EndDate != `0000-00-00` {
-			fromEdbEndDate, _ = time.Parse(utils.FormatDate, fromEdbInfo.EndDate)
-		}
-
-		// 获取之前的配置
-		edbAdjustConf := &EdbAdjustConf{
-			EdbInfoId:     edbInfo.EdbInfoId,
-			SourceEndDate: fromEdbEndDate,
-			ModifyTime:    time.Now(),
-			CreateTime:    time.Now(),
-		}
-		_, err = o.Insert(edbAdjustConf)
-		if err != nil {
-			fmt.Println(edbInfo.EdbInfoId, "添加失败；err:", tmpErr)
-			continue
-		}
-
-	}
-	fmt.Println("end")
-}

models/base_from_business.go

@@ -9,25 +9,6 @@ import (
 	"time"
 )
 
-// BaseFromBusinessIndex
-// @Description: 外部指标（商家系统）表
-//type BaseFromBusinessIndex struct {
-//	BaseFromBusinessIndexId int64     `orm:"column(base_from_business_index_id);pk"`
-//	IndexCode               string    `description:"指标编码"`
-//	IndexName               string    `description:"指标名称"`
-//	Unit                    string    `description:"单位"`
-//	Frequency               string    `description:"频度"`
-//	Source                  int       `description:"数据来源"`
-//	SourceName              string    `description:"数据来源名称"`
-//	StartDate               time.Time `description:"开始日期"`
-//	EndDate                 time.Time `description:"结束日期"`
-//	Remark                  string    `description:"备注字段"`
-//	BaseModifyTime          time.Time `description:"基础信息(名称，单位，频度)变更时间"`
-//	DataUpdateTime          time.Time `description:"最近一次数据发生变化的时间"`
-//	CreateTime              time.Time `description:"创建时间"`
-//	ModifyTime              time.Time `description:"修改时间"`
-//}
-
 // BaseFromBusinessIndex
 // @Description: 外部指标（商家系统）表
 type BaseFromBusinessIndex struct {
@@ -111,9 +92,7 @@ type DelBusinessIndexDataReq struct {
 // @return item *BaseFromBusinessIndex
 // @return err error
 func (m *BaseFromBusinessIndex) GetIndexItem(indexCode string) (item *BaseFromBusinessIndex, err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_business_index WHERE index_code = ? `
-	//err = o.Raw(sql, indexCode).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&item).Error
 	return
 }
@@ -131,9 +110,7 @@ func (m *BaseFromBusinessIndex) GetIndexItemList(indexCodeList []string) (items
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_business_index WHERE index_code in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, indexCodeList).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, indexCodeList).Find(&items).Error
 
 	return
@@ -151,9 +128,7 @@ func (m *BaseFromBusinessIndex) DelIndexItemList(indexCodeList []string) (err er
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrm()
 	sql := `DELETE FROM base_from_business_index WHERE index_code in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, indexCodeList).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, indexCodeList).Error
 
 	return
@@ -167,36 +142,27 @@ func (m *BaseFromBusinessIndex) DelIndexItemList(indexCodeList []string) (err er
 // @return maxId int
 // @return err error
 func (m *BaseFromBusinessIndex) GetMaxId() (maxId int, err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT max(base_from_business_index_id) id FROM base_from_business_index limit 1`
-	//err = o.Raw(sql).QueryRow(&maxId)
 	err = global.DEFAULT_DmSQL.Raw(sql).First(&maxId).Error
 	return
 }
 
 // Add 新增
 func (m *BaseFromBusinessIndex) Add() (err error) {
-	//o := orm.NewOrm()
-	//lastId, err := o.Insert(m)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	if err != nil {
 		return
 	}
-	//m.BaseFromBusinessIndexId = lastId
 
 	return
 }
 
 func (m *BaseFromBusinessIndex) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
 func (m *BaseFromBusinessIndex) Del() (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Delete(m)
 	err = global.DEFAULT_DmSQL.Delete(m).Error
 	return
 }
@@ -208,8 +174,6 @@ func (m *BaseFromBusinessIndex) UpdateIndex(item *BaseFromBusinessIndex, updateC
 	if len(updateCols) == 0 {
 		return
 	}
-	//o := orm.NewOrm()
-	//_, err = o.Update(item, updateCols...)
 	err = global.DEFAULT_DmSQL.Model(item).Select(updateCols).Updates(item).Error
 	return
 }
@@ -223,22 +187,17 @@ func (m *BaseFromBusinessIndex) UpdateIndex(item *BaseFromBusinessIndex, updateC
 // @return item *EdbBusinessSource
 // @return err error
 func (m *EdbBusinessSource) GetEdbBusinessSourceItem(sourceName string) (item *EdbBusinessSource, err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM edb_business_source WHERE source_name = ? `
-	//err = o.Raw(sql, sourceName).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, sourceName).First(&item).Error
 	return
 }
 
 // Add 新增
 func (m *EdbBusinessSource) Add() (err error) {
-	//o := orm.NewOrm()
-	//lastId, err := o.Insert(m)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	if err != nil {
 		return
 	}
-	//m.EdbBusinessSourceId = lastId
 
 	return
 }
@@ -355,13 +314,12 @@ func (m BaseFromBusinessIndex) getEdbInfoMaxAndMinInfoByMysql(edbCode string) (i
 // @param isIndexUpdateOrAdd bool
 // @return err error
 func (m *BaseFromBusinessIndex) ModifyIndexMaxAndMinInfo(indexCode string, item *EdbInfoMaxAndMinInfo, isIndexUpdateOrAdd bool) (err error) {
-	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_business_index SET start_date=?,end_date=?,modify_time=NOW() `
 	if isIndexUpdateOrAdd {
 		sql += `,data_update_time=NOW() `
 	}
 	sql += ` WHERE index_code=?`
-	//_, err = o.Raw(sql, item.MinDate, item.MaxDate, indexCode).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, indexCode).Error
+
 	return
 }

models/base_from_business_data.go

@@ -68,8 +68,6 @@ type WhereParams struct {
 // @return result []*BaseFromBusinessData
 // @return err error
 func (m *BaseFromBusinessData) GetAllDataList(condition []string, pars []interface{}, order string) (result []*BaseFromBusinessData, err error) {
-	//o := orm.NewOrm()
-
 	sql := `SELECT * FROM base_from_business_data `
 	if len(condition) > 0 {
 		sql += ` WHERE ` + strings.Join(condition, " AND ")
@@ -79,7 +77,6 @@ func (m *BaseFromBusinessData) GetAllDataList(condition []string, pars []interfa
 		sql += ` ORDER BY ` + order
 	}
 
-	//_, err = o.Raw(sql, pars).QueryRows(&result)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&result).Error
 
 	return
@@ -97,7 +94,6 @@ func (m *BaseFromBusinessData) GetAllDataList(condition []string, pars []interfa
 // @return result []*BaseFromBusinessData
 // @return err error
 func (m *BaseFromBusinessData) GetLimitDataList(condition []string, pars []interface{}, order string, size int64) (result []*BaseFromBusinessData, err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_business_data `
 	if len(condition) > 0 {
 		sql += ` WHERE ` + strings.Join(condition, " AND ")
@@ -109,7 +105,6 @@ func (m *BaseFromBusinessData) GetLimitDataList(condition []string, pars []inter
 
 	sql += fmt.Sprintf(` LIMIT %d`, size)
 
-	//_, err = o.Raw(sql, pars).QueryRows(&result)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&result).Error
 
 	return
@@ -128,7 +123,6 @@ func (m *BaseFromBusinessData) GetLimitDataList(condition []string, pars []inter
 // @return result []*BaseFromBusinessData
 // @return err error
 func (m *BaseFromBusinessData) GetPageDataList(condition []string, pars []interface{}, order string, startSize, size int64) (result []*BaseFromBusinessData, err error) {
-	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_business_data `
 	if len(condition) > 0 {
 		sql += ` WHERE ` + strings.Join(condition, " AND ")
@@ -140,7 +134,6 @@ func (m *BaseFromBusinessData) GetPageDataList(condition []string, pars []interf
 
 	sql += fmt.Sprintf(` LIMIT %d,%d`, startSize, size)
 
-	//_, err = o.Raw(sql, pars).QueryRows(&result)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&result).Error
 
 	return
@@ -175,8 +168,6 @@ func (m *BaseFromBusinessData) GetCountDataList(condition []string, pars []inter
 // @param addData interface{}
 // @return err error
 func (m *BaseFromBusinessData) InsertDataByColl(addData interface{}) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Insert(addData)
 	err = global.DEFAULT_DmSQL.Create(addData).Error
 
 	return
@@ -191,8 +182,6 @@ func (m *BaseFromBusinessData) InsertDataByColl(addData interface{}) (err error)
 // @param dataList []*BaseFromBusinessData
 // @return err error
 func (m *BaseFromBusinessData) BatchInsertData(bulk int, dataList []*BaseFromBusinessData) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.InsertMulti(bulk, dataList)
 	err = global.DEFAULT_DmSQL.CreateInBatches(dataList, bulk).Error
 
 	return
@@ -207,8 +196,6 @@ func (m *BaseFromBusinessData) BatchInsertData(bulk int, dataList []*BaseFromBus
 // @param updateParams interface{}
 // @return err error
 func (m *BaseFromBusinessData) UpdateData(updateCols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(m, updateCols...)
 	err = global.DEFAULT_DmSQL.Model(m).Select(updateCols).Updates(m).Error
 	if err != nil {
 		fmt.Println("UpdateDataByColl:Err:" + err.Error())
@@ -227,8 +214,6 @@ func (m *BaseFromBusinessData) UpdateData(updateCols []string) (err error) {
 // @param updateDataList []*BaseFromBusinessData
 // @return err error
 func (m *BaseFromBusinessData) HandleData(addDataList, updateDataList []*BaseFromBusinessData) (err error) {
-	//o := orm.NewOrm()
-	//to, err := o.Begin()
 	to := global.DEFAULT_DmSQL.Begin()
 	if err != nil {
 		return
@@ -244,7 +229,6 @@ func (m *BaseFromBusinessData) HandleData(addDataList, updateDataList []*BaseFro
 
 	// 插入数据
 	if len(addDataList) > 0 {
-		//_, err = to.InsertMulti(500, addDataList)
 		err = to.CreateInBatches(addDataList, 500).Error
 		if err != nil {
 			return
@@ -252,10 +236,8 @@ func (m *BaseFromBusinessData) HandleData(addDataList, updateDataList []*BaseFro
 	}
 
 	// 修改
-
 	if len(updateDataList) > 0 {
 		for _, v := range updateDataList {
-			//_, err = to.Update(v, "Value", "ModifyTime")
 			err = to.Model(v).Select("Value", "ModifyTime").Updates(v).Error
 			if err != nil {
 				fmt.Println("BaseFromBusinessData HandleData Update:Err:" + err.Error())
@@ -276,10 +258,8 @@ func (m *BaseFromBusinessData) HandleData(addDataList, updateDataList []*BaseFro
 // @return result EdbInfoMaxAndMinInfo
 // @return err error
 func (m *BaseFromBusinessData) GetEdbInfoMaxAndMinInfo(indexCode string) (result *EdbInfoMaxAndMinInfo, err error) {
-	//o := orm.NewOrm()
 	sql := ``
 	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 base_from_business_data WHERE index_code = ? `
-	//err = o.Raw(sql, indexCode).QueryRow(&result)
 	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&result).Error
 	if err != nil {
 		return
@@ -287,7 +267,6 @@ func (m *BaseFromBusinessData) GetEdbInfoMaxAndMinInfo(indexCode string) (result
 
 	var latestValue float64
 	sql = ` SELECT value AS latest_value FROM base_from_business_data WHERE index_code = ? ORDER BY data_time DESC LIMIT 1 `
-	//err = o.Raw(sql, indexCode).QueryRow(&latestValue)
 	err = global.DEFAULT_DmSQL.Raw(sql, indexCode).First(&latestValue).Error
 	result.LatestValue = latestValue
 
@@ -307,12 +286,9 @@ func (m *BaseFromBusinessData) DelDataByCond(condition []string, pars []interfac
 		err = errors.New("条件不能为空")
 		return
 	}
-	//o := orm.NewOrm()
 	sql := `DELETE FROM base_from_business_data `
-
 	sql += ` WHERE ` + strings.Join(condition, " AND ")
 
-	//_, err = o.Raw(sql, pars).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, pars...).Error
 
 	return

models/base_from_calculate.go

@@ -48,9 +48,6 @@ type CalculateItems struct {
 
 // AddCalculateInfo 新增计算（运算）指标
 func AddCalculateInfo(req EdbInfoCalculateSaveReq, calculateMappingList []*EdbInfoCalculateMapping, edbInfoList []*EdbInfo, edbCode, uniqueCode string, edbInfoIdBytes []string) (edbInfo *EdbInfo, err error) {
-
-	//o := orm.NewOrm()
-	//to, err := o.Begin()
 	to := global.DEFAULT_DmSQL.Begin()
 	if err != nil {
 		return
@@ -100,12 +97,10 @@ func AddCalculateInfo(req EdbInfoCalculateSaveReq, calculateMappingList []*EdbIn
 		MaxEmptyType:     req.MaxEmptyType,
 		Extra:            req.Extra,
 	}
-	//lastId, err := to.Insert(edbInfo)
 	err = to.Create(edbInfo).Error
 	if err != nil {
 		return
 	}
-	//edbInfo.EdbInfoId = int(lastId)
 	edbInfoTag := make(map[string]int)
 	//关联关系表
 	{
@@ -116,7 +111,6 @@ func AddCalculateInfo(req EdbInfoCalculateSaveReq, calculateMappingList []*EdbIn
 			v.EdbInfoId = edbInfo.EdbInfoId
 		}
 		if len(calculateMappingList) > 0 {
-			//_, err = to.InsertMulti(len(calculateMappingList), calculateMappingList)
 			err = to.CreateInBatches(calculateMappingList, len(calculateMappingList)).Error
 			if err != nil {
 				return
@@ -131,8 +125,6 @@ func AddCalculateInfo(req EdbInfoCalculateSaveReq, calculateMappingList []*EdbIn
 
 // EditCalculateInfo 编辑计算（运算）指标
 func EditCalculateInfo(edbInfo *EdbInfo, req EdbInfoCalculateSaveReq, formulaSlice []string, edbInfoIdBytes []string, needCalculate bool) (err error, errMsg string) {
-	//o := orm.NewOrm()
-	//to, err := o.Begin()
 	to := global.DEFAULT_DmSQL.Begin()
 	if err != nil {
 		return
@@ -159,7 +151,6 @@ func EditCalculateInfo(edbInfo *EdbInfo, req EdbInfoCalculateSaveReq, formulaSli
 	edbInfo.EmptyType = req.EmptyType
 	edbInfo.MaxEmptyType = req.MaxEmptyType
 	edbInfo.Extra = req.Extra
-	//_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "EdbNameEn", "UnitEn", "ClassifyId", "CalculateFormula", "ModifyTime", "EmptyType", "MaxEmptyType", "Extra")
 	err = to.Model(edbInfo).Updates(edbInfo).Error
 	if err != nil {
 		return
@@ -168,14 +159,12 @@ func EditCalculateInfo(edbInfo *EdbInfo, req EdbInfoCalculateSaveReq, formulaSli
 	if needCalculate {
 		// 清除计算数据
 		sql := `DELETE FROM edb_data_calculate WHERE edb_info_id=?`
-		//_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
 		err = to.Exec(sql, edbInfo.EdbInfoId).Error
 		if err != nil {
 			return
 		}
 		// 清除关联关系表
 		sql = `DELETE FROM edb_info_calculate_mapping WHERE edb_info_id=?`
-		//_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
 		err = to.Exec(sql, edbInfo.EdbInfoId).Error
 		if err != nil {
 			return
@@ -233,7 +222,6 @@ func EditCalculateInfo(edbInfo *EdbInfo, req EdbInfoCalculateSaveReq, formulaSli
 		//关联关系表
 		{
 			if len(calculateMappingList) > 0 {
-				//_, err = to.InsertMulti(len(calculateMappingList), calculateMappingList)
 				err = to.CreateInBatches(calculateMappingList, len(calculateMappingList)).Error
 				if err != nil {
 					return
@@ -250,48 +238,17 @@ func EditCalculateInfo(edbInfo *EdbInfo, req EdbInfoCalculateSaveReq, formulaSli
 
 // GetCalculateEdbInfo 获取计算指标的关联指标id
 func GetCalculateEdbInfo(edbInfoId int) (from_edb_info_id string, err error) {
-	//o := orm.NewOrm()
 	sql := ` SELECT GROUP_CONCAT(from_edb_info_id ORDER BY sort ASC SEPARATOR ',') AS from_edb_info_id 
 			FROM edb_info_calculate_mapping
 			WHERE edb_info_id=?
 			GROUP BY edb_info_id
 			 `
-	//err = o.Raw(sql, edbInfoId).QueryRow(&from_edb_info_id)
 	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Find(&from_edb_info_id).Error
 	return
 }
 
-// DeleteCalculateEdbInfo 删除指标信息
-func DeleteCalculateEdbInfo(edbInfoId int) (err error) {
-	//o := orm.NewOrm()
-	//to, err := o.Begin()
-	to := global.DEFAULT_DmSQL.Begin()
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err != nil {
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
-	sql := `DELETE FROM edb_data_calculate WHERE edb_info_id=?`
-	//_, err = to.Raw(sql, edbInfoId).Exec()
-	err = to.Exec(sql, edbInfoId).Error
-	if err != nil {
-		return
-	}
-	sql = `DELETE FROM edb_info_calculate_mapping WHERE edb_info_id=?`
-	//_, err = to.Raw(sql, edbInfoId).Exec()
-	err = to.Exec(sql, edbInfoId).Error
-	return
-}
-
 // RefreshAllCalculate 刷新全部数据
 func RefreshAllCalculate(edbInfoIdArr []*EdbInfo, edbInfoTag map[string]int, edbInfoId, source, subSource int, edbCode, formulaStr, startDate, endDate string, edbInfoIdBytes []string, emptyType, maxEmptyType int, extra string) (err error) {
-	//o := orm.NewOrm()
-	//to, err := o.Begin()
 	to := global.DEFAULT_DmSQL.Begin()
 	if err != nil {
 		return
@@ -468,29 +425,10 @@ func refreshAllCalculate(to *gorm.DB, edbInfoIdArr []*EdbInfo, edbInfoTag map[st
 		formulaFormStr := ReplaceFormula(edbInfoIdArr, sv, svMax, formulaMap, formulaStr, edbInfoIdBytes, maxDealFlag)
 		//计算公式异常，那么就移除该指标
 		if formulaFormStr == `` {
-			//removeDateList = append(removeDateList, sk)
 			continue
 		}
-		//utils.FileLog.Info(fmt.Sprintf("formulaFormStr:%s", formulaFormStr))
 		fmt.Println(fmt.Sprintf("%s:formulaFormStr:%s", sk, formulaFormStr))
-		//expression := formula.NewExpression(formulaFormStr)
-		//calResult, err := expression.Evaluate()
-		//if err != nil {
-		//	// 分母为0的报错
-		//	if strings.Contains(err.Error(), "divide by zero") {
-		//		//removeDateList = append(removeDateList, sk)
-		//		continue
-		//	}
-		//	err = errors.New("计算失败：Err:" + err.Error() + ";formulaStr:" + formulaFormStr)
-		//	fmt.Println(err)
-		//	return err
-		//}
-		//// 如果计算结果是NAN，那么就退出当前循环
-		//if calResult.IsNan() {
-		//	continue
-		//}
 		calVal, err := engine.ParseAndExec(formulaFormStr)
-		//calVal, err := calResult.Float64()
 		if err != nil {
 			// 分母为0的报错，忽略该循环
 			if utils.IsDivideZero(err) {
@@ -537,7 +475,6 @@ func refreshAllCalculate(to *gorm.DB, edbInfoIdArr []*EdbInfo, edbInfoTag map[st
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		//_, err = to.Raw(addSql).Exec()
 		err = to.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshAllCalculate add Err", err.Error())
@@ -556,7 +493,6 @@ func refreshAllCalculate(to *gorm.DB, edbInfoIdArr []*EdbInfo, edbInfoTag map[st
 		tableName := GetEdbDataTableName(source, subSource)
 		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)
 
-		//_, err = to.Raw(sql, edbInfoId).Exec()
 		err = to.Exec(sql, edbInfoId).Error
 		if err != nil {
 			err = fmt.Errorf("删除计算失败的计算指标数据失败,Err:" + err.Error())
@@ -762,12 +698,6 @@ func CheckFormula2(edbInfoArr []*EdbInfo, formulaMap map[string]string, formulaS
 	} else {
 		ok = true
 	}
-	//expression := formula.NewExpression(formulaFormStr)
-	//_, err = expression.Evaluate()
-	//if err != nil {
-	//} else {
-	//	ok = true
-	//}
 	return
 }
 
@@ -789,22 +719,6 @@ func HandleDateSaveDataMap(dateList []string, maxStartDate, minLatestDate time.T
 			tmpEdbInfoId := edbInfo.EdbInfoId // 当前指标id
 			// 如果该日期不存在该指标数据，那么需要找寻前后日期的数据，进行填补
 			if _, ok := tmpDataMap[tmpEdbInfoId]; !ok {
-
-				//day := 0
-				//switch edbInfo.Frequency {
-				//case "周度":
-				//	day = 7
-				//case "旬度":
-				//	day = 15
-				//case "月度":
-				//	day = 30
-				//case "季度":
-				//	day = 90
-				//case "年度":
-				//	day = 365
-				//}
-				// 需求池 255 指标运算文案修改，补数据遍历区间修改（2023-3-7 09:37:23修改）
-
 				switch emptyType {
 				case 0:
 					handleDateDataMap(realSaveDataMap, saveDataMap, date, tmpEdbInfoId, 35)
@@ -876,7 +790,6 @@ func handleDateDataMapBefore(realSaveDataMap, saveDataMap map[string]map[int]flo
 	if currDate.Before(startDateT) {
 		if findDataMap, hasFindDataMap := realSaveDataMap[startDate]; hasFindDataMap { // 下一个日期有数据
 			if val, hasFindItem := findDataMap[edbInfoId]; hasFindItem {
-				//utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, startDate, val))
 				saveDataMap[date][edbInfoId] = val
 				return
 			}
@@ -886,7 +799,6 @@ func handleDateDataMapBefore(realSaveDataMap, saveDataMap map[string]map[int]flo
 	if currDate.After(endDateT) {
 		if findDataMap, hasFindDataMap := realSaveDataMap[endDate]; hasFindDataMap { // 下一个日期有数据
 			if val, hasFindItem := findDataMap[edbInfoId]; hasFindItem {
-				//utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, endDate, val))
 				saveDataMap[date][edbInfoId] = val
 				return
 			}
@@ -899,7 +811,6 @@ func handleDateDataMapBefore(realSaveDataMap, saveDataMap map[string]map[int]flo
 			preDateDayStr := preDateDay.Format(utils.FormatDate)
 			if findDataMap, hasFindDataMap := realSaveDataMap[preDateDayStr]; hasFindDataMap { // 下一个日期有数据
 				if val, hasFindItem := findDataMap[edbInfoId]; hasFindItem {
-					//utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, preDateDayStr, val))
 					saveDataMap[date][edbInfoId] = val
 					return
 				}
@@ -922,7 +833,6 @@ func handleDateDataMapAfter(realSaveDataMap, saveDataMap map[string]map[int]floa
 	if currDate.Before(startDateT) {
 		if findDataMap, hasFindDataMap := realSaveDataMap[startDate]; hasFindDataMap { // 下一个日期有数据
 			if val, hasFindItem := findDataMap[edbInfoId]; hasFindItem {
-				//utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, startDate, val))
 				saveDataMap[date][edbInfoId] = val
 				return
 			}
@@ -932,7 +842,6 @@ func handleDateDataMapAfter(realSaveDataMap, saveDataMap map[string]map[int]floa
 	if currDate.After(endDateT) {
 		if findDataMap, hasFindDataMap := realSaveDataMap[endDate]; hasFindDataMap { // 下一个日期有数据
 			if val, hasFindItem := findDataMap[edbInfoId]; hasFindItem {
-				//utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, endDate, val))
 				saveDataMap[date][edbInfoId] = val
 				return
 			}
@@ -946,7 +855,6 @@ func handleDateDataMapAfter(realSaveDataMap, saveDataMap map[string]map[int]floa
 			nextDateDayStr := nextDateDay.Format(utils.FormatDate)
 			if findDataMap, hasFindDataMap := realSaveDataMap[nextDateDayStr]; hasFindDataMap { // 下一个日期有数据
 				if val, hasFindItem := findDataMap[edbInfoId]; hasFindItem {
-					//utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, nextDateDayStr, val))
 					saveDataMap[date][edbInfoId] = val
 					return
 				}

models/base_from_edb_mapping.go

@@ -8,20 +8,6 @@ import (
 	"time"
 )
 
-// BaseFromEdbMapping 同花顺高频数据
-//type BaseFromEdbMapping struct {
-//	Id              int       `orm:"column(id);pk"`
-//	BaseFromIndexId int       `description:"源指标ID"`
-//	BaseIndexCode   string    `description:"源指标编码"`
-//	EdbInfoId       int       `description:"指标ID"`
-//	EdbCode         string    `description:"指标编码"`
-//	Source          int       `description:"指标来源：1-同花顺..."`
-//	SubSource       int       `description:"子数据来源：0-经济数据库；1-日期序列；2-高频数据"`
-//	ConvertRule     string    `description:"转换规则"`
-//	CreateTime      time.Time `description:"创建时间"`
-//	ModifyTime      time.Time `description:"修改时间"`
-//}
-
 // BaseFromEdbMapping 同花顺高频数据
 type BaseFromEdbMapping struct {
 	Id              int       `gorm:"column:id;primaryKey" description:"同花顺高频数据ID"`
@@ -69,13 +55,10 @@ func (m *BaseFromEdbMapping) Cols() BaseFromEdbMappingCols {
 }
 
 func (m *BaseFromEdbMapping) Create() (err error) {
-	//o := orm.NewOrm()
-	//id, err := o.Insert(m)
 	err = global.DEFAULT_DmSQL.Create(m).Error
 	if err != nil {
 		return
 	}
-	//m.Id = int(id)
 	return
 }
 
@@ -83,23 +66,17 @@ func (m *BaseFromEdbMapping) CreateMulti(items []*BaseFromEdbMapping) (err error
 	if len(items) == 0 {
 		return
 	}
-	//o := orm.NewOrm()
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, len(items)).Error
 	return
 }
 
 func (m *BaseFromEdbMapping) Update(cols []string) (err error) {
-	//o := orm.NewOrm()
-	//_, err = o.Update(m, cols...)
 	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 	return
 }
 
 func (m *BaseFromEdbMapping) 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.Id).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, m.Id).Error
 	return
 }
@@ -108,9 +85,7 @@ func (m *BaseFromEdbMapping) 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
 }
@@ -119,43 +94,34 @@ func (m *BaseFromEdbMapping) RemoveByCondition(condition string, pars []interfac
 	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 *BaseFromEdbMapping) GetItemById(id int) (item *BaseFromEdbMapping, 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 *BaseFromEdbMapping) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *BaseFromEdbMapping, 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 *BaseFromEdbMapping) 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...).Find(&count).Error
 	return
 }
 
 func (m *BaseFromEdbMapping) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromEdbMapping, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -165,13 +131,11 @@ func (m *BaseFromEdbMapping) GetItemsByCondition(condition string, pars []interf
 		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 *BaseFromEdbMapping) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BaseFromEdbMapping, err error) {
-	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -181,7 +145,6 @@ func (m *BaseFromEdbMapping) GetPageItemsByCondition(condition string, pars []in
 		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

models/base_from_gn.go

@@ -150,9 +150,7 @@ func RefreshEdbDataFromGn(source, subSource, edbInfoId int, tableName, edbCode,
 	if !hasNew {
 		return
 	}
-	//o := orm.NewOrm()
 	sqlInsert = strings.TrimRight(sqlInsert, ",")
-	//_, e = o.Raw(sqlInsert).Exec()
 	e = global.DEFAULT_DmSQL.Exec(sqlInsert).Error
 	if e != nil {
 		err = fmt.Errorf("insert edb data err: %s", e.Error())

models/base_from_manual.go

@@ -12,15 +12,6 @@ import (
 	"time"
 )
 
-//弘则手工数据
-
-//type ManualEdbdata struct {
-//	TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
-//	Dt         string    `orm:"column(DT)" description:"日期"`
-//	Close      string    `orm:"column(CLOSE)" description:"值"`
-//	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`
-//}
-
 type ManualEdbdata struct {
 	TradeCode  string    `gorm:"column:TRADE_CODE;primaryKey" description:"指标编码"`
 	Dt         string    `gorm:"column:DT" description:"日期"`
@@ -38,16 +29,12 @@ func GetEdbdataManualByCondition(condition string, pars []interface{}) (item []*
 		sql += condition
 	}
 	sql += ` ORDER BY DT DESC `
-	//o := orm.NewOrmUsingDB("edb")
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
 	err = global.DmSQL["edb"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 // AddEdbDataFromManual 新增弘则手工指标数据
 func AddEdbDataFromManual(edbCode string) (err error) {
-	//o := orm.NewOrm()
-
 	var condition string
 	var pars []interface{}
 
@@ -86,7 +73,6 @@ func AddEdbDataFromManual(edbCode string) (err error) {
 		}
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
-			//_, err = o.Raw(addSql).Exec()
 			err = global.DEFAULT_DmSQL.Exec(addSql).Error
 			if err != nil {
 				return
@@ -101,7 +87,6 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err err
 	source := utils.DATA_SOURCE_MANUAL
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -166,7 +151,6 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err err
 	addSql := ` INSERT INTO edb_data_manual (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	manualMap := make(map[string]*ManualEdbdata)
-	//fmt.Println("manualDataList:", len(manualDataList))
 	for _, v := range manualDataList {
 		item := v
 		eDate := item.Dt
@@ -221,7 +205,6 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err err
 	}
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		//_, err = o.Raw(addSql).Exec()
 		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshAllEdbDataByManual add Err", err.Error())
@@ -268,9 +251,7 @@ func HandleConfigInsertEdbData(realDataMaxDate time.Time, edbDataInsertConfig *E
 			DeleteEdbDataById(source, subSource, item.EdbDataId)
 		}
 	} else {
-		//o := orm.NewOrm()
 		edbDataInsertConfig.RealDate = realDataMaxDate
-		//_, err = o.Update(edbDataInsertConfig, "RealDate")
 		err = global.DEFAULT_DmSQL.Model(&EdbDataInsertConfig{}).Where("edb_info_id=?", edbInfoId).Update("RealDate", realDataMaxDate).Error
 	}
 
@@ -313,9 +294,7 @@ func HandleConfigInsertEdbDataByMongo(realDataMaxDate time.Time, edbDataInsertCo
 			mogDataObj.RemoveManyByColl(coll, bson.M{"_id": item.ID})
 		}
 	} else {
-		//o := orm.NewOrm()
 		edbDataInsertConfig.RealDate = realDataMaxDate
-		//_, err = o.Update(edbDataInsertConfig, "RealDate")
 		err = global.DEFAULT_DmSQL.Model(&EdbDataInsertConfig{}).Where("edb_info_id=?", edbInfoId).Update("RealDate", realDataMaxDate).Error
 	}
 

models/base_from_python.go

@@ -11,18 +11,6 @@ import (
 	"time"
 )
 
-// EdbDataPython python指标数据结构体
-//type EdbDataPython struct {
-//	EdbDataId     int `orm:"column(edb_data_id);pk"`
-//	EdbInfoId     int
-//	EdbCode       string
-//	DataTime      string
-//	Value         float64
-//	CreateTime    time.Time
-//	ModifyTime    time.Time
-//	DataTimestamp int64
-//}
-
 type EdbDataPython struct {
 	EdbDataId     int       `gorm:"column:edb_data_id;primaryKey"` // 指标数据ID
 	EdbInfoId     int       `gorm:"column:edb_info_id"`            // 指标信息ID
@@ -34,7 +22,7 @@ type EdbDataPython struct {
 	DataTimestamp int64     `gorm:"column:data_timestamp"`         // 数据时间戳
 }
 
-// tableName
+// TableName
 func (m *EdbDataPython) TableName() string {
 	return "edb_data_python"
 }
@@ -47,8 +35,6 @@ type EdbDataFromPython struct {
 
 // AddPythonEdb 新增python运算指标
 func AddPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython, edbInfoList []*EdbInfo) (err error) {
-	//o := orm.NewOrm()
-
 	//添加指标关系
 	for _, tmpEdbInfo := range edbInfoList {
 		calculateMappingItem := new(EdbInfoCalculateMapping)
@@ -64,7 +50,6 @@ func AddPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython, edbInfoList []*EdbIn
 		calculateMappingItem.FromSourceName = tmpEdbInfo.SourceName
 		calculateMappingItem.Source = edbInfo.Source
 		calculateMappingItem.SourceName = edbInfo.SourceName
-		//_, err = o.Insert(calculateMappingItem)
 		err = global.DEFAULT_DmSQL.Create(calculateMappingItem).Error
 		if err != nil {
 			return
@@ -93,7 +78,6 @@ func AddPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython, edbInfoList []*EdbIn
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		//_, err = o.Raw(addSql).Exec()
 		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return
@@ -104,7 +88,6 @@ func AddPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython, edbInfoList []*EdbIn
 
 // EditPythonEdb 编辑python运算指标
 func EditPythonEdb(edbInfoId int, edbCode string, item EdbDataFromPython) (err error) {
-	//o := orm.NewOrm()
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_python (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	for k, dateTimeStr := range item.Date {
@@ -127,7 +110,6 @@ func EditPythonEdb(edbInfoId int, edbCode string, item EdbDataFromPython) (err e
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		//_, err = o.Raw(addSql).Exec()
 		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			return
@@ -138,21 +120,6 @@ func EditPythonEdb(edbInfoId int, edbCode string, item EdbDataFromPython) (err e
 
 // RefreshAllPythonEdb 刷新所有 python运算指标
 func RefreshAllPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython) (err error) {
-	//o := orm.NewOrm()
-	//to, err := o.Begin()
-	//to := global.DEFAULT_DmSQL.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		fmt.Println("RefreshAllPythonEdb,Err:" + err.Error())
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-
 	pythonDataMap := make(map[string]float64)
 	pythonDate := make([]string, 0)
 	for k, dateTimeStr := range item.Date {
@@ -216,7 +183,6 @@ func RefreshAllPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython) (err error) {
 		}
 		//最后如果还有需要新增的数据，那么就统一入库
 		if len(addDataList) > 0 {
-			//_, tmpErr := o.InsertMulti(len(addDataList), addDataList)
 			tmpErr := global.DEFAULT_DmSQL.CreateInBatches(addDataList, 500).Error
 			if tmpErr != nil {
 				err = tmpErr
@@ -234,7 +200,6 @@ func RefreshAllPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython) (err error) {
 			tableName := GetEdbDataTableName(edbInfo.Source, edbInfo.SubSource)
 			sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)
 
-			//_, err = o.Raw(sql, edbInfo.EdbInfoId).Exec()
 			err = global.DEFAULT_DmSQL.Exec(sql, edbInfo.EdbInfoId).Error
 			if err != nil {
 				err = errors.New("删除不存在的Python运算指标数据失败,Err:" + err.Error())
@@ -249,7 +214,6 @@ func RefreshAllPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython) (err error) {
 		for edbDate, edbDataValue := range updateEdbDataMap {
 			sql := fmt.Sprintf(` UPDATE  %s set value = ?,modify_time=now() WHERE edb_info_id = ? and data_time = ? `, tableName)
 
-			//_, err = o.Raw(sql, edbDataValue, edbInfo.EdbInfoId, edbDate).Exec()
 			err = global.DEFAULT_DmSQL.Exec(sql, edbDataValue, edbInfo.EdbInfoId, edbDate).Error
 			if err != nil {
 				err = errors.New("更新现有的Python运算指标数据失败,Err:" + err.Error())
@@ -262,8 +226,6 @@ func RefreshAllPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython) (err error) {
 
 // EditEdbInfoCalculateMapping 更新关联关系表
 func EditEdbInfoCalculateMapping(edbInfo *EdbInfo, edbInfoList []*EdbInfo) (err error) {
-	//o := orm.NewOrm()
-
 	var existCondition string
 	var existPars []interface{}
 	existCondition += " AND edb_info_id=? "
@@ -304,7 +266,6 @@ func EditEdbInfoCalculateMapping(edbInfo *EdbInfo, edbInfoList []*EdbInfo) (err
 			calculateMappingItem.FromSourceName = tmpEdbInfo.SourceName
 			calculateMappingItem.Source = edbInfo.Source
 			calculateMappingItem.SourceName = edbInfo.SourceName
-			//_, err = o.Insert(calculateMappingItem)
 			err = global.DEFAULT_DmSQL.Create(calculateMappingItem).Error
 			if err != nil {
 				return
@@ -315,7 +276,6 @@ func EditEdbInfoCalculateMapping(edbInfo *EdbInfo, edbInfoList []*EdbInfo) (err
 	for _, v := range existEdbInfoIdMap {
 		//删除，计算指标关联的，基础指标的关联关系
 		sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? and from_edb_info_id=?`
-		//_, err = o.Raw(sql, edbInfo.EdbInfoId, v).Exec()
 		err = global.DEFAULT_DmSQL.Exec(sql, edbInfo.EdbInfoId, v).Error
 		if err != nil {
 			err = errors.New("删除计算指标关联关系失败,Err:" + err.Error())
@@ -327,9 +287,7 @@ func EditEdbInfoCalculateMapping(edbInfo *EdbInfo, edbInfoList []*EdbInfo) (err
 
 // GetAllEdbDataPythonByEdbInfoId 根据指标id获取全部的数据
 func GetAllEdbDataPythonByEdbInfoId(edbInfoId int) (items []*EdbDataPython, err error) {
-	//o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_data_python WHERE edb_info_id=? ORDER BY data_time DESC `
-	//_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Scan(&items).Error
 	return
 }

models/base_from_stock_plant.go

@@ -10,14 +10,6 @@ import (
 	"time"
 )
 
-// StockPlantEdbdata 存量装置数据
-//type StockPlantEdbdata struct {
-//	VarietyEdbId string    `orm:"column(variety_edb_id);pk" description:"指标编码"`
-//	DataTime     string    `orm:"column(data_time)" description:"日期"`
-//	Value        string    `orm:"column(value)" description:"值"`
-//	ModifyTime   time.Time `orm:"column(modify_time)" description:"修改时间"`
-//}
-
 type StockPlantEdbdata struct {
 	VarietyEdbId string    `gorm:"column:variety_edb_id;primaryKey" description:"指标编码"`
 	DataTime     string    `gorm:"column:data_time" description:"日期"`
@@ -35,8 +27,6 @@ func GetStockPlantEdbDataByCondition(condition string, pars []interface{}) (item
 		sql += condition
 	}
 	sql += ` ORDER BY data_time DESC `
-	//o := orm.NewOrm()
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
@@ -46,7 +36,6 @@ func RefreshEdbDataFromStockPlant(edbInfoId int, edbCode, startDate string) (err
 	source := utils.DATA_SOURCE_STOCK_PLANT
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -99,7 +88,6 @@ func RefreshEdbDataFromStockPlant(edbInfoId int, edbCode, startDate string) (err
 	manualMap := make(map[string]*StockPlantEdbdata)
 	for _, v := range baseDataList {
 		item := v
-		//fmt.Println("Item:", item.Dt, item.Close, item.TradeCode, item.ModifyTime)
 		if findItem, ok := existMap[v.DataTime]; !ok {
 			eDate := item.DataTime
 			sValue := item.Value
@@ -133,7 +121,6 @@ func RefreshEdbDataFromStockPlant(edbInfoId int, edbCode, startDate string) (err
 	// 将数据入库
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		//_, err = o.Raw(addSql).Exec()
 		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshAllEdbDataByStockPlant add Err", err.Error())

models/base_predict_from_calculate.go

@@ -37,12 +37,6 @@ type PredictCalculateItems struct {
 
 // EditPredictCalculate 新增预测计算（运算）指标
 func EditPredictCalculate(edbInfo *EdbInfo, calculateMappingList []*EdbInfoCalculateMapping) (err error) {
-	//o := orm.NewOrm()
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-
 	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -63,7 +57,6 @@ func EditPredictCalculate(edbInfo *EdbInfo, calculateMappingList []*EdbInfoCalcu
 	}()
 
 	// 修改指标信息
-	//_, err = to.Update(edbInfo, "EdbName", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "EmptyType", "MaxEmptyType", "Extra", "EdbNameEn", "UnitEn")
 	err = edbInfo.Update(
 		[]string{"EdbName", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "EmptyType", "MaxEmptyType", "Extra", "EdbNameEn", "UnitEn"},
 	)
@@ -73,7 +66,6 @@ func EditPredictCalculate(edbInfo *EdbInfo, calculateMappingList []*EdbInfoCalcu
 
 	//删除，计算指标关联的，基础指标的关联关系
 	sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? `
-	//_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
 	err = to.Exec(sql, edbInfo.EdbInfoId).Error
 	if err != nil {
 		err = errors.New("删除计算指标关联关系失败,Err:" + err.Error())
@@ -82,7 +74,6 @@ func EditPredictCalculate(edbInfo *EdbInfo, calculateMappingList []*EdbInfoCalcu
 
 	// 插入新的关系表
 	if len(calculateMappingList) > 0 {
-		//_, err = to.InsertMulti(len(calculateMappingList), calculateMappingList)
 		err = to.CreateInBatches(calculateMappingList, len(calculateMappingList)).Error
 	}
 
@@ -90,7 +81,6 @@ func EditPredictCalculate(edbInfo *EdbInfo, calculateMappingList []*EdbInfoCalcu
 	tableName := GetEdbDataTableName(edbInfo.Source, edbInfo.SubSource)
 	//清空原有数据
 	sql = ` DELETE FROM ` + tableName + ` WHERE edb_info_id = ? `
-	//_, err = o.Raw(sql, edbInfo.EdbInfoId).Exec()
 	err = to.Exec(sql, edbInfo.EdbInfoId).Error
 	if err != nil {
 		return
@@ -99,146 +89,7 @@ func EditPredictCalculate(edbInfo *EdbInfo, calculateMappingList []*EdbInfoCalcu
 	return
 }
 
-// AddPredictCalculateData 新增预测计算（运算）指标的数据
-//func AddPredictCalculateDataBak(edbInfoIdList []*EdbInfo, edbInfoId int, edbCode, formulaStr string, edbInfoIdBytes []string) (latestDateStr string, latestValue float64, err error) {
-//	o := orm.NewOrm()
-//	defer func() {
-//		if err != nil {
-//			utils.FileLog.Info(fmt.Sprintf("Calculate Err:%s" + err.Error()))
-//		}
-//	}()
-//
-//	var minLatestDate time.Time
-//	oldSaveDataMap := make(map[string]map[int]float64)
-//	saveDataMap := make(map[string]map[int]float64)
-//	dateList := make([]string, 0)
-//
-//	for edbInfoIndex, v := range edbInfoIdList {
-//		tmpLatestDate, tmpErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
-//		if tmpErr != nil {
-//			err = errors.New(`最近的日期格式化失败;日期：` + v.LatestDate + `;err:` + tmpErr.Error())
-//			return
-//		}
-//		// 如果不存在最小的真实数据日期，那么将当前指标的真实数据日期给赋值；
-//		// 如果存在最小的真实数据日期，同时当前指标的真实数据日期 早于 最小的真实数据日期， 那么将当前指标的真实数据日期给赋值；
-//		if minLatestDate.IsZero() || tmpLatestDate.Before(minLatestDate) {
-//			minLatestDate = tmpLatestDate
-//		}
-//
-//		dataList, tmpErr := GetPredictEdbDataListAll(v, 1)
-//		if tmpErr != nil {
-//			err = tmpErr
-//			return
-//		}
-//		dataMap := make(map[string]float64)
-//		for _, dv := range dataList {
-//			// 现有实际数据
-//			if val, ok := oldSaveDataMap[dv.DataTime]; ok {
-//				if _, ok := val[v.EdbInfoId]; !ok {
-//					val[v.EdbInfoId] = dv.Value
-//				}
-//			} else {
-//				temp := make(map[int]float64)
-//				temp[v.EdbInfoId] = dv.Value
-//				oldSaveDataMap[dv.DataTime] = temp
-//			}
-//
-//			// 待处理的数据
-//			if val, ok := saveDataMap[dv.DataTime]; ok {
-//				if _, ok := val[v.EdbInfoId]; !ok {
-//					val[v.EdbInfoId] = dv.Value
-//				}
-//			} else {
-//				temp := make(map[int]float64)
-//				temp[v.EdbInfoId] = dv.Value
-//				saveDataMap[dv.DataTime] = temp
-//			}
-//
-//			// 以第一个指标的日期作为基准日期
-//			if edbInfoIndex == 0 {
-//				dateList = append(dateList, dv.DataTime)
-//			}
-//		}
-//		item := new(PredictCalculateItems)
-//		item.EdbInfoId = v.EdbInfoId
-//		item.DataMap = dataMap
-//	}
-//
-//	//数据处理，将日期内不全的数据做补全
-//	handleDateSaveDataMap(dateList, oldSaveDataMap, saveDataMap, edbInfoIdList)
-//
-//	formulaMap := utils.CheckFormula(formulaStr)
-//	addSql := ` INSERT INTO edb_data_predict_calculate (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
-//	nowStr := time.Now().Format(utils.FormatDateTime)
-//	var isAdd bool
-//
-//	if !minLatestDate.IsZero() {
-//		latestDateStr = minLatestDate.Format(utils.FormatDate)
-//	}
-//	for sk, sv := range saveDataMap {
-//		formulaStr = strings.ToUpper(formulaStr)
-//		formulaFormStr := ReplaceFormula(edbInfoIdList, sv, formulaMap, formulaStr, edbInfoIdBytes)
-//		if formulaStr == "" {
-//			return
-//		}
-//		if formulaFormStr != "" {
-//			expression := formula.NewExpression(formulaFormStr)
-//			calResult, tmpErr := expression.Evaluate()
-//			if tmpErr != nil {
-//				err = errors.New("计算失败：Err:" + tmpErr.Error() + ";formulaStr:" + formulaFormStr)
-//				fmt.Println(err)
-//				return
-//			}
-//			calVal, tmpErr := calResult.Float64()
-//			if tmpErr != nil {
-//				err = errors.New("计算失败：获取计算值失败 Err:" + tmpErr.Error() + ";formulaStr:" + formulaFormStr)
-//				fmt.Println(err)
-//				return
-//			}
-//
-//			//需要存入的数据
-//			{
-//				if latestDateStr == sk {
-//					nanCheck := fmt.Sprintf("%0.f", calVal)
-//					// 分母为0.0的报错
-//					if nanCheck == "NaN" || nanCheck == "+Inf" || nanCheck == "-Inf" {
-//						err = errors.New("计算失败 分母为0：Err: formulaStr:" + formulaFormStr)
-//						fmt.Println(err)
-//						return
-//					}
-//					latestValue, _ = decimal.NewFromFloat(calVal).Truncate(4).Float64() //保留4位小数
-//				}
-//				dataTime, _ := time.ParseInLocation(utils.FormatDate, sk, time.Local)
-//				timestamp := dataTime.UnixNano() / 1e6
-//				timeStr := fmt.Sprintf("%d", timestamp)
-//				addSql += "("
-//				addSql += strconv.Itoa(edbInfoId) + "," + "'" + edbCode + "'" + "," + "'" + sk + "'" + "," + utils.SubFloatToString(calVal, 4) + "," + "'" + nowStr + "'" +
-//					"," + "'" + nowStr + "'" + "," + "'" + timeStr + "'"
-//				addSql += "),"
-//				isAdd = true
-//			}
-//		} else {
-//			fmt.Println("formulaFormStr is empty")
-//		}
-//	}
-//	if isAdd {
-//		addSql = strings.TrimRight(addSql, ",")
-//		_, err = o.Raw(addSql).Exec()
-//		if err != nil {
-//			fmt.Println("AddPredictCalculate Err:" + err.Error())
-//			//errMsg = " tx.Exec Err :" + err.Error()
-//			return
-//		}
-//	}
-//	return
-//}
-
 func AddPredictCalculateData(edbInfoIdList []*EdbInfo, edbInfoTag map[string]int, edbInfo *EdbInfo, edbCode, formulaStr string, edbInfoIdBytes []string) (latestDateStr string, latestValue float64, err error) {
-	//o := orm.NewOrm()
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
 	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -255,11 +106,6 @@ func AddPredictCalculateData(edbInfoIdList []*EdbInfo, edbInfoTag map[string]int
 
 // RefreshAllPredictCalculate 刷新预测计算指标的全部数据
 func RefreshAllPredictCalculate(edbInfoIdList []*EdbInfo, edbInfoTag map[string]int, edbInfoId, source, subSource int, edbCode, formulaStr, startDate string, edbInfoIdBytes []string, emptyType, maxEmptyType int, extra string) (latestDateStr string, latestValue float64, err error) {
-	//o := orm.NewOrm()
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
 	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -307,14 +153,6 @@ func refreshAllPredictCalculate(to *gorm.DB, edbInfoIdList []*EdbInfo, edbInfoTa
 		if newLatestDate.IsZero() || tmpNewLatestDate.Before(newLatestDate) {
 			newLatestDate = tmpNewLatestDate
 		}
-		/*tmpStartDate, tmpErr := time.ParseInLocation(utils.FormatDate, v.StartDate, time.Local)
-		if tmpErr != nil {
-			err = errors.New(`最近的日期格式化失败;日期：` + v.StartDate + `;err:` + tmpErr.Error())
-			return
-		}
-		if maxStartDate.IsZero() || maxStartDate.Before(tmpStartDate) {
-			maxStartDate = tmpStartDate
-		}*/
 
 		// 获取关联指标数据
 		dataList, tmpErr := GetPredictEdbDataListAllByStartDate(v, 1, startDate)
@@ -367,17 +205,6 @@ func refreshAllPredictCalculate(to *gorm.DB, edbInfoIdList []*EdbInfo, edbInfoTa
 					}
 				}
 			}
-
-			/*if edbInfoIndex == 0 {
-				dateList = append(dateList, dv.DataTime)
-				tmpDate, _ := time.ParseInLocation(utils.FormatDate, dv.DataTime, time.Local)
-				if minLatestDate.IsZero() || tmpDate.After(minLatestDate) {
-					minLatestDate = tmpDate
-				}
-				if maxStartDate.IsZero() || tmpDate.Before(maxStartDate) {
-					maxStartDate = tmpDate
-				}
-			}*/
 		}
 	}
 	// 处理最大日期和最小日期
@@ -431,7 +258,6 @@ func refreshAllPredictCalculate(to *gorm.DB, edbInfoIdList []*EdbInfo, edbInfoTa
 				continue
 			}
 		}
-		//fmt.Println(sk, sv)
 		// 根据时间范围，选择对应的公式
 		formulaMap := make(map[string]string)
 		formulaStr = ""
@@ -461,13 +287,9 @@ func refreshAllPredictCalculate(to *gorm.DB, edbInfoIdList []*EdbInfo, edbInfoTa
 		formulaStr = strings.ToUpper(formulaStr)
 		formulaFormStr := ReplaceFormula(edbInfoIdList, sv, svMax, formulaMap, formulaStr, edbInfoIdBytes, maxDealFlag)
 		if formulaFormStr != "" {
-			//utils.FileLog.Info(fmt.Sprintf("formulaFormStr:%s", formulaFormStr))
 			fmt.Println(fmt.Sprintf("date %s:formulaFormStr:%s", sk, formulaFormStr))
-			//expression := formula.NewExpression(formulaFormStr)
-			//calResult, tmpErr := expression.Evaluate()
 
 			calVal, err := engine.ParseAndExec(formulaFormStr)
-			//calVal, err := calResult.Float64()
 			if err != nil {
 				// 分母为0的报错，忽略该循环
 				if utils.IsDivideZero(err) {
@@ -477,24 +299,6 @@ func refreshAllPredictCalculate(to *gorm.DB, edbInfoIdList []*EdbInfo, edbInfoTa
 				err = errors.New("计算失败：获取计算值失败 Err:" + err.Error() + ";formulaStr:" + formulaFormStr)
 				return "", 0, err
 			}
-			//nanCheck := fmt.Sprintf("%0.f", calVal)
-
-			//if tmpErr != nil {
-			//	// 分母为0的报错
-			//	if strings.Contains(err.Error(), "divide by zero") {
-			//		removeDateList = append(removeDateList, sk)
-			//		continue
-			//	}
-			//	err = errors.New("计算失败：Err:" + tmpErr.Error() + ";formulaStr:" + formulaFormStr)
-			//	fmt.Println(err)
-			//	return
-			//}
-			//calVal, tmpErr := calResult.Float64()
-			//if tmpErr != nil {
-			//	err = errors.New("计算失败：获取计算值失败 Err:" + tmpErr.Error() + ";formulaStr:" + formulaFormStr)
-			//	fmt.Println(err)
-			//	return
-			//}
 			nanCheck := fmt.Sprintf("%0.f", calVal)
 			// 分母为0.0的报错
 			if nanCheck == "NaN" || nanCheck == "+Inf" || nanCheck == "-Inf" {
@@ -522,7 +326,6 @@ func refreshAllPredictCalculate(to *gorm.DB, edbInfoIdList []*EdbInfo, edbInfoTa
 				if existStr != saveValue {
 					sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 					sql = fmt.Sprintf(sql, dataTableName)
-					//_, err = to.Raw(sql, saveValue, edbInfoId, sk).Exec()
 					err = to.Exec(sql, saveValue, edbInfoId, sk).Error
 					if err != nil {
 						return "", 0, err
@@ -538,7 +341,6 @@ func refreshAllPredictCalculate(to *gorm.DB, edbInfoIdList []*EdbInfo, edbInfoTa
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		//_, err = to.Raw(addSql).Exec()
 		err = global.DEFAULT_DmSQL.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshAllCalculate add Err", err.Error())
@@ -553,7 +355,6 @@ func refreshAllPredictCalculate(to *gorm.DB, edbInfoIdList []*EdbInfo, edbInfoTa
 		tableName := GetEdbDataTableName(source, subSource)
 		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)
 
-		//_, err = to.Raw(sql, edbInfoId).Exec()
 		err = to.Exec(sql, edbInfoId).Error
 		if err != nil {
 			err = fmt.Errorf("删除计算失败的计算指标数据失败,Err:" + err.Error())
@@ -566,13 +367,11 @@ func refreshAllPredictCalculate(to *gorm.DB, edbInfoIdList []*EdbInfo, edbInfoTa
 		latestDateStr = newLatestDate.Format(utils.FormatDate)
 		sql = fmt.Sprintf(` SELECT * FROM %s WHERE edb_info_id = ? and data_time <= ? ORDER BY data_time desc limit 1`, dataTableName)
 		var latestDate EdbData
-		//e := to.Raw(sql, edbInfoId, latestDateStr).QueryRow(&latestDate)
 		e := to.Raw(sql, edbInfoId, latestDateStr).Find(&latestDate).Error
 		if e != nil {
 			if e.Error() == utils.ErrNoRow() {
 				//首个日期的值
 				sql = fmt.Sprintf(` SELECT * FROM %s WHERE edb_info_id = ? ORDER BY data_time ASC limit 1`, dataTableName)
-				//e = to.Raw(sql, edbInfoId).QueryRow(&latestDate)
 				e = to.Raw(sql, edbInfoId).Find(&latestDate).Error
 				if e != nil {
 					err = fmt.Errorf("查询最新日期失败,Err:" + e.Error())

models/business_conf.go

@@ -4,68 +4,10 @@ import (
 	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
 	"fmt"
-	"html"
 	"strings"
 	"time"
 )
 
-const (
-	BusinessConfUseXf                     = "UseXf"
-	BusinessConfXfAppid                   = "XfAppid"
-	BusinessConfXfApiKey                  = "XfApiKey"
-	BusinessConfXfApiSecret               = "XfApiSecret"
-	BusinessConfXfVcn                     = "XfVcn"
-	BusinessConfEnPptCoverImgs            = "EnPptCoverImgs"
-	BusinessConfIsReportApprove           = "IsReportApprove"
-	BusinessConfReportApproveType         = "ReportApproveType"
-	BusinessConfCompanyName               = "CompanyName"
-	BusinessConfCompanyWatermark          = "CompanyWatermark"
-	BusinessConfWatermarkChart            = "WatermarkChart"
-	BusinessConfLoginSmsTpId              = "LoginSmsTpId"
-	BusinessConfLoginSmsGjTpId            = "LoginSmsGjTpId"
-	BusinessConfSmsJhgnAppKey             = "SmsJhgnAppKey"
-	BusinessConfSmsJhgjAppKey             = "SmsJhgjAppKey"
-	BusinessConfLdapHost                  = "LdapHost"
-	BusinessConfLdapBase                  = "LdapBase"
-	BusinessConfLdapPort                  = "LdapPort"
-	BusinessConfEmailClient               = "EmailClient"
-	BusinessConfEmailServerHost           = "EmailServerHost"
-	BusinessConfEmailServerPort           = "EmailServerPort"
-	BusinessConfEmailSender               = "EmailSender"
-	BusinessConfEmailSenderUserName       = "EmailSenderUserName"
-	BusinessConfEmailSenderPassword       = "EmailSenderPassword"
-	BusinessConfSmsClient                 = "SmsClient"
-	BusinessConfNanHuaSmsAppKey           = "NanHuaSmsAppKey"
-	BusinessConfNanHuaSmsAppSecret        = "NanHuaSmsAppSecret"
-	BusinessConfNanHuaSmsApiHost          = "NanHuaSmsApiHost"
-	BusinessConfLoginSmsTplContent        = "LoginSmsTplContent"
-	BusinessConfLoginEmailTemplateSubject = "LoginEmailTemplateSubject"
-	BusinessConfLoginEmailTemplateContent = "LoginEmailTemplateContent"
-	BusinessConfLdapBindUserSuffix        = "LdapBindUserSuffix"
-	BusinessConfLdapUserFilter            = "LdapUserFilter"
-
-	BusinessConfTencentApiSecretId           = "TencentApiSecretId"           // 腾讯云API-密钥对
-	BusinessConfTencentApiSecretKey          = "TencentApiSecretKey"          // 腾讯云API-密钥对
-	BusinessConfTencentApiRecTaskCallbackUrl = "TencentApiRecTaskCallbackUrl" // 腾讯云API-语音识别回调地址
-	BusinessConfSmsJhgjVariable              = "SmsJhgjVariable"              // 聚合国际短信变量
-)
-
-const (
-	BusinessConfReportApproveTypeEta   = "eta"
-	BusinessConfReportApproveTypeOther = "other"
-	BusinessConfClientFlagNanHua       = "nhqh" // 南华标记
-	BusinessConfEmailClientSmtp        = "smtp" // 普通邮箱标记
-)
-
-// FromSceneMap 数据源名称与数据源ID的对应关系
-var FromSceneMap = map[int]string{
-	1: "SmartReportSheetSize",
-	2: "ReportSheetSize",
-	3: "EnReportSheetSize",
-	4: "CnPptSheetSize",
-	5: "EnPptSheetSize",
-}
-
 // BusinessConf 商户配置表
 type BusinessConf struct {
 	Id         int        `gorm:"column:id;primaryKey;autoIncrement"`
@@ -132,7 +74,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) {
-
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -147,7 +88,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) {
-
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -162,46 +102,12 @@ 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
-
-	sql := `SELECT * FROM business_conf`
-	err = global.DmSQL["master"].Raw(sql).Scan(&items).Error
-	if err != nil {
-		return
-	}
-
-	for _, v := range items {
-		if v.ValType == 4 {
-			list[v.ConfKey] = html.UnescapeString(v.ConfVal)
-			continue
-		}
-		list[v.ConfKey] = v.ConfVal
-	}
-	return
-}
-
 // BusinessConfUpdate 更新配置
 type BusinessConfUpdate struct {
 	ConfKey string
 	ConfVal string
 }
 
-// UpdateBusinessConfMulti 批量修改配置
-func UpdateBusinessConfMulti(items []BusinessConfUpdate) (err error) {
-	sql := "UPDATE business_conf SET conf_val = ? WHERE conf_key = ?"
-	for _, v := range items {
-		err = global.DmSQL["master"].Exec(sql, v.ConfVal, v.ConfKey).Error
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
 func GetBusinessConfByKey(key string) (item *BusinessConf, err error) {
 	sql := fmt.Sprintf(`SELECT * FROM business_conf WHERE conf_key = ? LIMIT 1`)
 	err = global.DmSQL["master"].Raw(sql, key).First(&item).Error

models/chart_edb_mapping.go

@@ -27,7 +27,6 @@ type ChartEdbMapping struct {
 
 // GetChartEdbMappingListByEdbInfoId 根据指标id获取关联图表列表
 func GetChartEdbMappingListByEdbInfoId(edbInfoId int) (list []*ChartEdbMapping, err error) {
-
 	sql := ` SELECT *
              FROM chart_edb_mapping AS a
 			 WHERE edb_info_id=? 
@@ -35,13 +34,3 @@ func GetChartEdbMappingListByEdbInfoId(edbInfoId int) (list []*ChartEdbMapping,
 	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Scan(&list).Error
 	return
 }
-
-// GetGroupChartEdbMappingListByEdbInfoId 根据指标id和来源分组获取关联图表列表
-func GetGroupChartEdbMappingListByEdbInfoId(edbInfoId, source int) (list []*ChartEdbMapping, err error) {
-
-	sql := ` SELECT *
-             FROM chart_edb_mapping AS a
-			 WHERE edb_info_id=? AND source = ?  GROUP BY chart_info_id `
-	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId, source).Scan(&list).Error
-	return
-}

models/db_base.go

@@ -1,71 +0,0 @@
-// @Time : 2020/10/29 8:31 下午
-// @Author : bingee
-package models
-
-import (
-	"github.com/beego/beego/v2/client/orm"
-)
-
-// 是否存在
-func IsExistByExpr(ptrStructOrTableName interface{}, where map[string]interface{}) bool {
-	o := orm.NewOrm()
-	qs := o.QueryTable(ptrStructOrTableName)
-	for expr, exprV := range where {
-		qs = qs.Filter(expr, exprV)
-	}
-	return qs.Exist()
-}
-
-// 获取条数
-func GetCountByExpr(ptrStructOrTableName interface{}, where map[string]interface{}) (count int64, err error) {
-	o := orm.NewOrm()
-	qs := o.QueryTable(ptrStructOrTableName)
-	for expr, exprV := range where {
-		qs = qs.Filter(expr, exprV)
-	}
-	count, err = qs.Count()
-	return
-}
-
-// 更新
-func UpdateByExpr(ptrStructOrTableName interface{}, where map[string]interface{}, updateParams orm.Params) error {
-	o := orm.NewOrm()
-	qs := o.QueryTable(ptrStructOrTableName)
-	for expr, exprV := range where {
-		qs = qs.Filter(expr, exprV)
-	}
-	_, err := qs.Update(updateParams)
-	return err
-}
-
-// 删除
-func DeleteByExpr(ptrStructOrTableName interface{}, where map[string]interface{}) error {
-	o := orm.NewOrm()
-	qs := o.QueryTable(ptrStructOrTableName)
-	for expr, exprV := range where {
-		qs = qs.Filter(expr, exprV)
-	}
-	_, err := qs.Delete()
-	return err
-}
-
-// 插入
-func InsertData(ptrStructOrTableName interface{}) (int64, error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(ptrStructOrTableName)
-	return id, err
-}
-
-// 获取数据
-func GetDataByExpr(ptrStructOrTableName interface{}, where map[string]interface{}, data interface{}, page ...int64) (err error) {
-	o := orm.NewOrm()
-	qs := o.QueryTable(ptrStructOrTableName)
-	for expr, exprV := range where {
-		qs = qs.Filter(expr, exprV)
-	}
-	if len(page) > 1 {
-		qs = qs.Limit(page[1], page[0])
-	}
-	_, err = qs.All(data)
-	return err
-}

models/edb_classify.go

@@ -49,26 +49,6 @@ type EdbClassifySimplify struct {
 	ParentId     int
 }
 
-// 递归获取所有目录
-func GetClassifyAllByClassifyId(classifyId int) (resultList []*EdbClassifySimplify, err error) {
-
-	for {
-		sql := ` SELECT * FROM edb_classify AS a WHERE a.classify_id=? order by sort asc,classify_id asc`
-		item := new(EdbClassifySimplify)
-		err = global.DEFAULT_DmSQL.Raw(sql, classifyId).First(&item).Error
-		if err != nil {
-			break
-		}
-		if item.ClassifyId > 0 {
-			resultList = append(resultList, item)
-			classifyId = item.ParentId
-		} else {
-			break
-		}
-	}
-	return resultList, err
-}
-
 // 判断分类名称是否存在
 func GetEdbClassifyCount(classifyName string, parentId int, classifyType uint8) (item *EdbClassify, err error) {
 

models/edb_config.go

@@ -8,14 +8,6 @@ type EdbConfig struct {
 	ConfigValue string `description:"详情"`
 }
 
-// EdbConfigUpdate 修改配置
-func EdbConfigUpdate(newValue, configCode string) (err error) {
-
-	sql := `UPDATE edb_config SET  config_value=?   WHERE config_code=  ?`
-	err = global.DEFAULT_DmSQL.Exec(sql, newValue, configCode).Error
-	return
-}
-
 // GetConfigDetailByCode 根据配置编码获取配置的值
 func GetConfigDetailByCode(configCode string) (item *EdbConfig, err error) {
 

models/edb_data_base.go

@@ -65,7 +65,6 @@ type AddEdbInfoReq struct {
 
 // GetEdbInfoCountByCondition 获取指标数量
 func GetEdbInfoCountByCondition(condition string, pars []interface{}) (count int, err error) {
-
 	sql := ` SELECT COUNT(1) AS count FROM edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -91,7 +90,6 @@ func GetEdbDataAllByEdbCode(edbCode string, source, subSource, limit int) (items
 }
 
 func GetEdbDataByCondition(source, subSource int, condition string, pars []interface{}) (items []*EdbInfoSearchData, err error) {
-
 	tableName := GetEdbDataTableName(source, subSource)
 	sql := ` SELECT * FROM %s WHERE 1=1 `
 	if condition != "" {
@@ -113,7 +111,6 @@ func GetEdbDataByCondition(source, subSource int, condition string, pars []inter
 
 // GetEdbDataByDate 根据数据日期获取指标数据
 func GetEdbDataByDate(source, subSource int, edbCode, dataTime string) (item *EdbInfoSearchData, err error) {
-
 	tableName := GetEdbDataTableName(source, subSource)
 	sql := ` SELECT * FROM %s WHERE 1=1 AND edb_code = ? AND data_time =? ORDER BY data_time DESC `
 	sql = fmt.Sprintf(sql, tableName)
@@ -122,7 +119,6 @@ func GetEdbDataByDate(source, subSource int, edbCode, dataTime string) (item *Ed
 }
 
 func ModifyEdbDataById(source, subSource, edbDataId int, value string) (err error) {
-
 	tableName := GetEdbDataTableName(source, subSource)
 	sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_data_id=? `
 	sql = fmt.Sprintf(sql, tableName)
@@ -146,42 +142,13 @@ type RefreshEdbInfoReq struct {
 	Source    int    `description:"指标来源ID"`
 }
 
-// GetAllEdbDataList 获取所有的指标数据列表
-func GetAllEdbDataList(edbInfoId, source, subSource int) (existDataList []*EdbData, err error) {
-
-	dataTableName := GetEdbDataTableName(source, subSource)
-	fmt.Println("dataTableName:", dataTableName)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? order by data_time asc`
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Find(&existDataList).Error
-	if err != nil {
-		return
-	}
-
-	// 日期格式化
-	for _, item := range existDataList {
-		item.ConvertDate()
-	}
-	return
-}
-
 // GetAllEdbDataListByTo 获取所有的指标数据列表
 func GetAllEdbDataListByTo(to *gorm.DB, edbInfoId, source, subSource int) (existDataList []*EdbData, err error) {
 	dataTableName := GetEdbDataTableName(source, subSource)
-	//fmt.Println("dataTableName:", dataTableName)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? order by data_time asc`
 	sql = fmt.Sprintf(sql, dataTableName)
 	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 
-	//if err != nil {
-	//	return
-	//}
-	//
-	//// 日期格式化
-	//for _, item := range existDataList {
-	//	item.ConvertDate()
-	//}
-
 	return
 }
 

models/edb_data_business.go

@@ -656,7 +656,6 @@ func (obj Business) getBaseBusinessDataByMysql(edbInfo *EdbInfo, startDate strin
 
 	for _, v := range baseDataList {
 		newDataList = append(newDataList, EdbInfoMgoData{
-			//EdbDataId: v.BusinessDataId,
 			DataTime: v.DataTime,
 			Value:    v.Value,
 			EdbCode:  v.IndexCode,

models/edb_data_calculate_avg.go

@@ -141,17 +141,10 @@ func (obj CalculateAvg) Edit(params EditCalculateBatchParams) (err error, errMsg
 		return
 	}
 	//判断是否重复指标
-	//edbInfoMap := make(map[int]string)
 	if !needCalculate {
 		//用到的指标
 		newEdbInfoIdArr := make([]string, 0)
 		for _, tmpEdbInfo := range req.EdbInfoIdArr {
-			/*_, ok := edbInfoMap[tmpEdbInfo.EdbInfoId]
-			if ok {
-				br.Msg = "选择指标失败，请勿选择重复指标！"
-				return
-			}
-			edbInfoMap[tmpEdbInfo.EdbInfoId] = tmpEdbInfo.FromTag*/
 			newEdbInfoIdArr = append(newEdbInfoIdArr, strconv.Itoa(tmpEdbInfo.EdbInfoId))
 		}
 
@@ -258,8 +251,6 @@ func (obj CalculateAvg) Refresh(params RefreshParams) (err error, errMsg string)
 }
 
 func (obj CalculateAvg) refresh(to *gorm.DB, edbInfoId, source, subSource int, edbInfoIdArr []*EdbInfo, edbCode, extra string, edbInfoTag map[string]int, emptyType int) (err error) {
-
-	//to orm.TxOrmer, edbInfoId, source, subSource int, edbInfoIdArr []*EdbInfo, edbCode, extra string, edbInfoTag map[string]int, emptyType int
 	realSaveDataMap := make(map[string]map[int]float64)
 	saveDataMap := make(map[string]map[int]float64)
 

models/edb_data_calculate_bp.go

@@ -179,133 +179,6 @@ func EditCalculateBp(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditReq, fromEd
 	return
 }
 
-// RefreshAllCalculateBpBak 刷新所有升频数据
-func RefreshAllCalculateBpBak(edbInfoId, source, subSource int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
-	to := global.DEFAULT_DmSQL.Begin()
-	defer func() {
-		if err != nil {
-			to.Rollback()
-		} else {
-			to.Commit()
-		}
-	}()
-
-	if err != nil {
-		return
-	}
-	edbInfoIdStr := strconv.Itoa(edbInfoId)
-	//计算数据
-
-	dataList, err := GetEdbDataListAllByTo(to, fromEdbInfo.Source, fromEdbInfo.SubSource, FindEdbDataListAllCond{
-		EdbInfoId:         fromEdbInfo.EdbInfoId,
-		StartDataTime:     startDate,
-		StartDataTimeCond: ">=",
-		EndDataTime:       endDate,
-		EndDataTimeCond:   "<=",
-	}, 0)
-	if err != nil {
-		return err
-	}
-	var dateArr []string
-	dataMap := make(map[string]*EdbInfoSearchData)
-	for _, v := range dataList {
-		dateArr = append(dateArr, v.DataTime)
-		dataMap[v.DataTime] = v
-	}
-	fmt.Println("source:", source)
-	//获取指标所有数据
-	existDataList := make([]*EdbData, 0)
-	dataTableName := GetEdbDataTableName(source, subSource)
-	fmt.Println("dataTableName:", dataTableName)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
-	if err != nil {
-		return err
-	}
-	existDataMap := make(map[string]string)
-	for _, v := range existDataList {
-		existDataMap[v.DataTime] = v.Value
-	}
-	fmt.Println("existDataMap:", existDataMap)
-	addSql := ` INSERT INTO edb_data_calculate_bp(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
-	var isAdd bool
-
-	existMap := make(map[string]string)
-	dataLen := len(dataList)
-	for i := 0; i < dataLen; i++ {
-		//当期
-		currentItem := dataList[i]
-		currentDate, _ := time.ParseInLocation(utils.FormatDate, currentItem.DataTime, time.Local)
-		var day int
-		var preItem *EdbInfoSearchData
-		var preDate time.Time
-		if i == 0 {
-			day = int(time.Now().Sub(currentDate).Hours() / float64(24))
-			preDate = time.Now()
-		} else {
-			j := i + 1
-			if j < dataLen {
-				preItem = dataList[j]
-				preDate, _ = time.ParseInLocation(utils.FormatDate, preItem.DataTime, time.Local)
-				day = int(currentDate.Sub(preDate).Hours() / float64(24))
-			}
-		}
-		for k := 0; k <= day; k++ {
-			needDay := preDate.AddDate(0, 0, -k)
-			needDayStr := needDay.Format(utils.FormatDate)
-			existKey := edbCode + needDayStr
-			if _, ok := existMap[existKey]; !ok {
-				timestamp := needDay.UnixNano() / 1e6
-				timestampStr := fmt.Sprintf("%d", timestamp)
-				valStr := decimal.NewFromFloat(currentItem.Value).String()
-				if existVal, ok := existDataMap[needDayStr]; !ok {
-					addSql += GetAddSql(edbInfoIdStr, edbCode, needDayStr, timestampStr, valStr)
-				} else {
-					if existVal != valStr {
-						sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-						sql = fmt.Sprintf(sql, dataTableName)
-						err = to.Exec(sql, valStr, edbInfoId, needDay).Error
-						if err != nil {
-							return err
-						}
-					}
-				}
-			}
-			existMap[existKey] = needDayStr
-		}
-		existKey := edbCode + currentItem.DataTime
-		if _, ok := existMap[existKey]; !ok {
-			currentDate, _ := time.ParseInLocation(utils.FormatDate, currentItem.DataTime, time.Local)
-			timestamp := currentDate.UnixNano() / 1e6
-			timestampStr := fmt.Sprintf("%d", timestamp)
-			valStr := decimal.NewFromFloat(currentItem.Value).String()
-			if existVal, ok := existDataMap[currentItem.DataTime]; !ok {
-				addSql += GetAddSql(edbInfoIdStr, edbCode, currentItem.DataTime, timestampStr, valStr)
-			} else {
-				if existVal != valStr {
-					sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-					sql = fmt.Sprintf(sql, dataTableName)
-					err = to.Exec(sql, valStr, edbInfoId, currentItem.DataTime).Error
-					if err != nil {
-						return err
-					}
-				}
-			}
-		}
-		existMap[existKey] = currentItem.DataTime
-	}
-
-	if isAdd {
-		addSql = strings.TrimRight(addSql, ",")
-		err = to.Exec(addSql).Error
-		if err != nil {
-			return err
-		}
-	}
-	return
-}
-
 func RefreshAllCalculateBp(edbInfoId, source, subSource int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string, emptyType int) (err error) {
 	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {

models/edb_data_calculate_cjjx.go

@@ -256,12 +256,6 @@ func refreshAllCalculateCjjx(to *gorm.DB, edbInfoId, source, subSource int, from
 
 	addSql := ` INSERT INTO edb_data_calculate_cjjx(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
-	//日度/周度/季度/月度
-	//isCompatibility := false //是否向上下兼容35天
-	//if utils.InArrayByStr([]string{"日度", "周度", "季度", "月度"}, fromEdbInfo.Frequency) {
-	//	isCompatibility = true
-	//}
-
 	// 每个年份的日期数据需要平移的天数
 	moveDayMap := make(map[int]int, 0) // 每个年份的春节公历
 	var lastDataDay time.Time
@@ -315,27 +309,6 @@ func refreshAllCalculateCjjx(to *gorm.DB, edbInfoId, source, subSource int, from
 			if tmpValue, ok := handleDataMap[historyPreDateStr]; ok { //上一年同期找到
 				pastValueList = append(pastValueList, tmpValue)
 			}
-			//if findItem, ok := dataMap[hisoryPreDateStr]; ok { //上一年同期找到
-			//	pastValueList = append(pastValueList, findItem.Value)
-			//} else if isCompatibility { // 如果需要兼容上下35天
-			//	nextDateDay := hisoryPreDate
-			//	preDateDay := hisoryPreDate
-			//	for i := 0; i < 35; i++ {
-			//		nextDateDayStr := nextDateDay.Format(utils.FormatDate)
-			//		if findItem, ok := dataMap[nextDateDayStr]; ok { //上一年同期->下一个月找到
-			//			pastValueList = append(pastValueList, findItem.Value)
-			//			break
-			//		} else {
-			//			preDateDayStr := preDateDay.Format(utils.FormatDate)
-			//			if findItem, ok := dataMap[preDateDayStr]; ok { //上一年同期->上一个月找到
-			//				pastValueList = append(pastValueList, findItem.Value)
-			//				break
-			//			}
-			//		}
-			//		nextDateDay = nextDateDay.AddDate(0, 0, 1)
-			//		preDateDay = preDateDay.AddDate(0, 0, -1)
-			//	}
-			//}
 		}
 
 		if len(pastValueList) == formulaInt {
@@ -446,7 +419,6 @@ func CjjxSub(currValue float64, pastValue []float64) (value string) {
 		bf = bf.Add(tmpVal)
 	}
 	val, _ := af.Sub(bf.Div(numDecimal)).Float64()
-	//valStr := utils.SubFloatToString(val, 4)
 	valStr := decimal.NewFromFloat(val).Round(4).String()
 	return valStr
 }

models/edb_data_calculate_correlation.go

@@ -131,7 +131,6 @@ func EditCalculateCorrelation(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditRe
 	edbInfo.EdbNameEn = req.EdbNameEn
 	edbInfo.UnitEn = req.UnitEn
 	edbInfo.ModifyTime = time.Now()
-	//err = to.Model(edbInfo).Select([]string{ "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "ModifyTime", "EdbNameEn", "UnitEn"}).Updates(edbInfo).Error
 	err = to.Model(edbInfo).Select([]string{"EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "ModifyTime", "EdbNameEn", "UnitEn"}).Updates(edbInfo).Error
 	if err != nil {
 		return
@@ -414,7 +413,6 @@ func GetRollingCorrelationChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB *E
 		"天": 1, "周": 7, "月": 30, "季": 90, "年": 365,
 	}
 	// 2023-03-17 时间序列始终以指标A为基准, 始终是B进行平移
-	//baseDataList := make([]*data_manage.EdbDataList, 0)
 	baseDataMap := make(map[string]float64)
 	changeDataList := make([]*EdbInfoSearchData, 0)
 	changeDataMap := make(map[string]float64)
@@ -426,7 +424,6 @@ func GetRollingCorrelationChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB *E
 			err = fmt.Errorf("获取变频指标插值法Map失败, Err: %s", e.Error())
 			return
 		}
-		//baseDataList = tmpNewChangeDataList
 	}
 	// A指标不管三七二十一，先变个频再说
 	{

models/edb_data_calculate_hcz.go

@@ -217,10 +217,6 @@ func refreshAllCalculateHcz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 
 	var existPars []interface{}
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	//if startDate != "" {
-	//	sql += " AND data_time>=? "
-	//	existPars = append(existPars, startDate)
-	//}
 	sql = fmt.Sprintf(sql, dataTableName)
 	err = to.Raw(sql, edbInfoId, existPars).Find(&existDataList).Error
 	if err != nil {

models/edb_data_calculate_jp.go

@@ -139,7 +139,6 @@ func EditCalculateJp(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditReq, fromEd
 	edbInfo.EdbNameEn = req.EdbNameEn
 	edbInfo.UnitEn = req.UnitEn
 	edbInfo.ModifyTime = time.Now()
-	//err = to.Model(edbInfo).Select([]string{ "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "ModifyTime", "EdbNameEn", "UnitEn"}).Updates(edbInfo).Error
 	err = to.Model(edbInfo).Select([]string{"EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "ModifyTime", "EdbNameEn", "UnitEn"}).Updates(edbInfo).Error
 	if err != nil {
 		return
@@ -264,7 +263,6 @@ func refreshAllCalculateJp(to *gorm.DB, edbInfoId, source, subSource int, fromEd
 	addSql := ` INSERT INTO ` + tableName + ` (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 
-	//existMap := make(map[string]string)
 	dataLen := len(dataList)
 	if dataLen <= 0 {
 		return

models/edb_data_calculate_ljztbpj.go

@@ -383,13 +383,6 @@ func EditCalculateLjztbpj(req *EdbInfoCalculateBatchEditReq, edbInfo, firstEdbIn
 	return
 }
 
-// GetAllEdbDataCalculateLjztbpjByEdbInfoId 根据指标id获取全部的数据
-func GetAllEdbDataCalculateLjztbpjByEdbInfoId(edbInfoId int) (items []*EdbDataCalculateLjztbpj, err error) {
-	sql := ` SELECT * FROM edb_data_calculate_ljztbpj WHERE edb_info_id=? ORDER BY data_time DESC `
-	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Scan(&items).Error
-	return
-}
-
 // RefreshAllCalculateLjztbpj 刷新所有 累计值同比拼接 数据
 func RefreshAllCalculateLjztbpj(edbInfo *EdbInfo) (err error) {
 	to := global.DEFAULT_DmSQL.Begin()

models/edb_data_calculate_ljzzj.go

@@ -339,7 +339,6 @@ func (obj Ljzzj) refresh(to *gorm.DB, edbInfoId, source, subSource int, fromEdbI
 					dataPreItem := yv[i-1]
 					if dataCurrentItem != nil && dataPreItem != nil {
 						date = dataCurrentItem.DataTime
-						//val =  dataCurrentItem.Value - dataPreItem.Value
 						a := decimal.NewFromFloat(dataCurrentItem.Value)
 						b := decimal.NewFromFloat(dataPreItem.Value)
 						val, _ = a.Sub(b).Float64()

models/edb_data_calculate_ljzzy.go

@@ -316,27 +316,6 @@ func refreshAllCalculateLjzzy(to *gorm.DB, edbInfoId, source, subSource int, fro
 				}
 			}
 			if date != "" {
-				//saveValue := utils.SubFloatToString(val, 4)
-				////判断数据是否存在
-				//if existVal, ok := dataMap[date]; !ok {
-				//	dataTime, _ := time.ParseInLocation(utils.FormatDate, date, time.Local)
-				//	timestamp := dataTime.UnixNano() / 1e6
-				//	timeStr := fmt.Sprintf("%d", timestamp)
-				//	if _, existOk := existDataMap[date]; !existOk {
-				//		addSql += GetAddSql(edbInfoIdStr, edbCode, date, timeStr, saveValue)
-				//		isAdd = true
-				//	}
-				//	existDataMap[date] = date
-				//} else {
-				//	if existVal != saveValue {
-				//		sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-				//		sql = fmt.Sprintf(sql, dataTableName)
-				//		err = to.Raw(sql, saveValue, edbInfoId, date).Error
-				//		if err != nil {
-				//			return err
-				//		}
-				//	}
-				//}
 				tmpSql, newAdd, tmpErr := calculateLjzzy(edbInfoId, date, edbInfoIdStr, edbCode, dataTableName, addSql, val, dataMap, existDataMap, to)
 				if !isAdd {
 					isAdd = newAdd

models/edb_data_calculate_nhcc.go

@@ -431,76 +431,6 @@ func refreshAllCalculateNhcc(to *gorm.DB, edbInfo *EdbInfo, existItemA, existIte
 
 	addDataList := make([]*EdbDataCalculateNhcc, 0)
 
-	////第一个指标
-	//aDataList := make([]EdbInfoSearchData, 0)
-	//aDataMap := make(map[string]float64)
-	//{
-	//	var condition string
-	//	var pars []interface{}
-	//
-	//	condition += " AND edb_info_id=? "
-	//	pars = append(pars, existItemA.FromEdbInfoId)
-	//
-	//	//第一个指标的数据列表
-	//	firstDataList, tmpErr := GetEdbDataListAllByTo(to, condition, pars, existItemA.FromSource, 0)
-	//	if tmpErr != nil {
-	//		return tmpErr
-	//	}
-	//	aDataList, aDataMap = handleNhccData(firstDataList, existItemA.MoveValue)
-	//
-	//}
-	//
-	////第二个指标
-	//bDataList := make([]EdbInfoSearchData, 0)
-	//secondDataList := make([]*EdbInfoSearchData, 0)
-	//bDataMap := make(map[string]float64)
-	//{
-	//	condition = ``
-	//	pars = make([]interface{}, 0)
-	//
-	//	condition += "  AND edb_info_id = ? "
-	//	pars = append(pars, existItemB.FromEdbInfoId)
-	//
-	//	//第二个指标的数据列表
-	//	secondDataList, err = GetEdbDataListAllByTo(to, condition, pars, existItemB.FromSource, 0)
-	//	if err != nil {
-	//		return
-	//	}
-	//	bDataList, bDataMap = handleNhccData(secondDataList, existItemB.MoveValue)
-	//}
-	//
-	//if len(aDataList) <= 0 {
-	//	err = errors.New("指标A没有数据")
-	//	return
-	//}
-	//if len(bDataList) <= 0 {
-	//	err = errors.New("指标B没有数据")
-	//	return
-	//}
-	//// 拟合残差计算的结束日期判断
-	//{
-	//	endAData := aDataList[len(aDataList)-1]
-	//	tmpEndDate, tmpErr := time.ParseInLocation(utils.FormatDate, endAData.DataTime, time.Local)
-	//	if tmpErr != nil {
-	//		err = tmpErr
-	//		return
-	//	}
-	//	// 如果A指标的最新数据日期早于拟合残差的结束日期，那么就用A指标的最新数据日期
-	//	if tmpEndDate.Before(nhccDate.EndDate) {
-	//		nhccDate.EndDate = tmpEndDate
-	//	}
-	//	endBData := bDataList[len(bDataList)-1]
-	//	tmpEndDate, tmpErr = time.ParseInLocation(utils.FormatDate, endBData.DataTime, time.Local)
-	//	if tmpErr != nil {
-	//		err = tmpErr
-	//		return
-	//	}
-	//	// 如果B指标的最新数据日期早于拟合残差的结束日期，那么就用A指标的最新数据日期
-	//	if tmpEndDate.Before(nhccDate.EndDate) {
-	//		nhccDate.EndDate = tmpEndDate
-	//	}
-	//}
-
 	aDataList, secondDataList, aDataMap, bDataMap, nhccDate, err, errMsg := getNhccData(to, existItemA, existItemB, nhccDate)
 	if err != nil {
 		return

models/edb_data_calculate_nszydbpjjs.go

@@ -228,7 +228,6 @@ func refreshAllCalculateNszydpjjs(to *gorm.DB, edbInfoId, source, subSource, for
 		return err
 	}
 	//fmt.Println("fromPars:", fromPars)
-	//fromDataList, err := GetEdbDataListAllV1ByTo(to, fromCondition, fromPars, fromEdbInfo.Source, fromEdbInfo.SubSource, 0)
 
 	var fromDateArr []string
 	fromDataMap := make(map[string]*EdbInfoSearchData)

models/edb_data_calculate_qjjs.go

@@ -87,7 +87,6 @@ func (obj CalculateRangeAnalysis) Add(params AddCalculateBatchParams) (edbInfo *
 	uniqueCode := params.UniqueCode
 	sysUserId := params.SysUserId
 	sysUserRealName := params.SysUserRealName
-	//req *EdbInfoCalculateBatchSaveReq, edbCode, uniqueCode string, sysUserId int, sysUserRealName string
 	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -716,7 +715,6 @@ func HandleRangeAnalysisDataByCalculateType(originList []*ChartRangeAnalysisDate
 func GetRangeAnalysisChartDataByEdbInfo(fromEdbInfo *EdbInfo, calculateFormula RangeAnalysisCalculateFormula) (newDataList []*EdbInfoSearchData, err error) {
 	// 指标的开始日期和结束日期
 	edbStartDateTime, _ := time.ParseInLocation(utils.FormatDate, fromEdbInfo.StartDate, time.Local)
-	//edbStartDate := edbStartDateTime.AddDate(0, 0, 1).Format(utils.FormatDate)
 	edbEndDateTime, _ := time.ParseInLocation(utils.FormatDate, fromEdbInfo.EndDate, time.Local)
 	edbEndDate := edbEndDateTime.Format(utils.FormatDate)
 
@@ -857,16 +855,12 @@ func GetRangeAnalysisChartDataByEdbInfo(fromEdbInfo *EdbInfo, calculateFormula R
 				val, _ = decimal.NewFromFloat(val).Round(4).Float64()
 				newDataList[i].Value = val
 			}
-			//item.MaxData = item.MaxData * v.ConvertValue
-			//item.MinData = item.MinData * v.ConvertValue
 		case 2:
 			for i, v := range newDataList {
 				val := v.Value / calculateFormula.DataConvertConf.Value
 				val, _ = decimal.NewFromFloat(val).Round(4).Float64()
 				newDataList[i].Value = val
 			}
-			//item.MaxData = item.MaxData / v.ConvertValue
-			//item.MinData = item.MinData / v.ConvertValue
 		case 3:
 			for i, v := range newDataList {
 				if v.Value <= 0 {
@@ -877,8 +871,6 @@ func GetRangeAnalysisChartDataByEdbInfo(fromEdbInfo *EdbInfo, calculateFormula R
 				val, _ = decimal.NewFromFloat(val).Round(4).Float64()
 				newDataList[i].Value = val
 			}
-			//item.MaxData = math.Log(item.MaxData) / math.Log(v.ConvertValue)
-			//item.MinData = math.Log(item.MinData) / math.Log(v.ConvertValue)
 		}
 	}
 

models/edb_data_calculate_sum.go

@@ -149,12 +149,6 @@ func (obj CalculateSum) Edit(params EditCalculateBatchParams) (err error, errMsg
 		//用到的指标
 		newEdbInfoIdArr := make([]string, 0)
 		for _, tmpEdbInfo := range req.EdbInfoIdArr {
-			/*_, ok := edbInfoMap[tmpEdbInfo.EdbInfoId]
-			if ok {
-				br.Msg = "选择指标失败，请勿选择重复指标！"
-				return
-			}
-			edbInfoMap[tmpEdbInfo.EdbInfoId] = tmpEdbInfo.FromTag*/
 			newEdbInfoIdArr = append(newEdbInfoIdArr, strconv.Itoa(tmpEdbInfo.EdbInfoId))
 		}
 
@@ -262,8 +256,6 @@ func (obj CalculateSum) Refresh(params RefreshParams) (err error, errMsg string)
 }
 
 func (obj CalculateSum) refresh(to *gorm.DB, edbInfoId, source, subSource int, edbInfoIdArr []*EdbInfo, edbCode, extra string, edbInfoTag map[string]int, emptyType int) (err error) {
-
-	//to *gorm.DB, edbInfoId, source, subSource int, edbInfoIdArr []*EdbInfo, edbCode, extra string, edbInfoTag map[string]int, emptyType int
 	realSaveDataMap := make(map[string]map[int]float64)
 	saveDataMap := make(map[string]map[int]float64)
 

models/edb_data_calculate_tcz.go

@@ -240,7 +240,6 @@ func refreshAllCalculateTcz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 			preDateStr := preDate.Format(utils.FormatDate)
 			if findItem, ok := dataMap[preDateStr]; ok {
 				//上一年同期找到
-				//dataTime, _ := time.ParseInLocation(utils.FormatDate, date, time.Local)
 				timestamp := currentDate.UnixNano() / 1e6
 				timestampStr := fmt.Sprintf("%d", timestamp)
 				val := TczSub(currentItem.Value, findItem.Value)
@@ -425,10 +424,8 @@ func refreshAllCalculateTcz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 // TczSub 计算同差值
 func TczSub(a, b float64) string {
 	af := decimal.NewFromFloat(a)
-	//fmt.Println(af)
 	bf := decimal.NewFromFloat(b)
 	val, _ := af.Sub(bf).Float64()
-	//valStr := utils.SubFloatToString(val, 4)
 	valStr := decimal.NewFromFloat(val).Round(4).String()
 	return valStr
 }

models/edb_data_calculate_zdyfx.go

@@ -215,10 +215,6 @@ func (obj CustomAnalysis) refresh(to *gorm.DB, edbInfo *EdbInfo, dateList []stri
 	updateEdbDataStrList := make([]UpdateEdbDataStr, 0)
 	updateSql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 	updateSql = fmt.Sprintf(updateSql, dataTableName)
-	//err = to.Exec(updateSql).Error
-	//if err != nil {
-	//	return
-	//}
 
 	for i, currDateStr := range dateList {
 		currVal := dataList[i] // 当前日期对应的值
@@ -245,12 +241,6 @@ func (obj CustomAnalysis) refresh(to *gorm.DB, edbInfo *EdbInfo, dateList []stri
 					Value:    saveValue,
 					DataTime: currDateStr,
 				})
-				//sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-				//sql = fmt.Sprintf(sql, dataTableName)
-				//err = to.Exec(sql, saveValue, edbInfoId, currDateStr).Error
-				//if err != nil {
-				//	return
-				//}
 			}
 
 			continue

models/edb_data_calculate_zjpj.go

@@ -312,13 +312,6 @@ func EditCalculateZjpj(req *EdbInfoCalculateBatchEditReq, edbInfo, firstEdbInfo,
 	return
 }
 
-// GetAllEdbDataCalculateZjpjByEdbInfoId 根据指标id获取全部的数据
-func GetAllEdbDataCalculateZjpjByEdbInfoId(edbInfoId int) (items []*EdbDataCalculateZjpj, err error) {
-	sql := ` SELECT * FROM edb_data_calculate_zjpj WHERE edb_info_id=? ORDER BY data_time DESC `
-	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Scan(&items).Error
-	return
-}
-
 // RefreshAllCalculateZjpj 刷新所有 直接拼接 数据
 func RefreshAllCalculateZjpj(edbInfo *EdbInfo) (err error) {
 	to := global.DEFAULT_DmSQL.Begin()

models/edb_data_insert_config.go

@@ -2,7 +2,6 @@ package models
 
 import (
 	"eta_gn/eta_index_lib/global"
-	"gorm.io/gorm"
 	"time"
 )
 
@@ -18,7 +17,6 @@ type EdbDataInsertConfig struct {
 
 // GetEdbDataInsertConfigByEdbId 根据指标id 获取数据插入配置详情
 func GetEdbDataInsertConfigByEdbId(edbInfoId int) (item *EdbDataInsertConfig, err error) {
-
 	sql := ` SELECT * FROM edb_data_insert_config WHERE edb_info_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&item).Error
 	return
@@ -26,15 +24,7 @@ func GetEdbDataInsertConfigByEdbId(edbInfoId int) (item *EdbDataInsertConfig, er
 
 // DeleteEdbDataInsertConfigByEdbId 根据指标id 删除数据插入配置详情
 func DeleteEdbDataInsertConfigByEdbId(edbInfoId int) (err error) {
-
 	sql := ` DELETE FROM edb_data_insert_config WHERE edb_info_id=? `
 	err = global.DEFAULT_DmSQL.Exec(sql, edbInfoId).Error
 	return
 }
-
-// GetEdbDataInsertConfigByEdbIdWithTo 根据指标id 获取数据插入配置详情
-func GetEdbDataInsertConfigByEdbIdWithTo(to *gorm.DB, edbInfoId int) (item *EdbDataInsertConfig, err error) {
-	sql := ` SELECT * FROM edb_data_insert_config WHERE edb_info_id=? `
-	err = to.Raw(sql, edbInfoId).First(&item).Error
-	return
-}

models/edb_info.go

@@ -563,26 +563,12 @@ type EdbInfoMaxAndMinInfoTmp struct {
 
 // GetEdbInfoMaxAndMinInfo 获取指标的最新数据记录信息
 func GetEdbInfoMaxAndMinInfo(source, subSource int, edbCode string) (item *EdbInfoMaxAndMinInfo, err error) {
-	//itemTmp := new(EdbInfoMaxAndMinInfoTmp)
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	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 = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&item).Error
 
-	/*itemTmp.MinDate = itemTmp.MinDate.In(time.Local)
-	itemTmp.MaxDate = itemTmp.MaxDate.In(time.Local)
-
-	item = &EdbInfoMaxAndMinInfo{
-		MinDate:     itemTmp.MinDate.Format(utils.FormatDate),
-		MaxDate:     itemTmp.MaxDate.Format(utils.FormatDate),
-		MinValue:    itemTmp.MinValue,
-		MaxValue:    itemTmp.MaxValue,
-		LatestValue: itemTmp.LatestValue,
-		LatestDate:  itemTmp.LatestDate.Format(utils.FormatDate),
-		EndValue:    itemTmp.EndValue,
-	}*/
-
 	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)
@@ -611,36 +597,36 @@ func (m *EdbIndoDataUpdateTime) AfterFind(db *gorm.DB) (err error) {
 
 // GetEdbDataUpdateTimeByModify 获取指标的刷新时间获取最早的一条记录
 func GetEdbDataUpdateTimeByModify(source, subSource int, edbCode string, dataUpdateTime string) (item *EdbIndoDataUpdateTime, err error) {
-
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` SELECT MIN(data_time) AS min_date FROM %s WHERE edb_code=? and modify_time>=?`
 	sql = fmt.Sprintf(sql, tableName)
 	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, dataUpdateTime).First(&item).Error
+
 	return
 }
 
 // ModifyEdbInfoMaxAndMinInfo 修改指标的最新数据信息
 func ModifyEdbInfoMaxAndMinInfo(edbInfoId int, item *EdbInfoMaxAndMinInfo) (err error) {
-
 	sql := ` UPDATE edb_info SET start_date=?,end_date=?,min_value=?,max_value=?,is_update=2,latest_date=?,latest_value=?, end_value = ?,modify_time=NOW() WHERE edb_info_id=? `
 	err = global.DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, item.MinValue, item.MaxValue, item.MaxDate, item.LatestValue, item.LatestValue, edbInfoId).Error
+
 	return
 }
 
 // ModifyEdbTimeAndLastInfo 修改指标的最新数据信息(除上下限)
 func ModifyEdbTimeAndLastInfo(edbInfoId int, item *EdbInfoMaxAndMinInfo) (err error) {
-
 	sql := `UPDATE edb_info SET start_date = ?, end_date = ?, is_update = 2,latest_date = ?, latest_value = ?, end_value = ?, modify_time = NOW() WHERE edb_info_id = ?`
 	err = global.DEFAULT_DmSQL.Exec(sql, item.MinDate, item.MaxDate, item.MaxDate, item.LatestValue, item.LatestValue, edbInfoId).Error
+
 	return
 }
 
 // ModifyEdbDataUpdateTime 修改指标刷新，本次数据刷新的最早日期
 func ModifyEdbDataUpdateTime(edbInfoId int, dataUpdateTime, erDataUpdateDate string) (err error) {
-
 	sql := `UPDATE edb_info SET data_update_time = ?, er_data_update_date = ?, modify_time = NOW() WHERE edb_info_id = ?`
 	err = global.DEFAULT_DmSQL.Exec(sql, dataUpdateTime, erDataUpdateDate, edbInfoId).Error
+
 	return
 }
 
@@ -708,7 +694,6 @@ func GetLteZeroEdbDataCountByMysql(source, subSource, edbInfoId int) (count int,
 
 // GetLastEdbData 获取最近的一条指标数据
 func GetLastEdbData(condition string, pars []interface{}, source, subSource int) (item *EdbInfoSearchData, err error) {
-
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` SELECT * FROM %s WHERE 1=1 `
@@ -724,7 +709,6 @@ func GetLastEdbData(condition string, pars []interface{}, source, subSource int)
 
 // GetEdbInfoByEdbCode 根据指标code获取指标信息
 func GetEdbInfoByEdbCode(source int, edbCode string) (item *EdbInfo, err error) {
-
 	sql := ` SELECT * FROM edb_info WHERE source=? AND edb_code=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, source, edbCode).First(&item).Error
 
@@ -740,7 +724,6 @@ func GetEdbInfoByEdbCode(source int, edbCode string) (item *EdbInfo, err error)
 
 // GetEdbInfoOnlyByEdbCode 仅根据指标code获取指标信息
 func GetEdbInfoOnlyByEdbCode(edbCode string) (item *EdbInfo, err error) {
-
 	sql := ` SELECT * FROM edb_info WHERE edb_code=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&item).Error
 	if err != nil {
@@ -749,28 +732,29 @@ func GetEdbInfoOnlyByEdbCode(edbCode string) (item *EdbInfo, err error) {
 
 	// 格式化日期
 	item.ConvertDate()
+
 	return
 }
 
 // GetEdbInfoCalculateListByCondition 获取指标关系列表
 func GetEdbInfoCalculateListByCondition(condition string, pars []interface{}) (items []*EdbInfoCalculateMapping, err error) {
-
 	sql := ` SELECT * FROM edb_info_calculate_mapping WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
 // GetEdbInfoCalculateCountByCondition 获取关联指标数量
 func GetEdbInfoCalculateCountByCondition(condition string, pars []interface{}) (count int, err error) {
-
 	sql := ` SELECT COUNT(1) AS count FROM edb_info_calculate_mapping WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
+
 	return
 }
 
@@ -781,26 +765,6 @@ type EdbInfoSearchDataV1 struct {
 	Value     string `description:"数据"`
 }
 
-// 优化版本-处理数据精度问题
-func GetEdbDataListAllV1(condition string, pars []interface{}, source, subSource, order int) (item []*EdbInfoSearchDataV1, err error) {
-
-	sql := ``
-	tableName := GetEdbDataTableName(source, subSource)
-	sql = ` SELECT * FROM %s WHERE 1=1 `
-	sql = fmt.Sprintf(sql, tableName)
-
-	if condition != "" {
-		sql += condition
-	}
-	if order == 1 {
-		sql += ` ORDER BY data_time ASC `
-	} else {
-		sql += ` ORDER BY data_time DESC `
-	}
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&item).Error
-	return
-}
-
 // GetEdbDataListAllV1ByTo 通过事务链接获取数据列表
 func GetEdbDataListAllV1ByTo(to *gorm.DB, condition string, pars []interface{}, source, subSource, order int) (items []*EdbInfoSearchDataV1, err error) {
 	sql := ``
@@ -829,22 +793,6 @@ func GetEdbDataListAllV1ByTo(to *gorm.DB, condition string, pars []interface{},
 	return
 }
 
-// GetEdbInfoByCondition 获取指标列表
-func GetEdbInfoByCondition(condition string, pars []interface{}, order int) (item []*EdbInfo, err error) {
-
-	sql := ` SELECT * FROM edb_info WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	if order == 1 {
-		sql += ` ORDER BY end_date ASC `
-	} else {
-		sql += ` ORDER BY edb_info_id ASC `
-	}
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&item).Error
-	return
-}
-
 // UnifiedModifyEdbInfoMaxAndMinInfo 统一修改指标的最大最小值
 func UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo *EdbInfo) (err error, errMsg string) {
 	// 修改最大最小值
@@ -881,7 +829,6 @@ func UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo *EdbInfo) (err error, errMsg stri
 	// 刷新关联的预测指标
 	go RefreshPredictStandardBaseByGeneralEdbInfoId(edbInfo.EdbInfoId)
 
-	//go ModifyPredictEdbInfoMaxAndMinInfoBySourceEdbInfoId(edbInfo.EdbInfoId, maxAndMinItem)
 	return
 }
 
@@ -908,6 +855,7 @@ func UnifiedModifyEdbInfoMaxAndMinInfoDataUpdate(edbInfo *EdbInfo, dataUpdateTim
 		}
 		erDataUpdateDate = erDataUpdateTime.MinDate
 	}
+
 	return
 }
 
@@ -940,6 +888,7 @@ func UnifiedModifyPredictEdbInfoMaxAndMinInfo(edbInfo *EdbInfo, latestDateStr st
 			return
 		}
 	}
+
 	return
 }
 
@@ -971,7 +920,6 @@ func GetChartPredictEdbInfoDataListByConfList(predictEdbConfList []*PredictEdbCo
 		}
 	}
 
-	//var dateArr []string
 	// 对应日期的值
 	existMap := make(map[string]float64)
 	for _, v := range realPredictEdbInfoData {
@@ -980,14 +928,9 @@ func GetChartPredictEdbInfoDataListByConfList(predictEdbConfList []*PredictEdbCo
 	}
 
 	predictEdbInfoData = make([]*EdbInfoSearchData, 0)
-	//dataValue := lastDataValue
 	//预测规则，1：最新，2：固定值，3：同比，4：同差，5：环比，6：环差，7：N期移动均值，8：N期段线性外推值
 
 	for _, predictEdbConf := range predictEdbConfList {
-		//dataEndTime := endDate
-		//if predictEdbConf.EndDate.Before(dataEndTime) {
-		//	dataEndTime = predictEdbConf.EndDate
-		//}
 		endDate = predictEdbConf.EndDate
 		var tmpMinValue, tmpMaxValue float64 // 当前预测结果中的最大/最小值
 
@@ -1219,8 +1162,6 @@ func GetChartPredictEdbInfoDataListByConfList(predictEdbConfList []*PredictEdbCo
 	return
 }
 
-// GetPredictEdbDayList 获取预测指标日期列表
-
 // GetPredictEdbDayList 获取预测指标日期列表
 func getPredictEdbDayList(startDate, endDate time.Time, frequency, dataDateType string) (dayList []time.Time) {
 	if dataDateType == `` {
@@ -1236,7 +1177,6 @@ func getPredictEdbDayList(startDate, endDate time.Time, frequency, dataDateType
 			dayList = append(dayList, currDate)
 		}
 	case "周度":
-		//nextDate := startDate.AddDate(0, 0, 7)
 		for currDate := startDate.AddDate(0, 0, 7); currDate.Before(endDate) || currDate.Equal(endDate); currDate = currDate.AddDate(0, 0, 7) {
 			dayList = append(dayList, currDate)
 		}
@@ -1409,6 +1349,7 @@ func GetPredictEdbDataListAll(edbInfo *EdbInfo, order int) (items []*EdbInfoSear
 			EdbInfoId: edbInfo.EdbInfoId,
 		}, order)
 	}
+
 	return
 }
 
@@ -1434,23 +1375,6 @@ func ModifyPredictEdbInfoMaxAndMinInfo(edbInfoId int, item *EdbInfoMaxAndMinInfo
 	return
 }
 
-// ModifyCalculateEdbInfo 修改计算指标信息
-func ModifyCalculateEdbInfo(edbName, frequency, unit, calculateFormula string, classifyId, edbInfoId int) (err error) {
-
-	sql := ` UPDATE  edb_info
-			SET
-			  edb_name =?,
-			  edb_name_source =?,
-			  frequency = ?,
-			  unit = ?,
-			  classify_id = ?,
-			  calculate_formula=?,
-			  modify_time = NOW()
-			WHERE edb_info_id = ?`
-	err = global.DEFAULT_DmSQL.Exec(sql, edbName, edbName, frequency, unit, classifyId, calculateFormula, edbInfoId).Error
-	return
-}
-
 func GetEdbInfoItemByCondition(condition string, pars []interface{}) (item *EdbInfoList, err error) {
 	sql := ` SELECT * FROM edb_info WHERE 1=1 `
 	if condition != "" {
@@ -1466,13 +1390,6 @@ func GetEdbInfoItemByCondition(condition string, pars []interface{}) (item *EdbI
 	return
 }
 
-func GetEdbInfoItemListByCondition() (items []*EdbInfoList, err error) {
-
-	sql := ` SELECT * FROM edb_info WHERE 1=1 `
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&items).Error
-	return
-}
-
 // EdbInfoDetailReq 指标详情请求
 type EdbInfoDetailReq struct {
 	UniqueCode string `description:"指标唯一编码"`
@@ -1640,23 +1557,6 @@ func GetEdbInfoNoUpdateTotalByIdList(edbInfoIdList []int) (total int, err error)
 	return
 }
 
-func TransEdbInfoSearchData2DataList(items []*EdbInfoSearchData) (list []*EdbDataList) {
-	if len(items) == 0 {
-		return
-	}
-	list = make([]*EdbDataList, 0)
-	for _, v := range items {
-		list = append(list, &EdbDataList{
-			EdbDataId:     v.EdbDataId,
-			EdbInfoId:     v.EdbInfoId,
-			DataTime:      v.DataTime,
-			DataTimestamp: v.DataTimestamp,
-			Value:         v.Value,
-		})
-	}
-	return
-}
-
 func TransEdbInfoDataList2SearchData(items []*EdbDataList) (list []*EdbInfoSearchData) {
 	if len(items) == 0 {
 		return

models/edb_info_calculate_mapping.go

@@ -53,14 +53,12 @@ type EdbInfoCalculateMappingInfo struct {
 
 // AddEdbInfoCalculateMappingMulti 批量添加指标关系表
 func AddEdbInfoCalculateMappingMulti(items []*EdbInfoCalculateMapping) (err error) {
-
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
 	return
 }
 
 // AddEdbInfoCalculateMappingMulti 批量添加指标关系表
 func (e *EdbInfoCalculateMapping) Add() (err error) {
-
 	err = global.DEFAULT_DmSQL.Create(e).Error
 	return
 }
@@ -90,7 +88,6 @@ type EdbInfoCalculateMappingView struct {
 
 // GetEdbInfoCalculateMappingDetail 获取单条关联指标
 func GetEdbInfoCalculateMappingDetail(edbInfoId int) (item *EdbInfoCalculateMappingView, err error) {
-
 	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=? `
@@ -98,16 +95,6 @@ func GetEdbInfoCalculateMappingDetail(edbInfoId int) (item *EdbInfoCalculateMapp
 	return
 }
 
-// GetEdbInfoCalculateMappingDetailByFromTag 获取单条关联指标
-func GetEdbInfoCalculateMappingDetailByFromTag(edbInfoId int, fromTag string) (item *EdbInfoCalculateMappingView, err error) {
-
-	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=? and a.from_tag=? `
-	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId, fromTag).First(&item).Error
-	return
-}
-
 // EdbInfoCalculateDetail
 type EdbInfoCalculateDetail struct {
 	EdbInfoCalculateId int       `gorm:"primaryKey;autoIncrement;column:edb_info_calculate_mapping_id"`
@@ -129,39 +116,39 @@ type EdbInfoCalculateDetail struct {
 
 // GetEdbInfoCalculateDetailList 获取关联指标列表
 func GetEdbInfoCalculateDetailList(edbInfoId int) (list []*EdbInfoCalculateDetail, err error) {
-
 	sql := ` SELECT a.*,b.start_date,b.end_date,b.edb_type 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 = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Scan(&list).Error
+
 	return
 }
 
 // GetEdbInfoByEdbCode 根据指标code获取指标信息
 func GetEdbInfoCalculateByEdbCode(edbCode, fromEdbCode string) (item *EdbInfoCalculateMapping, err error) {
-
 	sql := ` SELECT * FROM edb_info_calculate_mapping WHERE edb_code=? AND from_edb_code=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, edbCode, fromEdbCode).First(&item).Error
+
 	return
 }
 
 // GetEdbInfoCalculateMappingListByEdbInfoIds 根据生成的指标id获取来源的指标id列表
 func GetEdbInfoCalculateMappingListByEdbInfoIds(edbInfoIds []int) (items []*EdbInfoCalculateMappingInfo, err error) {
-
 	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 = global.DEFAULT_DmSQL.Raw(sql, edbInfoIds).Scan(&items).Error
+
 	return
 }
 
 // GetEdbInfoCalculateMappingListByEdbInfoId 根据生成的指标id获取来源的指标id列表
 func GetEdbInfoCalculateMappingListByEdbInfoId(edbInfoId int) (items []*EdbInfoCalculateMappingInfo, err error) {
-
 	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 = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Scan(&items).Error
+
 	return
 }

models/edb_info_record.go

@@ -21,7 +21,7 @@ type EdbInfoRecord struct {
 }
 
 func AddEditEdbInfoRcord(edbRecord *EdbInfoRecord) (e error) {
-
 	e = global.DEFAULT_DmSQL.Create(edbRecord).Error
+
 	return
 }

models/edb_info_relation.go

@@ -3,7 +3,6 @@ package models
 import (
 	"eta_gn/eta_index_lib/global"
 	"eta_gn/eta_index_lib/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -32,7 +31,6 @@ func (e *EdbInfoRelation) TableName() string {
 
 // GetEdbInfoRelationByChildEdbInfoId 查询引用的指标ID
 func GetEdbInfoRelationByChildEdbInfoId(edbInfoId int) (item *EdbInfoRelation, err error) {
-
 	msql := ` SELECT * FROM edb_info_relation WHERE child_edb_info_id = ? or edb_info_id=?`
 	err = global.DEFAULT_DmSQL.Raw(msql, edbInfoId, edbInfoId).First(&item).Error
 	return
@@ -40,7 +38,6 @@ func GetEdbInfoRelationByChildEdbInfoId(edbInfoId int) (item *EdbInfoRelation, e
 
 // GetEdbInfoRelationListByChildEdbInfoId 根据间接引用中的的计算指标ID查询引用列表
 func GetEdbInfoRelationListByChildEdbInfoId(edbInfoId int) (items []*EdbInfoRelation, err error) {
-
 	msql := ` SELECT * FROM edb_info_relation WHERE relation_type=1 AND child_edb_info_id=?`
 	err = global.DEFAULT_DmSQL.Raw(msql, edbInfoId).Scan(&items).Error
 	return
@@ -48,7 +45,6 @@ func GetEdbInfoRelationListByChildEdbInfoId(edbInfoId int) (items []*EdbInfoRela
 
 // GetEdbInfoRelationListByParentRelationId 根据间接引用中的的父级ID查询
 func GetEdbInfoRelationEdbIdsByParentRelationId(relationId, edbInfoId int) (items []int, err error) {
-
 	msql := ` SELECT edb_info_id FROM edb_info_relation WHERE parent_relation_id=? AND child_edb_info_id=?`
 	err = global.DEFAULT_DmSQL.Raw(msql, relationId, edbInfoId).Scan(&items).Error
 	return
@@ -56,7 +52,6 @@ func GetEdbInfoRelationEdbIdsByParentRelationId(relationId, edbInfoId int) (item
 
 // GetEdbInfoRelationByRelationIds 查询引用的指标ID
 func GetEdbInfoRelationByRelationIds(ids []int) (items []*EdbInfoRelation, err error) {
-
 	msql := ` SELECT * FROM edb_info_relation WHERE edb_info_relation_id in (` + utils.GetOrmInReplace(len(ids)) + `) `
 	err = global.DEFAULT_DmSQL.Raw(msql, ids).Scan(&items).Error
 	return
@@ -64,10 +59,7 @@ func GetEdbInfoRelationByRelationIds(ids []int) (items []*EdbInfoRelation, err e
 
 // UpdateSecondRelationEdbInfoId 更新指标替换后的间接引用记录
 func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfoRelation, refreshEdbInfoIds []int, indexCodeList []string) (err error) {
-	o, err := orm.NewOrm().Begin()
-	if err != nil {
-		return
-	}
+	o := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {
 			_ = o.Rollback()
@@ -77,7 +69,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 	}()
 	// 删除相关的间接引用
 	sql := ` DELETE FROM edb_info_relation WHERE relation_type=1 and parent_relation_id in (` + utils.GetOrmInReplace(len(edbRelationIds)) + `)`
-	err = global.DEFAULT_DmSQL.Exec(sql, edbRelationIds).Error
+	err = o.Exec(sql, edbRelationIds).Error
 	if err != nil {
 		return
 	}
@@ -90,7 +82,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 				relationCodesMap[relation.RelationCode] = struct{}{}
 			}
 		}
-		_, err = o.InsertMulti(len(relationList), relationList)
+		err = o.CreateInBatches(relationList, 500).Error
 		if err != nil {
 			return
 		}
@@ -99,7 +91,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 	if len(refreshEdbInfoIds) > 0 {
 		// todo 更新指标的刷新状态
 		sql = ` UPDATE edb_info SET no_update = 0 WHERE  edb_info_id IN (` + utils.GetOrmInReplace(len(refreshEdbInfoIds)) + `) AND no_update = 1`
-		err = global.DEFAULT_DmSQL.Exec(sql, refreshEdbInfoIds).Error
+		err = o.Exec(sql, refreshEdbInfoIds).Error
 		if err != nil {
 			return
 		}
@@ -109,7 +101,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 	if len(indexCodeList) > 0 {
 		// 更改数据源的更新状态
 		sql = ` UPDATE base_from_mysteel_chemical_index SET is_stop = 0 WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodeList)) + `) and is_stop=1`
-		err = global.DEFAULT_DmSQL.Exec(sql, indexCodeList).Error
+		err = o.Exec(sql, indexCodeList).Error
 		if err != nil {
 			return
 		}
@@ -127,11 +119,12 @@ 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 = global.DEFAULT_DmSQL.Exec(sql, relationCodes).Error
+			err = o.Exec(sql, relationCodes).Error
 			if err != nil {
 				return
 			}
 		}
 	}
+
 	return
 }

models/edb_python_code.go

@@ -23,14 +23,12 @@ func (edbPythonCode *EdbPythonCode) Update(cols []string) (err error) {
 
 // AddEdbPythonCode python指标运算代码
 func AddEdbPythonCode(item *EdbPythonCode) (lastId int64, err error) {
-
 	err = global.DEFAULT_DmSQL.Create(item).Error
 	return
 }
 
 // GetEdbPythonCodeById 根据指标id获取python代码
 func GetEdbPythonCodeById(edbInfoId int) (item *EdbPythonCode, err error) {
-
 	sql := ` SELECT * FROM edb_python_code WHERE edb_info_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&item).Error
 	return

models/edb_terminal.go

@@ -1,77 +0,0 @@
-package models
-
-import (
-	"eta_gn/eta_index_lib/global"
-	"fmt"
-	"time"
-)
-
-// EdbTerminal 指标终端
-type EdbTerminal struct {
-	TerminalId   int       `gorm:"primaryKey;autoIncrement;column:terminal_id" description:"终端ID"`
-	Source       int       `gorm:"column:source" description:"指标来源类型"`
-	Name         string    `gorm:"column:name" description:"终端别名"`
-	TerminalCode string    `gorm:"column:terminal_code" description:"终端编码，用于配置在机器上"`
-	ServerUrl    string    `gorm:"column:server_url" description:"终端地址"`
-	Num          int       `gorm:"column:num" description:"终端最大指标数"`
-	Status       int       `gorm:"column:status" description:"状态，1启用，2禁用"`
-	Value        string    `gorm:"column:value" description:"终端相关的凭证"`
-	ModifyTime   time.Time `gorm:"column:modify_time" description:"修改时间"`
-	CreateTime   time.Time `gorm:"column:create_time" description:"创建时间"`
-}
-
-// GetEdbTerminalListBySource 根据指标来源类型获取所有的终端列表
-func GetEdbTerminalListBySource(source int) (items []*EdbTerminal, err error) {
-
-	sql := ` SELECT *  FROM edb_terminal WHERE source = ? and status=1 ORDER BY terminal_id ASC `
-	err = global.DEFAULT_DmSQL.Raw(sql, source).Scan(&items).Error
-	return
-}
-
-// GetEdbTerminalFirstBySource 根据指标来源类型获取配置的首个终端信息
-func GetEdbTerminalFirstBySource(source int) (item *EdbTerminal, err error) {
-
-	sql := ` SELECT *  FROM edb_terminal WHERE source = ? and status=1 ORDER BY terminal_id ASC Limit 1 `
-	err = global.DEFAULT_DmSQL.Raw(sql, source).First(&item).Error
-	return
-}
-
-type TerminalCodeCountGroup struct {
-	TerminalCode string
-	Total        int
-}
-
-// GetEdbTerminalByCode 根据终端编码获取终端信息
-func GetEdbTerminalByCode(terminalCode string) (item *EdbTerminal, err error) {
-
-	sql := ` SELECT *  FROM edb_terminal WHERE terminal_code = ? `
-	err = global.DEFAULT_DmSQL.Raw(sql, terminalCode).First(&item).Error
-	return
-}
-
-// GetEdbCountGroupByTerminal 获取终端code分组总数
-func GetEdbCountGroupByTerminal(source int) (list []TerminalCodeCountGroup, err error) {
-
-	//sql := `select terminal_code, count(1) as total from edb_info where source = ? AND no_update=0 AND terminal_code != "" AND terminal_code IS NOT NULL GROUP BY terminal_code`
-	sql := `SELECT "terminal_code", COUNT(*)  AS total
-	FROM "eta_index"."edb_info" ei
-	WHERE "source" = ?
-	  AND "no_update" = 0
-	  AND "terminal_code" IS NOT NULL
-	GROUP BY "terminal_code"`
-	err = global.DEFAULT_DmSQL.Raw(sql, source).Scan(&list).Error
-	return
-}
-
-type BaseIndexTerminalCode struct {
-	TerminalCode string `description:"终端编码，用于配置在机器上"`
-	IndexName    string
-}
-
-// GetBaseIndexTerminalCode 获取数据源的终端code
-func GetBaseIndexTerminalCode(edbCode, tableName string) (item BaseIndexTerminalCode, err error) {
-
-	sql := fmt.Sprintf(`select terminal_code, index_name from %s where index_code = ? `, tableName)
-	err = global.DEFAULT_DmSQL.Raw(sql, edbCode).First(&item).Error
-	return
-}

models/edb_trade_analysis.go

@@ -151,10 +151,12 @@ func (obj EdbTradeAnalysis) Refresh(edbInfo *EdbInfo, convertData []*EdbDataList
 
 	// 处理手工数据补充的配置
 	HandleConfigInsertEdbData(realDataMaxDate, edbDataInsertConfig, edbInfo.EdbInfoId, obj.GetSource(), 0, searchExistMap, isFindConfigDateRealData)
+
 	return
 }
 
 func (obj EdbTradeAnalysis) UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo *EdbInfo) (err error) {
 	err, _ = UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
+
 	return
 }

models/excel/excel_classify.go

@@ -1,7 +1,6 @@
 package excel
 
 import (
-	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
@@ -20,44 +19,3 @@ type ExcelClassify struct {
 	CreateTime        time.Time `gorm:"column:create_time" description:"创建时间"`
 	ModifyTime        time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
-
-// AddExcelClassify 添加excel分类
-func AddExcelClassify(item *ExcelClassify) (lastId int64, err error) {
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	if err != nil {
-		return
-	}
-	item.ExcelClassifyId = int(lastId)
-
-	return
-}
-
-type ExcelClassifyItems struct {
-	ExcelClassifyId   int `description:"分类id"`
-	ExcelInfoId       int `description:"表格id"`
-	ExcelClassifyName string
-	ParentId          int
-	Level             int    `description:"层级"`
-	Sort              int    `description:"排序字段，越小越靠前，默认值：10"`
-	UniqueCode        string `description:"唯一编码"`
-	SysUserId         int    `description:"创建人id"`
-	SysUserRealName   string `description:"创建人姓名"`
-	StartDate         string `description:"自定义开始日期"`
-	Children          []*ExcelClassifyItems
-}
-
-// GetExcelClassifyByParentId
-// @Description: 根据父级分类id获取指标下面的分类列表
-// @author: Roc
-// @datetime2023-10-30 13:46:35
-// @param parentId int
-// @param source int
-// @return items []*ExcelClassifyItems
-// @return err error
-func GetExcelClassifyByParentId(parentId, source int) (items []*ExcelClassifyItems, err error) {
-
-	sql := ` SELECT * FROM excel_classify WHERE parent_id=? AND source = ? AND is_delete=0 order by sort asc,excel_classify_id asc`
-	err = global.DEFAULT_DmSQL.Raw(sql, parentId, source).Scan(&items).Error
-	return
-}

models/excel/excel_edb_mapping.go

@@ -15,13 +15,6 @@ type ExcelEdbMapping struct {
 	ModifyTime        time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
-// AddExcelEdbMappingMulti 批量添加excel与指标的关系
-func AddExcelEdbMappingMulti(items []*ExcelEdbMapping) (err error) {
-
-	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
-	return
-}
-
 // Add 添加excel与指标的关系
 func (e *ExcelEdbMapping) Add() (err error) {
 

models/excel/excel_info.go

@@ -1,7 +1,6 @@
 package excel
 
 import (
-	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
@@ -24,41 +23,6 @@ type ExcelInfo struct {
 	CreateTime      time.Time `gorm:"column:create_time" description:"创建日期"`
 }
 
-// GetNoContentExcelInfoAll 获取不含content的表格列表 用于分类展示
-func GetNoContentExcelInfoAll(source, userId int) (items []*ExcelClassifyItems, err error) {
-
-	sql := ` SELECT excel_info_id,excel_classify_id,excel_name AS excel_classify_name,
-             unique_code,sys_user_id,sys_user_real_name
-            FROM excel_info where is_delete=0 AND source = ?  `
-
-	pars := []interface{}{source}
-
-	if userId > 0 {
-		sql += ` AND sys_user_id = ? `
-		pars = append(pars, userId)
-	}
-	sql += `  ORDER BY sort asc,create_time desc `
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
-	return
-}
-
-// UpdateExcelInfoClassifyId 更改表格分类
-func UpdateExcelInfoClassifyId(classifyId, excelInfoId int) (err error) {
-
-	sql := ` update excel_info set excel_classify_id = ? WHERE excel_info_id=? `
-	err = global.DEFAULT_DmSQL.Exec(sql, classifyId, excelInfoId).Error
-
-	return
-}
-
-// GetAllExcelInfoBySource 根据来源获取包含content的表格列表
-func GetAllExcelInfoBySource(source int) (items []*ExcelInfo, err error) {
-
-	sql := ` SELECT * FROM excel_info where is_delete=0  AND source = ?  ORDER BY sort asc,create_time desc `
-	err = global.DEFAULT_DmSQL.Raw(sql, source).Scan(&items).Error
-	return
-}
-
 // TableDataReq 自定义表格请求参数
 type TableDataReq struct {
 	EdbInfoIdList []int             `description:"指标id列表，从左至右，从上到下的顺序"`

models/factor_edb_series.go

@@ -53,8 +53,8 @@ func (m *FactorEdbSeries) Cols() FactorEdbSeriesCols {
 }
 
 func (m *FactorEdbSeries) Create() (err error) {
-
 	err = global.DEFAULT_DmSQL.Create(m).Error
+
 	return
 }
 
@@ -62,22 +62,21 @@ func (m *FactorEdbSeries) CreateMulti(items []*FactorEdbSeries) (err error) {
 	if len(items) == 0 {
 		return
 	}
-
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
+
 	return
 }
 
 func (m *FactorEdbSeries) Update(cols []string) (err error) {
-
 	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
 
 	return
 }
 
 func (m *FactorEdbSeries) Remove() (err error) {
-
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
 	err = global.DEFAULT_DmSQL.Raw(sql, m.FactorEdbSeriesId).Error
+
 	return
 }
 
@@ -85,39 +84,38 @@ func (m *FactorEdbSeries) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
 	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
+
 	return
 }
 
 func (m *FactorEdbSeries) GetItemById(id int) (item *FactorEdbSeries, err error) {
-
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeries) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeries, err error) {
-
 	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 = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeries) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
+
 	return
 }
 
 func (m *FactorEdbSeries) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeries, err error) {
-
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -128,11 +126,11 @@ func (m *FactorEdbSeries) GetItemsByCondition(condition string, pars []interface
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
 func (m *FactorEdbSeries) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeries, err error) {
-
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -144,6 +142,7 @@ func (m *FactorEdbSeries) GetPageItemsByCondition(condition string, pars []inter
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize, pageSize)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
@@ -167,6 +166,7 @@ func (m *FactorEdbSeries) Format2Item() (item *FactorEdbSeriesItem) {
 	}
 	item.CreateTime = utils.TimeTransferString(utils.FormatDateTime, m.CreateTime)
 	item.ModifyTime = utils.TimeTransferString(utils.FormatDateTime, m.ModifyTime)
+
 	return
 }
 
@@ -216,6 +216,7 @@ func (m *FactorEdbSeries) CreateSeriesAndMapping(item *FactorEdbSeries, mappings
 			return
 		}
 	}
+
 	return
 }
 
@@ -263,6 +264,7 @@ func (m *FactorEdbSeries) EditSeriesAndMapping(item *FactorEdbSeries, mappings [
 			return
 		}
 	}
+
 	return
 }
 

models/factor_edb_series_calculate_data.go

@@ -64,22 +64,21 @@ func (m *FactorEdbSeriesCalculateData) CreateMulti(items []*FactorEdbSeriesCalcu
 	if len(items) == 0 {
 		return
 	}
-
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
 
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) Update(cols []string) (err error) {
-
 	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) Remove() (err error) {
-
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
 	err = global.DEFAULT_DmSQL.Exec(sql, m.FactorEdbSeriesCalculateDataId).Error
+
 	return
 }
 
@@ -87,9 +86,9 @@ func (m *FactorEdbSeriesCalculateData) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
 	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
+
 	return
 }
 
@@ -100,36 +99,36 @@ func (m *FactorEdbSeriesCalculateData) RemoveByCondition(condition string, pars
 
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
 	err = global.DEFAULT_DmSQL.Exec(sql, pars...).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetItemById(id int) (item *FactorEdbSeriesCalculateData, err error) {
-
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeriesCalculateData, err error) {
-
 	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 = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeriesCalculateData, err error) {
-
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -140,11 +139,11 @@ func (m *FactorEdbSeriesCalculateData) GetItemsByCondition(condition string, par
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateData) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeriesCalculateData, err error) {
-
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -156,6 +155,7 @@ func (m *FactorEdbSeriesCalculateData) GetPageItemsByCondition(condition string,
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize, pageSize)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
@@ -175,6 +175,7 @@ func (m *FactorEdbSeriesCalculateData) Format2Item() (item *FactorEdbSeriesCalcu
 	item.FactorEdbSeriesId = m.FactorEdbSeriesId
 	item.EdbInfoId = m.EdbInfoId
 	item.EdbCode = m.EdbCode
+
 	return
 }
 
@@ -187,5 +188,6 @@ func TransEdbSeriesCalculateData2EdbDataList(items []*FactorEdbSeriesCalculateDa
 			Value:    v.Value,
 		})
 	}
+
 	return
 }

models/factor_edb_series_calculate_data_qjjs.go

@@ -52,8 +52,8 @@ func (m *FactorEdbSeriesCalculateDataQjjs) Cols() FactorEdbSeriesCalculateDataQj
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) Create() (err error) {
-
 	err = global.DEFAULT_DmSQL.Create(m).Error
+
 	return
 }
 
@@ -61,21 +61,21 @@ func (m *FactorEdbSeriesCalculateDataQjjs) CreateMulti(items []*FactorEdbSeriesC
 	if len(items) == 0 {
 		return
 	}
-
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) Update(cols []string) (err error) {
-
 	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) Remove() (err error) {
-
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
 	err = global.DEFAULT_DmSQL.Exec(sql, m.FactorEdbSeriesCalculateDataId).Error
+
 	return
 }
 
@@ -86,6 +86,7 @@ func (m *FactorEdbSeriesCalculateDataQjjs) MultiRemove(ids []int) (err error) {
 
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
 	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
+
 	return
 }
 
@@ -96,36 +97,36 @@ func (m *FactorEdbSeriesCalculateDataQjjs) RemoveByCondition(condition string, p
 
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
 	err = global.DEFAULT_DmSQL.Exec(sql, pars...).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetItemById(id int) (item *FactorEdbSeriesCalculateDataQjjs, err error) {
-
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *FactorEdbSeriesCalculateDataQjjs, err error) {
-
 	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 = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*FactorEdbSeriesCalculateDataQjjs, err error) {
-
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -136,11 +137,11 @@ func (m *FactorEdbSeriesCalculateDataQjjs) GetItemsByCondition(condition string,
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*FactorEdbSeriesCalculateDataQjjs, err error) {
-
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -152,6 +153,7 @@ func (m *FactorEdbSeriesCalculateDataQjjs) GetPageItemsByCondition(condition str
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize, pageSize)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
@@ -171,18 +173,7 @@ func (m *FactorEdbSeriesCalculateDataQjjs) Format2Item() (item *FactorEdbSeriesC
 	item.FactorEdbSeriesId = m.FactorEdbSeriesId
 	item.EdbInfoId = m.EdbInfoId
 	item.EdbCode = m.EdbCode
-	return
-}
 
-// TransEdbSeriesCalculateDataQjjs2EdbDataList 转换数据格式
-func TransEdbSeriesCalculateDataQjjs2EdbDataList(items []*FactorEdbSeriesCalculateDataQjjs) (list []*EdbDataList) {
-	list = make([]*EdbDataList, 0)
-	for _, v := range items {
-		list = append(list, &EdbDataList{
-			DataTime: v.DataTime.Format(utils.FormatDate),
-			Value:    v.Value,
-		})
-	}
 	return
 }
 
@@ -203,5 +194,6 @@ func (m *FactorEdbSeriesCalculateDataQjjs) GetEdbDataList(seriesId int, edbInfoI
 	sql = fmt.Sprintf(sql, m.TableName())
 
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&list).Error
+
 	return
 }

models/factor_edb_series_calculate_func.go

@@ -43,8 +43,8 @@ func (m *FactorEdbSeriesCalculateFunc) Cols() FactorEdbSeriesCalculateFuncCols {
 }
 
 func (m *FactorEdbSeriesCalculateFunc) Create() (err error) {
-
 	err = global.DEFAULT_DmSQL.Create(m).Error
+
 	return
 }
 
@@ -54,19 +54,20 @@ func (m *FactorEdbSeriesCalculateFunc) CreateMulti(items []*FactorEdbSeriesCalcu
 	}
 
 	err = global.DEFAULT_DmSQL.CreateInBatches(items, 500).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) Update(cols []string) (err error) {
-
 	err = global.DEFAULT_DmSQL.Model(m).Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *FactorEdbSeriesCalculateFunc) Remove() (err error) {
-
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
 	err = global.DEFAULT_DmSQL.Exec(sql, m.FactorEdbSeriesCalculateFuncId).Error
+
 	return
 }
 

models/factor_edb_series_mapping.go

@@ -163,7 +163,6 @@ func (m *FactorEdbSeriesMapping) Format2Item() (item *FactorEdbSeriesMappingItem
 }
 
 func (m *FactorEdbSeriesMapping) GetItemBySeriesId(seriesId int) (items []*FactorEdbSeriesMapping, err error) {
-
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? `, m.TableName(), m.Cols().FactorEdbSeriesId)
 	err = global.DEFAULT_DmSQL.Raw(sql, seriesId).Scan(&items).Error
 	return

models/mgo_base.go

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

models/predict_edb.go

@@ -62,7 +62,6 @@ func CalculateByRuleBy9(to *gorm.DB, rule CalculateRule) (resultDataList []*EdbI
 			return
 		}
 
-		//lenData := len(dataList)
 		for _, dv := range dataList {
 			// 现有实际数据
 			if val, ok := realSaveDataMap[dv.DataTime]; ok {
@@ -98,18 +97,6 @@ func CalculateByRuleBy9(to *gorm.DB, rule CalculateRule) (resultDataList []*EdbI
 				}
 			}
 		}
-
-		/*if lenData > 0 {
-			tmpLatestDate, _ := time.ParseInLocation(utils.FormatDate, dataList[lenData-1].DataTime, time.Local)
-			if minLatestDate.IsZero() || minLatestDate.After(tmpLatestDate) {
-				minLatestDate = tmpLatestDate
-			}
-
-			tmpStartDate, _ := time.ParseInLocation(utils.FormatDate, dataList[0].DataTime, time.Local)
-			if maxStartDate.IsZero() || maxStartDate.Before(tmpStartDate) {
-				maxStartDate = tmpStartDate
-			}
-		}*/
 	}
 
 	// todo 数据处理，将日期内不全的数据做填补
@@ -185,31 +172,10 @@ func CalculateByRuleBy9(to *gorm.DB, rule CalculateRule) (resultDataList []*EdbI
 			continue
 		}
 
-		//utils.FileLog.Info(fmt.Sprintf("formulaFormStr:%s", formulaFormStr))
-		//expression := formula.NewExpression(formulaFormStr)
-		//calResult, tmpErr := expression.Evaluate()
-		//if tmpErr != nil {
-		//	// 分母为0的报错
-		//	if strings.Contains(tmpErr.Error(), "divide by zero") {
-		//		continue
-		//	}
-		//	err = errors.New("计算失败：Err:" + tmpErr.Error() + ";formulaStr:" + formulaFormStr)
-		//	//fmt.Println(err)
-		//	return
-		//}
-		//calVal, tmpErr := calResult.Float64()
-		//if tmpErr != nil {
-		//	err = errors.New("计算失败：获取计算值失败 Err:" + tmpErr.Error() + ";formulaStr:" + formulaFormStr)
-		//	//fmt.Println(err)
-		//	return
-		//}
-
 		calVal, err := engine.ParseAndExec(formulaFormStr)
-		//calVal, err := calResult.Float64()
 		if err != nil {
 			// 分母为0的报错，忽略该循环
 			if utils.IsDivideZero(err) {
-				//removeDateList = append(removeDateList, sk)
 				continue
 			}
 			err = errors.New("计算失败：获取计算值失败 Err:" + err.Error() + ";formulaStr:" + formulaFormStr)

models/predict_edb_conf.go

@@ -68,22 +68,6 @@ type PredictEdbConfAndData struct {
 	DataList         []*EdbInfoSearchData `description:"动态数据" gorm:"-"`
 }
 
-// GetPredictEdbConfById 根据预测指标id获取预测指标配置信息
-func GetPredictEdbConfById(edbInfoId int) (item *PredictEdbConf, err error) {
-
-	sql := ` SELECT * FROM predict_edb_conf WHERE predict_edb_info_id=? `
-	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).First(&item).Error
-	return
-}
-
-// GetPredictEdbConfCount 根据来源指标id获取被引用的次数
-func GetPredictEdbConfCount(sourceEdbInfoId int) (count int, err error) {
-
-	sql := ` SELECT COUNT(1) AS count FROM predict_edb_conf WHERE source_edb_info_id=? `
-	err = global.DEFAULT_DmSQL.Raw(sql, sourceEdbInfoId).Scan(&count).Error
-	return
-}
-
 // GetPredictEdbConfListById 根据预测指标id获取预测指标配置信息列表
 func GetPredictEdbConfListById(edbInfoId int) (items []*PredictEdbConf, err error) {
 
@@ -111,59 +95,3 @@ func GetPredictEdbConfListByConfigIdList(configIdList []int) (items []*PredictEd
 	err = global.DEFAULT_DmSQL.Raw(sql, configIdList).Scan(&items).Error
 	return
 }
-
-// ModifyPredictEdbInfoMaxAndMinInfoBySourceEdbInfoId 根据来源指标修改预测指标的最新数据信息
-func ModifyPredictEdbInfoMaxAndMinInfoBySourceEdbInfoId(sourceEdbInfoId int, item *EdbInfoMaxAndMinInfo) (err error) {
-	//return
-
-	var list []*PredictEdbConf
-	sql := ` SELECT * FROM predict_edb_conf WHERE source_edb_info_id=? `
-	err = global.DEFAULT_DmSQL.Raw(sql, sourceEdbInfoId).Scan(&list).Error
-	if err != nil {
-		return
-	}
-	total := len(list)
-	if total > 0 {
-		idList := make([]int, 0)
-		for _, v := range list {
-			idList = append(idList, v.PredictEdbInfoId)
-		}
-
-		//sql := ` UPDATE edb_info SET start_date=?,min_value=?,max_value=?,is_update=2,latest_date=?,latest_value=?,modify_time=NOW() WHERE edb_info_id in (` + utils.GetOrmInReplace(int(total)) + `) `
-		//err = global.DEFAULT_DmSQL.Raw(sql, item.MinDate, item.MinValue, item.MaxValue, item.MaxDate, item.LatestValue, idList).Error
-		sql := ` UPDATE edb_info SET start_date=?,is_update=2,latest_date=?,latest_value=?,end_value=?,modify_time=NOW() WHERE edb_info_id in (` + utils.GetOrmInReplace(int(total)) + `) `
-		err = global.DEFAULT_DmSQL.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, item.LatestValue, idList).Error
-	}
-	return
-}
-
-// GetPredictEdbConfBySourceEdbInfoId 根据来源指标id获取配置
-func GetPredictEdbConfBySourceEdbInfoId(sourceEdbInfoId int) (item *PredictEdbConf, err error) {
-
-	sql := ` SELECT * FROM predict_edb_conf WHERE source_edb_info_id=? `
-	err = global.DEFAULT_DmSQL.Raw(sql, sourceEdbInfoId).First(&item).Error
-	return
-}
-
-// AddPredictEdbConf 添加预测指标规则
-func AddPredictEdbConf(item *PredictEdbConf) (lastId int64, err error) {
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	return
-}
-
-// GetPredictEdbInfoAllCalculate 根据基础预测指标id集合 获取 所有的普通指标列表数据
-func GetPredictEdbInfoAllCalculate(edbInfoIdList []int) (list []*EdbInfo, err error) {
-	num := len(edbInfoIdList)
-	if num <= 0 {
-		return
-	}
-
-	sql := ` SELECT b.* FROM predict_edb_conf AS a
-			 INNER JOIN edb_info AS b ON a.source_edb_info_id=b.edb_info_id
-             WHERE a.predict_edb_info_id in (` + utils.GetOrmInReplace(num) + `)
-			 GROUP BY a.source_edb_info_id
-			 ORDER BY a.source_edb_info_id ASC `
-	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoIdList).Scan(&list).Error
-	return
-}

models/predict_edb_conf_calculate_mapping.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
@@ -23,10 +23,8 @@ type PredictEdbConfCalculateMapping struct {
 
 // GetPredictEdbConfCalculateMappingListByEdbInfoId 根据预测指标id获取所有关联指标
 func GetPredictEdbConfCalculateMappingListByEdbInfoId(edbInfoId int) (list []*PredictEdbConfCalculateMapping, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * from predict_edb_conf_calculate_mapping
-			WHERE edb_info_id=? ORDER BY predict_edb_conf_calculate_mapping_id ASC `
+	sql := ` SELECT * from predict_edb_conf_calculate_mapping WHERE edb_info_id=? ORDER BY predict_edb_conf_calculate_mapping_id ASC `
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Find(&list).Error
 
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&list)
 	return
 }

models/predict_edb_data_calculate_cjjx.go

@@ -276,32 +276,7 @@ func refreshAllPredictCalculateCjjx(to *gorm.DB, edbInfoId, source, subSource in
 				if tmpValue, ok := handleDataMap[historyPreDateStr]; ok { //上一年同期找到
 					pastValueList = append(pastValueList, tmpValue)
 				}
-				//else if isCompatibility { // 如果需要兼容上下35天
-				//	nextDateDay := hisoryPreDate
-				//	preDateDay := hisoryPreDate
-				//	for i := 0; i < 35; i++ {
-				//		nextDateDayStr := nextDateDay.Format(utils.FormatDate)
-				//		if findItem, ok := dataMap[nextDateDayStr]; ok { //上一年同期->下一个月找到
-				//			pastValueList = append(pastValueList, findItem.Value)
-				//			break
-				//		} else {
-				//			preDateDayStr := preDateDay.Format(utils.FormatDate)
-				//			if findItem, ok := dataMap[preDateDayStr]; ok { //上一年同期->上一个月找到
-				//				pastValueList = append(pastValueList, findItem.Value)
-				//				break
-				//			}
-				//		}
-				//		nextDateDay = nextDateDay.AddDate(0, 0, 1)
-				//		preDateDay = preDateDay.AddDate(0, 0, -1)
-				//	}
-				//}
-				//if av == "2023-09-29" {
-				//	fmt.Println(moveDay)
-				//}
 			}
-			//if av == "2023-09-29" {
-			//	fmt.Println(pastValueList)
-			//}
 
 			if len(pastValueList) == formulaInt {
 				delete(removeDataTimeMap, av) //将待删除的日期给移除

models/predict_edb_data_calculate_ljztbpj.go

@@ -25,284 +25,6 @@ type EdbDataPredictCalculateLjztbpj struct {
 	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
-// SavePredictCalculateLjztbpj 新增累计值同比拼接数据
-func SavePredictCalculateLjztbpj(req *EdbInfoCalculateBatchSaveReq, firstEdbInfo, secondEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfo *EdbInfo, latestDateStr string, latestValue float64, err error) {
-	to := global.DEFAULT_DmSQL.Begin()
-	defer func() {
-		if err != nil {
-			to.Rollback()
-		} else {
-			to.Commit()
-		}
-	}()
-	//最近开始的时间
-	var lastDateTime time.Time
-	var existItemA, existItemB *EdbInfoCalculateMapping
-	//获取待拼接指标
-	{
-		/*var condition string
-		var pars []interface{}
-
-		//获取待拼接指标最近的个12月31日有值的年份
-		condition += " AND data_time like ? AND edb_info_id=? "
-		pars = append(pars, "%12-31", firstEdbInfo.EdbInfoId)
-
-		lastEdbData, tmpErr := GetLastEdbData(condition, pars, firstEdbInfo.Source)
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}*/
-		var firstDataList []*EdbInfoSearchData
-		var lastEdbData *EdbInfoSearchData
-		firstDataList, err = GetPredictEdbDataListAllByStartDate(firstEdbInfo, 0, "")
-		if err != nil {
-			return
-		}
-		for _, v := range firstDataList {
-			if strings.Contains(v.DataTime, "-12-31") {
-				lastEdbData = v
-			}
-		}
-
-		if lastEdbData == nil {
-			err = errors.New("找不到最近的12月31号")
-			return
-		}
-		lastDateTime, _ = time.ParseInLocation(utils.FormatDate, lastEdbData.DataTime, time.Local)
-	}
-
-	if req.EdbInfoId <= 0 {
-		edbInfo = &EdbInfo{
-			EdbInfoType:      1,
-			SourceName:       "预测累计值同比拼接",
-			Source:           utils.DATA_SOURCE_PREDICT_CALCULATE_LJZTBPJ,
-			EdbCode:          edbCode,
-			EdbName:          req.EdbName,
-			EdbNameSource:    req.EdbName,
-			Frequency:        req.Frequency,
-			Unit:             req.Unit,
-			StartDate:        firstEdbInfo.StartDate,
-			EndDate:          firstEdbInfo.EndDate,
-			ClassifyId:       req.ClassifyId,
-			SysUserId:        sysUserId,
-			SysUserRealName:  sysUserRealName,
-			UniqueCode:       uniqueCode,
-			CreateTime:       time.Now(),
-			ModifyTime:       time.Now(),
-			CalculateFormula: lastDateTime.Format(utils.FormatDate),
-			EdbType:          2,
-		}
-		tmpErr := to.Create(edbInfo).Error
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-
-		//关联关系
-		{
-			existItemA = &EdbInfoCalculateMapping{
-				EdbInfoCalculateMappingId: 0,
-				EdbInfoId:                 edbInfo.EdbInfoId,
-				Source:                    edbInfo.Source,
-				SourceName:                edbInfo.SourceName,
-				EdbCode:                   edbInfo.EdbCode,
-				FromEdbInfoId:             firstEdbInfo.EdbInfoId,
-				FromEdbCode:               firstEdbInfo.EdbCode,
-				FromEdbName:               firstEdbInfo.EdbName,
-				FromSource:                firstEdbInfo.Source,
-				FromSourceName:            firstEdbInfo.SourceName,
-				FromTag:                   "A",
-				Sort:                      1,
-				CreateTime:                time.Now(),
-				ModifyTime:                time.Now(),
-			}
-			tmpErr := to.Create(existItemA).Error
-			if tmpErr != nil {
-				err = tmpErr
-				return
-			}
-
-		}
-
-		//同比值指标
-		{
-			existItemB = &EdbInfoCalculateMapping{
-				EdbInfoCalculateMappingId: 0,
-				EdbInfoId:                 edbInfo.EdbInfoId,
-				Source:                    edbInfo.Source,
-				SourceName:                edbInfo.SourceName,
-				EdbCode:                   edbInfo.EdbCode,
-				FromEdbInfoId:             secondEdbInfo.EdbInfoId,
-				FromEdbCode:               secondEdbInfo.EdbCode,
-				FromEdbName:               secondEdbInfo.EdbName,
-				FromSource:                secondEdbInfo.Source,
-				FromSourceName:            secondEdbInfo.SourceName,
-				FromTag:                   "B",
-				Sort:                      1,
-				CreateTime:                time.Now(),
-				ModifyTime:                time.Now(),
-			}
-			tmpErr := to.Create(existItemB).Error
-			if tmpErr != nil {
-				err = tmpErr
-				return
-			}
-
-		}
-	} else {
-		edbInfo, err = GetEdbInfoById(req.EdbInfoId)
-		if err != nil {
-			return
-		}
-		latestDateStr = edbInfo.LatestDate
-		latestValue = edbInfo.LatestValue
-		nowEdbInfo := *edbInfo // 现在的指标信息
-
-		sql := ``
-		//修改指标信息
-		edbInfo.EdbNameSource = req.EdbName
-		edbInfo.Frequency = req.Frequency
-		edbInfo.Unit = req.Unit
-		edbInfo.ClassifyId = req.ClassifyId
-		edbInfo.CalculateFormula = lastDateTime.Format(utils.FormatDate)
-		edbInfo.ModifyTime = time.Now()
-		err = to.Model(edbInfo).Select([]string{"EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "ModifyTime"}).Updates(edbInfo).Error
-		if err != nil {
-			return
-		}
-
-		//查询出所有的关联指标
-		var existCondition string
-		var existPars []interface{}
-		existCondition += " AND edb_info_id=? "
-		existPars = append(existPars, edbInfo.EdbInfoId)
-		var existList []*EdbInfoCalculateMapping
-		existList, err = GetEdbInfoCalculateListByCondition(existCondition, existPars)
-		if err != nil {
-			err = errors.New("判断指标是否改变失败,Err:" + err.Error())
-			return
-		}
-		for _, existItem := range existList {
-			if existItem.FromTag == "A" {
-				existItemA = existItem
-			} else if existItem.FromTag == "B" {
-				existItemB = existItem
-			}
-		}
-		if existItemA == nil {
-			err = errors.New("原待拼接指标不存在")
-			return
-		}
-		if existItemB == nil {
-			err = errors.New("原同比值指标不存在")
-			return
-		}
-		// 是否需要删除数据重新计算
-		isNeedCalculateData := false
-
-		// 如果截止日期变更，那么需要重新计算
-		if lastDateTime.Format(utils.FormatDate) != nowEdbInfo.CalculateFormula {
-			isNeedCalculateData = true
-		}
-
-		//待拼接指标数据
-		//如果拼接指标变更了，那么需要删除所有的指标进行重新拼接
-		if existItemA.FromEdbInfoId != firstEdbInfo.EdbInfoId {
-			//删除之前的A指标关联关系
-			sql = ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? and from_edb_info_id = ?`
-			err = to.Exec(sql, edbInfo.EdbInfoId, existItemA.FromEdbInfoId).Error
-			if err != nil {
-				err = errors.New("删除拼接日期之前的指标关联关系失败,Err:" + err.Error())
-				return
-			}
-		}
-
-		//同比值指标
-		if existItemB.FromEdbInfoId != secondEdbInfo.EdbInfoId {
-			//删除之前的B指标关联关系
-			sql = ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? and from_edb_info_id = ?`
-			err = to.Exec(sql, edbInfo.EdbInfoId, existItemB.FromEdbInfoId).Error
-			if err != nil {
-				err = errors.New("删除拼接日期之后的指标关联关系失败,Err:" + err.Error())
-				return
-			}
-		}
-		//添加新的指标关系
-		if existItemA.FromEdbInfoId != firstEdbInfo.EdbInfoId {
-			existItemA = &EdbInfoCalculateMapping{
-				EdbInfoCalculateMappingId: 0,
-				EdbInfoId:                 edbInfo.EdbInfoId,
-				Source:                    edbInfo.Source,
-				SourceName:                edbInfo.SourceName,
-				EdbCode:                   edbInfo.EdbCode,
-				FromEdbInfoId:             firstEdbInfo.EdbInfoId,
-				FromEdbCode:               firstEdbInfo.EdbCode,
-				FromEdbName:               firstEdbInfo.EdbName,
-				FromSource:                firstEdbInfo.Source,
-				FromSourceName:            firstEdbInfo.SourceName,
-				FromTag:                   "A",
-				Sort:                      1,
-				CreateTime:                time.Now(),
-				ModifyTime:                time.Now(),
-			}
-			tmpErr := to.Create(existItemA).Error
-			if tmpErr != nil {
-				err = tmpErr
-				return
-			}
-
-			isNeedCalculateData = true
-		}
-
-		//添加新的指标关系
-		if existItemB.FromEdbInfoId != secondEdbInfo.EdbInfoId {
-			existItemB = &EdbInfoCalculateMapping{
-				EdbInfoCalculateMappingId: 0,
-				EdbInfoId:                 edbInfo.EdbInfoId,
-				Source:                    edbInfo.Source,
-				SourceName:                edbInfo.SourceName,
-				EdbCode:                   edbInfo.EdbCode,
-				FromEdbInfoId:             secondEdbInfo.EdbInfoId,
-				FromEdbCode:               secondEdbInfo.EdbCode,
-				FromEdbName:               secondEdbInfo.EdbName,
-				FromSource:                secondEdbInfo.Source,
-				FromSourceName:            secondEdbInfo.SourceName,
-				FromTag:                   "B",
-				Sort:                      2,
-				CreateTime:                time.Now(),
-				ModifyTime:                time.Now(),
-			}
-
-			tmpErr := to.Create(existItemB).Error
-			if tmpErr != nil {
-				err = tmpErr
-				return
-			}
-
-			isNeedCalculateData = true
-		}
-
-		// 如果需要重新计算，那么先删除所有的指标数据，然后再重新计算
-		if isNeedCalculateData {
-			// 删除之前所有的指标数据
-			tableName := GetEdbDataTableName(edbInfo.Source, edbInfo.SubSource)
-			sql = fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? `, tableName)
-			err = to.Exec(sql, edbInfo.EdbInfoId).Error
-			if err != nil {
-				err = errors.New("删除所有的累计值同比拼接指标数据失败,Err:" + err.Error())
-				return
-			}
-		} else {
-			return
-		}
-	}
-
-	// 添加数据
-	latestDateStr, latestValue, err = refreshAllPredictCalculateLjztbpj(to, edbInfo, firstEdbInfo, secondEdbInfo, existItemB)
-
-	return
-}
-
 // RefreshAllPredictCalculateLjztbpj 刷新所有 累计值同比拼接 数据
 func RefreshAllPredictCalculateLjztbpj(edbInfo *EdbInfo) (latestDateStr string, latestValue float64, err error) {
 	to := global.DEFAULT_DmSQL.Begin()

models/predict_edb_data_calculate_ljzzy.go

@@ -291,27 +291,6 @@ func refreshAllPredictCalculateLjzzy(to *gorm.DB, edbInfoId, source, subSource i
 				}
 			}
 			if date != "" {
-				//saveValue := utils.SubFloatToString(val, 4)
-				////判断数据是否存在
-				//if existVal, ok := dataMap[date]; !ok {
-				//	dataTime, _ := time.ParseInLocation(utils.FormatDate, date, time.Local)
-				//	timestamp := dataTime.UnixNano() / 1e6
-				//	timeStr := fmt.Sprintf("%d", timestamp)
-				//	if _, existOk := existDataMap[date]; !existOk {
-				//		addSql += GetAddSql(edbInfoIdStr, edbCode, date, timeStr, saveValue)
-				//		isAdd = true
-				//	}
-				//	existDataMap[date] = date
-				//} else {
-				//	if existVal != saveValue {
-				//		sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-				//		sql = fmt.Sprintf(sql, dataTableName)
-				//		err = to.Exec(sql, saveValue, edbInfoId, date).Error
-				//		if err != nil {
-				//			return err
-				//		}
-				//	}
-				//}
 				tmpSql, newAdd, tmpErr := calculateLjzzy(edbInfoId, date, edbInfoIdStr, edbCode, dataTableName, addSql, val, dataMap, existDataMap, to)
 				if !isAdd {
 					isAdd = newAdd

models/predict_edb_data_calculate_nhcc.go

@@ -652,18 +652,6 @@ func getPredictNhccData(firstEdbInfo, secondEdbInfo *EdbInfo, existItemA, existI
 	aDataList = make([]EdbInfoSearchData, 0)
 	aDataMap = make(map[string]float64)
 	{
-		/*var condition string
-		var pars []interface{}
-
-		condition += " AND edb_info_id=? "
-		pars = append(pars, existItemA.FromEdbInfoId)
-
-		//第一个指标的数据列表
-		firstDataList, tmpErr := GetEdbDataListAllByTo(to, condition, pars, existItemA.FromSource, 0)
-		if tmpErr != nil {
-
-			return tmpErr
-		}*/
 		var firstDataList []*EdbInfoSearchData
 		firstDataList, err = GetPredictEdbDataListAllByStartDate(firstEdbInfo, 0, "")
 		if err != nil {
@@ -677,17 +665,6 @@ func getPredictNhccData(firstEdbInfo, secondEdbInfo *EdbInfo, existItemA, existI
 	secondDataList = make([]*EdbInfoSearchData, 0)
 	bDataMap = make(map[string]float64)
 	{
-		/*condition = ``
-		pars = make([]interface{}, 0)
-
-		condition += "  AND edb_info_id = ? "
-		pars = append(pars, existItemB.FromEdbInfoId)
-
-		//第二个指标的数据列表
-		secondDataList, err = GetEdbDataListAllByTo(to, condition, pars, existItemB.FromSource, 0)
-		if err != nil {
-			return
-		}*/
 		secondDataList, err = GetPredictEdbDataListAllByStartDate(secondEdbInfo, 0, "")
 		if err != nil {
 			return

models/predict_edb_data_calculate_nszydbpjjs.go

@@ -352,7 +352,6 @@ func refreshAllPredictCalculateNszydpjjs(to *gorm.DB, edbInfoId, source, subSour
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		//utils.FileLog.Info("addSql:" + addSql)
 		err = to.Exec(addSql).Error
 		if err != nil {
 			return

models/predict_edb_data_calculate_qjjs.go

@@ -23,7 +23,6 @@ func (obj PredictCalculateRangeAnalysis) Add(params BatchSaveCalculateBatchParam
 	uniqueCode := params.UniqueCode
 	sysUserId := params.SysUserId
 	sysUserRealName := params.SysUserRealName
-	//req *EdbInfoCalculateBatchSaveReq, edbCode, uniqueCode string, sysUserId int, sysUserRealName string
 	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
 		if err != nil {

models/predict_edb_data_calculate_tbz.go

@@ -383,331 +383,3 @@ func (obj PredictTb) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbInfo, edbCode
 
 	return
 }
-
-// SavePredictCalculateTbz 新增/编辑 预测同比指标
-func SavePredictCalculateTbz(reqEdbInfoId, classifyId int, edbName, frequency, unit, formula string, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfo *EdbInfo, latestDateStr string, latestValue float64, err error, errMsg string) {
-	to := global.DEFAULT_DmSQL.Begin()
-	defer func() {
-		if err != nil {
-			to.Rollback()
-		} else {
-			to.Commit()
-		}
-	}()
-
-	if reqEdbInfoId <= 0 {
-		edbInfo = &EdbInfo{
-			//EdbInfoId:        0,
-			EdbInfoType:   1,
-			SourceName:    "预测同比",
-			Source:        utils.DATA_SOURCE_PREDICT_CALCULATE_TBZ,
-			EdbCode:       edbCode,
-			EdbName:       edbName,
-			EdbNameSource: edbName,
-			Frequency:     frequency,
-			Unit:          unit,
-			//StartDate:        "",
-			//EndDate:          "",
-			ClassifyId:       classifyId,
-			SysUserId:        sysUserId,
-			SysUserRealName:  sysUserRealName,
-			UniqueCode:       uniqueCode,
-			CreateTime:       time.Now(),
-			ModifyTime:       time.Now(),
-			MinValue:         0,
-			MaxValue:         0,
-			CalculateFormula: formula,
-			EdbType:          2,
-			Sort:             0,
-			MoveType:         0,
-			MoveFrequency:    "",
-			NoUpdate:         0,
-			ServerUrl:        "",
-			EdbNameEn:        "",
-			UnitEn:           "",
-			LatestDate:       "",
-			LatestValue:      0,
-			ChartImage:       "",
-		}
-		tmpErr := to.Create(edbInfo).Error
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-
-		// 添加关联关系
-		{
-			calculateMappingItem := &EdbInfoCalculateMapping{
-				EdbInfoCalculateMappingId: 0,
-				EdbInfoId:                 edbInfo.EdbInfoId,
-				Source:                    edbInfo.Source,
-				SourceName:                edbInfo.SourceName,
-				EdbCode:                   edbCode,
-				FromEdbInfoId:             fromEdbInfo.EdbInfoId,
-				FromEdbCode:               fromEdbInfo.EdbCode,
-				FromEdbName:               fromEdbInfo.EdbName,
-				FromSource:                fromEdbInfo.Source,
-				FromSourceName:            fromEdbInfo.SourceName,
-				FromTag:                   "",
-				Sort:                      1,
-				CreateTime:                time.Now(),
-				ModifyTime:                time.Now(),
-			}
-			err = to.Create(calculateMappingItem).Error
-			if err != nil {
-				return
-			}
-		}
-
-	} else {
-		edbInfo, err = GetEdbInfoById(reqEdbInfoId)
-		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
-				errMsg = `获取指标信息失败`
-			}
-			return
-		}
-		if edbInfo.EdbInfoType != 1 {
-			errMsg = `该指标不是预测指标`
-			err = errors.New(errMsg)
-			return
-		}
-		latestDateStr = edbInfo.LatestDate
-		latestValue = edbInfo.LatestValue
-		//修改指标信息
-		edbInfo.EdbName = edbName
-		edbInfo.EdbNameSource = edbName
-		edbInfo.Frequency = frequency
-		edbInfo.Unit = unit
-		edbInfo.ClassifyId = classifyId
-		edbInfo.ModifyTime = time.Now()
-		err = to.Model(edbInfo).Select([]string{"EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "ModifyTime"}).Updates(edbInfo).Error
-		if err != nil {
-			return
-		}
-
-		//判断计算指标是否被更换
-		var existCondition string
-		var existPars []interface{}
-		existCondition += " AND edb_info_id=? AND from_edb_info_id=? "
-		existPars = append(existPars, edbInfo.EdbInfoId, fromEdbInfo.EdbInfoId)
-
-		var count int
-		count, err = GetEdbInfoCalculateCountByCondition(existCondition, existPars)
-		if err != nil {
-			err = errors.New("判断指标是否改变失败,Err:" + err.Error())
-			return
-		}
-		if count > 0 { // 指标未被替换，无需重新计算
-			return
-		}
-		//删除，计算指标关联的，基础指标的关联关系
-		sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? `
-		err = to.Exec(sql, edbInfo.EdbInfoId).Error
-		if err != nil {
-			return
-		}
-
-		// 删除该指标所有的同比数据
-		dataTableName := GetEdbDataTableName(utils.DATA_SOURCE_PREDICT_CALCULATE_TBZ, utils.DATA_SUB_SOURCE_EDB)
-		deleteSql := ` DELETE FROM %s WHERE edb_info_id=? `
-		deleteSql = fmt.Sprintf(deleteSql, dataTableName)
-		err = to.Exec(deleteSql, edbInfo.EdbInfoId).Error
-		if err != nil {
-			return
-		}
-	}
-
-	edbInfoIdStr := strconv.Itoa(edbInfo.EdbInfoId)
-	// 获取源指标数据
-	dataList, err := GetPredictEdbDataListAll(fromEdbInfo, 0)
-	if err != nil {
-		return
-	}
-
-	latestDateStr = fromEdbInfo.LatestDate
-	// 计算数据
-	var dateArr []string
-	dataMap := make(map[string]*EdbInfoSearchData)
-	for _, v := range dataList {
-		dateArr = append(dateArr, v.DataTime)
-		dataMap[v.DataTime] = v
-	}
-
-	addSql := ` INSERT INTO edb_data_predict_calculate_tbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
-	var isAdd bool
-	existMap := make(map[string]string)
-	for _, av := range dateArr {
-		//fmt.Println(ak, av)
-		currentItem := dataMap[av]
-		if currentItem != nil {
-			//当前日期
-			currentDate, tmpErr := time.ParseInLocation(utils.FormatDate, av, time.Local)
-			if tmpErr != nil {
-				err = tmpErr
-				return
-			}
-			//上一年的日期
-			preDate := currentDate.AddDate(-1, 0, 0)
-			preDateStr := preDate.Format(utils.FormatDate)
-			if findItem, ok := dataMap[preDateStr]; ok { //上一年同期找到
-				//dataTime, _ := time.ParseInLocation(utils.FormatDate, date, time.Local)
-				if _, ok := existMap[edbCode+av]; !ok {
-					timestamp := currentDate.UnixNano() / 1e6
-					timestampStr := fmt.Sprintf("%d", timestamp)
-					val := TbzDiv(currentItem.Value, findItem.Value)
-					addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
-					isAdd = true
-					utils.FileLog.Info("同期找到:" + av + ";" + preDateStr)
-
-					// 实际数据的值
-					if fromEdbInfo.LatestDate == av {
-						latestValueDecimal, tmpErr := decimal.NewFromString(val)
-						if tmpErr != nil {
-							return
-						}
-						latestValue, _ = latestValueDecimal.Truncate(4).Float64() //保留4位小数
-					}
-				}
-				existMap[edbCode+av] = av
-			} else {
-				if fromEdbInfo.Frequency == "月度" { //向上和向下，各找一个月
-					nextDateDay := preDate
-					preDateDay := preDate
-					for i := 0; i <= 35; i++ {
-						nextDateDayStr := nextDateDay.Format(utils.FormatDate)
-						if findItem, ok := dataMap[nextDateDayStr]; ok { //上一年同期->下一个月找到
-							if _, ok := existMap[edbCode+av]; !ok {
-								timestamp := currentDate.UnixNano() / 1e6
-								timestampStr := fmt.Sprintf("%d", timestamp)
-								val := TbzDiv(currentItem.Value, findItem.Value)
-								addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
-								isAdd = true
-
-								// 实际数据的值
-								if fromEdbInfo.LatestDate == av {
-									latestValueDecimal, tmpErr := decimal.NewFromString(val)
-									if tmpErr != nil {
-										return
-									}
-									latestValue, _ = latestValueDecimal.Truncate(4).Float64() //保留4位小数
-								}
-							}
-							existMap[edbCode+av] = av
-							break
-						} else {
-							preDateDayStr := preDateDay.Format(utils.FormatDate)
-							if findItem, ok := dataMap[preDateDayStr]; ok { //上一年同期->上一个月找到
-								if _, ok := existMap[edbCode+av]; !ok {
-									timestamp := currentDate.UnixNano() / 1e6
-									timestampStr := fmt.Sprintf("%d", timestamp)
-									val := TbzDiv(currentItem.Value, findItem.Value)
-
-									addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
-									isAdd = true
-
-									// 实际数据的值
-									if fromEdbInfo.LatestDate == av {
-										latestValueDecimal, tmpErr := decimal.NewFromString(val)
-										if tmpErr != nil {
-											return
-										}
-										latestValue, _ = latestValueDecimal.Truncate(4).Float64() //保留4位小数
-									}
-								}
-								existMap[edbCode+av] = av
-								break
-							}
-						}
-						nextDateDay = nextDateDay.AddDate(0, 0, 1)
-						preDateDay = preDateDay.AddDate(0, 0, -1)
-					}
-				} else if fromEdbInfo.Frequency == "季度" || fromEdbInfo.Frequency == "年度" {
-					if findItem, ok := dataMap[preDateStr]; ok { //上一年同期->下一个月找到
-						if _, ok := existMap[edbCode+av]; !ok {
-							timestamp := currentDate.UnixNano() / 1e6
-							timestampStr := fmt.Sprintf("%d", timestamp)
-							val := TbzDiv(currentItem.Value, findItem.Value)
-
-							addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
-							isAdd = true
-
-							// 实际数据的值
-							if fromEdbInfo.LatestDate == av {
-								latestValueDecimal, tmpErr := decimal.NewFromString(val)
-								if tmpErr != nil {
-									return
-								}
-								latestValue, _ = latestValueDecimal.Truncate(4).Float64() //保留4位小数
-							}
-						}
-						existMap[edbCode+av] = av
-						break
-					}
-				} else {
-					nextDateDay := preDate
-					preDateDay := preDate
-
-					for i := 0; i < 35; i++ {
-						nextDateDayStr := nextDateDay.Format(utils.FormatDate)
-						if findItem, ok := dataMap[nextDateDayStr]; ok { //上一年同期->下一个月找到
-							if _, ok := existMap[edbCode+av]; !ok {
-								timestamp := currentDate.UnixNano() / 1e6
-								timestampStr := fmt.Sprintf("%d", timestamp)
-								val := TbzDiv(currentItem.Value, findItem.Value)
-								addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
-								isAdd = true
-
-								// 实际数据的值
-								if fromEdbInfo.LatestDate == av {
-									latestValueDecimal, tmpErr := decimal.NewFromString(val)
-									if tmpErr != nil {
-										return
-									}
-									latestValue, _ = latestValueDecimal.Truncate(4).Float64() //保留4位小数
-								}
-							}
-							existMap[edbCode+av] = av
-							break
-						} else {
-							preDateDayStr := preDateDay.Format(utils.FormatDate)
-							if findItem, ok := dataMap[preDateDayStr]; ok { //上一年同期->上一个月找到
-								if _, ok := existMap[edbCode+av]; !ok {
-									timestamp := currentDate.UnixNano() / 1e6
-									timestampStr := fmt.Sprintf("%d", timestamp)
-									val := TbzDiv(currentItem.Value, findItem.Value)
-									addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
-									isAdd = true
-
-									// 实际数据的值
-									if fromEdbInfo.LatestDate == av {
-										latestValueDecimal, tmpErr := decimal.NewFromString(val)
-										if tmpErr != nil {
-											return
-										}
-										latestValue, _ = latestValueDecimal.Truncate(4).Float64() //保留4位小数
-									}
-								}
-								existMap[edbCode+av] = av
-								break
-							} else {
-								//fmt.Println("pre not find:", preDateStr, "i:", i)
-							}
-						}
-						nextDateDay = nextDateDay.AddDate(0, 0, 1)
-						preDateDay = preDateDay.AddDate(0, 0, -1)
-					}
-				}
-			}
-		}
-	}
-
-	if isAdd {
-		addSql = strings.TrimRight(addSql, ",")
-		err = to.Exec(addSql).Error
-		if err != nil {
-			return
-		}
-	}
-	return
-}

models/predict_edb_data_calculate_time_shift.go

@@ -170,7 +170,7 @@ func SavePredictCalculateTimeShift(req *EdbInfoCalculateBatchSaveReq, fromEdbInf
 	return
 }
 
-// refreshAllPredictCalculateTimeShift 刷新所有时间移位数据
+// RefreshAllPredictCalculateTimeShift 刷新所有时间移位数据
 func RefreshAllPredictCalculateTimeShift(edbInfoId, source, subSource, formulaInt, moveType int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate, moveFrequency string) (latestDateStr string, latestValue float64, err error) {
 	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
@@ -222,11 +222,11 @@ func refreshAllPredictCalculateTimeShift(to *gorm.DB, edbInfoId, source, subSour
 		dataMap[v.DataTime] = v
 	}
 
-	fmt.Println("source:", source)
+	//fmt.Println("source:", source)
 	//获取指标所有数据
 	existDataList := make([]*EdbData, 0)
 	dataTableName := GetEdbDataTableName(source, subSource)
-	fmt.Println("dataTableName:", dataTableName)
+	//fmt.Println("dataTableName:", dataTableName)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
 	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
@@ -239,7 +239,7 @@ func refreshAllPredictCalculateTimeShift(to *gorm.DB, edbInfoId, source, subSour
 	for _, v := range existDataList {
 		existDataMap[v.DataTime] = v.Value
 	}
-	fmt.Println("existDataMap:", existDataMap)
+	//fmt.Println("existDataMap:", existDataMap)
 	addSql := ` INSERT INTO edb_data_predict_calculate_time_shift(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 

models/predict_edb_data_calculate_zjpj.go

@@ -23,258 +23,6 @@ type EdbDataPredictCalculateZjpj struct {
 	DataTimestamp int64
 }
 
-// SavePredictCalculateZjpj 新增直接拼接数据
-func SavePredictCalculateZjpj(req *EdbInfoCalculateBatchSaveReq, firstEdbInfo, secondEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfo *EdbInfo, latestDateStr string, latestValue float64, err error) {
-	to := global.DEFAULT_DmSQL.Begin()
-	defer func() {
-		if err != nil {
-			to.Rollback()
-		} else {
-			to.Commit()
-		}
-	}()
-	var existItemA, existItemB *EdbInfoCalculateMapping
-	if req.EdbInfoId <= 0 {
-		edbInfo = &EdbInfo{
-			EdbInfoType:      1,
-			SourceName:       "预测直接拼接",
-			Source:           utils.DATA_SOURCE_PREDICT_CALCULATE_ZJPJ,
-			EdbCode:          edbCode,
-			EdbName:          req.EdbName,
-			EdbNameSource:    req.EdbName,
-			Frequency:        req.Frequency,
-			Unit:             req.Unit,
-			StartDate:        firstEdbInfo.StartDate,
-			EndDate:          firstEdbInfo.EndDate,
-			ClassifyId:       req.ClassifyId,
-			SysUserId:        sysUserId,
-			SysUserRealName:  sysUserRealName,
-			UniqueCode:       uniqueCode,
-			CreateTime:       time.Now(),
-			ModifyTime:       time.Now(),
-			CalculateFormula: req.Formula,
-			EdbType:          2,
-		}
-		tmpErr := to.Create(edbInfo).Error
-		if tmpErr != nil {
-			err = tmpErr
-			return
-		}
-
-		//关联关系
-		//第一个指标
-		{
-			existItemA = &EdbInfoCalculateMapping{
-				EdbInfoCalculateMappingId: 0,
-				EdbInfoId:                 edbInfo.EdbInfoId,
-				Source:                    edbInfo.Source,
-				SourceName:                edbInfo.SourceName,
-				EdbCode:                   edbInfo.EdbCode,
-				FromEdbInfoId:             firstEdbInfo.EdbInfoId,
-				FromEdbCode:               firstEdbInfo.EdbCode,
-				FromEdbName:               firstEdbInfo.EdbName,
-				FromSource:                firstEdbInfo.Source,
-				FromSourceName:            firstEdbInfo.SourceName,
-				FromTag:                   "A",
-				Sort:                      1,
-				CreateTime:                time.Now(),
-				ModifyTime:                time.Now(),
-			}
-			tmpErr := to.Create(existItemA).Error
-			if tmpErr != nil {
-				err = tmpErr
-				return
-			}
-
-		}
-
-		//第二个指标
-		{
-			existItemB = &EdbInfoCalculateMapping{
-				EdbInfoCalculateMappingId: 0,
-				EdbInfoId:                 edbInfo.EdbInfoId,
-				Source:                    edbInfo.Source,
-				SourceName:                edbInfo.SourceName,
-				EdbCode:                   edbInfo.EdbCode,
-				FromEdbInfoId:             secondEdbInfo.EdbInfoId,
-				FromEdbCode:               secondEdbInfo.EdbCode,
-				FromEdbName:               secondEdbInfo.EdbName,
-				FromSource:                secondEdbInfo.Source,
-				FromSourceName:            secondEdbInfo.SourceName,
-				FromTag:                   "B",
-				Sort:                      1,
-				CreateTime:                time.Now(),
-				ModifyTime:                time.Now(),
-			}
-			tmpErr := to.Create(existItemB).Error
-			if tmpErr != nil {
-				err = tmpErr
-				return
-			}
-
-		}
-	} else {
-		edbInfo, err = GetEdbInfoById(req.EdbInfoId)
-		if err != nil {
-			return
-		}
-		latestDateStr = edbInfo.LatestDate
-		latestValue = edbInfo.LatestValue
-
-		nowEdbInfo := *edbInfo // 现在的指标信息
-
-		//修改指标信息
-		edbInfo.EdbName = req.EdbName
-		edbInfo.EdbNameSource = req.EdbName
-		edbInfo.Frequency = req.Frequency
-		edbInfo.Unit = req.Unit
-		edbInfo.ClassifyId = req.ClassifyId
-		edbInfo.CalculateFormula = req.Formula
-		edbInfo.ModifyTime = time.Now()
-		err = to.Model(edbInfo).Select([]string{"EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "ModifyTime"}).Updates(edbInfo).Error
-		if err != nil {
-			return
-		}
-
-		var existCondition string
-		var existPars []interface{}
-		existCondition += " AND edb_info_id=? "
-		existPars = append(existPars, edbInfo.EdbInfoId)
-
-		//查询出所有的关联指标
-		var existList []*EdbInfoCalculateMapping
-		existList, err = GetEdbInfoCalculateListByCondition(existCondition, existPars)
-		if err != nil {
-			err = fmt.Errorf("判断指标是否改变失败,Err:" + err.Error())
-			return
-		}
-
-		for _, existItem := range existList {
-			if existItem.FromTag == "A" {
-				existItemA = existItem
-			} else if existItem.FromTag == "B" {
-				existItemB = existItem
-			}
-		}
-		if existItemA == nil {
-			err = errors.New("原拼接日期之前的指标不存在")
-			return
-		}
-		if existItemB == nil {
-			err = errors.New("原拼接日期之后的指标不存在")
-			return
-		}
-
-		// 是否需要删除数据重新计算
-		isNeedCalculateData := false
-
-		// 如果截止日期变更，那么需要重新计算
-		if req.Formula != nowEdbInfo.CalculateFormula {
-			isNeedCalculateData = true
-		}
-		//第一个指标数据
-		{
-			// 如果指标变了，那么需要删除关系，并重新计算
-			if existItemA.FromEdbInfoId != firstEdbInfo.EdbInfoId {
-				//删除之前的A指标关联关系
-				sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? and from_edb_info_id = ?`
-				err = to.Exec(sql, edbInfo.EdbInfoId, existItemA.FromEdbInfoId).Error
-				if err != nil {
-					err = fmt.Errorf("删除拼接日期之前的指标关联关系失败,Err:" + err.Error())
-					return
-				}
-			}
-		}
-
-		//第二个指标数据
-		{
-			// 如果指标变了，那么需要删除关系，并重新计算
-			if existItemB.FromEdbInfoId != secondEdbInfo.EdbInfoId {
-				//删除之前的B指标关联关系
-				sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? and from_edb_info_id = ?`
-				err = to.Exec(sql, edbInfo.EdbInfoId, existItemB.FromEdbInfoId).Error
-				if err != nil {
-					err = fmt.Errorf("删除拼接日期之后的指标关联关系失败,Err:" + err.Error())
-					return
-				}
-			}
-		}
-		if existItemA.FromEdbInfoId != firstEdbInfo.EdbInfoId {
-			//添加新的指标关系
-			{
-				existItemA = &EdbInfoCalculateMapping{
-					EdbInfoCalculateMappingId: 0,
-					EdbInfoId:                 edbInfo.EdbInfoId,
-					Source:                    edbInfo.Source,
-					SourceName:                edbInfo.SourceName,
-					EdbCode:                   edbInfo.EdbCode,
-					FromEdbInfoId:             firstEdbInfo.EdbInfoId,
-					FromEdbCode:               firstEdbInfo.EdbCode,
-					FromEdbName:               firstEdbInfo.EdbName,
-					FromSource:                firstEdbInfo.Source,
-					FromSourceName:            firstEdbInfo.SourceName,
-					FromTag:                   "A",
-					Sort:                      1,
-					CreateTime:                time.Now(),
-					ModifyTime:                time.Now(),
-				}
-				tmpErr := to.Create(existItemA).Error
-				if tmpErr != nil {
-					err = tmpErr
-					return
-				}
-
-				isNeedCalculateData = true
-			}
-		}
-
-		if existItemB.FromEdbInfoId != secondEdbInfo.EdbInfoId {
-			// 添加新的指标关联关系
-			existItemB = &EdbInfoCalculateMapping{
-				EdbInfoCalculateMappingId: 0,
-				EdbInfoId:                 edbInfo.EdbInfoId,
-				Source:                    edbInfo.Source,
-				SourceName:                edbInfo.SourceName,
-				EdbCode:                   edbInfo.EdbCode,
-				FromEdbInfoId:             secondEdbInfo.EdbInfoId,
-				FromEdbCode:               secondEdbInfo.EdbCode,
-				FromEdbName:               secondEdbInfo.EdbName,
-				FromSource:                secondEdbInfo.Source,
-				FromSourceName:            secondEdbInfo.SourceName,
-				FromTag:                   "B",
-				Sort:                      2,
-				CreateTime:                time.Now(),
-				ModifyTime:                time.Now(),
-			}
-			tmpErr := to.Create(existItemB).Error
-			if tmpErr != nil {
-				err = tmpErr
-				return
-			}
-
-			isNeedCalculateData = true
-		}
-		// 如果需要重新计算，那么先删除所有的指标数据，然后再重新计算
-		if isNeedCalculateData {
-			// 删除之前所有的指标数据
-			tableName := GetEdbDataTableName(edbInfo.Source, edbInfo.SubSource)
-			sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? `, tableName)
-			err = to.Exec(sql, edbInfo.EdbInfoId).Error
-			if err != nil {
-				err = fmt.Errorf("删除历史数据失败,Err:" + err.Error())
-				return
-			}
-		} else {
-			return
-		}
-	}
-
-	//拼接数据
-	latestDateStr, latestValue, err = refreshAllPredictCalculateZjpj(to, edbInfo, firstEdbInfo, secondEdbInfo)
-
-	return
-}
-
 // RefreshAllPredictCalculateZjpj 刷新所有 直接拼接 数据
 func RefreshAllPredictCalculateZjpj(edbInfo *EdbInfo) (latestDateStr string, latestValue float64, err error) {
 	to := global.DEFAULT_DmSQL.Begin()
@@ -406,17 +154,6 @@ func refreshAllPredictCalculateZjpj(to *gorm.DB, edbInfo, firstEdbInfo, secondEd
 
 	//第二个指标
 	{
-		/*condition := ``
-		pars := make([]interface{}, 0)
-
-		condition += " AND data_time >= ? AND edb_info_id = ? "
-		pars = append(pars, edbInfo.CalculateFormula, existItemB.FromEdbInfoId)
-
-		//第二个指标的数据列表
-		secondDataList, tmpErr := GetEdbDataListAllByTo(to, condition, pars, existItemB.FromSource, 0)
-		if tmpErr != nil {
-			return tmpErr
-		}*/
 		var secondDataList []*EdbInfoSearchData
 		secondDataList, err = GetPredictEdbDataListAllByStartDate(secondEdbInfo, 0, edbInfo.CalculateFormula)
 		if err != nil {

models/predict_edb_rule_data.go

@@ -31,7 +31,6 @@ type PredictEdbRuleDataItem struct {
 
 // GetPredictEdbRuleDataItemList 根据基础预测指标id集合 获取 所有的普通指标列表数据
 func GetPredictEdbRuleDataItemList(edbInfoId, configId int, startDate, endDate string) (list []*PredictEdbRuleDataItem, err error) {
-
 	var pars []interface{}
 	sql := ` SELECT * FROM predict_edb_rule_data WHERE edb_info_id = ? AND config_id = ? `
 	pars = append(pars, edbInfoId, configId)
@@ -45,5 +44,6 @@ func GetPredictEdbRuleDataItemList(edbInfoId, configId int, startDate, endDate s
 	}
 	sql += ` ORDER BY data_time ASC `
 	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&list).Error
+
 	return
 }

models/supply_analysis/variety.go

@@ -25,180 +25,3 @@ func GetVarietyById(id int) (item *Variety, err error) {
 	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }
-
-// GetVarietyByName 根据品种名称获取品种详情
-func GetVarietyByName(name string) (item *Variety, err error) {
-
-	sql := `SELECT * FROM variety WHERE variety_name = ?`
-	err = global.DEFAULT_DmSQL.Raw(sql, name).First(&item).Error
-	return
-}
-
-// AddVariety 添加品种
-func AddVariety(item *Variety) (lastId int64, err error) {
-
-	err = global.DEFAULT_DmSQL.Create(item).Error
-	return
-}
-
-// CreateVariety 添加品种
-func CreateVariety(item *Variety, adminIdList []int) (err error) {
-	to := global.DEFAULT_DmSQL.Begin()
-	defer func() {
-		if err != nil {
-			to.Rollback()
-		} else {
-			to.Commit()
-		}
-	}()
-	err = to.Create(item).Error
-	if err != nil {
-		return
-	}
-	varietyAdminPermissionList := make([]*VarietyAdminPermission, 0)
-	for _, adminId := range adminIdList {
-		varietyAdminPermissionList = append(varietyAdminPermissionList, &VarietyAdminPermission{
-			//Id:              0,
-			VarietyId:  item.VarietyId,
-			SysUserId:  adminId,
-			CreateTime: time.Now(),
-		})
-	}
-	if len(varietyAdminPermissionList) > 0 {
-		err = to.CreateInBatches(varietyAdminPermissionList, 500).Error
-	}
-
-	return
-}
-
-// EditVariety 编辑品种
-func EditVariety(item *Variety, adminIdList []int) (err error) {
-	to := global.DEFAULT_DmSQL.Begin()
-	defer func() {
-		if err != nil {
-			to.Rollback()
-		} else {
-			to.Commit()
-		}
-	}()
-	err = to.Model(item).Select([]string{"VarietyName", "LastUpdateSysUserId", "LastUpdateSysUserRealName", "ModifyTime"}).Updates(item).Error
-	if err != nil {
-		return
-	}
-
-	// 删除历史的权限配置
-	sql := `DELETE FROM variety_admin_permission where variety_id = ? `
-	err = to.Exec(sql, item.VarietyId).Error
-	if err != nil {
-		return
-	}
-
-	// 添加新的权限配置
-	varietyAdminPermissionList := make([]*VarietyAdminPermission, 0)
-	for _, adminId := range adminIdList {
-		varietyAdminPermissionList = append(varietyAdminPermissionList, &VarietyAdminPermission{
-			//Id:              0,
-			VarietyId:  item.VarietyId,
-			SysUserId:  adminId,
-			CreateTime: time.Now(),
-		})
-	}
-	if len(varietyAdminPermissionList) > 0 {
-		err = to.CreateInBatches(varietyAdminPermissionList, 500).Error
-	}
-
-	return
-}
-
-// VarietyItem 列表页返回的数据结构
-type VarietyItem struct {
-	VarietyId                 int           `gorm:"primaryKey;autoIncrement;column:variety_id"`
-	VarietyName               string        `description:"品种名称"`
-	LastUpdateSysUserId       int           `description:"最后更新人id"`
-	LastUpdateSysUserRealName string        `description:"最后更新人名称"`
-	PermissionUserId          string        `description:"有操作权限的用户id" json:"-"`
-	ModifyTime                string        `description:"修改时间"`
-	CreateTime                string        `description:"创建时间"`
-	Button                    VarietyButton `description:"操作按钮权限"`
-}
-
-type VarietyButton struct {
-	Edit    bool `description:"操作权限"`
-	Delete  bool `description:"删除权限"`
-	Analyse bool `description:"分析权限"`
-}
-
-// GetListBySuperAdminPage 不区分是否有分析权限的获取分页数据
-func (item Variety) GetListBySuperAdminPage(condition string, pars []interface{}, startSize, pageSize int) (total int, items []*VarietyItem, err error) {
-
-	baseSql := ` FROM ( SELECT a.*, GROUP_CONCAT(DISTINCT b.sys_user_id ORDER BY b.sys_user_id ASC SEPARATOR ',') AS permission_user_id FROM variety a 
-				LEFT JOIN variety_admin_permission b on a.variety_id=b.variety_id 
-				LEFT JOIN variety_edb_info c on a.variety_id=c.variety_id WHERE 1=1 `
-	if condition != "" {
-		baseSql += condition
-	}
-	baseSql += ` GROUP BY a.variety_id ) d `
-	// 数据总数
-	totalSql := `SELECT COUNT(1) total ` + baseSql
-	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
-	if err != nil {
-		return
-	}
-
-	// 列表页数据
-	listSql := `SELECT * ` + baseSql + ` ORDER BY modify_time DESC,variety_id DESC LIMIT ?,?`
-	pars = append(pars, startSize, pageSize)
-	err = global.DEFAULT_DmSQL.Raw(listSql, pars...).Scan(&items).Error
-	return
-}
-
-// GetListByPage 获取分页数据
-func (item Variety) GetListByPage(condition string, pars []interface{}, startSize, pageSize int) (total int, items []*VarietyItem, err error) {
-
-	baseSql := ` FROM ( SELECT a.*, GROUP_CONCAT(DISTINCT b.sys_user_id ORDER BY b.sys_user_id ASC SEPARATOR ',') AS permission_user_id FROM variety a 
-				JOIN variety_admin_permission b on a.variety_id=b.variety_id 
-				JOIN variety_edb_info c on a.variety_id=c.variety_id WHERE 1=1 `
-	if condition != "" {
-		baseSql += condition
-	}
-	baseSql += ` GROUP BY a.variety_id ) d `
-	// 数据总数
-	totalSql := `SELECT COUNT(1) total ` + baseSql
-	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
-	if err != nil {
-		return
-	}
-
-	// 列表页数据
-	listSql := `SELECT * ` + baseSql + ` ORDER BY modify_time DESC,variety_id DESC LIMIT ?,?`
-	pars = append(pars, startSize, pageSize)
-	err = global.DEFAULT_DmSQL.Raw(listSql, pars...).Scan(&items).Error
-	return
-}
-
-// Update 更基础信息
-func (variety *Variety) Update(cols []string) (err error) {
-	err = global.DEFAULT_DmSQL.Model(variety).Select(cols).Updates(variety).Error
-	return
-}
-
-// GetVarietyMaxSort 获取图表分类下最大的排序数
-func GetVarietyMaxSort(parentId int) (sort int, err error) {
-
-	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM future_good_chart_classify WHERE parent_id=? AND is_delete=0 `
-	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Scan(&sort).Error
-	return
-}
-
-type VarietyView struct {
-	VarietyId   int    `gorm:"primaryKey;autoIncrement;column:future_good_chart_classify_id"`
-	VarietyName string `description:"分类名称"`
-	ParentId    int    `description:"父级id"`
-}
-
-func GetVarietyViewById(classifyId int) (item *VarietyView, err error) {
-
-	sql := `SELECT * FROM future_good_chart_classify WHERE future_good_chart_classify_id=? AND is_delete=0 `
-	err = global.DEFAULT_DmSQL.Raw(sql, classifyId).First(&item).Error
-	return
-}

models/supply_analysis/variety_admin_permission.go

@@ -1,7 +1,6 @@
 package supply_analysis
 
 import (
-	"eta_gn/eta_index_lib/global"
 	"time"
 )
 
@@ -12,11 +11,3 @@ type VarietyAdminPermission struct {
 	SysUserId  int       `gorm:"column:sys_user_id" description:"用户id"`
 	CreateTime time.Time `gorm:"column:create_time" description:"添加时间"`
 }
-
-// GetVarietyPermissionByVarietyIdAndUserId 根据品种id和用户id获取权限记录表
-func GetVarietyPermissionByVarietyIdAndUserId(varietyId, sysUserId int) (item *VarietyAdminPermission, err error) {
-
-	sql := `SELECT * FROM variety_admin_permission a  WHERE variety_id = ? AND sys_user_id = ? ORDER BY id desc `
-	err = global.DEFAULT_DmSQL.Raw(sql, varietyId, sysUserId).First(&item).Error
-	return
-}

models/supply_analysis/variety_edb_info.go

@@ -37,64 +37,3 @@ func GetVarietyEdbInfoByEdbInfoId(varietyId int) (item *VarietyEdbInfo, err erro
 
 	return
 }
-
-// BatchCreateVarietyEdbInfo 批量插入
-func BatchCreateVarietyEdbInfo(list []*VarietyEdbInfo) (err error) {
-	num := len(list)
-	if num <= 0 {
-		return
-	}
-
-	err = global.DEFAULT_DmSQL.CreateInBatches(list, 500).Error
-
-	return
-}
-
-// GetCountVarietyEdbByVarietyId 根据品种id获取添加到已经生成的指标数量（不管是否加入到ETA指标库）
-func GetCountVarietyEdbByVarietyId(varietyId int) (total int, err error) {
-
-	sql := `SELECT count(1) total FROM variety_edb_info AS a WHERE a.variety_id = ?`
-	err = global.DEFAULT_DmSQL.Raw(sql, varietyId).Scan(&total).Error
-	return
-}
-
-// GetCountVarietyEdbInfoByVarietyId 根据品种id获取添加到ETA指标库的指标数量
-func GetCountVarietyEdbInfoByVarietyId(varietyId int) (total int, err error) {
-
-	sql := `SELECT count(1) total FROM variety_edb_info AS a
-			JOIN edb_info b on a.edb_info_id=b.edb_info_id
-			WHERE a.variety_id = ? and a.edb_info_id >0`
-	err = global.DEFAULT_DmSQL.Raw(sql, varietyId).Scan(&total).Error
-	return
-}
-
-// VarietyEdbInfoItem 品种指标表（展示使用）
-type VarietyEdbInfoItem struct {
-	VarietyEdbId int                  `gorm:"primaryKey;autoIncrement;column:variety_edb_id"`
-	VarietyId    int                  `description:"品种id"`
-	EdbName      string               `description:"品种指标名称"`
-	Frequency    string               `description:"频度"`
-	StartDate    string               `description:"开始日期"`
-	EndDate      string               `description:"结束日期"`
-	EdbInfoId    int                  `description:"指标id" json:"-"`
-	EdbCode      string               `description:"品种编码"`
-	ClassifyName string               `description:"分类名称"`
-	Source       int                  `description:"来源，1：影响周度产量；2：周度产量变动；3：影响月度产量；4：月度产量变动" json:"-"`
-	ModifyTime   string               `description:"最近一次更新时间"`
-	CreateTime   string               `description:"添加时间"`
-	Button       VarietyEdbInfoButton `description:"操作按钮权限"`
-}
-
-type VarietyEdbInfoButton struct {
-	Copy bool `description:"复制数据权限"`
-	Show bool `description:"查看数据权限"`
-	Add  bool `description:"添加到指标库"`
-}
-
-// GetAllVarietyEdbInfoItemByVarietyId 根据品种id获取所有的指标
-func GetAllVarietyEdbInfoItemByVarietyId(varietyId int) (items []*VarietyEdbInfoItem, err error) {
-
-	sql := `SELECT * FROM variety_edb_info AS a WHERE a.variety_id = ? ORDER BY a.variety_edb_id ASC `
-	err = global.DEFAULT_DmSQL.Raw(sql, varietyId).Scan(&items).Error
-	return
-}

models/supply_analysis/variety_plant.go

@@ -33,77 +33,3 @@ func GetAllVarietyPlantByVarietyId(varietyId int) (items []*VarietyPlant, err er
 	err = global.DEFAULT_DmSQL.Raw(sql, varietyId).Scan(&items).Error
 	return
 }
-
-// AddVarietyPlant 添加future_good_chart分类
-func AddVarietyPlant(item *VarietyPlant) (err error) {
-	err = global.DEFAULT_DmSQL.Create(item).Error
-
-	return
-}
-
-// Update 更新基础信息
-func (varietyPlant *VarietyPlant) Update(cols []string) (err error) {
-
-	//_, err = o.Update(varietyPlant, cols...)
-	err = global.DEFAULT_DmSQL.Model(varietyPlant).Select(cols).Updates(varietyPlant).Error
-	return
-}
-
-// GetVarietyPlantById 根据品种装置id获取品种装置详情
-func GetVarietyPlantById(id int) (item *VarietyPlant, err error) {
-
-	sql := `SELECT * FROM variety_plant WHERE variety_plant_id = ?`
-	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
-	return
-}
-
-// VarietyPlantItem 品种装置数据（展示使用）
-type VarietyPlantItem struct {
-	VarietyPlantId                int                `gorm:"primaryKey;autoIncrement;column:variety_plant_id"`
-	VarietyId                     int                `description:"品种id"`
-	Province                      string             `description:"所属省份"`
-	City                          string             `description:"所属城市"`
-	FactoryName                   string             `description:"工厂名称"`
-	PlantName                     string             `description:"装置/产线名称"`
-	MaintenanceDate               string             `description:"检修日期"`
-	ResumptionDate                string             `description:"复产日期"`
-	AnnualCapacity                float64            `description:"年产能"`
-	Coefficient                   float64            `description:"降负系数"`
-	AverageDailyCapacityReduction float64            `description:"日均产量减量"`
-	IsStop                        int                `description:"是否停产，0：未停产；1：停产；默认未停产"`
-	Sort                          int                `description:"排序字段，越小越靠前"`
-	SysUserId                     int                `description:"添加人id"`
-	SysUserRealName               string             `description:"添加人真实姓名"`
-	ModifyTime                    string             `description:"最近一次更新时间"`
-	CreateTime                    string             `description:"添加时间"`
-	Button                        VarietyPlantButton `description:"操作按钮权限"`
-}
-
-type VarietyPlantButton struct {
-	Edit   bool `description:"操作权限"`
-	Delete bool `description:"删除权限"`
-}
-
-// GetAllVarietyPlantItemByVarietyId 根据品种id获取所有的装置
-func GetAllVarietyPlantItemByVarietyId(varietyId int) (items []*VarietyPlantItem, err error) {
-
-	sql := `SELECT * FROM variety_plant a  WHERE variety_id = ? ORDER BY variety_plant_id desc `
-	err = global.DEFAULT_DmSQL.Raw(sql, varietyId).Scan(&items).Error
-	return
-}
-
-// GetCountVarietyPlantByVarietyId 根据品种id获取所有的装置数量
-func GetCountVarietyPlantByVarietyId(varietyId int) (total int, err error) {
-
-	sql := `SELECT count(1) total FROM variety_plant a  WHERE variety_id = ? `
-	err = global.DEFAULT_DmSQL.Raw(sql, varietyId).Scan(&total).Error
-	return
-}
-
-// DeleteVarietyPlantById 根据装置id删除
-func DeleteVarietyPlantById(id int) (err error) {
-
-	sql := `DELETE FROM variety_plant WHERE variety_plant_id = ?`
-	err = global.DEFAULT_DmSQL.Exec(sql, id).Error
-	return
-}

models/trade_analysis/trade_analysis.go

@@ -89,35 +89,10 @@ type TradeClassifyName struct {
 	LatestDate   string //分类下最晚日期
 }
 
-// GetExchangeClassify 获取交易所分类列表
-func GetExchangeClassify(exchange string) (list []TradeClassifyName, err error) {
-	tableName := "base_from_trade_" + exchange + "_index"
-	orderStr := "classify_name DESC, classify_type asc"
-	if exchange == "zhengzhou" {
-		orderStr = "classify_name asc"
-	}
-	sql := "SELECT classify_name, classify_type FROM " + tableName + " WHERE `rank` <=20 and `rank` > 0 GROUP BY classify_name, classify_type  "
-	sql += ` ORDER BY ` + orderStr
-
-	err = global.DEFAULT_DmSQL.Raw(sql).Scan(&list).Error
-
-	return
-}
-
 type LastTimeItem struct {
 	CreateTime time.Time
 }
 
-// GetExchangeLastTime 获取交易所数据最晚的时间
-func GetExchangeLastTime(exchange string) (item LastTimeItem, err error) {
-	tableName := "base_from_trade_" + exchange + "_index"
-	sql := `SELECT create_time FROM ` + tableName + ` ORDER BY create_time desc`
-
-	err = global.DEFAULT_DmSQL.Raw(sql).First(&item).Error
-
-	return
-}
-
 type GetPositionTopReq struct {
 	Exchange     string `json:"exchange" form:"exchange"`           //交易所
 	ClassifyName string `json:"classify_name" form:"classify_name"` //分类名称
@@ -151,15 +126,6 @@ type GetPositionTopListItem struct {
 	BeforeAllChange int    `description:"排在前面的成交量增减总计"`
 }
 
-func GetTradePositionTop(exchange string, classifyName, classifyType, dataTime string) (list []TradePositionTop, err error) {
-	tableName := "trade_position_" + exchange + "_top"
-	sql := `SELECT * FROM ` + tableName + " WHERE classify_name=? and classify_type=? and data_time=? and `rank` <=20 and `rank` > 0 ORDER BY deal_value desc"
-
-	err = global.DEFAULT_DmSQL.Raw(sql, classifyName, classifyType, dataTime).Scan(&list).Error
-
-	return
-}
-
 type OriginTradeData struct {
 	Rank         int       `description:"排名"`
 	CompanyName  string    `description:"期货公司名称"`
@@ -292,12 +258,6 @@ const (
 	TradeExchangeGuangzhou = "guangzhou"
 )
 
-var WarehouseTypeSuffixNames = map[int]string{
-	WarehouseBuyChartType:     "席位多单",
-	WarehouseSoldChartType:    "席位空单",
-	WarehousePureBuyChartType: "席位净多单",
-}
-
 // GuangzhouSeatNameValType 广期所数据名称对应的席位方向
 var GuangzhouSeatNameValType = map[string]int{
 	GuangZhouSeatNameBuy:     1,

models/trade_analysis/warehouse.go

@@ -11,18 +11,6 @@ type WarehouseExtraConfig struct {
 	PredictRatio          float64  `gorm:"column:predict_ratio" description:"预估参数, 0-1之间"`
 }
 
-// WarehouseChartPars 建仓单表配置
-//type WarehouseChartPars struct {
-//	WarehouseChartType int    `description:"图表类型: 1-多单图; 2-空单图; 3-净多单图"`
-//	DateType           int    `description:"日期类型"`
-//	DateTypeNum        int    `description:"日期类型=25(N月)时的N值"`
-//	StartDate          string `description:"自定义开始日期"`
-//	EndDate            string `description:"自定义结束日期"`
-//	//ChartThemeId       int                               `description:"图表主题ID"`
-//	ChartEdbInfoList []*models.ChartSaveItem `description:"指标及配置信息"`
-//	//SourcesFrom        *data_manage.ChartInfoSourcesFrom `description:"图表来源"`
-//}
-
 // WarehouseChartDataResp 图表详情返回信息
 type WarehouseChartDataResp struct {
 	WarehouseExtraConfig

services/base_from_manual.go

@@ -1,79 +0,0 @@
-package services
-
-/*
-import (
-	"errors"
-	"eta_gn/eta_index_lib/models"
-	"eta_gn/eta_index_lib/utils"
-)
-
-func AddEdbDataFromManual(edbCode string) (err error) {
-	// 判断是否调用桥接服务
-	var manualDataList []*models.ManualEdbdata
-	url, _ := GetWindBridgeUrl()
-	if url != "" {
-		manualDataList, err = GetManualEdbDataFromBridgeJy(url, edbCode, "", "")
-		if err != nil {
-			return
-		}
-		// 设置指标与终端关系的缓存
-		windUrlCacheKey := utils.CACHE_WIND_URL + ":" + edbCode
-		_ = utils.Rc.SetNX(windUrlCacheKey, url, utils.GetTodayLastSecond())
-	} else {
-		var condition string
-		var pars []interface{}
-
-		if edbCode != "" {
-			condition += " AND TRADE_CODE=? "
-			pars = append(pars, edbCode)
-		}
-		manualDataList, err = models.GetEdbdataManualByCondition(condition, pars)
-		if err != nil {
-			return
-		}
-	}
-
-	err = models.AddEdbDataFromManual(edbCode, manualDataList)
-	return
-}
-
-func RefreshEdbDataFromManual(req models.RefreshEdbInfoReq, edbinfo *models.EdbInfo) (err error) {
-	var manualDataList []*models.ManualEdbdata
-	url, _ := GetManualBridgeJYUrl()
-	if url != "" && edbinfo.ServerUrl == url {
-		manualDataList, err = GetManualEdbDataFromBridgeJy(url, req.EdbCode, "", "")
-		if err != nil {
-			err = errors.New("查询桥接服务手工数据失败，Err:" + err.Error())
-			return
-		}
-	} else {
-		var condition string
-		var pars []interface{}
-
-		if req.EdbCode != "" {
-			condition += " AND TRADE_CODE=? "
-			pars = append(pars, req.EdbCode)
-		}
-
-		if req.StartDate != "" {
-			condition += " AND DT>=? "
-			pars = append(pars, req.StartDate)
-		} else {
-			condition += " AND DT != ? "
-			pars = append(pars, `0000-00-00`)
-		}
-
-		manualDataList, err = models.GetEdbdataManualByCondition(condition, pars)
-		if err != nil {
-			err = errors.New("查询手工数据失败，Err:" + err.Error())
-			return
-		}
-	}
-	err = models.RefreshEdbDataFromManual(req.EdbInfoId, req.EdbCode, req.StartDate, manualDataList)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		err = errors.New("刷新指标信息失败 service RefreshEdbDataFromManual，Err:" + err.Error())
-		return
-	}
-	return
-}
-*/

services/base_from_python.go

@@ -13,48 +13,6 @@ import (
 	"strings"
 )
 
-func Test() (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("err:", err)
-		}
-	}()
-	///usr/local/bin/python3.9
-	//exec.Command("bin/bash", "-c")
-	//cmd := exec.Command("/usr/local/bin/python3.9", "-c", "/Users/roc/go/src/eta_gn/eta_index_lib/test2.py")
-	//cmd := exec.Command("python3", "-c", "./test2.py")
-	cmd := exec.Command("python3", "/Users/roc/go/src/eta_gn/eta_index_lib/test2.py")
-	outputByte, err := cmd.Output()
-	//fmt.Println(err)
-	fmt.Println("start")
-	if err != nil {
-		return
-	}
-	fmt.Println(string(outputByte))
-	arr := strings.Split(string(outputByte), "result=")
-	arrLen := len(arr)
-	//fmt.Println(arr)
-	if arrLen <= 1 {
-		err = fmt.Errorf("python运算结果异常")
-		return
-	}
-	resultStr := arr[arrLen-1]
-	fmt.Println(resultStr)
-
-	var dataMap map[string]float64
-	json.Unmarshal([]byte(resultStr), &dataMap)
-	fmt.Println(dataMap)
-	//i, err := python3.Py_Main(os.Args)
-	//if err != nil {
-	//	fmt.Printf("error launching the python interpreter: %s\n", err)
-	//	os.Exit(1)
-	//}
-	////commStr := "#!/usr/bin/python\n# -*- coding: UTF-8 -*-\n\nimport pymysql\nimport pandas as pd\nfrom test_bak import sql_config\n\ndb = pymysql.connect(**sql_config)\ndb.autocommit(1)\ncursor = db.cursor()\npandas_fetch_all = pd.read_sql\n\n# 返回数据\nresult = {}\n\n# 格式化返回数据\ndef format_data(data: pd.DataFrame,\n                index_str: str = \"data_time\",\n                value_str: str = \"value\"\n                ) -> dict:\n    \"\"\"\n        Parameters\n        ----------\n        data : pandas的DataFrame数据结构.\n        index_str : 对象下标字符串，在pandas的DataFrame中的列名.\n        value_str : 对象值字符串，在pandas的DataFrame中的列名\n\n        Returns\n        -------\n        DataFrame or Iterator[DataFrame]\n        例子：{'2007-01-09': 3220.0, '2007-01-10': 3230.0}\n\n        \"\"\"\n    tmp_result = {}\n    for num in range(1, data.index.size):  # 迭代 所有的指标\n        tmp_result[data[index_str][num]] = data[value_str][num]\n    return tmp_result\n\n\ndef query():\n    edb_code = 's0033227'\n    data_time = '2002-03-17'\n    # field_name = '平均温度'\n    sql1 = f\"\"\"SELECT data_time,`value` FROM edb_data_wind WHERE edb_code = '{edb_code}' and data_time > '{data_time}' ;\"\"\"\n    raw = pandas_fetch_all(sql1, db)\n    raw['data_time_str'] = raw['data_time'].apply(lambda x: x.strftime(\"%Y-%m-%d\"))\n    format_result = format_data(raw, \"data_time_str\", \"value\")\n    print(format_result)\n    return format_result\n\n\nresult = query()\ndb.close()\n"
-	////i := python3.PyRun_SimpleString(commStr)
-	//fmt.Println(i)
-	return
-}
-
 // EdbDataStrFromPython 通过python代码获取到的指标数据（interface数据）
 type EdbDataStrFromPython struct {
 	Date  map[int]string      `json:"date"`

services/edb_terminal.go

@@ -1,93 +0,0 @@
-package services
-
-import (
-	"errors"
-	"eta_gn/eta_index_lib/models"
-	"eta_gn/eta_index_lib/utils"
-)
-
-// GetTerminal 获取终端信息
-func GetTerminal(source int, oldTerminalCode string) (edbTerminal *models.EdbTerminal, err error) {
-	if source == utils.DATA_SOURCE_WIND && oldTerminalCode == "" {
-		tmpConfig := new(models.EdbConfig)
-		tmpConfig, err = models.GetConfigDetailByCode("wind_terminal_code")
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			err = errors.New("获取配置的wind地址失败，err:" + err.Error())
-			return
-		}
-		err = nil
-		if tmpConfig != nil {
-			oldTerminalCode = tmpConfig.ConfigValue
-			//return
-		}
-	}
-	if oldTerminalCode != "" {
-		edbTerminal, err = models.GetEdbTerminalByCode(oldTerminalCode)
-		if err != nil {
-			return
-		}
-		return
-	}
-
-	// 配置中没有的话，那么就从分组获取,
-	list, err := models.GetEdbCountGroupByTerminal(source)
-	if err != nil {
-		return
-	}
-	//windUrlNum := 0
-
-	//获取对应的配置url
-	terminalNumMap := make(map[string]int)
-	for _, v := range list {
-		terminalNumMap[v.TerminalCode] = v.Total
-	}
-
-	terminalList, err := models.GetEdbTerminalListBySource(source)
-	if err != nil {
-		return
-	}
-	if len(terminalList) == 0 {
-		err = errors.New("终端地址未配置")
-		return
-	}
-	num := 0
-	for _, v := range terminalList {
-		tmpNum := terminalNumMap[v.TerminalCode]
-		if edbTerminal == nil {
-			edbTerminal = v
-			num = tmpNum
-		} else if tmpNum < num {
-			edbTerminal = v
-			num = tmpNum
-		}
-	}
-	if edbTerminal == nil {
-		err = errors.New("获取配置的终端地址失败")
-		return
-	}
-	/*if edbTerminal != nil {
-		windUrl = edbTerminal.ServerUrl
-		terminalCode = edbTerminal.TerminalCode
-	}*/
-	return
-}
-
-func GetFirstTerminal(source int, oldTerminalCode string) (edbTerminal *models.EdbTerminal, err error) {
-	if oldTerminalCode != "" {
-		edbTerminal, err = models.GetEdbTerminalByCode(oldTerminalCode)
-		if err != nil {
-			return
-		}
-		return
-	}
-
-	edbTerminal, err = models.GetEdbTerminalFirstBySource(source)
-	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			err = errors.New("终端未配置")
-			return
-		}
-		return
-	}
-	return
-}