diff --git a/main.go b/main.go index 3b3ba50..bdfcc7e 100644 --- a/main.go +++ b/main.go @@ -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 { diff --git a/repository/test.data/chart.go b/repository/test.data/chart.go index 8375935..6138ff0 100644 --- a/repository/test.data/chart.go +++ b/repository/test.data/chart.go @@ -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