fix：数据源支持英文分类

controllers/base_auth.go

@@ -51,6 +51,7 @@ type BaseAuthController struct {
 	web.Controller
 	SysUser *system.Admin
 	Session *system.SysSession
+	Lang    string `description:"当前语言类型，中文：zh；英文：en；默认：zh"`
 }
 
 func (c *BaseAuthController) Prepare() {
@@ -60,6 +61,15 @@ func (c *BaseAuthController) Prepare() {
 	//fmt.Println("Url:", uri)
 	if method != "HEAD" {
 		if method == "POST" || method == "GET" {
+			// 当前语言
+			{
+				lang := c.Ctx.Input.Header("Lang")
+				if lang == "" {
+					lang = utils.LangZh
+				}
+				c.Lang = lang
+			}
+
 			authorization := c.Ctx.Input.Header("authorization")
 			if authorization == "" {
 				authorization = c.Ctx.Input.Header("Authorization")

controllers/base_common.go

@@ -15,6 +15,7 @@ import (
 
 type BaseCommonController struct {
 	web.Controller
+	Lang string `description:"当前语言类型，中文：zh；英文：en；默认：zh"`
 }
 
 func (c *BaseCommonController) Prepare() {
@@ -25,6 +26,15 @@ func (c *BaseCommonController) Prepare() {
 	} else {
 		requestBody, _ = url.QueryUnescape(string(c.Ctx.Input.RequestBody))
 	}
+	// 当前语言
+	{
+		lang := c.Ctx.Input.Header("Lang")
+		if lang == "" {
+			lang = utils.LangZh
+		}
+		c.Lang = lang
+	}
+
 	ip := c.Ctx.Input.IP()
 	utils.ApiLog.Info("uri:%s, requestBody:%s, responseBody:%s, ip:%s", c.Ctx.Input.URI(), requestBody, ip)
 }

controllers/data_manage/baiinfo_data.go

@@ -2,15 +2,15 @@ package data_manage
 
 import (
 	"encoding/json"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
 	"eta/eta_api/models"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/models/data_manage/request"
 	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/data"
 	"eta/eta_api/utils"
+	"fmt"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"github.com/tealeg/xlsx"
 	"os"
 	"path/filepath"
 	"strings"
@@ -284,7 +284,7 @@ func (this *EdbInfoController) EditBaiinfoClassify() {
 		return
 	}
 
-	err, errMsg := data.EditBaiinfoClassify(req.ClassifyId, req.ClassifyName, this.SysUser)
+	err, errMsg := data.EditBaiinfoClassify(req.ClassifyId, req.ClassifyName, this.Lang, this.SysUser)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg

controllers/data_manage/mysteel_chemical_data.go

@@ -223,7 +223,7 @@ func (this *EdbClassifyController) EditMysteelChemicalClassify() {
 		return
 	}
 
-	err, errMsg := data.EditMysteelChemicalClassify(req.BaseFromMysteelChemicalClassifyId, req.ClassifyName, this.SysUser)
+	err, errMsg := data.EditMysteelChemicalClassify(req.BaseFromMysteelChemicalClassifyId, req.ClassifyName, this.Lang, this.SysUser)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg
@@ -879,8 +879,6 @@ func (this *EdbClassifyController) AddMysteelChemical() {
 		}
 	}
 
-
-
 	br.Data = resp
 	br.Ret = 200
 	br.Msg = "保存成功"

controllers/data_manage/sci_data.go

@@ -2,23 +2,23 @@ package data_manage
 
 import (
 	"encoding/json"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"github.com/tealeg/xlsx"
 	"eta/eta_api/models"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/models/data_manage/request"
 	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/data"
 	"eta/eta_api/utils"
+	"fmt"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"github.com/tealeg/xlsx"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
 )
 
-// @Title 有色数据分类
+// @Title 卓创（红桃3）数据分类
-// @Description 有色数据分类接口
+// @Description 卓创（红桃3）数据分类接口
 // @Success 200 {object} data_manage.SciClassify
 // @router /sci/classify [get]
 func (this *EdbInfoController) SciClassify() {
@@ -124,8 +124,8 @@ func (this *EdbInfoController) SciClassify() {
 }
 
 // SciClassifyName
-// @Title 有色数据分类名称查询
+// @Title 卓创（红桃3）数据分类名称查询
-// @Description 有色数据分类名称查询接口
+// @Description 卓创（红桃3）数据分类名称查询接口
 // @Success 200 {object} data_manage.SciClassify
 // @router /sci/classify/name [get]
 func (this *EdbInfoController) SciClassifyName() {
@@ -284,7 +284,7 @@ func (this *EdbInfoController) EditSciClassify() {
 		return
 	}
 
-	err, errMsg := data.EditSciClassify(req.ClassifyId, req.ClassifyName, this.SysUser)
+	err, errMsg := data.EditSciClassify(req.ClassifyId, req.ClassifyName, this.Lang, this.SysUser)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg
@@ -302,8 +302,8 @@ func (this *EdbInfoController) EditSciClassify() {
 	br.IsAddLog = true
 }
 
-// @Title 有色数据频度
+// @Title 卓创（红桃3）数据频度
-// @Description 有色数据频度接口
+// @Description 卓创（红桃3）数据频度接口
 // @Param   ClassifyId   query   string  true       "分类Id"
 // @Success 200 {object} data_manage.LzFrequency
 // @router /sci/frequency [get]
@@ -495,8 +495,8 @@ func (this *EdbInfoController) MoveSciData() {
 }
 
 // EditSci
-// @Title 编辑有色指标
+// @Title 编辑卓创（红桃3）指标
-// @Description 编辑有色指标接口
+// @Description 编辑卓创（红桃3）指标接口
 // @Param	request	body data_manage.AddEdbClassifyReq true "type json string"
 // @Success 200 Ret=200 保存成功
 // @router /sci/edit [post]

controllers/data_manage/smm_data.go

@@ -333,7 +333,7 @@ func (this *EdbInfoController) EditSmmClassify() {
 		return
 	}
 
-	err, errMsg := data.EditSmmClassify(req.ClassifyId, req.ClassifyName, this.SysUser)
+	err, errMsg := data.EditSmmClassify(req.ClassifyId, req.ClassifyName, this.Lang, this.SysUser)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg

go.mod

@@ -113,7 +113,6 @@ require (
 	github.com/xuri/nfp v0.0.0-20230919160717-d98342af3f05 // indirect
 	golang.org/x/crypto v0.19.0 // indirect
 	golang.org/x/image v0.15.0 // indirect
-	golang.org/x/net v0.21.0 // indirect
 	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect

models/data_manage/base_from_baiinfo_classify.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
-	"eta/eta_api/utils"
 	"time"
 )
 
@@ -18,6 +18,7 @@ type BaseFromBaiinfoClassify struct {
 	Sort            int       `description:"排序字段，越小越靠前，默认值：10"`
 	ModifyTime      time.Time `description:"修改时间"`
 	CreateTime      time.Time `description:"创建时间"`
+	ClassifyNameEn  string    `description:"英文分类名称"`
 }
 
 // AddBaseFromBaiinfoClassify 添加SMM原始数据分类
@@ -35,6 +36,21 @@ func GetBaseFromBaiinfoClassifyCount(classifyName string, parentId int) (count i
 	return
 }
 
+// GetBaseFromBaiinfoClassifyEnCount
+// @Description: 获取英文分类名称的个数
+// @author: Roc
+// @datetime 2024-04-16 16:54:05
+// @param classifyNameEn string
+// @param parentId int
+// @return count int
+// @return err error
+func GetBaseFromBaiinfoClassifyEnCount(classifyNameEn string, parentId int) (count int, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT COUNT(1) AS count FROM base_from_baiinfo_classify WHERE classify_name_en = ? AND parent_id=? `
+	err = o.Raw(sql, classifyNameEn, parentId).QueryRow(&count)
+	return
+}
+
 // GetBaseFromBaiinfoClassifyById 通过分类id的获取分类信息
 func GetBaseFromBaiinfoClassifyById(classifyId int) (item *BaseFromBaiinfoClassify, err error) {
 	o := orm.NewOrmUsingDB("data")
@@ -51,6 +67,20 @@ func EditBaseFromBaiinfoClassify(classifyId int, classifyName string) (err error
 	return
 }
 
+// EditBaseFromBaiinfoClassifyEn
+// @Description: 修改SMM原始数据英文分类
+// @author: Roc
+// @datetime 2024-04-16 16:54:39
+// @param classifyId int
+// @param classifyNameEn string
+// @return err error
+func EditBaseFromBaiinfoClassifyEn(classifyId int, classifyNameEn string) (err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `UPDATE base_from_baiinfo_classify SET classify_name_en = ?,modify_time=NOW() WHERE classify_id=? `
+	_, err = o.Raw(sql, classifyNameEn, classifyId).Exec()
+	return
+}
+
 // UpdateBaseFromBaiinfoClassifySort 修改SMM原始数据分类的排序
 func UpdateBaseFromBaiinfoClassifySort(classifyId int) (err error) {
 	o := orm.NewOrmUsingDB("data")
@@ -64,6 +94,7 @@ type BaseFromBaiinfoClassifyItems struct {
 	BaseFromBaiinfoIndexId   int    `description:"指标类型ID"`
 	BaseFromBaiinfoIndexCode string `description:"指标唯一编码"`
 	ClassifyName             string `description:"分类名称"`
+	ClassifyNameEn           string `description:"英文分类名称"`
 	ParentId                 int    `description:"父级id"`
 	Level                    int    `description:"层级"`
 	Sort                     int    `description:"排序字段，越小越靠前，默认值：10"`

models/data_manage/base_from_sci_classify.go

@@ -18,6 +18,7 @@ type BaseFromSciClassify struct {
 	Sort            int       `description:"排序字段，越小越靠前，默认值：10"`
 	ModifyTime      time.Time `description:"修改时间"`
 	CreateTime      time.Time `description:"创建时间"`
+	ClassifyNameEn  string    `description:"英文分类名称"`
 }
 
 // AddBaseFromSciClassify 添加SMM原始数据分类
@@ -35,6 +36,21 @@ func GetBaseFromSciClassifyCount(classifyName string, parentId int) (count int,
 	return
 }
 
+// GetBaseFromSciClassifyEnCount
+// @Description: 获取英文分类名称的个数
+// @author: Roc
+// @datetime 2024-04-16 16:56:14
+// @param classifyNameEn string
+// @param parentId int
+// @return count int
+// @return err error
+func GetBaseFromSciClassifyEnCount(classifyNameEn string, parentId int) (count int, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT COUNT(1) AS count FROM base_from_sci_classify WHERE classify_name_en=? AND parent_id=? `
+	err = o.Raw(sql, classifyNameEn, parentId).QueryRow(&count)
+	return
+}
+
 // GetBaseFromSciClassifyById 通过分类id的获取分类信息
 func GetBaseFromSciClassifyById(classifyId int) (item *BaseFromSciClassify, err error) {
 	o := orm.NewOrmUsingDB("data")
@@ -51,6 +67,20 @@ func EditBaseFromSciClassify(classifyId int, classifyName string) (err error) {
 	return
 }
 
+// EditBaseFromSciClassifyEn
+// @Description: 修改卓创（红桃3）数据英文分类
+// @author: Roc
+// @datetime 2024-04-16 16:56:42
+// @param classifyId int
+// @param classifyNameEn string
+// @return err error
+func EditBaseFromSciClassifyEn(classifyId int, classifyNameEn string) (err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `UPDATE base_from_sci_classify SET classify_name_en = ?,modify_time=NOW() WHERE classify_id=? `
+	_, err = o.Raw(sql, classifyNameEn, classifyId).Exec()
+	return
+}
+
 // UpdateBaseFromSciClassifySort 修改SMM原始数据分类的排序
 func UpdateBaseFromSciClassifySort(classifyId int) (err error) {
 	o := orm.NewOrmUsingDB("data")
@@ -64,6 +94,7 @@ type BaseFromSciClassifyItems struct {
 	BaseFromSciIndexId   int    `description:"指标类型ID"`
 	BaseFromSciIndexCode string `description:"指标唯一编码"`
 	ClassifyName         string `description:"分类名称"`
+	ClassifyNameEn       string `description:"英文分类名称"`
 	ParentId             int    `description:"父级id"`
 	Level                int    `description:"层级"`
 	Sort                 int    `description:"排序字段，越小越靠前，默认值：10"`

models/data_manage/base_from_smm_classify.go

@@ -18,6 +18,7 @@ type BaseFromSmmClassify struct {
 	Sort            int       `description:"排序字段，越小越靠前，默认值：10"`
 	ModifyTime      time.Time `description:"修改时间"`
 	CreateTime      time.Time `description:"创建时间"`
+	ClassifyNameEn  string    `description:"英文分类名称"`
 }
 
 // AddBaseFromSmmClassify 添加SMM原始数据分类
@@ -35,6 +36,21 @@ func GetBaseFromSmmClassifyCount(classifyName string, parentId int) (count int,
 	return
 }
 
+// GetBaseFromSmmClassifyEnCount
+// @Description: 获取英文分类名称的个数
+// @author: Roc
+// @datetime 2024-04-16 16:49:03
+// @param classifyNameEn string
+// @param parentId int
+// @return count int
+// @return err error
+func GetBaseFromSmmClassifyEnCount(classifyNameEn string, parentId int) (count int, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT COUNT(1) AS count FROM base_from_smm_classify WHERE classify_name_en = ? AND parent_id = ? `
+	err = o.Raw(sql, classifyNameEn, parentId).QueryRow(&count)
+	return
+}
+
 // GetBaseFromSmmClassifyById 通过分类id的获取分类信息
 func GetBaseFromSmmClassifyById(classifyId int) (item *BaseFromSmmClassify, err error) {
 	o := orm.NewOrmUsingDB("data")
@@ -51,6 +67,20 @@ func EditBaseFromSmmClassify(classifyId int, classifyName string) (err error) {
 	return
 }
 
+// EditBaseFromSmmClassifyEn
+// @Description: 修改SMM原始数据英文分类
+// @author: Roc
+// @datetime 2024-04-16 16:50:55
+// @param classifyId int
+// @param classifyNameEn string
+// @return err error
+func EditBaseFromSmmClassifyEn(classifyId int, classifyNameEn string) (err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `UPDATE base_from_smm_classify SET classify_name_en = ?,modify_time=NOW() WHERE classify_id=? `
+	_, err = o.Raw(sql, classifyNameEn, classifyId).Exec()
+	return
+}
+
 // UpdateBaseFromSmmClassifySort 修改SMM原始数据分类的排序
 func UpdateBaseFromSmmClassifySort(classifyId int) (err error) {
 	o := orm.NewOrmUsingDB("data")
@@ -64,6 +94,7 @@ type BaseFromSmmClassifyItems struct {
 	BaseFromSmmIndexId   int    `description:"指标类型ID"`
 	BaseFromSmmIndexCode string `description:"指标唯一编码"`
 	ClassifyName         string `description:"分类名称"`
+	ClassifyNameEn       string `description:"英文分类名称"`
 	ParentId             int    `description:"父级id"`
 	Level                int    `description:"层级"`
 	Sort                 int    `description:"排序字段，越小越靠前，默认值：10"`

models/data_manage/mysteel_chemical_classify.go

@@ -18,6 +18,7 @@ type BaseFromMysteelChemicalClassify struct {
 	Sort                              int       `description:"排序字段，越小越靠前，默认值：10"`
 	ModifyTime                        time.Time `description:"修改时间"`
 	CreateTime                        time.Time `description:"创建时间"`
+	ClassifyNameEn                    string    `description:"英文分类名称"`
 }
 
 // AddBaseFromMysteelChemicalClassify 添加钢联化工分类
@@ -27,7 +28,14 @@ func AddBaseFromMysteelChemicalClassify(item *BaseFromMysteelChemicalClassify) (
 	return
 }
 
-// GetBaseFromMysteelChemicalClassifyCount 获取分类名称的个数
+// GetBaseFromMysteelChemicalClassifyCount
+// @Description: 获取中文分类名称的个数
+// @author: Roc
+// @datetime 2024-04-16 16:37:43
+// @param classifyName string
+// @param parentId int
+// @return count int
+// @return err error
 func GetBaseFromMysteelChemicalClassifyCount(classifyName string, parentId int) (count int, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT COUNT(1) AS count FROM base_from_mysteel_chemical_classify WHERE classify_name=? AND parent_id=? `
@@ -35,6 +43,21 @@ func GetBaseFromMysteelChemicalClassifyCount(classifyName string, parentId int)
 	return
 }
 
+// GetBaseFromMysteelChemicalClassifyEnCount
+// @Description:  获取英文分类名称的个数
+// @author: Roc
+// @datetime 2024-04-16 16:28:14
+// @param classifyNameEn string
+// @param parentId int
+// @return count int
+// @return err error
+func GetBaseFromMysteelChemicalClassifyEnCount(classifyNameEn string, parentId int) (count int, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT COUNT(1) AS count FROM base_from_mysteel_chemical_classify WHERE classify_name_en = ? AND parent_id=? `
+	err = o.Raw(sql, classifyNameEn, parentId).QueryRow(&count)
+	return
+}
+
 // GetBaseFromMysteelChemicalClassifyById 通过分类id的获取分类信息
 func GetBaseFromMysteelChemicalClassifyById(classifyId int) (item *BaseFromMysteelChemicalClassify, err error) {
 	o := orm.NewOrmUsingDB("data")
@@ -51,6 +74,20 @@ func EditBaseFromMysteelChemicalClassify(classifyId int, classifyName string) (e
 	return
 }
 
+// EditBaseFromMysteelChemicalClassifyEn
+// @Description: 修改钢联化工英文分类名称
+// @author: Roc
+// @datetime 2024-04-16 16:34:53
+// @param classifyId int
+// @param classifyNameEn string
+// @return err error
+func EditBaseFromMysteelChemicalClassifyEn(classifyId int, classifyNameEn string) (err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `UPDATE base_from_mysteel_chemical_classify SET classify_name_en = ?,modify_time=NOW() WHERE base_from_mysteel_chemical_classify_id=? `
+	_, err = o.Raw(sql, classifyNameEn, classifyId).Exec()
+	return
+}
+
 type BaseFromMysteelChemicalIndexResp struct {
 	List []*BaseFromMysteelChemicalClassifyItems
 }
@@ -59,6 +96,7 @@ type BaseFromMysteelChemicalClassifyItems struct {
 	BaseFromMysteelChemicalIndexId    int                                        `orm:"column(base_from_mysteel_chemical_index_id)"`
 	IndexCode                         string                                     `description:"指标编码"`
 	ClassifyName                      string                                     `description:"分类名称"`
+	ClassifyNameEn                    string                                     `description:"英文分类名称"`
 	ParentId                          int                                        `description:"父级id"`
 	SysUserId                         int                                        `description:"创建人id"`
 	SysUserRealName                   string                                     `description:"创建人姓名"`

services/data/base_from_baiinfo.go

@@ -36,6 +36,7 @@ func AddBaiinfoClassify(classifyName string, parentId, sysUserId int, sysUserNam
 	}
 	classifyInfo = &data_manage.BaseFromBaiinfoClassify{
 		ClassifyName:    classifyName,
+		ClassifyNameEn:  classifyName,
 		ParentId:        parentId,
 		SysUserId:       sysUserId,
 		SysUserRealName: sysUserName,
@@ -56,35 +57,66 @@ func AddBaiinfoClassify(classifyName string, parentId, sysUserId int, sysUserNam
 }
 
 // EditBaiinfoClassify 编辑Baiinfo分类
-func EditBaiinfoClassify(classifyId int, classifyName string, sysUser *system.Admin) (err error, errMsg string) {
+func EditBaiinfoClassify(classifyId int, classifyName, lang string, sysUser *system.Admin) (err error, errMsg string) {
 	item, err := data_manage.GetBaseFromBaiinfoClassifyById(classifyId)
 	if err != nil {
 		errMsg = `保存失败`
 		return
 	}
 
-	// 名字相同，那么就直接返回
+	switch lang {
-	if item.ClassifyName == classifyName {
+	case utils.LangEn:
-		return
-	}
 
-	// 判断名称是否已存在
+		// 名字相同，那么就直接返回
-	count, err := data_manage.GetBaseFromBaiinfoClassifyCount(classifyName, item.ParentId)
+		if item.ClassifyNameEn == classifyName {
-	if err != nil {
+			return
-		errMsg = "判断名称是否已存在失败"
+		}
-		return
-	}
-	if count > 0 {
-		errMsg = "分类名称已存在，请重新输入"
-		err = errors.New(errMsg)
-		return
-	}
 
-	// 修改数据
+		// 判断名称是否已存在
-	err = data_manage.EditBaseFromBaiinfoClassify(classifyId, classifyName)
+		count, tmpErr := data_manage.GetBaseFromBaiinfoClassifyEnCount(classifyName, item.ParentId)
-	if err != nil {
+		if tmpErr != nil {
-		errMsg = "保存失败"
+			err = tmpErr
+			errMsg = "判断名称是否已存在失败"
+			return
+		}
+		if count > 0 {
+			errMsg = "分类名称已存在，请重新输入"
+			err = errors.New(errMsg)
+			return
+		}
+
+		// 修改数据
+		err = data_manage.EditBaseFromBaiinfoClassifyEn(classifyId, classifyName)
+		if err != nil {
+			errMsg = "保存失败"
+		}
+	default:
+
+		// 名字相同，那么就直接返回
+		if item.ClassifyName == classifyName {
+			return
+		}
+
+		// 判断名称是否已存在
+		count, tmpErr := data_manage.GetBaseFromBaiinfoClassifyCount(classifyName, item.ParentId)
+		if tmpErr != nil {
+			err = tmpErr
+			errMsg = "判断名称是否已存在失败"
+			return
+		}
+		if count > 0 {
+			errMsg = "分类名称已存在，请重新输入"
+			err = errors.New(errMsg)
+			return
+		}
+
+		// 修改数据
+		err = data_manage.EditBaseFromBaiinfoClassify(classifyId, classifyName)
+		if err != nil {
+			errMsg = "保存失败"
+		}
 	}
+
 	return
 }
 

services/data/base_from_sci.go

@@ -36,6 +36,7 @@ func AddSciClassify(classifyName string, parentId, sysUserId int, sysUserName st
 	}
 	classifyInfo = &data_manage.BaseFromSciClassify{
 		ClassifyName:    classifyName,
+		ClassifyNameEn:  classifyName,
 		ParentId:        parentId,
 		SysUserId:       sysUserId,
 		SysUserRealName: sysUserName,
@@ -56,35 +57,63 @@ func AddSciClassify(classifyName string, parentId, sysUserId int, sysUserName st
 }
 
 // EditSciClassify 编辑Sci分类
-func EditSciClassify(classifyId int, classifyName string, sysUser *system.Admin) (err error, errMsg string) {
+func EditSciClassify(classifyId int, classifyName, lang string, sysUser *system.Admin) (err error, errMsg string) {
 	item, err := data_manage.GetBaseFromSciClassifyById(classifyId)
 	if err != nil {
 		errMsg = `保存失败`
 		return
 	}
+	switch lang {
+	case utils.LangEn:
+		// 名字相同，那么就直接返回
+		if item.ClassifyNameEn == classifyName {
+			return
+		}
 
-	// 名字相同，那么就直接返回
+		// 判断名称是否已存在
-	if item.ClassifyName == classifyName {
+		count, tmpErr := data_manage.GetBaseFromSciClassifyEnCount(classifyName, item.ParentId)
-		return
+		if tmpErr != nil {
-	}
+			err = tmpErr
+			errMsg = "判断名称是否已存在失败"
+			return
+		}
+		if count > 0 {
+			errMsg = "分类名称已存在，请重新输入"
+			err = errors.New(errMsg)
+			return
+		}
 
-	// 判断名称是否已存在
+		// 修改数据
-	count, err := data_manage.GetBaseFromSciClassifyCount(classifyName, item.ParentId)
+		err = data_manage.EditBaseFromSciClassifyEn(classifyId, classifyName)
-	if err != nil {
+		if err != nil {
-		errMsg = "判断名称是否已存在失败"
+			errMsg = "保存失败"
-		return
+		}
-	}
+	default:
-	if count > 0 {
+		// 名字相同，那么就直接返回
-		errMsg = "分类名称已存在，请重新输入"
+		if item.ClassifyName == classifyName {
-		err = errors.New(errMsg)
+			return
-		return
+		}
-	}
 
-	// 修改数据
+		// 判断名称是否已存在
-	err = data_manage.EditBaseFromSciClassify(classifyId, classifyName)
+		count, tmpErr := data_manage.GetBaseFromSciClassifyCount(classifyName, item.ParentId)
-	if err != nil {
+		if tmpErr != nil {
-		errMsg = "保存失败"
+			err = tmpErr
+			errMsg = "判断名称是否已存在失败"
+			return
+		}
+		if count > 0 {
+			errMsg = "分类名称已存在，请重新输入"
+			err = errors.New(errMsg)
+			return
+		}
+
+		// 修改数据
+		err = data_manage.EditBaseFromSciClassify(classifyId, classifyName)
+		if err != nil {
+			errMsg = "保存失败"
+		}
 	}
+
 	return
 }
 

services/data/base_from_smm.go

@@ -10,10 +10,10 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/models/system"
 	"eta/eta_api/utils"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -406,6 +406,7 @@ func AddSmmClassify(classifyName string, parentId, sysUserId int, sysUserName st
 	}
 	classifyInfo = &data_manage.BaseFromSmmClassify{
 		ClassifyName:    classifyName,
+		ClassifyNameEn:  classifyName,
 		ParentId:        parentId,
 		SysUserId:       sysUserId,
 		SysUserRealName: sysUserName,
@@ -426,35 +427,64 @@ func AddSmmClassify(classifyName string, parentId, sysUserId int, sysUserName st
 }
 
 // EditSmmClassify 编辑Smm分类
-func EditSmmClassify(classifyId int, classifyName string, sysUser *system.Admin) (err error, errMsg string) {
+func EditSmmClassify(classifyId int, classifyName, lang string, sysUser *system.Admin) (err error, errMsg string) {
 	item, err := data_manage.GetBaseFromSmmClassifyById(classifyId)
 	if err != nil {
 		errMsg = `保存失败`
 		return
 	}
 
-	// 名字相同，那么就直接返回
+	switch lang {
-	if item.ClassifyName == classifyName {
+	case utils.LangEn:
-		return
+		// 名字相同，那么就直接返回
-	}
+		if item.ClassifyNameEn == classifyName {
+			return
+		}
 
-	// 判断名称是否已存在
+		// 判断名称是否已存在
-	count, err := data_manage.GetBaseFromSmmClassifyCount(classifyName, item.ParentId)
+		count, tmpErr := data_manage.GetBaseFromSmmClassifyEnCount(classifyName, item.ParentId)
-	if err != nil {
+		if tmpErr != nil {
-		errMsg = "判断名称是否已存在失败"
+			err = tmpErr
-		return
+			errMsg = "判断名称是否已存在失败"
-	}
+			return
-	if count > 0 {
+		}
-		errMsg = "分类名称已存在，请重新输入"
+		if count > 0 {
-		err = errors.New(errMsg)
+			errMsg = "分类名称已存在，请重新输入"
-		return
+			err = errors.New(errMsg)
-	}
+			return
+		}
 
-	// 修改数据
+		// 修改数据
-	err = data_manage.EditBaseFromSmmClassify(classifyId, classifyName)
+		err = data_manage.EditBaseFromSmmClassifyEn(classifyId, classifyName)
-	if err != nil {
+		if err != nil {
-		errMsg = "保存失败"
+			errMsg = "保存失败"
+		}
+	default:
+		// 名字相同，那么就直接返回
+		if item.ClassifyName == classifyName {
+			return
+		}
+
+		// 判断名称是否已存在
+		count, tmpErr := data_manage.GetBaseFromSmmClassifyCount(classifyName, item.ParentId)
+		if tmpErr != nil {
+			err = tmpErr
+			errMsg = "判断名称是否已存在失败"
+			return
+		}
+		if count > 0 {
+			errMsg = "分类名称已存在，请重新输入"
+			err = errors.New(errMsg)
+			return
+		}
+
+		// 修改数据
+		err = data_manage.EditBaseFromSmmClassify(classifyId, classifyName)
+		if err != nil {
+			errMsg = "保存失败"
+		}
 	}
+
 	return
 }
 

services/data/mysteel_chemical.go

@@ -20,7 +20,7 @@ func AddMysteelChemicalClassify(classifyName string, parentId, level, sysUserId
 		return
 	}
 	if count > 0 {
-		errMsg = `分类名称:`+classifyName+` 已存在，请重新输入`
+		errMsg = `分类名称:` + classifyName + ` 已存在，请重新输入`
 		return
 	}
 	//获取该层级下最大的排序数
@@ -29,6 +29,7 @@ func AddMysteelChemicalClassify(classifyName string, parentId, level, sysUserId
 	classifyInfo = &data_manage.BaseFromMysteelChemicalClassify{
 		//BaseFromMysteelChemicalClassifyId: 0,
 		ClassifyName:    classifyName,
+		ClassifyNameEn:  classifyName,
 		ParentId:        parentId,
 		SysUserId:       sysUserId,
 		SysUserRealName: sysUserName,
@@ -46,7 +47,7 @@ func AddMysteelChemicalClassify(classifyName string, parentId, level, sysUserId
 }
 
 // EditMysteelChemicalClassify 编辑钢联化工分类
-func EditMysteelChemicalClassify(classifyId int, classifyName string, sysUser *system.Admin) (err error, errMsg string) {
+func EditMysteelChemicalClassify(classifyId int, classifyName, lang string, sysUser *system.Admin) (err error, errMsg string) {
 	item, err := data_manage.GetBaseFromMysteelChemicalClassifyById(classifyId)
 	if err != nil {
 		errMsg = `保存失败`
@@ -60,28 +61,57 @@ func EditMysteelChemicalClassify(classifyId int, classifyName string, sysUser *s
 		return
 	}
 
-	// 名字相同，那么就直接返回
+	switch lang {
-	if item.ClassifyName == classifyName {
+	case utils.LangEn:
-		return
+		// 名字相同，那么就直接返回
-	}
+		if item.ClassifyNameEn == classifyName {
+			return
+		}
 
-	// 判断名称是否已存在
+		// 判断名称是否已存在
-	count, err := data_manage.GetBaseFromMysteelChemicalClassifyCount(classifyName, item.ParentId)
+		count, tmpErr := data_manage.GetBaseFromMysteelChemicalClassifyEnCount(classifyName, item.ParentId)
-	if err != nil {
+		if tmpErr != nil {
-		errMsg = "判断名称是否已存在失败"
+			err = tmpErr
-		return
+			errMsg = "判断名称是否已存在失败"
-	}
+			return
-	if count > 0 {
+		}
-		errMsg = "分类名称已存在，请重新输入"
+		if count > 0 {
-		err = errors.New(errMsg)
+			errMsg = "分类名称已存在，请重新输入"
-		return
+			err = errors.New(errMsg)
-	}
+			return
+		}
 
-	// 修改数据
+		// 修改数据
-	err = data_manage.EditBaseFromMysteelChemicalClassify(classifyId, classifyName)
+		err = data_manage.EditBaseFromMysteelChemicalClassifyEn(classifyId, classifyName)
-	if err != nil {
+		if err != nil {
-		errMsg = "保存失败"
+			errMsg = "保存失败"
+		}
+	default:
+		// 名字相同，那么就直接返回
+		if item.ClassifyName == classifyName {
+			return
+		}
+
+		// 判断名称是否已存在
+		count, tmpErr := data_manage.GetBaseFromMysteelChemicalClassifyCount(classifyName, item.ParentId)
+		if tmpErr != nil {
+			err = tmpErr
+			errMsg = "判断名称是否已存在失败"
+			return
+		}
+		if count > 0 {
+			errMsg = "分类名称已存在，请重新输入"
+			err = errors.New(errMsg)
+			return
+		}
+
+		// 修改数据
+		err = data_manage.EditBaseFromMysteelChemicalClassify(classifyId, classifyName)
+		if err != nil {
+			errMsg = "保存失败"
+		}
 	}
+
 	return
 }
 
@@ -269,7 +299,7 @@ func AddMysteelChemicalIndex(classifyId int, indexCode, updateWeek, updateTimeSt
 		return
 	}
 	if baseFromMysteelChemicalIndex != nil {
-		errMsg = `指标ID:`+indexCode+` 已存在，请重新输入`
+		errMsg = `指标ID:` + indexCode + ` 已存在，请重新输入`
 		return
 	}
 	// 更新时间切割
@@ -575,7 +605,7 @@ func CurlDelMysteelChemicalData(indexCode, updateWeek string) {
 
 // WeekMap 中英文日期转换
 var WeekMap = map[string]string{
-	"":     "",
+	"":   "",
 	"周一": "monday",
 	"周二": "tuesday",
 	"周三": "wednesday",

utils/constants.go

@@ -419,3 +419,9 @@ const (
 	PercentCalculateTypeRange = 0 // 百分位算法类型-数据区间
 	PercentCalculateTypeNum   = 1 // 百分位算法类型-数据个数
 )
+
+// 语言版本
+const (
+	LangZh = "zh" // 中文语言版本
+	LangEn = "en" // 英文语言版本
+)