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

controllers/data_manage/chart_info.go

@@ -533,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() {
+func (this *ChartInfoController) ChartInfoBaseEdit() {
-// 	br := new(models.BaseResponse).Init()
+	br := new(models.BaseResponse).Init()
-// 	defer func() {
+	defer func() {
-// 		this.Data["json"] = br
+		this.Data["json"] = br
-// 		this.ServeJSON()
+		this.ServeJSON()
-// 	}()
+	}()
-
+
-// 	sysUser := this.SysUser
+	sysUser := this.SysUser
-// 	if sysUser == nil {
+	if sysUser == nil {
-// 		br.Msg = "请登录"
+		br.Msg = "请登录"
-// 		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.ErrMsg = "请登录，SysUser Is Empty"
-// 		br.Ret = 408
+		br.Ret = 408
-// 		return
+		return
-// 	}
+	}
-
+
-// 	var req data_manage.EditChartInfoBaseReq
+	var req data_manage.EditChartInfoBaseReq
-// 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-// 	if err != nil {
+	if err != nil {
-// 		br.Msg = "参数解析异常！"
+		br.Msg = "参数解析异常！"
-// 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-// 		return
+		return
-// 	}
+	}
-// 	req.ChartName = strings.Trim(req.ChartName, " ")
+	req.ChartName = strings.Trim(req.ChartName, " ")
-// 	if req.ChartInfoId <= 0 {
+	if req.ChartInfoId <= 0 {
-// 		br.Msg = "请选择图表"
+		br.Msg = "请选择图表"
-// 		return
+		return
-// 	}
+	}
-
+
-// 	//判断指标名称是否存在
+	//判断指标名称是否存在
-// 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
+	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
-// 	if err != nil {
+	if err != nil {
-// 		if err.Error() == utils.ErrNoRow() {
+		if err.Error() == utils.ErrNoRow() {
-// 			br.Msg = "图表已被删除，请刷新页面"
+			br.Msg = "图表已被删除，请刷新页面"
-// 			br.ErrMsg = "图表已被删除，请刷新页面"
+			br.ErrMsg = "图表已被删除，请刷新页面"
-// 			return
+			return
-// 		}
+		}
-// 		br.Msg = "获取图表信息失败"
+		br.Msg = "获取图表信息失败"
-// 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
+		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
-// 		return
+		return
-// 	}
+	}
-
+
-// 	// 判断是否有传入对应的指标配置
+	// 判断是否有传入对应的指标配置
-// 	noEdbInfoType := []int{10}
+	noEdbInfoType := []int{10}
-// 	if len(req.ChartEdbInfoList) <= 0 && !utils.InArrayByInt(noEdbInfoType, chartItem.ChartType) {
+	if len(req.ChartEdbInfoList) <= 0 && !utils.InArrayByInt(noEdbInfoType, chartItem.ChartType) {
-// 		br.Msg = "请选择指标！"
+		br.Msg = "请选择指标！"
-// 		return
+		return
-// 	}
+	}
-
+
-// 	var edbCondition string
+	var edbCondition string
-// 	var edbPars []interface{}
+	var edbPars []interface{}
-// 	for _, v := range req.ChartEdbInfoList {
+	for _, v := range req.ChartEdbInfoList {
-// 		edbInfoId := v.EdbInfoId
+		edbInfoId := v.EdbInfoId
-// 		edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
+		edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
-// 		if err != nil {
+		if err != nil {
-// 			if err.Error() == utils.ErrNoRow() {
+			if err.Error() == utils.ErrNoRow() {
-// 				br.Msg = "图表不存在！"
+				br.Msg = "图表不存在！"
-// 				br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoId)
+				br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoId)
-// 				return
+				return
-// 			} else {
+			} else {
-// 				br.Msg = "获取图表信息失败！"
+				br.Msg = "获取图表信息失败！"
-// 				br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
+				br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
-// 				return
+				return
-// 			}
+			}
-// 		}
+		}
-// 		if edbInfo == nil {
+		if edbInfo == nil {
-// 			br.Msg = "指标不存在！"
+			br.Msg = "指标不存在！"
-// 			br.ErrMsg = "指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoId)
+			br.ErrMsg = "指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoId)
-// 			return
+			return
-// 		}
+		}
-
+
-// 		//判断指标名称是否重复
+		//判断指标名称是否重复
-// 		if v.EdbName != "" {
+		if v.EdbName != "" {
-// 			edbCondition = ""
+			edbCondition = ""
-// 			edbPars = make([]interface{}, 0)
+			edbPars = make([]interface{}, 0)
-
+
-// 			edbCondition += " AND edb_info_id<>? "
+			edbCondition += " AND edb_info_id<>? "
-// 			edbPars = append(edbPars, edbInfo.EdbInfoId)
+			edbPars = append(edbPars, edbInfo.EdbInfoId)
-
+
-// 			switch this.Lang {
+			switch this.Lang {
-// 			case utils.EnLangVersion:
+			case utils.EnLangVersion:
-// 				edbCondition += " AND edb_name_en =? "
+				edbCondition += " AND edb_name_en =? "
-// 			default:
+			default:
-// 				edbCondition += " AND edb_name =? "
+				edbCondition += " AND edb_name =? "
-// 			}
+			}
-
+
-// 			edbPars = append(edbPars, v.EdbName)
+			edbPars = append(edbPars, v.EdbName)
-
+
-// 			edbExist, err := data_manage.GetEdbInfoByCondition(edbCondition, edbPars)
+			edbExist, err := data_manage.GetEdbInfoByCondition(edbCondition, edbPars)
-// 			if err != nil {
+			if err != nil {
-// 				if err.Error() != utils.ErrNoRow() {
+				if err.Error() != utils.ErrNoRow() {
-// 					br.Msg = "判断英文指标名称是否存在失败"
+					br.Msg = "判断英文指标名称是否存在失败"
-// 					br.ErrMsg = "判断英文指标名称是否存在失败,Err:" + err.Error()
+					br.ErrMsg = "判断英文指标名称是否存在失败,Err:" + err.Error()
-// 					return
+					return
-// 				}
+				}
-// 			}
+			}
-
+
-// 			if err == nil && edbExist.EdbInfoId > 0 {
+			if err == nil && edbExist.EdbInfoId > 0 {
-// 				br.Msg = edbExist.EdbName + "：" + v.EdbName + "指标名称已存在"
+				br.Msg = edbExist.EdbName + "：" + v.EdbName + "指标名称已存在"
-// 				br.ErrMsg = "指标名称已存在，请重新填写"
+				br.ErrMsg = "指标名称已存在，请重新填写"
-// 				br.IsSendEmail = false
+				br.IsSendEmail = false
-// 				return
+				return
-// 			}
+			}
-// 		}
+		}
-// 	}
+	}
-// 	if req.ChartName != "" || req.ExtraConfig != `` {
+	if req.ChartName != "" || req.ExtraConfig != `` {
-// 		var condition string
+		var condition string
-// 		var pars []interface{}
+		var pars []interface{}
-// 		condition += " AND chart_info_id<>? "
+		condition += " AND chart_info_id<>? "
-// 		pars = append(pars, req.ChartInfoId)
+		pars = append(pars, req.ChartInfoId)
-
+
-// 		switch this.Lang {
+		switch this.Lang {
-// 		case utils.EnLangVersion:
+		case utils.EnLangVersion:
-// 			condition += " AND chart_name_en = ? "
+			condition += " AND chart_name_en = ? "
-// 		default:
+		default:
-// 			condition += " AND chart_name = ? "
+			condition += " AND chart_name = ? "
-// 		}
+		}
-
+
-// 		pars = append(pars, req.ChartName)
+		pars = append(pars, req.ChartName)
-
+
-// 		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
+		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-// 		if err != nil {
+		if err != nil {
-// 			if err.Error() != utils.ErrNoRow() {
+			if err.Error() != utils.ErrNoRow() {
-// 				br.Msg = "判断英文图表名称是否存在失败"
+				br.Msg = "判断英文图表名称是否存在失败"
-// 				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
+				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
-// 				return
+				return
-// 			}
+			}
-// 		}
+		}
-
+
-// 		if err == nil && existItem.ChartInfoId > 0 {
+		if err == nil && existItem.ChartInfoId > 0 {
-// 			br.Msg = existItem.ChartName + "：" + req.ChartName + "图表名称已存在"
+			br.Msg = existItem.ChartName + "：" + req.ChartName + "图表名称已存在"
-// 			return
+			return
-// 		}
+		}
-// 	}
+	}
-
+
-// 	err = data_manage.EditChartBaseInfoAndEdbEnInfo(&req, chartItem, this.Lang)
+	err = data_manage.EditChartBaseInfoAndEdbEnInfo(&req, chartItem, this.Lang)
-// 	if err != nil {
+	if err != nil {
-// 		br.Msg = "保存失败"
+		br.Msg = "保存失败"
-// 		br.ErrMsg = "保存失败,Err:" + err.Error()
+		br.ErrMsg = "保存失败,Err:" + err.Error()
-// 		return
+		return
-// 	}
+	}
-// 	//添加es数据
+	//添加es数据
-// 	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
-// 	//修改my eta es数据
+	//修改my eta es数据
-// 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
+	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
-
+
-// 	//edbinfo 修改es信息
+	//edbinfo 修改es信息
-// 	for _, v := range req.ChartEdbInfoList {
+	for _, v := range req.ChartEdbInfoList {
-// 		edbInfoId := v.EdbInfoId
+		edbInfoId := v.EdbInfoId
-// 		edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
+		edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
-// 		if err != nil {
+		if err != nil {
-// 			if err.Error() == utils.ErrNoRow() {
+			if err.Error() == utils.ErrNoRow() {
-// 				br.Msg = "图表不存在！"
+				br.Msg = "图表不存在！"
-// 				br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoId)
+				br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoId)
-// 				return
+				return
-// 			} else {
+			} else {
-// 				br.Msg = "获取图表信息失败！"
+				br.Msg = "获取图表信息失败！"
-// 				br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
+				br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
-// 				return
+				return
-// 			}
+			}
-// 		}
+		}
-// 		if edbInfo != nil {
+		if edbInfo != nil {
-// 			go data.AddOrEditEdbInfoToEs(edbInfoId)
+			go data.AddOrEditEdbInfoToEs(edbInfoId)
-// 		}
+		}
-// 	}
+	}
-
+
-// 	//新增操作日志
+	//新增操作日志
-// 	{
+	{
-// 		chartLog := new(data_manage.ChartInfoLog)
+		chartLog := new(data_manage.ChartInfoLog)
-// 		chartLog.ChartName = chartItem.ChartName
+		chartLog.ChartName = chartItem.ChartName
-// 		chartLog.ChartInfoId = req.ChartInfoId
+		chartLog.ChartInfoId = req.ChartInfoId
-// 		chartLog.ChartClassifyId = chartItem.ChartClassifyId
+		chartLog.ChartClassifyId = chartItem.ChartClassifyId
-// 		chartLog.SysUserId = sysUser.AdminId
+		chartLog.SysUserId = sysUser.AdminId
-// 		chartLog.SysUserRealName = sysUser.RealName
+		chartLog.SysUserRealName = sysUser.RealName
-// 		chartLog.UniqueCode = chartItem.UniqueCode
+		chartLog.UniqueCode = chartItem.UniqueCode
-// 		chartLog.CreateTime = time.Now()
+		chartLog.CreateTime = time.Now()
-// 		chartLog.Content = string(this.Ctx.Input.RequestBody)
+		chartLog.Content = string(this.Ctx.Input.RequestBody)
-// 		chartLog.Status = "编辑图表英文信息"
+		chartLog.Status = "编辑图表英文信息"
-// 		chartLog.Method = this.Ctx.Input.URL()
+		chartLog.Method = this.Ctx.Input.URL()
-// 		go data_manage.AddChartInfoLog(chartLog)
+		go data_manage.AddChartInfoLog(chartLog)
-// 	}
+	}
-// 	//清除缓存
+	//清除缓存
-// 	if utils.Re == nil && utils.Rc != nil {
+	if utils.Re == nil && utils.Rc != nil {
-// 		utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
+		utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
-// 		utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))
+		utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))
-// 	}
+	}
-
+
-// 	br.Ret = 200
+	br.Ret = 200
-// 	br.Success = true
+	br.Success = true
-// 	br.Msg = "编辑成功"
+	br.Msg = "编辑成功"
-// 	br.IsAddLog = true
+	br.IsAddLog = true
-// }
+}
 
 // @Title 获取最新图表接口
 // @Description 获取最新图表接口

controllers/data_manage/correlation/correlation_chart_info.go

@@ -1950,119 +1950,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() {
+func (this *CorrelationChartInfoController) BaseInfoEdit() {
-// 	br := new(models.BaseResponse).Init()
+	br := new(models.BaseResponse).Init()
-// 	defer func() {
+	defer func() {
-// 		this.Data["json"] = br
+		this.Data["json"] = br
-// 		this.ServeJSON()
+		this.ServeJSON()
-// 	}()
+	}()
-// 	sysUser := this.SysUser
+	sysUser := this.SysUser
-// 	if sysUser == nil {
+	if sysUser == nil {
-// 		br.Msg = "请登录"
+		br.Msg = "请登录"
-// 		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.ErrMsg = "请登录，SysUser Is Empty"
-// 		br.Ret = 408
+		br.Ret = 408
-// 		return
+		return
-// 	}
+	}
-// 	var req request.EditChartInfoBaseReq
+	var req request.EditChartInfoBaseReq
-// 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-// 	if err != nil {
+	if err != nil {
-// 		br.Msg = "参数解析异常！"
+		br.Msg = "参数解析异常！"
-// 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-// 		return
+		return
-// 	}
+	}
-// 	req.ChartName = strings.Trim(req.ChartName, " ")
+	req.ChartName = strings.Trim(req.ChartName, " ")
-// 	if req.ChartInfoId <= 0 {
+	if req.ChartInfoId <= 0 {
-// 		br.Msg = "请选择图表"
+		br.Msg = "请选择图表"
-// 		return
+		return
-// 	}
+	}
-// 	if req.ChartName == "" {
+	if req.ChartName == "" {
-// 		br.Msg = "请输入图表名称"
+		br.Msg = "请输入图表名称"
-// 		return
+		return
-// 	}
+	}
-
+
-// 	chartItem, _, tips, e := correlationServ.GetChartAndCorrelationInfo(req.ChartInfoId)
+	chartItem, _, tips, e := correlationServ.GetChartAndCorrelationInfo(req.ChartInfoId)
-// 	if e != nil {
+	if e != nil {
-// 		if tips != "" {
+		if tips != "" {
-// 			br.Msg = tips
+			br.Msg = tips
-// 			return
+			return
-// 		}
+		}
-// 		br.Msg = "操作失败"
+		br.Msg = "操作失败"
-// 		br.ErrMsg = "获取图表信息失败, Err: " + e.Error()
+		br.ErrMsg = "获取图表信息失败, Err: " + e.Error()
-// 		return
+		return
-// 	}
+	}
-
+
-// 	var condition string
+	var condition string
-// 	var pars []interface{}
+	var pars []interface{}
-
+
-// 	condition += " AND chart_info_id <> ? AND source = ? "
+	condition += " AND chart_info_id <> ? AND source = ? "
-// 	pars = append(pars, req.ChartInfoId, utils.CHART_SOURCE_CORRELATION)
+	pars = append(pars, req.ChartInfoId, utils.CHART_SOURCE_CORRELATION)
-
+
-// 	switch this.Lang {
+	switch this.Lang {
-// 	case utils.EnLangVersion:
+	case utils.EnLangVersion:
-// 		condition += " AND chart_name_en = ? "
+		condition += " AND chart_name_en = ? "
-// 	default:
+	default:
-// 		condition += " AND chart_name = ? "
+		condition += " AND chart_name = ? "
-// 	}
+	}
-// 	pars = append(pars, req.ChartName)
+	pars = append(pars, req.ChartName)
-// 	existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
+	existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-// 	if err != nil {
+	if err != nil {
-// 		if err.Error() != utils.ErrNoRow() {
+		if err.Error() != utils.ErrNoRow() {
-// 			br.Msg = "判断英文图表名称是否存在失败"
+			br.Msg = "判断英文图表名称是否存在失败"
-// 			br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
+			br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
-// 			return
+			return
-// 		}
+		}
-// 	}
+	}
-// 	if err == nil && existItem.ChartInfoId > 0 {
+	if err == nil && existItem.ChartInfoId > 0 {
-// 		br.Msg = existItem.ChartName + "：" + req.ChartName + "图表名称已存在"
+		br.Msg = existItem.ChartName + "：" + req.ChartName + "图表名称已存在"
-// 		return
+		return
-// 	}
+	}
-
+
-// 	switch this.Lang {
+	switch this.Lang {
-// 	case utils.EnLangVersion:
+	case utils.EnLangVersion:
-// 		chartItem.ChartNameEn = req.ChartName
+		chartItem.ChartNameEn = req.ChartName
-// 	default:
+	default:
-// 		chartItem.ChartName = req.ChartName
+		chartItem.ChartName = req.ChartName
-// 	}
+	}
-
+
-// 	chartItem.ModifyTime = time.Now().Local()
+	chartItem.ModifyTime = time.Now().Local()
-// 	if e := chartItem.Update([]string{"ChartName", "ChartNameEn", "ModifyTime"}); e != nil {
+	if e := chartItem.Update([]string{"ChartName", "ChartNameEn", "ModifyTime"}); e != nil {
-// 		br.Msg = "操作失败"
+		br.Msg = "操作失败"
-// 		br.ErrMsg = "更新图表信息失败, Err: " + e.Error()
+		br.ErrMsg = "更新图表信息失败, Err: " + e.Error()
-// 		return
+		return
-// 	}
+	}
-
+
-// 	//添加es数据
+	//添加es数据
-// 	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
-// 	//修改my eta es数据
+	//修改my eta es数据
-// 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
+	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
-
+
-// 	//新增操作日志
+	//新增操作日志
-// 	{
+	{
-// 		chartLog := new(data_manage.ChartInfoLog)
+		chartLog := new(data_manage.ChartInfoLog)
-// 		chartLog.ChartName = chartItem.ChartName
+		chartLog.ChartName = chartItem.ChartName
-// 		chartLog.ChartInfoId = req.ChartInfoId
+		chartLog.ChartInfoId = req.ChartInfoId
-// 		chartLog.ChartClassifyId = chartItem.ChartClassifyId
+		chartLog.ChartClassifyId = chartItem.ChartClassifyId
-// 		chartLog.SysUserId = sysUser.AdminId
+		chartLog.SysUserId = sysUser.AdminId
-// 		chartLog.SysUserRealName = sysUser.RealName
+		chartLog.SysUserRealName = sysUser.RealName
-// 		chartLog.UniqueCode = chartItem.UniqueCode
+		chartLog.UniqueCode = chartItem.UniqueCode
-// 		chartLog.CreateTime = time.Now()
+		chartLog.CreateTime = time.Now()
-// 		chartLog.Content = string(this.Ctx.Input.RequestBody)
+		chartLog.Content = string(this.Ctx.Input.RequestBody)
-// 		chartLog.Status = "编辑相关性图表基础信息"
+		chartLog.Status = "编辑相关性图表基础信息"
-// 		chartLog.Method = this.Ctx.Input.URL()
+		chartLog.Method = this.Ctx.Input.URL()
-// 		go data_manage.AddChartInfoLog(chartLog)
+		go data_manage.AddChartInfoLog(chartLog)
-// 	}
+	}
-
+
-// 	// 清除缓存
+	// 清除缓存
-// 	if utils.Re == nil && utils.Rc != nil {
+	if utils.Re == nil && utils.Rc != nil {
-// 		_ = utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
+		_ = utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
-// 		_ = utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))
+		_ = utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))
-// 	}
+	}
-
+
-// 	br.Ret = 200
+	br.Ret = 200
-// 	br.Success = true
+	br.Success = true
-// 	br.Msg = "编辑成功"
+	br.Msg = "编辑成功"
-// 	br.IsAddLog = true
+	br.IsAddLog = true
-// }
+}
 
 // MultiFactorAdd
 // @Title 多因子图表-新增

controllers/data_manage/cross_variety/chart_info.go

@@ -1818,88 +1818,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() {
+func (c *ChartInfoController) BaseInfoEdit() {
-// 	br := new(models.BaseResponse).Init()
+	br := new(models.BaseResponse).Init()
-// 	defer func() {
+	defer func() {
-// 		c.Data["json"] = br
+		c.Data["json"] = br
-// 		c.ServeJSON()
+		c.ServeJSON()
-// 	}()
+	}()
-// 	sysUser := c.SysUser
+	sysUser := c.SysUser
-// 	if sysUser == nil {
+	if sysUser == nil {
-// 		br.Msg = "请登录"
+		br.Msg = "请登录"
-// 		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.ErrMsg = "请登录，SysUser Is Empty"
-// 		br.Ret = 408
+		br.Ret = 408
-// 		return
+		return
-// 	}
+	}
-// 	var req request.EditChartBaseInfoReq
+	var req request.EditChartBaseInfoReq
-// 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
-// 	if err != nil {
+	if err != nil {
-// 		br.Msg = "参数解析异常！"
+		br.Msg = "参数解析异常！"
-// 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-// 		return
+		return
-// 	}
+	}
-// 	req.ChartName = strings.Trim(req.ChartName, " ")
+	req.ChartName = strings.Trim(req.ChartName, " ")
-// 	if req.ChartInfoId <= 0 {
+	if req.ChartInfoId <= 0 {
-// 		br.Msg = "请选择图表"
+		br.Msg = "请选择图表"
-// 		return
+		return
-// 	}
+	}
-// 	if req.ChartName == "" {
+	if req.ChartName == "" {
-// 		br.Msg = "请输入图表名称"
+		br.Msg = "请输入图表名称"
-// 		return
+		return
-// 	}
+	}
-
+
-// 	//判断指标名称是否存在
+	//判断指标名称是否存在
-// 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
+	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
-// 	if err != nil {
+	if err != nil {
-// 		if err.Error() == utils.ErrNoRow() {
+		if err.Error() == utils.ErrNoRow() {
-// 			br.Msg = "图表已被删除，请刷新页面"
+			br.Msg = "图表已被删除，请刷新页面"
-// 			br.ErrMsg = "图表已被删除，请刷新页面"
+			br.ErrMsg = "图表已被删除，请刷新页面"
-// 			return
+			return
-// 		}
+		}
-// 		br.Msg = "获取图表信息失败"
+		br.Msg = "获取图表信息失败"
-// 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
+		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
-// 		return
+		return
-// 	}
+	}
-
+
-// 	err = cross_varietyModels.EditChartBase(chartItem, req, c.Lang)
+	err = cross_varietyModels.EditChartBase(chartItem, req, c.Lang)
-// 	if err != nil {
+	if err != nil {
-// 		br.Msg = "修改失败"
+		br.Msg = "修改失败"
-// 		br.ErrMsg = "更新图表英文信息失败, Err: " + err.Error()
+		br.ErrMsg = "更新图表英文信息失败, Err: " + err.Error()
-// 		return
+		return
-// 	}
+	}
-
+
-// 	//添加es数据
+	//添加es数据
-// 	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
-// 	//修改my eta es数据
+	//修改my eta es数据
-// 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
+	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
-
+
-// 	//指标 修改es信息
+	//指标 修改es信息
-// 	//go data.AddOrEditEdbInfoToEs(edbInfo.EdbInfoId)
+	//go data.AddOrEditEdbInfoToEs(edbInfo.EdbInfoId)
-
+
-// 	//新增操作日志
+	//新增操作日志
-// 	{
+	{
-// 		chartLog := new(data_manage.ChartInfoLog)
+		chartLog := new(data_manage.ChartInfoLog)
-// 		chartLog.ChartName = chartItem.ChartName
+		chartLog.ChartName = chartItem.ChartName
-// 		chartLog.ChartInfoId = req.ChartInfoId
+		chartLog.ChartInfoId = req.ChartInfoId
-// 		chartLog.ChartClassifyId = chartItem.ChartClassifyId
+		chartLog.ChartClassifyId = chartItem.ChartClassifyId
-// 		chartLog.SysUserId = sysUser.AdminId
+		chartLog.SysUserId = sysUser.AdminId
-// 		chartLog.SysUserRealName = sysUser.RealName
+		chartLog.SysUserRealName = sysUser.RealName
-// 		chartLog.UniqueCode = chartItem.UniqueCode
+		chartLog.UniqueCode = chartItem.UniqueCode
-// 		chartLog.CreateTime = time.Now()
+		chartLog.CreateTime = time.Now()
-// 		chartLog.Content = string(c.Ctx.Input.RequestBody)
+		chartLog.Content = string(c.Ctx.Input.RequestBody)
-// 		chartLog.Status = "编辑跨品种分析图表基础信息"
+		chartLog.Status = "编辑跨品种分析图表基础信息"
-// 		chartLog.Method = c.Ctx.Input.URL()
+		chartLog.Method = c.Ctx.Input.URL()
-// 		go data_manage.AddChartInfoLog(chartLog)
+		go data_manage.AddChartInfoLog(chartLog)
-// 	}
+	}
-
+
-// 	// 清除缓存
+	// 清除缓存
-// 	if utils.Re == nil && utils.Rc != nil {
+	if utils.Re == nil && utils.Rc != nil {
-// 		_ = utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
+		_ = utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
-// 		_ = utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))
+		_ = utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))
-// 	}
+	}
-
+
-// 	br.Ret = 200
+	br.Ret = 200
-// 	br.Success = true
+	br.Success = true
-// 	br.Msg = "编辑成功"
+	br.Msg = "编辑成功"
-// 	br.IsAddLog = true
+	br.IsAddLog = true
-// }
+}

controllers/data_manage/edb_info.go

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

controllers/data_manage/future_good/future_good_chart_info.go

@@ -3070,214 +3070,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() {
+func (this *FutureGoodChartInfoController) BaseInfoEdit() {
-// 	br := new(models.BaseResponse).Init()
+	br := new(models.BaseResponse).Init()
-// 	defer func() {
+	defer func() {
-// 		this.Data["json"] = br
+		this.Data["json"] = br
-// 		this.ServeJSON()
+		this.ServeJSON()
-// 	}()
+	}()
-
+
-// 	sysUser := this.SysUser
+	sysUser := this.SysUser
-// 	if sysUser == nil {
+	if sysUser == nil {
-// 		br.Msg = "请登录"
+		br.Msg = "请登录"
-// 		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.ErrMsg = "请登录，SysUser Is Empty"
-// 		br.Ret = 408
+		br.Ret = 408
-// 		return
+		return
-// 	}
+	}
-
+
-// 	var req request.EditChartInfoBaseReq
+	var req request.EditChartInfoBaseReq
-// 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-// 	if err != nil {
+	if err != nil {
-// 		br.Msg = "参数解析异常！"
+		br.Msg = "参数解析异常！"
-// 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-// 		return
+		return
-// 	}
+	}
-// 	req.ChartName = strings.Trim(req.ChartName, " ")
+	req.ChartName = strings.Trim(req.ChartName, " ")
-
+
-// 	if req.ChartInfoId <= 0 {
+	if req.ChartInfoId <= 0 {
-// 		br.Msg = "请选择图表"
+		br.Msg = "请选择图表"
-// 		return
+		return
-// 	}
+	}
-
+
-// 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
+	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
-// 	if err != nil {
+	if err != nil {
-// 		if err.Error() == utils.ErrNoRow() {
+		if err.Error() == utils.ErrNoRow() {
-// 			br.Msg = "图表已被删除，请刷新页面"
+			br.Msg = "图表已被删除，请刷新页面"
-// 			br.ErrMsg = "图表已被删除，请刷新页面"
+			br.ErrMsg = "图表已被删除，请刷新页面"
-// 			return
+			return
-// 		}
+		}
-// 		br.Msg = "获取图表信息失败"
+		br.Msg = "获取图表信息失败"
-// 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
+		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
-// 		return
+		return
-// 	}
+	}
-
+
-// 	if !utils.InArrayByInt([]int{utils.CHART_SOURCE_FUTURE_GOOD, utils.CHART_SOURCE_FUTURE_GOOD_PROFIT}, chartItem.Source) {
+	if !utils.InArrayByInt([]int{utils.CHART_SOURCE_FUTURE_GOOD, utils.CHART_SOURCE_FUTURE_GOOD_PROFIT}, chartItem.Source) {
-// 		br.Msg = "该图不是商品价格/利润曲线图！"
+		br.Msg = "该图不是商品价格/利润曲线图！"
-// 		br.IsSendEmail = false
+		br.IsSendEmail = false
-// 		return
+		return
-// 	}
+	}
-
+
-// 	//图表操作权限
+	//图表操作权限
-// 	//ok := data.CheckOpChartPermission(sysUser, chartItem.SysUserId)
+	//ok := data.CheckOpChartPermission(sysUser, chartItem.SysUserId)
-// 	//if !ok {
+	//if !ok {
-// 	//	br.Msg = "没有该图表的操作权限"
+	//	br.Msg = "没有该图表的操作权限"
-// 	//	br.ErrMsg = "没有该图表的操作权限"
+	//	br.ErrMsg = "没有该图表的操作权限"
-// 	//	return
+	//	return
-// 	//}
+	//}
-
+
-// 	edbInfoMapping, err := data_manage.GetEtaEdbChartEdbMapping(chartItem.ChartInfoId)
+	edbInfoMapping, err := data_manage.GetEtaEdbChartEdbMapping(chartItem.ChartInfoId)
-// 	if err != nil {
+	if err != nil {
-// 		br.Msg = "修改失败"
+		br.Msg = "修改失败"
-// 		br.ErrMsg = "获取图表现货价格指标信息失败，指标信息失败，Err:" + err.Error()
+		br.ErrMsg = "获取图表现货价格指标信息失败，指标信息失败，Err:" + err.Error()
-// 		return
+		return
-// 	}
+	}
-
+
-// 	//校验指标信息是否存在
+	//校验指标信息是否存在
-// 	edbInfo, err := data_manage.GetEdbInfoById(edbInfoMapping.EdbInfoId)
+	edbInfo, err := data_manage.GetEdbInfoById(edbInfoMapping.EdbInfoId)
-// 	if err != nil {
+	if err != nil {
-// 		if err.Error() == utils.ErrNoRow() {
+		if err.Error() == utils.ErrNoRow() {
-// 			br.Msg = "图表不存在！"
+			br.Msg = "图表不存在！"
-// 			br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
+			br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
-// 			return
+			return
-// 		} else {
+		} else {
-// 			br.Msg = "获取图表信息失败！"
+			br.Msg = "获取图表信息失败！"
-// 			br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
+			br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
-// 			return
+			return
-// 		}
+		}
-// 	}
+	}
-// 	if edbInfo == nil {
+	if edbInfo == nil {
-// 		br.Msg = "指标不存在！"
+		br.Msg = "指标不存在！"
-// 		br.ErrMsg = "指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
+		br.ErrMsg = "指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
-// 		return
+		return
-// 	}
+	}
-
+
-// 	if req.ChartName != "" {
+	if req.ChartName != "" {
-// 		var condition string
+		var condition string
-// 		var pars []interface{}
+		var pars []interface{}
-// 		condition += " AND chart_info_id<>? "
+		condition += " AND chart_info_id<>? "
-// 		pars = append(pars, req.ChartInfoId)
+		pars = append(pars, req.ChartInfoId)
-
+
-// 		switch this.Lang {
+		switch this.Lang {
-// 		case utils.EnLangVersion:
+		case utils.EnLangVersion:
-// 			condition += " AND chart_name_en = ? "
+			condition += " AND chart_name_en = ? "
-// 		default:
+		default:
-// 			condition += " AND chart_name = ? "
+			condition += " AND chart_name = ? "
-// 		}
+		}
-// 		pars = append(pars, req.ChartName)
+		pars = append(pars, req.ChartName)
-
+
-// 		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
+		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-// 		if err != nil {
+		if err != nil {
-// 			if err.Error() != utils.ErrNoRow() {
+			if err.Error() != utils.ErrNoRow() {
-// 				br.Msg = "判断英文图表名称是否存在失败"
+				br.Msg = "判断英文图表名称是否存在失败"
-// 				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
+				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
-// 				return
+				return
-// 			}
+			}
-// 		}
+		}
-
+
-// 		if err == nil && existItem.ChartInfoId > 0 {
+		if err == nil && existItem.ChartInfoId > 0 {
-// 			br.Msg = existItem.ChartName + "：" + req.ChartName + "图表名称已存在"
+			br.Msg = existItem.ChartName + "：" + req.ChartName + "图表名称已存在"
-// 			return
+			return
-// 		}
+		}
-// 	}
+	}
-
+
-// 	switch chartItem.Source {
+	switch chartItem.Source {
-// 	case utils.CHART_SOURCE_FUTURE_GOOD:
+	case utils.CHART_SOURCE_FUTURE_GOOD:
-// 		err = data_manage.EditBaseFutureGoodChartInfoAndEdbEnInfo(chartItem, req.ChartName, edbInfo.EdbInfoId, req.EdbName, req.Unit, this.Lang)
+		err = data_manage.EditBaseFutureGoodChartInfoAndEdbEnInfo(chartItem, req.ChartName, edbInfo.EdbInfoId, req.EdbName, req.Unit, this.Lang)
-// 		if req.FutureGoodName != `` {
+		if req.FutureGoodName != `` {
-// 			futureGoodEdbInfoMapping, err := data_manage.GetFutureGoodEdbChartEdbMapping(chartItem.ChartInfoId)
+			futureGoodEdbInfoMapping, err := data_manage.GetFutureGoodEdbChartEdbMapping(chartItem.ChartInfoId)
-// 			if err != nil {
+			if err != nil {
-// 				br.Msg = "修改失败"
+				br.Msg = "修改失败"
-// 				br.ErrMsg = "获取图表现货价格指标信息失败，指标信息失败，Err:" + err.Error()
+				br.ErrMsg = "获取图表现货价格指标信息失败，指标信息失败，Err:" + err.Error()
-// 				return
+				return
-// 			}
+			}
-// 			futureGoodEdbInfo, err := future_good.GetFutureGoodEdbInfo(futureGoodEdbInfoMapping.EdbInfoId)
+			futureGoodEdbInfo, err := future_good.GetFutureGoodEdbInfo(futureGoodEdbInfoMapping.EdbInfoId)
-// 			if err != nil {
+			if err != nil {
-// 				if err.Error() == utils.ErrNoRow() {
+				if err.Error() == utils.ErrNoRow() {
-// 					br.Msg = "图表不存在！"
+					br.Msg = "图表不存在！"
-// 					br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
+					br.ErrMsg = "图表指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
-// 					return
+					return
-// 				} else {
+				} else {
-// 					br.Msg = "获取图表信息失败！"
+					br.Msg = "获取图表信息失败！"
-// 					br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
+					br.ErrMsg = "获取图表的指标信息失败，Err:" + err.Error()
-// 					return
+					return
-// 				}
+				}
-// 			}
+			}
-// 			if futureGoodEdbInfo == nil {
+			if futureGoodEdbInfo == nil {
-// 				br.Msg = "期货商品指标不存在！"
+				br.Msg = "期货商品指标不存在！"
-// 				br.ErrMsg = "期货商品指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
+				br.ErrMsg = "期货商品指标不存在，ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
-// 				return
+				return
-// 			}
+			}
-
+
-// 			list, _ := future_good.GetFutureGoodEdbInfoListByParentId(futureGoodEdbInfo.FutureGoodEdbInfoId)
+			list, _ := future_good.GetFutureGoodEdbInfoListByParentId(futureGoodEdbInfo.FutureGoodEdbInfoId)
-// 			for _, v := range list {
+			for _, v := range list {
-// 				switch this.Lang {
+				switch this.Lang {
-// 				case utils.EnLangVersion:
+				case utils.EnLangVersion:
-// 					if v.FutureGoodEdbNameEn == `` {
+					if v.FutureGoodEdbNameEn == `` {
-// 						v.FutureGoodEdbNameEn = strings.TrimPrefix(req.FutureGoodName, " ")
+						v.FutureGoodEdbNameEn = strings.TrimPrefix(req.FutureGoodName, " ")
-// 						v.FutureGoodEdbNameEn = strings.TrimSuffix(req.FutureGoodName, " ")
+						v.FutureGoodEdbNameEn = strings.TrimSuffix(req.FutureGoodName, " ")
-// 					} else {
+					} else {
-// 						v.FutureGoodEdbNameEn = strings.TrimPrefix(strings.Replace(v.FutureGoodEdbNameEn, v.FutureGoodEdbNameEn, req.FutureGoodName, -1), " ")
+						v.FutureGoodEdbNameEn = strings.TrimPrefix(strings.Replace(v.FutureGoodEdbNameEn, v.FutureGoodEdbNameEn, req.FutureGoodName, -1), " ")
-// 						v.FutureGoodEdbNameEn = strings.TrimSuffix(req.FutureGoodName, " ")
+						v.FutureGoodEdbNameEn = strings.TrimSuffix(req.FutureGoodName, " ")
-// 					}
+					}
-// 					v.Update([]string{"FutureGoodEdbNameEn"})
+					v.Update([]string{"FutureGoodEdbNameEn"})
-// 				default:
+				default:
-// 					if v.FutureGoodEdbName == `` {
+					if v.FutureGoodEdbName == `` {
-// 						v.FutureGoodEdbName = strings.TrimPrefix(req.FutureGoodName, " ")
+						v.FutureGoodEdbName = strings.TrimPrefix(req.FutureGoodName, " ")
-// 						v.FutureGoodEdbName = strings.TrimSuffix(req.FutureGoodName, " ")
+						v.FutureGoodEdbName = strings.TrimSuffix(req.FutureGoodName, " ")
-// 					} else {
+					} else {
-// 						v.FutureGoodEdbName = strings.TrimPrefix(strings.Replace(v.FutureGoodEdbName, v.FutureGoodEdbName, req.FutureGoodName, -1), " ")
+						v.FutureGoodEdbName = strings.TrimPrefix(strings.Replace(v.FutureGoodEdbName, v.FutureGoodEdbName, req.FutureGoodName, -1), " ")
-// 						v.FutureGoodEdbName = strings.TrimSuffix(req.FutureGoodName, " ")
+						v.FutureGoodEdbName = strings.TrimSuffix(req.FutureGoodName, " ")
-// 					}
+					}
-// 					v.Update([]string{"FutureGoodEdbName"})
+					v.Update([]string{"FutureGoodEdbName"})
-// 				}
+				}
-// 			}
+			}
-// 		}
+		}
-// 	case utils.CHART_SOURCE_FUTURE_GOOD_PROFIT:
+	case utils.CHART_SOURCE_FUTURE_GOOD_PROFIT:
-// 		err = data_manage.EditBaseFutureGoodProfitChartInfoAndEdbEnInfo(chartItem, req.ChartName, edbInfo.EdbInfoId, req.EdbName, req.Unit, req.ProfitName, this.Lang)
+		err = data_manage.EditBaseFutureGoodProfitChartInfoAndEdbEnInfo(chartItem, req.ChartName, edbInfo.EdbInfoId, req.EdbName, req.Unit, req.ProfitName, this.Lang)
-// 	default:
+	default:
-// 		br.Msg = "错误的图表类型"
+		br.Msg = "错误的图表类型"
-// 		br.ErrMsg = "错误的图表类型"
+		br.ErrMsg = "错误的图表类型"
-// 		br.IsSendEmail = false
+		br.IsSendEmail = false
-// 		return
+		return
-// 	}
+	}
-
+
-// 	if err != nil {
+	if err != nil {
-// 		br.Msg = "保存失败"
+		br.Msg = "保存失败"
-// 		br.ErrMsg = "保存失败,Err:" + err.Error()
+		br.ErrMsg = "保存失败,Err:" + err.Error()
-// 		return
+		return
-// 	}
+	}
-// 	//添加es数据
+	//添加es数据
-// 	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
-// 	//修改my eta es数据
+	//修改my eta es数据
-// 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
+	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
-
+
-// 	//指标 修改es信息
+	//指标 修改es信息
-// 	go data.AddOrEditEdbInfoToEs(edbInfo.EdbInfoId)
+	go data.AddOrEditEdbInfoToEs(edbInfo.EdbInfoId)
-
+
-// 	//新增操作日志
+	//新增操作日志
-// 	{
+	{
-// 		chartLog := new(data_manage.ChartInfoLog)
+		chartLog := new(data_manage.ChartInfoLog)
-// 		chartLog.ChartName = chartItem.ChartName
+		chartLog.ChartName = chartItem.ChartName
-// 		chartLog.ChartInfoId = req.ChartInfoId
+		chartLog.ChartInfoId = req.ChartInfoId
-// 		chartLog.ChartClassifyId = chartItem.ChartClassifyId
+		chartLog.ChartClassifyId = chartItem.ChartClassifyId
-// 		chartLog.SysUserId = sysUser.AdminId
+		chartLog.SysUserId = sysUser.AdminId
-// 		chartLog.SysUserRealName = sysUser.RealName
+		chartLog.SysUserRealName = sysUser.RealName
-// 		chartLog.UniqueCode = chartItem.UniqueCode
+		chartLog.UniqueCode = chartItem.UniqueCode
-// 		chartLog.CreateTime = time.Now()
+		chartLog.CreateTime = time.Now()
-// 		chartLog.Content = string(this.Ctx.Input.RequestBody)
+		chartLog.Content = string(this.Ctx.Input.RequestBody)
-// 		chartLog.Status = "编辑商品价格图表基础信息"
+		chartLog.Status = "编辑商品价格图表基础信息"
-// 		chartLog.Method = this.Ctx.Input.URL()
+		chartLog.Method = this.Ctx.Input.URL()
-// 		go data_manage.AddChartInfoLog(chartLog)
+		go data_manage.AddChartInfoLog(chartLog)
-// 	}
+	}
-
+
-// 	//清除缓存
+	//清除缓存
-// 	if utils.Re == nil && utils.Rc != nil {
+	if utils.Re == nil && utils.Rc != nil {
-// 		utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
+		utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
-// 		utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))
+		utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))
-// 	}
+	}
-
+
-// 	br.Ret = 200
+	br.Ret = 200
-// 	br.Success = true
+	br.Success = true
-// 	br.Msg = "编辑成功"
+	br.Msg = "编辑成功"
-// 	br.IsAddLog = true
+	br.IsAddLog = true
-// }
+}

controllers/data_manage/line_equation/line_chart_info.go

@@ -1674,117 +1674,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() {
+func (this *LineEquationChartInfoController) BaseInfoEdit() {
-// 	br := new(models.BaseResponse).Init()
+	br := new(models.BaseResponse).Init()
-// 	defer func() {
+	defer func() {
-// 		this.Data["json"] = br
+		this.Data["json"] = br
-// 		this.ServeJSON()
+		this.ServeJSON()
-// 	}()
+	}()
-// 	sysUser := this.SysUser
+	sysUser := this.SysUser
-// 	if sysUser == nil {
+	if sysUser == nil {
-// 		br.Msg = "请登录"
+		br.Msg = "请登录"
-// 		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.ErrMsg = "请登录，SysUser Is Empty"
-// 		br.Ret = 408
+		br.Ret = 408
-// 		return
+		return
-// 	}
+	}
-// 	var req request.EditChartBaseInfoReq
+	var req request.EditChartBaseInfoReq
-// 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-// 	if err != nil {
+	if err != nil {
-// 		br.Msg = "参数解析异常！"
+		br.Msg = "参数解析异常！"
-// 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-// 		return
+		return
-// 	}
+	}
-// 	req.ChartName = strings.Trim(req.ChartName, " ")
+	req.ChartName = strings.Trim(req.ChartName, " ")
-// 	if req.ChartInfoId <= 0 {
+	if req.ChartInfoId <= 0 {
-// 		br.Msg = "请选择图表"
+		br.Msg = "请选择图表"
-// 		return
+		return
-// 	}
+	}
-// 	if req.ChartName == "" {
+	if req.ChartName == "" {
-// 		br.Msg = "请输入英文图表名称"
+		br.Msg = "请输入英文图表名称"
-// 		return
+		return
-// 	}
+	}
-
+
-// 	//判断指标名称是否存在
+	//判断指标名称是否存在
-// 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
+	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
-// 	if err != nil {
+	if err != nil {
-// 		if err.Error() == utils.ErrNoRow() {
+		if err.Error() == utils.ErrNoRow() {
-// 			br.Msg = "图表已被删除，请刷新页面"
+			br.Msg = "图表已被删除，请刷新页面"
-// 			br.ErrMsg = "图表已被删除，请刷新页面"
+			br.ErrMsg = "图表已被删除，请刷新页面"
-// 			return
+			return
-// 		}
+		}
-// 		br.Msg = "获取图表信息失败"
+		br.Msg = "获取图表信息失败"
-// 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
+		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
-// 		return
+		return
-// 	}
+	}
-
+
-// 	// 校验名称是否有重复
+	// 校验名称是否有重复
-// 	{
+	{
-// 		var condition string
+		var condition string
-// 		var pars []interface{}
+		var pars []interface{}
-// 		condition += " AND chart_info_id <> ? AND source = ? "
+		condition += " AND chart_info_id <> ? AND source = ? "
-// 		pars = append(pars, req.ChartInfoId, utils.CHART_SOURCE_LINE_EQUATION)
+		pars = append(pars, req.ChartInfoId, utils.CHART_SOURCE_LINE_EQUATION)
-// 		switch this.Lang {
+		switch this.Lang {
-// 		case utils.EnLangVersion:
+		case utils.EnLangVersion:
-// 			condition += "  AND chart_name_en = ? "
+			condition += "  AND chart_name_en = ? "
-// 		default:
+		default:
-// 			condition += " AND chart_name = ? "
+			condition += " AND chart_name = ? "
-// 		}
+		}
-// 		pars = append(pars, req.ChartName)
+		pars = append(pars, req.ChartName)
-// 		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
+		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-// 		if err != nil {
+		if err != nil {
-// 			if err.Error() != utils.ErrNoRow() {
+			if err.Error() != utils.ErrNoRow() {
-// 				br.Msg = "判断英文图表名称是否存在失败"
+				br.Msg = "判断英文图表名称是否存在失败"
-// 				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
+				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
-// 				return
+				return
-// 			}
+			}
-// 		}
+		}
-// 		if err == nil && existItem.ChartInfoId > 0 {
+		if err == nil && existItem.ChartInfoId > 0 {
-// 			br.Msg = existItem.ChartName + "：" + req.ChartName + "图表名称已存在"
+			br.Msg = existItem.ChartName + "：" + req.ChartName + "图表名称已存在"
-// 			return
+			return
-// 		}
+		}
-// 	}
+	}
-// 	switch this.Lang {
+	switch this.Lang {
-// 	case utils.EnLangVersion:
+	case utils.EnLangVersion:
-// 		chartItem.ChartNameEn = req.ChartName
+		chartItem.ChartNameEn = req.ChartName
-// 	default:
+	default:
-// 		chartItem.ChartName = req.ChartName
+		chartItem.ChartName = req.ChartName
-// 	}
+	}
-// 	chartItem.ModifyTime = time.Now().Local()
+	chartItem.ModifyTime = time.Now().Local()
-// 	if e := chartItem.Update([]string{"ChartName", "ChartNameEn", "ModifyTime"}); e != nil {
+	if e := chartItem.Update([]string{"ChartName", "ChartNameEn", "ModifyTime"}); e != nil {
-// 		br.Msg = "操作失败"
+		br.Msg = "操作失败"
-// 		br.ErrMsg = "更新图表信息失败, Err: " + e.Error()
+		br.ErrMsg = "更新图表信息失败, Err: " + e.Error()
-// 		return
+		return
-// 	}
+	}
-
+
-// 	//添加es数据
+	//添加es数据
-// 	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
-// 	//修改my eta es数据
+	//修改my eta es数据
-// 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
+	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
-
+
-// 	//新增操作日志
+	//新增操作日志
-// 	{
+	{
-// 		chartLog := new(data_manage.ChartInfoLog)
+		chartLog := new(data_manage.ChartInfoLog)
-// 		chartLog.ChartName = chartItem.ChartName
+		chartLog.ChartName = chartItem.ChartName
-// 		chartLog.ChartInfoId = req.ChartInfoId
+		chartLog.ChartInfoId = req.ChartInfoId
-// 		chartLog.ChartClassifyId = chartItem.ChartClassifyId
+		chartLog.ChartClassifyId = chartItem.ChartClassifyId
-// 		chartLog.SysUserId = sysUser.AdminId
+		chartLog.SysUserId = sysUser.AdminId
-// 		chartLog.SysUserRealName = sysUser.RealName
+		chartLog.SysUserRealName = sysUser.RealName
-// 		chartLog.UniqueCode = chartItem.UniqueCode
+		chartLog.UniqueCode = chartItem.UniqueCode
-// 		chartLog.CreateTime = time.Now()
+		chartLog.CreateTime = time.Now()
-// 		chartLog.Content = string(this.Ctx.Input.RequestBody)
+		chartLog.Content = string(this.Ctx.Input.RequestBody)
-// 		chartLog.Status = "编辑拟合方程图表基础信息"
+		chartLog.Status = "编辑拟合方程图表基础信息"
-// 		chartLog.Method = this.Ctx.Input.URL()
+		chartLog.Method = this.Ctx.Input.URL()
-// 		go data_manage.AddChartInfoLog(chartLog)
+		go data_manage.AddChartInfoLog(chartLog)
-// 	}
+	}
-
+
-// 	// 清除缓存
+	// 清除缓存
-// 	if utils.Re == nil && utils.Rc != nil {
+	if utils.Re == nil && utils.Rc != nil {
-// 		_ = utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
+		_ = utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
-// 		_ = utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))
+		_ = utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))
-// 	}
+	}
-
+
-// 	br.Ret = 200
+	br.Ret = 200
-// 	br.Success = true
+	br.Success = true
-// 	br.Msg = "编辑成功"
+	br.Msg = "编辑成功"
-// 	br.IsAddLog = true
+	br.IsAddLog = true
-// }
+}

controllers/data_manage/line_feature/chart_info.go

@@ -2806,119 +2806,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() {
+func (this *LineFeaturesChartInfoController) BaseInfoEdit() {
-// 	br := new(models.BaseResponse).Init()
+	br := new(models.BaseResponse).Init()
-// 	defer func() {
+	defer func() {
-// 		this.Data["json"] = br
+		this.Data["json"] = br
-// 		this.ServeJSON()
+		this.ServeJSON()
-// 	}()
+	}()
-// 	sysUser := this.SysUser
+	sysUser := this.SysUser
-// 	if sysUser == nil {
+	if sysUser == nil {
-// 		br.Msg = "请登录"
+		br.Msg = "请登录"
-// 		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.ErrMsg = "请登录，SysUser Is Empty"
-// 		br.Ret = 408
+		br.Ret = 408
-// 		return
+		return
-// 	}
+	}
-// 	var req request.EditChartInfoBaseReq
+	var req request.EditChartInfoBaseReq
-// 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-// 	if err != nil {
+	if err != nil {
-// 		br.Msg = "参数解析异常！"
+		br.Msg = "参数解析异常！"
-// 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-// 		return
+		return
-// 	}
+	}
-// 	req.ChartName = strings.Trim(req.ChartName, " ")
+	req.ChartName = strings.Trim(req.ChartName, " ")
-// 	if req.ChartInfoId <= 0 {
+	if req.ChartInfoId <= 0 {
-// 		br.Msg = "请选择图表"
+		br.Msg = "请选择图表"
-// 		return
+		return
-// 	}
+	}
-// 	if req.ChartName == "" {
+	if req.ChartName == "" {
-// 		br.Msg = "请输入英文图表名称"
+		br.Msg = "请输入英文图表名称"
-// 		return
+		return
-// 	}
+	}
-
+
-// 	//判断指标名称是否存在
+	//判断指标名称是否存在
-// 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
+	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
-// 	if err != nil {
+	if err != nil {
-// 		if err.Error() == utils.ErrNoRow() {
+		if err.Error() == utils.ErrNoRow() {
-// 			br.Msg = "图表已被删除，请刷新页面"
+			br.Msg = "图表已被删除，请刷新页面"
-// 			br.ErrMsg = "图表已被删除，请刷新页面"
+			br.ErrMsg = "图表已被删除，请刷新页面"
-// 			return
+			return
-// 		}
+		}
-// 		br.Msg = "获取图表信息失败"
+		br.Msg = "获取图表信息失败"
-// 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
+		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
-// 		return
+		return
-// 	}
+	}
-
+
-// 	// 校验名称是否有重复
+	// 校验名称是否有重复
-// 	{
+	{
-// 		var condition string
+		var condition string
-// 		var pars []interface{}
+		var pars []interface{}
-// 		condition += " AND chart_info_id <> ? AND source in (?,?,?) "
+		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)
+		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 {
+		switch this.Lang {
-// 		case utils.EnLangVersion:
+		case utils.EnLangVersion:
-// 			condition += " AND chart_name_en = ? "
+			condition += " AND chart_name_en = ? "
-// 		default:
+		default:
-// 			condition += " AND chart_name = ? "
+			condition += " AND chart_name = ? "
-// 		}
+		}
-// 		pars = append(pars, req.ChartName)
+		pars = append(pars, req.ChartName)
-// 		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
+		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-// 		if err != nil {
+		if err != nil {
-// 			if err.Error() != utils.ErrNoRow() {
+			if err.Error() != utils.ErrNoRow() {
-// 				br.Msg = "判断英文图表名称是否存在失败"
+				br.Msg = "判断英文图表名称是否存在失败"
-// 				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
+				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
-// 				return
+				return
-// 			}
+			}
-// 		}
+		}
-// 		if err == nil && existItem.ChartInfoId > 0 {
+		if err == nil && existItem.ChartInfoId > 0 {
-// 			br.Msg = existItem.ChartName + "：" + req.ChartName + "图表名称已存在"
+			br.Msg = existItem.ChartName + "：" + req.ChartName + "图表名称已存在"
-// 			return
+			return
-// 		}
+		}
-// 	}
+	}
-
+
-// 	switch this.Lang {
+	switch this.Lang {
-// 	case utils.EnLangVersion:
+	case utils.EnLangVersion:
-// 		chartItem.ChartNameEn = req.ChartName
+		chartItem.ChartNameEn = req.ChartName
-// 	default:
+	default:
-// 		chartItem.ChartName = req.ChartName
+		chartItem.ChartName = req.ChartName
-// 	}
+	}
-// 	chartItem.ModifyTime = time.Now().Local()
+	chartItem.ModifyTime = time.Now().Local()
-// 	if e := chartItem.Update([]string{"ChartName", "ChartNameEn", "ModifyTime"}); e != nil {
+	if e := chartItem.Update([]string{"ChartName", "ChartNameEn", "ModifyTime"}); e != nil {
-// 		br.Msg = "操作失败"
+		br.Msg = "操作失败"
-// 		br.ErrMsg = "更新图表信息失败, Err: " + e.Error()
+		br.ErrMsg = "更新图表信息失败, Err: " + e.Error()
-// 		return
+		return
-// 	}
+	}
-
+
-// 	//添加es数据
+	//添加es数据
-// 	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
+	go data.EsAddOrEditChartInfo(chartItem.ChartInfoId)
-// 	//修改my eta es数据
+	//修改my eta es数据
-// 	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
+	go data.EsAddOrEditMyChartInfoByChartInfoId(chartItem.ChartInfoId)
-
+
-// 	//新增操作日志
+	//新增操作日志
-// 	{
+	{
-// 		chartLog := new(data_manage.ChartInfoLog)
+		chartLog := new(data_manage.ChartInfoLog)
-// 		chartLog.ChartName = chartItem.ChartName
+		chartLog.ChartName = chartItem.ChartName
-// 		chartLog.ChartInfoId = req.ChartInfoId
+		chartLog.ChartInfoId = req.ChartInfoId
-// 		chartLog.ChartClassifyId = chartItem.ChartClassifyId
+		chartLog.ChartClassifyId = chartItem.ChartClassifyId
-// 		chartLog.SysUserId = sysUser.AdminId
+		chartLog.SysUserId = sysUser.AdminId
-// 		chartLog.SysUserRealName = sysUser.RealName
+		chartLog.SysUserRealName = sysUser.RealName
-// 		chartLog.UniqueCode = chartItem.UniqueCode
+		chartLog.UniqueCode = chartItem.UniqueCode
-// 		chartLog.CreateTime = time.Now()
+		chartLog.CreateTime = time.Now()
-// 		chartLog.Content = string(this.Ctx.Input.RequestBody)
+		chartLog.Content = string(this.Ctx.Input.RequestBody)
-// 		chartLog.Status = "编辑统计特征图表基础信息"
+		chartLog.Status = "编辑统计特征图表基础信息"
-// 		chartLog.Method = this.Ctx.Input.URL()
+		chartLog.Method = this.Ctx.Input.URL()
-// 		go data_manage.AddChartInfoLog(chartLog)
+		go data_manage.AddChartInfoLog(chartLog)
-// 	}
+	}
-
+
-// 	// 清除缓存
+	// 清除缓存
-// 	if utils.Re == nil && utils.Rc != nil {
+	if utils.Re == nil && utils.Rc != nil {
-// 		_ = utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
+		_ = utils.Rc.Delete(utils.HZ_CHART_LIB_DETAIL + chartItem.UniqueCode) //图表分享链接缓存
-// 		_ = utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))
+		_ = utils.Rc.Delete(data.GetChartInfoDataKey(req.ChartInfoId))
-// 	}
+	}
-
+
-// 	br.Ret = 200
+	br.Ret = 200
-// 	br.Success = true
+	br.Success = true
-// 	br.Msg = "编辑成功"
+	br.Msg = "编辑成功"
-// 	br.IsAddLog = true
+	br.IsAddLog = true
-// }
+}

routers/commentsRouter.go

@@ -151,6 +151,15 @@ 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",
@@ -286,6 +295,15 @@ 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",
@@ -1231,6 +1249,15 @@ 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",
@@ -1510,6 +1537,15 @@ 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",
@@ -1681,6 +1717,15 @@ 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",
@@ -2257,6 +2302,15 @@ 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",
@@ -3319,6 +3373,15 @@ 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",