清理代码

models/data_manage/baiinfo_data.go

@@ -11,13 +11,6 @@ type BaiinfoClassify struct {
 	TypeCode string `orm:"column(type_code)" description:"分类名称编码"`
 }
 
-//func GetBaiinfoClassify() (items []*BaiinfoClassify, err error) {
-//	sql := `SELECT CONCAT(type_2,type_3) AS type_name,CONCAT(type_2,'#',type_3) type_code  FROM base_from_baiinfo_index GROUP BY CONCAT(type_2,type_3) ORDER BY CONCAT(type_2,type_3) ASC `
-//	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
-//
-//	return
-//}
-
 type BaiinfoFrequency struct {
 	Frequency string `description:"频度"`
 }
@@ -167,45 +160,8 @@ type ExportBaiinfoDataMaxCount struct {
 	Count    int
 }
 
-func GetExportBaiinfoDataMaxCount(typeCodes []string) (items []*ExportBaiinfoDataMaxCount, err error) {
-	if len(typeCodes) == 0 {
-		return
-	}
-	sql := ` SELECT
-				COALESCE(MAX(t.num), 0) AS count,
-				t.type_name
-			FROM
-				(
-					SELECT
-						COUNT(1) AS num,
-						CONCAT(a.type_2, "#", a.type_3) AS type_name
-					FROM
-						base_from_baiinfo_index AS a
-					INNER JOIN base_from_baiinfo_data AS b ON a.index_code = b.index_code
-					WHERE
-						CONCAT(a.type_2, "#", a.type_3) IN (` + utils.GetOrmInReplace(len(typeCodes)) + `)
-					GROUP BY
-						a.base_from_baiinfo_index_id
-				) AS t
-			GROUP BY
-				type_name `
-	err = global.DmSQL["data"].Raw(sql, typeCodes).Scan(&items).Error
-
-	return
-}
-
 type ExportBaiinfoIndexData struct {
 	Value     string `orm:"column(value)" description:"日期"`
 	DataTime  string `orm:"column(data_time)" description:"值"`
 	IndexCode string `orm:"column(index_code)" description:"指标编码"`
 }
-
-func GetExportBaiinfoIndexDataByCodes(indexCodes []string) (items []*ExportBaiinfoIndexData, err error) {
-	if len(indexCodes) == 0 {
-		return
-	}
-	sql := ` SELECT index_code,data_time,value FROM base_from_baiinfo_data WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodes)) + `) ORDER BY data_time DESC  `
-	err = global.DmSQL["data"].Raw(sql, indexCodes).Scan(&items).Error
-
-	return
-}

models/data_manage/base_from_bloomberg_index.go

@@ -253,40 +253,3 @@ type BloombergSourceBatchAddCheckReq struct {
 	BloombergSourceListReq
 	IndexCodes []string `form:"IndexCodes" description:"全选为false时, 该数组为选中; 全选为true时, 该数组为不选的指标"`
 }
-
-// --------------------------------------------- 以下为测试用 ---------------------------------------------
-
-// BaseFromBloombergData 彭博原始指标表
-//type BaseFromBloombergData struct {
-//	BaseFromBloombergDataId  int       `orm:"column(base_from_bloomberg_data_id);pk" gorm:"primaryKey" `
-//	BaseFromBloombergIndexId int       `description:"指标ID"`
-//	IndexCode                string    `description:"指标编码"`
-//	DataTime                 time.Time `description:"数据日期"`
-//	Value                    float64   `description:"数据值"`
-//	CreateTime               time.Time `description:"创建时间"`
-//	ModifyTime               time.Time `description:"修改时间"`
-//	DataTimestamp            int       `description:"数据日期时间戳"`
-//}
-//
-//func (m *BaseFromBloombergData) TableName() string {
-//	return "base_from_bloomberg_data"
-//}
-//
-//func (m *BaseFromBloombergData) Create() (err error) {
-//	o := global.DmSQL["data"]
-//	id, err := o.Insert(m)
-//	if err != nil {
-//		return
-//	}
-//	m.BaseFromBloombergDataId = int(id)
-//	return
-//}
-//
-//func (m *BaseFromBloombergData) CreateMulti(items []*BaseFromBloombergData) (err error) {
-//	if len(items) == 0 {
-//		return
-//	}
-//	o := global.DmSQL["data"]
-//	_, err = o.InsertMulti(len(items), items)
-//	return
-//}

models/data_manage/base_from_sci_classify.go

@@ -95,18 +95,15 @@ func UpdateBaseFromSciClassifySort(classifyId int) (err error) {
 }
 
 type BaseFromSciClassifyItems struct {
-	ClassifyId           int    `description:"分类ID"`
-	BaseFromSciIndexId   int    `description:"指标类型ID"`
-	BaseFromSciIndexCode string `description:"指标唯一编码"`
-	ClassifyName         string `description:"分类名称"`
-	ClassifyNameEn       string `description:"英文分类名称"`
-	ParentId             int    `description:"父级id"`
-	Level                int    `description:"层级"`
-	Sort                 int    `description:"排序字段，越小越靠前，默认值：10"`
-	//UniqueCode         string                         `description:"唯一编码"`
-	//ModifyTime         time.Time                      `description:"修改时间"`
-	//CreateTime         time.Time                      `description:"创建时间"`
-	Children []*BaseFromSciClassifyItems `gorm:"-" description:"下级"`
+	ClassifyId           int                         `description:"分类ID"`
+	BaseFromSciIndexId   int                         `description:"指标类型ID"`
+	BaseFromSciIndexCode string                      `description:"指标唯一编码"`
+	ClassifyName         string                      `description:"分类名称"`
+	ClassifyNameEn       string                      `description:"英文分类名称"`
+	ParentId             int                         `description:"父级id"`
+	Level                int                         `description:"层级"`
+	Sort                 int                         `description:"排序字段，越小越靠前，默认值：10"`
+	Children             []*BaseFromSciClassifyItems `gorm:"-" description:"下级"`
 }
 
 type BaseFromSciClassifyNameItems struct {

models/data_manage/base_from_sci_hq_index.go

@@ -237,14 +237,6 @@ func GetSciHqIndexMaxSortByClassifyId(classifyId int) (sort int, err error) {
 	return
 }
 
-func GetSciHqFrequency(classifyId int) (items []*string, err error) {
-	sql := `SELECT DISTINCT frequency FROM base_from_sci_hq_index WHERE classify_id=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	o := global.DmSQL["data"]
-	err = o.Raw(sql, classifyId).Scan(&items).Error
-
-	return
-}
-
 func GetSciHqFrequencyByCondition(condition string, pars []interface{}) (items []*string, err error) {
 	sql := `SELECT DISTINCT frequency FROM base_from_sci_hq_index WHERE 1=1 `
 	if condition != "" {
@@ -257,14 +249,6 @@ func GetSciHqFrequencyByCondition(condition string, pars []interface{}) (items [
 	return
 }
 
-func GetSciHqFrequencyByCode(code string) (items []*string, err error) {
-	sql := `SELECT DISTINCT frequency FROM base_from_sci_hq_index WHERE index_code=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	o := global.DmSQL["data"]
-	err = o.Raw(sql, code).Scan(&items).Error
-
-	return
-}
-
 // GetSciHqClassifyMaxSortByClassifyIds 通过分类id获取对应分类的最大sort
 func GetSciHqClassifyMaxSortByClassifyIds(classifyIds []int) (items []*BaseFromSciHqClassifyMaxSort, err error) {
 	if len(classifyIds) == 0 {

models/data_manage/base_from_trade_index.go

@@ -274,15 +274,6 @@ type BaseFromCoalmineCoastalIndex struct {
 	ModifyTime                     string `description:"修改时间"`
 }
 
-// 查询指标
-func GetBaseFromCoalmineCoastalIndex(startDate, endDate string) (items []*BaseFromCoalmineCoastalIndex, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT * FROM base_from_coalmine_coastal_index WHERE data_time between ? and ? `
-	err = o.Raw(sql, startDate, endDate).Scan(&items).Error
-
-	return
-}
-
 // BaseFromCoalmineInlandIndex 内陆动力煤用户供耗存数据指标表
 type BaseFromCoalmineInlandIndex struct {
 	BaseFromCoalmineInlandIndexID int    `orm:"column(base_from_coalmine_inland_index_id);pk" gorm:"primaryKey" `
@@ -298,15 +289,6 @@ type BaseFromCoalmineInlandIndex struct {
 	ModifyTime                    string `description:"修改时间"`
 }
 
-// 查询指标
-func GetBaseFromCoalmineInlandIndex(startDate, endDate string) (items []*BaseFromCoalmineInlandIndex, err error) {
-	o := global.DmSQL["data"]
-	sql := `SELECT * FROM base_from_coalmine_inland_index WHERE data_time between ? and ? `
-	err = o.Raw(sql, startDate, endDate).Scan(&items).Error
-
-	return
-}
-
 type BaseFromCoalmineClassifyItem struct {
 	ClassifyId   int
 	ClassifyName string

models/data_manage/chart_classify.go

@@ -100,44 +100,6 @@ type DeleteChartClassifyReq struct {
 	ChartInfoId     int `description:"指标id"`
 }
 
-func GetChartInfoCountByClassifyId(classifyId int) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT COUNT(1) AS count FROM chart_info AS a
-				WHERE a.chart_classify_id IN(
-				SELECT t.chart_classify_id FROM 
-				(
-				SELECT rd.*
-				FROM (SELECT * FROM chart_classify WHERE parent_id IS NOT NULL) rd,
-					 (SELECT @pid := ?) pd 
-				WHERE FIND_IN_SET(parent_id, @pid) > 0 
-				  AND @pid := CONCAT(@pid, ',', chart_classify_id) 
-				UNION SELECT * FROM chart_classify WHERE chart_classify_id = @pid
-				)AS t
-				) `
-	err = o.Raw(sql, classifyId).Scan(&count).Error
-
-	return
-}
-
-func DeleteChartClassify(classifyId int) (err error) {
-	o := global.DmSQL["data"]
-	sql := ` DELETE FROM chart_classify
-				WHERE chart_classify_id IN(
-				SELECT t.chart_classify_id FROM
-				(
-				SELECT rd.*
-				FROM (SELECT * FROM chart_classify WHERE parent_id IS NOT NULL) rd,
-				(SELECT @pid := ?) pd
-				WHERE FIND_IN_SET(parent_id, @pid) > 0
-				AND @pid := CONCAT(@pid, ',', chart_classify_id)
-				UNION SELECT * FROM chart_classify WHERE chart_classify_id = @pid
-				)AS t
-				) `
-	err = o.Exec(sql, classifyId).Error
-
-	return
-}
-
 // GetChartClassifyByParentId
 // @param source int 1：ETA图库；2：商品价格曲线；3：相关性图表
 func GetChartClassifyByParentId(parentId, source int) (items []*ChartClassifyItems, err error) {
@@ -208,22 +170,6 @@ type ChartClassifyDeleteCheckReq struct {
 	ChartInfoId     int `description:"指标id"`
 }
 
-func GetChartClassifyCountByClassifyId(chartClassifyId int) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT COUNT(1) AS count FROM (
-			SELECT rd.*
-			FROM (SELECT * FROM chart_classify WHERE parent_id IS NOT NULL) rd,
-				 (SELECT @pid := ?) pd 
-			WHERE FIND_IN_SET(parent_id, @pid) > 0 
-			  AND @pid := CONCAT(@pid, ',', chart_classify_id) 
-			UNION SELECT * FROM chart_classify WHERE chart_classify_id = @pid
-			)AS t
-			WHERE t.chart_classify_id<>? `
-	err = o.Raw(sql, chartClassifyId, chartClassifyId).Scan(&count).Error
-
-	return
-}
-
 func GetChartClassifyByCondition(condition string, pars []interface{}) (item *ChartClassify, err error) {
 	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM chart_classify WHERE 1=1 `
@@ -441,4 +387,4 @@ func DeleteChartClassifyByIds(ids []int) (err error) {
 	sql := `DELETE FROM chart_classify WHERE chart_classify_id IN (` + utils.GetOrmInReplace(len(ids)) + `)`
 	err = o.Exec(sql, ids).Error
 	return
-}
+}

models/data_manage/chart_edb_mapping.go

@@ -129,11 +129,6 @@ func GetChartEdbMappingListByEdbInfoIdList(edbIdList []int) (list []*ChartEdbInf
 	}
 	edbIdStr := strings.Join(edbIdArr, ",")
 	o := global.DmSQL["data"]
-	//sql := ` SELECT edb_info_id,source_name,source,sub_source,edb_code,edb_name,edb_name_en,frequency,unit,unit_en,start_date,end_date,modify_time,latest_date,latest_value,unique_code,edb_info_type AS edb_info_category_type,max_value,min_value,edb_type,classify_id,is_join_permission
-	//         FROM edb_info
-	//		 WHERE edb_info_id IN(` + utils.GetOrmInReplace(num) + `)
-	//		ORDER BY FIELD(edb_info_id,` + utils.GetOrmInReplace(num) + `) `
-
 	sql := ` SELECT edb_info_id,source_name,source,sub_source,edb_code,edb_name,edb_name_en,frequency,unit,unit_en,start_date,end_date,modify_time,latest_date,latest_value,unique_code,edb_info_type AS edb_info_category_type,max_value,min_value,edb_type,classify_id,is_join_permission
 	        FROM edb_info
 			 WHERE edb_info_id IN(` + edbIdStr + `)
@@ -420,15 +415,8 @@ func ModifyChartEdbMapping(chartInfoId int, edbInfoList []*EdbInfo) (err error)
 			UniqueCode:  utils.MD5(utils.CHART_PREFIX + "_" + fmt.Sprint(chartInfoId) + "_" + fmt.Sprint(v.EdbInfoId) + "_" + timestamp),
 			MaxData:     v.MaxValue,
 			MinData:     v.MinValue,
-			//IsOrder:     v.IsOrder,
-			//IsAxis:      v.IsAxis,
 			EdbInfoType: v.EdbInfoType,
-			//LeadValue:   v.LeadValue,
-			//LeadUnit:    v.LeadUnit,
-			//ChartStyle:  v.ChartStyle,
-			//ChartColor:  v.ChartColor,
-			//ChartWidth:  v.ChartWidth,
-			Source: v.Source,
+			Source:      v.Source,
 		})
 	}
 

models/data_manage/chart_info.go

@@ -167,21 +167,6 @@ func GetChartInfoViewById(chartInfoId int) (item *ChartInfoView, err error) {
 	return
 }
 
-func GetChartInfoViewByIds(chartInfoIds []string) (list []*ChartInfoView, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM chart_info WHERE chart_info_id in ("` + strings.Join(chartInfoIds, `","`) + `") `
-	err = o.Raw(sql).Scan(&list).Error
-	if err != nil {
-		return
-	}
-	// 日期格式转换
-	for _, item := range list {
-		item.ConvertToResp()
-	}
-
-	return
-}
-
 type SaveChartInfoReq struct {
 	ChartEdbInfoList []*ChartSaveItem `description:"指标及配置信息"`
 	ChartInfoId      int              `description:"图表id,新增时传0"`
@@ -367,19 +352,6 @@ type EditChartInfoEdbBaseItem struct {
 	Unit      string `description:"单位（根据语言版本区分）"`
 }
 
-func ModifyChartInfo(item *EditChartInfoReq) (err error) {
-	o := global.DmSQL["data"]
-	sql := ` UPDATE  chart_info
-			SET
-			  chart_name =?,
-			  chart_classify_id = ?,
-              is_set_name=1,
-			  modify_time = NOW()
-			WHERE chart_info_id = ?`
-	err = o.Exec(sql, item.ChartName, item.ChartClassifyId, item.ChartInfoId).Error
-
-	return
-}
 func SetForumChartInfoId(chartInfoId, forumChartInfoId int) (err error) {
 	o := global.DmSQL["data"]
 	sql := ` UPDATE  chart_info
@@ -429,14 +401,6 @@ func GetChartInfoByNewest(source int) (item *ChartInfoList, err error) {
 	return
 }
 
-func ModifyChartInfoModifyTime(chartInfoId int64) (err error) {
-	o := global.DmSQL["data"]
-	sql := ` UPDATE  chart_info SET modify_time = NOW() WHERE chart_info_id = ? `
-	err = o.Exec(sql, chartInfoId).Error
-
-	return
-}
-
 type MoveChartInfoReq struct {
 	ChartInfoId     int `description:"图表ID"`
 	PrevChartInfoId int `description:"上一个图表ID"`
@@ -726,62 +690,6 @@ func getEdbDataListMinAndMaxByMongo(source, subSource, edbInfoId int, startDate,
 	return
 }
 
-// type ChartEdbInfoMapping struct {
-// 	EdbInfoId           int     `description:"指标id"`
-// 	SourceName          string  `description:"来源名称"`
-// 	Source              int     `description:"来源id"`
-// 	SubSource           int     `description:"来源id"`
-// 	EdbCode             string  `description:"指标编码"`
-// 	EdbName             string  `description:"指标名称"`
-// 	EdbAliasName        string  `description:"指标名称（别名）"`
-// 	EdbNameEn           string  `description:"英文指标名称"`
-// 	EdbAliasNameEn      string  `description:"英文指标名称（别名）"`
-// 	EdbType             int     `description:"指标类型:1:基础指标,2:计算指标"`
-// 	Frequency           string  `description:"频率"`
-// 	FrequencyEn         string  `description:"英文频率"`
-// 	Unit                string  `description:"单位"`
-// 	UnitEn              string  `description:"英文单位"`
-// 	StartDate           string  `description:"起始日期"`
-// 	EndDate             string  `description:"终止日期"`
-// 	ModifyTime          string  `description:"指标最后更新时间"`
-// 	ChartEdbMappingId   int     `description:"图表指标id"`
-// 	ChartInfoId         int     `description:"图表id"`
-// 	MaxData             float64 `description:"上限"`
-// 	MinData             float64 `description:"下限"`
-// 	IsOrder             bool    `description:"true:正序,false:逆序"`
-// 	IsAxis              int     `description:"1:左轴,0:右轴"`
-// 	EdbInfoType         int     `description:"1:标准指标,0:领先指标"`
-// 	EdbInfoCategoryType int     `description:"0:普通指标,1:预测指标"`
-// 	LeadValue           int     `description:"领先值"`
-// 	LeadUnit            string  `description:"领先单位"`
-// 	LeadUnitEn          string  `description:"领先英文单位"`
-// 	ChartStyle          string  `description:"图表类型"`
-// 	ChartColor          string  `description:"颜色"`
-// 	PredictChartColor   string  `description:"预测数据的颜色"`
-// 	ChartWidth          float64 `description:"线条大小"`
-// 	ChartType           int     `description:"生成样式:1:曲线图,2:季节性图,3:面积图，4：柱状图，5：散点图，6：组合图，7：柱方图，8：商品价格曲线图，9：相关性图"`
-// 	LatestDate          string  `description:"数据最新日期"`
-// 	LatestValue         float64 `description:"数据最新值"`
-// 	MoveLatestDate      string  `description:"移动后的数据最新日期"`
-// 	UniqueCode          string  `description:"指标唯一编码"`
-// 	MinValue            float64 `json:"-" description:"最小值"`
-// 	MaxValue            float64 `json:"-" description:"最大值"`
-// 	DataList            interface{}
-// 	IsNullData          bool    `json:"-" description:"是否空数据"`
-// 	MappingSource       int     `description:"1：ETA图库；2：商品价格曲线"`
-// 	RegionType          string  `description:"交易所来源，海外还是国内" json:"-"`
-// 	ClassifyId          int     `description:"分类id"`
-// 	SubSourceName       string  `description:"子数据来源名称"`
-// 	IndicatorCode       string  `description:"指标代码"`
-// 	IsConvert           int     `description:"是否数据转换 0不转 1转"`
-// 	ConvertType         int     `description:"数据转换类型 1乘 2除 3对数"`
-// 	ConvertValue        float64 `description:"数据转换值"`
-// 	ConvertUnit         string  `description:"数据转换单位"`
-// 	ConvertEnUnit       string  `description:"数据转换单位"`
-// 	IsJoinPermission    int     `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
-// 	HaveOperaAuth       bool    `description:"是否有数据权限，默认：false"`
-// }
-
 type ChartEdbInfoMapping struct {
 	EdbInfoId           int         `description:"指标id" gorm:"column:edb_info_id"`
 	SourceName          string      `description:"来源名称" gorm:"column:source_name"`

models/data_manage/chart_info_correlation.go

@@ -219,25 +219,6 @@ func CreateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 				err = fmt.Errorf("insert series chart mappings err: %v", e)
 				return
 			}
-
-			//chartMappingOb := new(FactorEdbSeriesChartMapping)
-			//sql := fmt.Sprintf(`UPDATE %s SET %s = ?, %s = ?, %s = ?, %s = ? WHERE %s = ?`, chartMappingOb.TableName(), chartMappingOb.Cols().ChartInfoId, chartMappingOb.Cols().Source, chartMappingOb.Cols().EdbUsed, chartMappingOb.Cols().ModifyTime, chartMappingOb.Cols().PrimaryId)
-			//p, e := o.Raw(sql).Prepare()
-			//if e != nil {
-			//	err = fmt.Errorf("sql prepare err: %v", e)
-			//	return
-			//}
-			//defer func() {
-			//	_ = p.Close()
-			//}()
-			//for _, v := range chartMappings {
-			//	v.ChartInfoId = chartInfoId
-			//	_, e = p.Exec(v.ChartInfoId, v.Source, v.EdbUsed, v.ModifyTime, v.FactorEdbSeriesChartMappingId)
-			//	if e != nil {
-			//		err = fmt.Errorf("update exec err: %v", e)
-			//		return
-			//	}
-			//}
 		}
 		return
 	}
@@ -356,23 +337,6 @@ func UpdateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 			err = fmt.Errorf("insert series chart mappings err: %v", e)
 			return
 		}
-
-		//sql = fmt.Sprintf(`UPDATE %s SET %s = ?, %s = ?, %s = ?, %s = ? WHERE %s = ?`, chartMappingOb.TableName(), chartMappingOb.Cols().ChartInfoId, chartMappingOb.Cols().Source, chartMappingOb.Cols().EdbUsed, chartMappingOb.Cols().ModifyTime, chartMappingOb.Cols().PrimaryId)
-		//p, e := o.Raw(sql).Prepare()
-		//if e != nil {
-		//	err = fmt.Errorf("sql prepare err: %v", e)
-		//	return
-		//}
-		//defer func() {
-		//	_ = p.Close()
-		//}()
-		//for _, v := range chartMappings {
-		//	_, e = p.Exec(v.ChartInfoId, v.Source, v.EdbUsed, v.ModifyTime, v.FactorEdbSeriesChartMappingId)
-		//	if e != nil {
-		//		err = fmt.Errorf("update exec err: %v", e)
-		//		return
-		//	}
-		//}
 	}
 	return
 }

models/data_manage/chart_info_range_analysis.go

@@ -242,18 +242,8 @@ func EditRangeChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr, lang stri
 		if tmpChartEdbMapping != nil {
 			chartEdbMappingIdList = append(chartEdbMappingIdList, strconv.Itoa(tmpChartEdbMapping.ChartEdbMappingId))
 			tmpChartEdbMapping.ModifyTime = time.Now()
-			//tmpChartEdbMapping.MaxData = v.MaxData
-			//tmpChartEdbMapping.MinData = v.MinData
-			//tmpChartEdbMapping.IsOrder = v.IsOrder
 			tmpChartEdbMapping.EdbAliasName = v.EdbAliasName
 			tmpChartEdbMapping.IsAxis = v.IsAxis
-			//tmpChartEdbMapping.EdbInfoType = v.EdbInfoType
-			//tmpChartEdbMapping.LeadValue = v.LeadValue
-			//tmpChartEdbMapping.LeadUnit = v.LeadUnit
-			//tmpChartEdbMapping.ChartStyle = v.ChartStyle
-			//tmpChartEdbMapping.ChartColor = v.ChartColor
-			//tmpChartEdbMapping.PredictChartColor = v.PredictChartColor
-			//tmpChartEdbMapping.ChartWidth = v.ChartWidth
 			err = to.Select("ModifyTime", "IsAxis", "EdbAliasName").Updates(tmpChartEdbMapping).Error
 			if err != nil {
 				fmt.Println("chart_edb_mapping Err:" + err.Error())
@@ -269,16 +259,7 @@ func EditRangeChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr, lang stri
 			mapItem.ModifyTime = time.Now()
 			timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 			mapItem.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + timestamp + "_" + strconv.Itoa(v.EdbInfoId))
-			//mapItem.MaxData = v.MaxData
-			//mapItem.MinData = v.MinData
-			//mapItem.IsOrder = true
 			mapItem.EdbInfoType = 1
-			//mapItem.LeadValue = v.LeadValue
-			//mapItem.LeadUnit = v.LeadUnit
-			//mapItem.ChartStyle = v.ChartStyle
-			//mapItem.ChartColor = v.ChartColor
-			//mapItem.PredictChartColor = v.PredictChartColor
-			//mapItem.ChartWidth = v.ChartWidth
 			mapItem.Source = utils.CHART_SOURCE_RANGE_ANALYSIS
 			err = to.Create(mapItem).Error
 			if err != nil {

models/data_manage/com_trade_index.go

@@ -2,7 +2,6 @@ package data_manage
 
 import (
 	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
 	"time"
 )
 
@@ -28,19 +27,6 @@ func GetComTradeIndexList(condition string, pars []interface{}) (list []*ComTrad
 	return
 }
 
-// GetComTradeIndexByIdList 获取指标数据列表
-func GetComTradeIndexByIdList(idList []int) (list []*ComTradeIndex, err error) {
-	num := len(idList)
-	if num <= 0 {
-		return
-	}
-	o := global.DmSQL["data"]
-	sql := `SELECT * FROM com_trade_index WHERE com_trade_id in (` + utils.GetOrmInReplace(num) + `) `
-	err = o.Raw(sql, idList).Find(&list).Error
-
-	return
-}
-
 // GetAllComTradeIndexList 获取指标数据列表
 func GetAllComTradeIndexList() (list []*ComTradeIndex, err error) {
 	o := global.DmSQL["data"]

models/data_manage/edb_classify.go

@@ -4,7 +4,6 @@ import (
 	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"strconv"
 	"time"
 )
 
@@ -112,22 +111,6 @@ func EditEdbClassify(classifyId int, classifyName string, userId int, userRealNa
 	return
 }
 
-// EditEdbClassifyEn
-// @Description: 修改指标分类的英文名称
-// @author: Roc
-// @datetime 2024-04-17 14:14:36
-// @param classifyId int
-// @param classifyNameEn string
-// @param userId int
-// @param userRealName string
-// @return err error
-func EditEdbClassifyEn(classifyId int, classifyNameEn string, userId int, userRealName string) (err error) {
-	sql := `UPDATE edb_classify SET classify_name_en = ?,modify_time=NOW(), last_modify_user_id = ?, last_modify_user_real_name = ? WHERE classify_id=? `
-	err = global.DmSQL["data"].Exec(sql, classifyNameEn, userId, userRealName, classifyId).Error
-
-	return
-}
-
 type DeleteEdbClassifyReq struct {
 	ClassifyId int `description:"分类id"`
 	EdbInfoId  int `description:"指标id"`
@@ -135,19 +118,6 @@ type DeleteEdbClassifyReq struct {
 
 // TODO: sql优化，后续解决
 func GetEdbInfoCountByClassifyId(classifyId int) (count int, err error) {
-	//sql := ` SELECT COUNT(1) AS count FROM edb_info AS a
-	//			WHERE a.classify_id IN(
-	//			SELECT t.classify_id FROM
-	//			(
-	//			SELECT rd.*
-	//			FROM (SELECT * FROM edb_classify WHERE parent_id IS NOT NULL) rd,
-	//				 (SELECT @pid := ?) pd
-	//			WHERE FIND_IN_SET(parent_id, @pid) > 0
-	//			  AND @pid := CONCAT(@pid, ',', classify_id)
-	//			UNION SELECT * FROM edb_classify WHERE classify_id = @pid
-	//			)AS t
-	//			) `
-
 	sql := `WITH RECURSIVE classify_cte(classify_id, parent_id) AS (
     SELECT classify_id, parent_id  
     FROM edb_classify  
@@ -168,19 +138,6 @@ WHERE a.classify_id IN (SELECT classify_id FROM classify_cte);`
 }
 
 func DeleteEdbClassify(classifyId int) (err error) {
-	//sql := ` DELETE FROM edb_classify
-	//			WHERE classify_id IN(
-	//			SELECT t.classify_id FROM
-	//			(
-	//			SELECT rd.*
-	//			FROM (SELECT * FROM edb_classify WHERE parent_id IS NOT NULL) rd,
-	//			(SELECT @pid := ?) pd
-	//			WHERE FIND_IN_SET(parent_id, @pid) > 0
-	//			AND @pid := CONCAT(@pid, ',', classify_id)
-	//			UNION SELECT * FROM edb_classify WHERE classify_id = @pid
-	//			)AS t
-	//			) `
-
 	sql := `WITH RECURSIVE ClassifyHierarchy ( classify_id, parent_id ) AS 
      (
       SELECT classify_id, 
@@ -226,23 +183,6 @@ func GetEdbClassifyByRootIdLevel(rootId int, classifyType uint8, orderStr string
 	return
 }
 
-func GetEdbClassifyByRootIdLevelOrder(rootId int, classifyType uint8) (items []*EdbClassifyItems, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM edb_classify WHERE root_id=? AND classify_type = ? order by level desc, sort asc, classify_id asc`
-	err = o.Raw(sql, rootId, classifyType).Scan(&items).Error
-
-	return
-}
-
-// GetEdbClassifyAll 获取普通指标的分类列表
-func GetEdbClassifyAll() (items []*EdbClassifyItems, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM edb_classify WHERE parent_id<>0  AND classify_type = 0  order by sort asc,classify_id asc`
-	err = o.Raw(sql).Scan(&items).Error
-
-	return
-}
-
 // GetAllEdbClassify 获取所有的普通指标的分类列表（包含第一级）
 func GetAllEdbClassify() (items []*EdbClassifyItems, err error) {
 	o := global.DmSQL["data"]
@@ -252,15 +192,6 @@ func GetAllEdbClassify() (items []*EdbClassifyItems, err error) {
 	return
 }
 
-// GetNormalEdbClassifyAll 获取普通指标的分类列表
-func GetNormalEdbClassifyAll() (items []*EdbClassifyItems, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT * FROM edb_classify WHERE  classify_type = 0  order by sort asc,classify_id asc`
-	err = o.Raw(sql).Scan(&items).Error
-
-	return
-}
-
 // GetPredictEdbClassifyAll 获取预测指标的分类列表
 func GetPredictEdbClassifyAll() (items []*EdbClassifyItems, err error) {
 	o := global.DmSQL["data"]
@@ -367,16 +298,6 @@ type ClassifyDeleteCheckReq struct {
 
 func GetClassifyCountByClassifyId(classifyId int) (count int, err error) {
 	o := global.DmSQL["data"]
-	//sql := ` SELECT COUNT(1) AS count FROM (
-	//		SELECT rd.*
-	//		FROM (SELECT * FROM edb_classify WHERE parent_id IS NOT NULL) rd,
-	//			 (SELECT @pid := ?) pd
-	//		WHERE FIND_IN_SET(parent_id, @pid) > 0
-	//		  AND @pid := CONCAT(@pid, ',', classify_id)
-	//		UNION SELECT * FROM edb_classify WHERE classify_id = @pid
-	//		)AS t
-	//		WHERE t.classify_id<>? `
-
 	sql := `WITH RECURSIVE classify_cte(classify_id, parent_id) AS (  
   SELECT classify_id, parent_id  
   FROM edb_classify  
@@ -525,119 +446,6 @@ func FIXEdbClassifyId(newId, oldId int) (err error) {
 	return
 }
 
-func FixEdbClassify() {
-	//新增三级分类
-	list, err := GetEdbClassifyByLevel(2, 0)
-	if err != nil {
-		return
-	}
-
-	for _, v := range list {
-		timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
-		classifyInfo := &EdbClassify{
-			//ClassifyId:      0,
-			ClassifyType:    0,
-			ClassifyName:    v.ClassifyName,
-			ParentId:        v.ClassifyId,
-			HasData:         0,
-			CreateTime:      time.Now(),
-			ModifyTime:      time.Now(),
-			SysUserRealName: "admin",
-			Level:           3,
-			UniqueCode:      utils.MD5(utils.DATA_PREFIX + "_" + timestamp),
-			Sort:            v.Sort,
-		}
-		if utils.RunMode == "debug" {
-			classifyInfo.SysUserId = 11
-		} else {
-			classifyInfo.SysUserId = 163
-		}
-		id, err := AddEdbClassify(classifyInfo)
-		if err != nil {
-			return
-		}
-
-		err = FIXEdbClassifyId(int(id), v.ClassifyId)
-		if err != nil {
-			return
-		}
-	}
-}
-
-func FixPredictEdbClassify() {
-	//新增三级分类
-	list, err := GetEdbClassifyByLevel(2, 1)
-	if err != nil {
-		return
-	}
-
-	for _, v := range list {
-		timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
-		classifyInfo := &EdbClassify{
-			//ClassifyId:      0,
-			ClassifyType:    1,
-			ClassifyName:    v.ClassifyName,
-			ParentId:        v.ClassifyId,
-			HasData:         0,
-			CreateTime:      time.Now(),
-			ModifyTime:      time.Now(),
-			SysUserRealName: "admin",
-			Level:           3,
-			UniqueCode:      utils.MD5(utils.DATA_PREFIX + "_" + timestamp),
-			Sort:            v.Sort,
-		}
-		if utils.RunMode == "debug" {
-			classifyInfo.SysUserId = 11
-		} else {
-			classifyInfo.SysUserId = 163
-		}
-		id, err := AddEdbClassify(classifyInfo)
-		if err != nil {
-			return
-		}
-
-		err = FIXEdbClassifyId(int(id), v.ClassifyId)
-		if err != nil {
-			return
-		}
-	}
-}
-
-func GetEdbClassify(classifyId int) (classifyIds string, err error) {
-	sql := `SELECT GROUP_CONCAT(t.classify_id) AS classify_ids FROM (
-			SELECT a.classify_id FROM edb_classify AS a 
-			WHERE a.classify_id=?
-			UNION ALL
-			SELECT a.classify_id FROM edb_classify AS a 
-			WHERE a.parent_id=? UNION ALL
-	SELECT
-		classify_id 
-	FROM
-		edb_classify 
-WHERE
-	parent_id IN ( SELECT classify_id FROM edb_classify WHERE parent_id = ? )
-			)AS t`
-	err = global.DmSQL["data"].Raw(sql, classifyId, classifyId, classifyId).Scan(&classifyIds).Error
-
-	return
-}
-
-func FixEdbClassifySysUser() {
-	list, err := GetEdbClassifyByLevel(2, 0)
-	if err != nil {
-		return
-	}
-
-	for _, v := range list {
-		err := EditEdbClassifySysUser(v.ClassifyId, v.SysUserId, v.SysUserRealName)
-		if err != nil {
-			return
-		}
-		fmt.Println("ClassifyId:", v.ClassifyId)
-	}
-	fmt.Println("FixEdbClassifySysUser end")
-}
-
 func EditEdbClassifySysUser(classifyId, sysUserId int, chartClassifyName string) (err error) {
 	sql := `UPDATE edb_classify SET sys_user_id=?,sys_user_real_name=?,modify_time=NOW() WHERE parent_id=?  AND level=3 `
 	err = global.DmSQL["data"].Exec(sql, sysUserId, chartClassifyName, classifyId).Error
@@ -645,22 +453,6 @@ func EditEdbClassifySysUser(classifyId, sysUserId int, chartClassifyName string)
 	return
 }
 
-func FixPredictEdbClassifySysUser() {
-	list, err := GetEdbClassifyByLevel(2, 1)
-	if err != nil {
-		return
-	}
-
-	for _, v := range list {
-		err := EditEdbClassifySysUser(v.ClassifyId, v.SysUserId, v.SysUserRealName)
-		if err != nil {
-			return
-		}
-		fmt.Println("ClassifyId:", v.ClassifyId)
-	}
-	fmt.Println("EditChartClassifySysUser end")
-}
-
 func UpdateEdbClassifyChildByParentClassifyId(classifyIds []int, rootId int, levelStep int) (err error) {
 	var pars []interface{}
 	pars = append(pars, rootId, levelStep)

models/data_manage/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.DmSQL["data"].Exec(sql, newValue, configCode).Error
-
-	return
-}
-
 // GetConfigDetailByCode 根据配置编码获取配置的值
 func GetConfigDetailByCode(configCode string) (item *EdbConfig, err error) {
 	sql := ` SELECT config_value FROM edb_config WHERE config_code=? `

models/data_manage/edb_data_base.go

@@ -127,31 +127,6 @@ func GetEdbDataTableName(source, subSource int) (tableName string) {
 	return
 }
 
-//计算指标->关联的基础指标表
-//func GetEdbInfoCalculateTableName(source int) (tableName string) {
-//	switch source {
-//	case utils.DATA_SOURCE_CALCULATE:
-//		tableName = "edb_info_calculate"
-//	case utils.DATA_SOURCE_CALCULATE_LJZZY:
-//		tableName = "edb_info_calculate_ljzzy"
-//	case utils.DATA_SOURCE_CALCULATE_TBZ:
-//		tableName = "edb_info_calculate_tbz"
-//	case utils.DATA_SOURCE_CALCULATE_TCZ:
-//		tableName = "edb_info_calculate_tcz"
-//	case utils.DATA_SOURCE_CALCULATE_NSZYDPJJS:
-//		tableName = "edb_info_calculate_nszydpjjs"
-//	case utils.DATA_SOURCE_CALCULATE_HBZ:
-//		tableName = "edb_info_calculate_hbz"
-//	case utils.DATA_SOURCE_CALCULATE_HCZ:
-//		tableName = "edb_info_calculate_hcz"
-//	case utils.DATA_SOURCE_CALCULATE_BP:
-//		tableName = "edb_info_calculate_bp"
-//	default:
-//		tableName = ""
-//	}
-//	return
-//}
-
 type EdbDataBase struct {
 	EdbDataId     int `orm:"column(edb_data_id);pk" gorm:"primaryKey" `
 	EdbInfoId     int
@@ -313,20 +288,6 @@ func GetEdbDataTableNameAndSubSource(source, subSource int) (tableName string) {
 	return
 }
 
-func GetEdbDataAllByEdbCodes(edbCodes []string, limit int) (items []*EdbInfoSearchData, err error) {
-	var pars []interface{}
-	pars = append(pars, edbCodes)
-
-	sql := ` SELECT * FROM edb_data_ys WHERE edb_code IN (` + utils.GetOrmInReplace(len(edbCodes)) + `) ORDER BY data_time DESC`
-	if limit > 0 {
-		sql += `  LIMIT ?  `
-		pars = append(pars, limit)
-	}
-	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
-
-	return
-}
-
 func GetAddSql(edbInfoId, edbCode, dataTime, timestampStr string, value string) (addSql string) {
 	nowStr := time.Now().Format(utils.FormatDateTime)
 	addSql += "("

models/data_manage/edb_data_insert_config.go

@@ -276,10 +276,6 @@ func updateInsertConfigValueByMongo(to *gorm.DB, edbInfo *EdbInfo, oldConfigDate
 		}
 
 		edbDateData, err = mogDataObj.GetItem(queryConditions)
-		//if tmpErr != nil && tmpErr == mongo.ErrNoDocuments {
-		//	err = tmpErr
-		//	return
-		//}
 		if err != nil && err != mongo.ErrNoDocuments {
 			return
 		}
@@ -375,10 +371,6 @@ func updateThsHfInsertConfigValueByMongo(to *gorm.DB, edbInfo *EdbInfo, oldConfi
 		}
 
 		edbDateData, err = mogDataObj.GetItem(queryConditions)
-		//if tmpErr != nil && tmpErr == mongo.ErrNoDocuments {
-		//	err = tmpErr
-		//	return
-		//}
 		if err != nil && err != mongo.ErrNoDocuments {
 			return
 		}

models/data_manage/edb_data_quarter.go

@@ -4,7 +4,6 @@ import (
 	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"sort"
 	"strconv"
 	"strings"
@@ -63,8 +62,6 @@ func AddCalculateQuarter(edbInfoId, source int, edbCode string) (err error) {
 	sort.Sort(sort.Reverse(sort.IntSlice(yearArr)))
 	addSql := ` INSERT INTO edb_data_quarter(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
 	var isAdd bool
-	//yearLen := len(yearArr)
-
 	fmt.Println(yearArr)
 
 	for _, yv := range yearArr {
@@ -78,7 +75,6 @@ func AddCalculateQuarter(edbInfoId, source int, edbCode string) (err error) {
 		}
 		cjDate := currentHolidayObj.HolidayDate
 		fmt.Println("year:", yv, "cjDate:", cjDate)
-		//utils.FileLog.Info("cjDate:", cjDate)
 		existMap := make(map[string]string)
 
 		for i := 1; i <= 70; i++ {
@@ -110,81 +106,6 @@ func AddCalculateQuarter(edbInfoId, source int, edbCode string) (err error) {
 			}
 			cjDate = cjDate.AddDate(0, 0, +1)
 		}
-
-		//nextIndex := yk + 1
-		//if nextIndex < yearLen {
-		//	nextYear := yearArr[nextIndex]
-		//	fmt.Println("year:", currentYear, nextYear)
-		//	nextHolidayObj := new(Holiday)
-		//	hsql := `SELECT * FROM holiday WHERE year=? `
-		//	err = to.Raw(hsql, nextYear).QueryRow(&nextHolidayObj)
-		//	if err != nil {
-		//		return err
-		//	}
-		//	nextHolidayStr := nextHolidayObj.HolidayDate.Format(utils.FormatDate)
-		//	currentHolidayStr := currentHolidayObj.HolidayDate.Format(utils.FormatDate)
-		//
-		//	if findItem, ok := dataMap[nextHolidayStr]; ok {
-		//		timestamp := currentHolidayObj.HolidayDate.UnixNano() / 1e6
-		//		timestampStr := fmt.Sprintf("%d", timestamp)
-		//		addSql += GetAddSql(edbInfoIdStr, edbCode, currentHolidayStr, timestampStr, findItem.Value)
-		//		isAdd = true
-		//	}
-		//
-		//	nextMinDate := strconv.Itoa(nextYear) + "-01-01"
-		//	nextMaxDate := strconv.Itoa(nextYear) + "-12-31"
-		//	currentMinDate := strconv.Itoa(currentYear) + "-01-01"
-		//	currentMaxDate := strconv.Itoa(currentYear) + "-12-31"
-		//
-		//	i := 0
-		//	for {
-		//		i--
-		//		nextHolidayFormat := nextHolidayObj.HolidayDate.AddDate(0, 0, i)
-		//		currentHolidayFormat := currentHolidayObj.HolidayDate.AddDate(0, 0, i)
-		//
-		//		nextHolidayStr := nextHolidayFormat.Format(utils.FormatDate)
-		//		currentHolidayStr := currentHolidayFormat.Format(utils.FormatDate)
-		//
-		//		fmt.Println("currentHolidayStr:", currentHolidayStr, nextHolidayStr)
-		//		if findItem, ok := dataMap[nextHolidayStr]; ok {
-		//			timestamp := currentHolidayFormat.UnixNano() / 1e6
-		//			timestampStr := fmt.Sprintf("%d", timestamp)
-		//			addSql += GetAddSql(edbInfoIdStr, edbCode, currentHolidayStr, timestampStr, findItem.Value)
-		//			isAdd = true
-		//		}
-		//		//fmt.Println("nextHolidayStr:", nextHolidayStr,nextMinDate)
-		//		if nextHolidayStr == nextMinDate || currentHolidayStr == currentMinDate {
-		//			fmt.Println("min跳出循环:" + nextMinDate)
-		//			break
-		//		}
-		//	}
-		//
-		//	n := 0
-		//	for {
-		//		n++
-		//		nextHolidayFormat := nextHolidayObj.HolidayDate.AddDate(0, 0, n)
-		//		currentHolidayFormat := currentHolidayObj.HolidayDate.AddDate(0, 0, n)
-		//
-		//		nextHolidayStr := nextHolidayFormat.Format(utils.FormatDate)
-		//		currentHolidayStr := currentHolidayFormat.Format(utils.FormatDate)
-		//
-		//		fmt.Println("currentHolidayStr:", currentHolidayStr, nextHolidayStr)
-		//
-		//		if findItem, ok := dataMap[nextHolidayStr]; ok {
-		//			timestamp := currentHolidayFormat.UnixNano() / 1e6
-		//			timestampStr := fmt.Sprintf("%d", timestamp)
-		//
-		//			addSql += GetAddSql(edbInfoIdStr, edbCode, currentHolidayStr, timestampStr, findItem.Value)
-		//			isAdd = true
-		//		}
-		//
-		//		//fmt.Println("nextHolidayStr:", nextHolidayStr,nextMaxDate)
-		//		if nextHolidayStr == nextMaxDate || currentHolidayStr == currentMaxDate {
-		//			fmt.Println("max跳出循环：" + nextMaxDate)
-		//			break
-		//		}
-		//	}
-		//}
 	}
 	fmt.Println("isAdd", isAdd)
 	if isAdd {
@@ -431,14 +352,8 @@ func AddCalculateQuarterV6(dataList []*EdbDataList) (result *EdbDataResult, err
 		}
 	}
 	//排序
-	fmt.Println("yearArr:", yearArr)
 	thisYear := cureentDate.Year()
-	//thisMonth := int(cureentDate.Month())
-
-	fmt.Println("thisMonth:", thisMonth)
-	for ky, vy := range yearArr {
-		fmt.Printf("line 432:ky:%d, vy:%d, thisYear:%d, thisMonth:%d", ky, vy, thisYear, thisMonth)
-		fmt.Println("")
+	for _, vy := range yearArr {
 		if thisMonth < 11 {
 			currentYearCjnl := strconv.Itoa(thisYear) + "-01-01"               //当前年份春节农历
 			currentYearCjgl := solarlunar.LunarToSolar(currentYearCjnl, false) //当前年份春节公历
@@ -500,13 +415,9 @@ func AddCalculateQuarterV6(dataList []*EdbDataList) (result *EdbDataResult, err
 			}
 			day := nextYearCjglDate.Sub(preYearCjglDate).Hours() / float64(24)
 
-			fmt.Println("day:", day, nextYearCjglDate, preYearCjglDate)
-
 			items := new(EdbDataItems)
 			items.BetweenDay = int(day) //公历日期换算成农历，需要减除的天数
 			items.Year = preYear
-			fmt.Println("preYear:", preYear, "ky:", ky, "yearArrLen:", len(yearArr))
-			//if ky+1 < len(yearArr) {
 			for _, v := range dataList {
 				dateTime, err := time.Parse(utils.FormatDate, v.DataTime)
 				if err != nil {
@@ -524,198 +435,6 @@ func AddCalculateQuarterV6(dataList []*EdbDataList) (result *EdbDataResult, err
 				items.Items = append(items.Items, item)
 			}
 			result.List = append(result.List, items)
-			/*} else {
-				for _, v := range dataList {
-					dateTime, err := time.Parse(utils.FormatDate, v.DataTime)
-					if err != nil {
-						errMsg = "time.Parse Err:" + err.Error() + ";DataTime:" + v.DataTime
-						return result, err
-					}
-					timestamp := dateTime.UnixNano() / 1e6
-					item := new(EdbDataList)
-					item.DataTime = dateTime.Format(utils.FormatDate)
-					item.EdbInfoId = v.EdbInfoId
-					item.Value = v.Value
-					item.EdbDataId = v.EdbDataId
-					item.DataTimestamp = timestamp
-					items.Items = append(items.Items, item)
-				}
-				result.List = append(result.List, items)
-			}*/
-		}
-	}
-	return
-}
-
-// AddCalculateQuarterV4ByUniqueCode 指标季度数据计算(公历转农历)
-func AddCalculateQuarterV4ByUniqueCode(dataList []*EdbDataListByUniqueCode) (result *EdbDataResult, err error) {
-	var errMsg string
-	defer func() {
-		if errMsg != "" {
-			fmt.Println("errMsg:", errMsg)
-		}
-	}()
-
-	endDate := dataList[len(dataList)-1].DataTime
-	endDateForm, err := time.Parse(utils.FormatDate, endDate)
-	if err != nil {
-		return result, err
-	}
-	thisMonth := int(endDateForm.Month())
-
-	result = new(EdbDataResult)
-	var yearArr []int
-	yearMap := make(map[int]int)
-	var cureentDate time.Time
-	if thisMonth < 11 {
-		for k, v := range dataList {
-			dateTime, err := time.Parse(utils.FormatDate, v.DataTime)
-			if err != nil {
-				errMsg = "time.Parse Err:" + err.Error() + ";DataTime:" + v.DataTime
-				return result, err
-			}
-			if k == len(dataList)-1 {
-				cureentDate = dateTime
-			}
-			year := dateTime.Year()
-			if _, ok := yearMap[year]; !ok {
-				yearArr = append(yearArr, year)
-			}
-			yearMap[year] = year
-		}
-	} else {
-		for k, v := range dataList {
-			dateTime, err := time.Parse(utils.FormatDate, v.DataTime)
-			if err != nil {
-				errMsg = "time.Parse Err:" + err.Error() + ";DataTime:" + v.DataTime
-				return result, err
-			}
-			if k == len(dataList)-1 {
-				cureentDate = dateTime
-			}
-			year := dateTime.Year() + 1
-			if _, ok := yearMap[year]; !ok {
-				yearArr = append(yearArr, year)
-			}
-			yearMap[year] = year
-		}
-	}
-	//排序
-	fmt.Println("yearArr:", yearArr)
-	thisYear := cureentDate.Year()
-	//thisMonth := int(cureentDate.Month())
-
-	fmt.Println("thisMonth:", thisMonth)
-	for ky, vy := range yearArr {
-		fmt.Println("line 432:", ky, vy, thisYear, thisMonth)
-		if thisMonth < 11 {
-			currentYearCjnl := strconv.Itoa(thisYear) + "-01-01"               //当前年份春节农历
-			currentYearCjgl := solarlunar.LunarToSolar(currentYearCjnl, false) //当前年份春节公历
-			currentYearCjglDate, err := time.Parse(utils.FormatDate, currentYearCjgl)
-			if err != nil {
-				errMsg = "生成当前春节失败,Err:" + err.Error()
-				return result, err
-			}
-
-			preYear := vy
-			preYearCjnl := strconv.Itoa(preYear) + "-01-01"            //之前年份春节农历
-			preYearCjgl := solarlunar.LunarToSolar(preYearCjnl, false) //之前年份春节公历
-			preYearCjglDate, err := time.Parse(utils.FormatDate, preYearCjgl)
-			if err != nil {
-				errMsg = "生成历史年份春节失败,Err:" + err.Error()
-				return result, err
-			}
-			day := currentYearCjglDate.Sub(preYearCjglDate).Hours() / float64(24)
-
-			items := new(EdbDataItems)
-			items.Year = preYear
-			for _, v := range dataList {
-				dateTime, err := time.Parse(utils.FormatDate, v.DataTime)
-				if err != nil {
-					errMsg = "time.Parse Err:" + err.Error() + ";DataTime:" + v.DataTime
-					return result, err
-				}
-				newDate := dateTime.AddDate(0, 0, int(day))
-				selectDateStr := strconv.Itoa(thisYear) + "-11" + "-30"
-				selectDate, _ := time.Parse(utils.FormatDate, selectDateStr)
-				if newDate.Before(selectDate) || newDate == selectDate {
-					timestamp := newDate.UnixNano() / 1e6
-					item := new(EdbDataList)
-					item.DataTime = newDate.Format(utils.FormatDate)
-					item.EdbInfoId = v.EdbInfoId
-					item.Value = v.Value
-					item.EdbDataId = v.EdbDataId
-					item.DataTimestamp = timestamp
-					items.Items = append(items.Items, item)
-				}
-			}
-			result.List = append(result.List, items)
-		} else {
-			nextYear := thisYear + 1
-			nextYearCjnl := strconv.Itoa(nextYear) + "-01-01"            //当前年份春节农历
-			nextYearCjgl := solarlunar.LunarToSolar(nextYearCjnl, false) //当前年份春节公历
-
-			nextYearCjglDate, err := time.Parse(utils.FormatDate, nextYearCjgl)
-			if err != nil {
-				errMsg = "生成当前春节失败,Err:" + err.Error()
-				return result, err
-			}
-			preYear := vy
-			preYearCjnl := strconv.Itoa(preYear) + "-01-01"            //之前年份春节农历
-			preYearCjgl := solarlunar.LunarToSolar(preYearCjnl, false) //之前年份春节公历
-			preYearCjglDate, err := time.Parse(utils.FormatDate, preYearCjgl)
-			if err != nil {
-				errMsg = "生成历史年份春节失败,Err:" + err.Error()
-				return result, err
-			}
-			day := nextYearCjglDate.Sub(preYearCjglDate).Hours() / float64(24)
-
-			fmt.Println("day:", day, nextYearCjglDate, preYearCjglDate)
-
-			items := new(EdbDataItems)
-			items.Year = preYear - 1
-			fmt.Println("preYear:", preYear, "ky:", ky, "yearArrLen:", len(yearArr))
-			if ky+1 < len(yearArr) {
-				for _, v := range dataList {
-					dateTime, err := time.Parse(utils.FormatDate, v.DataTime)
-					if err != nil {
-						errMsg = "time.Parse Err:" + err.Error() + ";DataTime:" + v.DataTime
-						return result, err
-					}
-					newDate := dateTime.AddDate(0, 0, int(day))
-					selectDateStr := strconv.Itoa(nextYear) + "-05" + "-31"
-					selectDate, _ := time.Parse(utils.FormatDate, selectDateStr)
-
-					if newDate.Before(selectDate) || newDate == selectDate {
-						timestamp := newDate.UnixNano() / 1e6
-						item := new(EdbDataList)
-						item.DataTime = newDate.Format(utils.FormatDate)
-						item.EdbInfoId = v.EdbInfoId
-						item.Value = v.Value
-						item.EdbDataId = v.EdbDataId
-						item.DataTimestamp = timestamp
-						items.Items = append(items.Items, item)
-					}
-				}
-				result.List = append(result.List, items)
-			} else {
-				for _, v := range dataList {
-					dateTime, err := time.Parse(utils.FormatDate, v.DataTime)
-					if err != nil {
-						errMsg = "time.Parse Err:" + err.Error() + ";DataTime:" + v.DataTime
-						return result, err
-					}
-					timestamp := dateTime.UnixNano() / 1e6
-					item := new(EdbDataList)
-					item.DataTime = dateTime.Format(utils.FormatDate)
-					item.EdbInfoId = v.EdbInfoId
-					item.Value = v.Value
-					item.EdbDataId = v.EdbDataId
-					item.DataTimestamp = timestamp
-					items.Items = append(items.Items, item)
-				}
-				result.List = append(result.List, items)
-			}
 		}
 	}
 	return
@@ -737,13 +456,6 @@ type HzTestEdbdata struct {
 	DataTimestamp int64
 }
 
-func GetHzTestEdbdata() (list []*HzTestEdbdata, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM hz_test_edbdata WHERE TRADE_CODE=? ORDER BY DT DESC `
-	_, err = o.Raw(sql, "ST_0000577845").QueryRows(&list)
-	return
-}
-
 type EdbDataItems struct {
 	Items                []*EdbDataList
 	Year                 int
@@ -754,132 +466,3 @@ type EdbDataItems struct {
 type EdbDataResult struct {
 	List []*EdbDataItems
 }
-
-func AddCalculateQuarterV5(dataList []*EdbDataList) (result *EdbDataResult, err error) {
-	var errMsg string
-	defer func() {
-		if errMsg != "" {
-			fmt.Println("errMsg:", errMsg)
-		}
-	}()
-	result = new(EdbDataResult)
-	thisYear := time.Now().Year()
-
-	endDate := dataList[len(dataList)-1].DataTime
-	endDateForm, err := time.Parse(utils.FormatDate, endDate)
-	if err != nil {
-		return result, err
-	}
-	thisMonth := int(endDateForm.Month())
-
-	fmt.Println(thisMonth)
-	for i := 4; i > 0; i-- {
-		if thisMonth < 11 {
-			nextYear := thisYear
-			nextYearCjnl := strconv.Itoa(nextYear) + "-01-01"            //当前年份春节农历
-			nextYearCjgl := solarlunar.LunarToSolar(nextYearCjnl, false) //当前年份春节公历
-			nextYearCjglDate, err := time.Parse(utils.FormatDate, nextYearCjgl)
-			if err != nil {
-				errMsg = "生成当前春节失败,Err:" + err.Error()
-				return result, err
-			}
-			preYearCjnl := strconv.Itoa(nextYear-i) + "-01-01"         //之前年份春节农历
-			preYearCjgl := solarlunar.LunarToSolar(preYearCjnl, false) //之前年份春节公历
-			preYearCjglDate, err := time.Parse(utils.FormatDate, preYearCjgl)
-			if err != nil {
-				errMsg = "生成历史年份春节失败,Err:" + err.Error()
-				return result, err
-			}
-			day := nextYearCjglDate.Sub(preYearCjglDate).Hours() / float64(24)
-			items := new(EdbDataItems)
-			for _, v := range dataList {
-				dataDate := v.DataTime
-				dataDateForm, err := time.Parse(utils.FormatDate, dataDate)
-				if err != nil {
-					return result, err
-				}
-				newDate := dataDateForm.AddDate(0, 0, int(day))
-				selectDateStr := strconv.Itoa(nextYear) + "-11" + "-30"
-				selectDate, _ := time.Parse(utils.FormatDate, selectDateStr)
-				if newDate.Before(selectDate) {
-					timestamp := newDate.UnixNano() / 1e6
-					item := new(EdbDataList)
-					item.DataTime = newDate.Format(utils.FormatDate)
-					item.EdbInfoId = v.EdbInfoId
-					item.Value = v.Value
-					item.EdbDataId = v.EdbDataId
-					item.DataTimestamp = timestamp
-					items.Items = append(items.Items, item)
-				}
-			}
-			fmt.Println(nextYear, "年春节阳历", nextYearCjgl)
-			fmt.Println(i, "年前春节", preYearCjnl)
-			fmt.Println(i, "年前春节阳历", preYearCjgl)
-			fmt.Println("与", nextYear, "年春节相差天数", day, "____________")
-			result.List = append(result.List, items)
-		} else {
-			nextYear := thisYear + 1
-			nextYearCjnl := strconv.Itoa(nextYear) + "-01-01"            //当前年份春节农历
-			nextYearCjgl := solarlunar.LunarToSolar(nextYearCjnl, false) //当前年份春节公历
-			nextYearCjglDate, err := time.Parse(utils.FormatDate, nextYearCjgl)
-			if err != nil {
-				errMsg = "生成当前春节失败,Err:" + err.Error()
-				return result, err
-			}
-			preYearCjnl := strconv.Itoa(nextYear-i) + "-01-01"         //之前年份春节农历
-			preYearCjgl := solarlunar.LunarToSolar(preYearCjnl, false) //之前年份春节公历
-			preYearCjglDate, err := time.Parse(utils.FormatDate, preYearCjgl)
-			if err != nil {
-				errMsg = "生成历史年份春节失败,Err:" + err.Error()
-				return result, err
-			}
-			day := nextYearCjglDate.Sub(preYearCjglDate).Hours() / float64(24)
-			items := new(EdbDataItems)
-			for _, v := range dataList {
-				dataDate := v.DataTime
-				dataDateForm, err := time.Parse(utils.FormatDate, dataDate)
-				if err != nil {
-					return result, err
-				}
-
-				newDate := dataDateForm.AddDate(0, 0, int(day))
-				selectDateStr := strconv.Itoa(nextYear) + "-05" + "-31"
-				selectDate, _ := time.Parse(utils.FormatDate, selectDateStr)
-				if newDate.Before(selectDate) {
-					timestamp := newDate.UnixNano() / 1e6
-					item := new(EdbDataList)
-					item.DataTime = newDate.Format(utils.FormatDate)
-					item.EdbInfoId = v.EdbInfoId
-					item.Value = v.Value
-					item.EdbDataId = v.EdbDataId
-					item.DataTimestamp = timestamp
-					items.Items = append(items.Items, item)
-				}
-			}
-			fmt.Println(nextYear, "年春节阳历", nextYearCjgl)
-			fmt.Println(i, "年前春节", preYearCjnl)
-			fmt.Println(i, "年前春节阳历", preYearCjgl)
-			fmt.Println("与", nextYear, "年春节相差天数", day, "____________")
-			result.List = append(result.List, items)
-		}
-	}
-	//合并第五组数据
-	items := new(EdbDataItems)
-	for _, v := range dataList {
-		dataDate := v.DataTime
-		dataDateForm, err := time.Parse(utils.FormatDate, dataDate)
-		if err != nil {
-			return result, err
-		}
-		timestamp := dataDateForm.UnixNano() / 1e6
-		item := new(EdbDataList)
-		item.DataTime = v.DataTime
-		item.EdbInfoId = v.EdbInfoId
-		item.Value = v.Value
-		item.EdbDataId = v.EdbDataId
-		item.DataTimestamp = timestamp
-		items.Items = append(items.Items, item)
-	}
-	result.List = append(result.List, items)
-	return
-}

models/data_manage/edb_data_ys.go

@@ -9,16 +9,11 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"encoding/json"
-	"errors"
 	"eta_gn/eta_api/global"
-	"eta_gn/eta_api/utils"
 	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
-	"strconv"
-	"strings"
-	"time"
 )
 
 type BaseFromSmmDataSimple struct {
@@ -44,241 +39,6 @@ func GetEdbDataYsMaxAndMinDate(edbCode string) (minDate, maxDate string, err err
 	return
 }
 
-func SyncSmmIndexDataBase(edbCode, startDate, endDate string) (err error) {
-	utils.FileLog.Info("start:" + time.Now().Format(utils.FormatDateTime))
-
-	var smmCode string
-	if strings.Contains(edbCode, "#") {
-		smmCode = strings.Split(edbCode, "#")[0]
-	} else {
-		smmCode = edbCode
-	}
-	token, err := getToken("pqian@hzinsights.com", "hz123456")
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	baseSmmItem, err := GetBaseFromSmmBySmmCode(smmCode)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	if baseSmmItem == nil {
-		err = errors.New("GetBaseFromSmmBySmmCode Err:" + err.Error())
-		return
-	}
-
-	smmIndexAll, err := GetBaseFromSmmIndexBySmmCode(smmCode)
-	if err != nil {
-		fmt.Println("GetBaseFromSmmIndex Err:" + err.Error())
-		return
-	}
-	existIndexMap := make(map[string]*BaseFromSmmIndex)
-	for _, item := range smmIndexAll {
-		existIndexMap[item.IndexCode] = item
-	}
-
-	ysItem, err := getApiData(token, edbCode, startDate, endDate)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	if ysItem != nil && ysItem.Code == 200 {
-
-		frequency := ysItem.Data.Frequency
-
-		indexMap := make(map[string]int)
-		smmIndexIdMap := make(map[int]int)
-		indexCodeMap := make(map[int]string)
-
-		indexKey := 0
-		var isDateIndex int
-		for fk, fv := range ysItem.Data.Field {
-			if fv.IsDate == "1" {
-				isDateIndex = fk
-			} else {
-				if !strings.Contains(fv.Name, "产品名称") &&
-					!strings.Contains(fv.Name, "单位") &&
-					!strings.Contains(fv.Name, "时间") &&
-					!strings.Contains(fv.Name, "备注") {
-
-					indexMap[fv.DBColName] = fk
-
-					indexKey += 1
-					indexCode := smmCode + "#" + strconv.Itoa(indexKey)
-
-					if findItem, ok := existIndexMap[indexCode]; !ok {
-						ssmIndex := new(BaseFromSmmIndex)
-						ssmIndex.Interface = smmCode
-						ssmIndex.Name = baseSmmItem.Name
-						ssmIndex.IndexCode = indexCode
-						ssmIndex.IndexName = baseSmmItem.Name + "_" + fv.Name
-						ssmIndex.Type1 = baseSmmItem.Type1
-						ssmIndex.Type2 = baseSmmItem.Type2
-						ssmIndex.Type3 = baseSmmItem.Type3
-						ssmIndex.Frequency = frequency
-						ssmIndex.Unit = fv.Unit
-						ssmIndex.ApiStartTime = baseSmmItem.ApiStartTime
-						ssmIndex.ApiUpdateTime = baseSmmItem.ApiUpdateTime
-						ssmIndex.StartTime = baseSmmItem.StartTime
-						ssmIndex.FinishTime = baseSmmItem.FinishTime
-						ssmIndex.CreateTime = time.Now()
-						ssmIndex.ModifyTime = time.Now()
-						lastIndexId, err := AddBaseFromSmmIndex(ssmIndex)
-						if err != nil {
-							err = errors.New("AddBaseFromSmmIndex Err:" + err.Error())
-							return err
-						}
-						smmIndexIdMap[fk] = int(lastIndexId)
-						indexCodeMap[fk] = indexCode
-					} else {
-						smmIndexIdMap[fk] = findItem.BaseFromSmmIndexId
-						indexCodeMap[fk] = findItem.IndexCode
-					}
-				}
-			}
-		}
-
-		existDataMap := make(map[string]*BaseFromSmmData)
-		for _, mv := range indexCodeMap {
-			indexCode := mv
-			dataAllList, err := GetBaseFromSmmDataAllByIndexCode(indexCode)
-			if err != nil {
-				err = errors.New("GetBaseFromSmmData Err:" + err.Error())
-				return err
-			}
-			for _, item := range dataAllList {
-				key := item.IndexCode + item.DataTime
-				existDataMap[key] = item
-			}
-		}
-
-		addExistDataMap := make(map[string]string)
-
-		for _, dv := range ysItem.Data.Content {
-			var dataTime string
-			dataTime = dv[isDateIndex]
-			if strings.Contains(dataTime, "Q1") {
-				dataTime = strings.Replace(dataTime, "Q1", "-01", -1)
-				dataTime += "-31"
-			}
-			if strings.Contains(dataTime, "Q2") {
-				dataTime = strings.Replace(dataTime, "Q2", "-06", -1)
-				dataTime += "-30"
-			}
-			if strings.Contains(dataTime, "Q3") {
-				dataTime = strings.Replace(dataTime, "Q3", "-09", -1)
-				dataTime += "-30"
-			}
-			if strings.Contains(dataTime, "Q4") {
-				dataTime = strings.Replace(dataTime, "Q4", "-12", -1)
-				dataTime += "-31"
-			}
-
-			if strings.Contains(dataTime, "H1") {
-				dataTime = strings.Replace(dataTime, "H1", "-06", -1)
-				dataTime += "-30"
-			}
-
-			if strings.Contains(dataTime, "H2") {
-				dataTime = strings.Replace(dataTime, "H2", "-12", -1)
-				dataTime += "-31"
-			}
-
-			if frequency == "月" {
-				monthDate, err := time.Parse("2006-01", dataTime)
-				if err != nil {
-					fmt.Println("time.Parse:" + err.Error())
-				}
-				lastTime := monthDate.AddDate(0, 1, -1)
-				lastYear, lastMonth, lastDay := lastTime.Date()
-				var lastDate string
-				if int(lastMonth) < 10 {
-					lastDate = strconv.Itoa(lastYear) + "-" + "0" + strconv.Itoa(int(lastMonth)) + "-" + strconv.Itoa(lastDay)
-				} else {
-					lastDate = strconv.Itoa(lastYear) + "-" + strconv.Itoa(int(lastMonth)) + "-" + strconv.Itoa(lastDay)
-				}
-				dataTime = lastDate
-			} else if frequency == "年" {
-				dataTime = dataTime + "-12-31"
-			}
-			saveDataTime, err := time.Parse(utils.FormatDate, dataTime)
-			if err != nil {
-				err = errors.New("time.Parse Err:" + err.Error())
-				return err
-			}
-			timestamp := saveDataTime.UnixNano() / 1e6
-			//循环指标
-			for _, v := range indexMap {
-
-				indexCode := indexCodeMap[v]
-				smmIndexId := smmIndexIdMap[v]
-				dataVal := dv[v]
-
-				if indexCode != "" {
-
-					key := indexCode + dataTime
-					val := strings.Replace(dataVal, ",", "", -1)
-					if findData, dataOk := existDataMap[key]; !dataOk {
-						if _, addOK := addExistDataMap[key]; !addOK {
-							if val != "" && val != "-" {
-								dataItem := new(BaseFromSmmData)
-								dataItem.BaseFromSmmIndexId = smmIndexId
-								dataItem.IndexCode = indexCode
-								dataItem.DataTime = dataTime
-								dataItem.Value = val
-								dataItem.CreateTime = time.Now()
-								dataItem.ModifyTime = time.Now()
-								dataItem.DataTimestamp = timestamp
-								_, err = AddBaseFromSmmData(dataItem)
-								if err != nil && !strings.Contains(err.Error(), "idx_index_code_date") {
-									fmt.Println("AddBaseFromSmmData Err:" + err.Error())
-									err = errors.New("AddBaseFromSmmData Err:" + err.Error())
-									return err
-								}
-							}
-						}
-					} else {
-						if findData != nil && findData.Value != val { //修改
-							if _, addOK := addExistDataMap[key]; !addOK {
-								if val != "" && val != "-" {
-									err = ModifyBaseFromSmmData(findData.SmmDataId, val)
-									if err != nil {
-										err = errors.New("ModifyBaseFromSmmData Err:" + err.Error())
-										return err
-									}
-								}
-							}
-						}
-					}
-					addExistDataMap[key] = key
-				}
-			}
-		}
-
-		//修改数据开始，结束日期
-		{
-			indexList, err := GetBaseFromSmmIndexBySmmCode(smmCode)
-			if err != nil {
-				fmt.Println("GetBaseFromSmmIndexBySmmCode Err:" + err.Error())
-			}
-			for _, sv := range indexList {
-				minDate, maxDate, err := GetBaseFromSmmMaxOrMinDate(sv.IndexCode)
-				if err != nil {
-					fmt.Println("GetEdbDataSmmMaxOrMinDate Err:" + err.Error())
-				} else {
-					err = ModifyBaseFromSmmMinDateAndMaxDate(sv.BaseFromSmmIndexId, minDate, maxDate)
-					if err != nil {
-						fmt.Println("ModifyBaseFromSmmMinDateAndMaxDate Err:" + err.Error())
-					}
-				}
-			}
-		}
-	}
-	return
-}
-
 const (
 	dataUrl = "https://dataapi.smm.cn/GetData/" //data url (中文)
 	//dataUrl = "https://dataapi.smm.cn/GetDataEn/" //data url (english edition)
@@ -378,36 +138,3 @@ type YsResult struct {
 	} `json:"Data"`
 	Msg string `json:"Msg"`
 }
-
-/*
- * request data
- * sdatetime,edatetime ==>format:yyyy-mm-dd,
- * apiName ==> data.metal.com(for english)/data.smm.cn (for chinese)
- */
-func getApiData(token string, apiName string, sdatetime string, edatetime string) (item *YsResult, err error) {
-	reqUrl := dataUrl + apiName
-	resp, err := http.PostForm(reqUrl, url.Values{"token": {token}, "sdatetime": {sdatetime}, "edatetime": {edatetime}})
-	if err != nil {
-		return nil, err
-	}
-
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println("response error")
-		return nil, err
-	}
-	utils.FileLog.Info("ys result:" + string(body))
-	dataJsonContent := new(YsResult)
-	if err = json.Unmarshal([]byte(body), &dataJsonContent); err != nil {
-		fmt.Println(err, "data unmarshal failure")
-		return nil, err
-	}
-
-	if dataJsonContent.Code == 200 && len(dataJsonContent.Data.Content) > 0 {
-		return dataJsonContent, nil
-	} else {
-		err = errors.New("code:" + strconv.Itoa(int(dataJsonContent.Code)) + "msg:" + dataJsonContent.Msg)
-	}
-	return nil, nil
-}

models/data_manage/edb_info.go

@@ -116,22 +116,6 @@ func GetEdbInfoAll(edbInfoType uint8) (items []*EdbClassifyItems, err error) {
 	return
 }
 
-// GetPredictEdbInfoAll 用于分类展示（预测指标）
-func GetPredictEdbInfoAll(edbInfoType uint8) (items []*EdbClassifyItems, err error) {
-	sql := ` SELECT edb_info_id,classify_id,edb_name AS classify_name,edb_name_en AS classify_name_en,unique_code,source_name,source,sys_user_id,sys_user_real_name,start_date,edb_code,edb_type FROM edb_info WHERE edb_info_type = ? order by sort asc,edb_info_id asc`
-	err = global.DmSQL["data"].Raw(sql, edbInfoType).Scan(&items).Error
-
-	return
-}
-
-// 用于分类展示
-func GetEdbInfoAllList() (items []*EdbInfo, err error) {
-	sql := ` SELECT * FROM edb_info `
-	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
-
-	return
-}
-
 // 指标检索数据
 type EdbInfoSearch struct {
 	EdbCode   string `description:"指标编码"`
@@ -195,16 +179,6 @@ func (e *EdbInfo) AfterFind(db *gorm.DB) error {
 		return nil
 	}
 	e.LatestDate = tmpTime.Format(utils.FormatDate)
-	//tmpTime, err = time.Parse(utils.FormatDateWallWithLoc, e.StartDate)
-	//if err != nil {
-	//	return nil
-	//}
-	//e.StartDate = tmpTime.Format(utils.FormatDate)
-	//tmpTime, err = time.Parse(utils.FormatDateWallWithLoc, e.EndDate)
-	//if err != nil {
-	//	return nil
-	//}
-	//e.EndDate = tmpTime.Format(utils.FormatDate)
 	return nil
 }
 
@@ -242,14 +216,6 @@ func GetEdbInfoByIdList(edbInfoIdList []int) (items []*EdbInfo, err error) {
 	return
 }
 
-// type MysteelChemicalDataListReq struct {
-// 	Frequency    string `form:"Frequency" description:"频度"`
-// 	Source       int    `form:"Source" description:"来源id"`
-// 	Keywords     string `form:"Keywords" description:"指标ID/指标名称"`
-// 	SortField    int    `form:"SortField" description:"排序字段: 0-默认; 1-开始时间; 2-最新时间; 3-更新时间"`
-// 	SortRule     int    `form:"SortRule" description:"排序方式: 0-默认; 1-正序; 2-倒序"`
-// }
-
 // MysteelChemicalDataBatchAddCheckReq 钢联化工指标批量添加校验
 type MysteelChemicalDataBatchAddCheckReq struct {
 	// MysteelChemicalDataListReq
@@ -303,15 +269,6 @@ func DeleteEdbInfoAndData(edbInfoId, source, subSource int) (err error) {
 		return
 	}
 
-	//calculateTableName := GetEdbInfoCalculateTableName(source)
-	//if calculateTableName != "" {
-	//	sql = ` DELETE FROM %s WHERE edb_info_id=? `
-	//	sql = fmt.Sprintf(sql, calculateTableName)
-	//	_, err = to.Raw(sql, edbInfoId).Exec()
-	//	return
-	//}
-	//return
-
 	// 删除计算指标的关系
 	sql = ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id=? `
 	err = to.Exec(sql, edbInfoId).Error
@@ -818,14 +775,7 @@ type AddEdbInfoResp struct {
 
 // GetEdbInfoCalculateListByCondition 获取指标关系列表
 func GetEdbInfoCalculateListByCondition(condition string, pars []interface{}) (items []*EdbInfoCalculateMapping, err error) {
-	//calculateTableName := GetEdbInfoCalculateTableName(source)
-	//if calculateTableName == "" {
-	//	err = errors.New("无效的表名")
-	//	return
-	//}
-
 	sql := ` SELECT * FROM edb_info_calculate_mapping WHERE 1=1 `
-	//sql = fmt.Sprintf(sql, calculateTableName)
 	if condition != "" {
 		sql += condition
 	}
@@ -924,23 +874,6 @@ type EdbInfoReplaceReq struct {
 	NewEdbInfoId int `description:"替换为指标ID"`
 }
 
-// EdbInfoReplaceV2 替换指标v2版本（更换时间：2022年01月05日15:33:42）
-//func EdbInfoReplaceV2(oldEdbInfo, newEdbInfo *EdbInfo, sysAdminId int, sysAdminRealName string) (mappingList,replaceChartTotal, replaceCalculateTotal int, err error) {
-//	defer func() {
-//		if err != nil {
-//			fmt.Println("ERR:", err.Error())
-//		}
-//	}()
-//
-//	// 替换关联表中的source_edb_info_id
-//	mappingList, replaceChartTotal, replaceCalculateTotal, err := replaceChartEdb(oldEdbInfo, newEdbInfo)
-//	if err != nil {
-//		return
-//	}
-//	err = replaceRelationEdbInfo(mappingList, oldEdbInfo, newEdbInfo, sysAdminId, sysAdminRealName)
-//	return
-//}
-
 // ReplaceChartEdb 替换图表中的指标
 func ReplaceChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (relationEdbInfoIdList []int, replaceChartTotal, replaceCalculateTotal int, err error) {
 	var errmsg string
@@ -1226,8 +1159,6 @@ func ReplaceChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (relationEdbInfoIdList []i
 		//获取所有包含的计算指标
 		mappingList := make([]*EdbInfoCalculateMapping, 0)
 		queryList := make([]*EdbInfoCalculateMapping, 0)
-		//fields := []string{"edb_info_calculate_mapping_id", "edb_info_id", "source", "source_name", "edb_code", "from_edb_info_id", "from_edb_code", "from_edb_name", "from_source", "from_source_name", "move_value", "sort", "create_time", "modify_time", "from_tag", "from_sub_source"}
-		//msql := fmt.Sprintf(` SELECT %s FROM edb_info_calculate_mapping WHERE from_edb_info_id=?  GROUP BY %s `, strings.Join(fields, ","), strings.Join(fields, ","))
 		msql := ` SELECT * FROM edb_info_calculate_mapping WHERE from_edb_info_id = ?`
 		err = to.Raw(msql, oldEdbInfo.EdbInfoId).Find(&queryList).Error
 		if err != nil {
@@ -1270,8 +1201,6 @@ func ReplaceChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (relationEdbInfoIdList []i
 		//获取所有包含的计算指标
 		predictEdbConfList := make([]*PredictEdbConf, 0)
 		queryList := make([]*PredictEdbConf, 0)
-		//fields := []string{"config_id", "predict_edb_info_id", "source_edb_info_id", "rule_type", "fixed_value", "value", "empty_type", "max_empty_type", "end_date", "modify_time", "create_time"}
-		//msql := fmt.Sprintf(` SELECT %s FROM predict_edb_conf WHERE source_edb_info_id=? GROUP BY %s `, strings.Join(fields, ","), strings.Join(fields, ","))
 		msql := ` SELECT * FROM predict_edb_conf WHERE source_edb_info_id = ?`
 		err = to.Raw(msql, oldEdbInfo.EdbInfoId).Scan(&predictEdbConfList).Error
 		if err != nil {

models/data_manage/edb_info_calculate.go

@@ -76,13 +76,6 @@ type EdbInfoCalculateDetail struct {
 }
 
 func GetEdbInfoCalculateDetail(edbInfoId, source int) (list []*EdbInfoCalculateDetail, err error) {
-	//calculateTableName := GetEdbInfoCalculateTableName(source)
-	//sql := ` SELECT a.*,b.start_date,b.end_date,b.edb_type FROM %s AS a
-	//		INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
-	//		WHERE a.edb_info_id=? ORDER BY sort ASC `
-	//
-	//sql = fmt.Sprintf(sql, calculateTableName)
-
 	sql := ` SELECT a.edb_info_calculate_mapping_id,a.edb_info_id,a.source,a.source_name,a.edb_code,a.from_edb_info_id,a.from_edb_code,a.from_source,a.from_source_name,a.sort,a.create_time,a.modify_time,a.from_tag,a.move_value,b.edb_name as from_edb_name,b.edb_name_en as from_edb_name_en,b.start_date,b.end_date,b.latest_date,b.latest_value,b.edb_type, b.frequency, b.unit, b.classify_id 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 `
@@ -233,14 +226,6 @@ type EdbInfoCalculateBatchEditReqByEdbLib struct {
 }
 
 func GetEdbInfoCalculateMap(edbInfoId, source int) (list []*EdbInfo, err error) {
-	//calculateTableName := GetEdbInfoCalculateTableName(source)
-
-	//sql := ` SELECT b.* FROM %s AS a
-	//		INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
-	//		WHERE a.edb_info_id=? ORDER BY sort ASC `
-
-	//sql = fmt.Sprintf(sql, calculateTableName)
-
 	sql := ` SELECT b.* 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 `

models/data_manage/edb_info_updates.go

@@ -72,24 +72,6 @@ type UpdatesStatisticalResp struct {
 	FubaoNotUpdate              int `description:"富宝未更新"`
 }
 
-/*
-DATA_SOURCE_THS                 = iota + 1 //同花顺
-	DATA_SOURCE_WIND                           //wind
-	DATA_SOURCE_PB                             //彭博
-	DATA_SOURCE_CALCULATE                      //指标运算
-	DATA_SOURCE_CALCULATE_LJZZY                //累计值转月
-	DATA_SOURCE_CALCULATE_TBZ                  //同比值
-	DATA_SOURCE_CALCULATE_TCZ                  //同差值
-	DATA_SOURCE_CALCULATE_NSZYDPJJS            //N数值移动平均计算
-	DATA_SOURCE_MANUAL                         //手工指标
-	DATA_SOURCE_LZ                             //隆众
-	DATA_SOURCE_YS                             //有色
-	DATA_SOURCE_CALCULATE_HBZ                  //环比值->12
-	DATA_SOURCE_CALCULATE_HCZ                  //环差值->13
-	DATA_SOURCE_CALCULATE_BP                   //变频->14
-	DATA_SOURCE_GL                             //钢联->15
-*/
-
 func GetUpdatesList(condition string, pars []interface{}, startSize, pageSize int) (list []*EdbInfoView, err error) {
 	sql := ` SELECT * FROM edb_info
 			WHERE 1=1 `

models/data_manage/excel/excel_sheet_data.go

@@ -19,37 +19,16 @@ type ExcelSheetData struct {
 
 // Update 更新 excel表格的sheet基础信息
 func (ExcelSheetData *ExcelSheetData) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(ExcelSheetData, cols...)
-
 	err = global.DmSQL["data"].Select(cols).Updates(ExcelSheetData).Error
 	return
 }
 
-// AddExcelSheetData 新增excel表格的sheet基础信息
-func AddExcelSheetData(excelInfo *ExcelSheetData) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//// 表格信息入库
-	//lastId, err := o.Insert(excelInfo)
-	//if err != nil {
-	//	return
-	//}
-	//excelInfo.ExcelInfoId = int(lastId)
-	err = global.DmSQL["data"].Create(excelInfo).Error
-	return
-}
-
 // GetSheetDataListBySheetIdListAndPage 根据sheet_id列表和页码获取所有的sheet数据详情
 func GetSheetDataListBySheetIdListAndPage(excelSheetIdList []int, page int) (items []*ExcelSheetData, err error) {
 	num := len(excelSheetIdList)
 	if num <= 0 {
 		return
 	}
-	//	o := orm.NewOrmUsingDB("data")
-	//	sql := ` SELECT *
-	//FROM excel_sheet_data WHERE 1=1 AND excel_sheet_id in (` + utils.GetOrmInReplace(num) + `) AND sort = ? `
-	//	_, err = o.Raw(sql, excelSheetIdList, page).QueryRows(&items)
-
 	sql := ` SELECT *
 	FROM excel_sheet_data WHERE 1=1 AND excel_sheet_id in (` + utils.GetOrmInReplace(num) + `) AND sort = ? `
 	err = global.DmSQL["data"].Raw(sql, excelSheetIdList, page).Find(&items).Error
@@ -59,11 +38,6 @@ func GetSheetDataListBySheetIdListAndPage(excelSheetIdList []int, page int) (ite
 
 // GetAllSheetDataListByExcelInfoId 根据表格id获取所有的sheet的所有数据详情
 func GetAllSheetDataListByExcelInfoId(excelInfoId int) (items []*ExcelSheetData, err error) {
-	//	o := orm.NewOrmUsingDB("data")
-	//	sql := ` SELECT *
-	//FROM excel_sheet_data WHERE 1=1 AND excel_info_id = ? ORDER BY sort ASC `
-	//	_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
-
 	sql := ` SELECT *
 	FROM 	excel_sheet_data WHERE 1=1 AND excel_info_id = ? ORDER BY sort ASC `
 	err = global.DmSQL["data"].Raw(sql, excelInfoId).Find(&items).Error

models/data_manage/excel/excel_worker.go

@@ -21,18 +21,6 @@ func (e *ExcelWorker) TableName() string {
 
 // 新增 协作人
 func (e *ExcelWorker) AddWorker(excelInfoId int, addWorkers []*ExcelWorker, notDeleteWorkers []string) (err error) {
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//	} else {
-	//		_ = o.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -50,12 +38,6 @@ func (e *ExcelWorker) AddWorker(excelInfoId int, addWorkers []*ExcelWorker, notD
 			return
 		}
 	} else if len(notDeleteWorkers) == 0 { // 清空协作人
-		//sql := `delete from excel_worker where excel_info_id = ? `
-		//_, err = o.Raw(sql, excelInfoId).Exec()
-		//if err != nil {
-		//	return
-		//}
-
 		sql := `delete from excel_worker where excel_info_id = ? `
 		err = to.Exec(sql, excelInfoId).Error
 		if err != nil {
@@ -72,17 +54,12 @@ func (e *ExcelWorker) AddWorker(excelInfoId int, addWorkers []*ExcelWorker, notD
 
 // 修改
 func (e *ExcelWorker) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(e, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(e).Error
 	return
 }
 
 // 删除
 func (e *ExcelWorker) Delete() (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Delete(e)
-
 	sql := ` DELETE FROM excel_worker WHERE excel_worker_id=? `
 	err = global.DmSQL["data"].Exec(sql, e.ExcelWorkerId).Error
 	return
@@ -90,10 +67,6 @@ func (e *ExcelWorker) Delete() (err error) {
 
 // 查询
 func (e *ExcelWorker) GetByExcelInfoId(excelInfoId int) (items []*ExcelWorker, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `select * from excel_worker where excel_info_id = ? `
-	//_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
-
 	sql := `select * from excel_worker where excel_info_id = ? `
 	err = global.DmSQL["data"].Raw(sql, excelInfoId).Find(&items).Error
 	return
@@ -101,10 +74,6 @@ func (e *ExcelWorker) GetByExcelInfoId(excelInfoId int) (items []*ExcelWorker, e
 
 // 查询
 func (e *ExcelWorker) GetBySysUserId(sysUserId int) (items []*ExcelWorker, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `select * from excel_worker where sys_user_id = ? `
-	//_, err = o.Raw(sql, sysUserId).QueryRows(&items)
-
 	sql := `select * from excel_worker where sys_user_id = ? `
 	err = global.DmSQL["data"].Raw(sql, sysUserId).Find(&items).Error
 	return

models/data_manage/excel_style.go

@@ -171,12 +171,6 @@ type ExcelEdbdataMapping struct {
 	CreateTime time.Time
 }
 
-func AddExcelEdbdataMapping(item *ExcelEdbdataMapping) (err error) {
-	err = global.DmSQL["edb"].Create(item).Error
-
-	return
-}
-
 func GetExcelEdbdataMappingByTradeCode(classifyId int, frequency string) (excelId *int, err error) {
 	sql := `SELECT excel_id FROM excel_edbdata_mapping WHERE classify_id = ? AND frequency=?`
 	err = global.DmSQL["edb"].Raw(sql, classifyId, frequency).Scan(&excelId).Error
@@ -191,20 +185,6 @@ func GetExcelStyleById(excelId int) (item *ExcelStyle, err error) {
 	return
 }
 
-func GetExcelEdbdataMappingCount(classifyId int, tradeCode, frequency string) (count int, err error) {
-	sql := `SELECT COUNT(1) AS count FROM excel_edbdata_mapping WHERE classify_id=? AND trade_code=? AND frequency=? `
-	err = global.DmSQL["edb"].Raw(sql, classifyId, tradeCode, frequency).Scan(&count).Error
-
-	return
-}
-
-//func ModifyExcelEdbdataMapping(classifyId int, tradeCode, frequency string) (err error) {
-//	sql := `UPDATE  excel_edbdata_mapping SET CLOSE=?,modify_time=NOW() WHERE  TRADE_CODE=? AND DT=? `
-//	o := global.DmSQL["edb"]
-//	_, err = o.Raw(sql, close, tradeCode, dt).Exec()
-//	return
-//}
-
 type Ct struct {
 	Fa string `json:"fa"`
 	T  string `json:"t"`

models/data_manage/factor_edb_series_calculate_data_qjjs.go

@@ -178,18 +178,6 @@ func (m *FactorEdbSeriesCalculateDataQjjs) Format2Item() (item *FactorEdbSeriesC
 	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
-}
-
 func (m *FactorEdbSeriesCalculateDataQjjs) GetEdbDataList(seriesId int, edbInfoId int, startDate, endDate string) (list []*EdbDataList, err error) {
 	var pars []interface{}
 	sql := `SELECT factor_edb_series_calculate_data_id as edb_data_id  ,edb_info_id,data_time,"value",data_timestamp FROM %s WHERE edb_info_id=? and factor_edb_series_id=? `

models/data_manage/future_good/future_good_edb_info.go

@@ -39,15 +39,6 @@ func GetFutureGoodEdbInfo(edbInfoId int) (item *FutureGoodEdbInfo, err error) {
 	return
 }
 
-// GetFutureGoodEdbInfoByCode 根据期货code获取 期货指标信息
-func GetFutureGoodEdbInfoByCode(futureGoodEdbCode string) (item *FutureGoodEdbInfo, err error) {
-	sql := `SELECT * FROM future_good_edb_info WHERE future_good_edb_code = ? `
-	sql += ` ORDER BY future_good_edb_info_id DESC `
-	err = global.DmSQL["data"].Raw(sql, futureGoodEdbCode).First(&item).Error
-
-	return
-}
-
 // GetFutureGoodEdbInfoList 获取指标数据列表
 func GetFutureGoodEdbInfoList(condition string, pars []interface{}) (list []*FutureGoodEdbInfo, err error) {
 	sql := `SELECT * FROM future_good_edb_info WHERE 1=1 `
@@ -84,13 +75,6 @@ func GetChildFutureGoodEdbInfoListByParentId(parentId int) (list []*FutureGoodEd
 	return
 }
 
-// AddFutureGoodEdbInfo 添加期货数据库指标
-func AddFutureGoodEdbInfo(item *FutureGoodEdbInfo) (err error) {
-	err = global.DmSQL["data"].Create(item).Error
-
-	return
-}
-
 // Update 更新指标基础信息
 func (FutureGoodEdbInfo *FutureGoodEdbInfo) Update(cols []string) (err error) {
 	err = global.DmSQL["data"].Select(cols).Updates(FutureGoodEdbInfo).Error

models/data_manage/gl_data.go

@@ -11,10 +11,6 @@ type GlClassify struct {
 }
 
 func GetGlSurveyClassify() (items []*GlClassify, err error) {
-	//sql := ` SELECT CASE WHEN BREED_SHORT_NAME IS NULL THEN '无' ELSE BREED_SHORT_NAME END BREED_SHORT_NAME  FROM mb_index_main_info GROUP BY BREED_SHORT_NAME ORDER BY BREED_SHORT_NAME ASC `
-	//o := orm.NewOrmUsingDB("gl")
-	//o.Raw(sql).QueryRows(&items)
-
 	sql := ` SELECT CASE WHEN BREED_SHORT_NAME IS NULL THEN '无' ELSE BREED_SHORT_NAME END BREED_SHORT_NAME  FROM mb_index_main_info GROUP BY BREED_SHORT_NAME ORDER BY BREED_SHORT_NAME ASC `
 	err = global.DmSQL["gl"].Raw(sql).Find(&items).Error
 	return
@@ -25,25 +21,11 @@ type GlFrequency struct {
 }
 
 func GetGlFrequencyByClassifyId(breedShortName string) (items []*GlFrequency, err error) {
-	//o := orm.NewOrmUsingDB("gl")
-	//if breedShortName == "无" {
-	//	sql := ` SELECT FREQUENCY_NAME AS frequency FROM mb_index_main_info WHERE BREED_SHORT_NAME IS NULL GROUP BY FREQUENCY_CODE ORDER BY FREQUENCY_CODE ASC `
-	//	_, err = o.Raw(sql).QueryRows(&items)
-	//	return
-	//} else {
-	//	sql := ` SELECT FREQUENCY_NAME AS frequency FROM mb_index_main_info WHERE BREED_SHORT_NAME=? GROUP BY FREQUENCY_CODE ORDER BY FREQUENCY_CODE ASC `
-	//	_, err = o.Raw(sql, breedShortName).QueryRows(&items)
-	//	return
-	//}
-
 	if breedShortName == "无" {
 		sql := ` SELECT FREQUENCY_NAME AS frequency FROM mb_index_main_info WHERE BREED_SHORT_NAME IS NULL GROUP BY FREQUENCY_CODE ORDER BY FREQUENCY_CODE ASC `
 		err = global.DmSQL["gl"].Raw(sql).Find(&items).Error
 		return
 	} else {
-		//sql := ` SELECT FREQUENCY_NAME AS frequency FROM mb_index_main_info WHERE BREED_SHORT_NAME=? GROUP BY FREQUENCY_CODE ORDER BY FREQUENCY_CODE ASC `
-		//_, err = o.Raw(sql, breedShortName).QueryRows(&items)
-
 		sql := ` SELECT FREQUENCY_NAME AS frequency FROM mb_index_main_info WHERE BREED_SHORT_NAME=? GROUP BY FREQUENCY_CODE ORDER BY FREQUENCY_CODE ASC `
 		err = global.DmSQL["gl"].Raw(sql, breedShortName).Find(&items).Error
 		return
@@ -60,17 +42,6 @@ type GlIndex struct {
 }
 
 func GetGlIndex(breedShortName, frequency string) (items []*GlIndex, err error) {
-	//o := orm.NewOrmUsingDB("gl")
-	//if breedShortName == "无" {
-	//	sql := ` SELECT * FROM mb_index_main_info WHERE BREED_SHORT_NAME IS NULL AND FREQUENCY_NAME=? ORDER BY INDEX_CODE ASC `
-	//	_, err = o.Raw(sql, frequency).QueryRows(&items)
-	//	return
-	//} else {
-	//	sql := ` SELECT * FROM mb_index_main_info WHERE BREED_SHORT_NAME=? AND FREQUENCY_NAME=? ORDER BY INDEX_CODE ASC `
-	//	_, err = o.Raw(sql, breedShortName, frequency).QueryRows(&items)
-	//	return
-	//}
-
 	if breedShortName == "无" {
 		sql := ` SELECT * FROM mb_index_main_info WHERE BREED_SHORT_NAME IS NULL AND FREQUENCY_NAME=? ORDER BY INDEX_CODE ASC `
 		err = global.DmSQL["gl"].Raw(sql, frequency).Find(&items).Error
@@ -83,10 +54,6 @@ func GetGlIndex(breedShortName, frequency string) (items []*GlIndex, err error)
 }
 
 func GetGlFrequency(productName string) (items []*string, err error) {
-	//sql := `SELECT DISTINCT FREQUENCY_NAME FROM mb_index_main_info WHERE BREED_SHORT_NAME=? ORDER BY FIELD(FREQUENCY_NAME,'日度','周度','旬度','月度','季度','半年','年度') `
-	//o := orm.NewOrmUsingDB("gl")
-	//_, err = o.Raw(sql, productName).QueryRows(&items)
-
 	sql := `SELECT DISTINCT FREQUENCY_NAME FROM mb_index_main_info WHERE BREED_SHORT_NAME=? ORDER BY FIELD(FREQUENCY_NAME,'日度','周度','旬度','月度','季度','半年','年度') `
 	err = global.DmSQL["gl"].Raw(sql, productName).Find(&items).Error
 	return
@@ -109,16 +76,6 @@ type GlIndexData struct {
 }
 
 func GetGlIndexData(indexCode string, startSize, pageSize int) (items []*GlIndexData, err error) {
-	//sql := ` SELECT *  FROM mb_index_main_data WHERE INDEX_CODE=? ORDER BY DATA_DATE DESC,PUBLISH_TIME DESC LIMIT ?,?`
-	//sql := ` SELECT * FROM (
-	//SELECT DISTINCT a.INDEX_CODE,a.DATA_VALUE,a.DATA_DATE FROM mb_index_main_data AS a WHERE INDEX_CODE=? AND IS_DELETE=0
-	//ORDER BY DATA_DATE DESC,PUBLISH_TIME DESC
-	//)AS t
-	//GROUP BY t.DATA_DATE
-	//ORDER BY t.DATA_DATE DESC LIMIT ?,? `
-	//o := orm.NewOrmUsingDB("gl")
-	//_, err = o.Raw(sql, indexCode, startSize, pageSize).QueryRows(&items)
-
 	sql := ` SELECT * FROM (
 	SELECT DISTINCT a.INDEX_CODE,a.DATA_VALUE,a.DATA_DATE FROM mb_index_main_data AS a WHERE INDEX_CODE=? AND IS_DELETE=0
 	ORDER BY DATA_DATE DESC,PUBLISH_TIME DESC 
@@ -130,27 +87,12 @@ func GetGlIndexData(indexCode string, startSize, pageSize int) (items []*GlIndex
 }
 
 func GetGlIndexByCode(indexCode string) (items *GlIndex, err error) {
-	//sql := ` SELECT *  FROM mb_index_main_info WHERE INDEX_CODE=? `
-	//o := orm.NewOrmUsingDB("gl")
-	//err = o.Raw(sql, indexCode).QueryRow(&items)
-
 	sql := ` SELECT *  FROM mb_index_main_info WHERE INDEX_CODE=? `
 	err = global.DmSQL["gl"].Raw(sql, indexCode).First(&items).Error
 	return
 }
 
 func GetGlIndexDataCount(indexCode string) (count int, err error) {
-	//o := orm.NewOrmUsingDB("gl")
-	//sql := `SELECT COUNT(1) AS count FROM (
-	//		SELECT * FROM (
-	//			SELECT DISTINCT a.INDEX_CODE,a.DATA_VALUE,a.DATA_DATE FROM mb_index_main_data AS a WHERE INDEX_CODE=? AND IS_DELETE=0
-	//			ORDER BY DATA_DATE DESC,PUBLISH_TIME DESC
-	//			)AS t
-	//			GROUP BY t.DATA_DATE
-	//			ORDER BY t.DATA_DATE DESC
-	//		)AS n `
-	//err = o.Raw(sql, indexCode).QueryRow(&count)
-
 	sql := `SELECT COUNT(1) AS count FROM (
 			SELECT * FROM (
 				SELECT DISTINCT a.INDEX_CODE,a.DATA_VALUE,a.DATA_DATE FROM mb_index_main_data AS a WHERE INDEX_CODE=? AND IS_DELETE=0
@@ -175,10 +117,6 @@ type GlSearchIndex struct {
 
 // GetGlItemList 模糊查询隆众数据库指标列表
 func GetGlItemList(keyword string) (items []*GlSearchIndex, err error) {
-	//o := orm.NewOrmUsingDB("gl")
-	//sql := "SELECT * FROM mb_index_main_info WHERE CONCAT(INDEX_NAME,INDEX_CODE) LIKE ? "
-	//_, err = o.Raw(sql, utils.GetLikeKeyword(keyword)).QueryRows(&items)
-
 	sql := "SELECT * FROM mb_index_main_info WHERE CONCAT(INDEX_NAME,INDEX_CODE) LIKE ? "
 	err = global.DmSQL["gl"].Raw(sql, utils.GetLikeKeyword(keyword)).Find(&items).Error
 	return
@@ -186,15 +124,6 @@ func GetGlItemList(keyword string) (items []*GlSearchIndex, err error) {
 }
 
 func GetGlDataMaxCount(classifyName string) (count int, err error) {
-	//o := orm.NewOrmUsingDB("gl")
-	//sql := `SELECT MAX(t.num) AS count FROM (
-	//			SELECT COUNT(1) AS num  FROM mb_index_main_info AS a
-	//			INNER JOIN mb_index_main_data AS b ON a.INDEX_CODE=b.INDEX_CODE
-	//			WHERE a.BREED_SHORT_NAME=?
-	//			GROUP BY a.INDEX_CODE
-	//		)AS t `
-	//err = o.Raw(sql, classifyName).QueryRow(&count)
-
 	sql := `SELECT MAX(t.num) AS count FROM (
 				SELECT COUNT(1) AS num  FROM mb_index_main_info AS a
 				INNER JOIN mb_index_main_data AS b ON a.INDEX_CODE=b.INDEX_CODE
@@ -206,15 +135,6 @@ func GetGlDataMaxCount(classifyName string) (count int, err error) {
 }
 
 func GetGlDataByCode(indexCode string) (items []*GlIndexData, err error) {
-	//	o := orm.NewOrmUsingDB("gl")
-	//	sql := `SELECT
-	//	*
-	//FROM
-	//	( SELECT * FROM mb_index_main_data WHERE INDEX_CODE = ? GROUP BY UPDATE_TIME DESC, DATA_DATE DESC ) a
-	//GROUP BY
-	//	a.DATA_DATE DESC `
-	//	_, err = o.Raw(sql, indexCode).QueryRows(&items)
-
 	sql := `SELECT
 		* 
 	FROM

models/data_manage/line_feature/line_feature.go

@@ -128,23 +128,6 @@ func EditLineFeatureChartAndMapping(req *data_manage.EditChartInfoReq, edbInfoId
 		}
 		if tmpChartEdbMapping != nil {
 			chartEdbMappingIdList = append(chartEdbMappingIdList, strconv.Itoa(tmpChartEdbMapping.ChartEdbMappingId))
-			//tmpChartEdbMapping.ModifyTime = time.Now()
-			//tmpChartEdbMapping.MaxData = v.MaxData
-			//tmpChartEdbMapping.MinData = v.MinData
-			//tmpChartEdbMapping.IsOrder = v.IsOrder
-			//tmpChartEdbMapping.IsAxis = v.IsAxis
-			//tmpChartEdbMapping.EdbInfoType = v.EdbInfoType
-			//tmpChartEdbMapping.LeadValue = v.LeadValue
-			//tmpChartEdbMapping.LeadUnit = v.LeadUnit
-			//tmpChartEdbMapping.ChartStyle = v.ChartStyle
-			//tmpChartEdbMapping.ChartColor = v.ChartColor
-			//tmpChartEdbMapping.PredictChartColor = v.PredictChartColor
-			//tmpChartEdbMapping.ChartWidth = v.ChartWidth
-			//_, err = to.Update(tmpChartEdbMapping, "ModifyTime", "MaxData", "MinData", "IsOrder", "IsAxis", "EdbInfoType", "LeadValue", "LeadUnit", "ChartStyle", "ChartColor", "PredictChartColor", "ChartWidth")
-			//if err != nil {
-			//	fmt.Println("chart_edb_mapping Err:" + err.Error())
-			//	return err
-			//}
 		} else {
 			mapItem := new(data_manage.ChartEdbMapping)
 			mapItem.ChartInfoId = req.ChartInfoId
@@ -153,17 +136,9 @@ func EditLineFeatureChartAndMapping(req *data_manage.EditChartInfoReq, edbInfoId
 			mapItem.ModifyTime = time.Now()
 			timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 			mapItem.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + timestamp + "_" + strconv.Itoa(v.EdbInfoId))
-			//mapItem.MaxData = v.MaxData
-			//mapItem.MinData = v.MinData
 			mapItem.IsOrder = true
 			mapItem.IsAxis = 1
 			mapItem.EdbInfoType = 1
-			//mapItem.LeadValue = v.LeadValue
-			//mapItem.LeadUnit = v.LeadUnit
-			//mapItem.ChartStyle = v.ChartStyle
-			//mapItem.ChartColor = v.ChartColor
-			//mapItem.PredictChartColor = v.PredictChartColor
-			//mapItem.ChartWidth = v.ChartWidth
 			mapItem.Source = utils.CHART_SOURCE_CORRELATION
 			err = to.Create(mapItem).Error
 			if err != nil {

models/data_manage/lz_data.go

@@ -11,10 +11,6 @@ type LzClassify struct {
 }
 
 func GetLzSurveyClassify() (items []*LzClassify, err error) {
-	//sql := ` SELECT breed_id,breed_name FROM longzhong_survey_product GROUP BY breed_name ORDER BY breed_name DESC `
-	//o := orm.NewOrmUsingDB("edb")
-	//o.Raw(sql).QueryRows(&items)
-
 	sql := ` SELECT breed_id,breed_name FROM longzhong_survey_product GROUP BY breed_name ORDER BY breed_name DESC `
 	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
 	return
@@ -25,10 +21,6 @@ type LzFrequency struct {
 }
 
 func GetLzFrequencyByClassifyId(breedId int) (items []*LzFrequency, err error) {
-	//sql := ` SELECT frequency  FROM longzhong_survey_product WHERE breed_id=? GROUP BY frequency ORDER BY frequency ASC `
-	//o := orm.NewOrmUsingDB("edb")
-	//_, err = o.Raw(sql, breedId).QueryRows(&items)
-
 	sql := ` SELECT frequency  FROM longzhong_survey_product WHERE breed_id=? GROUP BY frequency ORDER BY frequency ASC `
 	err = global.DmSQL["data"].Raw(sql, breedId).Find(&items).Error
 	return
@@ -66,10 +58,6 @@ type LongzhongSurveyProduct struct {
 }
 
 func GetLongzhongSurveyProduct(breedId, frequency int) (items []*LongzhongSurveyProduct, err error) {
-	//sql := ` SELECT *  FROM longzhong_survey_product WHERE breed_id=? AND frequency=? ORDER BY survey_product_id ASC `
-	//o := orm.NewOrmUsingDB("edb")
-	//_, err = o.Raw(sql, breedId, frequency).QueryRows(&items)
-
 	sql := ` SELECT *  FROM longzhong_survey_product WHERE breed_id=? AND frequency=? ORDER BY survey_product_id ASC `
 	err = global.DmSQL["data"].Raw(sql, breedId, frequency).Find(&items).Error
 	return
@@ -98,20 +86,12 @@ type LzProductData struct {
 }
 
 func GetLongzhongSurveyProductData(surveyProductId int) (items []*LzProductData, err error) {
-	//sql := ` SELECT *  FROM longzhong_survey_data WHERE survey_product_id=? ORDER BY data_time DESC `
-	//o := orm.NewOrmUsingDB("edb")
-	//_, err = o.Raw(sql, surveyProductId).QueryRows(&items)
-
 	sql := ` SELECT *  FROM longzhong_survey_data WHERE survey_product_id=? ORDER BY data_time DESC `
 	err = global.DmSQL["data"].Raw(sql, surveyProductId).Find(&items).Error
 	return
 }
 
 func GetLongzhongSurveyProductByCode(lzCode string) (items *LongzhongSurveyProduct, err error) {
-	//sql := ` SELECT *  FROM longzhong_survey_product WHERE lz_code=? `
-	//o := orm.NewOrmUsingDB("edb")
-	//err = o.Raw(sql, lzCode).QueryRow(&items)
-
 	sql := ` SELECT *  FROM longzhong_survey_product WHERE lz_code=? `
 	err = global.DmSQL["data"].Raw(sql, lzCode).First(&items).Error
 	return

models/data_manage/manual.go

@@ -16,13 +16,6 @@ type ManualClassifyEdbInfoCount struct {
 }
 
 func GetManualClassifyEdbInfoCount() (items []*ManualClassifyEdbInfoCount, err error) {
-	//sql := ` SELECT a.classify_id,COUNT(1) AS total FROM edbdata_classify AS a
-	//		INNER JOIN edbinfo AS b ON a.classify_id=b.classify_id
-	//		WHERE a.is_show=1
-	//		GROUP BY a.classify_id `
-	//o := orm.NewOrmUsingDB("edb")
-	//_, err = o.Raw(sql).QueryRows(&items)
-
 	sql := ` SELECT a.classify_id,COUNT(1) AS total FROM edbdata_classify AS a
 			INNER JOIN edbinfo AS b ON a.classify_id=b.classify_id
 			WHERE a.is_show=1
@@ -33,12 +26,6 @@ func GetManualClassifyEdbInfoCount() (items []*ManualClassifyEdbInfoCount, err e
 
 // GetManualEdbInfoCountByClassifyId 根据手工指标分类id获取指标数
 func GetManualEdbInfoCountByClassifyId(classifyId int) (total int, err error) {
-	//sql := ` SELECT COUNT(1) AS total FROM edbdata_classify AS a
-	//		INNER JOIN edbinfo AS b ON a.classify_id=b.classify_id
-	//		WHERE a.is_show=1 AND b.classify_id = ?`
-	//o := orm.NewOrmUsingDB("edb")
-	//err = o.Raw(sql, classifyId).QueryRow(&total)
-
 	sql := ` SELECT COUNT(1) AS total FROM edbdata_classify AS a
 			INNER JOIN edbinfo AS b ON a.classify_id=b.classify_id
 			WHERE a.is_show=1 AND b.classify_id = ?`

models/data_manage/manual_classify.go

@@ -25,8 +25,6 @@ type EdbdataClassifyList struct {
 }
 
 func AddEdbdataClassify(item *EdbdataClassify) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("edb")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["edb"].Create(item).Error
 	return
 }
@@ -41,13 +39,6 @@ type ManualClassifyList struct {
 
 func GetManualClassifyAll(adminId int) (items []*ManualClassifyList, err error) {
 	var newItems []*ManualClassifyList
-	//o := orm.NewOrmUsingDB("edb")
-	//sql := ` SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE parent_id=0 AND is_show=1 ORDER BY sort ASC ,classify_id ASC `
-	//_, err = o.Raw(sql).QueryRows(&newItems)
-	//if err != nil {
-	//	return
-	//}
-
 	sql := ` SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE parent_id=0 AND is_show=1 ORDER BY sort ASC ,classify_id ASC `
 	err = global.DmSQL["edb"].Raw(sql).Find(&newItems).Error
 	if err != nil {
@@ -59,12 +50,6 @@ func GetManualClassifyAll(adminId int) (items []*ManualClassifyList, err error)
 		var childItems []*ManualClassifyList
 		parentId := newItems[i].ClassifyId
 		childSql := ``
-		//childSql = "SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE parent_id=? AND is_show=1 ORDER BY sort ASC ,classify_id ASC "
-		//_, err = o.Raw(childSql, parentId).QueryRows(&childItems)
-		//if err != nil {
-		//	return
-		//}
-
 		childSql = "SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE parent_id=? AND is_show=1 ORDER BY sort ASC ,classify_id ASC "
 		err = global.DmSQL["edb"].Raw(childSql, parentId).Find(&childItems).Error
 		if err != nil {
@@ -108,13 +93,6 @@ func GetManualClassifyAll(adminId int) (items []*ManualClassifyList, err error)
 
 func GetManualClassifyAllV2() (items []*ManualClassifyList, err error) {
 	var newItems []*ManualClassifyList
-	//o := orm.NewOrmUsingDB("edb")
-	//sql := ` SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE parent_id=0 AND is_show=1 ORDER BY sort ASC ,classify_id ASC `
-	//_, err = o.Raw(sql).QueryRows(&newItems)
-	//if err != nil {
-	//	return
-	//}
-
 	sql := ` SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE parent_id=0 AND is_show=1 ORDER BY sort ASC ,classify_id ASC `
 	err = global.DmSQL["edb"].Raw(sql).Find(&newItems).Error
 	if err != nil {
@@ -125,12 +103,6 @@ func GetManualClassifyAllV2() (items []*ManualClassifyList, err error) {
 		var childItems []*ManualClassifyList
 		parentId := newItems[i].ClassifyId
 		childSql := ``
-		//childSql = "SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE parent_id=? AND is_show=1 ORDER BY sort ASC ,classify_id ASC "
-		//_, err = o.Raw(childSql, parentId).QueryRows(&childItems)
-		//if err != nil {
-		//	return
-		//}
-
 		childSql = "SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE parent_id=? AND is_show=1 ORDER BY sort ASC ,classify_id ASC "
 		err = global.DmSQL["edb"].Raw(childSql, parentId).Find(&childItems).Error
 		if err != nil {
@@ -150,28 +122,13 @@ type AddManualClassifyReq struct {
 	ParentId     int    `description:"父级id,第一级传0"`
 }
 
-//func GetManualClassifyCount(classifyName string, parentId int) (count int, err error) {
-//	o := orm.NewOrmUsingDB("edb")
-//	sql := `SELECT COUNT(1) AS count FROM edbdata_classify WHERE parent_id=? AND classify_name=? `
-//	err = o.Raw(sql, parentId, classifyName).QueryRow(&count)
-//	return
-//}
-
 func GetManualClassifyByClassifyName(classifyName string) (item *EdbdataClassify, err error) {
-	//o := orm.NewOrmUsingDB("edb")
-	//sql := `SELECT * FROM edbdata_classify WHERE classify_name=? `
-	//err = o.Raw(sql, classifyName).QueryRow(&item)
-
 	sql := `SELECT * FROM edbdata_classify WHERE classify_name=? `
 	err = global.DmSQL["edb"].Raw(sql, classifyName).First(&item).Error
 	return
 }
 
 func ModifyManualClassifyIsShow(isShow, classifyId, parentId int) (err error) {
-	//o := orm.NewOrmUsingDB("edb")
-	//sql := `UPDATE edbdata_classify SET is_show=?,parent_id=? WHERE classify_id=? `
-	//_, err = o.Raw(sql, isShow, parentId, classifyId).Exec()
-
 	sql := `UPDATE edbdata_classify SET is_show=?,parent_id=? WHERE classify_id=? `
 	err = global.DmSQL["edb"].Exec(sql, isShow, parentId, classifyId).Error
 	return
@@ -189,28 +146,12 @@ type DelManualClassifyReq struct {
 }
 
 func GetManualClassifyById(classifyId int) (item *EdbdataClassify, err error) {
-	//o := orm.NewOrmUsingDB("edb")
-	//sql := ` SELECT * FROM edbdata_classify WHERE classify_id=? `
-	//err = o.Raw(sql, classifyId).QueryRow(&item)
-
 	sql := ` SELECT * FROM edbdata_classify WHERE classify_id=? `
 	err = global.DmSQL["edb"].Raw(sql, classifyId).First(&item).Error
 	return
 }
 
 func ModifyManualClassifyName(classifyName string, classifyId, parentId int) (err error) {
-	//o := orm.NewOrmUsingDB("edb")
-	//updateStr := ` classify_name=? `
-	//pars := []interface{}{classifyName}
-	//if parentId > 0 {
-	//	updateStr += ` , parent_id=? `
-	//	pars = append(pars, parentId)
-	//}
-	//sql := `UPDATE edbdata_classify SET ` + updateStr + ` WHERE classify_id=? `
-	//
-	//pars = append(pars, classifyId)
-	//_, err = o.Raw(sql, pars).Exec()
-
 	updateStr := ` classify_name=? `
 	pars := []interface{}{classifyName}
 	if parentId > 0 {
@@ -225,14 +166,6 @@ func ModifyManualClassifyName(classifyName string, classifyId, parentId int) (er
 }
 
 func GetManualClassifyAllByCondition(condition string) (items []*EdbdataClassifyList, err error) {
-	//o := orm.NewOrmUsingDB("edb")
-	//sql := ` SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE is_show=1 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += `  ORDER BY sort ASC `
-	//_, err = o.Raw(sql).QueryRows(&items)
-
 	sql := ` SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE is_show=1 `
 	if condition != "" {
 		sql += condition
@@ -244,10 +177,6 @@ func GetManualClassifyAllByCondition(condition string) (items []*EdbdataClassify
 
 // GetChildManualClassifyCount 根据分类id获取下面存在的子分类数量（展示的）
 func GetChildManualClassifyCount(parentId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("edb")
-	//sql := `SELECT COUNT(1) AS count FROM edbdata_classify WHERE parent_id=? AND is_show = 1`
-	//err = o.Raw(sql, parentId).QueryRow(&count)
-
 	sql := `SELECT COUNT(1) AS count FROM edbdata_classify WHERE parent_id=? AND is_show = 1`
 	err = global.DmSQL["edb"].Raw(sql, parentId).Scan(&count).Error
 	return

models/data_manage/manual_user.go

@@ -17,18 +17,12 @@ type ManualUser struct {
 }
 
 func DeleteManualUser(adminId int) (err error) {
-	//sql := `DELETE FROM manual_user WHERE admin_id=? `
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Raw(sql, adminId).Exec()
-
 	sql := `DELETE FROM manual_user WHERE admin_id=? `
 	err = global.DmSQL["data"].Exec(sql, adminId).Error
 	return
 }
 
 func AddManualUser(item *ManualUser) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Insert(item)
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }
@@ -39,13 +33,6 @@ type ManualUserItem struct {
 }
 
 func GetManualUserList() (list []*ManualUserItem, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT admin_id,admin_real_name FROM manual_user
-	//		GROUP BY admin_id
-	//		ORDER BY create_time DESC `
-	//fmt.Println("GetManualUserList:", sql)
-	//_, err = o.Raw(sql).QueryRows(&list)
-
 	sql := ` SELECT admin_id,admin_real_name FROM manual_user
 			GROUP BY admin_id
 			ORDER BY create_time DESC `
@@ -59,14 +46,6 @@ type ManualUserList struct {
 	AdminRealName int `description:"用户姓名"`
 }
 
-//func GetManualSysuserAll() (list []*ManualUserList, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT * FROM manual_user
-//			ORDER BY create_time ASC `
-//	o.Raw(sql).QueryRows()
-//	return
-//}
-
 type ManualSysUserClassifySaveReq struct {
 	AdminId    int   `description:"用户id"`
 	ClassifyId []int `description:"分类id数组"`
@@ -80,47 +59,29 @@ type ManualUserClassify struct {
 }
 
 func AddManualUserClassifyMulti(items []*ManualUserClassify) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.InsertMulti(1, items)
 	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func DeleteManualUserClassifyCount(adminId int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` DELETE FROM manual_user_classify WHERE admin_id=? `
-	//_, err = o.Raw(sql, adminId).Exec()
-
 	sql := ` DELETE FROM manual_user_classify WHERE admin_id=? `
 	err = global.DmSQL["data"].Exec(sql, adminId).Error
 	return
 }
 
 func GetManualUserClassifyCount(adminId, classifyId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count FROM manual_user_classify WHERE admin_id=? AND classify_id=? `
-	//err = o.Raw(sql, adminId, classifyId).QueryRow(&count)
-
 	sql := ` SELECT COUNT(1) AS count FROM manual_user_classify WHERE admin_id=? AND classify_id=? `
 	err = global.DmSQL["data"].Raw(sql, adminId, classifyId).Scan(&count).Error
 	return
 }
 
 func GetManualUserCount(adminId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count FROM manual_user WHERE admin_id=? `
-	//err = o.Raw(sql, adminId).QueryRow(&count)
-
 	sql := ` SELECT COUNT(1) AS count FROM manual_user WHERE admin_id=? `
 	err = global.DmSQL["data"].Raw(sql, adminId).Scan(&count).Error
 	return
 }
 
 func GetManualUserSetClassify(adminId int) (list []*EdbdataClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM manual_user_classify WHERE admin_id=? `
-	//_, err = o.Raw(sql, adminId).QueryRows(&list)
-
 	sql := ` SELECT * FROM manual_user_classify WHERE admin_id=? `
 	err = global.DmSQL["data"].Raw(sql, adminId).Find(&list).Error
 	return

models/data_manage/multiple_graph_config.go

@@ -28,34 +28,18 @@ type MultipleGraphConfig struct {
 
 // AddMultipleGraphConfig 新增多图配置
 func AddMultipleGraphConfig(item *MultipleGraphConfig) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//// 表格信息入库
-	//lastId, err := o.Insert(item)
-	//if err != nil {
-	//	return
-	//}
-	//item.MultipleGraphConfigId = int(lastId)
-
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }
 
 // Update 更新 基础信息
 func (item *MultipleGraphConfig) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(item, cols...)
-
 	err = global.DmSQL["data"].Select(cols).Updates(item).Error
 	return
 }
 
 // GetMultipleGraphConfigById 根据配置id获取配置
 func GetMultipleGraphConfigById(id int) (item *MultipleGraphConfig, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM multiple_graph_config WHERE multiple_graph_config_id = ? `
-	//// 表格信息入库
-	//err = o.Raw(sql, id).QueryRow(&item)
-
 	sql := `SELECT * FROM multiple_graph_config WHERE multiple_graph_config_id = ? `
 	// 表格信息入库
 	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
@@ -100,29 +84,6 @@ type RollingCorrelationConfig struct {
 func ReplaceEdbInfoInLineEquationMultipleGraphConfig(oldEdbInfo, newEdbInfo *EdbInfo) (replaceConfigTotal int, err error) {
 	var errmsg string
 	logMsg := `` // 记录替换的日志
-
-	//o := orm.NewOrmUsingDB("data")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//		if logMsg != `` {
-	//			utils.FileLog.Info(fmt.Sprintf("替换拟合方程中的指标记录 替换总数%d,旧的指标id:%d，新的指标id:%d;%s", replaceConfigTotal, oldEdbInfo.EdbInfoId, newEdbInfo.EdbInfoId, logMsg))
-	//		}
-	//	}
-	//	if errmsg != "" {
-	//		fmt.Println("errmsg:" + errmsg)
-	//	}
-	//	if err != nil && errmsg != "" {
-	//		go alarm_msg.SendAlarmMsg("替换拟合方程中的指标记录失败提醒,errmsg："+errmsg, 3)
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -145,13 +106,6 @@ func ReplaceEdbInfoInLineEquationMultipleGraphConfig(oldEdbInfo, newEdbInfo *Edb
 	//替换multiple_graph_config中的指标
 	{
 		multipleGraphConfigList := make([]*MultipleGraphConfig, 0)
-		//csql := `SELECT * FROM multiple_graph_config WHERE edb_info_id_a=0 AND edb_info_id_b=0 AND curve !=""`
-		//_, err = to.Raw(csql).QueryRows(&multipleGraphConfigList)
-		//if err != nil {
-		//	errmsg = "获取指标关联图表配置信息失败：Err:" + err.Error()
-		//	return
-		//}
-
 		csql := `SELECT * FROM multiple_graph_config WHERE edb_info_id_a=0 AND edb_info_id_b=0 AND curve !=''`
 		err = to.Raw(csql).Find(&multipleGraphConfigList).Error
 		if err != nil {
@@ -200,19 +154,6 @@ func ReplaceEdbInfoInLineEquationMultipleGraphConfig(oldEdbInfo, newEdbInfo *Edb
 			configIdStr = append(configIdStr, strconv.Itoa(mv.MultipleGraphConfigId))
 			if len(configIds) >= 10 {
 				numStr := utils.GetOrmInReplace(len(configIds))
-				// 准备批量更新的 SQL 语句
-				//			updateSQL := `UPDATE multiple_graph_config SET
-				//curve = CASE multiple_graph_config_id  `
-				//			for _, updateItem := range updateList {
-				//				updateSQL += `WHEN ` + strconv.Itoa(updateItem.MultipleGraphConfigId) + ` THEN '` + updateItem.Curve + `' `
-				//			}
-				//			updateSQL += `END, modify_time = ? WHERE multiple_graph_config_id IN (` + numStr + `)`
-				//			_, err = to.Raw(updateSQL, time.Now(), configIds).Exec()
-				//			if err != nil {
-				//				errmsg = "更新指标A关联图表配置信息失败：Err:" + err.Error()
-				//				return
-				//			}
-
 				updateSQL := `UPDATE multiple_graph_config SET   
     curve = CASE multiple_graph_config_id  `
 				for _, updateItem := range updateList {
@@ -234,19 +175,6 @@ func ReplaceEdbInfoInLineEquationMultipleGraphConfig(oldEdbInfo, newEdbInfo *Edb
 		}
 		if len(configIds) > 0 {
 			numStr := utils.GetOrmInReplace(len(configIds))
-			// 准备批量更新的 SQL 语句
-			//		updateSQL := `UPDATE multiple_graph_config SET
-			//curve = CASE multiple_graph_config_id  `
-			//		for _, updateItem := range updateList {
-			//			updateSQL += `WHEN ` + strconv.Itoa(updateItem.MultipleGraphConfigId) + ` THEN '` + updateItem.Curve + `' `
-			//		}
-			//		updateSQL += `END, modify_time = ? WHERE multiple_graph_config_id IN (` + numStr + `)`
-			//		_, err = to.Raw(updateSQL, time.Now(), configIds).Exec()
-			//		if err != nil {
-			//			errmsg = "更新指标A关联图表配置信息失败：Err:" + err.Error()
-			//			return
-			//		}
-
 			updateSQL := `UPDATE multiple_graph_config SET   
 			curve = CASE multiple_graph_config_id  `
 			for _, updateItem := range updateList {

models/data_manage/multiple_graph_config_chart_mapping.go

@@ -22,33 +22,18 @@ type MultipleGraphConfigChartMapping struct {
 
 // AddMultipleGraphConfigChartMapping 新增多图配置
 func AddMultipleGraphConfigChartMapping(item *MultipleGraphConfigChartMapping) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//// 表格信息入库
-	//lastId, err := o.Insert(item)
-	//if err != nil {
-	//	return
-	//}
-	//item.Id = int(lastId)
-
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }
 
 // Update 更新 基础信息
 func (item *MultipleGraphConfigChartMapping) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(item, cols...)
-
 	err = global.DmSQL["data"].Select(cols).Updates(item).Error
 	return
 }
 
 // GetMultipleGraphConfigChartMappingByIdAndSource 根据配置id和来源获取关联关系
 func GetMultipleGraphConfigChartMappingByIdAndSource(configId, source int) (item *MultipleGraphConfigChartMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM multiple_graph_config_chart_mapping WHERE multiple_graph_config_id = ? AND source = ? `
-	//err = o.Raw(sql, configId, source).QueryRow(&item)
-
 	sql := `SELECT * FROM multiple_graph_config_chart_mapping WHERE multiple_graph_config_id = ? AND source = ? `
 	err = global.DmSQL["data"].Raw(sql, configId, source).First(&item).Error
 	return
@@ -56,10 +41,6 @@ func GetMultipleGraphConfigChartMappingByIdAndSource(configId, source int) (item
 
 // GetMultipleGraphConfigChartMappingByChartId 根据图表id和来源获取关联关系
 func GetMultipleGraphConfigChartMappingByChartId(chartId int) (item *MultipleGraphConfigChartMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM multiple_graph_config_chart_mapping WHERE chart_info_id = ?  `
-	//err = o.Raw(sql, chartId).QueryRow(&item)
-
 	sql := `SELECT * FROM multiple_graph_config_chart_mapping WHERE chart_info_id = ?  `
 	err = global.DmSQL["data"].Raw(sql, chartId).First(&item).Error
 	return
@@ -67,10 +48,6 @@ func GetMultipleGraphConfigChartMappingByChartId(chartId int) (item *MultipleGra
 
 // GetMultipleGraphConfigChartMappingListById 根据配置id获取所有关联关系
 func GetMultipleGraphConfigChartMappingListById(configId int) (items []*MultipleGraphConfigChartMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM multiple_graph_config_chart_mapping WHERE multiple_graph_config_id = ? `
-	//_, err = o.Raw(sql, configId).QueryRows(&items)
-
 	sql := `SELECT * FROM multiple_graph_config_chart_mapping WHERE multiple_graph_config_id = ? `
 	err = global.DmSQL["data"].Raw(sql, configId).Find(&items).Error
 	return
@@ -80,29 +57,6 @@ func GetMultipleGraphConfigChartMappingListById(configId int) (items []*Multiple
 func ReplaceMultipleGraphConfigChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (replaceConfigTotal int, err error) {
 	var errmsg string
 	logMsg := `` // 记录替换的日志
-
-	//o := orm.NewOrmUsingDB("data")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//		if logMsg != `` {
-	//			utils.FileLog.Info(fmt.Sprintf("替换相关性分析中的指标记录 替换总数%d,旧的指标id:%d，新的指标id:%d;%s", replaceConfigTotal, oldEdbInfo.EdbInfoId, newEdbInfo.EdbInfoId, logMsg))
-	//		}
-	//	}
-	//	if errmsg != "" {
-	//		fmt.Println("errmsg:" + errmsg)
-	//	}
-	//	if err != nil && errmsg != "" {
-	//		go alarm_msg.SendAlarmMsg("替换统计分析配置中的指标记录失败提醒,errmsg："+errmsg, 3)
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -124,13 +78,6 @@ func ReplaceMultipleGraphConfigChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (replac
 
 	//替换multiple_graph_config中的指标
 	multipleGraphConfigList := make([]*MultipleGraphConfig, 0)
-	//csql := `SELECT * FROM multiple_graph_config WHERE (edb_info_id_a=? or edb_info_id_b=?)`
-	//_, err = to.Raw(csql, oldEdbInfo.EdbInfoId, oldEdbInfo.EdbInfoId).QueryRows(&multipleGraphConfigList)
-	//if err != nil {
-	//	errmsg = "获取指标关联图表配置信息失败：Err:" + err.Error()
-	//	return
-	//}
-
 	csql := `SELECT * FROM multiple_graph_config WHERE (edb_info_id_a=? or edb_info_id_b=?)`
 	err = to.Raw(csql, oldEdbInfo.EdbInfoId, oldEdbInfo.EdbInfoId).Find(&multipleGraphConfigList).Error
 	if err != nil {
@@ -152,13 +99,6 @@ func ReplaceMultipleGraphConfigChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (replac
 				if len(configIds) >= 1000 {
 					numStr := utils.GetOrmInReplace(len(configIds))
 					//更新配置中的指标A
-					//sql := `UPDATE multiple_graph_config SET edb_info_id_a=?, modify_time=? WHERE edb_info_id_a=? and multiple_graph_config_id IN (` + numStr + `)`
-					//_, err = to.Raw(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId, configIds).Exec()
-					//if err != nil {
-					//	errmsg = "更新指标A关联图表配置信息失败：Err:" + err.Error()
-					//	return
-					//}
-
 					sql := `UPDATE multiple_graph_config SET edb_info_id_a=?, modify_time=? WHERE edb_info_id_a=? and multiple_graph_config_id IN (` + numStr + `)`
 					err = to.Exec(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId, configIds).Error
 					if err != nil {
@@ -166,13 +106,6 @@ func ReplaceMultipleGraphConfigChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (replac
 						return
 					}
 					//更新配置中的指标B
-					//sql = `UPDATE multiple_graph_config SET edb_info_id_b=?, modify_time=? WHERE edb_info_id_b=? and multiple_graph_config_id IN (` + numStr + `)`
-					//_, err = to.Raw(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId, configIds).Exec()
-					//if err != nil {
-					//	errmsg = "更新指标B关联图表配置信息失败：Err:" + err.Error()
-					//	return
-					//}
-
 					sql = `UPDATE multiple_graph_config SET edb_info_id_b=?, modify_time=? WHERE edb_info_id_b=? and multiple_graph_config_id IN (` + numStr + `)`
 					err = to.Exec(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId, configIds).Error
 					if err != nil {
@@ -181,14 +114,6 @@ func ReplaceMultipleGraphConfigChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (replac
 					}
 
 					// 更新
-					// 更新指标id
-					//sql = `UPDATE multiple_graph_config_edb_mapping SET edb_info_id=?, modify_time=? WHERE edb_info_id=? and multiple_graph_config_id IN (` + numStr + `)`
-					//_, err = to.Raw(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId, configIds).Exec()
-					//if err != nil {
-					//	errmsg = "更新指标id关联图表配置信息失败：Err:" + err.Error()
-					//	return
-					//}
-
 					sql = `UPDATE multiple_graph_config_edb_mapping SET edb_info_id=?, modify_time=? WHERE edb_info_id=? and multiple_graph_config_id IN (` + numStr + `)`
 					err = to.Exec(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId, configIds).Error
 					if err != nil {
@@ -205,13 +130,6 @@ func ReplaceMultipleGraphConfigChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (replac
 		if len(configIds) > 0 {
 			numStr := utils.GetOrmInReplace(len(configIds))
 			//更新配置中的指标A
-			//sql := `UPDATE multiple_graph_config SET edb_info_id_a=?, modify_time=? WHERE edb_info_id_a=? and multiple_graph_config_id IN (` + numStr + `)`
-			//_, err = to.Raw(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId, configIds).Exec()
-			//if err != nil {
-			//	errmsg = "更新指标A关联图表配置信息失败：Err:" + err.Error()
-			//	return
-			//}
-
 			sql := `UPDATE multiple_graph_config SET edb_info_id_a=?, modify_time=? WHERE edb_info_id_a=? and multiple_graph_config_id IN (` + numStr + `)`
 			err = to.Exec(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId, configIds).Error
 			if err != nil {
@@ -220,13 +138,6 @@ func ReplaceMultipleGraphConfigChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (replac
 			}
 
 			//更新配置中的指标B
-			//sql = `UPDATE multiple_graph_config SET edb_info_id_b=?, modify_time=? WHERE edb_info_id_b=? and multiple_graph_config_id IN (` + numStr + `)`
-			//_, err = to.Raw(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId, configIds).Exec()
-			//if err != nil {
-			//	errmsg = "更新指标B关联图表配置信息失败：Err:" + err.Error()
-			//	return
-			//}
-
 			sql = `UPDATE multiple_graph_config SET edb_info_id_b=?, modify_time=? WHERE edb_info_id_b=? and multiple_graph_config_id IN (` + numStr + `)`
 			err = to.Exec(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId, configIds).Error
 			if err != nil {
@@ -235,13 +146,6 @@ func ReplaceMultipleGraphConfigChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (replac
 			}
 
 			// 更新指标id
-			//sql = `UPDATE multiple_graph_config_edb_mapping SET edb_info_id=?, modify_time=? WHERE edb_info_id=? and multiple_graph_config_id IN (` + numStr + `)`
-			//_, err = to.Raw(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId, configIds).Exec()
-			//if err != nil {
-			//	errmsg = "更新指标id关联图表配置信息失败：Err:" + err.Error()
-			//	return
-			//}
-
 			sql = `UPDATE multiple_graph_config_edb_mapping SET edb_info_id=?, modify_time=? WHERE edb_info_id=? and multiple_graph_config_id IN (` + numStr + `)`
 			err = to.Exec(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId, configIds).Error
 			if err != nil {
@@ -256,13 +160,6 @@ func ReplaceMultipleGraphConfigChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (replac
 	}
 
 	// 更新相关性图表中的
-	//sql := `UPDATE chart_info_correlation SET edb_info_id_first=?, modify_time=? WHERE edb_info_id_first=?`
-	//_, err = to.Raw(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId).Exec()
-	//if err != nil {
-	//	errmsg = "更新相关性图表中的指标id关联失败：Err:" + err.Error()
-	//	return
-	//}
-
 	sql := `UPDATE chart_info_correlation SET edb_info_id_first=?, modify_time=? WHERE edb_info_id_first=?`
 	err = to.Exec(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId).Error
 	if err != nil {
@@ -270,13 +167,6 @@ func ReplaceMultipleGraphConfigChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (replac
 		return
 	}
 
-	//sql = `UPDATE chart_info_correlation SET edb_info_id_second=?, modify_time=? WHERE edb_info_id_second=?`
-	//_, err = to.Raw(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId).Exec()
-	//if err != nil {
-	//	errmsg = "更新相关性图表中的指标id关联失败：Err:" + err.Error()
-	//	return
-	//}
-
 	sql = `UPDATE chart_info_correlation SET edb_info_id_second=?, modify_time=? WHERE edb_info_id_second=?`
 	err = to.Exec(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId).Error
 	if err != nil {
@@ -285,14 +175,6 @@ func ReplaceMultipleGraphConfigChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (replac
 	}
 
 	// 替换拟合方程曲线替换指标
-	// 替换跨品种标签绑定得到指标ID
-	//sql = `UPDATE chart_tag_variety SET edb_info_id=?, modify_time=? WHERE edb_info_id=?`
-	//_, err = to.Raw(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId).Exec()
-	//if err != nil {
-	//	errmsg = "更新指标id关联跨品种分析标签失败：Err:" + err.Error()
-	//	return
-	//}
-
 	sql = `UPDATE chart_tag_variety SET edb_info_id=?, modify_time=? WHERE edb_info_id=?`
 	err = to.Exec(sql, newEdbInfo.EdbInfoId, time.Now(), oldEdbInfo.EdbInfoId).Error
 	if err != nil {

models/data_manage/multiple_graph_config_edb_mapping.go

@@ -18,33 +18,18 @@ type MultipleGraphConfigEdbMapping struct {
 
 // AddMultipleGraphConfigEdbMapping 新增多图配置
 func AddMultipleGraphConfigEdbMapping(item *MultipleGraphConfigEdbMapping) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//// 表格信息入库
-	//lastId, err := o.Insert(item)
-	//if err != nil {
-	//	return
-	//}
-	//item.Id = int(lastId)
-
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }
 
 // Update 更新 基础信息
 func (item *MultipleGraphConfigEdbMapping) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(item, cols...)
-
 	err = global.DmSQL["data"].Select(cols).Updates(item).Error
 	return
 }
 
 // GetMultipleGraphConfigEdbMappingByIdAndSource 根据配置id和来源获取关联关系
 func GetMultipleGraphConfigEdbMappingByIdAndSource(configId, source int) (item *MultipleGraphConfigEdbMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM multiple_graph_config_edb_mapping WHERE multiple_graph_config_id = ? AND source = ? `
-	//err = o.Raw(sql, configId, source).QueryRow(&item)
-
 	sql := `SELECT * FROM multiple_graph_config_edb_mapping WHERE multiple_graph_config_id = ? AND source = ? `
 	err = global.DmSQL["data"].Raw(sql, configId, source).First(&item).Error
 	return
@@ -52,20 +37,12 @@ func GetMultipleGraphConfigEdbMappingByIdAndSource(configId, source int) (item *
 
 // GetMultipleGraphConfigEdbMappingListById 根据配置id获取所有关联关系
 func GetMultipleGraphConfigEdbMappingListById(configId int) (items []*MultipleGraphConfigEdbMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM multiple_graph_config_edb_mapping WHERE multiple_graph_config_id = ? `
-	//_, err = o.Raw(sql, configId).QueryRows(&items)
-
 	sql := `SELECT * FROM multiple_graph_config_edb_mapping WHERE multiple_graph_config_id = ? `
 	err = global.DmSQL["data"].Raw(sql, configId).Find(&items).Error
 	return
 }
 
 func GetMultipleGraphConfigEdbMappingListByIdAndSource(configId, source int) (items []*MultipleGraphConfigEdbMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM multiple_graph_config_edb_mapping WHERE multiple_graph_config_id = ? AND source = ? `
-	//_, err = o.Raw(sql, configId, source).QueryRows(&items)
-
 	sql := `SELECT * FROM multiple_graph_config_edb_mapping WHERE multiple_graph_config_id = ? AND source = ? `
 	err = global.DmSQL["data"].Raw(sql, configId, source).Find(&items).Error
 	return
@@ -73,37 +50,17 @@ func GetMultipleGraphConfigEdbMappingListByIdAndSource(configId, source int) (it
 
 // AddMultipleGraphConfigEdbMappingList 新增多图配置
 func AddMultipleGraphConfigEdbMappingList(items []*MultipleGraphConfigEdbMapping) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.InsertMulti(len(items), items)
-
 	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func DeleteMultipleGraphConfigEdbMappingByEdbIds(configId, source int, edbIds []int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `DELETE FROM multiple_graph_config_edb_mapping WHERE multiple_graph_config_id = ? AND source = ? AND edb_info_id IN (` + utils.GetOrmInReplace(len(edbIds)) + `) `
-	//_, err = o.Raw(sql, configId, source, edbIds).Exec()
-
 	sql := `DELETE FROM multiple_graph_config_edb_mapping WHERE multiple_graph_config_id = ? AND source = ? AND edb_info_id IN (` + utils.GetOrmInReplace(len(edbIds)) + `) `
 	err = global.DmSQL["data"].Exec(sql, configId, source, edbIds).Error
 	return
 }
 
 func DeleteMultipleGraphConfigByChartInfoId(chartInfoId, configId, source int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {

models/data_manage/my_chart.go

@@ -14,20 +14,10 @@ type ChartListResp struct {
 }
 
 func GetChartListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*ChartInfoView, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM chart_info WHERE 1=1 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	////sql += " ORDER BY sort ASC,chart_info_id DESC LIMIT ?,? "
-	//sql += " ORDER BY create_time DESC LIMIT ?,? "
-	//_, err = o.Raw(sql, pars...).QueryRows(&item)
-
 	sql := ` SELECT * FROM chart_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	//sql += " ORDER BY sort ASC,chart_info_id DESC LIMIT ?,? "
 	sql += " ORDER BY create_time DESC LIMIT ?,? "
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
@@ -36,13 +26,6 @@ func GetChartListByCondition(condition string, pars []interface{}, startSize, pa
 }
 
 func GetChartListCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count FROM chart_info WHERE 1=1 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//err = o.Raw(sql, pars).QueryRow(&count)
-
 	sql := ` SELECT COUNT(1) AS count FROM chart_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -66,18 +49,11 @@ type MyChartClassify struct {
 }
 
 func AddMyChartClassify(item *MyChartClassify) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Insert(item)
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }
 
 func GetMyChartClassifyAll(adminId int) (item []*MyChartClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM my_chart_classify WHERE 1=1 AND admin_id=? `
-	//sql += " ORDER BY sort asc, my_chart_classify_id asc "
-	//_, err = o.Raw(sql, adminId).QueryRows(&item)
-
 	sql := ` SELECT * FROM my_chart_classify WHERE 1=1 AND admin_id=? `
 	sql += " ORDER BY sort asc, my_chart_classify_id asc "
 	err = global.DmSQL["data"].Raw(sql, adminId).Find(&item).Error
@@ -85,11 +61,6 @@ func GetMyChartClassifyAll(adminId int) (item []*MyChartClassify, err error) {
 }
 
 func GetPublicChartClassifyAllExceptMy(adminId int) (item []*MyChartClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM my_chart_classify WHERE 1=1 AND is_public=1 AND admin_id !=?`
-	//sql += " ORDER BY public_time asc"
-	//_, err = o.Raw(sql, adminId).QueryRows(&item)
-
 	sql := ` SELECT * FROM my_chart_classify WHERE 1=1 AND is_public=1 AND admin_id !=?`
 	sql += " ORDER BY public_time asc"
 	err = global.DmSQL["data"].Raw(sql, adminId).Find(&item).Error
@@ -129,13 +100,6 @@ type MyChartClassifyAddReq struct {
 }
 
 func GetMyChartClassifyCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count FROM my_chart_classify WHERE 1=1 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//err = o.Raw(sql, pars).QueryRow(&count)
-
 	sql := ` SELECT COUNT(1) AS count FROM my_chart_classify WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -145,29 +109,13 @@ func GetMyChartClassifyCountByCondition(condition string, pars []interface{}) (c
 }
 
 func GetMyChartClassifyById(adminId, myChartClassifyId int) (item *MyChartClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM my_chart_classify WHERE admin_id=? AND my_chart_classify_id=? `
-	//err = o.Raw(sql, adminId, myChartClassifyId).QueryRow(&item)
-
 	sql := ` SELECT * FROM my_chart_classify WHERE admin_id=? AND my_chart_classify_id=? `
 	err = global.DmSQL["data"].Raw(sql, adminId, myChartClassifyId).First(&item).Error
 	return
 }
 
-//// GetMyChartClassifyMastSort 获取MY ETA 分类中排序最大的值
-//func GetMyChartClassifyMastSort(adminId int) (sort int, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT MAX(sort) sort FROM my_chart_classify WHERE admin_id=? `
-//	err = o.Raw(sql, adminId).QueryRow(&sort)
-//	return
-//}
-
 // GetMyChartClassifyMinSort 获取MY ETA 分类中排序最小的值
 func GetMyChartClassifyMinSort(adminId int) (sort int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT MIN(sort) sort FROM my_chart_classify WHERE admin_id=? `
-	//err = o.Raw(sql, adminId).QueryRow(&sort)
-
 	sql := ` SELECT COALESCE(MIN(sort), 0) as sort FROM my_chart_classify WHERE admin_id=? `
 	err = global.DmSQL["data"].Raw(sql, adminId).Scan(&sort).Error
 	return
@@ -186,10 +134,6 @@ type MyChartClassifyMoveReq struct {
 }
 
 func ModifyMyChartClassify(myChartClassifyId int, myChartClassifyName string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `UPDATE my_chart_classify SET my_chart_classify_name=?,modify_time=NOW() WHERE my_chart_classify_id=?`
-	//_, err = o.Raw(sql, myChartClassifyName, myChartClassifyId).Exec()
-
 	sql := `UPDATE my_chart_classify SET my_chart_classify_name=?,modify_time=NOW() WHERE my_chart_classify_id=?`
 	err = global.DmSQL["data"].Exec(sql, myChartClassifyName, myChartClassifyId).Error
 	return
@@ -200,17 +144,6 @@ type MyChartClassifyDeleteReq struct {
 }
 
 func DeleteMyChartClassify(myChartClassifyId int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//o.Begin()
-	//
-	//defer func() {
-	//	if err != nil {
-	//		o.Rollback()
-	//	} else {
-	//		o.Commit()
-	//	}
-	//}()
-
 	sql := `DELETE FROM my_chart_classify WHERE my_chart_classify_id=?`
 	err = global.DmSQL["data"].Exec(sql, myChartClassifyId).Error
 	if err != nil {
@@ -272,9 +205,6 @@ type MyChartView struct {
 }
 
 func AddMyChart(item *MyChart) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err = o.Insert(item)
-
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }
@@ -290,18 +220,11 @@ type MyChartClassifyMapping struct {
 }
 
 func AddMyChartClassifyMapping(item *MyChartClassifyMapping) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err = o.Insert(item)
-
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }
 
 func GetMyChartClassifyMapping(adminId, myChartId, myChartClassifyId int) (item *MyChartClassifyMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM my_chart_classify_mapping WHERE admin_id=? AND my_chart_id=? AND my_chart_classify_id=? `
-	//err = o.Raw(sql, adminId, myChartId, myChartClassifyId).QueryRow(&item)
-
 	sql := `SELECT * FROM my_chart_classify_mapping WHERE admin_id=? AND my_chart_id=? AND my_chart_classify_id=? `
 	err = global.DmSQL["data"].Raw(sql, adminId, myChartId, myChartClassifyId).First(&item).Error
 	return
@@ -313,7 +236,6 @@ type MyChartDeleteReq struct {
 }
 
 func DeleteMyChart(myChartId, myChartClassifyId int) (isDelMyChart bool, err error) {
-	//o := orm.NewOrmUsingDB("data")
 	if myChartClassifyId > 0 {
 		sql := `DELETE FROM my_chart_classify_mapping WHERE my_chart_id=? AND my_chart_classify_id=? `
 		err = global.DmSQL["data"].Exec(sql, myChartId, myChartClassifyId).Error
@@ -385,25 +307,7 @@ type MyChartListResp struct {
 }
 
 func GetMyChartListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*MyChartList, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//
-	//field := `a.my_chart_id,c.admin_id,c.sort,c.create_time as c_ctime,b.chart_info_id,b.chart_name,b.chart_name_en,b.chart_classify_id,b.sys_user_id,b.sys_user_real_name,b.unique_code,b.create_time,b.modify_time,b.date_type,b.start_date,b.end_date,b.is_set_name,b.edb_info_ids,b.chart_type,b.calendar,b.season_start_date,b.season_end_date,b.chart_image,b.edb_end_date,b.disabled,b.source,b.is_join_permission `
-	////MyChartClassifyName string `description:"分类名称，多个用英文逗号分割"`
-	////MyChartClassifyId   string `description:"分类id，多个用英文逗号分割"`
-	//sql := ` SELECT * FROM ( SELECT ` + field + ` FROM my_chart AS a
-	//		INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
-	//		INNER JOIN my_chart_classify_mapping AS c ON a.my_chart_id=c.my_chart_id
-	//		INNER JOIN my_chart_classify AS d ON c.my_chart_classify_id=d.my_chart_classify_id
-	//		WHERE 1=1 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += " GROUP BY a.chart_info_id) AS f ORDER BY sort ASC,c_ctime desc LIMIT ?,? "
-	//_, err = o.Raw(sql, pars...).QueryRows(&item)
-
 	field := `a.my_chart_id,c.admin_id,c.sort,c.create_time as c_ctime,b.chart_info_id,b.chart_name,b.chart_name_en,b.chart_classify_id,b.sys_user_id,b.sys_user_real_name,b.unique_code,b.create_time,b.modify_time,b.date_type,b.start_date,b.end_date,b.is_set_name,b.edb_info_ids,b.chart_type,b.calendar,b.season_start_date,b.season_end_date,b.chart_image,b.edb_end_date,b.disabled,b.source,b.is_join_permission `
-	//MyChartClassifyName string `description:"分类名称，多个用英文逗号分割"`
-	//MyChartClassifyId   string `description:"分类id，多个用英文逗号分割"`
 	sql := ` SELECT * FROM ( SELECT ` + field + ` FROM my_chart AS a
 			INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
 			INNER JOIN my_chart_classify_mapping AS c ON a.my_chart_id=c.my_chart_id
@@ -421,18 +325,6 @@ func GetMyChartListByCondition(condition string, pars []interface{}, startSize,
 }
 
 func GetMyChartListCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` select a.* from my_chart AS a
-	//		INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
-	//		INNER JOIN my_chart_classify_mapping AS c ON a.my_chart_id=c.my_chart_id
-	//		INNER JOIN my_chart_classify AS d ON c.my_chart_classify_id=d.my_chart_classify_id
-	//		WHERE 1=1`
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql1 := ` SELECT COUNT(1) AS count FROM (` + sql + ` GROUP BY a.chart_info_id ) d`
-	//err = o.Raw(sql1, pars).QueryRow(&count)
-
 	sql := ` select a.* from my_chart AS a
 			INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
 			INNER JOIN my_chart_classify_mapping AS c ON a.my_chart_id=c.my_chart_id
@@ -447,10 +339,6 @@ func GetMyChartListCountByCondition(condition string, pars []interface{}) (count
 }
 
 func GetMyChartMaxSort(adminId, myChartClassifyId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count FROM my_chart_classify_mapping WHERE 1=1 AND admin_id=? AND my_chart_classify_id=? `
-	//err = o.Raw(sql, adminId, myChartClassifyId).QueryRow(&count)
-
 	sql := ` SELECT COUNT(1) AS count FROM my_chart_classify_mapping WHERE 1=1 AND admin_id=? AND my_chart_classify_id=? `
 	err = global.DmSQL["data"].Raw(sql, adminId, myChartClassifyId).Scan(&count).Error
 	return
@@ -464,10 +352,6 @@ type MoveMyChartReq struct {
 }
 
 func MyChartMove(sort float64, adminId int, myChartId, myChartClassifyId int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` UPDATE my_chart_classify_mapping SET sort = ?,modify_time=NOW() WHERE admin_id=? AND my_chart_id=? AND my_chart_classify_id=? `
-	//_, err = o.Raw(sql, sort, adminId, myChartId, myChartClassifyId).Exec()
-
 	sql := ` UPDATE my_chart_classify_mapping SET sort = ?,modify_time=NOW() WHERE admin_id=? AND my_chart_id=? AND my_chart_classify_id=? `
 	err = global.DmSQL["data"].Exec(sql, sort, adminId, myChartId, myChartClassifyId).Error
 	return
@@ -475,12 +359,6 @@ func MyChartMove(sort float64, adminId int, myChartId, myChartClassifyId int) (e
 
 // UpdateMyChartSortByClassifyId 根据分类id更新排序
 func UpdateMyChartSortByClassifyId(myChartClassifyId, nowSort int, prevMyChartClassifyMappingId int, updateSort string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` update my_chart_classify_mapping set sort = ` + updateSort + ` WHERE my_chart_classify_id=? AND `
-	//if prevMyChartClassifyMappingId > 0 {
-	//	sql += ` ( sort > ? or ( my_chart_classify_mapping_id < ? and sort=? )) `
-	//}
-	//_, err = o.Raw(sql, myChartClassifyId, nowSort, prevMyChartClassifyMappingId, nowSort).Exec()
 	sql := ` update my_chart_classify_mapping set sort = ` + updateSort + ` WHERE my_chart_classify_id=? AND `
 	if prevMyChartClassifyMappingId > 0 {
 		sql += ` ( sort > ? or ( my_chart_classify_mapping_id < ? and sort=? )) `
@@ -489,34 +367,11 @@ func UpdateMyChartSortByClassifyId(myChartClassifyId, nowSort int, prevMyChartCl
 	return
 }
 
-//func GetMyChartMinSortByAdminId(adminId int) (item *MyChart, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT * FROM my_chart WHERE admin_id=? ORDER BY sort ASC LIMIT 1`
-//	err = o.Raw(sql, adminId).QueryRow(&item)
-//	return
-//}
-
 type ChartRecommendListResp struct {
 	List []*ChartInfoView
 }
 
 func GetChartClassify(chartClassifyId int) (chart_classify_id string, err error) {
-	//	o := orm.NewOrmUsingDB("data")
-	//	sql := `SELECT GROUP_CONCAT(t.chart_classify_id) AS chart_classify_id FROM (
-	//			SELECT a.chart_classify_id FROM chart_classify AS a
-	//			WHERE a.chart_classify_id=?
-	//			UNION ALL
-	//			SELECT a.chart_classify_id FROM chart_classify AS a
-	//			WHERE a.parent_id=? UNION ALL
-	//	SELECT
-	//		chart_classify_id
-	//	FROM
-	//		chart_classify
-	//WHERE
-	//	parent_id IN ( SELECT chart_classify_id FROM chart_classify WHERE parent_id = ? )
-	//			)AS t`
-	//	err = o.Raw(sql, chartClassifyId, chartClassifyId, chartClassifyId).QueryRow(&chart_classify_id)
-
 	sql := `SELECT LISTAGG(t.chart_classify_id, ',') WITHIN GROUP (ORDER BY t.chart_classify_id) AS chart_classify_id FROM (
 				SELECT a.chart_classify_id FROM chart_classify AS a
 				WHERE a.chart_classify_id=?
@@ -535,15 +390,6 @@ func GetChartClassify(chartClassifyId int) (chart_classify_id string, err error)
 }
 
 func GetRecommendChartListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*ChartInfoView, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT b.* FROM my_chart AS a
-	//		INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += " ORDER BY a.create_time DESC LIMIT ?,? "
-	//_, err = o.Raw(sql, pars...).QueryRows(&item)
-
 	sql := ` SELECT b.* FROM my_chart AS a
 			INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id `
 	if condition != "" {
@@ -558,18 +404,6 @@ func GetRecommendChartListByCondition(condition string, pars []interface{}, star
 }
 
 func GetMyChartListByAdminId(adminId int) (item []*MyChartView, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	////sql := ` SELECT * FROM my_chart WHERE 1=1 AND admin_id=? `
-	//
-	//sql := ` SELECT a.*,GROUP_CONCAT(c.my_chart_classify_id SEPARATOR ',') AS my_chart_classify_id FROM my_chart AS a
-	//		LEFT JOIN  my_chart_classify_mapping AS b ON a.my_chart_id=b.my_chart_id AND a.admin_id=b.admin_id
-	//		LEFT JOIN my_chart_classify AS c ON b.my_chart_classify_id=c.my_chart_classify_id AND b.admin_id=c.admin_id
-	//		WHERE 1=1 AND a.admin_id=?
-	//		GROUP BY a.chart_info_id `
-	//_, err = o.Raw(sql, adminId).QueryRows(&item)
-
-	//sql := ` SELECT * FROM my_chart WHERE 1=1 AND admin_id=? `
-
 	sql := ` SELECT 
            a.my_chart_id,a.chart_info_id,a.source,a.admin_id,a.create_time,a.modify_time,LISTAGG(c.my_chart_classify_id, ',') WITHIN GROUP (ORDER BY c.my_chart_classify_id) AS my_chart_classify_id
             FROM my_chart AS a
@@ -589,20 +423,6 @@ func GetMyChartListByAdminId(adminId int) (item []*MyChartView, err error) {
 }
 
 func GetMyChartSearchByCondition(condition string, pars []interface{}) (item []*MyChartList, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT a.my_chart_id,c.sort,b.*,GROUP_CONCAT(DISTINCT d.my_chart_classify_name) AS my_chart_classify_name,GROUP_CONCAT(DISTINCT d.my_chart_classify_id) AS my_chart_classify_id
-	//		FROM  my_chart AS a
-	//		INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
-	//		INNER JOIN my_chart_classify_mapping AS c ON a.my_chart_id=c.my_chart_id
-	//		INNER JOIN my_chart_classify AS d ON c.my_chart_classify_id=d.my_chart_classify_id
-	//		WHERE 1=1 `
-	//
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += " GROUP BY a.chart_info_id ORDER BY c.sort DESC "
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
-
 	sql := ` SELECT a.my_chart_id,c.sort,b.*,GROUP_CONCAT(DISTINCT d.my_chart_classify_name) AS my_chart_classify_name,GROUP_CONCAT(DISTINCT d.my_chart_classify_id) AS my_chart_classify_id
 			FROM  my_chart AS a
 			INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
@@ -630,12 +450,6 @@ type MyChartEditReq struct {
 }
 
 func GetMyChartClassifyMappingCount(adminId, myChartId, myChartClassifyId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count
-	//		FROM  my_chart_classify_mapping
-	//		WHERE 1=1 AND admin_id=? AND my_chart_id=? AND my_chart_classify_id=? `
-	//err = o.Raw(sql, adminId, myChartId, myChartClassifyId).QueryRow(&count)
-
 	sql := ` SELECT COUNT(1) AS count
 			FROM  my_chart_classify_mapping
 			WHERE 1=1 AND admin_id=? AND my_chart_id=? AND my_chart_classify_id=? `
@@ -644,11 +458,6 @@ func GetMyChartClassifyMappingCount(adminId, myChartId, myChartClassifyId int) (
 }
 
 func DeleteMyChartClassifyMapping(adminId, myChartId, myChartClassifyId int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` DELETE FROM my_chart_classify_mapping
-	//		WHERE admin_id=? AND my_chart_id=? AND my_chart_classify_id=? `
-	//_, err = o.Raw(sql, adminId, myChartId, myChartClassifyId).Exec()
-
 	sql := ` DELETE FROM my_chart_classify_mapping
 			WHERE admin_id=? AND my_chart_id=? AND my_chart_classify_id=? `
 	err = global.DmSQL["data"].Exec(sql, adminId, myChartId, myChartClassifyId).Error
@@ -656,15 +465,6 @@ func DeleteMyChartClassifyMapping(adminId, myChartId, myChartClassifyId int) (er
 }
 
 func GetMyChartSort(adminId, myChartClassifyId, sort int) (item *MyChartClassifyMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM my_chart_classify_mapping WHERE 1=1 AND admin_id=? AND my_chart_classify_id=? `
-	//if sort == 1 {
-	//	sql += ` ORDER BY sort DESC,my_chart_classify_mapping_id ASC LIMIT 1 `
-	//} else {
-	//	sql += ` ORDER BY sort ASC,my_chart_classify_mapping_id DESC LIMIT 1 `
-	//}
-	//err = o.Raw(sql, adminId, myChartClassifyId).QueryRow(&item)
-
 	sql := ` SELECT * FROM my_chart_classify_mapping WHERE 1=1 AND admin_id=? AND my_chart_classify_id=? `
 	if sort == 1 {
 		sql += ` ORDER BY sort DESC,my_chart_classify_mapping_id ASC LIMIT 1 `
@@ -676,19 +476,6 @@ func GetMyChartSort(adminId, myChartClassifyId, sort int) (item *MyChartClassify
 }
 
 func GetMyChartByCondition(condition string, pars []interface{}) (item []*MyChartView, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	////sql := ` SELECT * FROM my_chart WHERE 1=1 `
-	//sql := `SELECT a.*,GROUP_CONCAT(c.my_chart_classify_id SEPARATOR ',') AS my_chart_classify_id FROM my_chart AS a
-	//		LEFT JOIN  my_chart_classify_mapping AS b ON a.my_chart_id=b.my_chart_id AND a.admin_id=b.admin_id
-	//		LEFT JOIN my_chart_classify AS c ON b.my_chart_classify_id=c.my_chart_classify_id AND b.admin_id=c.admin_id
-	//		WHERE 1=1
-	//		`
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += ` GROUP BY a.chart_info_id  `
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
-
 	sql := `SELECT a.my_chart_id,a.chart_info_id,a.source,a.admin_id,a.create_time,a.modify_time,LISTAGG(c.my_chart_classify_id, ',') WITHIN GROUP (ORDER BY c.my_chart_classify_id) AS my_chart_classify_id
             FROM my_chart AS a
 			LEFT JOIN  my_chart_classify_mapping AS b ON a.my_chart_id=b.my_chart_id AND a.admin_id=b.admin_id
@@ -711,13 +498,6 @@ func GetMyChartByCondition(condition string, pars []interface{}) (item []*MyChar
 }
 
 func GetMyChartDetailByCondition(condition string, pars []interface{}) (item *MyChartView, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM my_chart WHERE 1=1 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//err = o.Raw(sql, pars).QueryRow(&item)
-
 	sql := ` SELECT * FROM my_chart WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -727,19 +507,6 @@ func GetMyChartDetailByCondition(condition string, pars []interface{}) (item *My
 }
 
 func MoveMyChartClassify(adminId, myChartId int, myChartClassifyId []int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -756,12 +523,6 @@ func MoveMyChartClassify(adminId, myChartId int, myChartClassifyId []int) (err e
 	}
 
 	mappingList := make([]*MyChartClassifyMapping, 0)
-	//sql := `SELECT * FROM my_chart_classify_mapping WHERE admin_id=? AND my_chart_id=?`
-	//_, err = to.Raw(sql, adminId, myChartId).QueryRows(&mappingList)
-	//if err != nil {
-	//	return
-	//}
-
 	sql := `SELECT * FROM my_chart_classify_mapping WHERE admin_id=? AND my_chart_id=?`
 	err = to.Raw(sql, adminId, myChartId).Find(&mappingList).Error
 	if err != nil {
@@ -770,12 +531,6 @@ func MoveMyChartClassify(adminId, myChartId int, myChartClassifyId []int) (err e
 
 	for _, v := range mappingList {
 		if _, ok := classifyIdMap[v.MyChartClassifyId]; !ok {
-			//sql := ` DELETE FROM my_chart_classify_mapping WHERE my_chart_classify_mapping_id=? `
-			//_, err = to.Raw(sql, v.MyChartClassifyMappingId).Exec()
-			//if err != nil {
-			//	return
-			//}
-
 			sql := ` DELETE FROM my_chart_classify_mapping WHERE my_chart_classify_mapping_id=? `
 			err = to.Exec(sql, v.MyChartClassifyMappingId).Error
 			if err != nil {
@@ -783,12 +538,6 @@ func MoveMyChartClassify(adminId, myChartId int, myChartClassifyId []int) (err e
 			}
 		}
 	}
-	//sql := `DELETE FROM my_chart_classify_mapping WHERE admin_id=? AND my_chart_id=? `
-	//_, err = to.Raw(sql, adminId, myChartId).Exec()
-	//if err != nil {
-	//	return err
-	//}
-	//step := float64(65536)
 	for _, v := range myChartClassifyId {
 		var count int
 		sql := ` SELECT COUNT(1) AS count FROM my_chart_classify_mapping WHERE my_chart_id=? AND my_chart_classify_id=? `
@@ -822,18 +571,12 @@ func MoveMyChartClassify(adminId, myChartId int, myChartClassifyId []int) (err e
 
 // Update 更新分类基础信息
 func (myChartClassify *MyChartClassify) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(myChartClassify, cols...)
 	err = global.DmSQL["data"].Select(cols).Updates(myChartClassify).Error
 	return
 }
 
 // GetFirstMyChartClassifyByAdminId 获取当前账号下，排序第一条的分类数据
 func GetFirstMyChartClassifyByAdminId(adminId int) (item *MyChartClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM my_chart_classify WHERE admin_id=? order by sort asc,my_chart_classify_id asc limit 1`
-	//err = o.Raw(sql, adminId).QueryRow(&item)
-
 	sql := ` SELECT * FROM my_chart_classify WHERE admin_id=? order by sort asc,my_chart_classify_id asc limit 1`
 	err = global.DmSQL["data"].Raw(sql, adminId).First(&item).Error
 	return
@@ -841,13 +584,6 @@ func GetFirstMyChartClassifyByAdminId(adminId int) (item *MyChartClassify, err e
 
 // UpdateMyChartClassifySortByClassifyId 根据分类id更新排序
 func UpdateMyChartClassifySortByClassifyId(adminId, classifyId, nowSort int, updateSort string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` update my_chart_classify set sort = ` + updateSort + ` WHERE admin_id = ? and sort > ? `
-	//if classifyId > 0 {
-	//	sql += ` or ( my_chart_classify_id > ` + fmt.Sprint(classifyId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
-	//}
-	//_, err = o.Raw(sql, adminId, nowSort).Exec()
-
 	sql := ` update my_chart_classify set sort = ` + updateSort + ` WHERE admin_id = ? and sort > ? `
 	if classifyId > 0 {
 		sql += ` or ( my_chart_classify_id > ` + fmt.Sprint(classifyId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
@@ -869,10 +605,6 @@ type CopyChartClassifyReq struct {
 
 // GetPublicMyChartClassifyById 根据分类ID获取公开分类
 func GetPublicMyChartClassifyById(myChartClassifyId int) (item *MyChartClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM my_chart_classify WHERE is_public=1 AND my_chart_classify_id=? `
-	//err = o.Raw(sql, myChartClassifyId).QueryRow(&item)
-
 	sql := ` SELECT * FROM my_chart_classify WHERE is_public=1 AND my_chart_classify_id=? `
 	err = global.DmSQL["data"].Raw(sql, myChartClassifyId).First(&item).Error
 	return
@@ -880,19 +612,6 @@ func GetPublicMyChartClassifyById(myChartClassifyId int) (item *MyChartClassify,
 
 // CopyPublicMyChartClassifyById 根据分类ID获取公开分类
 func CopyPublicMyChartClassifyById(myChartClassifyId, adminId int, newMyChartClassifyName string) (newMyChartClassify *MyChartClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -940,10 +659,6 @@ WHERE b.my_chart_classify_id=?`
 		ModifyTime:          time.Now(),
 		Sort:                minSort - 1,
 	}
-	//newMyChartClassifyId, err := to.Insert(newMyChartClassify)
-	//if err != nil {
-	//	return
-	//}
 	err = to.Create(newMyChartClassify).Error
 	newMappingList := make([]*MyChartClassifyMapping, 0)
 
@@ -956,12 +671,6 @@ WHERE b.my_chart_classify_id=?`
 			CreateTime:  time.Now(),
 			ModifyTime:  time.Now(),
 		}
-		//tmpMyChartId, tmpErr := to.Insert(tmpMyChart)
-		//if tmpErr != nil {
-		//	err = tmpErr
-		//}
-		//tmpMyChart.MyChartId = int(tmpMyChartId)
-
 		tmpErr := to.Create(tmpMyChart)
 		if tmpErr != nil {
 			err = tmpErr.Error
@@ -1001,12 +710,6 @@ type ModifyChartClassifyCompanyPublicReq struct {
 
 // GetCompanyPublicClassifyList 获取用户可见的分类列表
 func GetCompanyPublicClassifyList(condition string, pars []interface{}) (item []*MyChartClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM my_chart_classify WHERE 1 = 1 AND is_public = 1 AND is_company_public = 1 `
-	//sql += condition
-	//sql += " ORDER BY public_time asc"
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
-
 	sql := ` SELECT * FROM my_chart_classify WHERE 1 = 1 AND is_public = 1 AND is_company_public = 1 `
 	sql += condition
 	sql += " ORDER BY public_time asc"
@@ -1016,19 +719,6 @@ func GetCompanyPublicClassifyList(condition string, pars []interface{}) (item []
 
 // GetMyChartClassifyList 获取我的图表关联的分类列表数据
 func GetMyChartClassifyList(myChartClassifyId int) (mappingList []*MyChartClassifyMapping, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	////o.Begin()
-	////
-	////defer func() {
-	////	if err != nil {
-	////		o.Rollback()
-	////	} else {
-	////		o.Commit()
-	////	}
-	////}()
-	//sql := `SELECT * FROM my_chart_classify_mapping WHERE my_chart_id=?`
-	//_, err = o.Raw(sql, myChartClassifyId).QueryRows(&mappingList)
-
 	sql := `SELECT * FROM my_chart_classify_mapping WHERE my_chart_id=?`
 	err = global.DmSQL["data"].Raw(sql, myChartClassifyId).Find(&mappingList).Error
 	return
@@ -1036,16 +726,6 @@ func GetMyChartClassifyList(myChartClassifyId int) (mappingList []*MyChartClassi
 
 // AddMyChartToMyChartClassify 添加我的图表至我的分类
 func AddMyChartToMyChartClassify(adminId, myChartId int, myChartClassifyId []int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//o.Begin()
-
-	//defer func() {
-	//	if err != nil {
-	//		o.Rollback()
-	//	} else {
-	//		o.Commit()
-	//	}
-	//}()
 	//需要添加的分类id 集合map
 	classifyIdMap := make(map[int]int)
 	for _, v := range myChartClassifyId {
@@ -1054,12 +734,6 @@ func AddMyChartToMyChartClassify(adminId, myChartId int, myChartClassifyId []int
 
 	//查询已存在系统中的图表分类集合
 	mappingList := make([]*MyChartClassifyMapping, 0)
-	//sql := `SELECT * FROM my_chart_classify_mapping WHERE admin_id=? AND my_chart_id=?`
-	//_, err = o.Raw(sql, adminId, myChartId).QueryRows(&mappingList)
-	//if err != nil {
-	//	return
-	//}
-
 	sql := `SELECT * FROM my_chart_classify_mapping WHERE admin_id=? AND my_chart_id=?`
 	err = global.DmSQL["data"].Raw(sql, adminId, myChartId).Find(&mappingList).Error
 	if err != nil {
@@ -1075,12 +749,6 @@ func AddMyChartToMyChartClassify(adminId, myChartId int, myChartClassifyId []int
 	step := float64(65536)
 	for _, v := range myChartClassifyId {
 		var count int
-		//sql := ` SELECT COUNT(1) AS count FROM my_chart_classify_mapping WHERE my_chart_id=? AND my_chart_classify_id=? `
-		//err = o.Raw(sql, myChartId, v).QueryRow(&count)
-		//if err != nil {
-		//	return
-		//}
-
 		sql := ` SELECT COUNT(1) AS count FROM my_chart_classify_mapping WHERE my_chart_id=? AND my_chart_classify_id=? `
 		err = global.DmSQL["data"].Raw(sql, myChartId, v).Scan(&count).Error
 		if err != nil {
@@ -1092,18 +760,6 @@ func AddMyChartToMyChartClassify(adminId, myChartId int, myChartClassifyId []int
 				return err
 			}
 			sort := (float64(total) + 1) * step
-			//sql = ` INSERT INTO my_chart_classify_mapping (
-			//	  admin_id,
-			//	  my_chart_id,
-			//	  my_chart_classify_id,
-			//	  create_time,
-			//	  modify_time,
-			//	  sort )VALUES (?,?,?,NOW(),NOW(),?) `
-			//_, err = o.Raw(sql, adminId, myChartId, v, sort).Exec()
-			//if err != nil {
-			//	return err
-			//}
-
 			sql = ` INSERT INTO my_chart_classify_mapping (
 				  admin_id,
 				  my_chart_id,
@@ -1123,32 +779,6 @@ func AddMyChartToMyChartClassify(adminId, myChartId int, myChartClassifyId []int
 
 // GetMyChartListGroupByCharyInfoIdAndAdminIdByCondition 获取MY ETA 图表数据，根据图表id和操作员id
 func GetMyChartListGroupByCharyInfoIdAndAdminIdByCondition(condition string, pars []interface{}) (item []*MyChartList, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT a.admin_id,a.my_chart_id,c.sort,b.*,GROUP_CONCAT(DISTINCT d.my_chart_classify_name) AS my_chart_classify_name,GROUP_CONCAT(DISTINCT d.my_chart_classify_id) AS my_chart_classify_id
-	//		FROM  my_chart AS a
-	//		INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
-	//		INNER JOIN my_chart_classify_mapping AS c ON a.my_chart_id=c.my_chart_id
-	//		INNER JOIN my_chart_classify AS d ON c.my_chart_classify_id=d.my_chart_classify_id
-	//		WHERE 1=1 `
-	//
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += " GROUP BY a.chart_info_id,a.admin_id ORDER BY c.sort DESC "
-	//_, err = o.Raw(sql, pars).QueryRows(&item)
-
-	//sql := ` SELECT a.admin_id,a.my_chart_id,c.sort,b.*,LISTAGG(DISTINCT d.my_chart_classify_name, ',') WITHIN GROUP (ORDER BY d.my_chart_classify_name) AS my_chart_classify_name,LISTAGG(d.my_chart_classify_id, ',') WITHIN GROUP (ORDER BY d.my_chart_classify_id) AS my_chart_classify_id
-	//		FROM  my_chart AS a
-	//		INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
-	//		INNER JOIN my_chart_classify_mapping AS c ON a.my_chart_id=c.my_chart_id
-	//		INNER JOIN my_chart_classify AS d ON c.my_chart_classify_id=d.my_chart_classify_id
-	//		WHERE 1=1 `
-	//
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += " GROUP BY a.chart_info_id,a.admin_id ORDER BY c.sort DESC "
-
 	sql := `SELECT a.admin_id,a.my_chart_id,c.sort,b.chart_info_id, b.chart_name, b.unique_code, b.chart_classify_id, b.sys_user_id, b.sys_user_real_name, b.create_time, b.modify_time, b.date_type, b.start_date, b.end_date, b.is_set_name, b.edb_info_ids, b.chart_type, b.calendar, b.season_start_date, b.season_end_date, b.chart_image, b.sort, b.edb_end_date, b.x_min, b.x_max, b.left_min, b.left_max, b.right_min, b.right_max, b.right2_min, b.right2_max, b.min_max_save, b.chart_name_en, b.disabled, b.source,  b.start_year, b.chart_theme_id,  b.unit, b.unit_en, b.is_join_permission, b.forum_chart_info_id, b.chart_alias, b.date_type_num,LISTAGG(DISTINCT d.my_chart_classify_name, ',') WITHIN GROUP (ORDER BY d.my_chart_classify_name) AS my_chart_classify_name,LISTAGG(d.my_chart_classify_id, ',') WITHIN GROUP (ORDER BY d.my_chart_classify_id) AS my_chart_classify_id
 FROM  my_chart AS a
 INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
@@ -1165,16 +795,6 @@ WHERE 1=1  `
 }
 
 func GetRelationChartListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*ChartInfoView, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT a.* FROM chart_info AS a
-	//WHERE 1=1 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	////sql += " ORDER BY sort ASC,chart_info_id DESC LIMIT ?,? "
-	//sql += " ORDER BY a.create_time DESC LIMIT ?,? "
-	//_, err = o.Raw(sql, pars...).QueryRows(&item)
-
 	sql := ` SELECT a.* FROM chart_info AS a
 	WHERE 1=1 `
 	if condition != "" {
@@ -1190,14 +810,6 @@ func GetRelationChartListByCondition(condition string, pars []interface{}, start
 }
 
 func GetRelationChartListCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count FROM chart_info AS a
-	//WHERE 1=1 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//err = o.Raw(sql, pars).QueryRow(&count)
-
 	sql := ` SELECT COUNT(1) AS count FROM chart_info AS a
 	WHERE 1=1 `
 	if condition != "" {
@@ -1213,10 +825,6 @@ func GetChartInfoByIdList(chartInfoIdList []int) (items []*ChartInfo, err error)
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM chart_info WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, chartInfoIdList).QueryRows(&items)
-
 	sql := ` SELECT * FROM chart_info WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) `
 	err = global.DmSQL["data"].Raw(sql, chartInfoIdList).Find(&items).Error
 	return
@@ -1227,10 +835,6 @@ func GetChartInfoViewByIdList(chartInfoIdList []int) (items []*ChartInfoView, er
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM chart_info WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, chartInfoIdList).QueryRows(&items)
-
 	sql := ` SELECT * FROM chart_info WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) `
 	err = global.DmSQL["data"].Raw(sql, chartInfoIdList).Find(&items).Error
 	return
@@ -1238,10 +842,6 @@ func GetChartInfoViewByIdList(chartInfoIdList []int) (items []*ChartInfoView, er
 
 // GetMyChartClassifyByClassifyId 主键获取分类
 func GetMyChartClassifyByClassifyId(classifyId int) (item *MyChartClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM my_chart_classify WHERE my_chart_classify_id = ? `
-	//err = o.Raw(sql, classifyId).QueryRow(&item)
-
 	sql := ` SELECT * FROM my_chart_classify WHERE my_chart_classify_id = ? `
 	err = global.DmSQL["data"].Raw(sql, classifyId).First(&item).Error
 	return
@@ -1280,21 +880,6 @@ type MyChartClassifyIdAndNum struct {
 
 // GetMyChartClassifyIdAndNum 我的图表-获取分类ID及图表数
 func GetMyChartClassifyIdAndNum(cond string, pars []interface{}) (items []*MyChartClassifyIdAndNum, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := fmt.Sprintf(`SELECT
-	//		a.my_chart_classify_id,
-	//		COUNT(1) AS chart_num
-	//	FROM
-	//		my_chart_classify AS a
-	//	INNER JOIN my_chart_classify_mapping AS b ON a.my_chart_classify_id = b.my_chart_classify_id
-	//	INNER JOIN my_chart AS c ON b.my_chart_id = c.my_chart_id
-	//	INNER JOIN chart_info AS d ON c.chart_info_id = d.chart_info_id
-	//	WHERE
-	//		1 = 1 %s
-	//	GROUP BY
-	//		a.my_chart_classify_id`, cond)
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
-
 	sql := fmt.Sprintf(`SELECT
 			a.my_chart_classify_id,
 			COUNT(1) AS chart_num

models/data_manage/my_chart_log.go

@@ -18,8 +18,6 @@ type MyChartLog struct {
 }
 
 func AddMyChartLog(item *MyChartLog) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }

models/data_manage/mysteel_chemical_classify.go

@@ -23,8 +23,6 @@ type BaseFromMysteelChemicalClassify struct {
 
 // AddBaseFromMysteelChemicalClassify 添加钢联化工分类
 func AddBaseFromMysteelChemicalClassify(item *BaseFromMysteelChemicalClassify) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err = o.Insert(item)
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }
@@ -38,10 +36,6 @@ func AddBaseFromMysteelChemicalClassify(item *BaseFromMysteelChemicalClassify) (
 // @return count int
 // @return err error
 func GetBaseFromMysteelChemicalClassifyCount(classifyName string, parentId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT COUNT(1) AS count FROM base_from_mysteel_chemical_classify WHERE classify_name=? AND parent_id=? `
-	//err = o.Raw(sql, classifyName, parentId).QueryRow(&count)
-
 	sql := `SELECT COUNT(1) AS count FROM base_from_mysteel_chemical_classify WHERE classify_name=? AND parent_id=? `
 	err = global.DmSQL["data"].Raw(sql, classifyName, parentId).Scan(&count).Error
 	return
@@ -56,10 +50,6 @@ func GetBaseFromMysteelChemicalClassifyCount(classifyName string, parentId int)
 // @return count int
 // @return err error
 func GetBaseFromMysteelChemicalClassifyEnCount(classifyNameEn string, parentId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT COUNT(1) AS count FROM base_from_mysteel_chemical_classify WHERE classify_name_en = ? AND parent_id=? `
-	//err = o.Raw(sql, classifyNameEn, parentId).QueryRow(&count)
-
 	sql := `SELECT COUNT(1) AS count FROM base_from_mysteel_chemical_classify WHERE classify_name_en = ? AND parent_id=? `
 	err = global.DmSQL["data"].Raw(sql, classifyNameEn, parentId).Scan(&count).Error
 	return
@@ -67,10 +57,6 @@ func GetBaseFromMysteelChemicalClassifyEnCount(classifyNameEn string, parentId i
 
 // GetBaseFromMysteelChemicalClassifyById 通过分类id的获取分类信息
 func GetBaseFromMysteelChemicalClassifyById(classifyId int) (item *BaseFromMysteelChemicalClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM base_from_mysteel_chemical_classify WHERE base_from_mysteel_chemical_classify_id=? `
-	//err = o.Raw(sql, classifyId).QueryRow(&item)
-
 	sql := `SELECT * FROM base_from_mysteel_chemical_classify WHERE base_from_mysteel_chemical_classify_id=? `
 	err = global.DmSQL["data"].Raw(sql, classifyId).First(&item).Error
 	return
@@ -78,9 +64,6 @@ func GetBaseFromMysteelChemicalClassifyById(classifyId int) (item *BaseFromMyste
 
 // EditBaseFromMysteelChemicalClassify 修改钢联化工分类
 func EditBaseFromMysteelChemicalClassify(classifyId int, classifyName string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `UPDATE base_from_mysteel_chemical_classify SET classify_name=?,modify_time=NOW() WHERE base_from_mysteel_chemical_classify_id=? `
-	//_, err = o.Raw(sql, classifyName, classifyId).Exec()
 	sql := `UPDATE base_from_mysteel_chemical_classify SET classify_name=?,modify_time=NOW() WHERE base_from_mysteel_chemical_classify_id=? `
 	err = global.DmSQL["data"].Exec(sql, classifyName, classifyId).Error
 	return
@@ -94,10 +77,6 @@ func EditBaseFromMysteelChemicalClassify(classifyId int, classifyName string) (e
 // @param classifyNameEn string
 // @return err error
 func EditBaseFromMysteelChemicalClassifyEn(classifyId int, classifyNameEn string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `UPDATE base_from_mysteel_chemical_classify SET classify_name_en = ?,modify_time=NOW() WHERE base_from_mysteel_chemical_classify_id=? `
-	//_, err = o.Raw(sql, classifyNameEn, classifyId).Exec()
-
 	sql := `UPDATE base_from_mysteel_chemical_classify SET classify_name_en = ?,modify_time=NOW() WHERE base_from_mysteel_chemical_classify_id=? `
 	err = global.DmSQL["data"].Exec(sql, classifyNameEn, classifyId).Error
 	return
@@ -133,10 +112,6 @@ type BaseFromMysteelChemicalClassifyItemsButton struct {
 
 // GetBaseFromMysteelChemicalClassifyByParentId 根据上级id获取当下的分类列表数据
 func GetBaseFromMysteelChemicalClassifyByParentId(parentId int) (items []*BaseFromMysteelChemicalClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM base_from_mysteel_chemical_classify WHERE parent_id=? order by sort asc,base_from_mysteel_chemical_classify_id asc`
-	//_, err = o.Raw(sql, parentId).QueryRows(&items)
-
 	sql := ` SELECT * FROM base_from_mysteel_chemical_classify WHERE parent_id=? order by sort asc,base_from_mysteel_chemical_classify_id asc`
 	err = global.DmSQL["data"].Raw(sql, parentId).Find(&items).Error
 	return
@@ -144,10 +119,6 @@ func GetBaseFromMysteelChemicalClassifyByParentId(parentId int) (items []*BaseFr
 
 // GetBaseFromMysteelChemicalClassifyByIds 根据id获取当下的分类列表数据
 func GetBaseFromMysteelChemicalClassifyByIds(classifyIds []int) (items []*BaseFromMysteelChemicalClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM base_from_mysteel_chemical_classify WHERE parent_id > 0 and base_from_mysteel_chemical_classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `) order by sort asc,base_from_mysteel_chemical_classify_id asc`
-	//_, err = o.Raw(sql, classifyIds).QueryRows(&items)
-
 	sql := ` SELECT * FROM base_from_mysteel_chemical_classify WHERE parent_id > 0 and base_from_mysteel_chemical_classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `) order by sort asc,base_from_mysteel_chemical_classify_id asc`
 	err = global.DmSQL["data"].Raw(sql, classifyIds).Find(&items).Error
 	return
@@ -155,10 +126,6 @@ func GetBaseFromMysteelChemicalClassifyByIds(classifyIds []int) (items []*BaseFr
 
 // GetAllBaseFromMysteelChemicalClassify 获取所有的分类列表数据
 func GetAllBaseFromMysteelChemicalClassify() (items []*BaseFromMysteelChemicalClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM base_from_mysteel_chemical_classify WHERE parent_id <> 0 order by sort asc,base_from_mysteel_chemical_classify_id asc`
-	//_, err = o.Raw(sql).QueryRows(&items)
-
 	sql := ` SELECT * FROM base_from_mysteel_chemical_classify WHERE parent_id <> 0 order by sort asc,base_from_mysteel_chemical_classify_id asc`
 	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
 	return
@@ -182,10 +149,6 @@ type BaseFromMysteelChemicalClassifySimplify struct {
 
 // GetFirstBaseFromMysteelChemicalClassify 获取当前分类下，且排序数相同 的排序第一条的数据
 func GetFirstBaseFromMysteelChemicalClassify() (item *BaseFromMysteelChemicalClassify, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM base_from_mysteel_chemical_classify order by sort asc,base_from_mysteel_chemical_classify_id asc limit 1`
-	//err = o.Raw(sql).QueryRow(&item)
-
 	sql := ` SELECT * FROM base_from_mysteel_chemical_classify order by sort asc,base_from_mysteel_chemical_classify_id asc limit 1`
 	err = global.DmSQL["data"].Raw(sql).First(&item).Error
 	return
@@ -193,13 +156,6 @@ func GetFirstBaseFromMysteelChemicalClassify() (item *BaseFromMysteelChemicalCla
 
 // UpdateBaseFromMysteelChemicalClassifySortByClassifyId 根据分类id更新排序
 func UpdateBaseFromMysteelChemicalClassifySortByClassifyId(parentId, classifyId, nowSort int, updateSort string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` update base_from_mysteel_chemical_classify set sort = ` + updateSort + ` WHERE parent_id=? AND sort > ? `
-	//if classifyId > 0 {
-	//	sql += ` or ( base_from_mysteel_chemical_classify_id > ` + fmt.Sprint(classifyId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
-	//}
-	//_, err = o.Raw(sql, parentId, nowSort).Exec()
-
 	sql := ` update base_from_mysteel_chemical_classify set sort = ` + updateSort + ` WHERE parent_id=? AND sort > ? `
 	if classifyId > 0 {
 		sql += ` or ( base_from_mysteel_chemical_classify_id > ` + fmt.Sprint(classifyId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
@@ -210,19 +166,12 @@ func UpdateBaseFromMysteelChemicalClassifySortByClassifyId(parentId, classifyId,
 
 // Update 更新分类基础信息
 func (BaseFromMysteelChemicalClassify *BaseFromMysteelChemicalClassify) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(BaseFromMysteelChemicalClassify, cols...)
-
 	err = global.DmSQL["data"].Select(cols).Updates(BaseFromMysteelChemicalClassify).Error
 	return
 }
 
 // GetBaseFromMysteelChemicalClassifyMaxSort 获取分类下最大的排序数
 func GetBaseFromMysteelChemicalClassifyMaxSort(parentId int) (sort int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT Max(sort) AS sort FROM base_from_mysteel_chemical_classify WHERE parent_id=? `
-	//err = o.Raw(sql, parentId).QueryRow(&sort)
-
 	sql := `SELECT Max(sort) AS sort FROM base_from_mysteel_chemical_classify WHERE parent_id=? `
 	err = global.DmSQL["data"].Raw(sql, parentId).Scan(&sort).Error
 	return
@@ -230,19 +179,6 @@ func GetBaseFromMysteelChemicalClassifyMaxSort(parentId int) (sort int, err erro
 
 // DeleteMysteelChemicalByClassifyId 根据分类id删除对应的指标分类、指标、指标数据
 func DeleteMysteelChemicalByClassifyId(classifyIdList []int, mysteelChemicalIndexIdList []int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -258,26 +194,12 @@ func DeleteMysteelChemicalByClassifyId(classifyIdList []int, mysteelChemicalInde
 		return
 	}
 
-	//删除分类
-	//sql := `DELETE FROM base_from_mysteel_chemical_classify  WHERE base_from_mysteel_chemical_classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = to.Raw(sql, classifyIdList).Exec()
-	//if err != nil {
-	//	return
-	//}
-
 	sql := `DELETE FROM base_from_mysteel_chemical_classify  WHERE base_from_mysteel_chemical_classify_id IN (` + utils.GetOrmInReplace(num) + `) `
 	err = to.Exec(sql, classifyIdList).Error
 	if err != nil {
 		return
 	}
 
-	//删除指标
-	//sql = `DELETE FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = to.Raw(sql, classifyIdList).Exec()
-	//if err != nil {
-	//	return
-	//}
-
 	sql = `DELETE FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_classify_id IN (` + utils.GetOrmInReplace(num) + `) `
 	err = to.Exec(sql, classifyIdList).Error
 	if err != nil {
@@ -287,12 +209,6 @@ func DeleteMysteelChemicalByClassifyId(classifyIdList []int, mysteelChemicalInde
 	//删除指标数据
 	indexNum := len(mysteelChemicalIndexIdList)
 	if indexNum > 0 {
-		//sql = `DELETE FROM base_from_mysteel_chemical_data WHERE base_from_mysteel_chemical_index_id in (` + utils.GetOrmInReplace(indexNum) + `) `
-		//_, err = to.Raw(sql, mysteelChemicalIndexIdList).Exec()
-		//if err != nil {
-		//	return
-		//}
-
 		sql = `DELETE FROM base_from_mysteel_chemical_data WHERE base_from_mysteel_chemical_index_id in (` + utils.GetOrmInReplace(indexNum) + `) `
 		err = to.Exec(sql, mysteelChemicalIndexIdList).Error
 		if err != nil {
@@ -305,19 +221,6 @@ func DeleteMysteelChemicalByClassifyId(classifyIdList []int, mysteelChemicalInde
 
 // DeleteMysteelChemical 根据指标id删除对应的指标指标、指标数据
 func DeleteMysteelChemical(mysteelChemicalIndexId int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//to, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = to.Rollback()
-	//	} else {
-	//		_ = to.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -335,13 +238,6 @@ func DeleteMysteelChemical(mysteelChemicalIndexId int) (err error) {
 		return
 	}
 
-	////删除指标数据
-	//sql = `DELETE FROM base_from_mysteel_chemical_data WHERE base_from_mysteel_chemical_index_id = ? `
-	//_, err = to.Raw(sql, mysteelChemicalIndexId).Exec()
-	//if err != nil {
-	//	return
-	//}
-
 	sql = `DELETE FROM base_from_mysteel_chemical_data WHERE base_from_mysteel_chemical_index_id = ? `
 	err = to.Exec(sql, mysteelChemicalIndexId).Error
 	if err != nil {

models/data_manage/mysteel_chemical_index.go

@@ -81,9 +81,6 @@ var BaseFromMysteelChemicalIndexCols = struct {
 
 // Update 更新钢联化工指标基础信息
 func (item *BaseFromMysteelChemicalIndex) Update(cols []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Update(item, cols...)
-
 	err = global.DmSQL["data"].Select(cols).Updates(item).Error
 	return
 }
@@ -92,20 +89,6 @@ func (m *BaseFromMysteelChemicalIndex) GeItemsByCondition(condition string, pars
 		pars = make([]interface{}, 0)
 	}
 
-	//sql := `select a.*,b.edb_info_id,b.unique_code as edb_unique_code,b.classify_id as edb_classify_id FROM base_from_mysteel_chemical_index AS a LEFT JOIN edb_info b on a.index_code=b.edb_code AND b.source=? WHERE 1=1 `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += ` order by a.base_from_mysteel_chemical_index_id desc `
-	//
-	//if limitSize > 0 {
-	//	sql += " limit ? "
-	//	pars = append(pars, limitSize)
-	//}
-	//
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Raw(sql, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, pars).QueryRows(&items)
-
 	sql := `select a.*,b.edb_info_id,b.unique_code as edb_unique_code,b.classify_id as edb_classify_id FROM base_from_mysteel_chemical_index AS a LEFT JOIN edb_info b on a.index_code=b.edb_code AND b.source=? WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -122,20 +105,12 @@ func (m *BaseFromMysteelChemicalIndex) GeItemsByCondition(condition string, pars
 
 // AddBaseFromMysteelChemicalIndex 添加钢联化工指标
 func AddBaseFromMysteelChemicalIndex(item *BaseFromMysteelChemicalIndex) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//lastId, err = o.Insert(item)
-	//if err != nil {
-	//	return
-	//}
-	//item.BaseFromMysteelChemicalIndexId = int(lastId)
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }
 
 // AddBaseFromMysteelChemicalIndex 添加钢联化工指标
 func BatchAddBaseFromMysteelChemicalIndex(items []*BaseFromMysteelChemicalIndex) (lastId int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.InsertMulti(len(items), items)
 	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
@@ -158,12 +133,6 @@ type MysteelChemicalFrequency struct {
 
 // GetMysteelChemicalIndexByClassifyId 用于分类展示
 func GetMysteelChemicalIndexByClassifyId(classifyId int) (items []*BaseFromMysteelChemicalClassifyItems, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT base_from_mysteel_chemical_index_id,base_from_mysteel_chemical_classify_id,index_name AS classify_name,
-	//         sys_user_id,sys_user_real_name,sort,index_code
-	//        FROM base_from_mysteel_chemical_index where base_from_mysteel_chemical_classify_id=? ORDER BY sort asc, create_time ASC `
-	//_, err = o.Raw(sql, classifyId).QueryRows(&items)
-
 	sql := ` SELECT base_from_mysteel_chemical_index_id,base_from_mysteel_chemical_classify_id,index_name AS classify_name,
 	        sys_user_id,sys_user_real_name,sort,index_code
 	       FROM base_from_mysteel_chemical_index where base_from_mysteel_chemical_classify_id=? ORDER BY sort asc, create_time ASC `
@@ -171,30 +140,8 @@ func GetMysteelChemicalIndexByClassifyId(classifyId int) (items []*BaseFromMyste
 	return
 }
 
-//// MysteelChemicalFrequencyByClassifyId 根据分类id获取钢联化工频度数据列表
-//func MysteelChemicalFrequencyByClassifyId(classifyId int) (items []*MysteelChemicalFrequency, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	if classifyId == 0 {
-//		sql := ` SELECT frequency  FROM base_from_mysteel_chemical_index WHERE frequency != "" GROUP BY frequency ORDER BY frequency ASC `
-//		_, err = o.Raw(sql).QueryRows(&items)
-//		return
-//	} else {
-//		sql := ` SELECT frequency  FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_classify_id = ? AND frequency != "" GROUP BY frequency ORDER BY frequency ASC `
-//		_, err = o.Raw(sql, classifyId).QueryRows(&items)
-//		return
-//	}
-//}
-
 // GetMysteelChemicalFrequency 获取钢联化工频度数据列表
 func GetMysteelChemicalFrequency(condition string, pars []interface{}) (items []*MysteelChemicalFrequency, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT frequency FROM base_from_mysteel_chemical_index WHERE 1=1 AND frequency != "" `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += ` GROUP BY frequency ORDER BY frequency ASC `
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
-
 	sql := ` SELECT frequency FROM base_from_mysteel_chemical_index WHERE 1=1 AND frequency != "" `
 	if condition != "" {
 		sql += condition
@@ -230,15 +177,6 @@ type MysteelChemicalData struct {
 
 // GetMysteelChemicalIndex 根据分类id获取钢联化工频度数据列表
 func GetMysteelChemicalIndex(condition string, pars []interface{}) (items []*MysteelChemicalList, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE 1=1 `
-	//
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += ` ORDER BY base_from_mysteel_chemical_index_id ASC `
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
-
 	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE 1=1 `
 
 	if condition != "" {
@@ -251,15 +189,6 @@ func GetMysteelChemicalIndex(condition string, pars []interface{}) (items []*Mys
 
 // GetMysteelChemicalIndexData 根据指标code获取钢联化工数据列表
 func GetMysteelChemicalIndexData(indexCode string, startSize, pageSize int) (items []*MysteelChemicalData, err error) {
-	//sql := ` SELECT * FROM (
-	//SELECT DISTINCT a.index_code,a.value,a.data_time FROM base_from_mysteel_chemical_data AS a WHERE index_code=?
-	//ORDER BY data_time DESC
-	//)AS t
-	//GROUP BY t.data_time
-	//ORDER BY t.data_time DESC LIMIT ?,? `
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Raw(sql, indexCode, startSize, pageSize).QueryRows(&items)
-
 	sql := ` SELECT * FROM (
 	SELECT DISTINCT a.index_code,a.value,a.data_time FROM base_from_mysteel_chemical_data AS a WHERE index_code=? 
 	ORDER BY data_time DESC
@@ -272,17 +201,6 @@ func GetMysteelChemicalIndexData(indexCode string, startSize, pageSize int) (ite
 
 // GetMysteelChemicalIndexDataCount 根据指标code获取钢联化工数据列表 获取钢联数据总数
 func GetMysteelChemicalIndexDataCount(indexCode string) (count int, err error) {
-	//sql := `SELECT COUNT(1) AS count FROM (
-	//		SELECT * FROM (
-	//SELECT DISTINCT a.index_code,a.value,a.data_time FROM base_from_mysteel_chemical_data AS a WHERE index_code=?
-	//ORDER BY data_time DESC
-	//)AS t
-	//GROUP BY t.data_time
-	//ORDER BY t.data_time DESC
-	//		)AS n `
-	//o := orm.NewOrmUsingDB("data")
-	//err = o.Raw(sql, indexCode).QueryRow(&count)
-
 	sql := `SELECT COUNT(1) AS count FROM (
 			SELECT * FROM (
 	SELECT DISTINCT a.index_code,a.value,a.data_time FROM base_from_mysteel_chemical_data AS a WHERE index_code=? 
@@ -297,10 +215,6 @@ func GetMysteelChemicalIndexDataCount(indexCode string) (count int, err error) {
 
 // GetBaseFromMysteelChemicalIndexByIndexId 根据指标id获取指标信息
 func GetBaseFromMysteelChemicalIndexByIndexId(indexId int) (item *BaseFromMysteelChemicalIndex, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_index_id=? `
-	//err = o.Raw(sql, indexId).QueryRow(&item)
-
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_index_id=? `
 	err = global.DmSQL["data"].Raw(sql, indexId).First(&item).Error
 	return
@@ -308,10 +222,6 @@ func GetBaseFromMysteelChemicalIndexByIndexId(indexId int) (item *BaseFromMystee
 
 // GetBaseFromMysteelChemicalIndexByCode 根据指标code获取指标信息
 func GetBaseFromMysteelChemicalIndexByCode(indexCode string) (item *BaseFromMysteelChemicalIndex, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_code=? `
-	//err = o.Raw(sql, indexCode).QueryRow(&item)
-
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_code=? `
 	err = global.DmSQL["data"].Raw(sql, indexCode).First(&item).Error
 	return
@@ -322,15 +232,6 @@ func GetBaseFromMysteelChemicalIndexByCodeList(indexCodeList []string) (items []
 	if len(indexCodeList) <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_code IN (%s) `
-	//holder := make([]string, 0)
-	//for range indexCodeList {
-	//	holder = append(holder, "?")
-	//}
-	//sql = fmt.Sprintf(sql, strings.Join(holder, ","))
-	//_, err = o.Raw(sql, indexCodeList).QueryRows(&items)
-
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_code IN (%s) `
 	holder := make([]string, 0)
 	for range indexCodeList {
@@ -341,33 +242,12 @@ func GetBaseFromMysteelChemicalIndexByCodeList(indexCodeList []string) (items []
 	return
 }
 
-//
-//// GetBaseFromMysteelChemicalIndexByClassifyIdAndName 根据分类id和指标名名获取指标信息
-//func GetBaseFromMysteelChemicalIndexByClassifyIdAndName(classifyId int, chartName string) (item *BaseFromMysteelChemicalIndex, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_classify_id = ? and index_name = ? `
-//	err = o.Raw(sql, classifyId, chartName).QueryRow(&item)
-//	return
-//}
-//
-//// GetBaseFromMysteelChemicalIndexListByClassifyId 根据指标分类id获取指标列表信息
-//func GetBaseFromMysteelChemicalIndexListByClassifyId(classifyId int) (items []*BaseFromMysteelChemicalIndex, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_classify_id=? `
-//	_, err = o.Raw(sql, classifyId).QueryRows(&items)
-//	return
-//}
-
 // GetBaseFromMysteelChemicalIndexListByClassifyIdList 根据指标分类id集合获取指标列表信息
 func GetBaseFromMysteelChemicalIndexListByClassifyIdList(classifyIdList []int) (items []*BaseFromMysteelChemicalIndex, err error) {
 	num := len(classifyIdList)
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, classifyIdList).QueryRows(&items)
-
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_classify_id IN (` + utils.GetOrmInReplace(num) + `) `
 	err = global.DmSQL["data"].Raw(sql, classifyIdList).Find(&items).Error
 	return
@@ -375,15 +255,6 @@ func GetBaseFromMysteelChemicalIndexListByClassifyIdList(classifyIdList []int) (
 
 // GetBaseFromMysteelChemicalDataMaxCount 获取分类下指标的最大数量
 func GetBaseFromMysteelChemicalDataMaxCount(classifyId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT MAX(t.num) AS count FROM (
-	//			SELECT COUNT(1) AS num  FROM base_from_mysteel_chemical_index AS a
-	//			INNER JOIN base_from_mysteel_chemical_data AS b ON a.base_from_mysteel_chemical_index_id=b.base_from_mysteel_chemical_index_id
-	//			WHERE a.base_from_mysteel_chemical_classify_id=?
-	//			GROUP BY a.base_from_mysteel_chemical_index_id
-	//		)AS t `
-	//err = o.Raw(sql, classifyId).QueryRow(&count)
-
 	sql := `SELECT MAX(t.num) AS count FROM (
 				SELECT COUNT(1) AS num  FROM base_from_mysteel_chemical_index AS a
 				INNER JOIN base_from_mysteel_chemical_data AS b ON a.base_from_mysteel_chemical_index_id=b.base_from_mysteel_chemical_index_id
@@ -396,15 +267,6 @@ func GetBaseFromMysteelChemicalDataMaxCount(classifyId int) (count int, err erro
 
 // GetMysteelChemicalIndexDataByCode 通过钢联化工指标code获取所有数据列表
 func GetMysteelChemicalIndexDataByCode(indexCode string) (items []*MysteelChemicalData, err error) {
-	//sql := ` SELECT * FROM (
-	//SELECT DISTINCT a.index_code,a.value,a.data_time FROM base_from_mysteel_chemical_data AS a WHERE index_code=?
-	//ORDER BY data_time DESC
-	//)AS t
-	//GROUP BY t.data_time
-	//ORDER BY t.data_time DESC `
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Raw(sql, indexCode).QueryRows(&items)
-
 	sql := ` SELECT * FROM (
 	SELECT DISTINCT a.index_code,a.value,a.data_time FROM base_from_mysteel_chemical_data AS a WHERE index_code=? 
 	ORDER BY data_time DESC
@@ -417,13 +279,6 @@ func GetMysteelChemicalIndexDataByCode(indexCode string) (items []*MysteelChemic
 
 // MoveBaseFromMysteelChemicalIndex 移动钢联化工指标分类
 func MoveBaseFromMysteelChemicalIndex(chartInfoId, classifyId int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` UPDATE base_from_mysteel_chemical_index
-	//		SET
-	//		  base_from_mysteel_chemical_classify_id = ?
-	//		WHERE base_from_mysteel_chemical_index_id = ?`
-	//_, err = o.Raw(sql, classifyId, chartInfoId).Exec()
-
 	sql := ` UPDATE base_from_mysteel_chemical_index
 			SET
 			  base_from_mysteel_chemical_classify_id = ?
@@ -434,13 +289,6 @@ func MoveBaseFromMysteelChemicalIndex(chartInfoId, classifyId int) (err error) {
 
 // UpdateBaseFromMysteelChemicalIndexByClassifyId 根据指标id更新排序
 func UpdateBaseFromMysteelChemicalIndexByClassifyId(classifyId, nowSort, prevIndexInfoId int, updateSort string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` update base_from_mysteel_chemical_index set sort = ` + updateSort + ` WHERE base_from_mysteel_chemical_classify_id=? AND  `
-	//if prevIndexInfoId > 0 {
-	//	sql += ` ( sort > ? or (base_from_mysteel_chemical_index_id > ` + fmt.Sprint(prevIndexInfoId) + ` and sort = ` + fmt.Sprint(nowSort) + `))`
-	//}
-	//_, err = o.Raw(sql, classifyId, nowSort).Exec()
-
 	sql := ` update base_from_mysteel_chemical_index set sort = ` + updateSort + ` WHERE base_from_mysteel_chemical_classify_id=? AND  `
 	if prevIndexInfoId > 0 {
 		sql += ` ( sort > ? or (base_from_mysteel_chemical_index_id > ` + fmt.Sprint(prevIndexInfoId) + ` and sort = ` + fmt.Sprint(nowSort) + `))`
@@ -451,10 +299,6 @@ func UpdateBaseFromMysteelChemicalIndexByClassifyId(classifyId, nowSort, prevInd
 
 // GetFirstBaseFromMysteelChemicalIndexByClassifyId 获取当前分类下，且排序数相同 的排序第一条的数据
 func GetFirstBaseFromMysteelChemicalIndexByClassifyId(classifyId int) (item *BaseFromMysteelChemicalIndex, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_classify_id=? order by sort asc,base_from_mysteel_chemical_index_id asc limit 1`
-	//err = o.Raw(sql, classifyId).QueryRow(&item)
-
 	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_classify_id=? order by sort asc,base_from_mysteel_chemical_index_id asc limit 1`
 	err = global.DmSQL["data"].Raw(sql, classifyId).First(&item).Error
 	return
@@ -462,15 +306,6 @@ func GetFirstBaseFromMysteelChemicalIndexByClassifyId(classifyId int) (item *Bas
 
 // GetMysteelChemicalIndexCount 根据条件获取钢联化工数据
 func GetMysteelChemicalIndexCount(condition string, pars []interface{}) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count FROM base_from_mysteel_chemical_index WHERE 1=1 `
-	//
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += ` ORDER BY base_from_mysteel_chemical_index_id ASC `
-	//err = o.Raw(sql, pars).QueryRow(&count)
-
 	sql := ` SELECT COUNT(1) AS count FROM base_from_mysteel_chemical_index WHERE 1=1 `
 
 	if condition != "" {
@@ -483,21 +318,6 @@ func GetMysteelChemicalIndexCount(condition string, pars []interface{}) (count i
 
 // GetMysteelChemicalIndexList 根据分类id获取钢联化工频度数据列表
 func GetMysteelChemicalIndexList(condition string, pars []interface{}, startSize, pageSize int, orderDesc string) (items []*BaseFromMysteelChemicalIndex, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE 1=1 `
-	//
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//
-	//if orderDesc == `` {
-	//	orderDesc = ` ASC `
-	//}
-	//sql += ` ORDER BY base_from_mysteel_chemical_index_id `
-	//sql += orderDesc
-	//sql += ` LIMIT ?,? `
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
-
 	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE 1=1 `
 
 	if condition != "" {
@@ -517,19 +337,6 @@ func GetMysteelChemicalIndexList(condition string, pars []interface{}, startSize
 	return
 }
 
-//// GetMysteelChemicalIndexListGroupByUserId 根据指标id列表、用户分组获取指标信息
-//func GetMysteelChemicalIndexListGroupByUserId(edbIdList []string) (items []*BaseFromMysteelChemicalIndex, err error) {
-//	num := len(edbIdList)
-//	if num <= 0 {
-//		return
-//	}
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_index_id in (` + utils.GetOrmInReplace(num) + `) GROUP BY sys_user_id `
-//	_, err = o.Raw(sql, edbIdList).QueryRows(&items)
-//
-//	return
-//}
-
 // GetMysteelChemicalIndexListByIndexId
 // @Description: 根据指标id列表获取列表信息
 // @param edbIdList
@@ -540,10 +347,6 @@ func GetMysteelChemicalIndexListByIndexId(edbIdList []string) (items []*BaseFrom
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_index_id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, edbIdList).QueryRows(&items)
-
 	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_index_id in (` + utils.GetOrmInReplace(num) + `) `
 	err = global.DmSQL["data"].Raw(sql, edbIdList).Find(&items).Error
 	return
@@ -559,10 +362,6 @@ func GetMysteelChemicalIndexListByUserId(userIdList []int) (items []*BaseFromMys
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE sys_user_id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, userIdList).QueryRows(&items)
-
 	sql := ` SELECT * FROM base_from_mysteel_chemical_index WHERE sys_user_id in (` + utils.GetOrmInReplace(num) + `) `
 	err = global.DmSQL["data"].Raw(sql, userIdList).Find(&items).Error
 	return
@@ -574,9 +373,6 @@ func ModifyMysteelChemicalIndexUserIdByCodeList(edbIdList []string, userId int,
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `UPDATE base_from_mysteel_chemical_index SET sys_user_id=?,sys_user_real_name=? WHERE base_from_mysteel_chemical_index_id in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, userId, userName, edbIdList).Exec()
 	sql := `UPDATE base_from_mysteel_chemical_index SET sys_user_id=?,sys_user_real_name=? WHERE base_from_mysteel_chemical_index_id in (` + utils.GetOrmInReplace(num) + `) `
 	err = global.DmSQL["data"].Exec(sql, userId, userName, edbIdList).Error
 	return
@@ -595,10 +391,6 @@ func ModifyMysteelChemicalIndexUserIdByOldUserId(oldUserIdList []int, userId int
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `UPDATE base_from_mysteel_chemical_index SET sys_user_id=?,sys_user_real_name=? WHERE sys_user_id in (` + utils.GetOrmInReplace(num) + `)  `
-	//_, err = o.Raw(sql, userId, userName, oldUserIdList).Exec()
-
 	sql := `UPDATE base_from_mysteel_chemical_index SET sys_user_id=?,sys_user_real_name=? WHERE sys_user_id in (` + utils.GetOrmInReplace(num) + `)  `
 	err = global.DmSQL["data"].Exec(sql, userId, userName, oldUserIdList).Error
 	return
@@ -606,11 +398,6 @@ func ModifyMysteelChemicalIndexUserIdByOldUserId(oldUserIdList []int, userId int
 
 // GetMysteelChemicalIndexAdminList 获取所有指标创建人
 func GetMysteelChemicalIndexAdminList() (list []int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT sys_user_id FROM base_from_mysteel_chemical_index GROUP BY sys_user_id `
-	//
-	//_, err = o.Raw(sql).QueryRows(&list)
-
 	sql := ` SELECT sys_user_id FROM base_from_mysteel_chemical_index GROUP BY sys_user_id `
 	err = global.DmSQL["data"].Raw(sql).Find(&list).Error
 	return
@@ -623,10 +410,6 @@ type TerminalNum struct {
 
 // GetMysteelChemicalGroupTerminalNum 获取钢联化工指标的终端分布
 func GetMysteelChemicalGroupTerminalNum() (items []*TerminalNum, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT terminal_code,count(1) num FROM base_from_mysteel_chemical_index GROUP BY terminal_code ORDER BY num ASC `
-	//_, err = o.Raw(sql).QueryRows(&items)
-
 	sql := ` SELECT terminal_code,count(1) num FROM base_from_mysteel_chemical_index GROUP BY terminal_code ORDER BY num ASC `
 	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
 	return
@@ -669,18 +452,6 @@ type RefreshBaseEdbInfoResp struct {
 // @return items []*BaseRefreshEdbInfo
 // @return err error
 func GetMysteelChemicalBaseInfoList(condition string, pars []interface{}, orderBy string, startSize, pageSize int) (total int, items []*BaseRefreshEdbInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
-
-	// 数量汇总
-	//totalSql := ` SELECT count(1) FROM base_from_mysteel_chemical_index WHERE 1=1 `
-	//if condition != "" {
-	//	totalSql += condition
-	//}
-	//err = o.Raw(totalSql, pars).QueryRow(&total)
-	//if err != nil {
-	//	return
-	//}
-
 	totalSql := ` SELECT count(1) FROM base_from_mysteel_chemical_index WHERE 1=1 `
 	if condition != "" {
 		totalSql += condition
@@ -689,22 +460,6 @@ func GetMysteelChemicalBaseInfoList(condition string, pars []interface{}, orderB
 	if err != nil {
 		return
 	}
-
-	// 列表数据
-	//sql := ` SELECT base_from_mysteel_chemical_index_id as edb_info_id, base_from_mysteel_chemical_classify_id as classify_id,index_code,index_name,end_date,end_value,sys_user_id,sys_user_real_name,frequency,is_stop,terminal_code FROM base_from_mysteel_chemical_index WHERE 1=1  `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//
-	//if orderBy != "" {
-	//	sql += ` ORDER BY ` + orderBy
-	//} else {
-	//	sql += ` ORDER BY base_from_mysteel_chemical_index_id ASC `
-	//}
-	//sql += `  LIMIT ?,? `
-	//
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
-
 	sql := ` SELECT base_from_mysteel_chemical_index_id as edb_info_id, base_from_mysteel_chemical_classify_id as classify_id,index_code,index_name,end_date,end_value,sys_user_id,sys_user_real_name,frequency,is_stop,terminal_code FROM base_from_mysteel_chemical_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
@@ -736,24 +491,6 @@ func ModifyMysteelChemicalUpdateStatus(edbIdList []int, indexCodeList []string,
 	if idNum <= 0 {
 		return
 	}
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//		return
-	//	}
-	//	_ = o.Commit()
-	//}()
-
-	// 更改数据源的更新状态
-	//sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = ? WHERE base_from_mysteel_chemical_index_id IN (` + utils.GetOrmInReplace(idNum) + `) `
-	//_, err = o.Raw(sql, isStop, edbIdList).Exec()
-	//if err != nil {
-	//	return
-	//}
 
 	sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = ? WHERE base_from_mysteel_chemical_index_id IN (` + utils.GetOrmInReplace(idNum) + `) `
 	err = global.DmSQL["data"].Exec(sql, isStop, edbIdList).Error
@@ -764,12 +501,6 @@ func ModifyMysteelChemicalUpdateStatus(edbIdList []int, indexCodeList []string,
 	codeNum := len(indexCodeList)
 	if codeNum <= 0 {
 		// 需要通过指标id列表查找code列表
-		//sql := ` SELECT index_code FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_index_id IN (` + utils.GetOrmInReplace(idNum) + `) `
-		//_, err = o.Raw(sql, edbIdList).QueryRows(&indexCodeList)
-		//if err != nil {
-		//	return
-		//}
-
 		sql := ` SELECT index_code FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_index_id IN (` + utils.GetOrmInReplace(idNum) + `) `
 		err = global.DmSQL["data"].Raw(sql, edbIdList).Find(&indexCodeList).Error
 		if err != nil {
@@ -785,12 +516,6 @@ func ModifyMysteelChemicalUpdateStatus(edbIdList []int, indexCodeList []string,
 	}
 
 	// 更改指标的更新状态
-	//sql = ` UPDATE edb_info SET no_update = ? WHERE source = ? AND sub_source= ? AND edb_code IN (` + utils.GetOrmInReplace(codeNum) + `) `
-	//_, err = o.Raw(sql, isStop, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, 0, indexCodeList).Exec()
-	//if err != nil {
-	//	return
-	//}
-
 	sql = ` UPDATE edb_info SET no_update = ? WHERE source = ? AND sub_source= ? AND edb_code IN (` + utils.GetOrmInReplace(codeNum) + `) `
 	err = global.DmSQL["data"].Exec(sql, isStop, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, 0, indexCodeList).Error
 	if err != nil {
@@ -808,18 +533,6 @@ func ModifyMysteelChemicalUpdateStatus(edbIdList []int, indexCodeList []string,
 // @param isStop int
 // @return err error
 func ModifyMysteelChemicalUpdateStatusByEdbInfoId(edbInfoId, isStop int, edbCode string, calculateEdbInfoIds []int) (err error) {
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//		return
-	//	}
-	//	_ = o.Commit()
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -831,12 +544,6 @@ func ModifyMysteelChemicalUpdateStatusByEdbInfoId(edbInfoId, isStop int, edbCode
 	}()
 
 	// 更改数据源的更新状态
-	//sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = ? WHERE index_code = ? `
-	//_, err = o.Raw(sql, isStop, edbCode).Exec()
-	//if err != nil {
-	//	return
-	//}
-
 	sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = ? WHERE index_code = ? `
 	err = to.Exec(sql, isStop, edbCode).Error
 	if err != nil {
@@ -844,12 +551,6 @@ func ModifyMysteelChemicalUpdateStatusByEdbInfoId(edbInfoId, isStop int, edbCode
 	}
 
 	// 更改指标的更新状态
-	//sql = ` UPDATE edb_info SET no_update = ? WHERE source = ? AND sub_source= ? AND edb_info_id=? `
-	//_, err = o.Raw(sql, isStop, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, 0, edbInfoId).Exec()
-	//if err != nil {
-	//	return
-	//}
-
 	sql = ` UPDATE edb_info SET no_update = ? WHERE source = ? AND sub_source= ? AND edb_info_id=? `
 	err = to.Exec(sql, isStop, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, 0, edbInfoId).Error
 	if err != nil {
@@ -858,12 +559,6 @@ func ModifyMysteelChemicalUpdateStatusByEdbInfoId(edbInfoId, isStop int, edbCode
 
 	if len(calculateEdbInfoIds) > 0 {
 		// 批量更新相关联的指标ID
-		//sql = ` UPDATE edb_info SET no_update = ? WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(calculateEdbInfoIds)) + `) `
-		//_, err = o.Raw(sql, isStop, calculateEdbInfoIds).Exec()
-		//if err != nil {
-		//	return
-		//}
-
 		sql = ` UPDATE edb_info SET no_update = ? WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(calculateEdbInfoIds)) + `) `
 		err = to.Exec(sql, isStop, calculateEdbInfoIds).Error
 		if err != nil {
@@ -875,18 +570,6 @@ func ModifyMysteelChemicalUpdateStatusByEdbInfoId(edbInfoId, isStop int, edbCode
 }
 
 func ModifyMysteelChemicalUpdateStatusByEdbInfoIds(edbInfoIds []int, isStop int, edbCodes []string, calculateEdbInfoIds []int) (err error) {
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//		return
-	//	}
-	//	_ = o.Commit()
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -898,12 +581,6 @@ func ModifyMysteelChemicalUpdateStatusByEdbInfoIds(edbInfoIds []int, isStop int,
 	}()
 
 	// 更改数据源的更新状态
-	//sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = ? WHERE index_code IN (` + utils.GetOrmInReplace(len(edbCodes)) + `) `
-	//_, err = o.Raw(sql, isStop, edbCodes).Exec()
-	//if err != nil {
-	//	return
-	//}
-
 	sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = ? WHERE index_code IN (` + utils.GetOrmInReplace(len(edbCodes)) + `) `
 	err = to.Exec(sql, isStop, edbCodes).Error
 	if err != nil {
@@ -911,12 +588,6 @@ func ModifyMysteelChemicalUpdateStatusByEdbInfoIds(edbInfoIds []int, isStop int,
 	}
 
 	// 更改指标的更新状态
-	//sql = ` UPDATE edb_info SET no_update = ? WHERE source = ? AND edb_info_id IN (` + utils.GetOrmInReplace(len(edbInfoIds)) + `) `
-	//_, err = o.Raw(sql, isStop, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, edbInfoIds).Exec()
-	//if err != nil {
-	//	return
-	//}
-
 	sql = ` UPDATE edb_info SET no_update = ? WHERE source = ? AND edb_info_id IN (` + utils.GetOrmInReplace(len(edbInfoIds)) + `) `
 	err = to.Exec(sql, isStop, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, edbInfoIds).Error
 	if err != nil {
@@ -925,12 +596,6 @@ func ModifyMysteelChemicalUpdateStatusByEdbInfoIds(edbInfoIds []int, isStop int,
 
 	if len(calculateEdbInfoIds) > 0 {
 		// 批量更新相关联的指标ID
-		//sql = ` UPDATE edb_info SET no_update = ? WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(calculateEdbInfoIds)) + `) `
-		//_, err = o.Raw(sql, isStop, calculateEdbInfoIds).Exec()
-		//if err != nil {
-		//	return
-		//}
-
 		sql = ` UPDATE edb_info SET no_update = ? WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(calculateEdbInfoIds)) + `) `
 		err = to.Exec(sql, isStop, calculateEdbInfoIds).Error
 		if err != nil {
@@ -955,10 +620,6 @@ func GetNotIsSupplierStopIndexByCodeList(codeList []string, isStop int) (items [
 		return
 	}
 
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE is_supplier_stop = ? AND index_code in (` + utils.GetOrmInReplace(num) + `) `
-	//_, err = o.Raw(sql, isStop, codeList).QueryRows(&items)
-
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE is_supplier_stop = ? AND index_code in (` + utils.GetOrmInReplace(num) + `) `
 	err = global.DmSQL["data"].Raw(sql, isStop, codeList).Find(&items).Error
 	return

models/data_manage/predict_edb_conf.go

@@ -50,58 +50,15 @@ type PredictEdbConfAndData struct {
 	DataList         []*EdbDataList `description:"动态数据"`
 }
 
-//// GetPredictEdbConfById 根据预测指标id获取预测指标配置信息
-//func GetPredictEdbConfById(edbInfoId int) (item *PredictEdbConf, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT * FROM predict_edb_conf WHERE predict_edb_info_id=? `
-//	err = o.Raw(sql, edbInfoId).QueryRow(&item)
-//	return
-//}
-//
-//// GetPredictEdbConfBySourceEdbInfoId 根据来源指标id获取配置
-//func GetPredictEdbConfBySourceEdbInfoId(sourceEdbInfoId int) (item *PredictEdbConf, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT * FROM predict_edb_conf WHERE source_edb_info_id=? `
-//	err = o.Raw(sql, sourceEdbInfoId).QueryRow(&item)
-//	return
-//}
-
 // GetPredictEdbConfCount 根据来源指标id获取被引用的次数
 func GetPredictEdbConfCount(sourceEdbInfoId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count FROM predict_edb_conf WHERE source_edb_info_id=? `
-	//err = o.Raw(sql, sourceEdbInfoId).QueryRow(&count)
-
 	sql := ` SELECT COUNT(1) AS count FROM predict_edb_conf WHERE source_edb_info_id=? `
 	err = global.DmSQL["data"].Raw(sql, sourceEdbInfoId).Scan(&count).Error
 	return
 }
 
-//// AddPredictEdbConf 添加预测指标规则
-//func AddPredictEdbConf(item *PredictEdbConf) (lastId int64, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	lastId, err = o.Insert(item)
-//	return
-//}
-
 // AddPredictEdb 添加预测指标
 func AddPredictEdb(item *EdbInfo, calculateMappingItem *EdbInfoCalculateMapping, predictEdbConfList []*PredictEdbConf) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//tx, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		tmpErr := tx.Rollback()
-	//		if tmpErr != nil {
-	//			go alarm_msg.SendAlarmMsg("AddPredictEdb 事务回滚失败，Err："+tmpErr.Error(), 3)
-	//		}
-	//	} else {
-	//		err = tx.Commit()
-	//	}
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -113,22 +70,12 @@ func AddPredictEdb(item *EdbInfo, calculateMappingItem *EdbInfoCalculateMapping,
 	}()
 
 	// 新增预测指标
-	//edbInfoId, err := to.Create(item)
-	//if err != nil {
-	//	return
-	//}
-	//item.EdbInfoId = int(edbInfoId)
-
 	err = to.Create(item).Error
 	if err != nil {
 		return
 	}
 	// 新增预测指标
 	calculateMappingItem.EdbInfoId = item.EdbInfoId
-	//_, err = o.Insert(calculateMappingItem)
-	//if err != nil {
-	//	return
-	//}
 
 	err = to.Create(calculateMappingItem).Error
 	if err != nil {
@@ -141,11 +88,6 @@ func AddPredictEdb(item *EdbInfo, calculateMappingItem *EdbInfoCalculateMapping,
 		for _, v := range predictEdbConfList {
 			v.PredictEdbInfoId = item.EdbInfoId
 		}
-		//_, err = o.InsertMulti(lenPredictEdbConf, predictEdbConfList)
-		//if err != nil {
-		//	return
-		//}
-
 		err = to.CreateInBatches(predictEdbConfList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -156,21 +98,6 @@ func AddPredictEdb(item *EdbInfo, calculateMappingItem *EdbInfoCalculateMapping,
 
 // EditPredictEdb 修改预测指标
 func EditPredictEdb(edbInfo *EdbInfo, predictEdbConfList []*PredictEdbConf, updateEdbInfoCol []string) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//tx, err := o.Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		tmpErr := tx.Rollback()
-	//		if tmpErr != nil {
-	//			go alarm_msg.SendAlarmMsg("AddPredictEdb 事务回滚失败，Err："+tmpErr.Error(), 3)
-	//		}
-	//	} else {
-	//		err = tx.Commit()
-	//	}
-	//}()
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -182,23 +109,12 @@ func EditPredictEdb(edbInfo *EdbInfo, predictEdbConfList []*PredictEdbConf, upda
 	}()
 
 	// 修改预测指标
-	//_, err = o.Update(edbInfo, updateEdbInfoCol...)
-	//if err != nil {
-	//	return
-	//}
-
 	err = to.Select(updateEdbInfoCol).Updates(edbInfo).Error
 	if err != nil {
 		return
 	}
 
 	// 先删除原有的配置
-	//sql := ` DELETE FROM predict_edb_conf WHERE predict_edb_info_id = ?`
-	//_, err = o.Raw(sql, edbInfo.EdbInfoId).Exec()
-	//if err != nil {
-	//	return
-	//}
-
 	sql := ` DELETE FROM predict_edb_conf WHERE predict_edb_info_id = ?`
 	err = to.Exec(sql, edbInfo.EdbInfoId).Error
 	if err != nil {
@@ -207,11 +123,6 @@ func EditPredictEdb(edbInfo *EdbInfo, predictEdbConfList []*PredictEdbConf, upda
 	// 新增新有的预测指标配置
 	lenPredictEdbConf := len(predictEdbConfList)
 	if lenPredictEdbConf > 0 {
-		//_, err = o.InsertMulti(lenPredictEdbConf, predictEdbConfList)
-		//if err != nil {
-		//	return
-		//}
-
 		err = to.CreateInBatches(predictEdbConfList, utils.MultiAddNum).Error
 		if err != nil {
 			return
@@ -226,14 +137,6 @@ func GetPredictEdbInfoAllCalculate(edbInfoIdList []int) (list []*EdbInfo, err er
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//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 = o.Raw(sql, edbInfoIdList).QueryRows(&list)
-
 	sql := ` SELECT DISTINCT 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) + `)
@@ -244,10 +147,6 @@ func GetPredictEdbInfoAllCalculate(edbInfoIdList []int) (list []*EdbInfo, err er
 
 // GetPredictEdbConfListById 根据预测指标id获取预测指标配置信息列表
 func GetPredictEdbConfListById(edbInfoId int) (items []*PredictEdbConf, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM predict_edb_conf WHERE predict_edb_info_id=? ORDER BY config_id ASC`
-	//_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
-
 	sql := ` SELECT * FROM predict_edb_conf WHERE predict_edb_info_id=? ORDER BY config_id ASC`
 	err = global.DmSQL["data"].Raw(sql, edbInfoId).Find(&items).Error
 	return
@@ -255,12 +154,6 @@ func GetPredictEdbConfListById(edbInfoId int) (items []*PredictEdbConf, err erro
 
 // GetGroupPredictEdbBySourceEdbInfoId 根据来源指标id获取配置
 func GetGroupPredictEdbBySourceEdbInfoId(sourceEdbInfoId int) (items []*EdbInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT a.* FROM edb_info AS a
-	// JOIN predict_edb_conf AS b  on a.edb_info_id = b.predict_edb_info_id
-	//      WHERE b.source_edb_info_id=? group by a.edb_info_id`
-	//_, err = o.Raw(sql, sourceEdbInfoId).QueryRows(&items)
-
 	sql := ` SELECT a.* FROM edb_info AS a 
 	JOIN predict_edb_conf AS b  on a.edb_info_id = b.predict_edb_info_id
 	     WHERE b.source_edb_info_id=? group by a.edb_info_id`

models/data_manage/predict_edb_conf_calculate_mapping.go

@@ -22,23 +22,6 @@ type PredictEdbConfCalculateMapping struct {
 	ModifyTime                       time.Time `description:"修改时间"`
 }
 
-//
-//// GetPredictEdbConfCalculateMappingListById 根据预测指标id获取预测指标配置的关联指标信息列表
-//func GetPredictEdbConfCalculateMappingListById(edbInfoId int) (items []*PredictEdbConf, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT * FROM predict_edb_conf_calculate_mapping WHERE edb_info_id=? ORDER BY predict_edb_conf_calculate_mapping_id ASC`
-//	_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
-//	return
-//}
-//
-//// GetPredictEdbConfCalculateMappingListByConfigId 根据预测指标配置id获取预测指标配置的关联指标信息列表
-//func GetPredictEdbConfCalculateMappingListByConfigId(edbInfoId, configId int) (items []*PredictEdbConf, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT * FROM predict_edb_conf_calculate_mapping WHERE edb_info_id=? AND config_id=? ORDER BY predict_edb_conf_calculate_mapping_id ASC`
-//	_, err = o.Raw(sql, edbInfoId, configId).QueryRows(&items)
-//	return
-//}
-
 type PredictEdbConfCalculateMappingDetail struct {
 	PredictEdbConfCalculateMappingId int    `orm:"column(predict_edb_conf_calculate_mapping_id);pk" gorm:"primaryKey" `
 	EdbInfoId                        int    `description:"指标id"`
@@ -70,26 +53,8 @@ func (e *PredictEdbConfCalculateMappingDetail) ConvertToResp() {
 	return
 }
 
-//// GetPredictEdbConfCalculateMappingDetailListById 根据配置id获取 配置关联指标信息
-//func GetPredictEdbConfCalculateMappingDetailListById(edbInfoId int) (list []*PredictEdbConfCalculateMappingDetail, err error) {
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT a.predict_edb_conf_calculate_mapping_id,a.edb_info_id,a.from_edb_info_id,a.from_edb_code,a.from_source,a.from_source_name,a.sort,a.create_time,a.modify_time,a.from_tag,b.edb_name_source as from_edb_name,b.start_date,b.end_date,b.edb_type FROM predict_edb_conf_calculate_mapping AS a
-//			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
-//			WHERE a.edb_info_id=? ORDER BY sort ASC `
-//
-//	_, err = o.Raw(sql, edbInfoId).QueryRows(&list)
-//	return
-//}
-
 // GetPredictEdbConfCalculateMappingDetailListByConfigId 根据配置id和指标id获取 配置关联指标信息
 func GetPredictEdbConfCalculateMappingDetailListByConfigId(edbInfoId, configId int) (list []*PredictEdbConfCalculateMappingDetail, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT a.predict_edb_conf_calculate_mapping_id,a.edb_info_id,a.from_edb_info_id,a.from_edb_code,a.from_source,a.from_source_name,a.sort,a.create_time,a.modify_time,a.from_tag,b.edb_name_source as from_edb_name,b.start_date,b.end_date,b.edb_type FROM predict_edb_conf_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=? AND a.config_id=?  ORDER BY sort ASC `
-	//
-	//_, err = o.Raw(sql, edbInfoId, configId).QueryRows(&list)
-
 	sql := ` SELECT a.predict_edb_conf_calculate_mapping_id,a.edb_info_id,a.from_edb_info_id,a.from_edb_code,a.from_source,a.from_source_name,a.sort,a.create_time,a.modify_time,a.from_tag,b.edb_name_source as from_edb_name,b.start_date,b.end_date,b.edb_type FROM predict_edb_conf_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=? AND a.config_id=?  ORDER BY sort ASC `
@@ -113,12 +78,6 @@ func GetPredictEdbConfCalculateMappingDetailListByEdbInfoId(fromEdbInfoIdList []
 	if num <= 0 {
 		return
 	}
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT a.predict_edb_conf_calculate_mapping_id,a.edb_info_id,a.from_edb_info_id,a.from_edb_code,a.from_source,a.from_source_name,a.sort,a.create_time,a.modify_time,a.from_tag,b.edb_name_source as from_edb_name,b.start_date,b.end_date,b.edb_type,b.edb_code FROM predict_edb_conf_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(num) + `) GROUP BY a.edb_info_id ORDER BY sort ASC `
-	//
-	//_, err = o.Raw(sql, fromEdbInfoIdList).QueryRows(&list)
 
 	sql := ` SELECT a.predict_edb_conf_calculate_mapping_id,a.edb_info_id,a.from_edb_info_id,a.from_edb_code,a.from_source,a.from_source_name,a.sort,a.create_time,a.modify_time,a.from_tag,b.edb_name_source as from_edb_name,b.start_date,b.end_date,b.edb_type,b.edb_code FROM predict_edb_conf_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id

models/data_manage/predict_edb_rule_data.go

@@ -20,20 +20,6 @@ type PredictEdbRuleData struct {
 
 // GetPredictEdbRuleDataList 根据基础预测指标id集合 获取 所有的普通指标列表数据
 func GetPredictEdbRuleDataList(edbInfoId, configId int, startDate, endDate string) (list []*PredictEdbRuleData, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//var pars []interface{}
-	//sql := ` SELECT * FROM predict_edb_rule_data WHERE edb_info_id = ? AND config_id = ? `
-	//if startDate != "" {
-	//	sql += ` AND data_time>=? `
-	//	pars = append(pars, startDate)
-	//}
-	//if endDate != "" {
-	//	sql += ` AND data_time<=? `
-	//	pars = append(pars, endDate)
-	//}
-	//sql += ` ORDER BY data_time ASC `
-	//_, err = o.Raw(sql, edbInfoId, configId, pars).QueryRows(&list)
-
 	var pars []interface{}
 	sql := ` SELECT * FROM predict_edb_rule_data WHERE edb_info_id = ? AND config_id = ? `
 	if startDate != "" {

models/data_manage/request/predict_edb_info.go

@@ -4,20 +4,18 @@ import "eta_gn/eta_api/models/data_manage"
 
 // PredictEdbInfoChartDataReq 获取预测指标绘图数据请求
 type PredictEdbInfoChartDataReq struct {
-	SourceEdbInfoId int     `description:"来源指标id"`
-	PredictEndDate  string  `description:"预测截止日期"`
-	RuleType        int     `description:"预测规则，1：最新，2：固定值"`
-	FixedValue      float64 `description:"固定值"`
-	DateType        int     `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间,6:自定义起始时间至今，7：18年至今,8:19年至今,9:20年至今,10:全部"`
-	StartDate       string  `description:"自定义开始日期"`
-	EndDate         string  `description:"自定义结束日期"`
-	Calendar        string  `description:"公历/农历"`
-	ChartType       int     `description:"生成样式:1:曲线图,2:季节性图"`
-	//SeasonStartDate string       `description:"季节性图开始日期"`
-	//SeasonEndDate   string       `description:"季节性图结束日期"`
-	RuleList     []RuleConfig `description:"配置规则列表"`
-	DataDateType string       `description:"数据日期类型，枚举值：交易日、自然日"`
-	StartYear    int          `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
+	SourceEdbInfoId int          `description:"来源指标id"`
+	PredictEndDate  string       `description:"预测截止日期"`
+	RuleType        int          `description:"预测规则，1：最新，2：固定值"`
+	FixedValue      float64      `description:"固定值"`
+	DateType        int          `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间,6:自定义起始时间至今，7：18年至今,8:19年至今,9:20年至今,10:全部"`
+	StartDate       string       `description:"自定义开始日期"`
+	EndDate         string       `description:"自定义结束日期"`
+	Calendar        string       `description:"公历/农历"`
+	ChartType       int          `description:"生成样式:1:曲线图,2:季节性图"`
+	RuleList        []RuleConfig `description:"配置规则列表"`
+	DataDateType    string       `description:"数据日期类型，枚举值：交易日、自然日"`
+	StartYear       int          `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
 }
 
 // AddPredictEdbInfoReq 添加预测指标请求

models/data_manage/request/smm_data.go

@@ -4,7 +4,6 @@ package request
 type AddBaseFromSmmClassifyReq struct {
 	ParentId     int    `description:"上级id"`
 	ClassifyName string `description:"分类名称"`
-	//Level        int    `description:"层级,第一级传0，其余传上一级的层级"`
 }
 
 // EditBaseFromSmmClassifyReq 修改SMM分类请求
@@ -34,7 +33,6 @@ type MoveBaseFromSmmReq struct {
 	NextBaseFromSmmIndexId int `description:"下一个兄弟节点分类id"`
 }
 
-
 // EditBaseFromSmmReq 编辑SMM指标
 type EditBaseFromSmmReq struct {
 	BaseFromSmmIndexId int `description:"指标id"`

models/data_manage/sci_data.go

@@ -11,23 +11,11 @@ type SciClassify struct {
 	TypeCode string `orm:"column(type_code)" description:"分类名称编码"`
 }
 
-//func GetSciClassify() (items []*SciClassify, err error) {
-//	sql := `SELECT CONCAT(type_2,type_3) AS type_name,CONCAT(type_2,'#',type_3) type_code  FROM base_from_sci_index GROUP BY CONCAT(type_2,type_3) ORDER BY CONCAT(type_2,type_3) ASC `
-//	o := orm.NewOrmUsingDB("data")
-//	o.Raw(sql).QueryRows(&items)
-//	return
-//}
-
 type SciFrequency struct {
 	Frequency string `description:"频度"`
 }
 
 func GetSciFrequencyByClassifyId(classifyId int) (items []*GlFrequency, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT frequency FROM base_from_sci_index WHERE classify_id = ? `
-	//sql += ` GROUP BY frequency ORDER BY frequency ASC `
-	//_, err = o.Raw(sql, classifyId).QueryRows(&items)
-
 	sql := ` SELECT frequency FROM base_from_sci_index WHERE classify_id = ? `
 	sql += ` GROUP BY frequency ORDER BY frequency ASC `
 	err = global.DmSQL["data"].Raw(sql, classifyId).Find(&items).Error
@@ -54,14 +42,6 @@ type SciIndex struct {
 }
 
 func GetSciIndex(condition string, pars []interface{}) (items []*SciIndex, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM base_from_sci_index WHERE 1=1  `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += `ORDER BY sort ASC, base_from_sci_index_id asc`
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
-
 	sql := ` SELECT * FROM base_from_sci_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
@@ -84,31 +64,13 @@ type SciExportIndex struct {
 	ModifyTime string
 }
 
-//func GetExportSciIndex(typeCodes []string) (items []*SciExportIndex, err error) {
-//	if len(typeCodes) == 0 {
-//		return
-//	}
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT *,CONCAT(type_2, "#", type_3) AS type_name FROM base_from_sci_index WHERE CONCAT(type_2, "#", type_3) IN (` + utils.GetOrmInReplace(len(typeCodes)) + `) ORDER BY frequency ASC,index_code ASC`
-//	_, err = o.Raw(sql, typeCodes).QueryRows(&items)
-//	return
-//}
-
 func GetSciFrequency(classifyId int) (items []*string, err error) {
-	//sql := `SELECT DISTINCT frequency FROM base_from_sci_index WHERE classify_id=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Raw(sql, classifyId).QueryRows(&items)
-
 	sql := `SELECT DISTINCT frequency FROM base_from_sci_index WHERE classify_id=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
 	err = global.DmSQL["data"].Raw(sql, classifyId).Find(&items).Error
 	return
 }
 
 func GetSciFrequencyByCode(code string) (items []*string, err error) {
-	//sql := `SELECT DISTINCT frequency FROM base_from_sci_index WHERE index_code=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Raw(sql, code).QueryRows(&items)
-
 	sql := `SELECT DISTINCT frequency FROM base_from_sci_index WHERE index_code=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
 	err = global.DmSQL["data"].Raw(sql, code).Find(&items).Error
 	return
@@ -140,20 +102,12 @@ type SciIndexData struct {
 }
 
 func GetSciIndexData(indexCode string, startSize, pageSize int) (items []*SciIndexData, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT *  FROM base_from_sci_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	//_, err = o.Raw(sql, indexCode, startSize, pageSize).QueryRows(&items)
-
 	sql := ` SELECT *  FROM base_from_sci_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
 	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Find(&items).Error
 	return
 }
 
 func GetSciIndexDataCount(indexCode string) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count  FROM base_from_sci_data WHERE index_code=? `
-	//err = o.Raw(sql, indexCode).QueryRow(&count)
-
 	sql := ` SELECT COUNT(1) AS count  FROM base_from_sci_data WHERE index_code=? `
 	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&count).Error
 	return
@@ -161,35 +115,18 @@ func GetSciIndexDataCount(indexCode string) (count int, err error) {
 
 // GetSciItemList 模糊查询Sci数据库指标列表
 func GetSciItemList(keyword string) (items []*SciIndex, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := "SELECT * FROM base_from_sci_index WHERE CONCAT(index_name,index_code) LIKE ? "
-	//_, err = o.Raw(sql, utils.GetLikeKeyword(keyword)).QueryRows(&items)
-
 	sql := "SELECT * FROM base_from_sci_index WHERE CONCAT(index_name,index_code) LIKE ? "
 	err = global.DmSQL["data"].Raw(sql, utils.GetLikeKeyword(keyword)).Find(&items).Error
 	return
 }
 
 func GetSciIndexDataByCode(indexCode string) (items []*SciIndexData, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT *  FROM base_from_sci_data WHERE index_code=? ORDER BY data_time DESC  `
-	//_, err = o.Raw(sql, indexCode).QueryRows(&items)
-
 	sql := ` SELECT *  FROM base_from_sci_data WHERE index_code=? ORDER BY data_time DESC  `
 	err = global.DmSQL["data"].Raw(sql, indexCode).Find(&items).Error
 	return
 }
 
 func GetSciDataMaxCount(classifyId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT MAX(t.num) AS count FROM (
-	//			SELECT COUNT(1) AS num  FROM base_from_sci_index AS a
-	//			INNER JOIN base_from_sci_data AS b ON a.index_code=b.index_code
-	//			WHERE a.classify_id=?
-	//			GROUP BY a.base_from_sci_index_id
-	//		)AS t `
-	//err = o.Raw(sql, classifyId).QueryRow(&count)
-
 	sql := `SELECT COALESCE(MAX(t.num), 0) AS count FROM (
 				SELECT COUNT(1) AS num  FROM base_from_sci_index AS a
 				INNER JOIN base_from_sci_data AS b ON a.index_code=b.index_code
@@ -205,46 +142,8 @@ type ExportSciDataMaxCount struct {
 	Count    int
 }
 
-//
-//func GetExportSciDataMaxCount(typeCodes []string) (items []*ExportSciDataMaxCount, err error) {
-//	if len(typeCodes) == 0 {
-//		return
-//	}
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT
-//				MAX(t.num) AS count,
-//				t.type_name
-//			FROM
-//				(
-//					SELECT
-//						COUNT(1) AS num,
-//						CONCAT(a.type_2, "#", a.type_3) AS type_name
-//					FROM
-//						base_from_sci_index AS a
-//					INNER JOIN base_from_sci_data AS b ON a.index_code = b.index_code
-//					WHERE
-//						CONCAT(a.type_2, "#", a.type_3) IN (` + utils.GetOrmInReplace(len(typeCodes)) + `)
-//					GROUP BY
-//						a.base_from_sci_index_id
-//				) AS t
-//			GROUP BY
-//				type_name `
-//	_, err = o.Raw(sql, typeCodes).QueryRows(&items)
-//	return
-//}
-
 type ExportSciIndexData struct {
 	Value     string `orm:"column(value)" description:"日期"`
 	DataTime  string `orm:"column(data_time)" description:"值"`
 	IndexCode string `orm:"column(index_code)" description:"指标编码"`
 }
-
-//func GetExportSciIndexDataByCodes(indexCodes []string) (items []*ExportSciIndexData, err error) {
-//	if len(indexCodes) == 0 {
-//		return
-//	}
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT index_code,data_time,value FROM base_from_sci_data WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodes)) + `) ORDER BY data_time DESC  `
-//	_, err = o.Raw(sql, indexCodes).QueryRows(&items)
-//	return
-//}

models/data_manage/search_keyword.go

@@ -12,8 +12,6 @@ type SearchKeyword struct {
 }
 
 func AddSearchKeyword(item *SearchKeyword) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Insert(item)
 	err = global.DmSQL["data"].Create(item).Error
 	return
 }

models/data_manage/smm_data.go

@@ -11,23 +11,11 @@ type SmmClassify struct {
 	TypeCode string `orm:"column(type_code)" description:"分类名称编码"`
 }
 
-//func GetSmmClassify() (items []*SmmClassify, err error) {
-//	sql := `SELECT CONCAT(type_2,type_3) AS type_name,CONCAT(type_2,'#',type_3) type_code  FROM base_from_smm_index GROUP BY CONCAT(type_2,type_3) ORDER BY CONCAT(type_2,type_3) ASC `
-//	o := orm.NewOrmUsingDB("data")
-//	o.Raw(sql).QueryRows(&items)
-//	return
-//}
-
 type SmmFrequency struct {
 	Frequency string `description:"频度"`
 }
 
 func GetSmmFrequencyByClassifyId(classifyId int) (items []*GlFrequency, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT frequency FROM base_from_smm_index WHERE classify_id = ? `
-	//sql += ` GROUP BY frequency ORDER BY frequency ASC `
-	//_, err = o.Raw(sql, classifyId).QueryRows(&items)
-
 	sql := ` SELECT frequency FROM base_from_smm_index WHERE classify_id = ? `
 	sql += ` GROUP BY frequency ORDER BY frequency ASC `
 	err = global.DmSQL["data"].Raw(sql, classifyId).Find(&items).Error
@@ -79,14 +67,6 @@ type SmmIndexItem struct {
 }
 
 func GetSmmIndex(condition string, pars []interface{}) (items []*SmmIndex, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM base_from_smm_index WHERE 1=1  `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//sql += `ORDER BY sort ASC, base_from_smm_index_id asc`
-	//_, err = o.Raw(sql, pars).QueryRows(&items)
-
 	sql := ` SELECT * FROM base_from_smm_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
@@ -104,10 +84,6 @@ func GetSmmIndex(condition string, pars []interface{}) (items []*SmmIndex, err e
 // @return item *SmmIndex
 // @return err error
 func GetSmmIndexById(basFromSmmIndexId int) (item *SmmIndex, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT * FROM base_from_smm_index WHERE base_from_smm_index_id = ?  `
-	//err = o.Raw(sql, basFromSmmIndexId).QueryRow(&item)
-
 	sql := ` SELECT * FROM base_from_smm_index WHERE base_from_smm_index_id = ?  `
 	err = global.DmSQL["data"].Raw(sql, basFromSmmIndexId).First(&item).Error
 	return
@@ -125,31 +101,13 @@ type SmmExportIndex struct {
 	ModifyTime string
 }
 
-//func GetExportSmmIndex(typeCodes []string) (items []*SmmExportIndex, err error) {
-//	if len(typeCodes) == 0 {
-//		return
-//	}
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT *,CONCAT(type_2, "#", type_3) AS type_name FROM base_from_smm_index WHERE CONCAT(type_2, "#", type_3) IN (` + utils.GetOrmInReplace(len(typeCodes)) + `) ORDER BY frequency ASC,index_code ASC`
-//	_, err = o.Raw(sql, typeCodes).QueryRows(&items)
-//	return
-//}
-
 func GetSmmFrequency(classifyId int) (items []*string, err error) {
-	//sql := `SELECT DISTINCT frequency FROM base_from_smm_index WHERE classify_id=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Raw(sql, classifyId).QueryRows(&items)
-
 	sql := `SELECT DISTINCT frequency FROM base_from_smm_index WHERE classify_id=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
 	err = global.DmSQL["data"].Raw(sql, classifyId).Find(&items).Error
 	return
 }
 
 func GetSmmFrequencyByCode(code string) (items []*string, err error) {
-	//sql := `SELECT DISTINCT frequency FROM base_from_smm_index WHERE index_code=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	//o := orm.NewOrmUsingDB("data")
-	//_, err = o.Raw(sql, code).QueryRows(&items)
-
 	sql := `SELECT DISTINCT frequency FROM base_from_smm_index WHERE index_code=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
 	err = global.DmSQL["data"].Raw(sql, code).Find(&items).Error
 	return
@@ -181,20 +139,12 @@ type SmmIndexData struct {
 }
 
 func GetSmmIndexData(indexCode string, startSize, pageSize int) (items []*SmmIndexData, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT *  FROM base_from_smm_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	//_, err = o.Raw(sql, indexCode, startSize, pageSize).QueryRows(&items)
-
 	sql := ` SELECT *  FROM base_from_smm_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
 	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Find(&items).Error
 	return
 }
 
 func GetSmmIndexDataCount(indexCode string) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT COUNT(1) AS count  FROM base_from_smm_data WHERE index_code=? `
-	//err = o.Raw(sql, indexCode).QueryRow(&count)
-
 	sql := ` SELECT COUNT(1) AS count  FROM base_from_smm_data WHERE index_code=? `
 	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&count).Error
 	return
@@ -202,35 +152,18 @@ func GetSmmIndexDataCount(indexCode string) (count int, err error) {
 
 // GetSmmItemList 模糊查询Smm数据库指标列表
 func GetSmmItemList(keyword string) (items []*SmmIndexItem, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := "SELECT * FROM base_from_smm_index WHERE CONCAT(index_name,index_code) LIKE ? "
-	//_, err = o.Raw(sql, utils.GetLikeKeyword(keyword)).QueryRows(&items)
-
 	sql := "SELECT * FROM base_from_smm_index WHERE CONCAT(index_name,index_code) LIKE ? "
 	err = global.DmSQL["data"].Raw(sql, utils.GetLikeKeyword(keyword)).Find(&items).Error
 	return
 }
 
 func GetSmmIndexDataByCode(indexCode string) (items []*SmmIndexData, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := ` SELECT *  FROM base_from_smm_data WHERE index_code=? ORDER BY data_time DESC  `
-	//_, err = o.Raw(sql, indexCode).QueryRows(&items)
-
 	sql := ` SELECT *  FROM base_from_smm_data WHERE index_code=? ORDER BY data_time DESC  `
 	err = global.DmSQL["data"].Raw(sql, indexCode).Find(&items).Error
 	return
 }
 
 func GetSmmDataMaxCount(classifyId int) (count int, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := `SELECT MAX(t.num) AS count FROM (
-	//			SELECT COUNT(1) AS num  FROM base_from_smm_index AS a
-	//			INNER JOIN base_from_smm_data AS b ON a.index_code=b.index_code
-	//			WHERE a.classify_id=?
-	//			GROUP BY a.base_from_smm_index_id
-	//		)AS t `
-	//err = o.Raw(sql, classifyId).QueryRow(&count)
-
 	sql := `SELECT COALESCE(MAX(t.num), 0) AS count FROM (
 				SELECT COUNT(1) AS num  FROM base_from_smm_index AS a
 				INNER JOIN base_from_smm_data AS b ON a.index_code=b.index_code
@@ -246,51 +179,12 @@ type ExportSmmDataMaxCount struct {
 	Count    int
 }
 
-//
-//func GetExportSmmDataMaxCount(typeCodes []string) (items []*ExportSmmDataMaxCount, err error) {
-//	if len(typeCodes) == 0 {
-//		return
-//	}
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT
-//				MAX(t.num) AS count,
-//				t.type_name
-//			FROM
-//				(
-//					SELECT
-//						COUNT(1) AS num,
-//						CONCAT(a.type_2, "#", a.type_3) AS type_name
-//					FROM
-//						base_from_smm_index AS a
-//					INNER JOIN base_from_smm_data AS b ON a.index_code = b.index_code
-//					WHERE
-//						CONCAT(a.type_2, "#", a.type_3) IN (` + utils.GetOrmInReplace(len(typeCodes)) + `)
-//					GROUP BY
-//						a.base_from_smm_index_id
-//				) AS t
-//			GROUP BY
-//				type_name `
-//	_, err = o.Raw(sql, typeCodes).QueryRows(&items)
-//	return
-//}
-
 type ExportSmmIndexData struct {
 	Value     string `orm:"column(value)" description:"日期"`
 	DataTime  string `orm:"column(data_time)" description:"值"`
 	IndexCode string `orm:"column(index_code)" description:"指标编码"`
 }
 
-//
-//func GetExportSmmIndexDataByCodes(indexCodes []string) (items []*ExportSmmIndexData, err error) {
-//	if len(indexCodes) == 0 {
-//		return
-//	}
-//	o := orm.NewOrmUsingDB("data")
-//	sql := ` SELECT index_code,data_time,value FROM base_from_smm_data WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodes)) + `) ORDER BY data_time DESC  `
-//	_, err = o.Raw(sql, indexCodes).QueryRows(&items)
-//	return
-//}
-
 // GetSmmBaseInfoList
 // @Description: 获取有色数据列表
 // @author: Roc
@@ -304,33 +198,6 @@ type ExportSmmIndexData struct {
 // @return items []*BaseRefreshEdbInfo
 // @return err error
 func GetSmmBaseInfoList(condition string, pars []interface{}, orderBy string, startSize, pageSize int) (total int, items []*BaseRefreshEdbInfo, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//
-	//// 数量汇总
-	//totalSql := ` SELECT count(1) FROM base_from_smm_index WHERE 1=1 `
-	//if condition != "" {
-	//	totalSql += condition
-	//}
-	//err = o.Raw(totalSql, pars).QueryRow(&total)
-	//if err != nil {
-	//	return
-	//}
-	//
-	//// 列表数据
-	//sql := ` SELECT base_from_smm_index_id as edb_info_id, classify_id,index_code,index_name,end_date,end_value,frequency,is_stop,terminal_code FROM base_from_smm_index WHERE 1=1  `
-	//if condition != "" {
-	//	sql += condition
-	//}
-	//
-	//if orderBy != "" {
-	//	sql += ` ORDER BY ` + orderBy
-	//} else {
-	//	sql += ` ORDER BY base_from_smm_index_id ASC `
-	//}
-	//sql += `  LIMIT ?,? `
-	//
-	//_, err = o.Raw(sql, pars...).QueryRows(&items)
-
 	// 数量汇总
 	totalSql := ` SELECT count(1) FROM base_from_smm_index WHERE 1=1 `
 	if condition != "" {
@@ -373,18 +240,6 @@ func ModifySmmUpdateStatus(edbIdList []int, indexCodeList []string, isStop int)
 	if idNum <= 0 {
 		return
 	}
-	//o, err := orm.NewOrmUsingDB("data").Begin()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	if err != nil {
-	//		_ = o.Rollback()
-	//		return
-	//	}
-	//	_ = o.Commit()
-	//}()
-
 	to := global.DmSQL["data"].Begin()
 
 	defer func() {
@@ -396,12 +251,6 @@ func ModifySmmUpdateStatus(edbIdList []int, indexCodeList []string, isStop int)
 	}()
 
 	// 更改数据源的更新状态
-	//sql := ` UPDATE base_from_smm_index SET is_stop = ? WHERE base_from_smm_index_id IN (` + utils.GetOrmInReplace(idNum) + `) `
-	//_, err = o.Raw(sql, isStop, edbIdList).Exec()
-	//if err != nil {
-	//	return
-	//}
-
 	sql := ` UPDATE base_from_smm_index SET is_stop = ? WHERE base_from_smm_index_id IN (` + utils.GetOrmInReplace(idNum) + `) `
 	err = to.Exec(sql, isStop, edbIdList).Error
 	if err != nil {
@@ -411,12 +260,6 @@ func ModifySmmUpdateStatus(edbIdList []int, indexCodeList []string, isStop int)
 	codeNum := len(indexCodeList)
 	if codeNum <= 0 {
 		// 需要通过指标id列表查找code列表
-		//sql := ` SELECT index_code FROM base_from_smm_index WHERE base_from_smm_index_id IN (` + utils.GetOrmInReplace(idNum) + `) `
-		//_, err = o.Raw(sql, edbIdList).QueryRows(&indexCodeList)
-		//if err != nil {
-		//	return
-		//}
-
 		sql := ` SELECT index_code FROM base_from_smm_index WHERE base_from_smm_index_id IN (` + utils.GetOrmInReplace(idNum) + `) `
 		err = to.Raw(sql, edbIdList).Find(&indexCodeList).Error
 		if err != nil {
@@ -431,12 +274,6 @@ func ModifySmmUpdateStatus(edbIdList []int, indexCodeList []string, isStop int)
 	}
 
 	// 更改指标的更新状态
-	//sql = ` UPDATE edb_info SET no_update = ? WHERE source = ? AND sub_source= ? AND edb_code IN (` + utils.GetOrmInReplace(codeNum) + `) `
-	//_, err = o.Raw(sql, isStop, utils.DATA_SOURCE_YS, 0, indexCodeList).Exec()
-	//if err != nil {
-	//	return
-	//}
-
 	sql = ` UPDATE edb_info SET no_update = ? WHERE source = ? AND sub_source= ? AND edb_code IN (` + utils.GetOrmInReplace(codeNum) + `) `
 	err = to.Exec(sql, isStop, utils.DATA_SOURCE_YS, 0, indexCodeList).Error
 	if err != nil {

models/data_manage/supply_analysis/base_from_stock_plant_data.go

@@ -43,15 +43,3 @@ func GetVarietyEdbData(varietyEdbId int, startDate, endDate string) (items []*Ba
 
 	return
 }
-
-func GetVarietyEdbDataListByIdList(varietyEdbIdList []int) (items []*BaseFromStockPlantData, err error) {
-	num := len(varietyEdbIdList)
-	if num <= 0 {
-		return
-	}
-	sql := `SELECT * FROM  (SELECT * FROM base_from_stock_plant_data AS a WHERE a.variety_edb_id in (` + utils.GetOrmInReplace(num) + `) GROUP BY data_time) d ORDER BY data_time DESC `
-	//sql := ` SELECT  DT FROM edbdata WHERE TRADE_CODE IN(` + tradeCode + `)  GROUP BY DT ORDER BY DT DESC `
-	err = global.DmSQL["data"].Raw(sql, varietyEdbIdList).Find(&items).Error
-
-	return
-}

models/data_manage/supply_analysis/variety.go

@@ -38,13 +38,6 @@ func GetVarietyByName(name string) (item *Variety, err error) {
 	return
 }
 
-// AddVariety 添加品种
-func AddVariety(item *Variety) (lastId int64, err error) {
-	err = global.DmSQL["data"].Create(item).Error
-
-	return
-}
-
 // CreateVariety 添加品种
 func CreateVariety(item *Variety, adminIdList []int) (err error) {
 	to := global.DmSQL["data"].Begin()
@@ -219,23 +212,8 @@ func (variety *Variety) Delete() (err error) {
 	return
 }
 
-// GetVarietyMaxSort 获取图表分类下最大的排序数
-func GetVarietyMaxSort(parentId int) (sort int, err error) {
-	sql := `SELECT Max(sort) AS sort FROM future_good_chart_classify WHERE parent_id=? AND is_delete=0 `
-	err = global.DmSQL["data"].Raw(sql, parentId).Scan(&sort).Error
-
-	return
-}
-
 type VarietyView struct {
 	VarietyId   int    `orm:"column(future_good_chart_classify_id);pk" gorm:"primaryKey" `
 	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.DmSQL["data"].Raw(sql, classifyId).First(&item).Error
-
-	return
-}

models/data_manage/supply_analysis/variety_edb_info.go

@@ -35,14 +35,6 @@ func BatchCreateVarietyEdbInfo(list []*VarietyEdbInfo) (err 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.DmSQL["data"].Raw(sql, varietyId).Scan(&total).Error
-
-	return
-}
-
 // GetVarietyEdbListByVarietyId 根据品种id获取添加到已经生成的指标（不管是否加入到ETA指标库）
 func GetVarietyEdbListByVarietyId(varietyId int) (items []*VarietyEdbInfo, err error) {
 	sql := `SELECT * FROM variety_edb_info AS a WHERE a.variety_id = ?`

models/data_manage/trade_analysis/trade_analysis.go

@@ -105,15 +105,6 @@ 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.DmSQL["data"].Raw(sql).Scan(&item).Error
-
-	return
-}
-
 type GetPositionTopReq struct {
 	Exchange     string `json:"exchange" form:"exchange"`           //交易所
 	ClassifyName string `json:"classify_name" form:"classify_name"` //分类名称

models/data_manage/trade_position_analysis.go

@@ -98,30 +98,18 @@ func InsertMultiTradePositionTop(exchange string, items []*TradePositionTop) (er
 }
 
 func GetTradePositionTopByExchangeDataTime(exchange string, startDate, endDate string) (list []*TradePositionTop, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := "SELECT * FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (1,2) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc"
-	//_, err = o.Raw(sql, startDate, endDate).QueryRows(&list)
-
 	sql := "SELECT * FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (1,2) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc"
 	err = global.DmSQL["data"].Raw(sql, startDate, endDate).Find(&list).Error
 	return
 }
 
 func GetTradePositionTopCountByExchangeDataTime(exchange string, startDate, endDate string) (count int64, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := "SELECT count(*) FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (1,2) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc"
-	//err = o.Raw(sql, startDate, endDate).QueryRow(&count)
-
 	sql := "SELECT count(*) AS count FROM trade_position_" + exchange + "_top where data_time >= ? and data_time <= ? and deal_type in (1,2) ORDER BY classify_name, classify_type, deal_type, data_time, deal_value desc"
 	err = global.DmSQL["data"].Raw(sql, startDate, endDate).Scan(&count).Error
 	return
 }
 
 func GetTradePositionTopByExchangeSourceType(exchange string, dataTime string, sourceType int) (list []*TradePositionTop, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := "SELECT * FROM trade_position_" + exchange + "_top where data_time= ? and source_type = ? ORDER BY classify_name, classify_type, deal_type, deal_value desc"
-	//_, err = o.Raw(sql, dataTime, sourceType).QueryRows(&list)
-
 	sql := "SELECT * FROM trade_position_" + exchange + "_top where data_time= ? and source_type = ? ORDER BY classify_name, classify_type, deal_type, deal_value desc"
 	err = global.DmSQL["data"].Raw(sql, dataTime, sourceType).Find(&list).Error
 	return
@@ -164,21 +152,6 @@ type UpdateDealValueChange struct {
 }
 
 func MultiUpdatePositionTop(exchange string, updates []UpdateDealValueChange) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//p, err := o.Raw("UPDATE trade_position_" + exchange + "_top SET deal_value=?, deal_change=?, source_type=?, modify_time=? WHERE id = ?").Prepare()
-	//if err != nil {
-	//	return
-	//}
-	//defer func() {
-	//	_ = p.Close() // 别忘记关闭 statement
-	//}()
-	//for _, v := range updates {
-	//	_, err = p.Exec(v.DealValue, v.DealChange, v.SourceType, v.ModifyTime, v.Id)
-	//	if err != nil {
-	//		return
-	//	}
-	//}
-
 	sql := ` "UPDATE trade_position_" + exchange + "_top SET deal_value=?, deal_change=?, source_type=?, modify_time=? WHERE id = ?" `
 
 	for _, v := range updates {
@@ -192,10 +165,6 @@ func MultiUpdatePositionTop(exchange string, updates []UpdateDealValueChange) (e
 }
 
 func DeletePositionTopByDataTime(exchange string, dataTime string, dealType int) (err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := "delete from trade_position_" + exchange + "_Top WHERE data_time=? and deal_type=?"
-	//_, err = o.Raw(sql, dataTime, dealType).Exec()
-
 	sql := "delete from trade_position_" + exchange + "_Top WHERE data_time=? and deal_type=?"
 	err = global.DmSQL["data"].Exec(sql, dataTime, dealType).Error
 
@@ -203,27 +172,12 @@ func DeletePositionTopByDataTime(exchange string, dataTime string, dealType int)
 }
 
 func GetTradePositionTopByExchangeDataTimeType(exchange string, dataTime string, dealType int) (list []TradePositionTop, err error) {
-	//o := orm.NewOrmUsingDB("data")
-	//sql := "select * from trade_position_" + exchange + "_Top WHERE data_time=? and deal_type=?"
-	//_, err = o.Raw(sql, dataTime, dealType).QueryRows(&list)
 	sql := "select * from trade_position_" + exchange + "_Top WHERE data_time=? and deal_type=?"
 	err = global.DmSQL["data"].Raw(sql, dataTime, dealType).Find(&list).Error
 	return
 }
 
 func MultiInsertTradeBaseDataToTop(exchange string, startDate, endDate string) (err error) {
-	//	o := orm.NewOrmUsingDB("data")
-	//	now := time.Now().Format(utils.FormatDateTime)
-	//	sql1 := `INSERT INTO trade_position_` + exchange + `_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,rank,create_time,modify_time)
-	//	SELECT classify_name,classify_type,buy_short_name,buy_value,buy_change,data_time,1,0,rank,?,? FROM base_from_trade_` + exchange + `_index where rank <50 and buy_short_name !="" and data_time between ? and ?`
-	//	_, err = o.Raw(sql1, now, now, startDate, endDate).Exec()
-	//	if err != nil {
-	//		return
-	//	}
-	//	sql2 := `INSERT INTO trade_position_` + exchange + `_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,rank,create_time,modify_time)
-	//SELECT classify_name,classify_type,sold_short_name,sold_value,sold_change,data_time,2,0,rank,?,? FROM base_from_trade_` + exchange + `_index where rank <50 and sold_short_name !="" and data_time between ? and ?`
-	//	_, err = o.Raw(sql2, now, now, startDate, endDate).Exec()
-
 	now := time.Now().Format(utils.FormatDateTime)
 	sql1 := `INSERT INTO trade_position_` + exchange + `_top(classify_name,classify_type,deal_short_name,deal_value,deal_change,data_time,deal_type,source_type,rank,create_time,modify_time)
 		SELECT classify_name,classify_type,buy_short_name,buy_value,buy_change,data_time,1,0,rank,?,? FROM base_from_trade_` + exchange + `_index where rank <50 and buy_short_name !='' and data_time between ? and ?`