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