Merge remote-tracking branch 'origin/debug' into debug

controllers/data_manage/chart_info.go

@@ -15,13 +15,14 @@ import (
 	etaTrialService "eta/eta_api/services/eta_trial"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"os"
 	"os/exec"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 // 图表管理
@@ -532,197 +533,197 @@ func (this *ChartInfoController) ChartEnInfoEdit() {
 // @Param	request	body data_manage.EditChartEnInfoBaseReq true "type json string"
 // @Success Ret=200 编辑成功
 // @router /chart_info/base/edit [post]
-func (this *ChartInfoController) ChartInfoBaseEdit() {
-	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.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
-	}
-
-	//判断指标名称是否存在
-	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
-	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			br.Msg = "图表已被删除，请刷新页面"
-			br.ErrMsg = "图表已被删除，请刷新页面"
-			return
-		}
-		br.Msg = "获取图表信息失败"
-		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
-		return
-	}
-
-	// 判断是否有传入对应的指标配置
-	noEdbInfoType := []int{10}
-	if len(req.ChartEdbInfoList) <= 0 && !utils.InArrayByInt(noEdbInfoType, chartItem.ChartType) {
-		br.Msg = "请选择指标！"
-		return
-	}
-
-	var edbCondition string
-	var edbPars []interface{}
-	for _, v := range req.ChartEdbInfoList {
-		edbInfoId := v.EdbInfoId
-		edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
-		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
-				br.Msg = "图表不存在！"
-				br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoId)
-				return
-			} else {
-				br.Msg = "获取图表信息失败！"
-				br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
-				return
-			}
-		}
-		if edbInfo == nil {
-			br.Msg = "指标不存在！"
-			br.ErrMsg = "指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoId)
-			return
-		}
-
-		//判断指标名称是否重复
-		if v.EdbName != "" {
-			edbCondition = ""
-			edbPars = make([]interface{}, 0)
-
-			edbCondition += " AND edb_info_id<>? "
-			edbPars = append(edbPars, edbInfo.EdbInfoId)
-
-			switch this.Lang {
-			case utils.EnLangVersion:
-				edbCondition += " AND edb_name_en =? "
-			default:
-				edbCondition += " AND edb_name =? "
-			}
-
-			edbPars = append(edbPars, v.EdbName)
-
-			edbExist, err := data_manage.GetEdbInfoByCondition(edbCondition, edbPars)
-			if err != nil {
-				if err.Error() != utils.ErrNoRow() {
-					br.Msg = "判断英文指标名称是否存在失败"
-					br.ErrMsg = "判断英文指标名称是否存在失败,Err:" + err.Error()
-					return
-				}
-			}
-
-			if err == nil && edbExist.EdbInfoId > 0 {
-				br.Msg = edbExist.EdbName + "：" + v.EdbName + "指标名称已存在"
-				br.ErrMsg = "指标名称已存在，请重新填写"
-				br.IsSendEmail = false
-				return
-			}
-		}
-	}
-	if req.ChartName != "" || req.ExtraConfig != `` {
-		var condition string
-		var pars []interface{}
-		condition += " AND chart_info_id<>? "
-		pars = append(pars, req.ChartInfoId)
-
-		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
-		}
-	}
-
-	err = data_manage.EditChartBaseInfoAndEdbEnInfo(&req, chartItem, this.Lang)
-	if err != nil {
-		br.Msg = "保存失败"
-		br.ErrMsg = "保存失败,Err:" + err.Error()
-		return
-	}
-	//添加es数据
-	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
-	//修改my eta es数据
-	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
-
-	//edbinfo 修改es信息
-	for _, v := range req.ChartEdbInfoList {
-		edbInfoId := v.EdbInfoId
-		edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
-		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
-				br.Msg = "图表不存在！"
-				br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoId)
-				return
-			} else {
-				br.Msg = "获取图表信息失败！"
-				br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
-				return
-			}
-		}
-		if edbInfo != nil {
-			go data.AddOrEditEdbInfoToEs(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
-}
+// func (this *ChartInfoController) ChartInfoBaseEdit() {
+// 	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.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
+// 	}
+
+// 	//判断指标名称是否存在
+// 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
+// 	if err != nil {
+// 		if err.Error() == utils.ErrNoRow() {
+// 			br.Msg = "图表已被删除，请刷新页面"
+// 			br.ErrMsg = "图表已被删除，请刷新页面"
+// 			return
+// 		}
+// 		br.Msg = "获取图表信息失败"
+// 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
+// 		return
+// 	}
+
+// 	// 判断是否有传入对应的指标配置
+// 	noEdbInfoType := []int{10}
+// 	if len(req.ChartEdbInfoList) <= 0 && !utils.InArrayByInt(noEdbInfoType, chartItem.ChartType) {
+// 		br.Msg = "请选择指标！"
+// 		return
+// 	}
+
+// 	var edbCondition string
+// 	var edbPars []interface{}
+// 	for _, v := range req.ChartEdbInfoList {
+// 		edbInfoId := v.EdbInfoId
+// 		edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
+// 		if err != nil {
+// 			if err.Error() == utils.ErrNoRow() {
+// 				br.Msg = "图表不存在！"
+// 				br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoId)
+// 				return
+// 			} else {
+// 				br.Msg = "获取图表信息失败！"
+// 				br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
+// 				return
+// 			}
+// 		}
+// 		if edbInfo == nil {
+// 			br.Msg = "指标不存在！"
+// 			br.ErrMsg = "指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoId)
+// 			return
+// 		}
+
+// 		//判断指标名称是否重复
+// 		if v.EdbName != "" {
+// 			edbCondition = ""
+// 			edbPars = make([]interface{}, 0)
+
+// 			edbCondition += " AND edb_info_id<>? "
+// 			edbPars = append(edbPars, edbInfo.EdbInfoId)
+
+// 			switch this.Lang {
+// 			case utils.EnLangVersion:
+// 				edbCondition += " AND edb_name_en =? "
+// 			default:
+// 				edbCondition += " AND edb_name =? "
+// 			}
+
+// 			edbPars = append(edbPars, v.EdbName)
+
+// 			edbExist, err := data_manage.GetEdbInfoByCondition(edbCondition, edbPars)
+// 			if err != nil {
+// 				if err.Error() != utils.ErrNoRow() {
+// 					br.Msg = "判断英文指标名称是否存在失败"
+// 					br.ErrMsg = "判断英文指标名称是否存在失败,Err:" + err.Error()
+// 					return
+// 				}
+// 			}
+
+// 			if err == nil && edbExist.EdbInfoId > 0 {
+// 				br.Msg = edbExist.EdbName + "：" + v.EdbName + "指标名称已存在"
+// 				br.ErrMsg = "指标名称已存在，请重新填写"
+// 				br.IsSendEmail = false
+// 				return
+// 			}
+// 		}
+// 	}
+// 	if req.ChartName != "" || req.ExtraConfig != `` {
+// 		var condition string
+// 		var pars []interface{}
+// 		condition += " AND chart_info_id<>? "
+// 		pars = append(pars, req.ChartInfoId)
+
+// 		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
+// 		}
+// 	}
+
+// 	err = data_manage.EditChartBaseInfoAndEdbEnInfo(&req, chartItem, this.Lang)
+// 	if err != nil {
+// 		br.Msg = "保存失败"
+// 		br.ErrMsg = "保存失败,Err:" + err.Error()
+// 		return
+// 	}
+// 	//添加es数据
+// 	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+// 	//修改my eta es数据
+// 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
+
+// 	//edbinfo 修改es信息
+// 	for _, v := range req.ChartEdbInfoList {
+// 		edbInfoId := v.EdbInfoId
+// 		edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
+// 		if err != nil {
+// 			if err.Error() == utils.ErrNoRow() {
+// 				br.Msg = "图表不存在！"
+// 				br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoId)
+// 				return
+// 			} else {
+// 				br.Msg = "获取图表信息失败！"
+// 				br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
+// 				return
+// 			}
+// 		}
+// 		if edbInfo != nil {
+// 			go data.AddOrEditEdbInfoToEs(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
+// }
 
 // @Title 获取最新图表接口
 // @Description 获取最新图表接口

controllers/data_manage/correlation/correlation_chart_info.go

@@ -12,11 +12,12 @@ import (
 	"eta/eta_api/services/data/data_manage_permission"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 // CorrelationChartInfoController 相关性图表管理
@@ -1947,119 +1948,119 @@ func (this *CorrelationChartInfoController) Newest() {
 // @Param	request	body data_manage.EditChartInfoBaseReq true "type json string"
 // @Success Ret=200 编辑成功
 // @router /chart_info/base/edit [post]
-func (this *CorrelationChartInfoController) 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 := correlationServ.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
-}
+// func (this *CorrelationChartInfoController) 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 := correlationServ.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 多因子图表-新增

controllers/data_manage/cross_variety/chart_info.go

@@ -14,10 +14,11 @@ import (
 	"eta/eta_api/services/data/data_manage_permission"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 // ChartInfoController
@@ -1815,88 +1816,88 @@ func (c *ChartInfoController) Save() {
 // @Param	request	body data_manage.EditChartBaseInfoReq true "type json string"
 // @Success Ret=200 编辑成功
 // @router /chart_info/base/edit [post]
-func (c *ChartInfoController) BaseInfoEdit() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		c.Data["json"] = br
-		c.ServeJSON()
-	}()
-	sysUser := c.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	var req request.EditChartBaseInfoReq
-	err := json.Unmarshal(c.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, err := data_manage.GetChartInfoById(req.ChartInfoId)
-	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			br.Msg = "图表已被删除，请刷新页面"
-			br.ErrMsg = "图表已被删除，请刷新页面"
-			return
-		}
-		br.Msg = "获取图表信息失败"
-		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
-		return
-	}
-
-	err = cross_varietyModels.EditChartBase(chartItem, req, c.Lang)
-	if err != nil {
-		br.Msg = "修改失败"
-		br.ErrMsg = "更新图表英文信息失败, Err: " + err.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(c.Ctx.Input.RequestBody)
-		chartLog.Status = "编辑跨品种分析图表基础信息"
-		chartLog.Method = c.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
-}
+// func (c *ChartInfoController) BaseInfoEdit() {
+// 	br := new(models.BaseResponse).Init()
+// 	defer func() {
+// 		c.Data["json"] = br
+// 		c.ServeJSON()
+// 	}()
+// 	sysUser := c.SysUser
+// 	if sysUser == nil {
+// 		br.Msg = "请登录"
+// 		br.ErrMsg = "请登录，SysUser Is Empty"
+// 		br.Ret = 408
+// 		return
+// 	}
+// 	var req request.EditChartBaseInfoReq
+// 	err := json.Unmarshal(c.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, err := data_manage.GetChartInfoById(req.ChartInfoId)
+// 	if err != nil {
+// 		if err.Error() == utils.ErrNoRow() {
+// 			br.Msg = "图表已被删除，请刷新页面"
+// 			br.ErrMsg = "图表已被删除，请刷新页面"
+// 			return
+// 		}
+// 		br.Msg = "获取图表信息失败"
+// 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
+// 		return
+// 	}
+
+// 	err = cross_varietyModels.EditChartBase(chartItem, req, c.Lang)
+// 	if err != nil {
+// 		br.Msg = "修改失败"
+// 		br.ErrMsg = "更新图表英文信息失败, Err: " + err.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(c.Ctx.Input.RequestBody)
+// 		chartLog.Status = "编辑跨品种分析图表基础信息"
+// 		chartLog.Method = c.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
+// }

controllers/data_manage/edb_info.go

@@ -21,11 +21,12 @@ import (
 	etaTrialService "eta/eta_api/services/eta_trial"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 // EdbInfoController 数据管理
@@ -2701,136 +2702,136 @@ func (this *EdbInfoController) EdbEnInfoEdit() {
 // @Description 编辑指标基础信息接口
 // @Success 200 {object} data_manage.EditEdbBaseInfoReq
 // @router /edb_info/base/edit [post]
-func (this *EdbInfoController) EdbInfoBaseEdit() {
-	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.EditEdbBaseInfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-
-	req.EdbName = strings.Trim(req.EdbName, " ")
-	req.Unit = strings.Trim(req.Unit, " ")
-	if req.EdbInfoId <= 0 {
-		br.Msg = "参数错误"
-		br.ErrMsg = "指标id小于等于0"
-		return
-	}
-
-	edbInfo, err := data_manage.GetEdbInfoById(req.EdbInfoId)
-	if err != nil {
-		br.Msg = "获取指标信息失败"
-		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-		return
-	}
-
-	updateCols := make([]string, 0)
-
-	if req.EdbName != "" {
-		//判断指标名称是否存在
-		var condition string
-		var pars []interface{}
-
-		condition += " AND edb_info_id<>? "
-		pars = append(pars, req.EdbInfoId)
-
-		/*condition += " AND source=? "
-		pars = append(pars, edbInfo.Source)*/
-
-		switch this.Lang {
-		case utils.EnLangVersion:
-			condition += " AND edb_name_en = ? "
-			edbInfo.EdbNameEn = req.EdbName
-			edbInfo.UnitEn = req.Unit
-			edbInfo.ModifyTime = time.Now()
-			updateCols = append(updateCols, "EdbNameEn", "UnitEn", "ModifyTime")
-		default:
-			condition += " AND edb_name = ? "
-			edbInfo.EdbName = req.EdbName
-			edbInfo.EdbNameSource = req.EdbName
-			edbInfo.Unit = req.Unit
-			edbInfo.ModifyTime = time.Now()
-			updateCols = append(updateCols, "EdbName", "EdbNameSource", "Unit", "ModifyTime")
-		}
-		pars = append(pars, req.EdbName)
-
-		edbExist, err := data_manage.GetEdbInfoByCondition(condition, pars)
-		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
-				br.Msg = "判断英文指标名称是否存在失败"
-				br.ErrMsg = "判断英文指标名称是否存在失败,Err:" + err.Error()
-				return
-			}
-		}
-
-		if err == nil && edbExist.EdbInfoId > 0 {
-			br.Msg = edbExist.EdbName + "：" + req.EdbName + "指标名称已存在"
-			br.ErrMsg = "英文指标名称已存在，请重新填写"
-			br.IsSendEmail = false
-			return
-		}
-	}
-
-	if len(updateCols) > 0 {
-		err = edbInfo.Update(updateCols)
-		if err != nil {
-			br.Msg = "保存失败"
-			br.ErrMsg = "修改失败,Err:" + err.Error()
-			return
-		}
-	}
-
-	//新增操作日志
-	{
-		edbLog := new(data_manage.EdbInfoLog)
-		edbLog.EdbInfoId = edbInfo.EdbInfoId
-		edbLog.SourceName = edbInfo.SourceName
-		edbLog.Source = edbInfo.Source
-		edbLog.EdbCode = edbInfo.EdbCode
-		edbLog.EdbName = edbInfo.EdbName
-		edbLog.ClassifyId = edbInfo.ClassifyId
-		edbLog.SysUserId = sysUser.AdminId
-		edbLog.SysUserRealName = sysUser.RealName
-		edbLog.CreateTime = time.Now()
-		edbLog.Content = string(this.Ctx.Input.RequestBody)
-		edbLog.Status = "编辑指标英文信息"
-		edbLog.Method = this.Ctx.Input.URI()
-		go data_manage.AddEdbInfoLog(edbLog)
-	}
-
-	//添加es
-	data.AddOrEditEdbInfoToEs(req.EdbInfoId)
-
-	// 修改关联的预测指标基础信息
-	if edbInfo.EdbInfoType == 0 {
-		switch this.Lang {
-		case utils.EnLangVersion:
-			go data.ModifyPredictEdbEnBaseInfoBySourceEdb(edbInfo, req.Unit)
-		default:
-			go data.ModifyPredictEdbBaseInfoBySourceEdb(edbInfo, edbInfo.Frequency, req.Unit)
-
-		}
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "保存成功"
-	br.IsAddLog = true
-}
+// func (this *EdbInfoController) EdbInfoBaseEdit() {
+// 	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.EditEdbBaseInfoReq
+// 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+// 	if err != nil {
+// 		br.Msg = "参数解析异常！"
+// 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+// 		return
+// 	}
+
+// 	req.EdbName = strings.Trim(req.EdbName, " ")
+// 	req.Unit = strings.Trim(req.Unit, " ")
+// 	if req.EdbInfoId <= 0 {
+// 		br.Msg = "参数错误"
+// 		br.ErrMsg = "指标id小于等于0"
+// 		return
+// 	}
+
+// 	edbInfo, err := data_manage.GetEdbInfoById(req.EdbInfoId)
+// 	if err != nil {
+// 		br.Msg = "获取指标信息失败"
+// 		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
+// 		return
+// 	}
+
+// 	updateCols := make([]string, 0)
+
+// 	if req.EdbName != "" {
+// 		//判断指标名称是否存在
+// 		var condition string
+// 		var pars []interface{}
+
+// 		condition += " AND edb_info_id<>? "
+// 		pars = append(pars, req.EdbInfoId)
+
+// 		/*condition += " AND source=? "
+// 		pars = append(pars, edbInfo.Source)*/
+
+// 		switch this.Lang {
+// 		case utils.EnLangVersion:
+// 			condition += " AND edb_name_en = ? "
+// 			edbInfo.EdbNameEn = req.EdbName
+// 			edbInfo.UnitEn = req.Unit
+// 			edbInfo.ModifyTime = time.Now()
+// 			updateCols = append(updateCols, "EdbNameEn", "UnitEn", "ModifyTime")
+// 		default:
+// 			condition += " AND edb_name = ? "
+// 			edbInfo.EdbName = req.EdbName
+// 			edbInfo.EdbNameSource = req.EdbName
+// 			edbInfo.Unit = req.Unit
+// 			edbInfo.ModifyTime = time.Now()
+// 			updateCols = append(updateCols, "EdbName", "EdbNameSource", "Unit", "ModifyTime")
+// 		}
+// 		pars = append(pars, req.EdbName)
+
+// 		edbExist, err := data_manage.GetEdbInfoByCondition(condition, pars)
+// 		if err != nil {
+// 			if err.Error() != utils.ErrNoRow() {
+// 				br.Msg = "判断英文指标名称是否存在失败"
+// 				br.ErrMsg = "判断英文指标名称是否存在失败,Err:" + err.Error()
+// 				return
+// 			}
+// 		}
+
+// 		if err == nil && edbExist.EdbInfoId > 0 {
+// 			br.Msg = edbExist.EdbName + "：" + req.EdbName + "指标名称已存在"
+// 			br.ErrMsg = "英文指标名称已存在，请重新填写"
+// 			br.IsSendEmail = false
+// 			return
+// 		}
+// 	}
+
+// 	if len(updateCols) > 0 {
+// 		err = edbInfo.Update(updateCols)
+// 		if err != nil {
+// 			br.Msg = "保存失败"
+// 			br.ErrMsg = "修改失败,Err:" + err.Error()
+// 			return
+// 		}
+// 	}
+
+// 	//新增操作日志
+// 	{
+// 		edbLog := new(data_manage.EdbInfoLog)
+// 		edbLog.EdbInfoId = edbInfo.EdbInfoId
+// 		edbLog.SourceName = edbInfo.SourceName
+// 		edbLog.Source = edbInfo.Source
+// 		edbLog.EdbCode = edbInfo.EdbCode
+// 		edbLog.EdbName = edbInfo.EdbName
+// 		edbLog.ClassifyId = edbInfo.ClassifyId
+// 		edbLog.SysUserId = sysUser.AdminId
+// 		edbLog.SysUserRealName = sysUser.RealName
+// 		edbLog.CreateTime = time.Now()
+// 		edbLog.Content = string(this.Ctx.Input.RequestBody)
+// 		edbLog.Status = "编辑指标英文信息"
+// 		edbLog.Method = this.Ctx.Input.URI()
+// 		go data_manage.AddEdbInfoLog(edbLog)
+// 	}
+
+// 	//添加es
+// 	data.AddOrEditEdbInfoToEs(req.EdbInfoId)
+
+// 	// 修改关联的预测指标基础信息
+// 	if edbInfo.EdbInfoType == 0 {
+// 		switch this.Lang {
+// 		case utils.EnLangVersion:
+// 			go data.ModifyPredictEdbEnBaseInfoBySourceEdb(edbInfo, req.Unit)
+// 		default:
+// 			go data.ModifyPredictEdbBaseInfoBySourceEdb(edbInfo, edbInfo.Frequency, req.Unit)
+
+// 		}
+// 	}
+
+// 	br.Ret = 200
+// 	br.Success = true
+// 	br.Msg = "保存成功"
+// 	br.IsAddLog = true
+// }
 
 // EdbInfoNewest
 // @Title 获取最新指标接口

controllers/data_manage/future_good/future_good_chart_info.go

@@ -15,13 +15,14 @@ import (
 	etaTrialService "eta/eta_api/services/eta_trial"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"os"
 	"os/exec"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 // FutureGoodChartInfoController 商品价格图表管理
@@ -3067,214 +3068,214 @@ func (this *FutureGoodChartInfoController) PreviewBarChartInfo() {
 // @Param	request	body data_manage.EditChartInfoBaseReq true "type json string"
 // @Success Ret=200 编辑成功
 // @router /chart_info/base/edit [post]
-func (this *FutureGoodChartInfoController) 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
-	}
-
-	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
-	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			br.Msg = "图表已被删除，请刷新页面"
-			br.ErrMsg = "图表已被删除，请刷新页面"
-			return
-		}
-		br.Msg = "获取图表信息失败"
-		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
-		return
-	}
-
-	if !utils.InArrayByInt([]int{utils.CHART_SOURCE_FUTURE_GOOD, utils.CHART_SOURCE_FUTURE_GOOD_PROFIT}, chartItem.Source) {
-		br.Msg = "该图不是商品价格/利润曲线图！"
-		br.IsSendEmail = false
-		return
-	}
-
-	//图表操作权限
-	//ok := data.CheckOpChartPermission(sysUser, chartItem.SysUserId)
-	//if !ok {
-	//	br.Msg = "没有该图表的操作权限"
-	//	br.ErrMsg = "没有该图表的操作权限"
-	//	return
-	//}
-
-	edbInfoMapping, err := data_manage.GetEtaEdbChartEdbMapping(chartItem.ChartInfoId)
-	if err != nil {
-		br.Msg = "修改失败"
-		br.ErrMsg = "获取图表现货价格指标信息失败，指标信息失败，Err:" + err.Error()
-		return
-	}
-
-	//校验指标信息是否存在
-	edbInfo, err := data_manage.GetEdbInfoById(edbInfoMapping.EdbInfoId)
-	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			br.Msg = "图表不存在！"
-			br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
-			return
-		} else {
-			br.Msg = "获取图表信息失败！"
-			br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
-			return
-		}
-	}
-	if edbInfo == nil {
-		br.Msg = "指标不存在！"
-		br.ErrMsg = "指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
-		return
-	}
-
-	if req.ChartName != "" {
-		var condition string
-		var pars []interface{}
-		condition += " AND chart_info_id<>? "
-		pars = append(pars, req.ChartInfoId)
-
-		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 chartItem.Source {
-	case utils.CHART_SOURCE_FUTURE_GOOD:
-		err = data_manage.EditBaseFutureGoodChartInfoAndEdbEnInfo(chartItem, req.ChartName, edbInfo.EdbInfoId, req.EdbName, req.Unit, this.Lang)
-		if req.FutureGoodName != `` {
-			futureGoodEdbInfoMapping, err := data_manage.GetFutureGoodEdbChartEdbMapping(chartItem.ChartInfoId)
-			if err != nil {
-				br.Msg = "修改失败"
-				br.ErrMsg = "获取图表现货价格指标信息失败，指标信息失败，Err:" + err.Error()
-				return
-			}
-			futureGoodEdbInfo, err := future_good.GetFutureGoodEdbInfo(futureGoodEdbInfoMapping.EdbInfoId)
-			if err != nil {
-				if err.Error() == utils.ErrNoRow() {
-					br.Msg = "图表不存在！"
-					br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
-					return
-				} else {
-					br.Msg = "获取图表信息失败！"
-					br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
-					return
-				}
-			}
-			if futureGoodEdbInfo == nil {
-				br.Msg = "期货商品指标不存在！"
-				br.ErrMsg = "期货商品指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
-				return
-			}
-
-			list, _ := future_good.GetFutureGoodEdbInfoListByParentId(futureGoodEdbInfo.FutureGoodEdbInfoId)
-			for _, v := range list {
-				switch this.Lang {
-				case utils.EnLangVersion:
-					if v.FutureGoodEdbNameEn == `` {
-						v.FutureGoodEdbNameEn = strings.TrimPrefix(req.FutureGoodName, " ")
-						v.FutureGoodEdbNameEn = strings.TrimSuffix(req.FutureGoodName, " ")
-					} else {
-						v.FutureGoodEdbNameEn = strings.TrimPrefix(strings.Replace(v.FutureGoodEdbNameEn, v.FutureGoodEdbNameEn, req.FutureGoodName, -1), " ")
-						v.FutureGoodEdbNameEn = strings.TrimSuffix(req.FutureGoodName, " ")
-					}
-					v.Update([]string{"FutureGoodEdbNameEn"})
-				default:
-					if v.FutureGoodEdbName == `` {
-						v.FutureGoodEdbName = strings.TrimPrefix(req.FutureGoodName, " ")
-						v.FutureGoodEdbName = strings.TrimSuffix(req.FutureGoodName, " ")
-					} else {
-						v.FutureGoodEdbName = strings.TrimPrefix(strings.Replace(v.FutureGoodEdbName, v.FutureGoodEdbName, req.FutureGoodName, -1), " ")
-						v.FutureGoodEdbName = strings.TrimSuffix(req.FutureGoodName, " ")
-					}
-					v.Update([]string{"FutureGoodEdbName"})
-				}
-			}
-		}
-	case utils.CHART_SOURCE_FUTURE_GOOD_PROFIT:
-		err = data_manage.EditBaseFutureGoodProfitChartInfoAndEdbEnInfo(chartItem, req.ChartName, edbInfo.EdbInfoId, req.EdbName, req.Unit, req.ProfitName, this.Lang)
-	default:
-		br.Msg = "错误的图表类型"
-		br.ErrMsg = "错误的图表类型"
-		br.IsSendEmail = false
-		return
-	}
-
-	if err != nil {
-		br.Msg = "保存失败"
-		br.ErrMsg = "保存失败,Err:" + err.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
-}
+// func (this *FutureGoodChartInfoController) 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
+// 	}
+
+// 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
+// 	if err != nil {
+// 		if err.Error() == utils.ErrNoRow() {
+// 			br.Msg = "图表已被删除，请刷新页面"
+// 			br.ErrMsg = "图表已被删除，请刷新页面"
+// 			return
+// 		}
+// 		br.Msg = "获取图表信息失败"
+// 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
+// 		return
+// 	}
+
+// 	if !utils.InArrayByInt([]int{utils.CHART_SOURCE_FUTURE_GOOD, utils.CHART_SOURCE_FUTURE_GOOD_PROFIT}, chartItem.Source) {
+// 		br.Msg = "该图不是商品价格/利润曲线图！"
+// 		br.IsSendEmail = false
+// 		return
+// 	}
+
+// 	//图表操作权限
+// 	//ok := data.CheckOpChartPermission(sysUser, chartItem.SysUserId)
+// 	//if !ok {
+// 	//	br.Msg = "没有该图表的操作权限"
+// 	//	br.ErrMsg = "没有该图表的操作权限"
+// 	//	return
+// 	//}
+
+// 	edbInfoMapping, err := data_manage.GetEtaEdbChartEdbMapping(chartItem.ChartInfoId)
+// 	if err != nil {
+// 		br.Msg = "修改失败"
+// 		br.ErrMsg = "获取图表现货价格指标信息失败，指标信息失败，Err:" + err.Error()
+// 		return
+// 	}
+
+// 	//校验指标信息是否存在
+// 	edbInfo, err := data_manage.GetEdbInfoById(edbInfoMapping.EdbInfoId)
+// 	if err != nil {
+// 		if err.Error() == utils.ErrNoRow() {
+// 			br.Msg = "图表不存在！"
+// 			br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
+// 			return
+// 		} else {
+// 			br.Msg = "获取图表信息失败！"
+// 			br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
+// 			return
+// 		}
+// 	}
+// 	if edbInfo == nil {
+// 		br.Msg = "指标不存在！"
+// 		br.ErrMsg = "指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
+// 		return
+// 	}
+
+// 	if req.ChartName != "" {
+// 		var condition string
+// 		var pars []interface{}
+// 		condition += " AND chart_info_id<>? "
+// 		pars = append(pars, req.ChartInfoId)
+
+// 		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 chartItem.Source {
+// 	case utils.CHART_SOURCE_FUTURE_GOOD:
+// 		err = data_manage.EditBaseFutureGoodChartInfoAndEdbEnInfo(chartItem, req.ChartName, edbInfo.EdbInfoId, req.EdbName, req.Unit, this.Lang)
+// 		if req.FutureGoodName != `` {
+// 			futureGoodEdbInfoMapping, err := data_manage.GetFutureGoodEdbChartEdbMapping(chartItem.ChartInfoId)
+// 			if err != nil {
+// 				br.Msg = "修改失败"
+// 				br.ErrMsg = "获取图表现货价格指标信息失败，指标信息失败，Err:" + err.Error()
+// 				return
+// 			}
+// 			futureGoodEdbInfo, err := future_good.GetFutureGoodEdbInfo(futureGoodEdbInfoMapping.EdbInfoId)
+// 			if err != nil {
+// 				if err.Error() == utils.ErrNoRow() {
+// 					br.Msg = "图表不存在！"
+// 					br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
+// 					return
+// 				} else {
+// 					br.Msg = "获取图表信息失败！"
+// 					br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
+// 					return
+// 				}
+// 			}
+// 			if futureGoodEdbInfo == nil {
+// 				br.Msg = "期货商品指标不存在！"
+// 				br.ErrMsg = "期货商品指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
+// 				return
+// 			}
+
+// 			list, _ := future_good.GetFutureGoodEdbInfoListByParentId(futureGoodEdbInfo.FutureGoodEdbInfoId)
+// 			for _, v := range list {
+// 				switch this.Lang {
+// 				case utils.EnLangVersion:
+// 					if v.FutureGoodEdbNameEn == `` {
+// 						v.FutureGoodEdbNameEn = strings.TrimPrefix(req.FutureGoodName, " ")
+// 						v.FutureGoodEdbNameEn = strings.TrimSuffix(req.FutureGoodName, " ")
+// 					} else {
+// 						v.FutureGoodEdbNameEn = strings.TrimPrefix(strings.Replace(v.FutureGoodEdbNameEn, v.FutureGoodEdbNameEn, req.FutureGoodName, -1), " ")
+// 						v.FutureGoodEdbNameEn = strings.TrimSuffix(req.FutureGoodName, " ")
+// 					}
+// 					v.Update([]string{"FutureGoodEdbNameEn"})
+// 				default:
+// 					if v.FutureGoodEdbName == `` {
+// 						v.FutureGoodEdbName = strings.TrimPrefix(req.FutureGoodName, " ")
+// 						v.FutureGoodEdbName = strings.TrimSuffix(req.FutureGoodName, " ")
+// 					} else {
+// 						v.FutureGoodEdbName = strings.TrimPrefix(strings.Replace(v.FutureGoodEdbName, v.FutureGoodEdbName, req.FutureGoodName, -1), " ")
+// 						v.FutureGoodEdbName = strings.TrimSuffix(req.FutureGoodName, " ")
+// 					}
+// 					v.Update([]string{"FutureGoodEdbName"})
+// 				}
+// 			}
+// 		}
+// 	case utils.CHART_SOURCE_FUTURE_GOOD_PROFIT:
+// 		err = data_manage.EditBaseFutureGoodProfitChartInfoAndEdbEnInfo(chartItem, req.ChartName, edbInfo.EdbInfoId, req.EdbName, req.Unit, req.ProfitName, this.Lang)
+// 	default:
+// 		br.Msg = "错误的图表类型"
+// 		br.ErrMsg = "错误的图表类型"
+// 		br.IsSendEmail = false
+// 		return
+// 	}
+
+// 	if err != nil {
+// 		br.Msg = "保存失败"
+// 		br.ErrMsg = "保存失败,Err:" + err.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
+// }

controllers/data_manage/line_equation/line_chart_info.go

@@ -13,10 +13,11 @@ import (
 	"eta/eta_api/services/data/line_equation"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 // LineEquationChartInfoController 拟合方程图表管理
@@ -1671,117 +1672,117 @@ func (this *LineEquationChartInfoController) SearchByEs() {
 // @Param	request	body data_manage.EditChartBaseInfoReq true "type json string"
 // @Success Ret=200 编辑成功
 // @router /chart_info/base/edit [post]
-func (this *LineEquationChartInfoController) 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.EditChartBaseInfoReq
-	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, err := data_manage.GetChartInfoById(req.ChartInfoId)
-	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			br.Msg = "图表已被删除，请刷新页面"
-			br.ErrMsg = "图表已被删除，请刷新页面"
-			return
-		}
-		br.Msg = "获取图表信息失败"
-		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
-		return
-	}
-
-	// 校验名称是否有重复
-	{
-		var condition string
-		var pars []interface{}
-		condition += " AND chart_info_id <> ? AND source = ? "
-		pars = append(pars, req.ChartInfoId, utils.CHART_SOURCE_LINE_EQUATION)
-		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
-}
+// func (this *LineEquationChartInfoController) 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.EditChartBaseInfoReq
+// 	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, err := data_manage.GetChartInfoById(req.ChartInfoId)
+// 	if err != nil {
+// 		if err.Error() == utils.ErrNoRow() {
+// 			br.Msg = "图表已被删除，请刷新页面"
+// 			br.ErrMsg = "图表已被删除，请刷新页面"
+// 			return
+// 		}
+// 		br.Msg = "获取图表信息失败"
+// 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
+// 		return
+// 	}
+
+// 	// 校验名称是否有重复
+// 	{
+// 		var condition string
+// 		var pars []interface{}
+// 		condition += " AND chart_info_id <> ? AND source = ? "
+// 		pars = append(pars, req.ChartInfoId, utils.CHART_SOURCE_LINE_EQUATION)
+// 		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
+// }

controllers/data_manage/line_feature/chart_info.go

@@ -14,10 +14,11 @@ import (
 	lineFeatureServ "eta/eta_api/services/data/line_feature"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 // LineFeaturesChartInfoController 统计特征图表管理
@@ -2803,119 +2804,119 @@ func (this *LineFeaturesChartInfoController) SearchByEs() {
 // @Param	request	body data_manage.EditChartInfoBaseReq true "type json string"
 // @Success Ret=200 编辑成功
 // @router /chart_info/base/edit [post]
-func (this *LineFeaturesChartInfoController) 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, err := data_manage.GetChartInfoById(req.ChartInfoId)
-	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			br.Msg = "图表已被删除，请刷新页面"
-			br.ErrMsg = "图表已被删除，请刷新页面"
-			return
-		}
-		br.Msg = "获取图表信息失败"
-		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
-		return
-	}
-
-	// 校验名称是否有重复
-	{
-		var condition string
-		var pars []interface{}
-		condition += " AND chart_info_id <> ? AND source in (?,?,?) "
-		pars = append(pars, req.ChartInfoId, utils.CHART_SOURCE_LINE_FEATURE_STANDARD_DEVIATION, utils.CHART_SOURCE_LINE_FEATURE_PERCENTILE, utils.CHART_SOURCE_LINE_FEATURE_FREQUENCY)
-
-		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
-}
+// func (this *LineFeaturesChartInfoController) 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, err := data_manage.GetChartInfoById(req.ChartInfoId)
+// 	if err != nil {
+// 		if err.Error() == utils.ErrNoRow() {
+// 			br.Msg = "图表已被删除，请刷新页面"
+// 			br.ErrMsg = "图表已被删除，请刷新页面"
+// 			return
+// 		}
+// 		br.Msg = "获取图表信息失败"
+// 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
+// 		return
+// 	}
+
+// 	// 校验名称是否有重复
+// 	{
+// 		var condition string
+// 		var pars []interface{}
+// 		condition += " AND chart_info_id <> ? AND source in (?,?,?) "
+// 		pars = append(pars, req.ChartInfoId, utils.CHART_SOURCE_LINE_FEATURE_STANDARD_DEVIATION, utils.CHART_SOURCE_LINE_FEATURE_PERCENTILE, utils.CHART_SOURCE_LINE_FEATURE_FREQUENCY)
+
+// 		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
+// }

routers/commentsRouter.go

@@ -151,15 +151,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/correlation:CorrelationChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/correlation:CorrelationChartInfoController"],
-        beego.ControllerComments{
-            Method: "BaseInfoEdit",
-            Router: `/chart_info/base/edit`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/correlation:CorrelationChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/correlation:CorrelationChartInfoController"],
         beego.ControllerComments{
             Method: "Copy",
@@ -295,15 +286,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/cross_variety:ChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/cross_variety:ChartInfoController"],
-        beego.ControllerComments{
-            Method: "BaseInfoEdit",
-            Router: `/chart_info/base/edit`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/cross_variety:ChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/cross_variety:ChartInfoController"],
         beego.ControllerComments{
             Method: "Copy",
@@ -1249,15 +1231,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/future_good:FutureGoodChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/future_good:FutureGoodChartInfoController"],
-        beego.ControllerComments{
-            Method: "BaseInfoEdit",
-            Router: `/chart_info/base/edit`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/future_good:FutureGoodChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/future_good:FutureGoodChartInfoController"],
         beego.ControllerComments{
             Method: "ChartInfoBase64Upload",
@@ -1537,15 +1510,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/line_equation:LineEquationChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/line_equation:LineEquationChartInfoController"],
-        beego.ControllerComments{
-            Method: "BaseInfoEdit",
-            Router: `/chart_info/base/edit`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/line_equation:LineEquationChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/line_equation:LineEquationChartInfoController"],
         beego.ControllerComments{
             Method: "Copy",
@@ -1717,15 +1681,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/line_feature:LineFeaturesChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/line_feature:LineFeaturesChartInfoController"],
-        beego.ControllerComments{
-            Method: "BaseInfoEdit",
-            Router: `/chart_info/base/edit`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/line_feature:LineFeaturesChartInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/line_feature:LineFeaturesChartInfoController"],
         beego.ControllerComments{
             Method: "Copy",
@@ -2302,15 +2257,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: "ChartInfoBaseEdit",
-            Router: `/chart_info/base/edit`,
-            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: "ChartInfoBase64Upload",
@@ -3373,15 +3319,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
-        beego.ControllerComments{
-            Method: "EdbInfoBaseEdit",
-            Router: `/edb_info/base/edit`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
         beego.ControllerComments{
             Method: "EdbInfoBatchAdd",