Merge branch 'feature/eta_forum3_chart_classify' into debug

controllers/edb_data.go

@@ -0,0 +1,200 @@
+package controllers
+
+import (
+	"encoding/json"
+	"eta/eta_forum_hub/models"
+	"eta/eta_forum_hub/services"
+	"eta/eta_forum_hub/utils"
+	"fmt"
+	"strconv"
+	"time"
+)
+
+type EdbDataController struct {
+	BaseAuthController
+}
+// 根据binlog监听记录，更新指标数据
+// SaveByBinlog 根据binlog监听记录，更新指标数据
+// @Title 根据binlog监听记录，更新指标数据
+// @Description 根据binlog监听记录，更新指标数据
+// @Param   request	body models.EdbDataBinlogReq true "type json string"
+// @Success 200 {object} models.BaseResponse
+// @router /save_by_binlog [post]
+func (this *EdbDataController) SaveByBinlog() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	var req models.EdbDataBinlogReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+
+	if len(req.List) == 0 {
+		br.Msg = "参数异常！"
+		br.ErrMsg = "参数异常，请检查！"
+		return
+	}
+
+	edbInfoIdMap := make(map[int]*models.AddEdbDataBinlogReq)
+	reqList := make([]*models.EdbDataBinlogItem, 0)
+	// 判断指标库里是否存在这些指标，如果不存在，则丢弃，无需处理
+	edbInfoIds := make([]int, 0)
+	for _, item := range req.List {
+		// 解析json
+		var dataItem models.EdbDataBinlogItem
+		err := json.Unmarshal([]byte(item.Item), &dataItem)
+		if err != nil {
+			utils.FileLog.Info("解析binlog数据失败，Err:" + err.Error(), "item", item)
+			continue
+		}
+		dataItem.OpType = item.OpType
+		reqList = append(reqList, &dataItem)
+		edbInfoIds = append(edbInfoIds, dataItem.EdbInfoId)
+	}
+	// 查询指标信息
+	edbInfoList, err := models.GetEdbInfoByIdList(edbInfoIds)
+	if err != nil {
+		br.Msg = "指标信息查询异常！"
+		br.ErrMsg = "指标信息查询失败，Err:" + err.Error()
+		return
+	}
+	existEdbInfoMap := make(map[int]*models.EdbInfo)
+	for _, item := range edbInfoList {
+		existEdbInfoMap[item.EdbInfoId] = item
+	}
+	// edbInfoList := []*models.EdbInfo{
+	// 	{
+	// 		EdbInfoId: 1,
+	// 		EdbCode:   "test_code_1",
+	// 		EdbType:   1,
+	// 	},
+	// 	{
+	// 		EdbInfoId: 2,
+	// 		EdbCode:   "test_code_2",
+	// 		EdbType:   1,
+	// 	},
+	// }
+	// existEdbInfoMap := make(map[int]*models.EdbInfo)
+	// for _, item := range edbInfoList {
+	// 	existEdbInfoMap[item.EdbInfoId] = item
+	// }
+	edbDataIdMap := make(map[string]*models.EdbDataBaseWithOpType)
+	for _, item := range reqList {
+		edbInfo, ok := existEdbInfoMap[item.EdbInfoId]
+		if !ok {
+			continue
+		}
+		if _, ok := edbInfoIdMap[item.EdbInfoId]; !ok {
+			tmp := &models.AddEdbDataBinlogReq{
+				EdbInfoId: item.EdbInfoId,
+				EdbCode: item.EdbCode,
+				EdbType: edbInfo.EdbType,
+			}
+			edbInfoIdMap[item.EdbInfoId] = tmp
+		}
+		value, ok := item.Value.(float64)
+		if !ok {
+			continue
+		}
+		createTime, _ := time.ParseInLocation("2006-01-02 15:04:05", item.CreateTime, time.Local)
+		modifyTime, _ := time.ParseInLocation("2006-01-02 15:04:05", item.ModifyTime, time.Local)
+		dataItem := &models.EdbDataBaseWithOpType{
+			EdbDataBase: &models.EdbDataBase{
+				EdbInfoId: item.EdbInfoId,
+				EdbCode: item.EdbCode,
+				Value: strconv.FormatFloat(value, 'f', -1, 64),
+				DataTimestamp: item.DataTimestamp,
+				DataTime: item.DataTime,
+				CreateTime: createTime,
+				ModifyTime: modifyTime,
+			},
+			OpType: item.OpType,
+		}
+		if _, ok := edbDataIdMap[fmt.Sprintf("%d_%s", item.EdbInfoId, item.DataTime)]; ok {
+			edbDataIdMap[fmt.Sprintf("%d_%s", item.EdbInfoId, item.DataTime)] = dataItem
+		} else {
+			edbDataIdMap[fmt.Sprintf("%d_%s", item.EdbInfoId, item.DataTime)] = dataItem
+		}
+		//edbInfoIdMap[item.EdbInfoId].DataList = append(edbInfoIdMap[item.EdbInfoId].DataList, dataItem)
+	}
+
+	edbDataMinDataTimeMap := make(map[int]string)
+	edbDataMaxDataTimeMap := make(map[int]string)
+	for _, item := range edbDataIdMap {
+		edbInfoIdMap[item.EdbInfoId].DataList = append(edbInfoIdMap[item.EdbInfoId].DataList, item)
+		if edbDataMinDataTimeMap[item.EdbInfoId] == "" || edbDataMinDataTimeMap[item.EdbInfoId] > item.DataTime {
+			edbDataMinDataTimeMap[item.EdbInfoId] = item.DataTime
+		}
+		if edbDataMaxDataTimeMap[item.EdbInfoId] == "" || edbDataMaxDataTimeMap[item.EdbInfoId] < item.DataTime {
+			edbDataMaxDataTimeMap[item.EdbInfoId] = item.DataTime
+		}
+	}
+
+	for _, item := range edbInfoIdMap {
+		minDataTime := edbDataMinDataTimeMap[item.EdbInfoId]
+		maxDataTime := edbDataMaxDataTimeMap[item.EdbInfoId]
+		if item.EdbType == 1 {
+			err := services.AddOrUpdateEdbDataWithOpType(item.EdbInfoId, item.DataList, minDataTime, maxDataTime)
+			if err != nil {
+				br.Msg = "更新指标数据失败！"
+				br.ErrMsg = "更新指标数据失败，Err:" + err.Error()
+				return
+			}
+		} else {
+			err := services.AddOrUpdateEdbDataCalculateWithOpType(item.EdbInfoId, item.DataList, minDataTime, maxDataTime)
+			if err != nil {
+				br.Msg = "更新指标数据失败！"
+				br.ErrMsg = "更新指标数据失败，Err:" + err.Error()
+				return
+			}
+		}
+	}
+	br.Ret = 200
+	br.Success = true
+	return
+}
+
+// TestSaveByBinlog 测试SaveByBinlog接口的测试数据
+// @Title 测试SaveByBinlog接口的测试数据
+// @Description 测试SaveByBinlog接口的测试数据
+// @Success 200 {object} models.BaseResponse
+// @router /test_save_by_binlog [get]
+func (this *EdbDataController) TestSaveByBinlog() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	// 构造测试数据
+	testData := models.EdbDataBinlogReq{
+		List: []*models.EdbDataBinlogDataReq{
+			{
+				OpType: "INSERT",
+				Item: `{"create_time":"2024-10-12 17:03:04","data_time":"2024-09-08","data_timestamp":1725724800000,"edb_code":"test_code_1","edb_data_id":1001,"edb_info_id":1,"modify_time":"2024-10-14 13:37:30","value":71988}`,
+			},
+			{
+				OpType: "UPDATE",
+				Item: `{"create_time":"2024-10-12 17:03:04","data_time":"2024-09-09","data_timestamp":1725811200000,"edb_code":"test_code_1","edb_data_id":1002,"edb_info_id":1,"modify_time":"2024-10-14 13:37:30","value":72500}`,
+			},
+			{
+				OpType: "DELETE",
+				Item: `{"create_time":"2024-10-12 17:03:04","data_time":"2024-09-10","data_timestamp":1725897600000,"edb_code":"test_code_2","edb_data_id":2001,"edb_info_id":2,"modify_time":"2024-10-14 13:37:30","value":85600}`,
+			},
+		},
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取测试数据成功"
+	br.Data = testData
+	return
+}
+
+

models/chart_info.go

@@ -5,11 +5,12 @@ import (
 	"eta/eta_forum_hub/models/system"
 	"eta/eta_forum_hub/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 type ChartInfo struct {
@@ -1053,6 +1054,18 @@ type EdbDataBase struct {
 	DataTimestamp int64
 }
 
+type EdbDataBaseWithOpType struct {
+	*EdbDataBase
+	OpType    string
+}
+
+type AddEdbDataBinlogReq struct {
+	EdbInfoId int
+	EdbCode   string
+	EdbType   int
+	DataList  []*EdbDataBaseWithOpType
+}
+
 type DeleteChartReq struct {
 	ChartInfoId int `description:"图表id"`
 }
@@ -2159,3 +2172,25 @@ type ChartListResp struct {
 	ChartInfoList []*ChartInfo
 	Paging        *paging.PagingItem `description:"分页数据"`
 }
+
+// {"create_time":"2024-10-12 17:03:04","data_time":"2024-09-08","data_timestamp":1725724800000,"edb_code":"smmsmmgd1djt","edb_data_id":88546,"edb_info_id":105933,"modify_time":"2024-10-14 13:37:30","value":71988}
+type EdbDataBinlogItem struct {
+	CreateTime    string    	`json:"create_time"`
+	DataTime      string    	`json:"data_time"`
+	DataTimestamp int64     	`json:"data_timestamp"`
+	EdbCode       string    	`json:"edb_code"`
+	EdbDataId     int      	`json:"edb_data_id"`
+	EdbInfoId     int      	`json:"edb_info_id"`
+	ModifyTime    string    	`json:"modify_time"`
+	Value         interface{}    	`json:"value"`
+	OpType        string    	`json:"OpType"`
+}
+
+type EdbDataBinlogDataReq struct {
+	Item 	 string  `description:"指标数据列表"`
+	OpType   string  `description:"操作类型"`
+}
+
+type EdbDataBinlogReq struct {
+	List []*EdbDataBinlogDataReq `description:"指标数据列表"`
+}

models/mgodb/edb_data_base.go

@@ -86,17 +86,24 @@ func DeleteEdbInfoDataByEdbInfoId(edbInfoId int) (err error) {
 }
 
 // 删除
-func DeleteEdbInfoDataByEdbInfoIdAndDate(edbCode string, dataTime []time.Time) (err error) {
-	filter := bson.D{{"edb_code", edbCode}, {"data_time", bson.D{{"$in", dataTime}}}}
+func DeleteEdbInfoDataByEdbCodeAndDateList(edbCode string, dataTimeList []time.Time) (err error) {
+	filter := bson.D{{"edb_code", edbCode}, {"data_time", bson.D{{"$in", dataTimeList}}}}
+	db := NewMgo(utils.MgoDataDbName, "edb_data_base", utils.MgoDataCli)
+	_, err = db.DeleteMany(filter)
+	return
+}
+
+func DeleteEdbInfoDataByEdbInfoIdAndDateList(edbInfoId int, dataTimeList []time.Time) (err error) {
+	filter := bson.D{{"edb_info_id", edbInfoId}, {"data_time", bson.D{{"$in", dataTimeList}}}}
 	db := NewMgo(utils.MgoDataDbName, "edb_data_base", utils.MgoDataCli)
 	_, err = db.DeleteMany(filter)
 	return
 }
 
 // 更新指标的值
-func ModifyValueEdbDataValue(edbDataId primitive.ObjectID, value float64) (err error) {
+func ModifyValueEdbDataValue(edbDataId primitive.ObjectID, value float64, modifyTime time.Time) (err error) {
 	filter := bson.D{{"_id", edbDataId}}
-	update := bson.D{{"$set", bson.D{{"value", value}, {"modify_time", time.Now()}}}}
+	update := bson.D{{"$set", bson.D{{"value", value}, {"modify_time", modifyTime}}}}
 	db := NewMgo(utils.MgoDataDbName, "edb_data_base", utils.MgoDataCli)
 	_, err = db.UpdateOne(filter, update)
 	return

models/mgodb/edb_data_calculate.go

@@ -68,21 +68,28 @@ func DeleteEdbInfoCalculateDataByEdbInfoId(edbInfoId int) (err error) {
 }
 
 // 更新指标的值
-func ModifyValueEdbCalculateDataValue(edbDataId primitive.ObjectID, value float64) (err error) {
+func ModifyValueEdbCalculateDataValue(edbDataId primitive.ObjectID, value float64, modifyTime time.Time) (err error) {
 	filter := bson.D{{"_id", edbDataId}}
-	update := bson.D{{"$set", bson.D{{"value", value}, {"modify_time", time.Now()}}}}
+	update := bson.D{{"$set", bson.D{{"value", value}, {"modify_time", modifyTime}}}}
 	db := NewMgo(utils.MgoDataDbName, "edb_data_calculate", utils.MgoDataCli)
 	_, err = db.UpdateOne(filter, update)
 	return
 }
 
-func DeleteEdbCalculateDataByEdbInfoIdAndDate(edbCode string, dataTime []time.Time) (err error) {
+func DeleteEdbCalculateDataByEdbCodeAndDateList(edbCode string, dataTime []time.Time) (err error) {
 	filter := bson.D{{"edb_code", edbCode}, {"data_time", bson.D{{"$in", dataTime}}}}
 	db := NewMgo(utils.MgoDataDbName, "edb_data_calculate", utils.MgoDataCli)
 	_, err = db.DeleteMany(filter)
 	return
 }
 
+func DeleteEdbCalculateDataByEdbInfoIdAndDateList(edbInfoId int, dataTime []time.Time) (err error) {
+	filter := bson.D{{"edb_info_id", edbInfoId}, {"data_time", bson.D{{"$in", dataTime}}}}
+	db := NewMgo(utils.MgoDataDbName, "edb_data_calculate", utils.MgoDataCli)
+	_, err = db.DeleteMany(filter)
+	return
+}
+
 // GetEdbCalculateDataList 获取指标的数据（日期正序返回）
 func GetEdbCalculateDataList(endInfoId int, startDate, endDate time.Time) (list []*EdbDataBase, err error) {
 	findOptions := options.Find()

routers/commentsRouter.go

@@ -340,4 +340,22 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_forum_hub/controllers:EdbDataController"] = append(beego.GlobalControllerRouter["eta/eta_forum_hub/controllers:EdbDataController"],
+        beego.ControllerComments{
+            Method: "SaveByBinlog",
+            Router: `/save_by_binlog`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_forum_hub/controllers:EdbDataController"] = append(beego.GlobalControllerRouter["eta/eta_forum_hub/controllers:EdbDataController"],
+        beego.ControllerComments{
+            Method: "TestSaveByBinlog",
+            Router: `/test_save_by_binlog`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
 }

routers/router.go

@@ -55,6 +55,11 @@ func init() {
 				&controllers.ChartClassifyController{},
 			),
 		),
+		web.NSNamespace("/edb_data",
+			web.NSInclude(
+				&controllers.EdbDataController{},
+			),
+		),
 	)
 	web.AddNamespace(ns)
 }

services/edb_data.go

@@ -5,9 +5,10 @@ import (
 	"eta/eta_forum_hub/models/mgodb"
 	"eta/eta_forum_hub/utils"
 	"fmt"
-	"github.com/shopspring/decimal"
 	"strconv"
 	"time"
+
+	"github.com/shopspring/decimal"
 )
 
 func BatchAddOrUpdateEdbData(req []*models.AddEdbDataReq) (err error) {
@@ -28,6 +29,10 @@ func BatchAddOrUpdateEdbData(req []*models.AddEdbDataReq) (err error) {
 }
 
 func AddOrUpdateEdbData(edbCode string, dataList []*models.EdbDataBase) (err error) {
+	// 指标数据为空则不更新
+	if len(dataList) == 0 {
+		return
+	}
 	addList := make([]interface{}, 0)
 	existList, err := mgodb.GetEdbDataBaseByEdbCode(edbCode)
 	if err != nil {
@@ -59,8 +64,8 @@ func AddOrUpdateEdbData(edbCode string, dataList []*models.EdbDataBase) (err err
 				DataTime:      dataTime,
 				Value:         val,
 				Status:        v.Status,
-				CreateTime:    time.Now(),
-				ModifyTime:    time.Now(),
+				CreateTime:    v.CreateTime,
+				ModifyTime:    v.ModifyTime,
 				DataTimestamp: v.DataTimestamp,
 			}
 			addList = append(addList, tmp)
@@ -75,7 +80,7 @@ func AddOrUpdateEdbData(edbCode string, dataList []*models.EdbDataBase) (err err
 		} else {
 			delete(deleteMap, v.DataTime)
 			if val != oldObj.Value {
-				err = mgodb.ModifyValueEdbDataValue(oldObj.EdbDataId, val)
+				err = mgodb.ModifyValueEdbDataValue(oldObj.EdbDataId, val, v.ModifyTime)
 				if err != nil {
 					err = fmt.Errorf("更新指标数据出错 error, %v", err)
 					return
@@ -97,7 +102,7 @@ func AddOrUpdateEdbData(edbCode string, dataList []*models.EdbDataBase) (err err
 		}
 		removeNum := len(removeDateList)
 		if removeNum > 0 {
-			err = mgodb.DeleteEdbInfoDataByEdbInfoIdAndDate(edbCode, removeDateList)
+			err = mgodb.DeleteEdbInfoDataByEdbCodeAndDateList(edbCode, removeDateList)
 			if err != nil {
 				err = fmt.Errorf("删除多余日期失败，error, %v", err)
 				return
@@ -113,6 +118,10 @@ func AddOrUpdateEdbData(edbCode string, dataList []*models.EdbDataBase) (err err
 }
 
 func AddOrUpdateEdbDataCalculate(edbCode string, dataList []*models.EdbDataBase) (err error) {
+	// 指标数据为空则不更新
+	if len(dataList) == 0 {
+		return
+	}
 	addList := make([]interface{}, 0)
 	existList, err := mgodb.GetEdbDataCalculateByEdbCode(edbCode)
 	if err != nil {
@@ -144,8 +153,8 @@ func AddOrUpdateEdbDataCalculate(edbCode string, dataList []*models.EdbDataBase)
 				DataTime:      dataTime,
 				Value:         val,
 				Status:        v.Status,
-				CreateTime:    time.Now(),
-				ModifyTime:    time.Now(),
+				CreateTime:    v.CreateTime,
+				ModifyTime:    v.ModifyTime,
 				DataTimestamp: v.DataTimestamp,
 			}
 			addList = append(addList, tmp)
@@ -160,7 +169,7 @@ func AddOrUpdateEdbDataCalculate(edbCode string, dataList []*models.EdbDataBase)
 		} else {
 			delete(deleteMap, v.DataTime)
 			if val != oldObj.Value {
-				err = mgodb.ModifyValueEdbCalculateDataValue(oldObj.EdbDataId, val)
+				err = mgodb.ModifyValueEdbCalculateDataValue(oldObj.EdbDataId, val, v.ModifyTime)
 				if err != nil {
 					err = fmt.Errorf("更新指标数据出错 error, %v", err)
 					return
@@ -182,7 +191,7 @@ func AddOrUpdateEdbDataCalculate(edbCode string, dataList []*models.EdbDataBase)
 		}
 		removeNum := len(removeDateList)
 		if removeNum > 0 {
-			err = mgodb.DeleteEdbCalculateDataByEdbInfoIdAndDate(edbCode, removeDateList)
+			err = mgodb.DeleteEdbCalculateDataByEdbCodeAndDateList(edbCode, removeDateList)
 			if err != nil {
 				err = fmt.Errorf("删除多余日期失败，error, %v", err)
 				return
@@ -361,3 +370,195 @@ func GetEdbDataTbzForSeason(frequency string, tmpDataList []*models.EdbDataList,
 
 	return
 }
+
+// AddOrUpdateEdbDataWithOpType 根据操作类型，更新指标数据
+func AddOrUpdateEdbDataWithOpType(edbInfoId int, dataList []*models.EdbDataBaseWithOpType, minDataTime string, maxDataTime string) (err error) {
+	// 指标数据为空则不更新
+	if len(dataList) == 0 {
+		return
+	}
+	addList := make([]interface{}, 0)
+	minDataTimeT, err := time.ParseInLocation(utils.FormatDate, minDataTime, time.Local)
+	if err != nil {
+		err = fmt.Errorf("日期格式错误 error, %v", err)
+		return
+	}
+	maxDataTimeT, err := time.ParseInLocation(utils.FormatDate, maxDataTime, time.Local)
+	if err != nil {
+		err = fmt.Errorf("日期格式错误 error, %v", err)
+		return
+	}
+	existList, err := mgodb.GetEdbDataList(edbInfoId, minDataTimeT, maxDataTimeT)
+	if err != nil {
+		err = fmt.Errorf("查询指标数据出错 error, %v", err)
+		return
+	}
+	existMap := make(map[string]*mgodb.EdbDataBase, len(existList))
+	removeDateList := make([]time.Time, 0)
+	for _, exist := range existList {
+		tmp := exist.DataTime.Format(utils.FormatDate)
+		existMap[tmp] = exist
+	}
+	for _, v := range dataList {
+		dataTime, e := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
+		if e != nil {
+			err = fmt.Errorf("时间格式化出错 error, %v", e)
+			return
+		}
+		val, e := strconv.ParseFloat(v.Value, 64)
+		if e != nil {
+			err = fmt.Errorf("指标数据格式化出错 error, %v", e)
+			return
+		}
+		if oldObj, ok := existMap[v.DataTime]; !ok {
+			if v.OpType == "insert"  || v.OpType == "update" {
+				tmp := &mgodb.EdbDataBase{
+					EdbInfoId:     v.EdbInfoId,
+					EdbCode:       v.EdbCode,
+					DataTime:      dataTime,
+					Value:         val,
+					Status:        v.Status,
+					CreateTime:    v.CreateTime,
+					ModifyTime:    v.ModifyTime,
+					DataTimestamp: v.DataTimestamp,
+				}
+				addList = append(addList, tmp)
+				if len(addList) >500 {
+					err = mgodb.InsertEdbDataBatch(addList)
+					if err != nil {
+						err = fmt.Errorf("批量新增指标数据失败 error, %v", e)
+						return
+					}
+					addList = make([]interface{}, 0)
+					continue
+				}
+			}
+		} else {
+			if v.OpType != "delete" {
+				if v.ModifyTime.After(oldObj.ModifyTime) {
+					err = mgodb.ModifyValueEdbDataValue(oldObj.EdbDataId, val, v.ModifyTime)
+					if err != nil {
+						err = fmt.Errorf("更新指标数据出错 error, %v", err)
+						return
+					}
+				}
+			}else if v.OpType == "delete" {
+				removeDateList = append(removeDateList, dataTime)
+				// 删除数据
+				// err = mgodb.DeleteEdbInfoDataByEdbInfoIdAndDate(v.EdbCode, v.DataTime)
+				// if err != nil {
+				// 	err = fmt.Errorf("删除指标数据出错 error, %v", err)
+				// 	return
+			}
+		}
+	}
+
+	//遍历deletemap，找出需要删除的日期
+	
+	removeNum := len(removeDateList)
+	if removeNum > 0 {
+		err = mgodb.DeleteEdbInfoDataByEdbInfoIdAndDateList(edbInfoId, removeDateList)
+		if err != nil {
+			err = fmt.Errorf("删除多余日期失败，error, %v", err)
+			return
+		}
+	}
+	
+
+	if len(addList) > 0 {
+		err = mgodb.InsertEdbDataBatch(addList)
+	}
+
+	return
+}
+
+func AddOrUpdateEdbDataCalculateWithOpType(edbInfoId int, dataList []*models.EdbDataBaseWithOpType, minDataTime string, maxDataTime string) (err error) {
+	// 指标数据为空则不更新
+	if len(dataList) == 0 {
+		return
+	}
+	addList := make([]interface{}, 0)
+	minDataTimeT, err := time.ParseInLocation(utils.FormatDate, minDataTime, time.Local)
+	if err != nil {
+		err = fmt.Errorf("日期格式错误 error, %v", err)
+		return
+	}
+	maxDataTimeT, err := time.ParseInLocation(utils.FormatDate, maxDataTime, time.Local)
+	if err != nil {
+		err = fmt.Errorf("日期格式错误 error, %v", err)
+		return
+	}
+	existList, err := mgodb.GetEdbCalculateDataList(edbInfoId, minDataTimeT, maxDataTimeT)
+	if err != nil {
+		err = fmt.Errorf("查询指标数据出错 error, %v", err)
+		return
+	}
+	existMap := make(map[string]*mgodb.EdbDataBase, len(existList))
+	removeDateList := make([]time.Time, 0)
+	for _, exist := range existList {
+		tmp := exist.DataTime.Format(utils.FormatDate)
+		existMap[tmp] = exist
+	}
+	for _, v := range dataList {
+		dataTime, e := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
+		if e != nil {
+			err = fmt.Errorf("时间格式化出错 error, %v", e)
+			return
+		}
+		val, e := strconv.ParseFloat(v.Value, 64)
+		if e != nil {
+			err = fmt.Errorf("指标数据格式化出错 error, %v", e)
+			return
+		}
+		if oldObj, ok := existMap[v.DataTime]; !ok {
+			if v.OpType == "insert"  || v.OpType == "update" {
+				tmp := &mgodb.EdbDataBase{
+						EdbInfoId:     v.EdbInfoId,
+						EdbCode:       v.EdbCode,
+						DataTime:      dataTime,
+						Value:         val,
+						Status:        v.Status,
+						CreateTime:    v.CreateTime,
+						ModifyTime:    v.ModifyTime,
+						DataTimestamp: v.DataTimestamp,
+					}
+				addList = append(addList, tmp)
+				if len(addList) >500 {
+					err = mgodb.InsertEdbCalculateDataBatch(addList)
+					if err != nil {
+						err = fmt.Errorf("批量新增指标数据失败 error, %v", e)
+						return
+					}
+					addList = make([]interface{}, 0)
+					continue
+				}
+			}
+		} else {
+			if v.OpType != "delete" {
+				if v.ModifyTime.After(oldObj.ModifyTime) {
+					err = mgodb.ModifyValueEdbCalculateDataValue(oldObj.EdbDataId, val, v.ModifyTime)
+					if err != nil {
+						err = fmt.Errorf("更新指标数据出错 error, %v", err)
+						return
+					}
+				}
+			} else if v.OpType == "delete" {
+				removeDateList = append(removeDateList, dataTime)
+			}
+		}
+	}
+	//遍历deleteMap，找出需要删除的日期
+	removeNum := len(removeDateList)
+	if removeNum > 0 {
+		err = mgodb.DeleteEdbCalculateDataByEdbInfoIdAndDateList(edbInfoId, removeDateList)
+		if err != nil {
+			err = fmt.Errorf("删除多余日期失败，error, %v", err)
+			return
+		}
+	}
+
+	if len(addList) > 0 {
+		err = mgodb.InsertEdbCalculateDataBatch(addList)
+	}
+	return
+}