|
@@ -473,7 +473,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
|
|
|
} else {
|
|
|
if v.EdbInfoType == 0 && v.LeadUnit != "" && v.LeadValue > 0 { //领先指标
|
|
|
var startTimeRealTemp time.Time
|
|
|
- startDateParse, _ := time.Parse(utils.FormatDate, startDate)
|
|
|
+ startDateParse, _ := time.ParseInLocation(utils.FormatDate, startDate, time.Local)
|
|
|
switch v.LeadUnit {
|
|
|
case "天":
|
|
|
startTimeRealTemp = startDateParse.AddDate(0, 0, -v.LeadValue)
|
|
@@ -515,7 +515,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
|
|
|
//fmt.Println("line 1011 chart:", v.Source, v.EdbInfoId, startDateReal, endDate)
|
|
|
calendarPreYear := 0
|
|
|
if calendar == "农历" {
|
|
|
- newStartDateReal, err := time.Parse(utils.FormatDate, startDateReal)
|
|
|
+ newStartDateReal, err := time.ParseInLocation(utils.FormatDate, startDateReal, time.Local)
|
|
|
if err != nil {
|
|
|
fmt.Println("time.Parse:" + err.Error())
|
|
|
}
|
|
@@ -572,7 +572,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
|
|
|
}
|
|
|
|
|
|
if chartType == 2 && item.IsAxis == 1 {
|
|
|
- latestDate, tmpErr := time.Parse(utils.FormatDate, v.LatestDate)
|
|
|
+ latestDate, tmpErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
|
|
|
if tmpErr != nil {
|
|
|
//item.DataList = dataList
|
|
|
item.IsNullData = true
|
|
@@ -631,7 +631,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
|
|
|
if length == 0 {
|
|
|
return
|
|
|
}
|
|
|
- latestDate, tmpErr := time.Parse(utils.FormatDate, v.LatestDate)
|
|
|
+ latestDate, tmpErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
|
|
|
if tmpErr != nil {
|
|
|
//item.DataList = dataList
|
|
|
item.IsNullData = true
|
|
@@ -646,14 +646,14 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
|
|
|
latestDate = latestDate.AddDate(-1, 0, 0)
|
|
|
}
|
|
|
latestDateStr := fmt.Sprintf("%d-%s", latestDate.Year(), xStartDate)
|
|
|
- rightAxisDate, err = time.Parse(utils.FormatDate, latestDateStr)
|
|
|
+ rightAxisDate, err = time.ParseInLocation(utils.FormatDate, latestDateStr, time.Local)
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
newDataList := make([]*data_manage.EdbDataList, 0)
|
|
|
for _, v := range dataList {
|
|
|
- dataTime, e := time.Parse(utils.FormatDate, v.DataTime)
|
|
|
+ dataTime, e := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
|
|
|
if e != nil {
|
|
|
err = errors.New("季节性图处理右轴指标数据转换日期失败,Err:" + e.Error())
|
|
|
return
|
|
@@ -711,7 +711,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
|
//根据数据确定最早的年份,和最近年份
|
|
|
//根据横轴的日期,汇总所有的年份
|
|
|
startDate := dataList[0].DataTime
|
|
|
- startDateT, tmpErr := time.Parse(utils.FormatDate, startDate)
|
|
|
+ startDateT, tmpErr := time.ParseInLocation(utils.FormatDate, startDate, time.Local)
|
|
|
if tmpErr != nil {
|
|
|
err = tmpErr
|
|
|
return
|
|
@@ -719,7 +719,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
|
startYear := startDateT.Year()
|
|
|
//获取数据的最新日期
|
|
|
lastDate := dataList[length-1].DataTime
|
|
|
- lastDateT, tmpErr := time.Parse(utils.FormatDate, lastDate)
|
|
|
+ lastDateT, tmpErr := time.ParseInLocation(utils.FormatDate, lastDate, time.Local)
|
|
|
if tmpErr != nil {
|
|
|
err = tmpErr
|
|
|
return
|
|
@@ -745,13 +745,13 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
|
name := fmt.Sprintf("%s_%s", startStr, endStr)
|
|
|
showName := fmt.Sprintf("%d_%d", currentStartYear, currentEndYear)
|
|
|
|
|
|
- startT, tEr := time.Parse(utils.FormatDate, startStr)
|
|
|
+ startT, tEr := time.ParseInLocation(utils.FormatDate, startStr, time.Local)
|
|
|
if tEr != nil {
|
|
|
err = tEr
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- endT, tEr := time.Parse(utils.FormatDate, endStr)
|
|
|
+ endT, tEr := time.ParseInLocation(utils.FormatDate, endStr, time.Local)
|
|
|
if tEr != nil {
|
|
|
err = tEr
|
|
|
return
|
|
@@ -795,7 +795,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
|
}
|
|
|
|
|
|
for _, v := range dataList {
|
|
|
- dataTimeT, _ := time.Parse(utils.FormatDate, v.DataTime)
|
|
|
+ dataTimeT, _ := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
|
|
|
year := dataTimeT.Year()
|
|
|
newItemDate := dataTimeT.AddDate(nowYear-year, 0, 0)
|
|
|
for k, dateItem := range dataMap {
|
|
@@ -810,7 +810,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
|
if jumpYear == 1 {
|
|
|
//计算前一年最大的日期, 只补齐数据到去年
|
|
|
beforeYearMaxDate := fmt.Sprintf("%d-12-31", dateItem.StartDate.Year())
|
|
|
- beforeYearMaxDateT, _ := time.Parse(utils.FormatDate, beforeYearMaxDate)
|
|
|
+ beforeYearMaxDateT, _ := time.ParseInLocation(utils.FormatDate, beforeYearMaxDate, time.Local)
|
|
|
if dataTimeT.Before(beforeYearMaxDateT) || dataTimeT == beforeYearMaxDateT {
|
|
|
newItemDate = dataTimeT.AddDate(nowYear-year-1, 0, 0)
|
|
|
} else {
|
|
@@ -918,7 +918,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
|
//获取数据的最新日期
|
|
|
lastDate := result.List[length-1].Items[itemLength-1].DataTime
|
|
|
maxY := result.List[length-1].Year
|
|
|
- lastDateT, tmpErr := time.Parse(utils.FormatDate, lastDate)
|
|
|
+ lastDateT, tmpErr := time.ParseInLocation(utils.FormatDate, lastDate, time.Local)
|
|
|
if tmpErr != nil {
|
|
|
err = tmpErr
|
|
|
return
|
|
@@ -945,13 +945,13 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
|
endStr := fmt.Sprintf("%d-%s", currentEndYear, xEndDate)
|
|
|
showName := fmt.Sprintf("%d_%d", currentStartYear, currentEndYear)
|
|
|
|
|
|
- startT, tEr := time.Parse(utils.FormatDate, startStr)
|
|
|
+ startT, tEr := time.ParseInLocation(utils.FormatDate, startStr, time.Local)
|
|
|
if tEr != nil {
|
|
|
err = tEr
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- endT, tEr := time.Parse(utils.FormatDate, endStr)
|
|
|
+ endT, tEr := time.ParseInLocation(utils.FormatDate, endStr, time.Local)
|
|
|
if tEr != nil {
|
|
|
err = tEr
|
|
|
return
|
|
@@ -1042,7 +1042,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
|
DataTimestamp: item.DataTimestamp,
|
|
|
Value: item.Value,
|
|
|
}
|
|
|
- dataTimeT, _ := time.Parse(utils.FormatDate, item.DataTime)
|
|
|
+ dataTimeT, _ := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
|
|
|
if (startTmpT.Before(dataTimeT) && endTmpT.After(dataTimeT)) || startTmpT == dataTimeT || endTmpT == dataTimeT {
|
|
|
tmpV := &tmpVal
|
|
|
if findVal, ok := quarterMap[name]; !ok {
|
|
@@ -3629,12 +3629,12 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
|
|
|
startDateStr = fmt.Sprintf("%d-%s", time.Now().Year(), seasonConfig.XStartDate)
|
|
|
endDateStr = fmt.Sprintf("%d-%s", time.Now().Year(), seasonConfig.XEndDate)
|
|
|
- startDate, e := time.Parse(utils.FormatDate, startDateStr)
|
|
|
+ startDate, e := time.ParseInLocation(utils.FormatDate, startDateStr, time.Local)
|
|
|
if e != nil {
|
|
|
err = e
|
|
|
return
|
|
|
}
|
|
|
- endDate, e := time.Parse(utils.FormatDate, endDateStr)
|
|
|
+ endDate, e := time.ParseInLocation(utils.FormatDate, endDateStr, time.Local)
|
|
|
if e != nil {
|
|
|
err = e
|
|
|
return
|
|
@@ -3653,7 +3653,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
continue
|
|
|
}
|
|
|
for _, date := range dataTimeList {
|
|
|
- dateTime, e := time.Parse(utils.FormatDate, date)
|
|
|
+ dateTime, e := time.ParseInLocation(utils.FormatDate, date, time.Local)
|
|
|
if e != nil {
|
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
|
return
|
|
@@ -3769,7 +3769,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
} else {
|
|
|
// 旬度、月度、季度、半年度 不插值,需要先把日期列表和数据map取出来
|
|
|
for _, vv := range v.DataList {
|
|
|
- dateTime, e := time.Parse(utils.FormatDate, vv.DataTime)
|
|
|
+ dateTime, e := time.ParseInLocation(utils.FormatDate, vv.DataTime, time.Local)
|
|
|
if e != nil {
|
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
|
return
|
|
@@ -3942,7 +3942,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
return
|
|
|
}
|
|
|
for _, date := range dataTimeList {
|
|
|
- dateTime, e := time.Parse(utils.FormatDate, date)
|
|
|
+ dateTime, e := time.ParseInLocation(utils.FormatDate, date, time.Local)
|
|
|
if e != nil {
|
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
|
return
|
|
@@ -4026,7 +4026,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
return
|
|
|
}
|
|
|
for _, date := range dataTimeList {
|
|
|
- dateTime, e := time.Parse(utils.FormatDate, date)
|
|
|
+ dateTime, e := time.ParseInLocation(utils.FormatDate, date, time.Local)
|
|
|
if e != nil {
|
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
|
return
|
|
@@ -4089,7 +4089,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
// 自定义右轴
|
|
|
if seasonConfig.RightAxis.IndicatorType != 0 {
|
|
|
if seasonConfig.RightAxis.IndicatorType == 1 {
|
|
|
- startTime, _ := time.Parse(utils.FormatDate, mappingItem.StartDate)
|
|
|
+ startTime, _ := time.ParseInLocation(utils.FormatDate, mappingItem.StartDate, time.Local)
|
|
|
for i := len(quarterDataList) - 1; i > len(quarterDataList)-2 && i > 0; i-- {
|
|
|
var rightMappingItem data_manage.ChartEdbInfoMapping
|
|
|
rightMappingItem = *mappingItem
|
|
@@ -4788,7 +4788,7 @@ func getEdbDataMapListForSeason(chartInfoId, chartType int, calendar, startDate,
|
|
|
} else {
|
|
|
if v.EdbInfoType == 0 && v.LeadUnit != "" && v.LeadValue > 0 { //领先指标
|
|
|
var startTimeRealTemp time.Time
|
|
|
- startDateParse, _ := time.Parse(utils.FormatDate, startDate)
|
|
|
+ startDateParse, _ := time.ParseInLocation(utils.FormatDate, startDate, time.Local)
|
|
|
switch v.LeadUnit {
|
|
|
case "天":
|
|
|
startTimeRealTemp = startDateParse.AddDate(0, 0, -v.LeadValue)
|
|
@@ -4830,7 +4830,7 @@ func getEdbDataMapListForSeason(chartInfoId, chartType int, calendar, startDate,
|
|
|
//fmt.Println("line 1011 chart:", v.Source, v.EdbInfoId, startDateReal, endDate)
|
|
|
calendarPreYear := 0
|
|
|
if calendar == "农历" {
|
|
|
- newStartDateReal, err := time.Parse(utils.FormatDate, startDateReal)
|
|
|
+ newStartDateReal, err := time.ParseInLocation(utils.FormatDate, startDateReal, time.Local)
|
|
|
if err != nil {
|
|
|
fmt.Println("time.Parse:" + err.Error())
|
|
|
}
|
|
@@ -4898,7 +4898,7 @@ func getEdbDataMapListForSeason(chartInfoId, chartType int, calendar, startDate,
|
|
|
}
|
|
|
|
|
|
if chartType == 2 && item.IsAxis == 1 {
|
|
|
- latestDate, tmpErr := time.Parse(utils.FormatDate, v.LatestDate)
|
|
|
+ latestDate, tmpErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
|
|
|
if tmpErr != nil {
|
|
|
//item.DataList = newDataList
|
|
|
item.IsNullData = true
|
|
@@ -4957,7 +4957,7 @@ func getEdbDataMapListForSeason(chartInfoId, chartType int, calendar, startDate,
|
|
|
if length == 0 {
|
|
|
return
|
|
|
}
|
|
|
- latestDate, tmpErr := time.Parse(utils.FormatDate, v.LatestDate)
|
|
|
+ latestDate, tmpErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
|
|
|
if tmpErr != nil {
|
|
|
//item.DataList = newDataList
|
|
|
item.IsNullData = true
|
|
@@ -4972,14 +4972,14 @@ func getEdbDataMapListForSeason(chartInfoId, chartType int, calendar, startDate,
|
|
|
latestDate = latestDate.AddDate(-1, 0, 0)
|
|
|
}
|
|
|
latestDateStr := fmt.Sprintf("%d-%s", latestDate.Year(), xStartDate)
|
|
|
- rightAxisDate, err = time.Parse(utils.FormatDate, latestDateStr)
|
|
|
+ rightAxisDate, err = time.ParseInLocation(utils.FormatDate, latestDateStr, time.Local)
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
newList := make([]*data_manage.EdbDataList, 0)
|
|
|
for _, v := range newDataList {
|
|
|
- dataTime, e := time.Parse(utils.FormatDate, v.DataTime)
|
|
|
+ dataTime, e := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
|
|
|
if e != nil {
|
|
|
err = errors.New("季节性图处理右轴指标数据转换日期失败,Err:" + e.Error())
|
|
|
return
|