fix：python运算的指标关系

controllers/base_from_python.go

@@ -224,7 +224,7 @@ func (this *PythonController) Add() {
 	edbInfoList := models.AnalysisPythonCode(req.PythonCode, req.EdbName)
 
 	//pythonCode
-	err = models.AddPythonEdb(edbInfo.EdbInfoId, edbInfo.EdbCode, edbData, edbInfoList)
+	err = models.AddPythonEdb(edbInfo, edbData, edbInfoList)
 	if err != nil {
 		br.Msg = "生成python指标失败"
 		br.Msg = "生成python指标失败,AddPythonEdb Err:" + err.Error()
@@ -383,7 +383,7 @@ func (this *PythonController) Edit() {
 
 	//匹配所有的关联指标
 	edbInfoList := models.AnalysisPythonCode(req.PythonCode, req.EdbName)
-	err = models.EditEdbInfoCalculateMapping(edbInfo.EdbInfoId, edbInfo.EdbCode, edbInfoList)
+	err = models.EditEdbInfoCalculateMapping(edbInfo, edbInfoList)
 	if err != nil {
 		br.Msg = "修改python运算指标失败"
 		br.Msg = "修改python运算指标失败,存储python代码失败,EditEdbPythonCode Err:" + err.Error()

models/base_from_python.go

@@ -30,7 +30,7 @@ type EdbDataFromPython struct {
 }
 
 // AddPythonEdb 新增python运算指标
-func AddPythonEdb(edbInfoId int, edbCode string, item EdbDataFromPython, edbInfoList []*EdbInfo) (err error) {
+func AddPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython, edbInfoList []*EdbInfo) (err error) {
 	o := orm.NewOrm()
 
 	//添加指标关系
@@ -39,15 +39,15 @@ func AddPythonEdb(edbInfoId int, edbCode string, item EdbDataFromPython, edbInfo
 		calculateMappingItem.CreateTime = time.Now()
 		calculateMappingItem.ModifyTime = time.Now()
 		calculateMappingItem.Sort = 1
-		calculateMappingItem.EdbCode = edbCode
-		calculateMappingItem.EdbInfoId = edbInfoId
+		calculateMappingItem.EdbCode = edbInfo.EdbCode
+		calculateMappingItem.EdbInfoId = edbInfo.EdbInfoId
 		calculateMappingItem.FromEdbInfoId = tmpEdbInfo.EdbInfoId
 		calculateMappingItem.FromEdbCode = tmpEdbInfo.EdbCode
 		calculateMappingItem.FromEdbName = tmpEdbInfo.EdbName
 		calculateMappingItem.FromSource = tmpEdbInfo.Source
 		calculateMappingItem.FromSourceName = tmpEdbInfo.SourceName
-		calculateMappingItem.Source = tmpEdbInfo.Source
-		calculateMappingItem.SourceName = tmpEdbInfo.SourceName
+		calculateMappingItem.Source = edbInfo.Source
+		calculateMappingItem.SourceName = edbInfo.SourceName
 		_, err = o.Insert(calculateMappingItem)
 		if err != nil {
 			return
@@ -69,7 +69,7 @@ func AddPythonEdb(edbInfoId int, edbCode string, item EdbDataFromPython, edbInfo
 		//值
 		val := item.Value[k]
 		saveVal := utils.SubFloatToString(val, 20)
-		addSql += GetAddSql(fmt.Sprint(edbInfoId), edbCode, dateTimeStr, timestampStr, saveVal)
+		addSql += GetAddSql(fmt.Sprint(edbInfo.EdbInfoId), edbInfo.EdbCode, dateTimeStr, timestampStr, saveVal)
 
 		isAdd = true
 	}
@@ -238,13 +238,13 @@ func RefreshAllPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython) (err error) {
 }
 
 // EditEdbInfoCalculateMapping 更新关联关系表
-func EditEdbInfoCalculateMapping(edbInfoId int, edbCode string, edbInfoList []*EdbInfo) (err error) {
+func EditEdbInfoCalculateMapping(edbInfo *EdbInfo, edbInfoList []*EdbInfo) (err error) {
 	o := orm.NewOrm()
 
 	var existCondition string
 	var existPars []interface{}
 	existCondition += " AND edb_info_id=? "
-	existPars = append(existPars, edbInfoId)
+	existPars = append(existPars, edbInfo.EdbInfoId)
 
 	//查询出所有的关联指标
 	existList, err := GetEdbInfoCalculateListByCondition(existCondition, existPars)
@@ -272,15 +272,15 @@ func EditEdbInfoCalculateMapping(edbInfoId int, edbCode string, edbInfoList []*E
 			calculateMappingItem.CreateTime = time.Now()
 			calculateMappingItem.ModifyTime = time.Now()
 			calculateMappingItem.Sort = 1
-			calculateMappingItem.EdbCode = edbCode
-			calculateMappingItem.EdbInfoId = edbInfoId
+			calculateMappingItem.EdbCode = edbInfo.EdbCode
+			calculateMappingItem.EdbInfoId = edbInfo.EdbInfoId
 			calculateMappingItem.FromEdbInfoId = tmpEdbInfo.EdbInfoId
 			calculateMappingItem.FromEdbCode = tmpEdbInfo.EdbCode
 			calculateMappingItem.FromEdbName = tmpEdbInfo.EdbName
 			calculateMappingItem.FromSource = tmpEdbInfo.Source
 			calculateMappingItem.FromSourceName = tmpEdbInfo.SourceName
-			calculateMappingItem.Source = tmpEdbInfo.Source
-			calculateMappingItem.SourceName = tmpEdbInfo.SourceName
+			calculateMappingItem.Source = edbInfo.Source
+			calculateMappingItem.SourceName = edbInfo.SourceName
 			_, err = o.Insert(calculateMappingItem)
 			if err != nil {
 				return
@@ -291,7 +291,7 @@ func EditEdbInfoCalculateMapping(edbInfoId int, edbCode string, edbInfoList []*E
 	for _, v := range existEdbInfoIdMap {
 		//删除，计算指标关联的，基础指标的关联关系
 		sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? and from_edb_info_id=?`
-		_, err = o.Raw(sql, edbInfoId, v).Exec()
+		_, err = o.Raw(sql, edbInfo.EdbInfoId, v).Exec()
 		if err != nil {
 			err = errors.New("删除计算指标关联关系失败,Err:" + err.Error())
 			return