|
|
|
@ -2,11 +2,15 @@ package GPSqlService
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
"dsDataex/MyReport/GPSql/GPSqlDAO"
|
|
|
|
|
"dsDataex/Utils/ConfigUtil"
|
|
|
|
|
"dsDataex/Utils/ES7SqlUtil"
|
|
|
|
|
"dsDataex/Utils/GPUtil"
|
|
|
|
|
"encoding/json"
|
|
|
|
|
"fmt"
|
|
|
|
|
"math/rand"
|
|
|
|
|
"reflect"
|
|
|
|
|
"strconv"
|
|
|
|
|
"time"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -208,6 +212,26 @@ func ConvEcharts(result []map[string]interface{}, queryGroup []string, queryCoun
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 生成0.8~1随机数, 与data相乘
|
|
|
|
|
// Start
|
|
|
|
|
if ConfigUtil.GPSQLIsRandDataNum == 1 {
|
|
|
|
|
rand.Seed(time.Now().UnixNano())
|
|
|
|
|
randRangeMin := int((1 - ConfigUtil.GPSQLRandRangeMin) * 100)
|
|
|
|
|
randRangeMax := int(ConfigUtil.GPSQLRandRangeMax * 100)
|
|
|
|
|
randInt := rand.Intn(randRangeMax - randRangeMin)
|
|
|
|
|
randFloat := float64(randInt) / 100
|
|
|
|
|
|
|
|
|
|
for key, value := range data {
|
|
|
|
|
f, _ := strconv.ParseFloat(value,64)
|
|
|
|
|
r := f * randFloat
|
|
|
|
|
val, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", r), 64)
|
|
|
|
|
s := strconv.FormatFloat(val,'f',-1,64)
|
|
|
|
|
|
|
|
|
|
data[key] = s
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// End
|
|
|
|
|
|
|
|
|
|
echarts.Groups = append(echarts.Groups, group)
|
|
|
|
|
echarts.Datas = append(echarts.Datas, data)
|
|
|
|
|
echarts.Datas2 = append(echarts.Datas2, data2)
|
|
|
|
@ -465,6 +489,28 @@ func ConvEcharts(result []map[string]interface{}, queryGroup []string, queryCoun
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 生成0.8~1随机数, 与data相乘
|
|
|
|
|
// Start
|
|
|
|
|
if ConfigUtil.GPSQLIsRandDataNum == 1 {
|
|
|
|
|
rand.Seed(time.Now().UnixNano())
|
|
|
|
|
randRangeMin := int((1 - ConfigUtil.GPSQLRandRangeMin) * 100)
|
|
|
|
|
randRangeMax := int(ConfigUtil.GPSQLRandRangeMax * 100)
|
|
|
|
|
randInt := rand.Intn(randRangeMax - randRangeMin)
|
|
|
|
|
randFloat := float64(randInt) / 100
|
|
|
|
|
|
|
|
|
|
for key, value := range datas {
|
|
|
|
|
for k , v := range value {
|
|
|
|
|
f, _ := strconv.ParseFloat(v,64)
|
|
|
|
|
r := f * randFloat
|
|
|
|
|
val, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", r), 64)
|
|
|
|
|
s := strconv.FormatFloat(val,'f',-1,64)
|
|
|
|
|
|
|
|
|
|
datas[key][k] = s
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// End
|
|
|
|
|
|
|
|
|
|
echarts.Datas = datas
|
|
|
|
|
if total2Index > -1 {
|
|
|
|
|
echarts.Datas2 = datas2
|
|
|
|
|