This commit is contained in:
jh_peng 2024-10-15 18:11:38 +08:00
parent 055fabba11
commit adeda66cda
2 changed files with 23 additions and 24 deletions

View File

@ -6,11 +6,11 @@ import (
func main() {
initialization.InitConfig()
initialization.InitLogger()
initialization.InitPostgres()
initialization.InitBaseDB()
initialization.InitOracle()
//initialization.InitMongoDB()
initialization.InitLogger()
//var reports []*model.Report
//global.PostGreSQL.Where("step = ? AND id IN ?", "FT", []int{30, 31, 32, 33}).Find(&reports)
//for _, report := range reports {

View File

@ -57,7 +57,7 @@ func Histogram(req *request.Histogram) ([]*model.Histogram, error) {
var sumSelection float64 = 0
// 计算最大值、最小值、标准差、均值、数量
//var standardDeviation float64
var max, min string
var maxValue, minValue string
for _, data := range datas {
selectionDecimal, _ := decimal.NewFromString(data[fieldMap[selection]])
if req.XMax != "" && req.XMin != "" {
@ -94,20 +94,20 @@ func Histogram(req *request.Histogram) ([]*model.Histogram, error) {
n++
//difference := sumSelection/n - selectionData
//standardDeviation += math.Pow(difference, 2)
if max == "" {
max = data[fieldMap[selection]]
if maxValue == "" {
maxValue = data[fieldMap[selection]]
} else {
maxDecimal, _ := strconv.ParseFloat(max, 64)
maxDecimal, _ := strconv.ParseFloat(maxValue, 64)
if maxDecimal < selectionData {
max = data[fieldMap[selection]]
maxValue = data[fieldMap[selection]]
}
}
if min == "" {
min = data[fieldMap[selection]]
if minValue == "" {
minValue = data[fieldMap[selection]]
} else {
minDecimal, _ := strconv.ParseFloat(min, 64)
minDecimal, _ := strconv.ParseFloat(minValue, 64)
if selectionData < minDecimal {
min = data[fieldMap[selection]]
minValue = data[fieldMap[selection]]
}
}
if xMax == "" {
@ -141,8 +141,8 @@ func Histogram(req *request.Histogram) ([]*model.Histogram, error) {
Field: filed,
Average: averageFloat64,
//StandardDeviation: standardDeviation,
Max: max,
Min: min,
Max: maxValue,
Min: minValue,
N: n,
})
} else {
@ -151,7 +151,7 @@ func Histogram(req *request.Histogram) ([]*model.Histogram, error) {
var sumSelection float64 = 0
// 计算最大值、最小值、标准差、均值、数量
//var standardDeviation float64
var max, min string
var maxValue, minValue string
for _, data := range datas {
selectionDecimal, _ := decimal.NewFromString(data[fieldMap[selection]])
if req.XMax != "" && req.XMin != "" {
@ -193,20 +193,20 @@ func Histogram(req *request.Histogram) ([]*model.Histogram, error) {
n++
//difference := sumSelection/n - selectionData
//standardDeviation += math.Pow(difference, 2)
if max == "" {
max = data[fieldMap[selection]]
if maxValue == "" {
maxValue = data[fieldMap[selection]]
} else {
maxDecimal, _ := strconv.ParseFloat(max, 64)
maxDecimal, _ := strconv.ParseFloat(maxValue, 64)
if maxDecimal < selectionData {
max = data[fieldMap[selection]]
maxValue = data[fieldMap[selection]]
}
}
if min == "" {
min = data[fieldMap[selection]]
if minValue == "" {
minValue = data[fieldMap[selection]]
} else {
minDecimal, _ := strconv.ParseFloat(min, 64)
minDecimal, _ := strconv.ParseFloat(minValue, 64)
if selectionData < minDecimal {
min = data[fieldMap[selection]]
minValue = data[fieldMap[selection]]
}
}
if xMax == "" {
@ -241,15 +241,14 @@ func Histogram(req *request.Histogram) ([]*model.Histogram, error) {
Field: filed,
Average: averageFloat64,
//StandardDeviation: standardDeviation,
Max: max,
Min: min,
Max: maxValue,
Min: minValue,
N: n,
})
}
}
}
}
// 生成X坐标
if req.XMax != "" {
xMax = req.XMax