保存接口调整

controllers/data_manage/chart_info.go

@@ -121,25 +121,7 @@ func (this *ChartInfoController) ChartInfoSave() {
 		edbInfoIdArrStr = append(edbInfoIdArrStr, strconv.Itoa(v))
 	}
 	edbInfoIdStr := strings.Join(edbInfoIdArrStr, ",")
-
-	seasonExtraConfig := ""
-	if chartItem.ChartType == 2 {
-		if req.SeasonExtraConfig.XEndDate != "" {
-			if req.SeasonExtraConfig.XStartDate > req.SeasonExtraConfig.XEndDate && req.SeasonExtraConfig.JumpYear != 1 {
-				br.Msg = "季节性图表配置信息异常：横坐标日期配置错误"
-				return
-			}
-			seasonExtra, tErr := json.Marshal(req.SeasonExtraConfig)
-			if tErr != nil {
-				br.Msg = "季节性图表配置信息异常"
-				br.ErrMsg = "季节性图表配置信息异常,Err:" + tErr.Error()
-				return
-			}
-
-			seasonExtraConfig = string(seasonExtra)
-		}
-	}
-	err = data_manage.ModifyChartInfoAndMapping(edbInfoIdStr, &req, chartItem.ChartType, seasonExtraConfig)
+	err = data_manage.ModifyChartInfoAndMapping(edbInfoIdStr, &req, chartItem.ChartType)
 	if err != nil {
 		br.Msg = "保存失败"
 		br.ErrMsg = "保存失败,Err:" + err.Error()

models/data_manage/chart_info.go

@@ -141,19 +141,18 @@ func GetChartInfoViewByIds(chartInfoIds []string) (list []*ChartInfoView, err er
 }
 
 type SaveChartInfoReq struct {
-	ChartEdbInfoList  []*ChartSaveItem `description:"指标及配置信息"`
-	ChartInfoId       int              `description:"图表id,新增时传0"`
-	DateType          int              `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间,6:起始日期至今"`
-	StartDate         string           `description:"自定义开始日期"`
-	EndDate           string           `description:"自定义结束日期"`
-	Calendar          string           `description:"公历/农历"`
-	LeftMin           string           `description:"图表左侧最小值"`
-	LeftMax           string           `description:"图表左侧最大值"`
-	RightMin          string           `description:"图表右侧最小值"`
-	RightMax          string           `description:"图表右侧最大值"`
-	ExtraConfig       string           `description:"图表额外配置,json数据"`
-	SeasonExtraConfig SeasonExtraItem  `description:"季节性图表中的配置,json数据"`
-	StartYear         int              `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
+	ChartEdbInfoList []*ChartSaveItem `description:"指标及配置信息"`
+	ChartInfoId      int              `description:"图表id,新增时传0"`
+	DateType         int              `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间,6:起始日期至今"`
+	StartDate        string           `description:"自定义开始日期"`
+	EndDate          string           `description:"自定义结束日期"`
+	Calendar         string           `description:"公历/农历"`
+	LeftMin          string           `description:"图表左侧最小值"`
+	LeftMax          string           `description:"图表左侧最大值"`
+	RightMin         string           `description:"图表右侧最小值"`
+	RightMax         string           `description:"图表右侧最大值"`
+	ExtraConfig      string           `description:"图表额外配置,json数据"`
+	StartYear        int              `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
 }
 
 type ChartSaveItem struct {
@@ -523,7 +522,7 @@ type YData struct {
 	UnitEn         string          `description:"英文单位名称"`
 }
 
-func ModifyChartInfoAndMapping(edbInfoIdStr string, req *SaveChartInfoReq, chartType int, seasonExtra string) (err error) {
+func ModifyChartInfoAndMapping(edbInfoIdStr string, req *SaveChartInfoReq, chartType int) (err error) {
 	o := orm.NewOrmUsingDB("data")
 	to, err := o.Begin()
 	if err != nil {
@@ -577,10 +576,9 @@ func ModifyChartInfoAndMapping(edbInfoIdStr string, req *SaveChartInfoReq, chart
 			  left_max=?,
 			  right_min=?,
 			  right_max=?,
-			  season_extra_config=?,
 			  start_year=?
 			WHERE chart_info_id = ?`
-		_, err = to.Raw(sql, edbInfoIdStr, req.Calendar, req.DateType, req.StartDate, req.EndDate, req.StartDate, req.EndDate, req.LeftMin, req.LeftMax, req.RightMin, req.RightMax, seasonExtra, req.StartYear, req.ChartInfoId).Exec()
+		_, err = to.Raw(sql, edbInfoIdStr, req.Calendar, req.DateType, req.StartDate, req.EndDate, req.StartDate, req.EndDate, req.LeftMin, req.LeftMax, req.RightMin, req.RightMax, req.StartYear, req.ChartInfoId).Exec()
 		if err != nil {
 			fmt.Println("UPDATE  chart_info Err:", err.Error())
 			return err