Merge branch 'feature/eta1.9.6_chart_series' into debug

# Conflicts:
#	models/data_manage/chart_info.go
#	services/data/chart_info.go

models/data_manage/chart_info.go

@@ -2790,3 +2790,12 @@ func EditChartInfoImageV2(chartInfoId int, imageUrl string) (err error) {
 
 	return
 }
+
+// 时序组合图额外配置
+type ChartTimeCombineExtraConf struct {
+	IsHeap int `description:"是否堆积（1.堆积，0不堆积）"`
+}
+
+type ChartTimeCombineDataResp struct {
+	IsHeap int `description:"是否堆积（1.堆积，0不堆积）"`
+}

services/data/chart_info.go

@@ -515,6 +515,17 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 		if seasonExtraConfig != "" {
 			dataResp, err = SeasonChartData(edbList, seasonExtraConfig)
 		}
+	case 6: //时序组合图
+		//判断是否堆积
+		var timeConf data_manage.ChartTimeCombineExtraConf
+		if extraConfig == "" { //历史数据，默认开启堆积
+			timeConf = data_manage.ChartTimeCombineExtraConf{
+				IsHeap: 1,
+			}
+		} else {
+			timeConf = extraConfig.(data_manage.ChartTimeCombineExtraConf)
+		}
+		dataResp = data_manage.ChartTimeCombineDataResp{IsHeap: timeConf.IsHeap}
 	case 7: // 柱形图
 		barChartConf := extraConfig.(data_manage.BarChartInfoReq)
 		xEdbIdValue, yDataList, err = BarChartData(mappingList, edbDataListMap, barChartConf.DateList, barChartConf.Sort)