|
@@ -417,11 +417,11 @@ func (obj EdbThsHf) refreshByMongo(edbInfo *EdbInfo, edbBaseMapping *BaseFromEdb
|
|
|
}
|
|
|
|
|
|
existDataMap := make(map[string]*mgo.EdbDataThsHf)
|
|
|
- removeDataTimeMap := make(map[string]bool) //需要移除的日期数据
|
|
|
+ //removeDataTimeMap := make(map[string]bool) //需要移除的日期数据
|
|
|
for _, v := range existDataList {
|
|
|
tmpDate := v.DataTime.Format(utils.FormatDate)
|
|
|
existDataMap[tmpDate] = v
|
|
|
- removeDataTimeMap[tmpDate] = true
|
|
|
+ //removeDataTimeMap[tmpDate] = true
|
|
|
}
|
|
|
|
|
|
// 待添加的数据集
|
|
@@ -483,25 +483,25 @@ func (obj EdbThsHf) refreshByMongo(edbInfo *EdbInfo, edbBaseMapping *BaseFromEdb
|
|
|
coll := mogDataObj.GetCollection()
|
|
|
|
|
|
//删除已经不存在的指标数据(由于该指标当日的数据删除了)
|
|
|
- {
|
|
|
- removeDateList := make([]time.Time, 0)
|
|
|
- for dateTime := range removeDataTimeMap {
|
|
|
- //获取已存在的所有数据
|
|
|
- tmpDateTime, e := time.ParseInLocation(utils.FormatDate, dateTime, time.Local)
|
|
|
- if e != nil {
|
|
|
- err = fmt.Errorf("tmpDateTime parse err: %v", e)
|
|
|
- return
|
|
|
- }
|
|
|
- removeDateList = append(removeDateList, tmpDateTime)
|
|
|
- }
|
|
|
- removeNum := len(removeDateList)
|
|
|
- if removeNum > 0 {
|
|
|
- if e = mogDataObj.RemoveManyByColl(coll, bson.M{"edb_code": edbInfo.EdbCode, "data_time": bson.M{"$in": removeDateList}}); e != nil {
|
|
|
- err = fmt.Errorf("RemoveManyByColl, err: %v", e)
|
|
|
- return
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ //{
|
|
|
+ // removeDateList := make([]time.Time, 0)
|
|
|
+ // for dateTime := range removeDataTimeMap {
|
|
|
+ // //获取已存在的所有数据
|
|
|
+ // tmpDateTime, e := time.ParseInLocation(utils.FormatDate, dateTime, time.Local)
|
|
|
+ // if e != nil {
|
|
|
+ // err = fmt.Errorf("tmpDateTime parse err: %v", e)
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // removeDateList = append(removeDateList, tmpDateTime)
|
|
|
+ // }
|
|
|
+ // removeNum := len(removeDateList)
|
|
|
+ // if removeNum > 0 {
|
|
|
+ // if e = mogDataObj.RemoveManyByColl(coll, bson.M{"edb_code": edbInfo.EdbCode, "data_time": bson.M{"$in": removeDateList}}); e != nil {
|
|
|
+ // err = fmt.Errorf("RemoveManyByColl, err: %v", e)
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ //}
|
|
|
|
|
|
// 插入新数据
|
|
|
if len(addDataList) > 0 {
|