Merge branch 'hotfix/mysteel' into debug

go.mod

@@ -3,7 +3,6 @@ module eta/eta_index_lib
 go 1.21.7
 
 require (
-	github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
 	github.com/beego/bee/v2 v2.1.0
 	github.com/beego/beego/v2 v2.1.0
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible

services/base_from_mysteel_chemical.go

@@ -164,12 +164,13 @@ func handleIndex(indexItem *models.HandleMysteelIndex) (err error) {
 	var hasUpdate bool
 	// 遍历excel数据，然后跟现有的数据做校验，不存在则入库
 	for date, value := range indexItem.ExcelDataMap {
+		dateTime, err := utils.DealExcelDate(date)
+		if err != nil {
+			fmt.Println("time.ParseInLocation Err:" + err.Error())
+			return err
+		}
+		date = dateTime.Format(utils.FormatDate)
 		if findData, ok := exitDataMap[date]; !ok {
-			dateTime, err := utils.DealExcelDate(date)
-			if err != nil {
-				fmt.Println("time.ParseInLocation Err:" + err.Error())
-				return err
-			}
 			if !strings.Contains(value, "#N/A") {
 				dataItem := new(models.BaseFromMysteelChemicalData)
 				dataItem.BaseFromMysteelChemicalIndexId = indexId

utils/common.go

@@ -8,7 +8,6 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"github.com/araddon/dateparse"
 	"github.com/shopspring/decimal"
 	"image"
 	"image/png"
@@ -1204,11 +1203,18 @@ func GetEdbRefreshEndDate(endDate string) string {
 }
 
 func DealExcelDate(date string) (newDate time.Time, err error) {
-	newDate, err = dateparse.ParseAny(date)
+	/*newDate, err = dateparse.ParseAny(date)
 	if err != nil {
 		return
 	}
 
-	newDate = time.Date(newDate.Year(), newDate.Month(), newDate.Day(), 0, 0, 0, 0, time.Local)
+	newDate = time.Date(newDate.Year(), newDate.Month(), newDate.Day(), 0, 0, 0, 0, time.Local)*/
+	if strings.Contains(date, "/") {
+		newDate, err = time.ParseInLocation("2006/01/02", date, time.Local)
+		return
+	} else {
+		newDate, err = time.ParseInLocation(FormatDate, date, time.Local)
+		return
+	}
 	return
 }