|
@@ -208,12 +208,13 @@ func refreshAllPredictCalculateBp(to orm.TxOrmer, edbInfoId, source int, fromEdb
|
|
|
if len(existDataList) > 0 {
|
|
|
//第一个已经入库的日期
|
|
|
firstExistDataTimeStr := existDataList[0].DataTime //计算指标数据第一条的日期字符串
|
|
|
- if len(dateArr) > 0 {
|
|
|
- firstFromDataTimeStr := dateArr[0] //来源数据第一条的日期字符串
|
|
|
- firstExistDataTime, _ := time.ParseInLocation(utils.FormatDate, firstExistDataTimeStr, time.Local) //计算指标数据第一条的日期(time类型)
|
|
|
- firstFromDataTime, _ := time.ParseInLocation(utils.FormatDate, firstFromDataTimeStr, time.Local) //来源数据第一条的日期(time类型)
|
|
|
- nowDateStr := time.Now().Format(utils.FormatDate) //当天日期字符串
|
|
|
- nowDate, _ := time.ParseInLocation(utils.FormatDate, nowDateStr, firstFromDataTime.Location()) //当天日期(time类型)
|
|
|
+ lenDateArr := len(dateArr)
|
|
|
+ if lenDateArr > 0 {
|
|
|
+ firstFromDataTimeStr := dateArr[0] //来源数据第一条的日期字符串
|
|
|
+ firstExistDataTime, _ := time.ParseInLocation(utils.FormatDate, firstExistDataTimeStr, time.Local) //计算指标数据第一条的日期(time类型)
|
|
|
+ firstFromDataTime, _ := time.ParseInLocation(utils.FormatDate, firstFromDataTimeStr, time.Local) //来源数据第一条的日期(time类型)
|
|
|
+ fromEndDateStr := dateArr[lenDateArr-1] //当天日期字符串
|
|
|
+ fromEndDate, _ := time.ParseInLocation(utils.FormatDate, fromEndDateStr, firstFromDataTime.Location()) //当天日期(time类型)
|
|
|
|
|
|
lastValue = fromDataMap[firstFromDataTimeStr]
|
|
|
lastValueStr = decimal.NewFromFloat(lastValue).String()
|
|
@@ -256,7 +257,7 @@ func refreshAllPredictCalculateBp(to orm.TxOrmer, edbInfoId, source int, fromEdb
|
|
|
|
|
|
//第二步 剩余数据每天修改
|
|
|
|
|
|
- day := int(nowDate.Sub(firstExistDataTime).Hours() / float64(24))
|
|
|
+ day := int(fromEndDate.Sub(firstExistDataTime).Hours() / float64(24))
|
|
|
|
|
|
//第三步: 已经入库的数据处理
|
|
|
for _, v := range existDataList {
|
|
@@ -264,7 +265,7 @@ func refreshAllPredictCalculateBp(to orm.TxOrmer, edbInfoId, source int, fromEdb
|
|
|
}
|
|
|
|
|
|
for k := day; k >= 0; k-- {
|
|
|
- needDay := nowDate.AddDate(0, 0, -k)
|
|
|
+ needDay := fromEndDate.AddDate(0, 0, -k)
|
|
|
needDayStr := needDay.Format(utils.FormatDate)
|
|
|
tmpExistData, ok := existDataMap[needDayStr]
|
|
|
if ok {
|