|
|
@@ -115,9 +115,9 @@ func GetPercentileData(chartInfoId int, mappingInfo *data_manage.ChartEdbInfoMap
|
|
|
currDateTime, _ := time.ParseInLocation(utils.FormatDate, tmpData.DataTime, time.Local)
|
|
|
maxVal := tmpData.Value
|
|
|
minVal := tmpData.Value
|
|
|
- for i := 0; i < calculateDay; i++ {
|
|
|
- preVal, ok := dataMap[currDateTime.AddDate(0, 0, -i)]
|
|
|
- if ok {
|
|
|
+ for k := 0; k < calculateDay; k++ {
|
|
|
+ preVal, ok2 := dataMap[currDateTime.AddDate(0, 0, -k)]
|
|
|
+ if ok2 {
|
|
|
if preVal > maxVal {
|
|
|
maxVal = preVal
|
|
|
}
|
|
|
@@ -130,14 +130,14 @@ func GetPercentileData(chartInfoId int, mappingInfo *data_manage.ChartEdbInfoMap
|
|
|
if maxVal == minVal {
|
|
|
continue
|
|
|
}
|
|
|
- tmpV := (tmpData.Value) / (maxVal - minVal) * 100
|
|
|
- tmpV, _ = decimal.NewFromFloat(tmpV).Round(4).Float64()
|
|
|
//百分位=(现值-Min)/(Max-Min)
|
|
|
+ tmpV := (tmpData.Value - minVal) / (maxVal - minVal) * 100
|
|
|
+ tmpV, _ = decimal.NewFromFloat(tmpV).Round(4).Float64()
|
|
|
newDataList = append(newDataList, data_manage.EdbDataList{
|
|
|
EdbDataId: i,
|
|
|
EdbInfoId: edb.EdbInfoId,
|
|
|
- DataTime: dataList[i-1].DataTime,
|
|
|
- DataTimestamp: dataList[i-1].DataTimestamp,
|
|
|
+ DataTime: dataList[i].DataTime,
|
|
|
+ DataTimestamp: dataList[i].DataTimestamp,
|
|
|
Value: tmpV,
|
|
|
})
|
|
|
|
|
|
@@ -256,14 +256,28 @@ func GetFrequencyDistributionData(chartInfoId int, mappingInfo *data_manage.Char
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ var minNum, maxNum int
|
|
|
tmpNum := 0
|
|
|
- for _, tmpMinVal := range XDataList {
|
|
|
+ for k, tmpMinVal := range XDataList {
|
|
|
// 频率
|
|
|
frequencyYNum := distributionDataNumMap[tmpMinVal]
|
|
|
Y1DataList = append(Y1DataList, response.FrequencyDistributionYData{
|
|
|
X: tmpMinVal,
|
|
|
Y: float64(frequencyYNum),
|
|
|
})
|
|
|
+
|
|
|
+ if k == 0 {
|
|
|
+ minNum = frequencyYNum
|
|
|
+ maxNum = frequencyYNum
|
|
|
+ } else {
|
|
|
+ if frequencyYNum < minNum {
|
|
|
+ minNum = frequencyYNum
|
|
|
+ }
|
|
|
+ if frequencyYNum > maxNum {
|
|
|
+ maxNum = frequencyYNum
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
// 累计数
|
|
|
tmpNum += frequencyYNum
|
|
|
// 累计频率
|
|
|
@@ -295,8 +309,8 @@ func GetFrequencyDistributionData(chartInfoId int, mappingInfo *data_manage.Char
|
|
|
}
|
|
|
edbList[0].DataList = nil
|
|
|
dataResp = response.FrequencyDistributionResp{
|
|
|
- LeftMinValue: minVal,
|
|
|
- LeftMaxValue: maxVal,
|
|
|
+ LeftMinValue: float64(minNum),
|
|
|
+ LeftMaxValue: float64(maxNum),
|
|
|
RightMinValue: 0,
|
|
|
RightMaxValue: 100,
|
|
|
DataList: newDataList,
|
