预览图表

controllers/data_manage/range_analysis/chart_info.go

@@ -5,17 +5,9 @@ import (
 	"eta/eta_api/controllers"
 	"eta/eta_api/models"
 	"eta/eta_api/models/data_manage"
-	"eta/eta_api/models/data_manage/correlation/request"
-	"eta/eta_api/models/system"
-	"eta/eta_api/services/data"
-	"eta/eta_api/services/data/data_manage_permission"
 	rangeServ "eta/eta_api/services/data/range_analysis"
 	"eta/eta_api/utils"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"sort"
-	"strconv"
-	"strings"
 	"time"
 )
 
@@ -53,7 +45,7 @@ func (this *RangeChartChartInfoController) Preview() {
 		return
 	}
 	// 基础校验
-	if req.ExtraConf.EdbInfoMode == 1 && req.EdbInfoId == 0 {
+	if len(req.EdbInfoIds) == 0 {
 		br.Msg = "请选择指标"
 		return
 	}
@@ -110,26 +102,30 @@ func (this *RangeChartChartInfoController) Preview() {
 	}
 
 	// 获取指标信息
-	edbInfoMapping, e := data_manage.GetChartEdbMappingByEdbInfoId(req.EdbInfoId)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取区间计算图表, A指标mapping信息失败, Err:" + e.Error()
-		return
+	//chartInfo.CorrelationLeadUnit = req.LeadUnit
+	edbInfoMappingList := make([]*data_manage.ChartEdbInfoMapping, 0)
+	for _, v := range req.EdbInfoIds {
+		edbInfoMapping, e := data_manage.GetChartEdbMappingByEdbInfoId(v)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取区间计算图表, A指标mapping信息失败, Err:" + e.Error()
+			return
+		}
+		edbInfoMappingList = append(edbInfoMappingList, edbInfoMapping)
 	}
 
 	chartInfo := new(data_manage.ChartInfoView)
-	chartInfo.ChartType = 9
+	chartInfo.ChartType = 1
 
-	//chartInfo.CorrelationLeadUnit = req.LeadUnit
 	// 获取图表x轴y轴
-	xEdbIdValue, dataResp, e := rangeServ.GetChartDataByEdbInfo(edbInfoMapping, &req.ExtraConf)
+	xEdbIdValue, dataResp, e := rangeServ.GetChartDataByEdbInfoList(edbInfoMappingList, &req.ExtraConf)
 	if e != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取区间计算图表, 图表计算值失败, Err:" + e.Error()
 		return
 	}
 	// 完善指标信息
-	edbList, e := rangeServ.GetChartEdbInfoFormat(chartInfo.ChartInfoId, edbInfoMapping)
+	edbList, e := rangeServ.GetChartEdbInfoFormat(chartInfo.ChartInfoId, edbInfoMappingList)
 	if e != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取区间计算图表, 完善指标信息失败, Err:" + e.Error()
@@ -146,2868 +142,3 @@ func (this *RangeChartChartInfoController) Preview() {
 	br.Success = true
 	br.Msg = "获取成功"
 }
-
-// Add
-// @Title 新增图表接口
-// @Description 新增图表接口
-// @Param	request	body data_manage.AddChartInfoReq true "type json string"
-// @Success 200 {object} data_manage.AddChartInfoResp
-// @router /chart_info/add [post]
-func (this *RangeChartChartInfoController) Add() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	deleteCache := true
-	cacheKey := "CACHE_CHART_INFO_ADD_" + strconv.Itoa(sysUser.AdminId)
-	defer func() {
-		if deleteCache {
-			_ = utils.Rc.Delete(cacheKey)
-		}
-	}()
-	if !utils.Rc.SetNX(cacheKey, 1, 30*time.Second) {
-		deleteCache = false
-		br.Msg = "系统处理中，请稍后重试！"
-		br.ErrMsg = "系统处理中，请稍后重试！" + sysUser.RealName + ";data:" + string(this.Ctx.Input.RequestBody)
-		return
-	}
-	var req data_manage.AddChartInfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-
-	chartInfo, err, errMsg, isSendEmail := rangeServ.AddChartInfo(req, utils.CHART_SOURCE_CORRELATION, sysUser, this.Lang)
-	if err != nil {
-		br.Msg = "保存失败"
-		if errMsg != `` {
-			br.Msg = errMsg
-		}
-		br.ErrMsg = err.Error()
-		br.IsSendEmail = isSendEmail
-		return
-	}
-
-	//新增操作日志
-	{
-		chartLog := new(data_manage.ChartInfoLog)
-		chartLog.ChartInfoId = chartInfo.ChartInfoId
-		chartLog.ChartName = req.ChartName
-		chartLog.ChartClassifyId = req.ChartClassifyId
-		chartLog.SysUserId = sysUser.AdminId
-		chartLog.SysUserRealName = sysUser.RealName
-		chartLog.UniqueCode = chartInfo.UniqueCode
-		chartLog.CreateTime = time.Now()
-		chartLog.Content = string(this.Ctx.Input.RequestBody)
-		chartLog.Status = "新增区间计算图表"
-		chartLog.Method = this.Ctx.Input.URI()
-		go data_manage.AddChartInfoLog(chartLog)
-	}
-
-	resp := new(data_manage.AddChartInfoResp)
-	resp.ChartInfoId = chartInfo.ChartInfoId
-	resp.UniqueCode = chartInfo.UniqueCode
-	resp.ChartType = chartInfo.ChartType
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "保存成功"
-	br.Data = resp
-	br.IsAddLog = true
-}
-
-// Edit
-// @Title 编辑图表接口
-// @Description 编辑图表接口
-// @Param	request	body data_manage.EditChartInfoReq true "type json string"
-// @Success Ret=200 保存成功
-// @router /chart_info/edit [post]
-func (this *RangeChartChartInfoController) Edit() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	var req data_manage.EditChartInfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-
-	chartItem, err, errMsg, isSendEmail := rangeServ.EditChartInfo(req, sysUser, this.Lang)
-	if err != nil {
-		br.Msg = "保存失败"
-		if errMsg != `` {
-			br.Msg = errMsg
-		}
-		br.ErrMsg = err.Error()
-		br.IsSendEmail = isSendEmail
-		return
-	}
-
-	resp := new(data_manage.AddChartInfoResp)
-	resp.ChartInfoId = chartItem.ChartInfoId
-	resp.UniqueCode = chartItem.UniqueCode
-	resp.ChartType = req.ChartType
-
-	//新增操作日志
-	{
-		chartLog := new(data_manage.ChartInfoLog)
-		chartLog.ChartName = chartItem.ChartName
-		chartLog.ChartInfoId = req.ChartInfoId
-		chartLog.ChartClassifyId = chartItem.ChartClassifyId
-		chartLog.SysUserId = sysUser.AdminId
-		chartLog.SysUserRealName = sysUser.RealName
-		chartLog.UniqueCode = chartItem.UniqueCode
-		chartLog.CreateTime = time.Now()
-		chartLog.Content = string(this.Ctx.Input.RequestBody)
-		chartLog.Status = "编辑区间计算图表"
-		chartLog.Method = this.Ctx.Input.URL()
-		go data_manage.AddChartInfoLog(chartLog)
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "保存成功"
-	br.Data = resp
-	br.IsAddLog = true
-}
-
-// Move
-// @Title 移动图表接口
-// @Description 移动图表接口
-// @Success 200 {object} data_manage.MoveChartInfoReq
-// @router /chart_info/move [post]
-func (this *RangeChartChartInfoController) Move() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	var req data_manage.MoveChartInfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-
-	if req.ChartInfoId <= 0 {
-		br.Msg = "参数错误"
-		br.ErrMsg = "图表id小于等于0"
-		return
-	}
-
-	if req.ChartClassifyId <= 0 {
-		br.Msg = "请选择分类"
-		return
-	}
-	//判断分类是否存在
-	count, _ := data_manage.GetChartClassifyCountById(req.ChartClassifyId)
-	if count <= 0 {
-		br.Msg = "分类已被删除，不可移动，请刷新页面"
-		return
-	}
-
-	chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
-	if err != nil {
-		br.Msg = "移动失败"
-		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
-		return
-	}
-
-	if !utils.InArrayByInt([]int{utils.CHART_SOURCE_CORRELATION, utils.CHART_SOURCE_ROLLING_CORRELATION}, chartInfo.Source) {
-		br.Msg = "图表异常"
-		br.ErrMsg = "分类异常,不是区间计算的图表"
-		return
-	}
-
-	//如果改变了分类，那么移动该图表数据
-	if chartInfo.ChartClassifyId != req.ChartClassifyId {
-		//查询需要修改的分类下是否存在同一个图表名称
-		tmpChartInfo, tmpErr := data_manage.GetChartInfoByClassifyIdAndName(req.ChartClassifyId, chartInfo.ChartName)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
-			br.Msg = "移动失败"
-			br.ErrMsg = "移动失败,Err:" + tmpErr.Error()
-			return
-		}
-		if tmpChartInfo != nil {
-			br.Msg = "移动失败，同一个分类下图表名称不允许重复"
-			br.ErrMsg = "移动失败，同一个分类下图表名称不允许重复"
-			return
-		}
-		err = data_manage.MoveChartInfo(req.ChartInfoId, req.ChartClassifyId)
-		if err != nil {
-			br.Msg = "移动失败"
-			br.ErrMsg = "移动失败,Err:" + err.Error()
-			return
-		}
-	}
-
-	//移动排序
-	updateCol := make([]string, 0)
-	//如果有传入 上一个兄弟节点分类id
-	if req.PrevChartInfoId > 0 {
-		prevChartInfo, err := data_manage.GetChartInfoById(req.PrevChartInfoId)
-		if err != nil {
-			br.Msg = "移动失败"
-			br.ErrMsg = "获取上一个兄弟节点分类信息失败,Err:" + err.Error()
-			return
-		}
-
-		//如果是移动在两个兄弟节点之间
-		if req.NextChartInfoId > 0 {
-			//下一个兄弟节点
-			nextChartInfo, err := data_manage.GetChartInfoById(req.NextChartInfoId)
-			if err != nil {
-				br.Msg = "移动失败"
-				br.ErrMsg = "获取下一个兄弟节点分类信息失败,Err:" + err.Error()
-				return
-			}
-			//如果上一个兄弟与下一个兄弟的排序权重是一致的，那么需要将下一个兄弟（以及下个兄弟的同样排序权重）的排序权重+2，自己变成上一个兄弟的排序权重+1
-			if prevChartInfo.Sort == nextChartInfo.Sort || prevChartInfo.Sort == chartInfo.Sort {
-				//变更兄弟节点的排序
-				updateSortStr := `sort + 2`
-				_ = data_manage.UpdateChartInfoSortByClassifyId(prevChartInfo.ChartClassifyId, prevChartInfo.Sort, prevChartInfo.ChartInfoId, []int{chartInfo.Source}, updateSortStr)
-			} else {
-				//如果下一个兄弟的排序权重正好是上个兄弟节点的下一层，那么需要再加一层了
-				if nextChartInfo.Sort-prevChartInfo.Sort == 1 {
-					//变更兄弟节点的排序
-					updateSortStr := `sort + 1`
-					_ = data_manage.UpdateChartInfoSortByClassifyId(prevChartInfo.ChartClassifyId, prevChartInfo.Sort, prevChartInfo.ChartInfoId, []int{chartInfo.Source}, updateSortStr)
-				}
-			}
-		}
-
-		chartInfo.Sort = prevChartInfo.Sort + 1
-		chartInfo.ModifyTime = time.Now()
-		updateCol = append(updateCol, "Sort", "ModifyTime")
-
-	} else {
-		firstClassify, err := data_manage.GetFirstChartInfoByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "移动失败"
-			br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
-			return
-		}
-
-		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
-			updateSortStr := ` sort + 1 `
-			_ = data_manage.UpdateChartInfoSortByClassifyId(firstClassify.ChartClassifyId, 0, firstClassify.ChartInfoId-1, []int{chartInfo.Source}, updateSortStr)
-		}
-
-		chartInfo.Sort = 0 //那就是排在第一位
-		chartInfo.ModifyTime = time.Now()
-		updateCol = append(updateCol, "Sort", "ModifyTime")
-	}
-
-	//更新
-	if len(updateCol) > 0 {
-		err = chartInfo.Update(updateCol)
-		if err != nil {
-			br.Msg = "移动失败"
-			br.ErrMsg = "修改失败,Err:" + err.Error()
-			return
-		}
-	}
-
-	if err != nil {
-		br.Msg = "移动失败"
-		br.ErrMsg = "修改失败,Err:" + err.Error()
-		return
-	}
-
-	//添加es数据
-	go data.EsAddOrEditChartInfo(req.ChartInfoId)
-	//修改my eta es数据
-	go data.EsAddOrEditMyChartInfoByChartInfoId(req.ChartInfoId)
-
-	//新增操作日志
-	{
-		chartLog := new(data_manage.ChartInfoLog)
-		chartLog.ChartName = chartInfo.ChartName
-		chartLog.ChartInfoId = req.ChartInfoId
-		chartLog.ChartClassifyId = chartInfo.ChartClassifyId
-		chartLog.SysUserId = sysUser.AdminId
-		chartLog.SysUserRealName = sysUser.RealName
-		chartLog.UniqueCode = chartInfo.UniqueCode
-		chartLog.CreateTime = time.Now()
-		chartLog.Content = string(this.Ctx.Input.RequestBody)
-		chartLog.Status = "移动区间计算图表"
-		chartLog.Method = this.Ctx.Input.URL()
-		go data_manage.AddChartInfoLog(chartLog)
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "移动成功"
-}
-
-// List
-// @Title 区间计算图表列表接口
-// @Description 区间计算图表列表接口
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
-// @Param   ChartClassifyId   query   int  true       "分类id"
-// @Param   Keyword   query   string  true       "搜索关键词"
-// @Param   IsShowMe   query   bool  true       "是否只看我的，true、false"
-// @Param   Source   query   int  true       "图表类型，3：区间计算，4：滚动区间计算"
-// @Success 200 {object} data_manage.ChartListResp
-// @router /chart_info/list [get]
-func (this *RangeChartChartInfoController) List() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	chartClassifyId, _ := this.GetInt("ChartClassifyId")
-
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	keyword := this.GetString("KeyWord")
-
-	var total int
-	page := paging.GetPaging(currentIndex, pageSize, total)
-
-	var startSize int
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-	startSize = paging.StartIndex(currentIndex, pageSize)
-
-	source, _ := this.GetInt("Source")
-	if source <= 0 {
-		source = utils.CHART_SOURCE_CORRELATION
-	}
-
-	var condition string
-	var pars []interface{}
-
-	// 普通图表
-	condition += ` AND source = ? `
-	pars = append(pars, source)
-
-	if chartClassifyId > 0 {
-		chartClassifyId, err := data_manage.GetChartClassify(chartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取图表信息失败"
-			br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
-			return
-		}
-		condition += " AND chart_classify_id IN(" + chartClassifyId + ") "
-	}
-	if keyword != "" {
-		condition += ` AND  ( chart_name LIKE '%` + keyword + `%' )`
-	}
-
-	//只看我的
-	isShowMe, _ := this.GetBool("IsShowMe")
-	if isShowMe {
-		condition += ` AND sys_user_id = ? `
-		pars = append(pars, sysUser.AdminId)
-	}
-
-	// 获取当前账号的不可见指标
-	noPermissionChartIdList := make([]int, 0)
-	{
-		obj := data_manage.EdbInfoNoPermissionAdmin{}
-		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取不可见指标配置数据失败，Err:" + err.Error()
-			return
-		}
-		for _, v := range confList {
-			noPermissionChartIdList = append(noPermissionChartIdList, v.ChartInfoId)
-		}
-	}
-
-	lenNoPermissionChartIdList := len(noPermissionChartIdList)
-	if lenNoPermissionChartIdList > 0 {
-		condition += ` AND chart_info_id not in (` + utils.GetOrmInReplace(lenNoPermissionChartIdList) + `) `
-		pars = append(pars, noPermissionChartIdList)
-	}
-
-	//获取图表信息
-	list, err := data_manage.GetChartListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Success = true
-		br.Msg = "获取图表信息失败"
-		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
-		return
-	}
-
-	myChartList, err := data_manage.GetMyChartListByAdminId(sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取图表信息失败"
-		br.ErrMsg = "获取我的图表信息失败,Err:" + err.Error()
-		return
-	}
-	myChartMap := make(map[int]*data_manage.MyChartView)
-	for _, v := range myChartList {
-		myChartMap[v.ChartInfoId] = v
-	}
-	listLen := len(list)
-	chartEdbMap := make(map[int][]*data_manage.ChartEdbInfoMapping)
-	if listLen > 0 {
-		chartInfoIds := ""
-		for _, v := range list {
-			chartInfoIds += strconv.Itoa(v.ChartInfoId) + ","
-		}
-		if chartInfoIds != "" {
-			chartInfoIds = strings.Trim(chartInfoIds, ",")
-			//判断是否需要展示英文标识
-			edbList, e := data_manage.GetChartEdbMappingListByChartInfoIds(chartInfoIds)
-			if e != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取图表，指标信息失败，Err:" + e.Error()
-				return
-			}
-			for _, v := range edbList {
-				chartEdbMap[v.ChartInfoId] = append(chartEdbMap[v.ChartInfoId], v)
-			}
-		}
-	}
-	for i := 0; i < listLen; i++ {
-		//判断是否需要展示英文标识
-		if edbTmpList, ok := chartEdbMap[list[i].ChartInfoId]; ok {
-			list[i].IsEnChart = data.CheckIsEnChart(list[i].ChartNameEn, edbTmpList, list[i].Source, list[i].ChartType)
-		}
-
-		if existItem, ok := myChartMap[list[i].ChartInfoId]; ok {
-			list[i].IsAdd = true
-			list[i].MyChartId = existItem.MyChartId
-			list[i].MyChartClassifyId = existItem.MyChartClassifyId
-		}
-	}
-
-	resp := new(data_manage.ChartListResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
-		items := make([]*data_manage.ChartInfoView, 0)
-		resp.Paging = page
-		resp.List = items
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		return
-	}
-
-	dataCount, err := data_manage.GetChartListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取指标信息失败"
-		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
-		return
-	}
-	page = paging.GetPaging(currentIndex, pageSize, dataCount)
-	resp.Paging = page
-	resp.List = list
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// Detail
-// @Title 获取图表详情
-// @Description 获取图表详情接口
-// @Param   ChartInfoId   query   int  true       "图表id"
-// @Param   DateType   query   int  true       "日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间"
-// @Param   StartDate   query   string  true       "自定义开始日期"
-// @Param   EndDate   query   string  true       "自定义结束日期"
-// @Param   Calendar   query   string  true       "公历/农历"
-// @Param   SeasonStartDate   query   string  true       "季节性图开始日期"
-// @Param   SeasonEndDate   query   string  true       "季节性图结束日期"
-// @Param   EdbInfoId   query   string  true       "指标ID，多个用英文逗号隔开"
-// @Param   ChartType   query   int  true       "生成样式:1:曲线图,2:季节性图"
-// @Success 200 {object} data_manage.ChartInfoDetailResp
-// @router /chart_info/detail [get]
-func (this *RangeChartChartInfoController) Detail() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	chartInfoId, _ := this.GetInt("ChartInfoId")
-	if chartInfoId <= 0 {
-		br.Msg = "参数有误"
-		return
-	}
-
-	var err error
-	chartInfo := new(data_manage.ChartInfoView)
-	chartInfo, err = data_manage.GetChartInfoViewById(chartInfoId)
-	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			br.Msg = "图被删除，请刷新页面"
-			br.ErrMsg = "图被删除，请刷新页面，Err:" + err.Error()
-			return
-		}
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取图表信息失败，Err:" + err.Error()
-		return
-	}
-
-	// 获取主题样式
-	chartTheme, err := data.GetChartThemeConfig(chartInfo.ChartThemeId, utils.CHART_SOURCE_DEFAULT, 1)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取主题信息失败，Err:" + err.Error()
-		return
-	}
-	chartInfo.ChartThemeStyle = chartTheme.Config
-	chartInfo.ChartThemeId = chartTheme.ChartThemeId
-
-	// 区间计算图表信息
-	correlationChart := new(data_manage.ChartInfoCorrelation)
-	if e := correlationChart.GetItemById(chartInfoId); e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取图表区间计算信息失败, Err: " + e.Error()
-		return
-	}
-
-	// 获取指标信息
-	edbInfoMappingA, e := data_manage.GetChartEdbMappingByEdbInfoId(correlationChart.EdbInfoIdFirst)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取区间计算图表, A指标mapping信息失败, Err:" + e.Error()
-		return
-	}
-	edbInfoMappingB := new(data_manage.ChartEdbInfoMapping)
-	// 非多因子
-	if correlationChart.AnalysisMode != 1 {
-		edbInfoMappingB, e = data_manage.GetChartEdbMappingByEdbInfoId(correlationChart.EdbInfoIdSecond)
-		if e != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取区间计算图表, B指标mapping信息失败, Err:" + e.Error()
-			return
-		}
-	}
-
-	var dataResp interface{} // 绘图数据返回（目前是滚动区间计算的图）
-	var xEdbIdValue []int
-	var yDataList []data_manage.YData
-	if correlationChart.AnalysisMode != 1 {
-		switch chartInfo.Source {
-		case utils.CHART_SOURCE_CORRELATION: // 区间计算图
-			moveUnitDays, ok := utils.FrequencyDaysMap[correlationChart.CalculateUnit]
-			if !ok {
-				br.Msg = "错误的分析周期"
-				br.IsSendEmail = false
-				return
-			}
-			startDate := time.Now().AddDate(0, 0, -correlationChart.CalculateValue*moveUnitDays).Format(utils.FormatDate)
-			endDate := time.Now().Format(utils.FormatDate)
-
-			xEdbIdValue, yDataList, e = rangeServ.GetChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB, correlationChart.LeadValue, correlationChart.LeadUnit, startDate, endDate, chartInfo.ExtraConfig)
-			if e != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取区间计算图表, 图表计算值失败, Err:" + e.Error()
-				return
-			}
-		case utils.CHART_SOURCE_ROLLING_CORRELATION: // 滚动区间计算图
-			startDate, endDate := utils.GetDateByDateType(correlationChart.DateType, correlationChart.StartDate.Format(utils.FormatDate), correlationChart.EndDate.Format(utils.FormatDate))
-			dataResp, e = rangeServ.GetRollingCorrelationChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB, correlationChart.LeadValue, correlationChart.LeadUnit, correlationChart.CalculateValue, correlationChart.CalculateUnit, startDate, endDate, chartInfo.ChartName, chartInfo.ChartNameEn)
-			if e != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取滚动区间计算图表, 图表计算值失败, Err:" + e.Error()
-				return
-			}
-		}
-	} else {
-		xEdbIdValue, yDataList, e = rangeServ.GetFactorChartDataByChartId(chartInfoId, chartInfo.ExtraConfig)
-		if e != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取区间计算图表, 图表计算值失败, Err:" + e.Error()
-			return
-		}
-	}
-
-	// 完善指标信息
-	edbList := make([]*data_manage.ChartEdbInfoMapping, 0)
-	if correlationChart.AnalysisMode != 1 {
-		edbList, e = rangeServ.GetChartEdbInfoFormat(chartInfo.ChartInfoId, edbInfoMappingA, edbInfoMappingB)
-		if e != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取区间计算图表, 完善指标信息失败, Err:" + e.Error()
-			return
-		}
-	} else {
-		// 多因子指标, 获取图表引用到的系列指标(去重后)
-		edbList, e = data_manage.GetChartEdbMappingListByIdList([]int{chartInfoId})
-		if e != nil {
-			err = fmt.Errorf("获取图表引用系列指标失败, err: %v", e)
-			return
-		}
-	}
-	correlationInfo := new(data_manage.CorrelationInfo)
-	correlationInfo.LeadValue = correlationChart.LeadValue
-	correlationInfo.LeadUnit = correlationChart.LeadUnit
-	correlationInfo.CalculateValue = correlationChart.CalculateValue
-	correlationInfo.CalculateUnit = correlationChart.CalculateUnit
-	correlationInfo.StartDate = correlationChart.StartDate.Format(utils.FormatDate)
-	correlationInfo.EndDate = correlationChart.EndDate.Format(utils.FormatDate)
-	correlationInfo.LeadValue = correlationChart.LeadValue
-	correlationInfo.EdbInfoIdFirst = correlationChart.EdbInfoIdFirst
-	correlationInfo.EdbInfoIdSecond = correlationChart.EdbInfoIdSecond
-	correlationInfo.AnalysisMode = correlationChart.AnalysisMode
-
-	// 判断是否加入我的图库
-	if chartInfoId > 0 && chartInfo != nil {
-		{
-			var myChartCondition string
-			var myChartPars []interface{}
-			myChartCondition += ` AND a.admin_id=? `
-			myChartPars = append(myChartPars, sysUser.AdminId)
-			myChartCondition += ` AND a.chart_info_id=? `
-			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
-
-			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取我的图表信息失败，GetMyChartByCondition，Err:" + err.Error()
-				return
-			}
-			if myChartList != nil && len(myChartList) > 0 {
-				chartInfo.IsAdd = true
-				chartInfo.MyChartId = myChartList[0].MyChartId
-				chartInfo.MyChartClassifyId = myChartList[0].MyChartClassifyId
-			}
-		}
-	}
-
-	//图表操作权限
-	chartInfo.IsEdit = data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, true)
-	//判断是否需要展示英文标识
-	chartInfo.IsEnChart = data.CheckIsEnChart(chartInfo.ChartNameEn, edbList[0:1], chartInfo.Source, chartInfo.ChartType)
-	chartInfo.UnitEn = edbInfoMappingA.UnitEn
-
-	sourceNameList, sourceNameEnList := data.GetEdbSourceByEdbInfoIdList(edbList)
-	chartInfo.ChartSource = strings.Join(sourceNameList, ",")
-	chartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
-
-	isSaveAs := true
-	if chartInfo.Source == utils.CHART_SOURCE_ROLLING_CORRELATION {
-		isSaveAs = false
-	}
-	// 另存为
-	chartInfo.Button = data_manage.ChartViewButton{
-		IsEdit:    chartInfo.IsEdit,
-		IsEnChart: chartInfo.IsEnChart,
-		IsAdd:     chartInfo.IsAdd,
-		IsCopy:    isSaveAs,
-		IsSetName: chartInfo.IsSetName,
-	}
-
-	// 指标权限
-	{
-		edbClassifyPermissionMap := make(map[int]data_manage_permission.EdbClassifyPermission)
-		classifyMap := make(map[int]*data_manage.EdbClassify)
-		// 分类
-		{
-			classifyIdList := make([]int, 0)
-			for _, v := range edbList {
-				classifyIdList = append(classifyIdList, v.ClassifyId)
-			}
-			classifyList, tmpErr := data_manage.GetEdbClassifyByIdList(classifyIdList)
-			if tmpErr != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取分类列表失败，Err:" + tmpErr.Error()
-				return
-			}
-			for _, v := range classifyList {
-				classifyMap[v.ClassifyId] = v
-			}
-		}
-
-		// 遍历到校验map
-		for _, v := range edbList {
-			edbClassifyPermissionMap[v.EdbInfoId] = data_manage_permission.EdbClassifyPermission{
-				ClassifyId:       v.ClassifyId,
-				IsJoinPermission: v.IsJoinPermission,
-				EdbInfoId:        v.EdbInfoId,
-			}
-		}
-
-		// 获取所有有权限的指标和分类
-		permissionEdbIdList, permissionClassifyIdList, err := data_manage_permission.GetUserEdbAndClassifyPermissionList(sysUser.AdminId, 0, 0)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取所有有权限的指标和分类失败，Err:" + err.Error()
-			return
-		}
-
-		for _, v := range edbList {
-			// 数据权限
-			edbItem, ok := edbClassifyPermissionMap[v.EdbInfoId]
-			if !ok {
-				continue
-			}
-
-			if currClassify, ok := classifyMap[edbItem.ClassifyId]; ok {
-				v.HaveOperaAuth = data_manage_permission.CheckEdbPermissionByPermissionIdList(edbItem.IsJoinPermission, currClassify.IsJoinPermission, edbItem.EdbInfoId, edbItem.ClassifyId, permissionEdbIdList, permissionClassifyIdList)
-			}
-		}
-	}
-
-	// 图表当前分类的分类树
-	classifyLevels := make([]string, 0)
-	{
-		list, e := data_manage.GetChartClassifyAllBySource(utils.CHART_SOURCE_CORRELATION)
-		if e != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = fmt.Sprintf("获取图表分类失败, Err: %v", e)
-			return
-		}
-		parents := data.GetChartClassifyParentRecursive(list, chartInfo.ChartClassifyId)
-		sort.Slice(parents, func(i, j int) bool {
-			return parents[i].Level < parents[i].Level
-		})
-		for _, v := range parents {
-			classifyLevels = append(classifyLevels, v.UniqueCode)
-		}
-	}
-
-	resp := new(data_manage.ChartInfoDetailResp)
-	resp.ChartInfo = chartInfo
-	resp.EdbInfoList = edbList
-	resp.XEdbIdValue = xEdbIdValue
-	resp.YDataList = yDataList
-	resp.CorrelationChartInfo = correlationInfo
-	resp.DataResp = dataResp
-	resp.ClassifyLevels = classifyLevels
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// DetailFromUniqueCode
-// @Title 根据编码获取图表详情
-// @Description 根据编码获取图表详情接口
-// @Param   UniqueCode   query   int  true       "图表唯一编码,如果是管理后台访问，传固定字符串:7c69b590249049942070ae9dcd5bf6dc"
-// @Param   IsCache   query   bool  true       "是否走缓存，默认false"
-// @Success 200 {object} data_manage.ChartInfoDetailFromUniqueCodeResp
-// @router /chart_info/detail/from_unique_code [get]
-func (this *RangeChartChartInfoController) DetailFromUniqueCode() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	adminId := sysUser.AdminId
-
-	uniqueCode := this.GetString("UniqueCode")
-	if uniqueCode == "" {
-		br.Msg = "参数错误"
-		br.ErrMsg = "参数错误,uniqueCode is empty"
-		return
-	}
-
-	//是否走缓存
-	isCache, _ := this.GetBool("IsCache")
-
-	resp := new(data_manage.ChartInfoDetailFromUniqueCodeResp)
-	status := true
-	chartInfo, err := data_manage.GetChartInfoViewByUniqueCode(uniqueCode)
-	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			status = false
-		} else {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取图表信息失败，Err:" + err.Error()
-			return
-		}
-	}
-	if chartInfo == nil {
-		status = false
-	}
-	if !status {
-		endInfoList := make([]*data_manage.ChartEdbInfoMapping, 0)
-		resp.EdbInfoList = endInfoList
-		resp.ChartInfo = chartInfo
-		resp.Status = false
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = resp
-		return
-	}
-
-	//判断是否存在缓存，如果存在缓存，那么直接从缓存中获取
-	key := data.GetChartInfoDataKey(chartInfo.ChartInfoId)
-	if utils.Re == nil && isCache {
-		if utils.Re == nil && utils.Rc.IsExist(key) {
-			if d, e := utils.Rc.RedisBytes(key); e == nil {
-				err := json.Unmarshal(d, &resp)
-				if err == nil && resp != nil {
-					// 这里跟当前用户相关的信息重新查询写入resp, 不使用缓存中的
-					var myCond string
-					var myPars []interface{}
-					myCond += ` AND a.admin_id=? `
-					myPars = append(myPars, adminId)
-					myCond += ` AND a.chart_info_id=? `
-					myPars = append(myPars, chartInfo.ChartInfoId)
-					myList, err := data_manage.GetMyChartByCondition(myCond, myPars)
-					if err != nil && err.Error() != utils.ErrNoRow() {
-						br.Msg = "获取失败"
-						br.ErrMsg = "获取我的图表信息失败，GetMyChartByCondition，Err:" + err.Error()
-						return
-					}
-					resp.ChartInfo.IsAdd = false
-					resp.ChartInfo.MyChartId = 0
-					resp.ChartInfo.MyChartClassifyId = ""
-					if myList != nil && len(myList) > 0 {
-						resp.ChartInfo.IsAdd = true
-						resp.ChartInfo.MyChartId = myList[0].MyChartId
-						resp.ChartInfo.MyChartClassifyId = myList[0].MyChartClassifyId
-					}
-
-					br.Ret = 200
-					br.Success = true
-					br.Msg = "获取成功"
-					br.Data = resp
-					return
-				}
-			}
-		}
-	}
-	resp, isOk, msg, errMsg := GetChartInfoDetailFromUniqueCode(chartInfo, isCache, sysUser)
-	if !isOk {
-		br.Msg = msg
-		br.ErrMsg = errMsg
-		return
-	}
-	if !isOk {
-		br.Msg = msg
-		br.ErrMsg = errMsg
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// Refresh
-// @Title 图表刷新接口
-// @Description 图表刷新接口
-// @Param   ChartInfoId   query   int  true       "图表id"
-// @Param   UniqueCode   query   string  true       "唯一code"
-// @Success Ret=200 刷新成功
-// @router /chart_info/refresh [get]
-func (this *RangeChartChartInfoController) Refresh() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	chartInfoId, _ := this.GetInt("ChartInfoId")
-	uniqueCode := this.GetString("UniqueCode")
-	if chartInfoId <= 0 && uniqueCode == `` {
-		br.Msg = "参数错误"
-		br.ErrMsg = "参数错误:chartInfoId:" + strconv.Itoa(chartInfoId) + ",UniqueCode:" + uniqueCode
-		return
-	}
-
-	var chartInfo *data_manage.ChartInfo
-	var err error
-	if chartInfoId > 0 {
-		chartInfo, err = data_manage.GetChartInfoById(chartInfoId)
-	} else {
-		chartInfo, err = data_manage.GetChartInfoByUniqueCode(uniqueCode)
-	}
-	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			br.Msg = "图表已被删除，无需刷新"
-			br.ErrMsg = "获取指标信息失败，Err:" + err.Error()
-			return
-		}
-		br.Msg = "刷新失败"
-		br.ErrMsg = "获取图表信息失败，Err:" + err.Error()
-		return
-	}
-
-	// 刷新区间计算图表
-	isAsync, e := rangeServ.ChartInfoRefresh(chartInfo.ChartInfoId, chartInfo.UniqueCode)
-	if e != nil {
-		br.Msg = "刷新失败"
-		br.ErrMsg = "刷新区间计算图表失败, Err:" + err.Error()
-		return
-	}
-	// 多因子区间计算异步刷新, 前端提示
-	if isAsync {
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "刷新时间较长, 请10分钟后查看"
-		return
-	}
-
-	//清除图表缓存
-	{
-		key := utils.HZ_CHART_LIB_DETAIL + chartInfo.UniqueCode
-		_ = utils.Rc.Delete(key)
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "刷新成功"
-}
-
-// Copy
-// @Title 复制并新增图表接口
-// @Description 新增图表接口
-// @Param	request	body data_manage.CopyAddChartInfoReq true "type json string"
-// @Success 200 {object} data_manage.AddChartInfoResp
-// @router /chart_info/copy [post]
-func (this *RangeChartChartInfoController) Copy() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	var req data_manage.CopyAddChartInfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-	if req.ChartInfoId <= 0 {
-		br.Msg = "参数有误"
-		br.ErrMsg = fmt.Sprintf("参数有误, ChartInfoId: %d", req.ChartInfoId)
-		return
-	}
-	req.ChartName = strings.TrimSpace(req.ChartName)
-	if req.ChartName == "" {
-		br.Msg = "请输入图表名称"
-		return
-	}
-	if req.ChartClassifyId <= 0 {
-		br.Msg = "请选择图表分类"
-		return
-	}
-
-	deleteCache := true
-	cacheKey := "CACHE_CHART_INFO_ADD_" + strconv.Itoa(sysUser.AdminId)
-	defer func() {
-		if deleteCache {
-			utils.Rc.Delete(cacheKey)
-		}
-	}()
-	if !utils.Rc.SetNX(cacheKey, 1, 30*time.Second) {
-		deleteCache = false
-		br.Msg = "系统处理中，请稍后重试！"
-		br.ErrMsg = "系统处理中，请稍后重试！" + sysUser.RealName + ";data:" + string(this.Ctx.Input.RequestBody)
-		return
-	}
-
-	chartSource := utils.CHART_SOURCE_CORRELATION
-	// 校验分类、图表名称
-	{
-		var cond string
-		var pars []interface{}
-		switch this.Lang {
-		case utils.EnLangVersion:
-			cond += " AND chart_name_en = ? AND source = ? "
-		default:
-			cond += " AND chart_name = ? AND source = ? "
-		}
-		pars = append(pars, req.ChartName, chartSource)
-		count, e := data_manage.GetChartInfoCountByCondition(cond, pars)
-		if e != nil {
-			br.Msg = "保存失败"
-			br.ErrMsg = fmt.Sprintf("获取同名图表失败, Err: %v", e)
-			return
-		}
-		if count > 0 {
-			br.Msg = "图表名称已存在, 请重新填写"
-			return
-		}
-
-		_, e = data_manage.GetChartClassifyById(req.ChartClassifyId)
-		if e != nil {
-			if e.Error() == utils.ErrNoRow() {
-				br.Msg = "分类不存在"
-				return
-			}
-			br.Msg = "保存失败"
-			br.ErrMsg = fmt.Sprintf("获取图表分类失败, Err: %v", e)
-			return
-		}
-	}
-
-	// 图表信息
-	originChart, e := data_manage.GetChartInfoById(req.ChartInfoId)
-	if e != nil {
-		if e.Error() == utils.ErrNoRow() {
-			br.Msg = "原图表不存在"
-			return
-		}
-		br.Msg = "保存失败"
-		br.ErrMsg = fmt.Sprintf("获取原图表信息失败, Err: %v", e)
-		return
-	}
-	if originChart.Source == utils.CHART_SOURCE_ROLLING_CORRELATION {
-		br.Msg = `滚动区间计算图不支持另存为`
-		br.IsSendEmail = false
-		return
-	}
-
-	// 区间计算图
-	originCorrelate := new(data_manage.ChartInfoCorrelation)
-	if e = originCorrelate.GetItemById(req.ChartInfoId); e != nil {
-		if e.Error() == utils.ErrNoRow() {
-			br.Msg = "原区间计算图表不存在"
-			return
-		}
-		br.Msg = "保存失败"
-		br.ErrMsg = fmt.Sprintf("获取原区间计算图表信息失败, Err: %v", e)
-		return
-	}
-
-	// 普通区间计算图表
-	chartInfo := new(data_manage.ChartInfo)
-	if originCorrelate.AnalysisMode != 1 {
-		multipleGraphConfigChartMapping, err := data_manage.GetMultipleGraphConfigChartMappingByChartId(req.ChartInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = `保存失败`
-			br.ErrMsg = "获取配置与图表的关联关系失败，ERR:" + err.Error()
-			return
-		}
-
-		correlationChartInfoReq := data_manage.CorrelationChartInfoReq{
-			LeadValue:          originCorrelate.LeadValue,
-			LeadUnit:           originCorrelate.LeadUnit,
-			CalculateValue:     originCorrelate.CalculateValue,
-			CalculateUnit:      originCorrelate.CalculateUnit,
-			BaseCalculateUnit:  originCorrelate.BaseCalculateUnit,
-			BaseCalculateValue: originCorrelate.BaseCalculateValue,
-			StartDate:          originCorrelate.StartDate.Format(utils.FormatDate),
-			EndDate:            originCorrelate.EndDate.Format(utils.FormatDate),
-			EdbInfoIdList: []data_manage.CorrelationChartInfoEdbItemReq{
-				{
-					EdbInfoId: originCorrelate.EdbInfoIdFirst,
-					Name:      "",
-					NameEn:    "",
-				}, {
-					EdbInfoId: originCorrelate.EdbInfoIdSecond,
-					Name:      "",
-					NameEn:    "",
-				},
-			},
-		}
-
-		newChart, err, errMsg, isSendEmail := rangeServ.CopyChartInfo(multipleGraphConfigChartMapping.MultipleGraphConfigId, req.ChartClassifyId, req.ChartName, correlationChartInfoReq, originChart, sysUser, this.Lang)
-		chartInfo = newChart
-
-		if err != nil {
-			br.Msg = "保存失败"
-			if errMsg != `` {
-				br.Msg = errMsg
-			}
-			br.ErrMsg = err.Error()
-			br.IsSendEmail = isSendEmail
-			return
-		}
-	}
-
-	// 多因子区间计算图表
-	if originCorrelate.AnalysisMode == 1 {
-		chartInfo.ChartName = req.ChartName
-		chartInfo.ChartNameEn = req.ChartName
-		chartInfo.ChartClassifyId = req.ChartClassifyId
-		chartInfo.SysUserId = sysUser.AdminId
-		chartInfo.SysUserRealName = sysUser.RealName
-		chartInfo.CreateTime = time.Now()
-		chartInfo.ModifyTime = time.Now()
-		timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
-		chartInfo.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + timestamp)
-		chartInfo.ChartType = originChart.ChartType
-		chartInfo.Calendar = originChart.Calendar
-		chartInfo.DateType = originChart.DateType
-		chartInfo.StartDate = originChart.StartDate
-		chartInfo.EndDate = originChart.EndDate
-		chartInfo.SeasonStartDate = originChart.StartDate
-		chartInfo.SeasonEndDate = originChart.EndDate
-		chartInfo.Disabled = originChart.Disabled
-		chartInfo.Source = originChart.Source
-		chartInfo.ChartThemeId = originChart.ChartThemeId
-		chartInfo.ExtraConfig = originChart.ExtraConfig
-		chartInfo.SourcesFrom = originChart.SourcesFrom
-		chartInfo.Instructions = originChart.Instructions
-		chartInfo.MarkersLines = originChart.MarkersLines
-		chartInfo.MarkersAreas = originChart.MarkersAreas
-
-		// 区间计算图
-		chartCorrelate := new(data_manage.ChartInfoCorrelation)
-		chartCorrelate.LeadValue = originCorrelate.LeadValue
-		chartCorrelate.LeadUnit = originCorrelate.LeadUnit
-		chartCorrelate.CalculateValue = originCorrelate.CalculateValue
-		chartCorrelate.CalculateUnit = originCorrelate.CalculateUnit
-		chartCorrelate.EdbInfoIdFirst = originCorrelate.EdbInfoIdFirst
-		chartCorrelate.AnalysisMode = 1
-		chartCorrelate.CreateTime = time.Now().Local()
-		chartCorrelate.ModifyTime = time.Now().Local()
-
-		// 图表指标关联
-		edbMappings := make([]*data_manage.ChartEdbMapping, 0)
-		{
-			mappings, e := data_manage.GetChartMappingList(req.ChartInfoId)
-			if e != nil {
-				br.Msg = "保存失败"
-				br.ErrMsg = fmt.Sprintf("获取图表指标关联失败, Err: %v", e)
-				return
-			}
-			for _, v := range mappings {
-				m := new(data_manage.ChartEdbMapping)
-				m.EdbInfoId = v.EdbInfoId
-				edbTimestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
-				m.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + edbTimestamp + "_" + strconv.Itoa(v.EdbInfoId))
-				m.IsOrder = true
-				m.IsAxis = 1
-				m.EdbInfoType = 1
-				m.Source = utils.CHART_SOURCE_CORRELATION
-				m.CreateTime = time.Now()
-				m.ModifyTime = time.Now()
-				edbMappings = append(edbMappings, m)
-			}
-		}
-
-		// 指标系列-图表关联
-		seriesIds := make([]int, 0)
-		originChartMappings := make([]*data_manage.FactorEdbSeriesChartMapping, 0)
-		{
-			ob := new(data_manage.FactorEdbSeriesChartMapping)
-			cond := fmt.Sprintf(" AND %s = ?", ob.Cols().ChartInfoId)
-			pars := make([]interface{}, 0)
-			pars = append(pars, req.ChartInfoId)
-			list, e := ob.GetItemsByCondition(cond, pars, []string{}, "")
-			if e != nil {
-				br.Msg = "保存失败"
-				br.ErrMsg = fmt.Sprintf("获取指标系列-图表关联失败, Err: %v", e)
-				return
-			}
-			for _, v := range list {
-				//seriesMappings = append(seriesMappings, &data_manage.FactorEdbSeriesChartMapping{
-				//	FactorEdbSeriesId: v.FactorEdbSeriesId,
-				//	ChartInfoId:       req.ChartInfoId,
-				//	EdbInfoId:         v.EdbInfoId,
-				//	Source:            v.Source,
-				//	CreateTime:        time.Now().Local(),
-				//	ModifyTime:        time.Now().Local(),
-				//})
-				if !utils.InArrayByInt(seriesIds, v.FactorEdbSeriesId) {
-					seriesIds = append(seriesIds, v.FactorEdbSeriesId)
-				}
-			}
-			originChartMappings = list
-		}
-		if len(seriesIds) == 0 {
-			br.Msg = "保存失败"
-			br.ErrMsg = "源图表系列有误"
-			return
-		}
-
-		// 注意此处要复制一份系列及系列关联指标, 不可共用被复制图表的系列
-		originSeries := make([]*data_manage.FactorEdbSeries, 0)
-		{
-			ob := new(data_manage.FactorEdbSeries)
-			cond := fmt.Sprintf(" AND %s IN (%s)", ob.Cols().PrimaryId, utils.GetOrmInReplace(len(seriesIds)))
-			pars := make([]interface{}, 0)
-			pars = append(pars, seriesIds)
-			list, e := ob.GetItemsByCondition(cond, pars, []string{}, "")
-			if e != nil {
-				br.Msg = "保存失败"
-				br.ErrMsg = fmt.Sprintf("获取源图表系列失败, %v", e)
-				return
-			}
-			originSeries = list
-		}
-		originEdbSeriesMapping := make([]*data_manage.FactorEdbSeriesMapping, 0)
-		{
-			ob := new(data_manage.FactorEdbSeriesMapping)
-			cond := fmt.Sprintf(" AND %s IN (%s)", ob.Cols().FactorEdbSeriesId, utils.GetOrmInReplace(len(seriesIds)))
-			pars := make([]interface{}, 0)
-			pars = append(pars, seriesIds)
-			list, e := ob.GetItemsByCondition(cond, pars, []string{}, "")
-			if e != nil {
-				br.Msg = "保存失败"
-				br.ErrMsg = fmt.Sprintf("获取源图表系列指标失败, %v", e)
-				return
-			}
-			originEdbSeriesMapping = list
-		}
-
-		// 新增图表/区间计算图表/图表指标关联/指标系列图表关联
-		chartInfoId, seriesIdMap, e := data_manage.CreateMultiFactorCorrelationChartAndEdb(chartInfo, edbMappings, chartCorrelate, originChartMappings, true, originSeries, originEdbSeriesMapping)
-		if e != nil {
-			br.Msg = "保存失败"
-			br.ErrMsg = fmt.Sprintf("新增多因子区间计算图表失败, Err: %v", e)
-			return
-		}
-
-		// 如果原图表有设置图例-那么替换图例设置中的系列ID
-		if originChart.ExtraConfig != "" {
-			conf := new(data_manage.CorrelationChartInfoExtraConfig)
-			e = json.Unmarshal([]byte(originChart.ExtraConfig), &conf)
-			if e != nil {
-				br.Msg = "保存失败"
-				br.ErrMsg = fmt.Sprintf("解析图表额外配置失败, Err: %v", e)
-				return
-			}
-			for _, v := range conf.LegendConfig {
-				v.SeriesId = seriesIdMap[v.SeriesId]
-			}
-			b, e := json.Marshal(conf)
-			if e != nil {
-				br.Msg = "保存失败"
-				br.ErrMsg = fmt.Sprintf("图表来源JSON格式化失败, Err: %v", e)
-				return
-			}
-			chartInfo.ExtraConfig = string(b)
-			if e = chartInfo.Update([]string{"ExtraConfig"}); e != nil {
-				br.Msg = "保存失败"
-				br.ErrMsg = fmt.Sprintf("更新图例信息失败, %v", e)
-				return
-			}
-		}
-
-		go data.EsAddOrEditChartInfo(chartInfoId)
-	}
-
-	// 新增操作日志
-	{
-		chartLog := new(data_manage.ChartInfoLog)
-		chartLog.ChartInfoId = chartInfo.ChartInfoId
-		chartLog.ChartName = req.ChartName
-		chartLog.ChartClassifyId = req.ChartClassifyId
-		chartLog.SysUserId = sysUser.AdminId
-		chartLog.SysUserRealName = sysUser.RealName
-		chartLog.UniqueCode = chartInfo.UniqueCode
-		chartLog.CreateTime = time.Now()
-		chartLog.Content = string(this.Ctx.Input.RequestBody)
-		chartLog.Status = "复制区间计算图表"
-		chartLog.Method = this.Ctx.Input.URI()
-		go data_manage.AddChartInfoLog(chartLog)
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "保存成功"
-	br.Data = data_manage.AddChartInfoResp{
-		ChartInfoId: chartInfo.ChartInfoId,
-		UniqueCode:  chartInfo.UniqueCode,
-		ChartType:   chartInfo.ChartType,
-	}
-	br.IsAddLog = true
-}
-
-// GetChartInfoDetailFromUniqueCode 根据编码获取图表详情
-func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCache bool, sysUser *system.Admin) (resp *data_manage.ChartInfoDetailFromUniqueCodeResp, isOk bool, msg, errMsg string) {
-	resp = new(data_manage.ChartInfoDetailFromUniqueCodeResp)
-
-	adminId := sysUser.AdminId
-
-	// 指标数据map
-	edbClassifyPermissionMap := make(map[int]data_manage_permission.EdbClassifyPermission)
-	defer func() {
-		if isOk {
-			// 这里跟当前用户相关的信息重新查询写入resp, 不使用缓存中的
-			{
-				//判断是否加入我的图库
-				var myChartCondition string
-				var myChartPars []interface{}
-				myChartCondition += ` AND a.admin_id=? `
-				myChartPars = append(myChartPars, adminId)
-				myChartCondition += ` AND a.chart_info_id=? `
-				myChartPars = append(myChartPars, chartInfo.ChartInfoId)
-
-				myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-				if err != nil && err.Error() != utils.ErrNoRow() {
-					msg = "获取失败"
-					errMsg = "获取我的图表信息失败，GetMyChartByCondition，Err:" + err.Error()
-					return
-				}
-				if myChartList != nil && len(myChartList) > 0 {
-					chartInfo.IsAdd = true
-					chartInfo.MyChartId = myChartList[0].MyChartId
-					chartInfo.MyChartClassifyId = myChartList[0].MyChartClassifyId
-				}
-			}
-
-			resp.ChartInfo.HaveOperaAuth = true
-
-			// 指标权限
-			{
-				classifyMap := make(map[int]*data_manage.EdbClassify)
-				// 分类
-				{
-					classifyIdList := make([]int, 0)
-					for _, v := range resp.EdbInfoList {
-						classifyIdList = append(classifyIdList, v.ClassifyId)
-					}
-					classifyList, tmpErr := data_manage.GetEdbClassifyByIdList(classifyIdList)
-					if tmpErr != nil {
-						errMsg = "获取分类列表失败，Err:" + tmpErr.Error()
-						return
-					}
-					for _, v := range classifyList {
-						classifyMap[v.ClassifyId] = v
-					}
-				}
-
-				// 指标
-				if len(edbClassifyPermissionMap) < 0 {
-					edbInfoIdList := make([]int, 0)
-					for _, v := range resp.EdbInfoList {
-						edbInfoIdList = append(edbInfoIdList, v.EdbInfoId)
-					}
-					edbInfoList, tmpErr := data_manage.GetEdbInfoByIdList(edbInfoIdList)
-					if tmpErr != nil {
-						errMsg = "获取指标列表失败，Err:" + tmpErr.Error()
-						return
-					}
-					for _, v := range edbInfoList {
-						edbClassifyPermissionMap[v.EdbInfoId] = data_manage_permission.EdbClassifyPermission{
-							ClassifyId:       v.ClassifyId,
-							IsJoinPermission: v.IsJoinPermission,
-							EdbInfoId:        v.EdbInfoId,
-						}
-					}
-				}
-
-				// 获取所有有权限的指标和分类
-				permissionEdbIdList, permissionClassifyIdList, err := data_manage_permission.GetUserEdbAndClassifyPermissionList(sysUser.AdminId, 0, 0)
-				if err != nil {
-					errMsg = "获取所有有权限的指标和分类失败，Err:" + err.Error()
-					return
-				}
-
-				for _, v := range resp.EdbInfoList {
-					// 数据权限
-					edbItem, ok := edbClassifyPermissionMap[v.EdbInfoId]
-					if !ok {
-						continue
-					}
-
-					if currClassify, ok := classifyMap[edbItem.ClassifyId]; ok {
-						v.HaveOperaAuth = data_manage_permission.CheckEdbPermissionByPermissionIdList(edbItem.IsJoinPermission, currClassify.IsJoinPermission, edbItem.EdbInfoId, edbItem.ClassifyId, permissionEdbIdList, permissionClassifyIdList)
-					}
-				}
-			}
-		}
-	}()
-
-	//判断是否存在缓存，如果存在缓存，那么直接从缓存中获取
-	key := data.GetChartInfoDataKey(chartInfo.ChartInfoId)
-	if utils.Re == nil && isCache {
-		if utils.Re == nil && utils.Rc.IsExist(key) {
-			if chartData, err1 := utils.Rc.RedisBytes(key); err1 == nil {
-				err := json.Unmarshal(chartData, &resp)
-				if err != nil || resp == nil {
-					return
-				}
-				isOk = true
-				fmt.Println("source redis")
-				return
-			}
-		}
-	}
-
-	// 获取主题样式
-	chartTheme, err := data.GetChartThemeConfig(chartInfo.ChartThemeId, utils.CHART_SOURCE_DEFAULT, 1)
-	if err != nil {
-		msg = "获取失败"
-		errMsg = "获取主题信息失败，Err:" + err.Error()
-		return
-	}
-	chartInfo.ChartThemeStyle = chartTheme.Config
-	chartInfo.ChartThemeId = chartTheme.ChartThemeId
-
-	chartInfoId := chartInfo.ChartInfoId
-
-	// 区间计算图表信息
-	correlationChart := new(data_manage.ChartInfoCorrelation)
-	if e := correlationChart.GetItemById(chartInfoId); e != nil {
-		msg = "获取失败"
-		errMsg = "获取图表区间计算信息失败, Err:" + e.Error()
-		return
-	}
-
-	// 获取指标信息
-	edbInfoMappingA, e := data_manage.GetChartEdbMappingByEdbInfoId(correlationChart.EdbInfoIdFirst)
-	if e != nil {
-		msg = "获取失败"
-		errMsg = "获取区间计算图表, A指标mapping信息失败, Err:" + e.Error()
-		return
-	}
-	edbInfoMappingB := new(data_manage.ChartEdbInfoMapping)
-	// 非多因子
-	if correlationChart.AnalysisMode != 1 {
-		edbInfoMappingB, e = data_manage.GetChartEdbMappingByEdbInfoId(correlationChart.EdbInfoIdSecond)
-		if e != nil {
-			msg = "获取失败"
-			errMsg = "获取区间计算图表, B指标mapping信息失败, Err:" + e.Error()
-			return
-		}
-	}
-
-	var dataResp interface{} // 绘图数据返回（目前是滚动区间计算的图）
-	var xEdbIdValue []int
-	var yDataList []data_manage.YData
-	if correlationChart.AnalysisMode != 1 {
-		switch chartInfo.Source {
-		case utils.CHART_SOURCE_CORRELATION: // 区间计算图
-			moveUnitDays, ok := utils.FrequencyDaysMap[correlationChart.CalculateUnit]
-			if !ok {
-				msg = "错误的分析周期"
-				errMsg = "区间计算图表数据有误"
-				return
-			}
-			startDate := time.Now().AddDate(0, 0, -correlationChart.CalculateValue*moveUnitDays).Format(utils.FormatDate)
-			endDate := time.Now().Format(utils.FormatDate)
-
-			xEdbIdValue, yDataList, e = rangeServ.GetChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB, correlationChart.LeadValue, correlationChart.LeadUnit, startDate, endDate, chartInfo.ExtraConfig)
-			if e != nil {
-				msg = "获取失败"
-				errMsg = "获取区间计算图表, 图表计算值失败, Err:" + e.Error()
-				return
-			}
-		case utils.CHART_SOURCE_ROLLING_CORRELATION: // 滚动区间计算图
-			startDate, endDate := utils.GetDateByDateType(correlationChart.DateType, correlationChart.StartDate.Format(utils.FormatDate), correlationChart.EndDate.Format(utils.FormatDate))
-
-			dataResp, e = rangeServ.GetRollingCorrelationChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB, correlationChart.LeadValue, correlationChart.LeadUnit, correlationChart.CalculateValue, correlationChart.CalculateUnit, startDate, endDate, chartInfo.ChartName, chartInfo.ChartNameEn)
-			if e != nil {
-				msg = "获取失败"
-				errMsg = "获取滚动区间计算图表, 图表计算值失败, Err:" + e.Error()
-				return
-			}
-		}
-	} else {
-		xEdbIdValue, yDataList, e = rangeServ.GetFactorChartDataByChartId(chartInfoId, chartInfo.ExtraConfig)
-		if e != nil {
-			msg = "获取失败"
-			errMsg = "获取区间计算图表, 图表计算值失败, Err:" + e.Error()
-			return
-		}
-	}
-
-	// 完善指标信息
-	edbList := make([]*data_manage.ChartEdbInfoMapping, 0)
-	if correlationChart.AnalysisMode != 1 {
-		edbList, e = rangeServ.GetChartEdbInfoFormat(chartInfo.ChartInfoId, edbInfoMappingA, edbInfoMappingB)
-		if e != nil {
-			msg = "获取失败"
-			errMsg = "获取区间计算图表, 完善指标信息失败, Err:" + e.Error()
-			return
-		}
-	} else {
-		// 多因子指标, 获取图表引用到的系列指标(去重后)
-		edbList, e = data_manage.GetChartEdbMappingListByIdList([]int{chartInfoId})
-		if e != nil {
-			msg = "获取失败"
-			errMsg = "获取图表引用系列指标失败, Err:" + e.Error()
-			return
-		}
-	}
-	correlationInfo := new(data_manage.CorrelationInfo)
-	correlationInfo.LeadValue = correlationChart.LeadValue
-	correlationInfo.LeadUnit = correlationChart.LeadUnit
-	correlationInfo.CalculateValue = correlationChart.CalculateValue
-	correlationInfo.CalculateUnit = correlationChart.CalculateUnit
-	correlationInfo.StartDate = correlationChart.StartDate.Format(utils.FormatDate)
-	correlationInfo.EndDate = correlationChart.EndDate.Format(utils.FormatDate)
-	correlationInfo.LeadValue = correlationChart.LeadValue
-	correlationInfo.EdbInfoIdFirst = correlationChart.EdbInfoIdFirst
-	correlationInfo.EdbInfoIdSecond = correlationChart.EdbInfoIdSecond
-	correlationInfo.AnalysisMode = correlationChart.AnalysisMode
-
-	if chartInfoId > 0 && chartInfo != nil {
-		//判断是否加入我的图库
-		{
-			var myChartCondition string
-			var myChartPars []interface{}
-			myChartCondition += ` AND a.admin_id=? `
-			myChartPars = append(myChartPars, sysUser.AdminId)
-			myChartCondition += ` AND a.chart_info_id=? `
-			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
-
-			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
-				msg = "获取失败"
-				errMsg = "获取我的图表信息失败，GetMyChartByCondition，Err:" + err.Error()
-				return
-			}
-			if myChartList != nil && len(myChartList) > 0 {
-				chartInfo.IsAdd = true
-				chartInfo.MyChartId = myChartList[0].MyChartId
-				chartInfo.MyChartClassifyId = myChartList[0].MyChartClassifyId
-			}
-		}
-	}
-
-	//图表操作权限
-	chartInfo.IsEdit = data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, true)
-	//判断是否需要展示英文标识
-	chartInfo.IsEnChart = data.CheckIsEnChart(chartInfo.ChartNameEn, edbList[0:1], chartInfo.Source, chartInfo.ChartType)
-	chartInfo.UnitEn = edbInfoMappingA.UnitEn
-
-	isSaveAs := true
-	if chartInfo.Source == utils.CHART_SOURCE_ROLLING_CORRELATION {
-		isSaveAs = false
-	}
-	// 另存为
-	chartInfo.Button = data_manage.ChartViewButton{
-		IsEdit:    chartInfo.IsEdit,
-		IsEnChart: chartInfo.IsEnChart,
-		IsAdd:     chartInfo.IsAdd,
-		IsCopy:    isSaveAs,
-		IsSetName: chartInfo.IsSetName,
-	}
-
-	// 图表的指标来源
-	sourceNameList, sourceNameEnList := data.GetEdbSourceByEdbInfoIdList(edbList)
-	chartInfo.ChartSource = strings.Join(sourceNameList, ",")
-	chartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
-
-	resp.ChartInfo = chartInfo
-	resp.EdbInfoList = edbList
-	resp.XEdbIdValue = xEdbIdValue
-	resp.YDataList = yDataList
-	resp.CorrelationChartInfo = correlationInfo
-	resp.DataResp = dataResp
-	resp.Status = true
-
-	// 遍历到校验map
-	for _, v := range edbList {
-		edbClassifyPermissionMap[v.EdbInfoId] = data_manage_permission.EdbClassifyPermission{
-			ClassifyId:       v.ClassifyId,
-			IsJoinPermission: v.IsJoinPermission,
-			EdbInfoId:        v.EdbInfoId,
-		}
-	}
-
-	// 将数据加入缓存
-	if utils.Re == nil {
-		d, _ := json.Marshal(resp)
-		_ = utils.Rc.Put(key, d, 2*time.Hour)
-	}
-	isOk = true
-	return
-}
-
-// EnInfoEdit
-// @Title 编辑图表英文信息接口
-// @Description 编辑图表英文信息接口
-// @Param	request	body data_manage.EditChartEnInfoReq true "type json string"
-// @Success Ret=200 编辑成功
-// @router /chart_info/en/edit [post]
-func (this *RangeChartChartInfoController) EnInfoEdit() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	var req request.EditChartEnInfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-	req.ChartNameEn = strings.Trim(req.ChartNameEn, " ")
-	if req.ChartInfoId <= 0 {
-		br.Msg = "请选择图表"
-		return
-	}
-	if req.ChartNameEn == "" {
-		br.Msg = "请输入英文图表名称"
-		return
-	}
-
-	chartItem, _, tips, e := rangeServ.GetChartAndCorrelationInfo(req.ChartInfoId)
-	if e != nil {
-		if tips != "" {
-			br.Msg = tips
-			return
-		}
-		br.Msg = "操作失败"
-		br.ErrMsg = "获取图表信息失败, Err: " + e.Error()
-		return
-	}
-
-	var condition string
-	var pars []interface{}
-	condition += " AND chart_info_id <> ?  AND chart_name_en = ? AND source = ?"
-	pars = append(pars, req.ChartInfoId, req.ChartNameEn, utils.CHART_SOURCE_CORRELATION)
-	existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-	if err != nil {
-		if err.Error() != utils.ErrNoRow() {
-			br.Msg = "判断英文图表名称是否存在失败"
-			br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
-			return
-		}
-	}
-	if err == nil && existItem.ChartInfoId > 0 {
-		br.Msg = existItem.ChartName + "：" + req.ChartNameEn + "图表名称已存在"
-		return
-	}
-	chartItem.ChartNameEn = req.ChartNameEn
-	chartItem.ModifyTime = time.Now().Local()
-	if e := chartItem.Update([]string{"ChartNameEn", "ModifyTime"}); e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "更新图表信息失败, Err: " + e.Error()
-		return
-	}
-
-	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
-	//修改my eta es数据
-	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
-
-	//指标 修改es信息
-	//go data.AddOrEditEdbInfoToEs(edbInfo.EdbInfoId)
-
-	//新增操作日志
-	{
-		chartLog := new(data_manage.ChartInfoLog)
-		chartLog.ChartName = chartItem.ChartName
-		chartLog.ChartInfoId = req.ChartInfoId
-		chartLog.ChartClassifyId = chartItem.ChartClassifyId
-		chartLog.SysUserId = sysUser.AdminId
-		chartLog.SysUserRealName = sysUser.RealName
-		chartLog.UniqueCode = chartItem.UniqueCode
-		chartLog.CreateTime = time.Now()
-		chartLog.Content = string(this.Ctx.Input.RequestBody)
-		chartLog.Status = "编辑区间计算图表英文信息"
-		chartLog.Method = this.Ctx.Input.URL()
-		go data_manage.AddChartInfoLog(chartLog)
-	}
-	// 清除缓存
-	if utils.Re == nil && utils.Rc != nil {
-		_ = utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
-		_ = utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "编辑成功"
-	br.IsAddLog = true
-}
-
-// SearchByEs
-// @Title 图表模糊搜索（从es获取）
-// @Description  图表模糊搜索（从es获取）
-// @Param   Keyword   query   string  true       "图表名称"
-// @Param   IsShowMe   query   bool  true       "是否只看我的，true、false"
-// @Param   Source   query   int  true       "来源，3：区间计算，4：滚动区间计算，默认0：全部"
-// @Success 200 {object} data_manage.ChartInfo
-// @router /chart_info/search_by_es [get]
-func (this *RangeChartChartInfoController) SearchByEs() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-
-	var startSize int
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-	startSize = paging.StartIndex(currentIndex, pageSize)
-
-	keyword := this.GetString("Keyword")
-
-	//只看我的
-	isShowMe, _ := this.GetBool("IsShowMe")
-	showSysId := 0
-	if isShowMe {
-		showSysId = sysUser.AdminId
-	}
-
-	source, _ := this.GetInt("Source")
-	sourceList := make([]int, 0)
-	if source <= 0 {
-		sourceList = append(sourceList, utils.CHART_SOURCE_CORRELATION, utils.CHART_SOURCE_ROLLING_CORRELATION)
-	} else {
-		sourceList = append(sourceList, source)
-	}
-
-	var searchList []*data_manage.ChartInfo
-	var total int64
-	var err error
-
-	// 获取当前账号的不可见指标
-	noPermissionChartIdList := make([]int, 0)
-	{
-		obj := data_manage.EdbInfoNoPermissionAdmin{}
-		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取不可见指标配置数据失败，Err:" + err.Error()
-			return
-		}
-		for _, v := range confList {
-			noPermissionChartIdList = append(noPermissionChartIdList, v.ChartInfoId)
-		}
-	}
-
-	if keyword != "" {
-		searchList, total, err = data.EsSearchChartInfo(keyword, showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
-	} else {
-		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取图表信息失败，Err:" + err.Error()
-			return
-		}
-	}
-
-	finalList := make([]*data_manage.ChartInfoMore, 0)
-	if len(searchList) > 0 {
-		chartInfoIds := ""
-		chartEdbMap := make(map[int][]*data_manage.ChartEdbInfoMapping)
-		for _, v := range searchList {
-			chartInfoIds += strconv.Itoa(v.ChartInfoId) + ","
-		}
-		if chartInfoIds != "" {
-			chartInfoIds = strings.Trim(chartInfoIds, ",")
-			//判断是否需要展示英文标识
-			edbList, e := data_manage.GetChartEdbMappingListByChartInfoIds(chartInfoIds)
-			if e != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取图表，指标信息失败，Err:" + e.Error()
-				return
-			}
-			for _, v := range edbList {
-				chartEdbMap[v.ChartInfoId] = append(chartEdbMap[v.ChartInfoId], v)
-			}
-		}
-
-		for _, v := range searchList {
-			tmp := new(data_manage.ChartInfoMore)
-			tmp.ChartInfo = *v
-			// 图表数据权限
-			tmp.HaveOperaAuth = true
-			//判断是否需要展示英文标识
-			if edbTmpList, ok := chartEdbMap[v.ChartInfoId]; ok {
-				tmp.IsEnChart = data.CheckIsEnChart(v.ChartNameEn, edbTmpList, v.Source, v.ChartType)
-			}
-			finalList = append(finalList, tmp)
-		}
-	}
-	//新增搜索词记录
-	{
-		searchKeyword := new(data_manage.SearchKeyword)
-		searchKeyword.KeyWord = keyword
-		searchKeyword.CreateTime = time.Now()
-		go data_manage.AddSearchKeyword(searchKeyword)
-	}
-
-	page := paging.GetPaging(currentIndex, pageSize, int(total))
-	resp := data_manage.ChartInfoListByEsResp{
-		Paging: page,
-		List:   finalList,
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// Newest
-// @Title 获取最新图表接口
-// @Description 获取最新图表接口
-// @Success 200 {object} data_manage.ChartInfoList
-// @router /chart_info/newest [get]
-func (this *RangeChartChartInfoController) Newest() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	item, err := data_manage.GetChartInfoByNewest(utils.CHART_SOURCE_CORRELATION)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取最新图表失败"
-		br.ErrMsg = "获取最新图表失败,Err:" + err.Error()
-		return
-	}
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = item
-}
-
-// BaseInfoEdit
-// @Title 编辑图表基础信息接口
-// @Description 编辑图表基础信息接口
-// @Param	request	body data_manage.EditChartInfoBaseReq true "type json string"
-// @Success Ret=200 编辑成功
-// @router /chart_info/base/edit [post]
-func (this *RangeChartChartInfoController) BaseInfoEdit() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	var req request.EditChartInfoBaseReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-	req.ChartName = strings.Trim(req.ChartName, " ")
-	if req.ChartInfoId <= 0 {
-		br.Msg = "请选择图表"
-		return
-	}
-	if req.ChartName == "" {
-		br.Msg = "请输入图表名称"
-		return
-	}
-
-	chartItem, _, tips, e := rangeServ.GetChartAndCorrelationInfo(req.ChartInfoId)
-	if e != nil {
-		if tips != "" {
-			br.Msg = tips
-			return
-		}
-		br.Msg = "操作失败"
-		br.ErrMsg = "获取图表信息失败, Err: " + e.Error()
-		return
-	}
-
-	var condition string
-	var pars []interface{}
-
-	condition += " AND chart_info_id <> ? AND source = ? "
-	pars = append(pars, req.ChartInfoId, utils.CHART_SOURCE_CORRELATION)
-
-	switch this.Lang {
-	case utils.EnLangVersion:
-		condition += " AND chart_name_en = ? "
-	default:
-		condition += " AND chart_name = ? "
-	}
-	pars = append(pars, req.ChartName)
-	existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-	if err != nil {
-		if err.Error() != utils.ErrNoRow() {
-			br.Msg = "判断英文图表名称是否存在失败"
-			br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
-			return
-		}
-	}
-	if err == nil && existItem.ChartInfoId > 0 {
-		br.Msg = existItem.ChartName + "：" + req.ChartName + "图表名称已存在"
-		return
-	}
-
-	switch this.Lang {
-	case utils.EnLangVersion:
-		chartItem.ChartNameEn = req.ChartName
-	default:
-		chartItem.ChartName = req.ChartName
-	}
-
-	chartItem.ModifyTime = time.Now().Local()
-	if e := chartItem.Update([]string{"ChartName", "ChartNameEn", "ModifyTime"}); e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "更新图表信息失败, Err: " + e.Error()
-		return
-	}
-
-	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
-	//修改my eta es数据
-	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
-
-	//新增操作日志
-	{
-		chartLog := new(data_manage.ChartInfoLog)
-		chartLog.ChartName = chartItem.ChartName
-		chartLog.ChartInfoId = req.ChartInfoId
-		chartLog.ChartClassifyId = chartItem.ChartClassifyId
-		chartLog.SysUserId = sysUser.AdminId
-		chartLog.SysUserRealName = sysUser.RealName
-		chartLog.UniqueCode = chartItem.UniqueCode
-		chartLog.CreateTime = time.Now()
-		chartLog.Content = string(this.Ctx.Input.RequestBody)
-		chartLog.Status = "编辑区间计算图表基础信息"
-		chartLog.Method = this.Ctx.Input.URL()
-		go data_manage.AddChartInfoLog(chartLog)
-	}
-
-	// 清除缓存
-	if utils.Re == nil && utils.Rc != nil {
-		_ = utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
-		_ = utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "编辑成功"
-	br.IsAddLog = true
-}
-
-// MultiFactorAdd
-// @Title 多因子图表-新增
-// @Description 多因子图表-新增
-// @Param	request	body request.CorrelationChartMultiFactorSaveReq true "type json string"
-// @Success Ret=200 返回图表id
-// @router /chart_info/multi_factor/add [post]
-func (this *RangeChartChartInfoController) MultiFactorAdd() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	var req request.CorrelationChartMultiFactorSaveReq
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = fmt.Sprintf("参数解析失败, Err: %v", e)
-		return
-	}
-	// 此方法只加多因子图表
-	if req.AnalysisMode != 1 {
-		br.Msg = "分析模式有误"
-		br.ErrMsg = fmt.Sprintf("分析模式有误, Mode: %d", req.AnalysisMode)
-		return
-	}
-	if req.BaseEdbInfoId <= 0 {
-		br.Msg = "请选择标的指标"
-		return
-	}
-	if len(req.FactorCorrelation.SeriesIds) == 0 {
-		br.Msg = "请选择因子指标系列"
-		return
-	}
-	if len(req.FactorCorrelation.SeriesEdb) == 0 {
-		br.Msg = "请选择因子指标"
-		return
-	}
-	if req.FactorCorrelation.LeadValue <= 0 {
-		br.Msg = "分析周期不允许设置为负数或0"
-		return
-	}
-	if req.FactorCorrelation.LeadUnit == "" {
-		br.Msg = "请选择分析周期频度"
-		return
-	}
-	leadUnitDays, ok := utils.FrequencyDaysMap[req.FactorCorrelation.LeadUnit]
-	if !ok {
-		br.Msg = "错误的分析周期频度"
-		br.ErrMsg = fmt.Sprintf("分析周期频度有误: %s", req.FactorCorrelation.LeadUnit)
-		return
-	}
-	if req.FactorCorrelation.CalculateUnit == "" {
-		br.Msg = "请选择计算窗口频度"
-		return
-	}
-	calculateUnitDays, ok := utils.FrequencyDaysMap[req.FactorCorrelation.CalculateUnit]
-	if !ok {
-		br.Msg = "错误的计算窗口频度"
-		br.ErrMsg = fmt.Sprintf("计算窗口频度有误: %s", req.FactorCorrelation.CalculateUnit)
-		return
-	}
-	leadDays := 2 * req.FactorCorrelation.LeadValue * leadUnitDays
-	calculateDays := req.FactorCorrelation.CalculateValue * calculateUnitDays
-	if calculateDays < leadDays {
-		br.Msg = "计算窗口必须≥2*分析周期"
-		return
-	}
-	req.ChartName = strings.TrimSpace(req.ChartName)
-	if req.ChartName == "" {
-		br.Msg = "请输入图表名称"
-		return
-	}
-	if req.ClassifyId <= 0 {
-		br.Msg = "请选择图表分类"
-		return
-	}
-
-	cacheKey := "CACHE_CORRELATION_CHART_INFO_ADD_" + strconv.Itoa(sysUser.AdminId)
-	if !utils.Rc.SetNX(cacheKey, 1, 30*time.Second) {
-		br.Msg = "系统处理中, 请稍后重试"
-		return
-	}
-	defer func() {
-		_ = utils.Rc.Delete(cacheKey)
-	}()
-
-	chartType := 9
-	chartSource := utils.CHART_SOURCE_CORRELATION
-	startDate := time.Now().AddDate(0, 0, -calculateDays).Format(utils.FormatDate)
-	endDate := time.Now().Format(utils.FormatDate)
-	mappingEdbIds := make([]int, 0) // 该图表关联的指标(去除系列中重复指标之后的)
-	{
-		exists := make(map[int]bool)
-		for _, v := range req.FactorCorrelation.SeriesEdb {
-			if !exists[v.EdbInfoId] {
-				mappingEdbIds = append(mappingEdbIds, v.EdbInfoId)
-			}
-		}
-	}
-
-	// 校验分类、图表名称
-	{
-		var cond string
-		var pars []interface{}
-		switch this.Lang {
-		case utils.EnLangVersion:
-			cond += " AND chart_name_en = ? AND source = ? "
-		default:
-			cond += " AND chart_name = ? AND source = ? "
-		}
-		pars = append(pars, req.ChartName, chartSource)
-		count, e := data_manage.GetChartInfoCountByCondition(cond, pars)
-		if e != nil {
-			br.Msg = "保存失败"
-			br.ErrMsg = fmt.Sprintf("获取同名图表失败, Err: %v", e)
-			return
-		}
-		if count > 0 {
-			br.Msg = "图表名称已存在, 请重新填写"
-			return
-		}
-
-		_, e = data_manage.GetChartClassifyById(req.ClassifyId)
-		if e != nil {
-			if e.Error() == utils.ErrNoRow() {
-				br.Msg = "分类不存在"
-				return
-			}
-			br.Msg = "保存失败"
-			br.ErrMsg = fmt.Sprintf("获取图表分类失败, Err: %v", e)
-			return
-		}
-	}
-
-	// 图表来源、图例设置
-	var sourceFrom, extraConfig string
-	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)
-	}
-	if req.ExtraConfig != nil {
-		b, e := json.Marshal(req.ExtraConfig)
-		if e != nil {
-			br.Msg = "保存失败"
-			br.ErrMsg = fmt.Sprintf("图表来源JSON格式化失败, Err: %v", e)
-			return
-		}
-		extraConfig = string(b)
-	}
-
-	// 图表信息
-	chartInfo := new(data_manage.ChartInfo)
-	chartInfo.ChartName = req.ChartName
-	chartInfo.ChartNameEn = req.ChartName
-	chartInfo.ChartClassifyId = req.ClassifyId
-	chartInfo.SysUserId = sysUser.AdminId
-	chartInfo.SysUserRealName = sysUser.RealName
-	chartInfo.CreateTime = time.Now()
-	chartInfo.ModifyTime = time.Now()
-	chartInfo.IsSetName = 0
-	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
-	chartInfo.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + timestamp)
-	chartInfo.ChartType = chartType
-	chartInfo.Calendar = "公历"
-	chartInfo.DateType = 6
-	chartInfo.StartDate = startDate
-	chartInfo.EndDate = endDate
-	chartInfo.SeasonStartDate = startDate
-	chartInfo.SeasonEndDate = endDate
-	chartInfo.Disabled = data.CheckIsDisableChart(mappingEdbIds)
-	chartInfo.Source = chartSource
-	chartInfo.ExtraConfig = extraConfig
-	chartInfo.SourcesFrom = sourceFrom
-
-	// 区间计算图
-	chartCorrelate := new(data_manage.ChartInfoCorrelation)
-	chartCorrelate.LeadValue = req.FactorCorrelation.LeadValue
-	chartCorrelate.LeadUnit = req.FactorCorrelation.LeadUnit
-	chartCorrelate.CalculateValue = req.FactorCorrelation.CalculateValue
-	chartCorrelate.CalculateUnit = req.FactorCorrelation.CalculateUnit
-	chartCorrelate.EdbInfoIdFirst = req.BaseEdbInfoId
-	chartCorrelate.AnalysisMode = 1
-	chartCorrelate.CreateTime = time.Now().Local()
-	chartCorrelate.ModifyTime = time.Now().Local()
-
-	// 图表指标关联
-	edbMappings := make([]*data_manage.ChartEdbMapping, 0)
-	for _, v := range mappingEdbIds {
-		m := new(data_manage.ChartEdbMapping)
-		m.EdbInfoId = v
-		m.CreateTime = time.Now()
-		m.ModifyTime = time.Now()
-		edbTimestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
-		m.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + edbTimestamp + "_" + strconv.Itoa(v))
-		m.IsOrder = true
-		m.IsAxis = 1
-		m.EdbInfoType = 1
-		m.Source = utils.CHART_SOURCE_CORRELATION
-		edbMappings = append(edbMappings, m)
-	}
-
-	// 标记引用的指标
-	seriesIds := req.FactorCorrelation.SeriesIds
-	edbUsed := make(map[string]bool)
-	for _, v := range req.FactorCorrelation.SeriesEdb {
-		k := fmt.Sprintf("%d-%d", v.SeriesId, v.EdbInfoId)
-		edbUsed[k] = true
-	}
-
-	// 指标系列-图表关联
-	chartMappings := make([]*data_manage.FactorEdbSeriesChartMapping, 0)
-	{
-		ob := new(data_manage.FactorEdbSeriesChartMapping)
-		cond := fmt.Sprintf(" AND %s IN (%s)", ob.Cols().FactorEdbSeriesId, utils.GetOrmInReplace(len(seriesIds)))
-		pars := make([]interface{}, 0)
-		pars = append(pars, seriesIds)
-		items, e := ob.GetItemsByCondition(cond, pars, []string{}, "")
-		if e != nil {
-			br.Msg = "保存失败"
-			br.ErrMsg = fmt.Sprintf("获取指标系列图表关联失败, Err: %v", e)
-			return
-		}
-		chartMappings = items
-	}
-	for _, v := range chartMappings {
-		v.Source = chartSource
-		k := fmt.Sprintf("%d-%d", v.FactorEdbSeriesId, v.EdbInfoId)
-		v.EdbUsed = 0 // 先重置一下
-		if edbUsed[k] {
-			v.EdbUsed = 1
-		}
-		v.ModifyTime = time.Now().Local()
-	}
-
-	// 另存为
-	originSeries := make([]*data_manage.FactorEdbSeries, 0)
-	originEdbSeriesMapping := make([]*data_manage.FactorEdbSeriesMapping, 0)
-	if req.SaveAs {
-		// 注意此处要复制一份系列及系列关联指标, 不可共用被复制图表的系列
-		{
-			ob := new(data_manage.FactorEdbSeries)
-			cond := fmt.Sprintf(" AND %s IN (%s)", ob.Cols().PrimaryId, utils.GetOrmInReplace(len(seriesIds)))
-			pars := make([]interface{}, 0)
-			pars = append(pars, seriesIds)
-			list, e := ob.GetItemsByCondition(cond, pars, []string{}, "")
-			if e != nil {
-				br.Msg = "保存失败"
-				br.ErrMsg = fmt.Sprintf("获取源图表系列失败, %v", e)
-				return
-			}
-			originSeries = list
-		}
-		{
-			ob := new(data_manage.FactorEdbSeriesMapping)
-			cond := fmt.Sprintf(" AND %s IN (%s)", ob.Cols().FactorEdbSeriesId, utils.GetOrmInReplace(len(seriesIds)))
-			pars := make([]interface{}, 0)
-			pars = append(pars, seriesIds)
-			list, e := ob.GetItemsByCondition(cond, pars, []string{}, "")
-			if e != nil {
-				br.Msg = "保存失败"
-				br.ErrMsg = fmt.Sprintf("获取源图表系列指标失败, %v", e)
-				return
-			}
-			originEdbSeriesMapping = list
-		}
-	}
-
-	// 新增图表/区间计算图表/图表指标关联/指标系列图表关联
-	chartInfoId, seriesIdMap, e := data_manage.CreateMultiFactorCorrelationChartAndEdb(chartInfo, edbMappings, chartCorrelate, chartMappings, req.SaveAs, originSeries, originEdbSeriesMapping)
-	if e != nil {
-		br.Msg = "保存失败"
-		br.ErrMsg = fmt.Sprintf("新增多因子区间计算图表失败, Err: %v", e)
-		return
-	}
-
-	// 另存为-替换图例设置中的系列ID
-	if req.SaveAs {
-		if req.ExtraConfig != nil {
-			for _, v := range req.ExtraConfig.LegendConfig {
-				v.SeriesId = seriesIdMap[v.SeriesId]
-			}
-			b, e := json.Marshal(req.ExtraConfig)
-			if e != nil {
-				br.Msg = "保存失败"
-				br.ErrMsg = fmt.Sprintf("图表来源JSON格式化失败, Err: %v", e)
-				return
-			}
-			chartInfo.ExtraConfig = string(b)
-			if e = chartInfo.Update([]string{"ExtraConfig"}); e != nil {
-				br.Msg = "保存失败"
-				br.ErrMsg = fmt.Sprintf("更新图例信息失败, %v", e)
-				return
-			}
-		}
-	}
-
-	go data.EsAddOrEditChartInfo(chartInfoId)
-
-	// 操作日志
-	{
-		chartLog := new(data_manage.ChartInfoLog)
-		chartLog.ChartInfoId = chartInfo.ChartInfoId
-		chartLog.ChartName = req.ChartName
-		chartLog.ChartClassifyId = req.ClassifyId
-		chartLog.SysUserId = sysUser.AdminId
-		chartLog.SysUserRealName = sysUser.RealName
-		chartLog.UniqueCode = chartInfo.UniqueCode
-		chartLog.CreateTime = time.Now()
-		chartLog.Content = string(this.Ctx.Input.RequestBody)
-		chartLog.Status = "新增多因子区间计算图表"
-		chartLog.Method = this.Ctx.Input.URI()
-		go data_manage.AddChartInfoLog(chartLog)
-	}
-
-	resp := new(data_manage.AddChartInfoResp)
-	resp.ChartInfoId = chartInfo.ChartInfoId
-	resp.UniqueCode = chartInfo.UniqueCode
-	resp.ChartType = chartInfo.ChartType
-	resp.ClassifyId = req.ClassifyId
-
-	br.Data = resp
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "保存成功"
-	br.IsAddLog = true
-}
-
-// MultiFactorEdit
-// @Title 多因子图表-编辑
-// @Description 多因子图表-编辑
-// @Param	request	body request.CorrelationChartMultiFactorSaveReq true "type json string"
-// @Success Ret=200 返回图表id
-// @router /chart_info/multi_factor/edit [post]
-func (this *RangeChartChartInfoController) MultiFactorEdit() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	var req request.CorrelationChartMultiFactorSaveReq
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = fmt.Sprintf("参数解析失败, Err: %v", e)
-		return
-	}
-	if req.ChartInfoId <= 0 {
-		br.Msg = "参数有误"
-		br.ErrMsg = fmt.Sprintf("参数有误, ChartInfoId: %d", req.ChartInfoId)
-		return
-	}
-	// 此方法只加多因子图表
-	if req.AnalysisMode != 1 {
-		br.Msg = "分析模式有误"
-		br.ErrMsg = fmt.Sprintf("分析模式有误, Mode: %d", req.AnalysisMode)
-		return
-	}
-	if req.BaseEdbInfoId <= 0 {
-		br.Msg = "请选择标的指标"
-		return
-	}
-	if len(req.FactorCorrelation.SeriesIds) == 0 {
-		br.Msg = "请选择因子指标系列"
-		return
-	}
-	if len(req.FactorCorrelation.SeriesEdb) == 0 {
-		br.Msg = "请选择因子指标"
-		return
-	}
-	if req.FactorCorrelation.LeadValue <= 0 {
-		br.Msg = "分析周期不允许设置为负数或0"
-		return
-	}
-	if req.FactorCorrelation.LeadUnit == "" {
-		br.Msg = "请选择分析周期频度"
-		return
-	}
-	leadUnitDays, ok := utils.FrequencyDaysMap[req.FactorCorrelation.LeadUnit]
-	if !ok {
-		br.Msg = "错误的分析周期频度"
-		br.ErrMsg = fmt.Sprintf("分析周期频度有误: %s", req.FactorCorrelation.LeadUnit)
-		return
-	}
-	if req.FactorCorrelation.CalculateUnit == "" {
-		br.Msg = "请选择计算窗口频度"
-		return
-	}
-	calculateUnitDays, ok := utils.FrequencyDaysMap[req.FactorCorrelation.CalculateUnit]
-	if !ok {
-		br.Msg = "错误的计算窗口频度"
-		br.ErrMsg = fmt.Sprintf("计算窗口频度有误: %s", req.FactorCorrelation.CalculateUnit)
-		return
-	}
-	leadDays := 2 * req.FactorCorrelation.LeadValue * leadUnitDays
-	calculateDays := req.FactorCorrelation.CalculateValue * calculateUnitDays
-	if calculateDays < leadDays {
-		br.Msg = "计算窗口必须≥2*分析周期"
-		return
-	}
-	req.ChartName = strings.TrimSpace(req.ChartName)
-	if req.ChartName == "" {
-		br.Msg = "请输入图表名称"
-		return
-	}
-	if req.ClassifyId <= 0 {
-		br.Msg = "请选择图表分类"
-		return
-	}
-
-	cacheKey := "CACHE_CORRELATION_CHART_INFO_EDIT_" + strconv.Itoa(sysUser.AdminId)
-	if !utils.Rc.SetNX(cacheKey, 1, 30*time.Second) {
-		br.Msg = "系统处理中, 请稍后重试"
-		return
-	}
-	defer func() {
-		_ = utils.Rc.Delete(cacheKey)
-	}()
-
-	chartSource := utils.CHART_SOURCE_CORRELATION
-	startDate := time.Now().AddDate(0, 0, -calculateDays).Format(utils.FormatDate)
-	endDate := time.Now().Format(utils.FormatDate)
-	mappingEdbIds := make([]int, 0) // 该图表关联的指标(去除系列中重复指标之后的)
-	{
-		exists := make(map[int]bool)
-		for _, v := range req.FactorCorrelation.SeriesEdb {
-			if !exists[v.EdbInfoId] {
-				mappingEdbIds = append(mappingEdbIds, v.EdbInfoId)
-			}
-		}
-	}
-
-	chartInfo, e := data_manage.GetChartInfoById(req.ChartInfoId)
-	if e != nil {
-		if e.Error() == utils.ErrNoRow() {
-			br.Msg = "图表已被删除, 请刷新页面"
-			return
-		}
-		br.Msg = "保存失败"
-		br.ErrMsg = fmt.Sprintf("获取图表信息失败, Err: %v", e)
-		return
-	}
-	chartCorrelate := new(data_manage.ChartInfoCorrelation)
-	if e = chartCorrelate.GetItemById(chartInfo.ChartInfoId); e != nil {
-		br.Msg = "图表区间计算信息不存在"
-		br.ErrMsg = fmt.Sprintf("获取图表区间计算信息失败, Err: %v", e)
-		return
-	}
-
-	// 图表检验
-	{
-		if chartInfo.Source != chartSource {
-			br.Msg = "该图表不是区间计算图表"
-			return
-		}
-
-		// 图表操作权限
-		authOk := data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, true)
-		if !authOk {
-			br.Msg = "没有该图表的操作权限"
-			return
-		}
-
-		// 图表名称、分类
-		var cond string
-		var pars []interface{}
-		switch this.Lang {
-		case utils.EnLangVersion:
-			cond += " AND chart_name_en = ? AND source = ? AND chart_info_id <> ? "
-		default:
-			cond += " AND chart_name = ? AND source = ? AND chart_info_id <> ? "
-		}
-		pars = append(pars, req.ChartName, chartSource, chartInfo.ChartInfoId)
-		count, e := data_manage.GetChartInfoCountByCondition(cond, pars)
-		if e != nil {
-			br.Msg = "保存失败"
-			br.ErrMsg = fmt.Sprintf("获取同名图表失败, Err: %v", e)
-			return
-		}
-		if count > 0 {
-			br.Msg = "图表名称已存在, 请重新填写"
-			return
-		}
-
-		_, e = data_manage.GetChartClassifyById(req.ClassifyId)
-		if e != nil {
-			if e.Error() == utils.ErrNoRow() {
-				br.Msg = "分类不存在"
-				return
-			}
-			br.Msg = "保存失败"
-			br.ErrMsg = fmt.Sprintf("获取图表分类失败, Err: %v", e)
-			return
-		}
-	}
-
-	// 图表来源、图例设置
-	var sourceFrom, extraConfig string
-	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)
-	}
-	if req.ExtraConfig != nil {
-		b, e := json.Marshal(req.ExtraConfig)
-		if e != nil {
-			br.Msg = "保存失败"
-			br.ErrMsg = fmt.Sprintf("图表来源JSON格式化失败, Err: %v", e)
-			return
-		}
-		extraConfig = string(b)
-	}
-
-	// 图表信息
-	chartInfo.ChartName = req.ChartName
-	chartInfo.ChartNameEn = req.ChartName
-	chartInfo.ChartClassifyId = req.ClassifyId
-	chartInfo.ModifyTime = time.Now()
-	chartInfo.StartDate = startDate
-	chartInfo.EndDate = endDate
-	chartInfo.SeasonStartDate = startDate
-	chartInfo.SeasonEndDate = endDate
-	chartInfo.ExtraConfig = extraConfig
-	chartInfo.SourcesFrom = sourceFrom
-	chartInfo.Disabled = data.CheckIsDisableChart(mappingEdbIds)
-	chartUpdateCols := []string{"ChartName", "ChartNameEn", "ChartClassifyId", "ModifyTime", "StartDate", "EndDate", "SeasonStartDate", "SeasonEndDate", "ExtraConfig", "SourcesFrom", "Disabled"}
-
-	// 区间计算图
-	chartCorrelate.LeadValue = req.FactorCorrelation.LeadValue
-	chartCorrelate.LeadUnit = req.FactorCorrelation.LeadUnit
-	chartCorrelate.CalculateValue = req.FactorCorrelation.CalculateValue
-	chartCorrelate.CalculateUnit = req.FactorCorrelation.CalculateUnit
-	chartCorrelate.EdbInfoIdFirst = req.BaseEdbInfoId
-	chartCorrelate.ModifyTime = time.Now().Local()
-	correlateUpdateCols := []string{"LeadValue", "LeadUnit", "CalculateValue", "CalculateUnit", "EdbInfoIdFirst", "ModifyTime"}
-
-	// 图表指标关联
-	edbMappings := make([]*data_manage.ChartEdbMapping, 0)
-	for _, v := range mappingEdbIds {
-		m := new(data_manage.ChartEdbMapping)
-		m.EdbInfoId = v
-		m.CreateTime = time.Now()
-		m.ModifyTime = time.Now()
-		edbTimestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
-		m.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + edbTimestamp + "_" + strconv.Itoa(v))
-		m.IsOrder = true
-		m.IsAxis = 1
-		m.EdbInfoType = 1
-		m.Source = utils.CHART_SOURCE_CORRELATION
-		edbMappings = append(edbMappings, m)
-	}
-
-	seriesIds := req.FactorCorrelation.SeriesIds
-	edbUsed := make(map[string]bool)
-	for _, v := range req.FactorCorrelation.SeriesEdb {
-		k := fmt.Sprintf("%d-%d", v.SeriesId, v.EdbInfoId)
-		edbUsed[k] = true
-	}
-	// 指标系列-图表关联
-	chartMappings := make([]*data_manage.FactorEdbSeriesChartMapping, 0)
-	{
-		ob := new(data_manage.FactorEdbSeriesChartMapping)
-		cond := fmt.Sprintf(" AND %s IN (%s)", ob.Cols().FactorEdbSeriesId, utils.GetOrmInReplace(len(seriesIds)))
-		pars := make([]interface{}, 0)
-		pars = append(pars, seriesIds)
-		items, e := ob.GetItemsByCondition(cond, pars, []string{}, "")
-		if e != nil {
-			br.Msg = "保存失败"
-			br.ErrMsg = fmt.Sprintf("获取指标系列图表关联失败, Err: %v", e)
-			return
-		}
-		chartMappings = items
-	}
-	for _, v := range chartMappings {
-		k := fmt.Sprintf("%d-%d", v.FactorEdbSeriesId, v.EdbInfoId)
-		v.EdbUsed = 0
-		if edbUsed[k] {
-			v.EdbUsed = 1
-		}
-		v.ModifyTime = time.Now().Local()
-	}
-
-	// 更新图表/区间计算图表/图表指标关联/指标系列图表关联
-	e = data_manage.UpdateMultiFactorCorrelationChartAndEdb(chartInfo, edbMappings, chartCorrelate, chartMappings, chartUpdateCols, correlateUpdateCols)
-	if e != nil {
-		br.Msg = "保存失败"
-		br.ErrMsg = fmt.Sprintf("新增多因子区间计算图表失败, Err: %v", e)
-		return
-	}
-
-	// ES
-	go func() {
-		data.EsAddOrEditChartInfo(chartInfo.ChartInfoId)
-		data.EsAddOrEditMyChartInfoByChartInfoId(chartInfo.ChartInfoId)
-	}()
-
-	// 操作日志
-	{
-		chartLog := new(data_manage.ChartInfoLog)
-		chartLog.ChartInfoId = chartInfo.ChartInfoId
-		chartLog.ChartName = req.ChartName
-		chartLog.ChartClassifyId = req.ClassifyId
-		chartLog.SysUserId = sysUser.AdminId
-		chartLog.SysUserRealName = sysUser.RealName
-		chartLog.UniqueCode = chartInfo.UniqueCode
-		chartLog.CreateTime = time.Now()
-		chartLog.Content = string(this.Ctx.Input.RequestBody)
-		chartLog.Status = "编辑多因子区间计算图表"
-		chartLog.Method = this.Ctx.Input.URI()
-		go data_manage.AddChartInfoLog(chartLog)
-	}
-
-	resp := new(data_manage.AddChartInfoResp)
-	resp.ChartInfoId = chartInfo.ChartInfoId
-	resp.UniqueCode = chartInfo.UniqueCode
-	resp.ChartType = chartInfo.ChartType
-	resp.ClassifyId = req.ClassifyId
-
-	br.Data = resp
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "保存成功"
-	br.IsAddLog = true
-}
-
-// MultiFactorDetail
-// @Title 多因子图表-编辑页详情
-// @Description 多因子图表-编辑页详情
-// @Param   UniqueCode  query  string  true  "图表唯一编码"
-// @Success Ret=200 返回图表id
-// @router /chart_info/multi_factor/detail [get]
-func (this *RangeChartChartInfoController) MultiFactorDetail() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	uniqueCode := this.GetString("UniqueCode")
-	if uniqueCode == "" {
-		br.Msg = "参数有误"
-		br.ErrMsg = fmt.Sprintf("参数有误, UniqueCode: %s", uniqueCode)
-		return
-	}
-
-	chartInfo, e := data_manage.GetChartInfoByUniqueCode(uniqueCode)
-	if e != nil {
-		if e.Error() == utils.ErrNoRow() {
-			br.Msg = "图表已被删除, 请刷新页面"
-			return
-		}
-		br.Msg = "获取失败"
-		br.ErrMsg = fmt.Sprintf("获取图表信息失败, Err: %v", e)
-		return
-	}
-	chartCorrelate := new(data_manage.ChartInfoCorrelation)
-	if e = chartCorrelate.GetItemById(chartInfo.ChartInfoId); e != nil {
-		br.Msg = "图表区间计算信息不存在"
-		br.ErrMsg = fmt.Sprintf("获取图表区间计算信息失败, Err: %v", e)
-		return
-	}
-	if chartCorrelate.AnalysisMode != 1 {
-		br.Msg = "图表分析模式有误"
-		br.ErrMsg = fmt.Sprintf("图表分析模式有误, Err: %v", e)
-		return
-	}
-	if chartCorrelate.EdbInfoIdFirst <= 0 {
-		br.Msg = "标的指标异常"
-		br.ErrMsg = fmt.Sprintf("标的指标ID异常, Err: %v", e)
-		return
-	}
-	resp := new(data_manage.FactorCorrelationEditDetail)
-
-	// 标的指标
-	baseEdbMapping := new(data_manage.ChartEdbInfoMapping)
-	{
-		mappings, e := data_manage.GetChartEdbMappingListByEdbInfoIdList([]int{chartCorrelate.EdbInfoIdFirst})
-		if e != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = fmt.Sprintf("获取标的指标信息异常, Err: %v", e)
-			return
-		}
-		if len(mappings) > 0 {
-			baseEdbMapping = mappings[0]
-		}
-	}
-
-	// 获取图表系列
-	chartMappings := make([]*data_manage.FactorEdbSeriesChartMapping, 0)
-	{
-		ob := new(data_manage.FactorEdbSeriesChartMapping)
-		cond := fmt.Sprintf(" AND %s = ?", ob.Cols().ChartInfoId)
-		pars := make([]interface{}, 0)
-		pars = append(pars, chartInfo.ChartInfoId)
-		list, e := ob.GetItemsByCondition(cond, pars, []string{}, "")
-		if e != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = fmt.Sprintf("获取图表关联系列列表失败, Err: %v", e)
-			return
-		}
-		chartMappings = list
-	}
-	if len(chartMappings) == 0 {
-		br.Msg = "因子指标系列异常"
-		br.ErrMsg = fmt.Sprintf("因子指标系列引用异常")
-		return
-	}
-
-	seriesIds := make([]int, 0)
-	seriesIdExist := make(map[int]bool)
-	edbInfoIds := make([]int, 0)
-	for _, v := range chartMappings {
-		if !seriesIdExist[v.FactorEdbSeriesId] {
-			seriesIds = append(seriesIds, v.FactorEdbSeriesId)
-		}
-		edbInfoIds = append(edbInfoIds, v.EdbInfoId)
-	}
-	if len(seriesIds) == 0 {
-		br.Msg = "因子指标系列异常"
-		br.ErrMsg = fmt.Sprintf("因子指标系列引用异常")
-		return
-	}
-
-	// 系列信息
-	seriesDetails := make([]*data_manage.FactorEdbSeriesDetail, 0)
-	{
-		seriesOb := new(data_manage.FactorEdbSeries)
-		cond := fmt.Sprintf(" AND %s IN (%s)", seriesOb.Cols().PrimaryId, utils.GetOrmInReplace(len(seriesIds)))
-		pars := make([]interface{}, 0)
-		pars = append(pars, seriesIds)
-		list, e := seriesOb.GetItemsByCondition(cond, pars, []string{}, fmt.Sprintf("%s ASC", seriesOb.Cols().PrimaryId))
-		if e != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = fmt.Sprintf("获取关联系列失败, Err: %v", e)
-			return
-		}
-		for _, v := range list {
-			seriesDetails = append(seriesDetails, &data_manage.FactorEdbSeriesDetail{
-				FactorEdbSeriesItem: v.Format2Item(),
-				EdbMappings:         make([]*data_manage.FactorEdbSeriesMappingItem, 0),
-			})
-		}
-	}
-
-	// 区间计算配置
-	var correlateConf data_manage.CorrelationConfig
-	correlateConf.LeadUnit = chartCorrelate.LeadUnit
-	correlateConf.LeadValue = chartCorrelate.LeadValue
-	correlateConf.CalculateUnit = chartCorrelate.CalculateUnit
-	correlateConf.CalculateValue = chartCorrelate.CalculateValue
-
-	edbIdItem := make(map[int]*data_manage.EdbInfo)
-	edbItems, e := data_manage.GetEdbInfoByIdList(edbInfoIds)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取因子指标失败, Err: " + e.Error()
-		return
-	}
-	for _, v := range edbItems {
-		edbIdItem[v.EdbInfoId] = v
-	}
-
-	// 区间计算矩阵
-	seriesEdb := make(map[int][]*data_manage.FactorEdbSeriesMappingItem)
-	var matrixItems []data_manage.FactorEdbSeriesCorrelationMatrixItem
-	for _, v := range chartMappings {
-		edbItem := edbIdItem[v.EdbInfoId]
-		if edbItem == nil {
-			continue
-		}
-
-		var item data_manage.FactorEdbSeriesCorrelationMatrixItem
-		item.SeriesId = v.FactorEdbSeriesId
-		item.EdbInfoId = edbItem.EdbInfoId
-		item.EdbCode = edbItem.EdbCode
-		item.EdbName = edbItem.EdbName
-		var values []data_manage.FactorEdbSeriesCorrelationMatrixValues
-		if v.CalculateData != "" {
-			if e = json.Unmarshal([]byte(v.CalculateData), &values); e != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = fmt.Sprintf("解析因子指标计算结果失败, Err: %v", e)
-				return
-			}
-		}
-		sort.Sort(data_manage.FactorEdbSeriesCorrelationMatrixOrder(values))
-		item.Values = values
-		if v.EdbUsed == 1 {
-			item.Used = true
-		}
-		item.SourceName = edbItem.SourceName
-		matrixItems = append(matrixItems, item)
-
-		// 系列关联的指标详情
-		if seriesEdb[v.FactorEdbSeriesId] == nil {
-			seriesEdb[v.FactorEdbSeriesId] = make([]*data_manage.FactorEdbSeriesMappingItem, 0)
-		}
-		seriesEdb[v.FactorEdbSeriesId] = append(seriesEdb[v.FactorEdbSeriesId], &data_manage.FactorEdbSeriesMappingItem{
-			SeriesId:  v.FactorEdbSeriesId,
-			EdbInfoId: v.EdbInfoId,
-			EdbCode:   edbItem.EdbCode,
-			EdbName:   edbItem.EdbName,
-			EdbNameEn: edbItem.EdbNameEn,
-		})
-	}
-
-	// 系列关联的指标详情
-	for _, v := range seriesDetails {
-		v.EdbMappings = seriesEdb[v.SeriesId]
-	}
-
-	resp.ChartInfoId = chartInfo.ChartInfoId
-	resp.UniqueCode = chartInfo.UniqueCode
-	resp.BaseEdbInfo = baseEdbMapping
-	resp.EdbSeries = seriesDetails
-	resp.CorrelationConfig = correlateConf
-	resp.CorrelationMatrix = matrixItems
-
-	br.Data = resp
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}

models/data_manage/chart_info_range_analysis.go

@@ -10,9 +10,10 @@ type ChartRangeAnalysisExtraConf struct {
 	YearDateConf         ChartRangeAnalysisYearDateConf     `description:"跨年划分时间区间配置"`
 	CalculateType        int                                `description:"计算类型 0: 区间均值，1: 区间累计值，2：区间涨幅，3：区间年化增长率，4：区间最大值，5：区间最小值"`
 	UnNormalDataDealType int                                `description:"异常值处理配置 0：不处理，1:剔除，2替换"`
-	DeleteDataConf       ChartRangeAnalysisDeleteDataConf
+	UnNormalDataConf     ChartRangeAnalysisDeleteDataConf
 	DataConvertType      int                               `description:"数据转换类型 0不转, 1乘 2除 3对数"`
 	DataConvertConf      ChartRangeAnalysisDataConvertConf `description:"数据转换详情"`
+	SeriesId             int                               `description:"指标系列ID"`
 }
 
 type ChartRangeAnalysisAutoDateChangeConf struct {
@@ -60,9 +61,8 @@ type ChartRangeAnalysisYearDateConf struct {
 
 // ChartRangeAnalysisPreviewReq 相关性图表请求体
 type ChartRangeAnalysisPreviewReq struct {
-	ExtraConf ChartRangeAnalysisExtraConf
-	EdbInfoId int `description:"指标Id"`
-	SeriesId  int `description:"系列ID"`
+	ExtraConf  ChartRangeAnalysisExtraConf
+	EdbInfoIds []int `description:"指标Id"`
 }
 
 type ChartRangeAnalysisManualDateConfList []ChartRangeAnalysisManualDateConf
@@ -74,11 +74,12 @@ func (a ChartRangeAnalysisManualDateConfList) Less(i, j int) bool {
 }
 
 type ChartRangeAnalysisDataResp struct { //图表详情返回值
-	ChartRangeAnalysisExtraConf
+	*ChartRangeAnalysisExtraConf
+	SeriesName string `description:"指标系列名称"`
 }
 
 type ChartRangeAnalysisDateDataItem struct {
 	StartDate time.Time
 	EndDate   time.Time
-	DataList  []EdbDataList
+	DataList  []*EdbDataList
 }

routers/commentsRouter.go

@@ -1843,6 +1843,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/range_analysis:RangeChartChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/range_analysis:RangeChartChartInfoController"],
+        beego.ControllerComments{
+            Method: "Preview",
+            Router: `/chart_info/preview`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/range_analysis:RangeChartClassifyController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/range_analysis:RangeChartClassifyController"],
         beego.ControllerComments{
             Method: "AddChartClassify",

routers/router.go

@@ -380,6 +380,7 @@ func init() {
 		web.NSNamespace("/range_analysis",
 			web.NSInclude(
 				&range_analysis.RangeChartClassifyController{},
+				&range_analysis.RangeChartChartInfoController{},
 			),
 		),
 	)