..

models/predict_edb_data_calculate_nhcc.go

@@ -630,5 +630,21 @@ func refreshAllPredictCalculateNhcc(to orm.TxOrmer, edbInfo, firstEdbInfo, secon
 			}
 		}
 	}
+
+	//确定最终值
+	var finalLast EdbInfoSearchData
+	sql = ` SELECT max(data_time), value FROM edb_data_predict_calculate_nhcc WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `
+	tmpErr := to.Raw(sql, edbInfo.EdbInfoId, latestDateStr).QueryRow(&finalLast)
+	if tmpErr != nil {
+		if tmpErr.Error() != utils.ErrNoRow() {
+			err = tmpErr
+		}
+		return
+	}else{
+		if finalLast.DataTime != latestDateStr {
+			latestDateStr = finalLast.DataTime
+			latestValue = finalLast.Value
+		}
+	}
 	return
 }