编辑截面组合图

models/data_manage/chart_series.go

@@ -2,6 +2,7 @@ package data_manage
 
 import (
 	"encoding/json"
+	"eta/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
@@ -100,7 +101,6 @@ func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err e
 				return
 			}
 			//新增
-			delete(seriesDeleteMap, v.ChartSeriesId)
 			tmp.CreateTime = time.Now()
 			seriesIdTmp, e := to.Insert(tmp)
 			if e != nil {
@@ -109,6 +109,8 @@ func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err e
 			}
 			seriesId = int(seriesIdTmp)
 		} else {
+			//编辑
+			delete(seriesDeleteMap, v.ChartSeriesId)
 			_, e := to.Update(tmp)
 			if e != nil {
 				err = fmt.Errorf("UpdateChartSeries Err:" + e.Error())
@@ -146,6 +148,26 @@ func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err e
 			}
 		}
 	}
+	//删除旧的系列和ID
+	seriesIds := make([]int, 0)
+	for id, _ := range seriesDeleteMap {
+		seriesIds = append(seriesIds, id)
+	}
+	if len(seriesIds) > 0 {
+		sql := `DELETE FROM chart_series WHERE chart_series_id IN (` + utils.GetOrmInReplace(len(seriesIds)) + `) and chart_info_id=?`
+		_, err = to.Raw(sql, seriesIds, chartInfoId).Exec()
+		if err != nil {
+			err = fmt.Errorf("删除系列失败 Err:" + err.Error())
+			return
+		}
+		sql = `DELETE FROM chart_series_edb_mapping WHERE chart_series_id IN (` + utils.GetOrmInReplace(len(seriesIds)) + `) and chart_info_id=?`
+		_, err = to.Raw(sql, seriesIds, chartInfoId).Exec()
+		if err != nil {
+			err = fmt.Errorf("删除系列指标 Err:" + err.Error())
+			return
+		}
+	}
+
 	return
 }