查询图表主题

controllers/data_manage/range_analysis/chart_info.go

@@ -5,6 +5,7 @@ import (
 	"eta/eta_api/controllers"
 	"eta/eta_api/models"
 	"eta/eta_api/models/data_manage"
+	"eta/eta_api/models/data_manage/chart_theme"
 	"eta/eta_api/models/system"
 	"eta/eta_api/services/data"
 	"eta/eta_api/services/data/data_manage_permission"
@@ -85,7 +86,13 @@ func (this *RangeChartChartInfoController) Preview() {
 	chartInfo := new(data_manage.ChartInfoView)
 	chartInfo.ChartType = 1
 	chartInfo.Source = utils.CHART_SOURCE_RANGE_ANALYSIS
-
+	chartTheme, err := chart_theme.GetSystemChartTheme(chartInfo.ChartType)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取图表主题失败, Err:" + err.Error()
+		return
+	}
+	chartInfo.ChartThemeId = chartTheme.ChartThemeId
 	// 获取图表x轴y轴
 	edbList, xEdbIdValue, dataResp, e := rangeServ.GetChartDataByEdbInfoList(0, req.DateType, req.StartYear, req.StartDate, req.EndDate, edbInfoMappingList, &req.ExtraConfig)
 	if e != nil {
@@ -1373,11 +1380,10 @@ func (this *RangeChartChartInfoController) MultipleGraphConfigSaveEdb() {
 	// 普通指标批量新增\批量编辑
 	var saveReq data_manage.BatchEdbInfoCalculateBatchSaveReq
 	calculateEdbList := make([]data_manage.BatchEdbInfoCalculateBatchSaveSuccessResp, 0)
-	reqEdbList := make([]*data_manage.CalculateEdbInfoItem, 0)
+	addReqEdbList := make([]*data_manage.CalculateEdbInfoItem, 0)
+	editReqEdbList := make([]*data_manage.CalculateEdbInfoItem, 0)
 	for _, v := range req.EdbInfoList {
-		/*if edbInfoId, ok := fromEdbMap[v.EdbInfoId]; ok {
-			v.EdbInfoId = edbInfoId
-		}*/
+
 		v.CalculateId = strconv.Itoa(v.FromEdbInfoId)
 		v.EdbName = strings.Trim(v.EdbName, " ")
 		if v.EdbName == "" {
@@ -1427,9 +1433,13 @@ func (this *RangeChartChartInfoController) MultipleGraphConfigSaveEdb() {
 			continue
 		} else {
 		}
-		reqEdbList = append(reqEdbList, v)
+		if v.EdbInfoId > 0 {
+			editReqEdbList = append(editReqEdbList, v)
+		} else {
+			addReqEdbList = append(addReqEdbList, v)
+		}
 	}
-	if len(reqEdbList) <= 0 {
+	if len(editReqEdbList) <= 0 && len(addReqEdbList) <= 0 {
 		br.Msg = "新增失败！"
 		if len(resp.Fail) > 0 {
 			br.ErrMsg = resp.Fail[0].Msg
@@ -1443,27 +1453,53 @@ func (this *RangeChartChartInfoController) MultipleGraphConfigSaveEdb() {
 		saveReq.CalculateFormula = extraConfig
 		saveReq.AdminId = sysUser.AdminId
 		saveReq.AdminName = sysUser.RealName
-		saveReq.EdbList = reqEdbList
-		// 调用指标库去更新
-		reqJson, err := json.Marshal(saveReq)
-		if err != nil {
-			br.Msg = "参数解析异常！"
-			br.ErrMsg = "参数解析失败，Err:" + err.Error()
-			return
-		}
-		respItem, err := data.BatchSaveEdbCalculateMultiData(string(reqJson), this.Lang)
-		if err != nil {
-			br.Msg = "新增失败！"
-			br.ErrMsg = "新增失败，Err:" + err.Error()
-			return
+		if len(addReqEdbList) > 0 {
+			saveReq.EdbList = addReqEdbList
+			// 调用指标库去更新
+			reqJson, err := json.Marshal(saveReq)
+			if err != nil {
+				br.Msg = "参数解析异常！"
+				br.ErrMsg = "参数解析失败，Err:" + err.Error()
+				return
+			}
+			respItem, err := data.BatchSaveEdbCalculateMultiData(string(reqJson), this.Lang)
+			if err != nil {
+				br.Msg = "新增失败！"
+				br.ErrMsg = "新增失败，Err:" + err.Error()
+				return
+			}
+			if respItem.Ret != 200 {
+				br.Msg = respItem.Msg
+				br.ErrMsg = respItem.ErrMsg
+				return
+			}
+			resp = respItem.Data
+			calculateEdbList = respItem.Data.Success
 		}
-		if respItem.Ret != 200 {
-			br.Msg = respItem.Msg
-			br.ErrMsg = respItem.ErrMsg
-			return
+
+		if len(editReqEdbList) > 0 {
+			saveReq.EdbList = addReqEdbList
+			// 调用指标库去更新
+			reqJson, err := json.Marshal(saveReq)
+			if err != nil {
+				br.Msg = "参数解析异常！"
+				br.ErrMsg = "参数解析失败，Err:" + err.Error()
+				return
+			}
+			respItem, err := data.BatchEditEdbCalculateMultiData(string(reqJson), this.Lang)
+			if err != nil {
+				br.Msg = "更新失败！"
+				br.ErrMsg = "更新失败，Err:" + err.Error()
+				return
+			}
+			if respItem.Ret != 200 {
+				br.Msg = respItem.Msg
+				br.ErrMsg = respItem.ErrMsg
+				return
+			}
+			resp.Fail = append(resp.Fail, respItem.Data.Fail...)
+			calculateEdbList = append(calculateEdbList, respItem.Data.Success...)
 		}
-		resp = respItem.Data
-		calculateEdbList = respItem.Data.Success
 	} else if req.EdbInfoType == 1 {
 		// 预测指标
 		for _, v := range req.EdbInfoList {

models/data_manage/chart_info_range_analysis.go

@@ -152,25 +152,41 @@ func EditRangeChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr, lang stri
 	}()
 	var pars []interface{}
 	pars = append(pars, req.ChartName)
+	pars = append(pars, req.ChartNameEn)
 	pars = append(pars, edbInfoIdStr)
 	pars = append(pars, req.ChartType)
 	pars = append(pars, req.ChartClassifyId)
 	pars = append(pars, disabled)
 	pars = append(pars, barChartConf)
 	pars = append(pars, req.ExtraConfig)
+	pars = append(pars, req.StartYear)
+	pars = append(pars, req.ChartThemeId)
 	pars = append(pars, req.SourcesFrom)
+	pars = append(pars, req.Instructions)
+	pars = append(pars, req.MarkersLines)
+	pars = append(pars, req.MarkersAreas)
+	pars = append(pars, req.Unit)
+	pars = append(pars, req.UnitEn)
 
 	sql := ` UPDATE  chart_info
 			SET
 			  chart_name =?,
+			  chart_name_en =?,
               edb_info_ids=?,
 			  chart_type=?,
 			  chart_classify_id = ?,
 			  modify_time = NOW(),
               disabled = ?,
               bar_config = ?,
-			  extra_config = ?,
-			  sources_from = ?
+              extra_config = ?, 
+ 			  start_year = ?,
+ 			  chart_theme_id = ?,
+ 			  sources_from = ?,
+ 			  instructions = ?,
+ 			  markers_lines = ?,
+ 			  markers_areas = ?,
+ 			  unit = ?,
+ 			  unit_en = ?
 			`
 	if calendar != "" {
 		sql += `,calendar = ? `
@@ -205,6 +221,15 @@ func EditRangeChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr, lang stri
 	sql += `,right_max = ? `
 	pars = append(pars, req.RightMax)
 
+	sql += `,right2_min = ? `
+	pars = append(pars, req.Right2Min)
+
+	sql += `,right2_max = ? `
+	pars = append(pars, req.Right2Max)
+
+	sql += `,min_max_save = ? `
+	pars = append(pars, req.MinMaxSave)
+
 	sql += `WHERE chart_info_id = ?`
 
 	pars = append(pars, req.ChartInfoId)