Browse Source

返回结构体中添加字段Uom

pull/341/head
zhangxin 3 years ago
parent
commit
338144a9b3
2 changed files with 4 additions and 3 deletions
  1. +1
    -0
      models/report/report.go
  2. +3
    -3
      services/report/implments/FilterDataInfo.service.impl.go

+ 1
- 0
models/report/report.go View File

@ -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"`


+ 3
- 3
services/report/implments/FilterDataInfo.service.impl.go View File

@ -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)
}


Loading…
Cancel
Save