季节图时间戳修改为本地时间

services/data/chart_info.go

@@ -703,7 +703,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)
@@ -806,7 +806,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
@@ -890,10 +890,10 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 			// }
 			// nowYear := time.Now().Year()
 			newDataList := make([]*data_manage.EdbDataList, 0)
-			seasonXStartDateWithYearT, _ := time.Parse(utils.FormatDate, seasonXStartDateWithYear)
-			seasonXEndDateWithYearT, _ := time.Parse(utils.FormatDate, seasonXEndDateWithYear)
+			seasonXStartDateWithYearT, _ := time.ParseInLocation(utils.FormatDate, seasonXStartDateWithYear, time.Local)
+			seasonXEndDateWithYearT, _ := time.ParseInLocation(utils.FormatDate, seasonXEndDateWithYear, time.Local)
 			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
@@ -3935,12 +3935,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
@@ -3964,7 +3964,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
@@ -4080,7 +4080,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
@@ -4258,7 +4258,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
@@ -4347,7 +4347,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
@@ -4415,7 +4415,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
@@ -5121,7 +5121,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)
@@ -5163,7 +5163,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())
 			}
@@ -5231,7 +5231,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
@@ -5317,7 +5317,7 @@ func getEdbDataMapListForSeason(chartInfoId, chartType int, calendar, startDate,
 			// nowYear := time.Now().Year()
 			newList := 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
@@ -5329,8 +5329,8 @@ func getEdbDataMapListForSeason(chartInfoId, chartType int, calendar, startDate,
 				// if dataTime.Equal(rightAxisDate) || dataTime.After(rightAxisDate) {
 				// 	newList = append(newList, v)
 				// }
-				seasonXStartDateWithYearT, _ := time.Parse(utils.FormatDate, seasonXStartDateWithYear)
-				seasonXEndDateWithYearT, _ := time.Parse(utils.FormatDate, seasonXEndDateWithYear)
+				seasonXStartDateWithYearT, _ := time.ParseInLocation(utils.FormatDate, seasonXStartDateWithYear, time.Local)
+				seasonXEndDateWithYearT, _ := time.ParseInLocation(utils.FormatDate, seasonXEndDateWithYear, time.Local)
 
 				if (dataTime.After(seasonXStartDateWithYearT) && dataTime.Before(seasonXEndDateWithYearT)) || dataTime.Equal(seasonXStartDateWithYearT) || dataTime.Equal(seasonXEndDateWithYearT) {
 					newList = append(newList, v)