Browse Source

修改时间为本地时间

kobe6258 1 week ago
parent
commit
5863a0af76

+ 2 - 2
controllers/base_from_clarksons.go

@@ -145,8 +145,8 @@ func (this *ClarksonsDataController) ClarksonsData() {
 				}
 			}
 			if len(itemsIndex) > 2 {
-				time1, _ := time.Parse(utils.FormatDate, itemsIndex[0].DataTime)
-				time2, _ := time.Parse(utils.FormatDate, itemsIndex[1].DataTime)
+				time1, _ := time.ParseInLocation(utils.FormatDate, itemsIndex[0].DataTime, time.Local)
+				time2, _ := time.ParseInLocation(utils.FormatDate, itemsIndex[1].DataTime, time.Local)
 				diff := time2.Sub(time1).Hours() / 24
 
 				if diff < 5 {

+ 3 - 3
controllers/base_from_ths_hf.go

@@ -561,7 +561,7 @@ func (this *ThsHfController) EdbAdd() {
 		}
 		timePrefix := time.Now().Local().Format(utils.FormatDate)
 		st := fmt.Sprintf("%s %s", timePrefix, convertRule.ConvertFixed.FixedTime)
-		_, e := time.Parse(utils.FormatDateTime, st)
+		_, e := time.ParseInLocation(utils.FormatDateTime, st, time.Local)
 		if e != nil {
 			br.Msg = "指定时间格式有误"
 			return
@@ -584,7 +584,7 @@ func (this *ThsHfController) EdbAdd() {
 			startTimePre = time.Now().Local().AddDate(0, 0, -1).Format(utils.FormatDate)
 		}
 		st := fmt.Sprintf("%s %s", startTimePre, convertRule.ConvertArea.StartTime)
-		startTime, e := time.Parse(utils.FormatDateTime, st)
+		startTime, e := time.ParseInLocation(utils.FormatDateTime, st, time.Local)
 		if e != nil {
 			br.Msg = "起始时间格式有误"
 			return
@@ -606,7 +606,7 @@ func (this *ThsHfController) EdbAdd() {
 			endTimePre = time.Now().Local().AddDate(0, 0, -1).Format(utils.FormatDate)
 		}
 		ed := fmt.Sprintf("%s %s", endTimePre, convertRule.ConvertArea.EndTime)
-		endTime, e := time.Parse(utils.FormatDateTime, ed)
+		endTime, e := time.ParseInLocation(utils.FormatDateTime, ed, time.Local)
 		if e != nil {
 			br.Msg = "截止时间格式有误"
 			return

+ 10 - 10
controllers/commodity_coal.go

@@ -150,7 +150,7 @@ func (this *CoalMineDataController) JsmHistory() {
 				var item models.BaseFromCoalmineJsmIndex
 				if k == 0 {
 					text := cell.Value
-					parsedTime, err := time.Parse("01-02-06", text)
+					parsedTime, err := time.ParseInLocation("01-02-06", text, time.Local)
 					if err != nil {
 						fmt.Println("解析时间字符串出错:", err)
 						return
@@ -386,9 +386,9 @@ func (this *CoalMineDataController) CoastalHistory() {
 							if len(text) < 6 {
 								dataTime = ExcelDateToDate(text).Format(utils.FormatDate)
 							} else {
-								parsedTime, err := time.Parse("01-02-06", text)
+								parsedTime, err := time.ParseInLocation("01-02-06", text, time.Local)
 								if err != nil {
-									parsedTime, err = time.Parse("2006/01/02", text)
+									parsedTime, err = time.ParseInLocation("2006/01/02", text, time.Local)
 									if err != nil {
 										fmt.Println("解析时间字符串出错:", err)
 										return
@@ -613,9 +613,9 @@ func (this *CoalMineDataController) InlandHistory() {
 							if len(text) < 6 {
 								dataTime = ExcelDateToDate(text).Format(utils.FormatDate)
 							} else {
-								parsedTime, err := time.Parse("01-02-06", text)
+								parsedTime, err := time.ParseInLocation("01-02-06", text, time.Local)
 								if err != nil {
-									parsedTime, err = time.Parse("2006/01/02", text)
+									parsedTime, err = time.ParseInLocation("2006/01/02", text, time.Local)
 									if err != nil {
 										fmt.Println("解析时间字符串出错:", err)
 										return
@@ -1234,9 +1234,9 @@ func (this *CoalMineDataController) Coastal() {
 							if len(text) < 6 {
 								dataTime = ExcelDateToDate(text).Format(utils.FormatDate)
 							} else {
-								parsedTime, err := time.Parse("01-02-06", text)
+								parsedTime, err := time.ParseInLocation("01-02-06", text, time.Local)
 								if err != nil {
-									parsedTime, err = time.Parse("2006/01/02", text)
+									parsedTime, err = time.ParseInLocation("2006/01/02", text, time.Local)
 									if err != nil {
 										fmt.Println("解析时间字符串出错:", err)
 										return
@@ -1462,9 +1462,9 @@ func (this *CoalMineDataController) Inland() {
 							if len(text) < 6 {
 								dataTime = ExcelDateToDate(text).Format(utils.FormatDate)
 							} else {
-								parsedTime, err := time.Parse("01-02-06", text)
+								parsedTime, err := time.ParseInLocation("01-02-06", text, time.Local)
 								if err != nil {
-									parsedTime, err = time.Parse("2006/01/02", text)
+									parsedTime, err = time.ParseInLocation("2006/01/02", text, time.Local)
 									if err != nil {
 										utils.FileLog.Info("解析时间字符串出错:", err)
 										fmt.Println("解析时间字符串出错:", err)
@@ -1643,7 +1643,7 @@ func (this *CoalMineDataController) Firm() {
 					if k > 0 && text != "" {
 						month = text
 						month = utils.ConvertToFormatDay(month)
-						time, _ := time.Parse(utils.FormatDate, month)
+						time, _ := time.ParseInLocation(utils.FormatDate, month, time.Local)
 						yearInt := time.Year()
 						monthInt := int(time.Month())
 						year = strconv.Itoa(yearInt)

+ 1 - 1
controllers/edb_info.go

@@ -294,7 +294,7 @@ func (this *EdbInfoController) RefreshCheck() {
 		return
 	}
 
-	_, err = time.Parse(utils.FormatDate, req.LatestDate)
+	_, err = time.ParseInLocation(utils.FormatDate, req.LatestDate, time.Local)
 	if err != nil {
 		br.Msg = "查询日期格式错误"
 		return

+ 2 - 2
controllers/shanghai_smm.go

@@ -321,8 +321,8 @@ func (this *ShanghaiSmmController) RefreshExcel() {
 		isAdd := false
 		indexItem := new(models.BaseFromSmmIndex)
 		indexItem.BaseFromSmmIndexId = indexInfo.BaseFromSmmIndexId
-		startDate, _ := time.Parse(utils.FormatDate, indexInfo.StartDate)
-		endDate, _ := time.Parse(utils.FormatDate, indexInfo.EndDate)
+		startDate, _ := time.ParseInLocation(utils.FormatDate, indexInfo.StartDate, time.Local)
+		endDate, _ := time.ParseInLocation(utils.FormatDate, indexInfo.EndDate, time.Local)
 		if v.LastDate.After(endDate) {
 			isAdd = true
 			indexItem.EndDate = v.LastDate.Format(utils.FormatDate)

+ 5 - 5
models/base_from_adjust.go

@@ -116,7 +116,7 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 		{
 			var fromEdbEndDate time.Time
 			if fromEdbInfo.EndDate != `0000-00-00` {
-				fromEdbEndDate, _ = time.Parse(utils.FormatDate, fromEdbInfo.EndDate)
+				fromEdbEndDate, _ = time.ParseInLocation(utils.FormatDate, fromEdbInfo.EndDate, time.Local)
 			}
 			edbAdjustConf := &EdbAdjustConf{
 				EdbInfoId:     edbInfo.EdbInfoId,
@@ -179,7 +179,7 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 			}
 			var fromEdbEndDate time.Time
 			if fromEdbInfo.EndDate != `0000-00-00` {
-				fromEdbEndDate, _ = time.Parse(utils.FormatDate, fromEdbInfo.EndDate)
+				fromEdbEndDate, _ = time.ParseInLocation(utils.FormatDate, fromEdbInfo.EndDate, time.Local)
 			}
 
 			// 获取之前的配置
@@ -319,7 +319,7 @@ func RefreshAllAdjustEdb(edbInfo *EdbInfo, fromEdbInfo *EdbInfo) (err error) {
 		saveVal := utils.SubFloatToString(val, 20)
 		if existVal, ok := existDataMap[currDay]; !ok {
 			//格式化时间
-			currentDate, tmpErr := time.Parse(utils.FormatDate, item.DataTime)
+			currentDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
 			if tmpErr != nil {
 				err = tmpErr
 				return
@@ -355,7 +355,7 @@ func RefreshAllAdjustEdb(edbInfo *EdbInfo, fromEdbInfo *EdbInfo) (err error) {
 		{
 			var fromEdbEndDate time.Time
 			if fromEdbInfo.EndDate != `0000-00-00` {
-				fromEdbEndDate, _ = time.Parse(utils.FormatDate, fromEdbInfo.EndDate)
+				fromEdbEndDate, _ = time.ParseInLocation(utils.FormatDate, fromEdbInfo.EndDate, time.Local)
 			}
 			edbAdjustConf.SourceEndDate = fromEdbEndDate
 			edbAdjustConf.ModifyTime = time.Now()
@@ -407,7 +407,7 @@ func FixData() {
 		}
 		var fromEdbEndDate time.Time
 		if fromEdbInfo.EndDate != `0000-00-00` {
-			fromEdbEndDate, _ = time.Parse(utils.FormatDate, fromEdbInfo.EndDate)
+			fromEdbEndDate, _ = time.ParseInLocation(utils.FormatDate, fromEdbInfo.EndDate, time.Local)
 		}
 
 		// 获取之前的配置

+ 1 - 1
models/base_from_baiinfo.go

@@ -58,7 +58,7 @@ func AddEdbDataFromBaiinfo(edbCode string) (err error) {
 	existMap := make(map[string]string)
 	for _, sv := range baiinfoBaseDataAll {
 		eDate := sv.DataTime
-		dataTime, err := time.Parse(utils.FormatDate, eDate)
+		dataTime, err := time.ParseInLocation(utils.FormatDate, eDate, time.Local)
 		if err != nil {
 			return err
 		}

+ 1 - 1
models/base_from_ccf.go

@@ -67,7 +67,7 @@ func (obj BaseFromCCF) Add(edbCode string) (err error) {
 	existMap := make(map[string]string)
 	for _, sv := range ccfBaseDataAll {
 		eDate := sv.DataTime
-		dataTime, err := time.Parse(utils.FormatDate, eDate)
+		dataTime, err := time.ParseInLocation(utils.FormatDate, eDate, time.Local)
 		if err != nil {
 			return err
 		}

+ 1 - 1
models/base_from_fenwei.go

@@ -66,7 +66,7 @@ func (obj BaseFromFenwei) Add(edbCode string) (err error) {
 	existMap := make(map[string]string)
 	for _, sv := range fenweiBaseDataAll {
 		eDate := sv.DataTime
-		dataTime, err := time.Parse(utils.FormatDate, eDate)
+		dataTime, err := time.ParseInLocation(utils.FormatDate, eDate, time.Local)
 		if err != nil {
 			return err
 		}

+ 1 - 1
models/base_from_gpr_risk.go

@@ -69,7 +69,7 @@ func (obj BaseFromGprRisk) Add(edbCode string) (err error) {
 	for i := 0; i < length; i++ {
 		sv := gprRiskBaseDataAll[i]
 		eDate := sv.DataTime
-		dataTime, err := time.Parse(utils.FormatDate, eDate)
+		dataTime, err := time.ParseInLocation(utils.FormatDate, eDate, time.Local)
 		if err != nil {
 			return err
 		}

+ 1 - 1
models/base_from_national_statistics.go

@@ -62,7 +62,7 @@ func AddEdbDataFromNationalStatistics(edbCode string) (err error) {
 	existMap := make(map[string]string)
 	for _, sv := range dataList {
 		eDate := sv.DataTime
-		dataTime, err := time.Parse(utils.FormatDate, eDate)
+		dataTime, err := time.ParseInLocation(utils.FormatDate, eDate, time.Local)
 		if err != nil {
 			return err
 		}

+ 1 - 1
models/base_from_stock_plant.go

@@ -102,7 +102,7 @@ func RefreshEdbDataFromStockPlant(edbInfoId int, edbCode, startDate string) (err
 			eDate := item.DataTime
 			sValue := item.Value
 
-			dataTime, err := time.Parse(utils.FormatDate, eDate)
+			dataTime, err := time.ParseInLocation(utils.FormatDate, eDate, time.Local)
 			if err != nil {
 				return err
 			}

+ 1 - 1
models/base_from_usda_fas.go

@@ -62,7 +62,7 @@ func (obj BaseFromUsdaFas) Add(edbCode string) (err error) {
 	existMap := make(map[string]string)
 	for _, sv := range UsdaFasBaseDataAll {
 		eDate := sv.DataTime
-		dataTime, err := time.Parse(utils.FormatDate, eDate)
+		dataTime, err := time.ParseInLocation(utils.FormatDate, eDate, time.Local)
 		if err != nil {
 			return err
 		}

+ 1 - 1
models/base_from_yongyi.go

@@ -62,7 +62,7 @@ func (obj BaseFromYongyi) Add(edbCode string) (err error) {
 	existMap := make(map[string]string)
 	for _, sv := range yongyiBaseDataAll {
 		eDate := sv.DataTime
-		dataTime, err := time.Parse(utils.FormatDate, eDate)
+		dataTime, err := time.ParseInLocation(utils.FormatDate, eDate, time.Local)
 		if err != nil {
 			return err
 		}

+ 2 - 2
services/base_from_baiinfo.go

@@ -109,9 +109,9 @@ func HandleBaiinfoIndex(baseFilePath, terminalCode, renameFilePath, indexName, i
 			if !strings.Contains(value, "#N/A") {
 				var saveDataTime time.Time
 				if strings.Contains(date, "00:00:00") {
-					saveDataTime, err = time.Parse(utils.FormatDateTime, date)
+					saveDataTime, err = time.ParseInLocation(utils.FormatDateTime, date, time.Local)
 				} else {
-					saveDataTime, err = time.Parse(utils.FormatDate, date)
+					saveDataTime, err = time.ParseInLocation(utils.FormatDate, date, time.Local)
 				}
 				if err != nil {
 					errMsg := "saveDataTime parse err:" + err.Error() + " dataTime:" + date

+ 2 - 2
services/base_from_ccf.go

@@ -139,9 +139,9 @@ func handleCCFIndex(req *models.HandleCCFEdbData, terminalCode string) (err erro
 			if !strings.Contains(value, "#N/A") {
 				var saveDataTime time.Time
 				if strings.Contains(date, "00:00:00") {
-					saveDataTime, err = time.Parse(utils.FormatDateTime, date)
+					saveDataTime, err = time.ParseInLocation(utils.FormatDateTime, date, time.Local)
 				} else {
-					saveDataTime, err = time.Parse(utils.FormatDate, date)
+					saveDataTime, err = time.ParseInLocation(utils.FormatDate, date, time.Local)
 				}
 				if err != nil {
 					err = fmt.Errorf("%s 转换日期格式失败 Err:%s", date, err)

+ 6 - 6
services/base_from_fenwei.go

@@ -171,9 +171,9 @@ func handleFenweiIndex(req *models.HandleFenweiExcelData, terminalCode string) (
 			if !strings.Contains(value, "#N/A") {
 				var saveDataTime time.Time
 				if strings.Contains(date, "00:00:00") {
-					saveDataTime, err = time.Parse(utils.FormatDateTime, date)
+					saveDataTime, err = time.ParseInLocation(utils.FormatDateTime, date, time.Local)
 				} else {
-					saveDataTime, err = time.Parse(utils.FormatDate, date)
+					saveDataTime, err = time.ParseInLocation(utils.FormatDate, date, time.Local)
 				}
 				if err != nil {
 					err = fmt.Errorf("%s 转换日期格式失败 Err:%s", date, err)
@@ -478,7 +478,7 @@ func handleClassify(classify *models.BaseFromFenweiClassify, parentId int, level
 
 // 判断传入参数 dataText 是否是yyyy-MM格式,如果是则返回true,否则返回false
 func isYearMonth(dataText string) bool {
-	_, err := time.Parse("2006-01", dataText)
+	_, err := time.ParseInLocation("2006-01", dataText, time.Local)
 	if err != nil {
 		return false
 	}
@@ -487,7 +487,7 @@ func isYearMonth(dataText string) bool {
 
 // 判断传入参数 dataText yyyy-MM-dd格式,是否是该月第一天,如果是则返回true,否则返回false
 func isFirstDayOfMonth(dataText string) bool {
-	t, _ := time.Parse("2006-01-02", dataText)
+	t, _ := time.ParseInLocation("2006-01-02", dataText, time.Local)
 	if t.Day() == 1 {
 		return true
 	}
@@ -496,14 +496,14 @@ func isFirstDayOfMonth(dataText string) bool {
 
 // 转换时间 dataText yyyy-MM-dd格式,获取该月最后一天的日期
 func convertYearMonthDayToLastDay(dataText string) string {
-	t, _ := time.Parse("2006-01-02", dataText)
+	t, _ := time.ParseInLocation("2006-01-02", dataText, time.Local)
 	lastDay := t.AddDate(0, 1, -1)
 	return lastDay.Format("2006-01-02")
 }
 
 // 转换时间 dataText 2024-08 yyyy-MM 格式的时间字符串转换为该月最后一天的日期Date --> 2024-08-31
 func convertYearMonthToLastDay(dataText string) string {
-	t, _ := time.Parse("2006-01", dataText)
+	t, _ := time.ParseInLocation("2006-01", dataText, time.Local)
 	lastDay := t.AddDate(0, 1, -1)
 	return lastDay.Format("2006-01-02")
 }

+ 2 - 2
services/base_from_gpr_risk.go

@@ -218,9 +218,9 @@ func handleGprRiskIndex(req *models.HandleGprRiskExcelData, terminalCode string,
 			//if !strings.Contains(value, "#N/A") {
 			var saveDataTime time.Time
 			if strings.Contains(date, "00:00:00") {
-				saveDataTime, err = time.Parse(utils.FormatDateTime, date)
+				saveDataTime, err = time.ParseInLocation(utils.FormatDateTime, date, time.Local)
 			} else {
-				saveDataTime, err = time.Parse(utils.FormatDate, date)
+				saveDataTime, err = time.ParseInLocation(utils.FormatDate, date, time.Local)
 			}
 			if err != nil {
 				err = fmt.Errorf("%s 转换日期格式失败 Err:%s", date, err)

+ 1 - 1
services/base_from_mysteel_chemical.go

@@ -245,7 +245,7 @@ func tranformData(dataResp *models.MySteelChemicalApiResp) (items [][]*models.Ba
 				}
 				continue
 			}
-			dataDate, er := time.Parse(utils.FormatDate, vv.DataDate)
+			dataDate, er := time.ParseInLocation(utils.FormatDate, vv.DataDate, time.Local)
 			if er != nil {
 				err = er
 				return

+ 1 - 1
services/base_from_predict.go

@@ -247,7 +247,7 @@ func CalculateByRuleByNine(formulaStr string, edbInfoList []*models.EdbInfo, edb
 		//}
 
 		saveValue, _ := decimal.NewFromFloat(calVal).Round(4).Float64() //utils.SubFloatToString(calVal, 4)
-		dataTime, _ := time.Parse(utils.FormatDate, date)
+		dataTime, _ := time.ParseInLocation(utils.FormatDate, date, time.Local)
 		timestamp := dataTime.UnixNano() / 1e6
 
 		if _, existOk := existDataMap[date]; !existOk {

+ 3 - 3
services/base_from_smm_http.go

@@ -133,7 +133,7 @@ func GetSmmNewIndexFromBridge(edbCode string) (indexDataList []models.BaseFromSm
 			dataItem.IndexCode = quota.QuotaID
 			dataItem.DataTime = v.Date
 			dataItem.Value = v.Value
-			createTime, e := time.Parse(utils.FormatDateTime, v.Create)
+			createTime, e := time.ParseInLocation(utils.FormatDateTime, v.Create, time.Local)
 			if e != nil {
 				err = fmt.Errorf("time parse err: %s", e.Error())
 				return
@@ -328,7 +328,7 @@ func GetSmmIndexLatestFromBridge(edbInfoId int, edbCode, startDate string) (err
 
 	url := fmt.Sprint(utils.EtaBridgeUrl, BridgeApiZhongJiIndexLatestUrl)
 
-	startDateTime, err := time.Parse(utils.FormatDate, startDate)
+	startDateTime, err := time.ParseInLocation(utils.FormatDate, startDate, time.Local)
 	if err != nil {
 		err = fmt.Errorf("startDateTime parse err: %s", err.Error())
 		return
@@ -400,7 +400,7 @@ func GetSmmIndexLatestFromBridge(edbInfoId int, edbCode, startDate string) (err
 		item.CreateTime = time.Now()
 		item.ModifyTime = time.Now()
 
-		timeDate, _ := time.Parse(utils.FormatDateTime, v.Date)
+		timeDate, _ := time.ParseInLocation(utils.FormatDateTime, v.Date, time.Local)
 		timestamp := timeDate.UnixNano() / 1e6
 		item.DataTimestamp = timestamp
 

+ 2 - 2
services/base_from_usda_fas.go

@@ -223,9 +223,9 @@ func handleUsdaFasIndex(req *models.HandleUsdaFasExcelData, terminalCode string,
 			//if !strings.Contains(value, "#N/A") {
 			var saveDataTime time.Time
 			if strings.Contains(date, "00:00:00") {
-				saveDataTime, err = time.Parse(utils.FormatDateTime, date)
+				saveDataTime, err = time.ParseInLocation(utils.FormatDateTime, date, time.Local)
 			} else {
-				saveDataTime, err = time.Parse(utils.FormatDate, date)
+				saveDataTime, err = time.ParseInLocation(utils.FormatDate, date, time.Local)
 			}
 			if err != nil {
 				err = fmt.Errorf("%s 转换日期格式失败 Err:%s", date, err)

+ 2 - 2
services/base_from_yongyi.go

@@ -215,9 +215,9 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData, terminalCode string, c
 			if !strings.Contains(value, "#N/A") {
 				var saveDataTime time.Time
 				if strings.Contains(date, "00:00:00") {
-					saveDataTime, err = time.Parse(utils.FormatDateTime, date)
+					saveDataTime, err = time.ParseInLocation(utils.FormatDateTime, date, time.Local)
 				} else {
-					saveDataTime, err = time.Parse(utils.FormatDate, date)
+					saveDataTime, err = time.ParseInLocation(utils.FormatDate, date, time.Local)
 				}
 				if err != nil {
 					err = fmt.Errorf("%s 转换日期格式失败 Err:%s", date, err)

+ 4 - 4
services/edb_data_calculate_stl.go

@@ -238,7 +238,7 @@ func SyncUpdateRelationEdbInfo(edbInfo *models.EdbInfo, config EdbStlConfig, tre
 func UpdateStlEdbData(edbInfo *models.EdbInfo, config EdbStlConfig, edbCode string, edbData ChartEdbInfo) (err error) {
 	var dataList []*models.EdbDataCalculateStl
 	for _, v := range edbData.DataList {
-		dataTime, _ := time.Parse(utils.FormatDate, v.DataTime)
+		dataTime, _ := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
 		dataList = append(dataList, &models.EdbDataCalculateStl{
 			EdbInfoId:     edbData.EdbInfoId,
 			EdbCode:       edbCode,
@@ -324,7 +324,7 @@ func ParseStlExcel(excelPath string) (TrendChart, SeasonalChart, ResidualChart,
 					date = tmpTime.Format(utils.FormatDate)
 					dataTimestamp = tmpTime.UnixMilli()
 				} else {
-					timeDate, _ := time.Parse(utils.FormatDateTime, date)
+					timeDate, _ := time.ParseInLocation(utils.FormatDateTime, date, time.Local)
 					date = timeDate.Format(utils.FormatDate)
 					dataTimestamp = timeDate.UnixMilli()
 				}
@@ -353,7 +353,7 @@ func ParseStlExcel(excelPath string) (TrendChart, SeasonalChart, ResidualChart,
 					date = tmpTime.Format(utils.FormatDate)
 					dataTimestamp = tmpTime.UnixMilli()
 				} else {
-					timeDate, _ := time.Parse(utils.FormatDateTime, date)
+					timeDate, _ := time.ParseInLocation(utils.FormatDateTime, date, time.Local)
 					date = timeDate.Format(utils.FormatDate)
 					dataTimestamp = timeDate.UnixMilli()
 				}
@@ -382,7 +382,7 @@ func ParseStlExcel(excelPath string) (TrendChart, SeasonalChart, ResidualChart,
 					date = tmpTime.Format(utils.FormatDate)
 					dataTimestamp = tmpTime.UnixMilli()
 				} else {
-					timeDate, _ := time.Parse(utils.FormatDateTime, date)
+					timeDate, _ := time.ParseInLocation(utils.FormatDateTime, date, time.Local)
 					date = timeDate.Format(utils.FormatDate)
 					dataTimestamp = timeDate.UnixMilli()
 				}

+ 1 - 1
services/trade_analysis/trade_analysis_table.go

@@ -46,7 +46,7 @@ func CheckAnalysisTableExtraConfig(extraConfig tradeAnalysisModel.TableExtraConf
 		return
 	}
 	if extraConfig.FixedDate != "" {
-		_, e := time.Parse(utils.FormatDate, extraConfig.FixedDate)
+		_, e := time.ParseInLocation(utils.FormatDate, extraConfig.FixedDate, time.Local)
 		if e != nil {
 			tips = "固定日期格式有误"
 			return

+ 3 - 3
utils/common.go

@@ -1680,7 +1680,7 @@ func ParseDateTime(dateStr string) (time.Time, error) {
 
 		// 检查是否是 "28-Jun-2019" 格式
 		if len(dateStr) > 9 {
-			return time.Parse("2-Jan-2006", dateStr)
+			return time.ParseInLocation("2-Jan-2006", dateStr, time.Local)
 		}
 	} else {
 		excelDate, err := strconv.Atoi(dateStr)
@@ -1769,7 +1769,7 @@ func GormDateStrToDateTimeStr(originalString string) (formatStr string) {
 	}
 
 	// 解析原始字符串
-	t, err := time.Parse(FormatDateWallWithLoc, originalString)
+	t, err := time.ParseInLocation(FormatDateWallWithLoc, originalString, time.Local)
 	if err != nil {
 		fmt.Println("Error parsing time:", err)
 		return
@@ -1799,7 +1799,7 @@ func GormDateStrToDateStr(originalString string) (formatStr string) {
 	}
 
 	// 解析原始字符串
-	t, err := time.Parse(FormatDateWallWithLoc, originalString)
+	t, err := time.ParseInLocation(FormatDateWallWithLoc, originalString, time.Local)
 	if err != nil {
 		fmt.Println("Error parsing time:", err)
 		return

+ 7 - 7
utils/date_util.go

@@ -26,8 +26,8 @@ func GetPreYearTime(n int) string {
 
 // IsMoreThanOneDay 判断两个yyyy-MM-dd类型的时间,相差是否大于1天
 func IsMoreThanOneDay(startDate, endDate string) bool {
-	startTime, _ := time.Parse("2006-01-02", startDate)
-	endTime, _ := time.Parse("2006-01-02", endDate)
+	startTime, _ := time.ParseInLocation("2006-01-02", startDate, time.Local)
+	endTime, _ := time.ParseInLocation("2006-01-02", endDate, time.Local)
 	diff := endTime.Sub(startTime)
 	days := diff.Hours() / 24
 	return days > 1
@@ -35,14 +35,14 @@ func IsMoreThanOneDay(startDate, endDate string) bool {
 
 // GetNextDay 获取 yyyy-MM-dd类型的时间的下一天
 func GetNextDay(date string) string {
-	t, _ := time.Parse("2006-01-02", date)
+	t, _ := time.ParseInLocation("2006-01-02", date, time.Local)
 	nextDay := t.AddDate(0, 0, 1)
 	return nextDay.Format("2006-01-02")
 }
 
 // GetNextDayN 获取 yyyy-MM-dd 类型的时间的下n天
 func GetNextDayN(date string, n int) string {
-	t, _ := time.Parse("2006-01-02", date)
+	t, _ := time.ParseInLocation("2006-01-02", date, time.Local)
 	nextDay := t.AddDate(0, 0, n)
 	return nextDay.Format("2006-01-02")
 }
@@ -111,7 +111,7 @@ func isLeap(year int) bool {
 
 // StringToTime string 类型时间 转换为 time.Time 类型
 func StringToTime(date string) time.Time {
-	t, _ := time.Parse("2006-01-02", date)
+	t, _ := time.ParseInLocation("2006-01-02", date, time.Local)
 	return t
 }
 
@@ -123,7 +123,7 @@ func TimeToString(t time.Time, format string) string {
 
 // CompareDate 判断传入的两个字符串时间的前后顺序
 func CompareDate(data1, data2 string) bool {
-	t1, _ := time.Parse("2006-01-02", data1)
-	t2, _ := time.Parse("2006-01-02", data2)
+	t1, _ := time.ParseInLocation("2006-01-02", data1, time.Local)
+	t2, _ := time.ParseInLocation("2006-01-02", data2, time.Local)
 	return !t1.After(t2)
 }