|
@@ -6,6 +6,7 @@ import (
|
|
"eta/eta_data_analysis/services/kpler"
|
|
"eta/eta_data_analysis/services/kpler"
|
|
"eta/eta_data_analysis/utils"
|
|
"eta/eta_data_analysis/utils"
|
|
"fmt"
|
|
"fmt"
|
|
|
|
+ "strings"
|
|
"time"
|
|
"time"
|
|
|
|
|
|
"github.com/patrickmn/go-cache"
|
|
"github.com/patrickmn/go-cache"
|
|
@@ -88,6 +89,7 @@ func GetKplerDataByExcel(filePath string) {
|
|
productNames += productName.Name + ","
|
|
productNames += productName.Name + ","
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ productNames = strings.TrimSuffix(productNames, ",")
|
|
fromZoneNameSlice := flowsRequestItem.Origins
|
|
fromZoneNameSlice := flowsRequestItem.Origins
|
|
fromZoneNames := ""
|
|
fromZoneNames := ""
|
|
if len(fromZoneNameSlice) > 0 {
|
|
if len(fromZoneNameSlice) > 0 {
|
|
@@ -95,6 +97,7 @@ func GetKplerDataByExcel(filePath string) {
|
|
fromZoneNames += fromZoneName.Name + ","
|
|
fromZoneNames += fromZoneName.Name + ","
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ fromZoneNames = strings.TrimSuffix(fromZoneNames, ",")
|
|
toZoneNames := ""
|
|
toZoneNames := ""
|
|
toZoneNameSlice := flowsRequestItem.Destinations
|
|
toZoneNameSlice := flowsRequestItem.Destinations
|
|
if len(toZoneNameSlice) > 0 {
|
|
if len(toZoneNameSlice) > 0 {
|
|
@@ -102,6 +105,7 @@ func GetKplerDataByExcel(filePath string) {
|
|
toZoneNames += toZoneName.Name + ","
|
|
toZoneNames += toZoneName.Name + ","
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ toZoneNames = strings.TrimSuffix(toZoneNames, ",")
|
|
flowDirection := flowsRequestItem.FlowDirection
|
|
flowDirection := flowsRequestItem.FlowDirection
|
|
granularity := flowsRequestItem.Granularity
|
|
granularity := flowsRequestItem.Granularity
|
|
split := flowsRequestItem.Split
|
|
split := flowsRequestItem.Split
|
|
@@ -121,6 +125,8 @@ func GetKplerDataByExcel(filePath string) {
|
|
FlowDirection: flowDirection,
|
|
FlowDirection: flowDirection,
|
|
Granularity: granularity,
|
|
Granularity: granularity,
|
|
Split: split,
|
|
Split: split,
|
|
|
|
+ SplitName: index.Name,
|
|
|
|
+ ExcelQueryUrl: index.Request,
|
|
ExcelDataMap: excelDataMap,
|
|
ExcelDataMap: excelDataMap,
|
|
}
|
|
}
|
|
indexList = append(indexList, &tmp)
|
|
indexList = append(indexList, &tmp)
|