fix

controllers/base_from_business.go

@@ -74,20 +74,25 @@ func (c *BusinessIndexController) Add() {
 		return
 	}
 	cacheKey = utils.CACHE_EDB_DATA_ADD + strconv.Itoa(source) + "_" + req.EdbCode
-	if !utils.Rc.IsExist(cacheKey) {
-		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
-		err = models.AddEdbDataFromMysteelChemical(req.EdbCode)
-		if err != nil {
-			br.Msg = "获取指标信息失败！"
-			br.ErrMsg = "获取指标信息失败 AddEdbDataFromMysteelChemical，Err:" + err.Error()
-			return
-		}
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-	} else {
+	if utils.Rc.IsExist(cacheKey) {
 		br.Ret = 501
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
+		return
 	}
+
+	utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
+	err = models.AddEdbDataFromMysteelChemical(req.EdbCode)
+	if err != nil {
+		br.Msg = "获取指标信息失败！"
+		br.ErrMsg = "获取指标信息失败 AddEdbDataFromMysteelChemical，Err:" + err.Error()
+		return
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+
+	indexObj := new(models.BaseFromBusinessIndex)
+	//判断指标是否存在
+	item, err := indexObj.GetIndexItem(edbCode)
 }

models/edb_data_business.go

@@ -16,11 +16,18 @@ import (
 type Business struct {
 }
 
+type AddBaseParams struct {
+	EdbCode         string `description:"指标编码"`
+	EdbName         string `description:"指标名称"`
+	Unit            string `description:"单位"`
+	ClassifyId      int    `description:"所属分类"`
+	SysUserId       int    `description:"用户id"`
+	SysUserRealName string `description:"用户真实名称"`
+	UniqueCode      string `description:"编码"`
+}
+
 // Add 添加
-func (obj Business) Add(params AddCalculateBatchParams) (edbInfo *EdbInfo, err error, errMsg string) {
-	req := params.Req
-	fromEdbInfo := params.FromEdbInfo
-	edbCode := params.EdbCode
+func (obj Business) Add(params AddBaseParams, classifyId int, businessIndexItem *BaseFromBusinessIndex) (edbInfo *EdbInfo, err error, errMsg string) {
 	o := orm.NewOrm()
 	to, err := o.Begin()
 	if err != nil {
@@ -38,18 +45,20 @@ func (obj Business) Add(params AddCalculateBatchParams) (edbInfo *EdbInfo, err e
 	edbInfo = new(EdbInfo)
 	edbInfo.Source = obj.GetSource()
 	edbInfo.SourceName = obj.GetSourceName()
-	edbInfo.EdbCode = edbCode
-	edbInfo.EdbName = req.EdbName
-	edbInfo.EdbNameSource = req.EdbName
-	edbInfo.Frequency = req.Frequency
-	edbInfo.Unit = req.Unit
-	edbInfo.ClassifyId = req.ClassifyId
+	edbInfo.EdbCode = params.EdbCode
+	edbInfo.EdbName = params.EdbName
+	edbInfo.EdbNameSource = params.EdbName
+	edbInfo.Frequency = businessIndexItem.Frequency
+	edbInfo.Unit = params.Unit
+	edbInfo.ClassifyId = classifyId
 	edbInfo.SysUserId = params.SysUserId
 	edbInfo.SysUserRealName = params.SysUserRealName
 	edbInfo.CreateTime = time.Now()
 	edbInfo.ModifyTime = time.Now()
 	edbInfo.UniqueCode = params.UniqueCode
-	edbInfo.CalculateFormula = req.Formula
+	edbInfo.CalculateFormula = ``
+	edbInfo.EdbNameEn = params.EdbName
+	edbInfo.UnitEn = params.Unit
 	edbInfo.EdbType = obj.GetEdbType()
 	newEdbInfoId, tmpErr := to.Insert(edbInfo)
 	if tmpErr != nil {
@@ -58,31 +67,8 @@ func (obj Business) Add(params AddCalculateBatchParams) (edbInfo *EdbInfo, err e
 	}
 	edbInfo.EdbInfoId = int(newEdbInfoId)
 
-	//关联关系
-	{
-		calculateMappingItem := new(EdbInfoCalculateMapping)
-		calculateMappingItem.CreateTime = time.Now()
-		calculateMappingItem.ModifyTime = time.Now()
-		calculateMappingItem.Sort = 1
-		calculateMappingItem.EdbCode = edbCode
-		calculateMappingItem.EdbInfoId = edbInfo.EdbInfoId
-		calculateMappingItem.FromEdbInfoId = fromEdbInfo.EdbInfoId
-		calculateMappingItem.FromEdbCode = fromEdbInfo.EdbCode
-		calculateMappingItem.FromEdbName = fromEdbInfo.EdbName
-		calculateMappingItem.FromSource = fromEdbInfo.Source
-		calculateMappingItem.FromSourceName = fromEdbInfo.SourceName
-		calculateMappingItem.FromTag = ""
-		calculateMappingItem.Source = edbInfo.Source
-		calculateMappingItem.SourceName = edbInfo.SourceName
-		calculateMappingItem.FromSubSource = edbInfo.SubSource
-		_, err = to.Insert(calculateMappingItem)
-		if err != nil {
-			return
-		}
-	}
-
 	//计算数据
-	err = obj.refresh(to, edbInfo, fromEdbInfo, edbInfo.EdbCode)
+	//err = obj.refresh(to, edbInfo, fromEdbInfo, edbInfo.EdbCode)
 
 	return
 }
@@ -117,8 +103,10 @@ func (obj Business) Edit(params EditCalculateBatchParams) (err error, errMsg str
 	edbInfo.Unit = req.Unit
 	edbInfo.ClassifyId = req.ClassifyId
 	edbInfo.CalculateFormula = req.Formula
+	edbInfo.EdbNameEn = req.EdbNameEn
+	edbInfo.UnitEn = req.UnitEn
 	edbInfo.ModifyTime = time.Now()
-	_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "ModifyTime")
+	_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "ModifyTime", "EdbNameEn", "UnitEn")
 	if err != nil {
 		return
 	}