|
@@ -3224,9 +3224,9 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
for _, mappingItem := range dataList {
|
|
|
quarterDataList := mappingItem.DataList.(data_manage.QuarterDataList)
|
|
|
// 上下限区间
|
|
|
- //if seasonConfig.MaxMinLimits.Value > 0 {
|
|
|
+ //if seasonConfig.MaxMinLimits.Year > 0 {
|
|
|
dataResp.MaxMinLimits.List = make([]*data_manage.MaxMinLimitsData, 0)
|
|
|
- dataTimeMap := make(map[string]time.Time)
|
|
|
+ dataTimeMap := make(map[time.Time]time.Time)
|
|
|
dataTimeList := make([]string, 0)
|
|
|
maxValueMap := make(map[time.Time]float64)
|
|
|
minValueMap := make(map[time.Time]float64)
|
|
@@ -3265,7 +3265,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
minValueMap[newDate] = handleDataMap[date]
|
|
|
}
|
|
|
|
|
|
- dataTimeMap[date] = newDate
|
|
|
+ dataTimeMap[newDate] = newDate
|
|
|
}
|
|
|
} else {
|
|
|
// 旬度、月度、季度、半年度 不插值,需要先把日期列表和数据map取出来
|
|
@@ -3292,7 +3292,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
} else {
|
|
|
minValueMap[newDate] = vv.Value
|
|
|
}
|
|
|
- dataTimeMap[vv.DataTime] = newDate
|
|
|
+ dataTimeMap[newDate] = newDate
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -3325,9 +3325,20 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
dataResp.MaxMinLimits.List = maxMinDataList
|
|
|
dataResp.MaxMinLimits.Color = seasonConfig.MaxMinLimits.Color
|
|
|
dataResp.MaxMinLimits.Legend = seasonConfig.MaxMinLimits.Legend
|
|
|
+ //}
|
|
|
+
|
|
|
+ // 自定义同期均线
|
|
|
+ if seasonConfig.SamePeriodAverage.Year > 0 {
|
|
|
+
|
|
|
}
|
|
|
|
|
|
- //}
|
|
|
+ // 自定义同期标准差
|
|
|
+ if seasonConfig.SamePeriodAverage.Year > 0 {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
return
|
|
|
}
|