Browse Source

fix:相关性计算

Roc 1 year ago
parent
commit
beb1db2f8c
2 changed files with 11 additions and 7 deletions
  1. 2 1
      .gitignore
  2. 9 6
      services/data/correlation/chart_info.go

+ 2 - 1
.gitignore

@@ -14,4 +14,5 @@
 *.DS_Store
 /static/images/*.svg
 eta_api.exe
-eta_api.exe~
+eta_api.exe~
+/static/tmpFile/*

+ 9 - 6
services/data/correlation/chart_info.go

@@ -275,27 +275,30 @@ func GetChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB *data_manage.ChartEd
 
 		// 如果A指标是高频,那么就需要对B指标进行升频
 		if frequencyIntMap[edbInfoMappingA.Frequency] < frequencyIntMap[edbInfoMappingB.Frequency] {
-			tmpNewChangeDataList, e := HandleDataByLinearRegression(aDataList, baseDataMap)
+			tmpNewChangeDataList, e := HandleDataByLinearRegression(bDataList, changeDataMap)
 			if e != nil {
 				err = fmt.Errorf("获取变频指标插值法Map失败, Err: %s", e.Error())
 				return
 			}
-			baseDataList = tmpNewChangeDataList
-		} else {
+			changeDataList = tmpNewChangeDataList
+
+			// 基础指标不用变
 			baseDataList = aDataList
 			for _, v := range baseDataList {
 				baseDataMap[v.DataTime] = v.Value
 			}
 		}
+
 		// 如果B指标是高频,那么就需要对A指标进行升频
 		if frequencyIntMap[edbInfoMappingA.Frequency] > frequencyIntMap[edbInfoMappingB.Frequency] {
-			tmpNewChangeDataList, e := HandleDataByLinearRegression(bDataList, changeDataMap)
+			tmpNewChangeDataList, e := HandleDataByLinearRegression(aDataList, baseDataMap)
 			if e != nil {
 				err = fmt.Errorf("获取变频指标插值法Map失败, Err: %s", e.Error())
 				return
 			}
-			changeDataList = tmpNewChangeDataList
-		} else {
+			baseDataList = tmpNewChangeDataList
+
+			// B指标不用变
 			changeDataList = bDataList
 			for _, v := range changeDataList {
 				changeDataMap[v.DataTime] = v.Value