From 338144a9b39e79f64453f2ab8d76b5057184e2c9 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Wed, 23 Jun 2021 09:41:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=84=E4=BD=93?= =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5Uom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/report/report.go | 1 + services/report/implments/FilterDataInfo.service.impl.go | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/models/report/report.go b/models/report/report.go index ad15acb..7c99106 100644 --- a/models/report/report.go +++ b/models/report/report.go @@ -2,6 +2,7 @@ package report type AWMDisplay struct { Title string `json:"title"` + Uom string `json:"uom"` Avg float64 `json:"avg"` Data []FilterDataInfo `json:"data"` Start string `json:"start"` diff --git a/services/report/implments/FilterDataInfo.service.impl.go b/services/report/implments/FilterDataInfo.service.impl.go index 50666c1..2917f38 100644 --- a/services/report/implments/FilterDataInfo.service.impl.go +++ b/services/report/implments/FilterDataInfo.service.impl.go @@ -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) }