清理代码

models/data_manage/base_from_smm_classify.go

@@ -100,18 +100,15 @@ func UpdateBaseFromSmmClassifySort(classifyId int) (err error) {
 }
 
 type BaseFromSmmClassifyItems struct {
-	ClassifyId           int    `description:"分类ID"`
-	BaseFromSmmIndexId   int    `description:"指标类型ID"`
-	BaseFromSmmIndexCode 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 []*BaseFromSmmClassifyItems `gorm:"-" description:"下级"`
+	ClassifyId           int                         `description:"分类ID"`
+	BaseFromSmmIndexId   int                         `description:"指标类型ID"`
+	BaseFromSmmIndexCode string                      `description:"指标唯一编码"`
+	ClassifyName         string                      `description:"分类名称"`
+	ClassifyNameEn       string                      `description:"英文分类名称"`
+	ParentId             int                         `description:"父级id"`
+	Level                int                         `description:"层级"`
+	Sort                 int                         `description:"排序字段，越小越靠前，默认值：10"`
+	Children             []*BaseFromSmmClassifyItems `gorm:"-" description:"下级"`
 }
 
 type BaseFromSmmClassifyNameItems struct {

models/data_manage/edb_data_ys.go

@@ -6,14 +6,7 @@
 package data_manage
 
 import (
-	"crypto/md5"
-	"encoding/hex"
-	"encoding/json"
 	"eta_gn/eta_api/global"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/url"
 )
 
 type BaseFromSmmDataSimple struct {
@@ -39,12 +32,6 @@ func GetEdbDataYsMaxAndMinDate(edbCode string) (minDate, maxDate string, err err
 	return
 }
 
-const (
-	dataUrl = "https://dataapi.smm.cn/GetData/" //data url (中文)
-	//dataUrl = "https://dataapi.smm.cn/GetDataEn/" //data url (english edition)
-	authUrl = "https://platform.smm.cn/usercenter/auth" // auth url (for all)
-)
-
 type TokenResp struct {
 	Code int       `json:"Code"`
 	Msg  string    `json:"Msg"`
@@ -55,41 +42,6 @@ type TokenData struct {
 	Token string `json:"Token"`
 }
 
-// 获取token
-func getToken(userName string, password string) (string, error) {
-	encryptAuth := md5.New()
-	encryptAuth.Write([]byte(password)) //encrypt password with md5
-	newPassword := hex.EncodeToString(encryptAuth.Sum(nil))
-
-	resp, err := http.PostForm(authUrl, url.Values{"user_name": {userName}, "password": {newPassword}})
-	if err != nil {
-		return "", err
-	}
-
-	defer resp.Body.Close()
-
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println("reponse error", err)
-		return "", err
-	}
-
-	var bodyJsonContent TokenResp
-
-	if err = json.Unmarshal([]byte(body), &bodyJsonContent); err != nil {
-		fmt.Println(err, "unmarsal failure")
-		return "", err
-	}
-
-	var token string
-	if bodyJsonContent.Code == 0 {
-		token = bodyJsonContent.Data.Token
-	}
-
-	//print(token)
-	return token, nil
-}
-
 // request response
 type DataResp struct {
 	Code int      `json:"Code"`

models/data_manage/edb_info.go

@@ -218,7 +218,6 @@ func GetEdbInfoByIdList(edbInfoIdList []int) (items []*EdbInfo, err error) {
 
 // MysteelChemicalDataBatchAddCheckReq 钢联化工指标批量添加校验
 type MysteelChemicalDataBatchAddCheckReq struct {
-	// MysteelChemicalDataListReq
 	IndexCodes []string `form:"IndexCodes" description:"全选为false时, 该数组为选中; 全选为true时, 该数组为不选的指标"`
 }
 
@@ -360,22 +359,6 @@ type EditEdbBaseInfoReq struct {
 	Unit      string `description:"指标单位"`
 }
 
-func ModifyEdbInfo(item *EditEdbInfoReq) (err error) {
-	o := global.DmSQL["data"]
-	sql := ` UPDATE  edb_info
-			SET
-			  edb_name =?,
-			  edb_name_source =?,
-			  frequency = ?,
-			  unit = ?,
-			  classify_id = ?,
-			  modify_time = NOW()
-			WHERE edb_info_id = ?`
-	err = o.Exec(sql, item.EdbName, item.EdbName, item.Frequency, item.Unit, item.ClassifyId, item.EdbInfoId).Error
-
-	return
-}
-
 // ModifyEdbEnInfo 修改指标英文信息
 func ModifyEdbEnInfo(item *EditEdbEnInfoReq) (err error) {
 	o := global.DmSQL["data"]

services/data/correlation/chart_info.go

@@ -250,14 +250,7 @@ func GetChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB *data_manage.ChartEd
 		err = errors.New("指标change类型异常")
 		return
 	}
-	//changeDataMap := make(map[string]float64)
-	//newChangeDataList, e := HandleDataByLinearRegression(bDataList, changeDataMap)
-	//if e != nil {
-	//	err = fmt.Errorf("获取变频指标插值法Map失败, Err: %s", e.Error())
-	//	return
-	//}
 
-	// 2023-03-17 时间序列始终以指标A为基准, 始终是B进行平移
 	baseDataList := make([]*data_manage.EdbDataList, 0)
 	baseDataMap := make(map[string]float64)
 	changeDataList := make([]*data_manage.EdbDataList, 0)
@@ -321,35 +314,13 @@ func GetChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB *data_manage.ChartEd
 		baseCalculateData = append(baseCalculateData, baseDataList[i].Value)
 	}
 
-	//zeroBaseData := make([]float64, 0)
-	//zeroCalculateData := make([]float64, 0)
-	//for i := range baseDataTimeArr {
-	//	tmpBaseVal, ok1 := baseDataMap[baseDataTimeArr[i]]
-	//	tmpCalculateVal, ok2 := changeDataMap[baseDataTimeArr[i]]
-	//	if ok1 && ok2 {
-	//		zeroBaseData = append(zeroBaseData, tmpBaseVal)
-	//		zeroCalculateData = append(zeroCalculateData, tmpCalculateVal)
-	//	}
-	//}
-	//if len(zeroBaseData) != len(zeroCalculateData) {
-	//	err = fmt.Errorf("相关系数两组序列元素数不一致, %d-%d", len(baseCalculateData), len(zeroCalculateData))
-	//	return
-	//}
-	//zeroRatio := utils.CalculateCorrelationByIntArr(zeroBaseData, zeroCalculateData)
-	//if leadValue == 0 {
-	//	yData = append(yData, zeroRatio)
-	//}
-
 	// 计算领先/滞后N期
 	if leadValue > 0 {
 		// 平移变频指标领先/滞后的日期(单位天)
 		moveUnitDays := utils.FrequencyDaysMap[leadUnit]
 
 		for i := range xData {
-			//if xData[i] == 0 {
-			//	yData = append(yData, zeroRatio)
-			//	continue
-			//}
+
 			xCalculateData := make([]float64, 0)
 			yCalculateData := make([]float64, 0)
 
@@ -366,9 +337,6 @@ func GetChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB *data_manage.ChartEd
 				}
 			}
 			if len(yCalculateData) <= 0 {
-				//err = fmt.Errorf("领先滞后相关系数两组序列元素数不一致, %d-%d", len(baseCalculateData), len(yCalculateData))
-				//return
-				// 领先滞后后，没有可以计算的数据了
 				continue
 			}
 
@@ -474,7 +442,6 @@ func GetRollingCorrelationChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB *d
 
 	// 数据平移变频指标领先/滞后的日期(单位天)
 	// 2023-03-17 时间序列始终以指标A为基准, 始终是B进行平移
-	//baseDataList := make([]*data_manage.EdbDataList, 0)
 	baseDataMap := make(map[string]float64)
 	changeDataList := make([]*data_manage.EdbDataList, 0)
 	changeDataMap := make(map[string]float64)
@@ -486,7 +453,6 @@ func GetRollingCorrelationChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB *d
 			err = fmt.Errorf("获取变频指标插值法Map失败, Err: %s", e.Error())
 			return
 		}
-		//baseDataList = tmpNewChangeDataList
 	}
 	// B指标不管三七二十一，先变个频再说
 	{
@@ -743,26 +709,6 @@ func AddChartInfo(req data_manage.AddChartInfoReq, source int, sysUser *system.A
 		isSendEmail = false
 		return
 	}
-	//if req.CorrelationChartInfo.StartDate == "" || req.CorrelationChartInfo.EndDate == "" {
-	//	errMsg = "请填写开始结束日期"
-	//	err = errors.New(errMsg)
-	//	isSendEmail = false
-	//	return
-	//}
-	//startDate, e := time.Parse(utils.FormatDate, req.CorrelationChartInfo.StartDate)
-	//if e != nil {
-	//	errMsg = "开始日期格式有误"
-	//	err = errors.New(errMsg)
-	//	isSendEmail = false
-	//	return
-	//}
-	//endDate, e := time.Parse(utils.FormatDate, req.CorrelationChartInfo.EndDate)
-	//if e != nil {
-	//	errMsg = "结束日期格式有误"
-	//	err = errors.New(errMsg)
-	//	isSendEmail = false
-	//	return
-	//}
 	if len(req.CorrelationChartInfo.EdbInfoIdList) != 2 {
 		errMsg = "请选择AB指标"
 		err = errors.New(errMsg)
@@ -941,40 +887,6 @@ func AddChartInfo(req data_manage.AddChartInfoReq, source int, sysUser *system.A
 	correlationChart.EdbInfoIdSecond = req.CorrelationChartInfo.EdbInfoIdList[1].EdbInfoId
 	correlationChart.CreateTime = time.Now().Local()
 	correlationChart.ModifyTime = time.Now().Local()
-	//// 生成图表x轴y轴数据
-	//edbInfoMappingA, e := data_manage.GetChartEdbMappingByEdbInfoId(req.CorrelationChartInfo.EdbInfoIdList[0].EdbInfoId)
-	//if e != nil {
-	//	errMsg = "获取失败"
-	//	err = errors.New("获取相关性图表, A指标mapping信息失败, Err:" + e.Error())
-	//	return
-	//}
-	//edbInfoMappingB, e := data_manage.GetChartEdbMappingByEdbInfoId(req.CorrelationChartInfo.EdbInfoIdList[1].EdbInfoId)
-	//if e != nil {
-	//	errMsg = "获取失败"
-	//	err = errors.New("获取相关性图表, B指标mapping信息失败, Err:" + e.Error())
-	//	return
-	//}
-	//periodData, correlationData, e := GetChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB, req.CorrelationChartInfo.LeadValue, req.CorrelationChartInfo.LeadUnit, req.CorrelationChartInfo.StartDate, req.CorrelationChartInfo.EndDate)
-	//if e != nil {
-	//	errMsg = "获取失败"
-	//	err = errors.New("获取相关性图表, 图表计算值失败, Err:" + e.Error())
-	//	return
-	//}
-	//periodDataByte, e := json.Marshal(periodData)
-	//if e != nil {
-	//	errMsg = "获取失败"
-	//	err = errors.New("相关性图表, X轴信息有误, Err:" + e.Error())
-	//	return
-	//}
-	//correlationDataByte, e := json.Marshal(correlationData[0].Value)
-	//if e != nil {
-	//	errMsg = "获取失败"
-	//	err = errors.New("相关性图表, Y轴信息有误, Err:" + e.Error())
-	//	return
-	//}
-	//correlationChart.PeriodData = string(periodDataByte)
-	//correlationChart.CorrelationData = string(correlationDataByte)
-
 	// 新增图表和指标mapping
 	chartInfoId, e := data_manage.CreateCorrelationChartAndEdb(chartInfo, mapList, correlationChart)
 	if e != nil {
@@ -1035,12 +947,6 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin, lang
 		isSendEmail = false
 		return
 	}
-	//if req.CorrelationChartInfo.StartDate == "" || req.CorrelationChartInfo.EndDate == "" {
-	//	errMsg = "请填写开始结束日期"
-	//	err = errors.New(errMsg)
-	//	isSendEmail = false
-	//	return
-	//}
 	startDate, e := time.Parse(utils.FormatDate, req.CorrelationChartInfo.StartDate)
 	if e != nil {
 		errMsg = "开始日期格式有误"
@@ -1160,38 +1066,6 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin, lang
 
 	// 图表启用与否
 	disableVal := data.CheckIsDisableChart(edbInfoIdArr)
-
-	// 重新生成图表值, 并修改相关性图表扩展信息
-	//edbInfoMappingA, e := data_manage.GetChartEdbMappingByEdbInfoId(req.CorrelationChartInfo.EdbInfoIdList[0].EdbInfoId)
-	//if e != nil {
-	//	errMsg = "获取失败"
-	//	err = errors.New("获取相关性图表, A指标mapping信息失败, Err:" + e.Error())
-	//	return
-	//}
-	//edbInfoMappingB, e := data_manage.GetChartEdbMappingByEdbInfoId(req.CorrelationChartInfo.EdbInfoIdList[1].EdbInfoId)
-	//if e != nil {
-	//	errMsg = "获取失败"
-	//	err = errors.New("获取相关性图表, B指标mapping信息失败, Err:" + e.Error())
-	//	return
-	//}
-	//periodData, correlationData, e := GetChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB, req.CorrelationChartInfo.LeadValue, req.CorrelationChartInfo.LeadUnit, req.CorrelationChartInfo.StartDate, req.CorrelationChartInfo.EndDate)
-	//if e != nil {
-	//	errMsg = "获取失败"
-	//	err = errors.New("获取相关性图表, 图表计算值失败, Err:" + e.Error())
-	//	return
-	//}
-	//periodDataByte, e := json.Marshal(periodData)
-	//if e != nil {
-	//	errMsg = "获取失败"
-	//	err = errors.New("相关性图表, X轴信息有误, Err:" + e.Error())
-	//	return
-	//}
-	//correlationDataByte, e := json.Marshal(correlationData[0].Value)
-	//if e != nil {
-	//	errMsg = "获取失败"
-	//	err = errors.New("相关性图表, Y轴信息有误, Err:" + e.Error())
-	//	return
-	//}
 	correlationChart.LeadValue = req.CorrelationChartInfo.LeadValue
 	correlationChart.LeadUnit = req.CorrelationChartInfo.LeadUnit
 	correlationChart.CalculateValue = req.CorrelationChartInfo.CalculateValue
@@ -1205,10 +1079,8 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin, lang
 	if chartItem.Source == utils.CHART_SOURCE_ROLLING_CORRELATION {
 		correlationChart.DateType = req.CorrelationChartInfo.DateType
 	}
-	//correlationChart.PeriodData = string(periodDataByte)
-	//correlationChart.CorrelationData = string(correlationDataByte)
+
 	correlationChart.ModifyTime = time.Now().Local()
-	//correlationUpdateCols := []string{"LeadValue", "LeadUnit", "StartDate", "EndDate", "EdbInfoIdFirst", "EdbInfoIdSecond", "PeriodData","CorrelationData", "ModifyTime"}
 	correlationUpdateCols := []string{"LeadValue", "LeadUnit", "CalculateValue", "CalculateUnit", "DateType", "StartDate", "EndDate", "EdbInfoIdFirst", "EdbInfoIdSecond", "ModifyTime"}
 
 	// 修改图表与指标mapping
@@ -1311,46 +1183,6 @@ func CalculateCorrelation(leadValue int, leadUnit, frequencyA, frequencyB string
 	}
 
 	// 计算窗口，不包含第一天
-	//startDateTime, _ := time.ParseInLocation(utils.FormatDate, startDate, time.Local)
-	//startDate = startDateTime.AddDate(0, 0, 1).Format(utils.FormatDate)
-
-	//// 2023-03-02 时间序列始终以指标B为基准, 始终是A进行平移
-	//baseEdbInfo := edbInfoMappingB
-	//changeEdbInfo := edbInfoMappingA
-	// 2023-03-17 时间序列始终以指标A为基准, 始终是B进行平移
-	//baseEdbInfo := edbInfoMappingA
-	//changeEdbInfo := edbInfoMappingB
-
-	// 获取时间基准指标在时间区间内的值
-	//aDataList := make([]*data_manage.EdbDataList, 0)
-	//switch baseEdbInfo.EdbInfoCategoryType {
-	//case 0:
-	//	aDataList, err = data_manage.GetEdbDataList(baseEdbInfo.Source, baseEdbInfo.SubSource, baseEdbInfo.EdbInfoId, startDate, endDate)
-	//case 1:
-	//	_, aDataList, _, _, err, _ = data.GetPredictDataListByPredictEdbInfoId(baseEdbInfo.EdbInfoId, startDate, endDate, false)
-	//default:
-	//	err = errors.New("指标base类型异常")
-	//	return
-	//}
-	//
-	//// 获取变频指标所有日期的值, 插值法完善数据
-	//bDataList := make([]*data_manage.EdbDataList, 0)
-	//switch changeEdbInfo.EdbInfoCategoryType {
-	//case 0:
-	//	bDataList, err = data_manage.GetEdbDataList(changeEdbInfo.Source, changeEdbInfo.SubSource, changeEdbInfo.EdbInfoId, "", "")
-	//case 1:
-	//	_, bDataList, _, _, err, _ = data.GetPredictDataListByPredictEdbInfoId(changeEdbInfo.EdbInfoId, "", "", false)
-	//default:
-	//	err = errors.New("指标change类型异常")
-	//	return
-	//}
-	//changeDataMap := make(map[string]float64)
-	//newChangeDataList, e := HandleDataByLinearRegression(bDataList, changeDataMap)
-	//if e != nil {
-	//	err = fmt.Errorf("获取变频指标插值法Map失败, Err: %s", e.Error())
-	//	return
-	//}
-
 	// 2023-03-17 时间序列始终以指标A为基准, 始终是B进行平移
 	baseDataList := make([]*data_manage.EdbDataList, 0)
 	baseDataMap := make(map[string]float64)
@@ -1415,35 +1247,13 @@ func CalculateCorrelation(leadValue int, leadUnit, frequencyA, frequencyB string
 		baseCalculateData = append(baseCalculateData, baseDataList[i].Value)
 	}
 
-	//zeroBaseData := make([]float64, 0)
-	//zeroCalculateData := make([]float64, 0)
-	//for i := range baseDataTimeArr {
-	//	tmpBaseVal, ok1 := baseDataMap[baseDataTimeArr[i]]
-	//	tmpCalculateVal, ok2 := changeDataMap[baseDataTimeArr[i]]
-	//	if ok1 && ok2 {
-	//		zeroBaseData = append(zeroBaseData, tmpBaseVal)
-	//		zeroCalculateData = append(zeroCalculateData, tmpCalculateVal)
-	//	}
-	//}
-	//if len(zeroBaseData) != len(zeroCalculateData) {
-	//	err = fmt.Errorf("相关系数两组序列元素数不一致, %d-%d", len(baseCalculateData), len(zeroCalculateData))
-	//	return
-	//}
-	//zeroRatio := utils.CalculateCorrelationByIntArr(zeroBaseData, zeroCalculateData)
-	//if leadValue == 0 {
-	//	yData = append(yData, zeroRatio)
-	//}
-
 	// 计算领先/滞后N期
 	if leadValue > 0 {
 		// 平移变频指标领先/滞后的日期(单位天)
 		moveUnitDays := utils.FrequencyDaysMap[leadUnit]
 
 		for i := range xData {
-			//if xData[i] == 0 {
-			//	yData = append(yData, zeroRatio)
-			//	continue
-			//}
+
 			xCalculateData := make([]float64, 0)
 			yCalculateData := make([]float64, 0)
 
@@ -1460,9 +1270,6 @@ func CalculateCorrelation(leadValue int, leadUnit, frequencyA, frequencyB string
 				}
 			}
 			if len(yCalculateData) <= 0 {
-				//err = fmt.Errorf("领先滞后相关系数两组序列元素数不一致, %d-%d", len(baseCalculateData), len(yCalculateData))
-				//return
-				// 领先滞后后，没有可以计算的数据了
 				continue
 			}
 

services/data/data_manage_permission/chart.go

@@ -19,8 +19,6 @@ import (
 // @param permissionChartClassifyIdList []int
 // @return hasAuth bool
 func CheckChartPermissionByPermissionIdList(chartIsJoinPermission, chartClassifyIsJoinPermission, chartInfoId, chartClassifyId int, permissionChartInfoIdList, permissionChartClassifyIdList []int) (hasAuth bool) {
-	//hasAuth = true
-
 	// 判断 分类是否纳入权限管控
 	if chartClassifyIsJoinPermission == 1 {
 		// 不属于已授权的分类，那么就无权限

services/data/data_manage_permission/data_move.go

@@ -97,12 +97,6 @@ func GetEdbChartClassifyList(source, subSource int) (resp data_manage.EdbChartCl
 		}
 
 	case 3, 7:
-		//ETA指标库
-		//rootList, e := data_manage.GetEdbClassifyByParentId(0, 0)
-		//if e != nil && !utils.IsErrNoRow(e) {
-		//	err = e
-		//	return
-		//}
 		// 这里拆分指标库和计算指标
 		classifyType := utils.EdbClassifyTypeBase
 		if source == 7 {
@@ -133,11 +127,6 @@ func GetEdbChartClassifyList(source, subSource int) (resp data_manage.EdbChartCl
 			return
 		}
 		resp.List = GetChartMenuTreeRecursive(classifyAll, 0)
-
-	// 将数据加入缓存
-	//if utils.Re == nil {
-	//	utils.Rc.Delete(key)
-	//}
 	case 6:
 		// ETA表格
 		// 考虑到后面可以会迭代到10层, 这里直接用递归处理