指标数据更新

models/chart_info.go

@@ -1038,9 +1038,10 @@ type AddChartReq struct {
 }
 
 type AddEdbDataReq struct {
-	EdbCode  string
-	EdbType  int
-	DataList []*EdbDataBase
+	EdbInfoId int
+	EdbCode   string
+	EdbType   int
+	DataList  []*EdbDataBase
 }
 
 type EdbDataBase struct {

services/edb_data.go

@@ -14,12 +14,12 @@ import (
 func BatchAddOrUpdateEdbData(req []*models.AddEdbDataReq) (err error) {
 	for _, reqData := range req {
 		if reqData.EdbType == 1 {
-			err = AddOrUpdateEdbData(reqData.EdbCode, reqData.DataList)
+			err = AddOrUpdateEdbData(reqData.EdbInfoId, reqData.EdbCode, reqData.DataList)
 			if err != nil {
 				return
 			}
 		} else {
-			err = AddOrUpdateEdbDataCalculate(reqData.EdbCode, reqData.DataList)
+			err = AddOrUpdateEdbDataCalculate(reqData.EdbInfoId, reqData.EdbCode, reqData.DataList)
 			if err != nil {
 				return
 			}
@@ -28,7 +28,7 @@ func BatchAddOrUpdateEdbData(req []*models.AddEdbDataReq) (err error) {
 	return
 }
 
-func AddOrUpdateEdbData(edbCode string, dataList []*models.EdbDataBase) (err error) {
+func AddOrUpdateEdbData(edbInfoId int, edbCode string, dataList []*models.EdbDataBase) (err error) {
 	// 指标数据为空则不更新
 	if len(dataList) == 0 {
 		return
@@ -59,7 +59,7 @@ func AddOrUpdateEdbData(edbCode string, dataList []*models.EdbDataBase) (err err
 		}
 		if oldObj, ok := existMap[v.DataTime]; !ok {
 			tmp := &mgodb.EdbDataBase{
-				EdbInfoId:     0,
+				EdbInfoId:     edbInfoId,
 				EdbCode:       v.EdbCode,
 				DataTime:      dataTime,
 				Value:         val,
@@ -117,7 +117,7 @@ func AddOrUpdateEdbData(edbCode string, dataList []*models.EdbDataBase) (err err
 	return
 }
 
-func AddOrUpdateEdbDataCalculate(edbCode string, dataList []*models.EdbDataBase) (err error) {
+func AddOrUpdateEdbDataCalculate(edbInfoId int, edbCode string, dataList []*models.EdbDataBase) (err error) {
 	// 指标数据为空则不更新
 	if len(dataList) == 0 {
 		return
@@ -148,7 +148,7 @@ func AddOrUpdateEdbDataCalculate(edbCode string, dataList []*models.EdbDataBase)
 		}
 		if oldObj, ok := existMap[v.DataTime]; !ok {
 			tmp := &mgodb.EdbDataBase{
-				EdbInfoId:     0,
+				EdbInfoId:     edbInfoId,
 				EdbCode:       v.EdbCode,
 				DataTime:      dataTime,
 				Value:         val,

services/edb_info.go

@@ -205,21 +205,21 @@ func AddOrUpdateEdbInfo(edbItem *models.EdbInfo, sysUserId int, sysUserRealName
 		}
 		edbInfo.EdbInfoId = int(edbInfoId)
 	}
-	if edbInfo.EdbType == 1 {
-		err = mgodb.ModifyEdbDataEdbInfoId(edbInfoId, edbInfo.EdbCode)
-		if err != nil {
-			errMsg = "保存失败"
-			err = errors.New("更新指标数据失败，Err:" + err.Error())
-			return
-		}
-	} else {
-		err = mgodb.ModifyEdbCalculateDataEdbInfoId(edbInfoId, edbInfo.EdbCode)
-		if err != nil {
-			errMsg = "保存失败"
-			err = errors.New("更新指标数据失败，Err:" + err.Error())
-			return
-		}
-	}
+	// if edbInfo.EdbType == 1 {
+	// 	err = mgodb.ModifyEdbDataEdbInfoId(edbInfoId, edbInfo.EdbCode)
+	// 	if err != nil {
+	// 		errMsg = "保存失败"
+	// 		err = errors.New("更新指标数据失败，Err:" + err.Error())
+	// 		return
+	// 	}
+	// } else {
+	// 	err = mgodb.ModifyEdbCalculateDataEdbInfoId(edbInfoId, edbInfo.EdbCode)
+	// 	if err != nil {
+	// 		errMsg = "保存失败"
+	// 		err = errors.New("更新指标数据失败，Err:" + err.Error())
+	// 		return
+	// 	}
+	// }
 
 	// 更新es
 	go AddOrEditEdbInfoToEs(edbInfo.EdbInfoId)