fix：调整不同语言版本下商品利润曲线的分类新增和编辑，指标分类的新增和编辑

controllers/data_manage/edb_classify.go

@@ -207,7 +207,7 @@ func (this *EdbClassifyController) AddEdbClassify() {
 	}
 
 	//添加指标
-	_, err, errMsg := data.AddEdbClassify(req.ClassifyName, req.ParentId, req.Level, 0, this.SysUser.AdminId, this.SysUser.AdminName)
+	_, err, errMsg := data.AddEdbClassify(req.ClassifyName, req.ParentId, req.Level, 0, this.SysUser.AdminId, this.SysUser.AdminName, this.Lang)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg
@@ -288,7 +288,7 @@ func (this *EdbClassifyController) EditEdbClassify() {
 		return
 	}
 
-	err, errMsg := data.EditEdbClassify(req.ClassifyId, req.ClassifyName, this.SysUser)
+	err, errMsg := data.EditEdbClassify(req.ClassifyId, req.ClassifyName, this.Lang, this.SysUser)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg

controllers/data_manage/future_good/future_good_chart_classify.go

@@ -9,7 +9,6 @@ import (
 	"eta/eta_api/services/data"
 	"eta/eta_api/utils"
 	"fmt"
-	"strconv"
 	"time"
 )
 
@@ -200,42 +199,15 @@ func (this *FutureGoodChartClassifyController) AddChartClassify() {
 		return
 	}
 
-	count, err := data_manage.GetChartClassifyCount(req.ChartClassifyName, req.ParentId, utils.CHART_SOURCE_FUTURE_GOOD)
+	// 新增图表分类
+	_, err, errMsg, isSendEmail := data.AddChartClassify(req.ChartClassifyName, 0, req.Level, utils.CHART_SOURCE_FUTURE_GOOD, this.Lang, this.SysUser)
 	if err != nil {
-		br.Msg = "判断名称是否已存在失败"
+		br.Msg = errMsg
-		br.ErrMsg = "判断名称是否已存在失败，Err:" + err.Error()
+		br.ErrMsg = "添加分类失败,Err:" + err.Error()
-		return
+		br.IsSendEmail = isSendEmail
-	}
-	if count > 0 {
-		br.Msg = "分类名称已存在，请重新输入"
-		br.IsSendEmail = false
-		return
-	}
-	//获取该层级下最大的排序数
-	maxSort, err := data_manage.GetChartClassifyMaxSort(req.ParentId, utils.CHART_SOURCE_FUTURE_GOOD)
-
-	classify := new(data_manage.ChartClassify)
-	//classify.ParentId = req.ParentId
-	classify.ParentId = 0
-	classify.ChartClassifyName = req.ChartClassifyName
-	classify.ChartClassifyNameEn = req.ChartClassifyName
-	classify.HasData = 0
-	classify.CreateTime = time.Now()
-	classify.ModifyTime = time.Now()
-	classify.SysUserId = this.SysUser.AdminId
-	classify.SysUserRealName = this.SysUser.RealName
-	classify.Level = req.Level + 1
-	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
-	classify.UniqueCode = utils.MD5(utils.DATA_PREFIX + "_" + timestamp)
-	classify.Sort = maxSort + 1
-	classify.Source = utils.CHART_SOURCE_FUTURE_GOOD
-
-	_, err = data_manage.AddChartClassify(classify)
-	if err != nil {
-		br.Msg = "保存分类失败"
-		br.ErrMsg = "保存分类失败,Err:" + err.Error()
 		return
 	}
+
 	br.Ret = 200
 	br.Msg = "添加成功"
 	br.Success = true
@@ -272,58 +244,15 @@ func (this *FutureGoodChartClassifyController) EditChartClassify() {
 		return
 	}
 
-	item, err := data_manage.GetChartClassifyById(req.ChartClassifyId)
+	// 编辑图表分类
+	_, err, errMsg, isSendEmail := data.EditChartClassify(req.ChartClassifyId, utils.CHART_SOURCE_FUTURE_GOOD, req.ChartClassifyName, this.Lang, this.SysUser)
 	if err != nil {
-		br.Msg = "保存失败"
+		br.Msg = errMsg
-		br.Msg = "获取分类信息失败,Err:" + err.Error()
+		br.ErrMsg = "保存分类失败,Err:" + err.Error()
+		br.IsSendEmail = isSendEmail
 		return
 	}
 
-	switch this.Lang {
-	case utils.LangEn:
-		if item.ChartClassifyNameEn != req.ChartClassifyName {
-			count, err := data_manage.GetChartClassifyEnCount(req.ChartClassifyName, item.ParentId, utils.CHART_SOURCE_FUTURE_GOOD)
-			if err != nil {
-				br.Msg = "判断名称是否已存在失败"
-				br.ErrMsg = "判断名称是否已存在失败，Err:" + err.Error()
-				return
-			}
-			if count > 0 {
-				br.Msg = "分类名称已存在，请重新输入"
-				br.IsSendEmail = false
-				return
-			}
-
-			err = data_manage.EditChartClassifyEn(req.ChartClassifyId, utils.CHART_SOURCE_FUTURE_GOOD, req.ChartClassifyName)
-			if err != nil {
-				br.Msg = "保存失败"
-				br.ErrMsg = "保存失败,Err:" + err.Error()
-				return
-			}
-		}
-	default:
-		if item.ChartClassifyName != req.ChartClassifyName {
-			count, err := data_manage.GetChartClassifyCount(req.ChartClassifyName, item.ParentId, utils.CHART_SOURCE_FUTURE_GOOD)
-			if err != nil {
-				br.Msg = "判断名称是否已存在失败"
-				br.ErrMsg = "判断名称是否已存在失败，Err:" + err.Error()
-				return
-			}
-			if count > 0 {
-				br.Msg = "分类名称已存在，请重新输入"
-				br.IsSendEmail = false
-				return
-			}
-
-			err = data_manage.EditChartClassify(req.ChartClassifyId, utils.CHART_SOURCE_FUTURE_GOOD, req.ChartClassifyName)
-			if err != nil {
-				br.Msg = "保存失败"
-				br.ErrMsg = "保存失败,Err:" + err.Error()
-				return
-			}
-		}
-	}
-
 	br.Ret = 200
 	br.Msg = "修改成功"
 	br.Success = true

controllers/data_manage/future_good/future_good_edb_info.go

@@ -41,7 +41,7 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoList() {
 	// @Param   Keyword   query   string  false       "搜索关键词:期货指标ID/期货指标名称"
 	keyword := this.GetString("Keyword")
 	if keyword != `` {
-		condition += ` AND ( future_good_edb_name like ? or future_good_edb_code like ? ) `
+		condition += ` AND ( future_good_edb_name like ? or future_good_edb_name_en like ?  or future_good_edb_code like ? ) `
 		pars = utils.GetLikeKeywordPars(pars, keyword, 2)
 	}
 

controllers/data_manage/predict_edb_classify.go

@@ -211,7 +211,7 @@ func (this *PredictEdbClassifyController) Add() {
 	}
 
 	// 添加指标分类
-	_, err, errMsg := data.AddEdbClassify(req.ClassifyName, req.ParentId, req.Level, 1, this.SysUser.AdminId, this.SysUser.AdminName)
+	_, err, errMsg := data.AddEdbClassify(req.ClassifyName, req.ParentId, req.Level, 1, this.SysUser.AdminId, this.SysUser.AdminName, this.Lang)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg
@@ -259,7 +259,7 @@ func (this *PredictEdbClassifyController) Edit() {
 		return
 	}
 
-	err, errMsg := data.EditEdbClassify(req.ClassifyId, req.ClassifyName, this.SysUser)
+	err, errMsg := data.EditEdbClassify(req.ClassifyId, req.ClassifyName, this.Lang, this.SysUser)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg

models/data_manage/chart_classify.go

@@ -27,6 +27,11 @@ type ChartClassify struct {
 func AddChartClassify(item *ChartClassify) (lastId int64, err error) {
 	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
+	if err != nil {
+		return
+	}
+	item.ChartClassifyId = int(lastId)
+
 	return
 }
 

models/data_manage/edb_classify.go

@@ -23,6 +23,7 @@ type EdbClassify struct {
 	UniqueCode       string    `description:"唯一编码"`
 	Sort             int       `description:"排序字段，越小越靠前，默认值：10"`
 	IsJoinPermission int       `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
+	ClassifyNameEn   string    `description:"英文分类名称"`
 }
 
 func AddEdbClassify(item *EdbClassify) (lastId int64, err error) {
@@ -38,6 +39,15 @@ type AddEdbClassifyReq struct {
 	ClassifyType uint8  `description:"分类类型，0：普通指标分类，1：预测指标分类"`
 }
 
+// GetEdbClassifyCount
+// @Description: 根据父级id获取同级中文名称的数量
+// @author: Roc
+// @datetime 2024-04-17 14:12:22
+// @param classifyName string
+// @param parentId int
+// @param classifyType uint8
+// @return count int
+// @return err error
 func GetEdbClassifyCount(classifyName string, parentId int, classifyType uint8) (count int, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT COUNT(1) AS count FROM edb_classify WHERE parent_id=? AND classify_name=? AND classify_type = ? `
@@ -45,6 +55,22 @@ func GetEdbClassifyCount(classifyName string, parentId int, classifyType uint8)
 	return
 }
 
+// GetEdbClassifyEnCount
+// @Description: 根据父级id获取同级英文名称的数量
+// @author: Roc
+// @datetime 2024-04-17 14:12:09
+// @param classifyNameEn string
+// @param parentId int
+// @param classifyType uint8
+// @return count int
+// @return err error
+func GetEdbClassifyEnCount(classifyNameEn string, parentId int, classifyType uint8) (count int, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT COUNT(1) AS count FROM edb_classify WHERE parent_id=? AND classify_name_en = ? AND classify_type = ? `
+	err = o.Raw(sql, parentId, classifyNameEn, classifyType).QueryRow(&count)
+	return
+}
+
 type EditEdbClassifyReq struct {
 	ClassifyName string `description:"分类名称"`
 	ClassifyId   int    `description:"分类名称"`
@@ -64,6 +90,15 @@ func GetEdbClassifyCountById(classifyId int) (count int, err error) {
 	return
 }
 
+// EditEdbClassify
+// @Description: 修改指标分类的中文名称
+// @author: Roc
+// @datetime 2024-04-17 14:14:48
+// @param classifyId int
+// @param classifyName string
+// @param userId int
+// @param userRealName string
+// @return err error
 func EditEdbClassify(classifyId int, classifyName string, userId int, userRealName string) (err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE edb_classify SET classify_name=?,modify_time=NOW(), last_modify_user_id = ?, last_modify_user_real_name = ? WHERE classify_id=? `
@@ -71,6 +106,22 @@ func EditEdbClassify(classifyId int, classifyName string, userId int, userRealNa
 	return
 }
 
+// EditEdbClassifyEn
+// @Description: 修改指标分类的英文名称
+// @author: Roc
+// @datetime 2024-04-17 14:14:36
+// @param classifyId int
+// @param classifyNameEn string
+// @param userId int
+// @param userRealName string
+// @return err error
+func EditEdbClassifyEn(classifyId int, classifyNameEn string, userId int, userRealName string) (err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `UPDATE edb_classify SET classify_name_en = ?,modify_time=NOW(), last_modify_user_id = ?, last_modify_user_real_name = ? WHERE classify_id=? `
+	_, err = o.Raw(sql, classifyNameEn, userId, userRealName, classifyId).Exec()
+	return
+}
+
 type DeleteEdbClassifyReq struct {
 	ClassifyId int `description:"分类id"`
 	EdbInfoId  int `description:"指标id"`

models/data_manage/future_good/future_good_edb_info.go

@@ -103,9 +103,10 @@ func (FutureGoodEdbInfo *FutureGoodEdbInfo) Update(cols []string) (err error) {
 
 // FutureGoodEdbInfoGroupListResp 期货指标数据列表数据返回
 type FutureGoodEdbInfoGroupListResp struct {
-	FutureGoodEdbInfoId   int
+	FutureGoodEdbInfoId     int
-	FutureGoodEdbInfoName string
+	FutureGoodEdbInfoName   string `description:"中文名称"`
-	Child                 []FutureGoodEdbInfoGroupListResp
+	FutureGoodEdbInfoNameEn string `description:"英文名称"`
+	Child                   []FutureGoodEdbInfoGroupListResp
 }
 
 // GetFutureGoodEdbInfoGroupList 获取分組指标数据列表
@@ -121,13 +122,14 @@ func GetFutureGoodEdbInfoGroupList(condition string, pars []interface{}) (list [
 }
 
 type FutureGoodExchange struct {
-	Exchange string `description:"所属交易所"`
+	Exchange   string `description:"所属交易所"`
+	ExchangeEn string `description:"所属交易所（英文）"`
 }
 
 // GetFutureGoodEdbExchangeList 获取分組指标数据列表
 func GetFutureGoodEdbExchangeList(condition string, pars []interface{}) (list []FutureGoodExchange, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT exchange FROM future_good_edb_info WHERE 1=1 `
+	sql := `SELECT exchange,exchange_en FROM future_good_edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}

services/data/chart_classify.go

@@ -1,6 +1,7 @@
 package data
 
 import (
+	"errors"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/models/system"
 	"eta/eta_api/services/data/data_manage_permission"
@@ -220,3 +221,156 @@ func HandleNoPermissionChart(allNodes []*data_manage.ChartClassifyItems, noPermi
 
 	return
 }
+
+// AddChartClassify
+// @Description: 添加图表分类
+// @author: Roc
+// @datetime 2024-04-17 14:48:23
+// @param chartClassifyName string
+// @param parentId int
+// @param level int
+// @param source int
+// @param lang string
+// @param sysUser *system.Admin
+// @return classifyInfo *data_manage.ChartClassify
+// @return err error
+// @return errMsg string
+// @return isSendEmail bool
+func AddChartClassify(chartClassifyName string, parentId, level, source int, lang string, sysUser *system.Admin) (classifyInfo *data_manage.ChartClassify, err error, errMsg string, isSendEmail bool) {
+	isSendEmail = true
+	errMsg = "保存分类失败"
+	// 版本校验
+	switch lang {
+	case utils.LangEn:
+		count, tmpErr := data_manage.GetChartClassifyEnCount(chartClassifyName, parentId, source)
+		if tmpErr != nil {
+			errMsg = "判断名称是否已存在失败"
+			err = tmpErr
+			return
+		}
+		if count > 0 {
+			errMsg = "分类名称已存在，请重新输入"
+			err = errors.New(errMsg)
+			isSendEmail = false
+			return
+		}
+	default:
+		count, tmpErr := data_manage.GetChartClassifyCount(chartClassifyName, parentId, source)
+		if tmpErr != nil {
+			errMsg = "判断名称是否已存在失败"
+			err = tmpErr
+			return
+		}
+		if count > 0 {
+			errMsg = "分类名称已存在，请重新输入"
+			err = errors.New(errMsg)
+			isSendEmail = false
+			return
+		}
+	}
+
+	//获取该层级下最大的排序数
+	maxSort, err := data_manage.GetChartClassifyMaxSort(parentId, source)
+
+	classifyInfo = new(data_manage.ChartClassify)
+	classifyInfo.ParentId = parentId
+	classifyInfo.ChartClassifyName = chartClassifyName
+	classifyInfo.ChartClassifyNameEn = chartClassifyName
+	classifyInfo.HasData = 0
+	classifyInfo.CreateTime = time.Now()
+	classifyInfo.ModifyTime = time.Now()
+	classifyInfo.SysUserId = sysUser.AdminId
+	classifyInfo.SysUserRealName = sysUser.RealName
+	classifyInfo.Level = level + 1
+	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
+	classifyInfo.UniqueCode = utils.MD5(utils.DATA_PREFIX + "_" + timestamp)
+	classifyInfo.Sort = maxSort + 1
+	classifyInfo.Source = source
+
+	_, err = data_manage.AddChartClassify(classifyInfo)
+
+	return
+}
+
+// EditChartClassify
+// @Description: 修改图表分类
+// @author: Roc
+// @datetime 2024-04-17 14:59:37
+// @param chartClassifyId int
+// @param source int
+// @param chartClassifyName string
+// @param lang string
+// @param sysUser *system.Admin
+// @return classifyInfo *data_manage.ChartClassify
+// @return err error
+// @return errMsg string
+// @return isSendEmail bool
+func EditChartClassify(chartClassifyId, source int, chartClassifyName, lang string, sysUser *system.Admin) (classifyInfo *data_manage.ChartClassify, err error, errMsg string, isSendEmail bool) {
+	isSendEmail = true
+	errMsg = "保存失败"
+
+	// 获取分类信息
+	classifyInfo, err = data_manage.GetChartClassifyById(chartClassifyId)
+	if err != nil {
+		return
+	}
+
+	// 分类来源校验
+	if classifyInfo.Source != source {
+		errMsg = "图表分类异常"
+		err = errors.New(fmt.Sprintf("图表分类来源异常，修改来源：%d,分类来源：%d", source, classifyInfo.Source))
+		isSendEmail = false
+		return
+	}
+
+	// 需要变更的字段
+	updateCols := make([]string, 0)
+
+	// 语言版本校验
+	switch lang {
+	case utils.LangEn:
+		if classifyInfo.ChartClassifyNameEn != chartClassifyName {
+			count, tmpErr := data_manage.GetChartClassifyEnCount(chartClassifyName, classifyInfo.ParentId, source)
+			if tmpErr != nil {
+				errMsg = "判断名称是否已存在失败"
+				err = errors.New("判断名称是否已存在失败，Err:" + tmpErr.Error())
+				return
+			}
+			if count > 0 {
+				errMsg = "分类名称已存在，请重新输入"
+				err = errors.New(errMsg)
+				isSendEmail = false
+				return
+			}
+
+			classifyInfo.ChartClassifyNameEn = chartClassifyName
+			classifyInfo.ModifyTime = time.Now()
+			updateCols = append(updateCols, "ChartClassifyName", "ModifyTime")
+		}
+	default:
+		if classifyInfo.ChartClassifyName != chartClassifyName {
+			count, tmpErr := data_manage.GetChartClassifyCount(chartClassifyName, classifyInfo.ParentId, source)
+			if tmpErr != nil {
+				errMsg = "判断名称是否已存在失败"
+				err = errors.New("判断名称是否已存在失败，Err:" + tmpErr.Error())
+				return
+			}
+			if count > 0 {
+				errMsg = "分类名称已存在，请重新输入"
+				err = errors.New(errMsg)
+				isSendEmail = false
+				return
+			}
+
+			classifyInfo.ChartClassifyName = chartClassifyName
+			classifyInfo.ModifyTime = time.Now()
+			updateCols = append(updateCols, "ChartClassifyName", "ModifyTime")
+		}
+	}
+
+	if len(updateCols) > 0 {
+		err = classifyInfo.Update(updateCols)
+	}
+
+	return
+}

services/data/edb_classify.go

@@ -252,20 +252,41 @@ func GetEdbClassifyNameListByAdminId(adminId int64) (classifyNameList []string,
 }
 
 // AddEdbClassify 添加指标分类
-func AddEdbClassify(classifyName string, parentId, level int, classifyType uint8, sysUserId int, sysUserName string) (classifyInfo *data_manage.EdbClassify, err error, errMsg string) {
+func AddEdbClassify(classifyName string, parentId, level int, classifyType uint8, sysUserId int, sysUserName, lang string) (classifyInfo *data_manage.EdbClassify, err error, errMsg string) {
-	count, err := data_manage.GetEdbClassifyCount(classifyName, parentId, classifyType)
+	// 版本校验
-	if err != nil {
+	switch lang {
-		errMsg = `判断名称是否已存在失败`
+	case utils.LangEn:
-		return
+		count, tmpErr := data_manage.GetEdbClassifyEnCount(classifyName, parentId, classifyType)
-	}
+		if tmpErr != nil {
-	if count > 0 {
+			err = tmpErr
-		errMsg = `分类名称已存在，请重新输入`
+			errMsg = `判断名称是否已存在失败`
-		return
+			return
+		}
+		if count > 0 {
+			errMsg = `分类名称已存在，请重新输入`
+			err = errors.New(errMsg)
+			return
+		}
+	default:
+		count, tmpErr := data_manage.GetEdbClassifyCount(classifyName, parentId, classifyType)
+		if tmpErr != nil {
+			err = tmpErr
+			errMsg = `判断名称是否已存在失败`
+			return
+		}
+		if count > 0 {
+			errMsg = `分类名称已存在，请重新输入`
+			err = errors.New(errMsg)
+			return
+		}
 	}
+
+	// 层级校验
 	if level > 6 {
 		errMsg = `最高只支持添加6级分类`
 		return
 	}
+
 	//获取该层级下最大的排序数
 	maxSort, err := GetEdbClassifyMaxSort(parentId, classifyType)
 	if err != nil {
@@ -295,6 +316,7 @@ func AddEdbClassify(classifyName string, parentId, level int, classifyType uint8
 		//ClassifyId:      0,
 		ClassifyType:    classifyType,
 		ClassifyName:    classifyName,
+		ClassifyNameEn:  classifyName,
 		ParentId:        parentId,
 		RootId:          rootId,
 		HasData:         0,
@@ -335,7 +357,7 @@ func AddEdbClassify(classifyName string, parentId, level int, classifyType uint8
 }
 
 // EditEdbClassify 编辑指标分类
-func EditEdbClassify(classifyId int, classifyName string, sysUser *system.Admin) (err error, errMsg string) {
+func EditEdbClassify(classifyId int, classifyName, lang string, sysUser *system.Admin) (err error, errMsg string) {
 	item, err := data_manage.GetEdbClassifyById(classifyId)
 	if err != nil {
 		errMsg = `保存失败`
@@ -372,6 +394,57 @@ func EditEdbClassify(classifyId int, classifyName string, sysUser *system.Admin)
 
 	}
 
+	switch lang {
+	case utils.LangEn:
+		// 名字相同，那么就直接返回
+		if item.ClassifyNameEn == classifyName {
+			return
+		}
+
+		// 判断名称是否已存在
+		count, tmpErr := data_manage.GetEdbClassifyEnCount(classifyName, item.ParentId, item.ClassifyType)
+		if tmpErr != nil {
+			err = tmpErr
+			errMsg = "判断名称是否已存在失败"
+			return
+		}
+		if count > 0 {
+			errMsg = "分类名称已存在，请重新输入"
+			err = errors.New(errMsg)
+			return
+		}
+
+		// 修改数据
+		err = data_manage.EditEdbClassifyEn(classifyId, classifyName, sysUser.AdminId, sysUser.RealName)
+		if err != nil {
+			errMsg = "保存失败"
+		}
+	default:
+		// 名字相同，那么就直接返回
+		if item.ClassifyName == classifyName {
+			return
+		}
+
+		// 判断名称是否已存在
+		count, tmpErr := data_manage.GetEdbClassifyCount(classifyName, item.ParentId, item.ClassifyType)
+		if tmpErr != nil {
+			err = tmpErr
+			errMsg = "判断名称是否已存在失败"
+			return
+		}
+		if count > 0 {
+			errMsg = "分类名称已存在，请重新输入"
+			err = errors.New(errMsg)
+			return
+		}
+
+		// 修改数据
+		err = data_manage.EditEdbClassify(classifyId, classifyName, sysUser.AdminId, sysUser.RealName)
+		if err != nil {
+			errMsg = "保存失败"
+		}
+	}
+
 	// 名字相同，那么就直接返回
 	if item.ClassifyName == classifyName {
 		return