|
|
@ -8,7 +8,6 @@ import ( |
|
|
|
"LAPP_GAAS_GFrame_BACKEND/grmi" |
|
|
|
meta "LAPP_GAAS_GFrame_BACKEND/meta/report" |
|
|
|
model "LAPP_GAAS_GFrame_BACKEND/models/report" |
|
|
|
"LAPP_GAAS_GFrame_BACKEND/utils" |
|
|
|
"errors" |
|
|
|
"fmt" |
|
|
|
"reflect" |
|
|
@ -304,8 +303,8 @@ func (impl *FilterDataInfoServiceImplement) GetDisplayData() (result []model.AWM |
|
|
|
engine := slaves[2] |
|
|
|
session := engine.NewSession() |
|
|
|
defer session.Close() |
|
|
|
//now := time.Now()
|
|
|
|
now, _ := time.ParseInLocation(grmi.DatetimeOutFormat, "2021-06-09 21:00:00", utils.TimezoneLocation) |
|
|
|
now := time.Now() |
|
|
|
//now, _ := time.ParseInLocation(grmi.DatetimeOutFormat, "2021-06-09 21:00:00", utils.TimezoneLocation)
|
|
|
|
tempTime, err := time.ParseDuration("-1h") |
|
|
|
if err != nil { |
|
|
|
return result, err |
|
|
@ -350,6 +349,7 @@ func (impl *FilterDataInfoServiceImplement) GetDisplayData() (result []model.AWM |
|
|
|
displayData.Title = config.Title |
|
|
|
displayData.Standard = config.StandardValue |
|
|
|
displayData.Avg = avg |
|
|
|
displayData.Uom = config.Uom |
|
|
|
displayData.UseField = meta.FilterDataInfo.TableName + "-" + config.StatisticField |
|
|
|
result = append(result, displayData) |
|
|
|
} |
|
|
|