单因子图表来源

controllers/data_manage/multiple_graph_config.go

@@ -828,8 +828,8 @@ func (this *ChartInfoController) MultipleGraphConfigSaveChart() {
 				startDate, endDate = utils.GetDateByDateType(req.Curve.DateType, req.Curve.StartDate, req.Curve.EndDate)
 			}
 
-			// 图例
-			var extraConfig string
+			// 图例, 图表来源
+			var sourceFrom, extraConfig string
 			if req.CorrelationExtraConfig != nil {
 				b, e := json.Marshal(req.CorrelationExtraConfig)
 				if e != nil {
@@ -839,6 +839,15 @@ func (this *ChartInfoController) MultipleGraphConfigSaveChart() {
 				}
 				extraConfig = string(b)
 			}
+			if req.SourcesFrom != nil {
+				b, e := json.Marshal(req.SourcesFrom)
+				if e != nil {
+					br.Msg = "保存失败"
+					br.ErrMsg = fmt.Sprintf("图表来源JSON格式化失败, Err: %v", e)
+					return
+				}
+				sourceFrom = string(b)
+			}
 
 			correlationChartInfoReq := data_manage.CorrelationChartInfoReq{
 				LeadValue:          leadValue,
@@ -871,6 +880,7 @@ func (this *ChartInfoController) MultipleGraphConfigSaveChart() {
 					Calendar:             "公历",
 					CorrelationChartInfo: correlationChartInfoReq,
 					ExtraConfig:          extraConfig,
+					SourcesFrom:          sourceFrom,
 				}
 				chartInfo, err, errMsg, isSendEmail = correlationServ.AddChartInfo(addChartReq, chartSource, sysUser, this.Lang)
 			} else {
@@ -882,6 +892,7 @@ func (this *ChartInfoController) MultipleGraphConfigSaveChart() {
 					Calendar:             "公历",
 					CorrelationChartInfo: correlationChartInfoReq,
 					ExtraConfig:          extraConfig,
+					SourcesFrom:          sourceFrom,
 				}
 				chartInfo, err, errMsg, isSendEmail = correlationServ.EditChartInfo(editChartReq, sysUser, this.Lang)
 				if err != nil {

models/data_manage/chart_info.go

@@ -2007,6 +2007,7 @@ func EditCorrelationChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr stri
 	pars = append(pars, disabled)
 	pars = append(pars, barChartConf)
 	pars = append(pars, req.ExtraConfig)
+	pars = append(pars, req.SourcesFrom)
 
 	sql := ` UPDATE  chart_info
 			SET
@@ -2017,7 +2018,8 @@ func EditCorrelationChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr stri
 			  modify_time = NOW(),
               disabled = ?,
               bar_config = ?,
-			  extra_config = ?
+			  extra_config = ?,
+			  sources_from = ?
 			`
 	if calendar != "" {
 		sql += `,calendar = ? `

models/data_manage/request/multiple_graph_config.go

@@ -25,6 +25,7 @@ type SaveMultipleGraphChartReq struct {
 	RollingCorrelation     []data_manage.RollingCorrelationConfig       `description:"滚动相关性配置"`
 	IsSaveAs               bool                                         `description:"是否另存为，true的话，就是另存为，不会建立与配置的关系"`
 	CorrelationExtraConfig *data_manage.CorrelationChartInfoExtraConfig `description:"普通相关性图表额外设置(含图例)"`
+	SourcesFrom            *data_manage.ChartInfoSourcesFrom            `description:"图表来源"`
 }
 
 // SaveMultipleGraphEdbReq 多图配置的单指标保存请求