截面组合图数据处理

controllers/data_manage/chart_info_section.go

@@ -2,13 +2,11 @@ package data_manage
 
 import (
 	"encoding/json"
-	"errors"
 	"eta/eta_api/models"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/services/data"
 	"eta/eta_api/services/data/data_manage_permission"
 	"eta/eta_api/utils"
-	"fmt"
 	"strings"
 )
 
@@ -200,81 +198,3 @@ func (this *ChartInfoController) PreviewSectionCombineChartInfo() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
-
-// PreviewSectionCombineChartInfo
-// @Title 图表-获取预览的截面组合图数据
-// @Description 图表-获取预览的截面组合图数据
-// @Param	request	body data_manage.ChartSectionDateConfItem true "type json string"
-// @Success 200 {object} data_manage.PreviewSectionCombineDateCalculateResp
-// @router /chart_info/section_combine/date_calculate [post]
-func (this *ChartInfoController) PreviewSectionCombineDateCalculate() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	var req data_manage.PreviewSectionCombineDateCalculateReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	//查询指标细信息
-	dataList := make([]*data_manage.EdbDataList, 0)
-	if req.EdbInfoId > 0 {
-		edbInfo, e := data_manage.GetEdbInfoById(req.EdbInfoId)
-		if e != nil {
-			br.Msg = "指标查询失败！"
-			br.ErrMsg = "指标查询失败，Err:" + e.Error()
-			return
-		}
-		startDateReal := ""
-		endDate := ""
-
-		switch edbInfo.EdbInfoType {
-		case 0:
-			dataList, err = data_manage.GetEdbDataList(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbInfoId, startDateReal, endDate)
-		case 1:
-			_, dataList, _, _, err, _ = data.GetPredictDataListByPredictEdbInfoId(edbInfo.EdbInfoId, startDateReal, endDate, true)
-		default:
-			err = errors.New(fmt.Sprint("获取失败,指标类型异常", edbInfo.EdbInfoType))
-		}
-		if err != nil {
-			br.Msg = "指标数据查询失败！"
-			br.ErrMsg = "指标数据查询失败，Err:" + err.Error()
-			return
-		}
-	}
-	var findDate string
-	if req.DateType == 1 {
-		req.EdbInfoId = 0
-	}
-	findDate, err = data.GetChartSectionSeriesDateByDateChange(req.EdbInfoId, dataList, req.DateChange, req.MoveForward)
-	if err != nil {
-		br.Msg = "指标数据查询失败！"
-		br.ErrMsg = "指标数据查询失败，Err:" + err.Error()
-		return
-	}
-
-	if findDate == "" {
-		br.Msg = "日期为空！"
-		return
-	}
-	resp := &data_manage.PreviewSectionCombineDateCalculateResp{
-		Date: findDate,
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}

models/data_manage/chart_info.go

@@ -2601,7 +2601,8 @@ type ChartSectionDateConfItem struct {
 	EdbInfoType    int    `description:"指标类型"`
 	Frequency      string `description:"频度"`
 	EndDate        string `description:"最新日期"`
-	DateType       int    `description:"日期类型:0 指标日期，1系统日期"`
+	StaticDate     string `description:"固定日期"`
+	DateType       int    `description:"日期类型:0 指标日期，1系统日期, 2固定日期"`
 	DateConfName   string `description:"引用日期名称"` // 引用日期名称不能重复
 	DateConfNameEn string `description:"引用日期英文名称"`
 	DateChange     []*ChartSectionDateChange

routers/commentsRouter.go

@@ -2932,15 +2932,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ChartInfoController"],
-        beego.ControllerComments{
-            Method: "PreviewSectionCombineDateCalculate",
-            Router: `/chart_info/section_combine/date_calculate`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ChartInfoController"],
         beego.ControllerComments{
             Method: "GetChartTypeList",

services/data/chart_extra_config.go

@@ -395,18 +395,34 @@ func GetChartSectionCombineData(chartInfo *data_manage.ChartInfo, mappingList []
 				}
 				// todo 根据日期变换得到最终日期
 				edbDataListTmp := make([]*data_manage.EdbDataList, 0)
-				if dateConfItem.EdbInfoId > 0 {
-					edbDataListTmp, ok1 = edbDataListMap[dateConfItem.EdbInfoId]
-					if !ok1 {
-						err = fmt.Errorf("指标%d的日期数据不存在", dateConfItem.EdbInfoId)
+				if dateConfItem.DateType == 0 {
+					if dateConfItem.EdbInfoId > 0 {
+						edbDataListTmp, ok1 = edbDataListMap[dateConfItem.EdbInfoId]
+						if !ok1 {
+							err = fmt.Errorf("指标%d的日期数据不存在", dateConfItem.EdbInfoId)
+							return
+						}
+						findDate, err = GetChartSectionSeriesDateByDateChange(dateConfItem.EdbInfoId, edbDataListTmp, dateConfItem.DateChange, dateConfItem.MoveForward)
+						if err != nil {
+							err = fmt.Errorf("指标%d的日期变换处理失败", dateConfItem.EdbInfoId)
+							return
+						}
+					} else {
+						err = fmt.Errorf("请选择指标")
 						return
 					}
-				}
-
-				findDate, err = GetChartSectionSeriesDateByDateChange(dateConfItem.EdbInfoId, edbDataListTmp, dateConfItem.DateChange, dateConfItem.MoveForward)
-				if err != nil {
-					err = fmt.Errorf("指标%d的日期变换处理失败", dateConfItem.EdbInfoId)
-					return
+				} else if dateConfItem.DateType == 1 {
+					findDate, err = GetChartSectionSeriesDateByDateChange(dateConfItem.EdbInfoId, edbDataListTmp, dateConfItem.DateChange, dateConfItem.MoveForward)
+					if err != nil {
+						err = fmt.Errorf("指标%d的日期变换处理失败", dateConfItem.EdbInfoId)
+						return
+					}
+				} else if dateConfItem.DateType == 2 {
+					if dateConfItem.StaticDate == "" {
+						err = fmt.Errorf("请输入固定日期")
+						return
+					}
+					findDate = dateConfItem.StaticDate
 				}
 			}
 			findDateTime, _ := time.ParseInLocation(utils.FormatDate, findDate, time.Local)
@@ -601,7 +617,6 @@ func GetChartSectionCombineData(chartInfo *data_manage.ChartInfo, mappingList []
 					extraConfig.DateConfList[i].Frequency = edbItem.Frequency
 					extraConfig.DateConfList[i].EndDate = edbItem.EndDate
 				}
-
 			}
 		}
 	}