优化

models/base_from_rzd_data.go

@@ -2,11 +2,17 @@
 package models
 
 type BaseFromRzdData struct {
-	BaseFromRzdDataId  int     `orm:"column(base_from_rzd_data_id);pk"`
+	BaseFromRzdDataId  int
-	BaseFromRzdIndexId int     `orm:"column(base_from_rzd_index_id)"`
+	BaseFromRzdIndexId int
-	CreateTime         string  `orm:"column(create_time)"`
+	DataTime           string
-	DataTime           string  `orm:"column(data_time)"`
+	IndexCode          string
-	IndexCode          string  `orm:"column(index_code)"`
+	Value              float64
-	ModifyTime         string  `orm:"column(modify_time)"`
+}
-	Value              float64 `orm:"column(value)"`
+
+type RzdIndexData struct {
+	BaseFromRzdDataId  int
+	BaseFromRzdIndexId int
+	DataTime           string
+	IndexCode          string
+	Value              float64
 }

models/base_from_rzd_index.go

@@ -2,6 +2,10 @@
 // @Author gmy 2024/8/7 9:38:00
 package models
 
+import (
+	"time"
+)
+
 type BaseFromRzdIndex struct {
 	BaseFromRzdIndexId   int    `orm:"column(base_from_rzd_index_id);pk"`
 	CreateTime           string `orm:"column(create_time)"`
@@ -14,9 +18,18 @@ type BaseFromRzdIndex struct {
 }
 
 type IndexInfo struct {
+	StartDate   time.Time
+	EndDate     time.Time
+	LatestValue float64
 	IndexName   string
 	IndexCode   string
-	Value       float64
+	Frequency   string
-	IndexInfoId int
+	Unit        string
-	DataTime    string
+	ClassifyId  int
+	DataList    []IndexData
+}
+
+type IndexData struct {
+	DataTime time.Time
+	Value    float64
 }

services/ruizide/data_processor.go

@@ -456,6 +456,7 @@ func FileResolverV2() error {
 		utils.FileLog.Error("获取睿咨得分类数据失败:", err.Error())
 		return err
 	}
+	RzdClassifyMap = make(map[string]*models.BaseFromRzdClassify)
 	//更新睿咨得分类Map
 	for _, classify := range rzdClassifyList {
 		RzdClassifyMap[classify.ClassifyName] = &classify
@@ -463,63 +464,15 @@ func FileResolverV2() error {
 	for _, tableName := range tableNameList {
 		rzdProcessor, processorErr := GetRZDProcessor(tableName)
 		if processorErr != nil {
-			fmt.Printf("获取睿咨得数据处理器: %v", processorErr)
+			//fmt.Printf("获取睿咨得数据处理器: %v", processorErr)
 			utils.FileLog.Error("获取睿咨得数据处理器:", processorErr.Error())
 			continue
 		}
-		_, err = rzdProcessor.Process(tableName)
+		err = rzdProcessor.Process(tableName)
 		if err != nil {
 			utils.FileLog.Error(fmt.Sprintf("%s处理数据失败:", tableName), err.Error())
 			continue
 		}
-		// 新增指标库数据
-		edbDataList := []models.EdbDataRzd{}
-		for _, index := range indexData {
-			// 补充 判断是否存在于指标库
-			paramsLib := make(map[string]interface{})
-			paramsLib["IndexCode"] = index.IndexCode
-			paramsLib["Source"] = utils.DATA_SOURCE_RZD
-			postEdbLib, err := httpRequestFill(paramsLib, utils.GET_RZD_EDB_INFO_BY_INDEX_CODE)
-			if err != nil {
-				// 有错误就不继续执行
-				utils.FileLog.Error("postEdbLib err: %v", err)
-				continue
-			}
-			var requestResponse models.RequestResponse[models.EdbInfo]
-			err = json.Unmarshal(postEdbLib, &requestResponse)
-			if err != nil {
-				utils.FileLog.Error("postEdbLib err: %v", err)
-				continue
-			}
-
-			if requestResponse.Data.EdbInfoId != 0 {
-				edbDataRzd := models.EdbDataRzd{
-					CreateTime:    utils.GetCurrentTime(),
-					ModifyTime:    utils.GetCurrentTime(),
-					EdbInfoId:     index.BaseFromRzdIndexId,
-					EdbCode:       index.IndexCode,
-					DataTime:      index.DataTime,
-					Value:         index.Value,
-					DataTimestamp: uint64(utils.StringToTimeFormat(index.DataTime, utils.FormatDate).UnixMilli()),
-				}
-				edbDataList = append(edbDataList, edbDataRzd)
-			}
-		}
-
-		if len(edbDataList) > 0 {
-			// 转换成json
-			marshal, err := json.Marshal(edbDataList)
-			if err != nil {
-				utils.FileLog.Error("postEdbLib err: %v", err)
-				return err
-			}
-			_, err = utils.HttpPostRequest(utils.EDB_LIB_URL+utils.ADD_BATCH_RZD_EDB_DATA, string(marshal), "application/json")
-			if err != nil {
-				// 有错误就不继续执行
-				utils.FileLog.Error("postEdbLib err: %v", err)
-				return err
-			}
-		}
 	}
 	return nil
 }

services/ruizide/oil_demand_signals_weekly_report_processor.go

@@ -21,6 +21,7 @@ var (
 			IndexNameColOne: "Index",
 			IndexNameColTwo: "Index 7DMA",
 			IndexPrefix:     "Road Index",
+			BeginRow:        4,
 			Rows:            5,
 			IndexRow:        2,
 			DataOneRow:      3,
@@ -33,6 +34,7 @@ var (
 			IndexNameColOne: "Active Fleet",
 			IndexNameColTwo: "Active Fleet 7DMA",
 			IndexPrefix:     "Road Active Fleet",
+			BeginRow:        4,
 			Rows:            5,
 			IndexRow:        2,
 			DataOneRow:      3,
@@ -45,6 +47,7 @@ var (
 			IndexNameColOne: "Index",
 			IndexNameColTwo: "Index 7DMA",
 			IndexPrefix:     "Aviation Index",
+			BeginRow:        4,
 			Rows:            5,
 			IndexRow:        2,
 			DataOneRow:      3,
@@ -57,6 +60,7 @@ var (
 			IndexNameColOne: "Active Fleet",
 			IndexNameColTwo: "Active Fleet 7DMA",
 			IndexPrefix:     "Aviation Active Fleet",
+			BeginRow:        4,
 			Rows:            5,
 			IndexRow:        2,
 			DataOneRow:      3,
@@ -69,6 +73,7 @@ var (
 			IndexNameColOne: "Demand",
 			IndexNameColTwo: "Demand 7DMA",
 			IndexPrefix:     "Gasoline Demand",
+			BeginRow:        4,
 			Rows:            6,
 			IndexRow:        3,
 			DataOneRow:      4,
@@ -81,6 +86,7 @@ var (
 			IndexNameColOne: "Demand",
 			IndexNameColTwo: "Demand 7DMA",
 			IndexPrefix:     "Demand Diesel",
+			BeginRow:        4,
 			Rows:            6,
 			IndexRow:        3,
 			DataOneRow:      4,
@@ -93,6 +99,7 @@ var (
 			IndexNameColOne: "Demand",
 			IndexNameColTwo: "Demand 7DMA",
 			IndexPrefix:     "Demand Jet Fuel",
+			BeginRow:        4,
 			Rows:            6,
 			IndexRow:        3,
 			DataOneRow:      4,
@@ -105,6 +112,7 @@ var (
 			IndexNameColOne: "Demand",
 			IndexNameColTwo: "Demand 7DMA",
 			IndexPrefix:     "Demand Maritime Bunker",
+			BeginRow:        4,
 			Rows:            6,
 			IndexRow:        3,
 			DataOneRow:      4,
@@ -120,6 +128,7 @@ type config struct {
 	IndexNameColOne string
 	IndexNameColTwo string
 	IndexPrefix     string
+	BeginRow        int
 	Rows            int
 	IndexRow        int
 	DataOneRow      int
@@ -129,12 +138,12 @@ type config struct {
 type OilDemandSignalsWeeklyReportProcessor struct {
 }
 
-func (p *OilDemandSignalsWeeklyReportProcessor) Process(tableName string) (list []models.BaseFromRzdData, err error) {
+func (p *OilDemandSignalsWeeklyReportProcessor) Process(tableName string) (err error) {
 	var fileName string
 	// 解析表格
 	fileName = tableName + "_" + utils.GetCurrentYearMonth() + ".xlsx"
 	filePath := filepath.Join(excelDir, fileName)
-	if _, err := os.Stat(filePath); os.IsNotExist(err) {
+	if _, err = os.Stat(filePath); os.IsNotExist(err) {
 		utils.FileLog.Error("文件不存在: %v", err)
 		return
 	}
@@ -151,7 +160,9 @@ func (p *OilDemandSignalsWeeklyReportProcessor) Process(tableName string) (list
 		utils.FileLog.Error("获取分类Id失败: %v", err)
 		return
 	}
+	//按照sheet页来处理数据,一个sheet发送一次服务器
 	for _, sheetName := range sheetNames {
+		var indexMap = make(map[string]*models.IndexInfo)
 		if sheetName == "Content" {
 			utils.FileLog.Info("跳过工作表:", sheetName)
 			continue
@@ -163,190 +174,161 @@ func (p *OilDemandSignalsWeeklyReportProcessor) Process(tableName string) (list
 			utils.FileLog.Error("获取工作表数据时出错: %v", excelErr)
 			continue
 		}
-		var indexData []models.BaseFromRzdData
+		sheetConfig := OilDemandSignalsWeeklyReportConfigMap[sheetName]
-		for rowIndex, rowData := range dataRows[:] {
+		for _, rowData := range dataRows[sheetConfig.BeginRow:] {
-			if rowIndex < 4 {
+			//处理数据不全的情况
-				return nil, nil
+			less := sheetConfig.Rows - len(rowData)
+			if less > 0 {
+				for i := 0; i < less; i++ {
+					rowData = append(rowData, "")
+				}
 			}
-
+			// 匹配非数字字符
-			frequency := "日度"
+			re := regexp.MustCompile(`^\d*\.?\d*\s*$`)
-			unit := "辆"
+			if !re.MatchString(strings.TrimSpace(rowData[sheetConfig.DataOneRow])) || !re.MatchString(strings.TrimSpace(rowData[sheetConfig.DataTwoRow])) {
-			indexNameColOne := "Active Fleet"
+				utils.FileLog.Error("数据格式错误:", fmt.Sprintf("%v", rowData))
-			indexNameColTwo := "Active Fleet 7DMA"
+				continue
-
-			// step_1: 分类
-			classifyId, err := dealClassify(tableName, sheetName)
-			if err != nil {
-				return nil, err
 			}
-			utils.FileLog.Info("classifyId: %v", classifyId)
+			classifyId := classifyIds[sheetName]
-
 			// step_2: 指标
 			// 指标名称
-			indexNameOne := sheetName + "/" + rowData[len(rowData)-3] + "/" + indexNameColOne
+			indexNameOne := sheetName + "/" + rowData[sheetConfig.IndexRow] + "/" + sheetConfig.IndexNameColOne
-			indexNameTwo := sheetName + "/" + rowData[len(rowData)-3] + "/" + indexNameColTwo
+			indexNameTwo := sheetName + "/" + rowData[sheetConfig.IndexRow] + "/" + sheetConfig.IndexNameColTwo
-
 			// 生成指标编码
-			indexCodeOne, err := getIndexId(sheetName, strings.ReplaceAll(strings.ToLower(rowData[len(rowData)-3]), " ", ""), indexNameColOne)
+			indexCodeOne := getIndexId(sheetName, strings.ReplaceAll(strings.ToLower(rowData[len(rowData)-3]), " ", ""), sheetConfig.IndexNameColOne)
-			indexCodeTwo, err := getIndexId(sheetName, strings.ReplaceAll(strings.ToLower(rowData[len(rowData)-3]), " ", ""), indexNameColTwo)
+			indexCodeTwo := getIndexId(sheetName, strings.ReplaceAll(strings.ToLower(rowData[len(rowData)-3]), " ", ""), sheetConfig.IndexNameColTwo)
-
+			dataTime := rowData[sheetConfig.DateRow]
-			var indexInfoList []*models.IndexInfo
+			date, _, convertErr := utils.ConvertDateFormat(dataTime)
-			valueOne, err := strconv.ParseFloat(strings.ReplaceAll(rowData[len(rowData)-2], ",", ""), 64)
+			if convertErr != nil {
-			if err != nil {
+				utils.FileLog.Error(fmt.Sprintf("转换时间数据失败,index_code:%s,time_value:%s err:%v", indexCodeOne, dataTime, convertErr))
-				utils.FileLog.Error(fmt.Sprintf("转换data数据失败,index_code:%s,data_value:%s err:%v", indexCodeOne, rowData[len(rowData)-2], err))
+				continue
-				return nil, err
 			}
-
+			if rowData[sheetConfig.DataOneRow] != "" {
-			dataTimeOne := rowData[1]
+				valueOne, parseErr := strconv.ParseFloat(strings.ReplaceAll(rowData[sheetConfig.DataOneRow], ",", ""), 64)
-			formatOne, err := utils.ConvertDateFormat(dataTimeOne)
+				if parseErr != nil {
-			if err != nil {
+					utils.FileLog.Error(fmt.Sprintf("转换data数据失败,index_code:%s,data_value:%s err:%v", indexCodeOne, rowData[sheetConfig.DataOneRow], err))
-				utils.FileLog.Error(fmt.Sprintf("转换时间数据失败,index_code:%s,time_value:%s err:%v", indexCodeOne, dataTimeOne, err))
+				} else {
-				return nil, err
+					if index, ok := indexMap[indexCodeOne]; ok {
-			}
+						if index.StartDate.After(date) {
-
+							index.StartDate = date
-			indexInfoList = append(indexInfoList, &models.IndexInfo{
+						}
-				IndexName: indexNameOne,
+						if index.EndDate.Before(date) {
-				IndexCode: indexCodeOne,
+							index.EndDate = date
-				Value:     valueOne,
+							index.LatestValue = valueOne
-				DataTime:  formatOne,
+						}
-			})
+						index.DataList = append(index.DataList, models.IndexData{
-			valueTwo, err := strconv.ParseFloat(strings.ReplaceAll(rowData[len(rowData)-1], ",", ""), 64)
+							DataTime: date,
-			if err != nil {
+							Value:    valueOne,
-				utils.FileLog.Error(fmt.Sprintf("转换data数据失败,index_code:%s,data_value:%s err:%v", indexCodeTwo, rowData[len(rowData)-1], err))
+						})
-				return nil, err
+					} else {
-			}
+						indexMap[indexCodeOne] = &models.IndexInfo{
-			indexInfoList = append(indexInfoList, &models.IndexInfo{
+							IndexName:   indexNameOne,
-				IndexName: indexNameTwo,
+							IndexCode:   indexCodeOne,
-				IndexCode: indexCodeTwo,
+							Frequency:   sheetConfig.Frequency,
-				Value:     valueTwo,
+							Unit:        sheetConfig.Unit,
-				DataTime:  formatOne,
+							StartDate:   date,
-			})
+							EndDate:     date,
-
+							LatestValue: valueOne,
-			indexInfoList, err = dealIndex(indexInfoList, frequency, unit, classifyId)
+							ClassifyId:  classifyId,
-			if err != nil {
+							DataList: []models.IndexData{
-				return nil, err
+								{
+									DataTime: date,
+									Value:    valueOne,
+								},
+							},
+						}
+					}
+				}
 			}
-			utils.FileLog.Info("AviationActiveFleetProcessor indexInfoList: %v", indexInfoList)
+			if rowData[sheetConfig.DataTwoRow] != "" {
-
+				valueTwo, parseErr := strconv.ParseFloat(strings.ReplaceAll(rowData[sheetConfig.DataTwoRow], ",", ""), 64)
-			// step_3: 指标数据
+				if parseErr != nil {
-			dataList, err := dealData(indexInfoList)
+					utils.FileLog.Error(fmt.Sprintf("转换data数据失败,index_code:%s,data_value:%s err:%v", indexCodeTwo, rowData[sheetConfig.DataTwoRow], err))
-			if err != nil {
+				} else {
-				return nil, err
+					if index, ok := indexMap[indexCodeTwo]; ok {
+						if index.StartDate.After(date) {
+							index.StartDate = date
+						}
+						if index.EndDate.Before(date) {
+							index.EndDate = date
+							index.LatestValue = valueTwo
+						}
+						index.DataList = append(index.DataList, models.IndexData{
+							DataTime: date,
+							Value:    valueTwo,
+						})
+					} else {
+						indexMap[indexCodeTwo] = &models.IndexInfo{
+							IndexName:   indexNameTwo,
+							IndexCode:   indexCodeTwo,
+							Frequency:   sheetConfig.Frequency,
+							Unit:        sheetConfig.Unit,
+							StartDate:   date,
+							EndDate:     date,
+							LatestValue: valueTwo,
+							ClassifyId:  classifyId,
+							DataList: []models.IndexData{
+								{
+									DataTime: date,
+									Value:    valueTwo,
+								},
+							},
+						}
+					}
+				}
 			}
-			utils.FileLog.Info("AviationActiveFleetProcessor dataList: %v", dataList)
-
-			return dataList, err
-			indexData = append(indexData, baseFromRzdDataList...)
 		}
-		fmt.Printf("读取工作表完成: %s\n", sheetName)
 		utils.FileLog.Info("读取工作表完成:", sheetName)
 		// 新增数据源指标数据
-		if len(indexData) > 0 {
+		if len(indexMap) > 0 {
-			for i := 0; i < len(indexData); i += rzdBatchSize {
+			for _, index := range indexMap {
-				// 计算当前批次的结束索引
+				pars := chunkIndexData(index, rzdBatchSize)
-				end := i + rzdBatchSize
+				for _, par := range pars {
-				if end > len(indexData) {
+					// 转换成json
-					end = len(indexData)
+					marshal, parseErr := json.Marshal(par)
-				}
+					if parseErr != nil {
-
+						utils.FileLog.Error("json.Marshal err: %v", parseErr)
-				// 获取当前批次的数据
+						return parseErr
-				batchData := indexData[i:end]
+					}
-
+					// 发送 HTTP POST 请求
-				// 转换成json
+					_, err = utils.HttpPostRequest(utils.EDB_LIB_URL+utils.ADD_BATCH_RZD_DATA, string(marshal), "application/json")
-				marshal, err := json.Marshal(batchData)
+					if err != nil {
-				if err != nil {
+						utils.FileLog.Error("postEdbLib err: %v", err)
-					utils.FileLog.Error("json.Marshal err: %v", err)
+						return err
-					return err
+					}
 				}
-
-				// 发送 HTTP POST 请求
-				_, err = utils.HttpPostRequest(utils.EDB_LIB_URL+utils.ADD_BATCH_RZD_DATA, string(marshal), "application/json")
-				if err != nil {
-					utils.FileLog.Error("postEdbLib err: %v", err)
-					return err
-				}
-			}
-		}
-		utils.FileLog.Info("Processing AnalyticsLibrary...")
-		sheetConfig := OilDemandSignalsWeeklyReportConfigMap[sheetName]
-		if tableName == "Content" {
-			return nil, nil
-		}
-		if rowIndex < 4 {
-			return nil, nil
-		}
-		//处理数据不全的情况
-		less := sheetConfig.Rows - len(rowData)
-		if less > 0 {
-			for i := 0; i < less; i++ {
-				rowData = append(rowData, "")
 			}
 		}
-		// 匹配非数字字符
+	}
-		re := regexp.MustCompile(`^\d*\.?\d*\s*$`)
+	return
-		if !re.MatchString(strings.TrimSpace(rowData[sheetConfig.DataOneRow])) || !re.MatchString(strings.TrimSpace(rowData[sheetConfig.DataTwoRow])) {
+}
-			utils.FileLog.Warn("数据格式错误:", fmt.Sprintf("%v", rowData))
-			return
-		}
-
-		// step_2: 指标
-		// 指标名称
-		indexNameOne := sheetName + "/" + rowData[len(rowData)-3] + "/" + sheetConfig.IndexNameColOne
-		indexNameTwo := sheetName + "/" + rowData[len(rowData)-3] + "/" + sheetConfig.IndexNameColTwo
-		// 生成指标编码
-		indexCodeOne, err := getIndexId(sheetName, strings.ReplaceAll(strings.ToLower(rowData[len(rowData)-3]), " ", ""), sheetConfig.IndexNameColOne)
-		indexCodeTwo, err := getIndexId(sheetName, strings.ReplaceAll(strings.ToLower(rowData[len(rowData)-3]), " ", ""), sheetConfig.IndexNameColTwo)
-
-		indexInfoMap := make(map[string]string)
-		indexInfoMap[indexCodeOne] = indexNameOne
-		indexInfoMap[indexCodeTwo] = indexNameTwo
 
-		dataTime := rowData[1]
+func chunkIndexData(index *models.IndexInfo, rzdBatchSize int) (pars []models.IndexInfo) {
-		formatDate, err := utils.ConvertDateFormat(dataTime)
+	var chunks int
-		if err != nil {
+	total := len(index.DataList)
-			return nil, err
+	count := total % rzdBatchSize
-		}
+	if count > 0 {
-		var indexInfoList []*models.IndexInfo
+		chunks = (total + rzdBatchSize - count) / rzdBatchSize
-		dataOneStr := strings.TrimSpace(rowData[3])
+	} else {
-		if strings.TrimSpace(dataOneStr) != "" {
+		chunks = total / rzdBatchSize
-			valueOne, err := strconv.ParseFloat(strings.ReplaceAll(dataOneStr, ",", ""), 64)
+	}
-			if err != nil {
+	for i := 0; i < chunks; i++ {
-				utils.FileLog.Error(fmt.Sprintf("转换data数据失败,index_code:%s,data_value:%s err:%v", indexCodeOne, rowData[3], err))
+		start := i * rzdBatchSize
-				return nil, err
+		end := start + rzdBatchSize
-			}
+		if end > total {
-			indexInfoList = append(indexInfoList, &models.IndexInfo{
+			end = total
-				IndexName: indexNameOne,
-				IndexCode: indexCodeOne,
-				Value:     valueOne,
-				DataTime:  formatDate,
-			})
-		}
-		dataTwoStr := strings.TrimSpace(rowData[4])
-		if strings.TrimSpace(dataTwoStr) != "" {
-			valueTwo, err := strconv.ParseFloat(rowData[4], 64)
-			if err != nil {
-				utils.FileLog.Error(fmt.Sprintf("转换data数据失败,index_code:%s,data_value:%s err:%v", indexCodeTwo, rowData[4], err))
-				return nil, err
-			}
-			indexInfoList = append(indexInfoList, &models.IndexInfo{
-				IndexName: indexNameTwo,
-				IndexCode: indexCodeTwo,
-				Value:     valueTwo,
-				DataTime:  formatDate,
-			})
-		}
-		indexInfoList, err = dealIndex(indexInfoList, sheetConfig.Frequency, sheetConfig.Unit, classifyId)
-		if err != nil {
-			return nil, err
-		}
-		utils.FileLog.Info("indexInfoList: %v", indexInfoList)
-		// step_3: 指标数据
-		dataList, err := dealData(indexInfoList)
-		if err != nil {
-			return nil, err
 		}
-		utils.FileLog.Info("dataList: %v", dataList)
+		pars = append(pars, models.IndexInfo{
-		return dataList, err
+			IndexName:   index.IndexName,
+			IndexCode:   index.IndexCode,
+			LatestValue: index.LatestValue,
+			StartDate:   index.StartDate,
+			EndDate:     index.EndDate,
+			Frequency:   index.Frequency,
+			Unit:        index.Unit,
+			ClassifyId:  index.ClassifyId,
+			DataList:    index.DataList[start:end],
+		})
 	}
-	return nil, nil
+	return
 }

services/ruizide/processor_factory.go

@@ -6,7 +6,7 @@ import (
 )
 
 var (
-	RzdClassifyMap map[string]*models.BaseFromRzdClassify
+	RzdClassifyMap = make(map[string]*models.BaseFromRzdClassify)
 	classifyMap    = map[string]models.RzdClassifyMapStruct{
 		"Road Index": {
 			ClassifyName: "Road Index",
@@ -24,8 +24,8 @@ var (
 			ClassifyName: "Aviation Active Fleet",
 			Sort:         4,
 		},
-		"Demand-Gasoline": {
+		"Demand - Gasoline": {
-			ClassifyName: "Demand-Gasoline",
+			ClassifyName: "Demand - Gasoline",
 			Sort:         5,
 		},
 		"Demand - Diesel": {
@@ -60,237 +60,237 @@ type ReportProcessor interface {
 }
 
 type RzdDataProcessor interface {
-	Process(tableName string) ([]models.BaseFromRzdData, error)
+	Process(tableName string) error
 }
 
 func GetProcessor(tableName string, sheetName string) (ReportProcessor, error) {
-	if tableName == "Oil_Demand_Signals_Weekly_Report" {
+	//if tableName == "Oil_Demand_Signals_Weekly_Report" {
-		switch sheetName {
+	//	switch sheetName {
-		case "Road Index":
+	//	case "Road Index":
-			return &RoadIndexProcessor{}, nil
+	//		return &RoadIndexProcessor{}, nil
-		case "Road Active Fleet":
+	//	case "Road Active Fleet":
-			return &RoadActiveFleetProcessor{}, nil
+	//		return &RoadActiveFleetProcessor{}, nil
-		case "Aviation Index":
+	//	case "Aviation Index":
-			return &AviationIndexProcessor{}, nil
+	//		return &AviationIndexProcessor{}, nil
-		case "Aviation Active Fleet":
+	//	case "Aviation Active Fleet":
-			return &AviationActiveFleetProcessor{}, nil
+	//		return &AviationActiveFleetProcessor{}, nil
-		case "Demand - Gasoline":
+	//	case "Demand - Gasoline":
-			return &DemandGasolineProcessor{}, nil
+	//		return &DemandGasolineProcessor{}, nil
-		case "Demand - Diesel":
+	//	case "Demand - Diesel":
-			return &DemandDieselProcessor{}, nil
+	//		return &DemandDieselProcessor{}, nil
-		case "Demand - Jet Fuel":
+	//	case "Demand - Jet Fuel":
-			return &DemandJetFuelProcessor{}, nil
+	//		return &DemandJetFuelProcessor{}, nil
-		case "Demand - Maritime Bunker":
+	//	case "Demand - Maritime Bunker":
-			return &DemandMaritimeBunkerProcessor{}, nil
+	//		return &DemandMaritimeBunkerProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Supply_Revision_Analysis" {
+	//} else if tableName == "Supply_Revision_Analysis" {
-		switch sheetName {
+	//	switch sheetName {
-		case "Chart1":
+	//	case "Chart1":
-			return &SupplyRevisionAnalysisChartOneProcessor{}, nil
+	//		return &SupplyRevisionAnalysisChartOneProcessor{}, nil
-		case "Chart2":
+	//	case "Chart2":
-			return &SupplyRevisionAnalysisChartTwoProcessor{}, nil
+	//		return &SupplyRevisionAnalysisChartTwoProcessor{}, nil
-		case "Chart3":
+	//	case "Chart3":
-			return &SupplyRevisionAnalysisChartThreeProcessor{}, nil
+	//		return &SupplyRevisionAnalysisChartThreeProcessor{}, nil
-		case "Chart4":
+	//	case "Chart4":
-			return &SupplyRevisionAnalysisChartFourProcessor{}, nil
+	//		return &SupplyRevisionAnalysisChartFourProcessor{}, nil
-		case "Chart5":
+	//	case "Chart5":
-			return &SupplyRevisionAnalysisChartFiveProcessor{}, nil
+	//		return &SupplyRevisionAnalysisChartFiveProcessor{}, nil
-		case "Chart6":
+	//	case "Chart6":
-			return &SupplyRevisionAnalysisChartSixProcessor{}, nil
+	//		return &SupplyRevisionAnalysisChartSixProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Supply_Analysis" {
+	//} else if tableName == "Oil_Supply_Analysis" {
-		switch sheetName {
+	//	switch sheetName {
-		case "Chart1":
+	//	case "Chart1":
-			return &OilSupplyAnalysisChartOneProcessor{}, nil
+	//		return &OilSupplyAnalysisChartOneProcessor{}, nil
-		case "Chart2":
+	//	case "Chart2":
-			return &OilSupplyAnalysisChartTwoProcessor{}, nil
+	//		return &OilSupplyAnalysisChartTwoProcessor{}, nil
-		case "Chart3":
+	//	case "Chart3":
-			return &OilSupplyAnalysisChartThreeProcessor{}, nil
+	//		return &OilSupplyAnalysisChartThreeProcessor{}, nil
-		case "Chart4":
+	//	case "Chart4":
-			return &OilSupplyAnalysisChartFourProcessor{}, nil
+	//		return &OilSupplyAnalysisChartFourProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Demand_Analysis_Continent" {
+	//} else if tableName == "Oil_Demand_Analysis_Continent" {
-		switch sheetName {
+	//	switch sheetName {
-		case "Chart1":
+	//	case "Chart1":
-			return &OilDemandAnalysisContinentProcessor{}, nil
+	//		return &OilDemandAnalysisContinentProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Demand_Analysis_Region" {
+	//} else if tableName == "Oil_Demand_Analysis_Region" {
-		switch sheetName {
+	//	switch sheetName {
-		case "Chart1":
+	//	case "Chart1":
-			return &OilDemandAnalysisRegionProcessor{}, nil
+	//		return &OilDemandAnalysisRegionProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Demand_Analysis_Country" {
+	//} else if tableName == "Oil_Demand_Analysis_Country" {
-		switch sheetName {
+	//	switch sheetName {
-		case "Chart1":
+	//	case "Chart1":
-			return &OilDemandAnalysisCountryProcessor{}, nil
+	//		return &OilDemandAnalysisCountryProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Demand_Analysis_Product_Category" {
+	//} else if tableName == "Oil_Demand_Analysis_Product_Category" {
-		switch sheetName {
+	//	switch sheetName {
-		case "Chart1":
+	//	case "Chart1":
-			return &OilDemandAnalysisProductCategoryProcessor{}, nil
+	//		return &OilDemandAnalysisProductCategoryProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Demand_Analysis_Product_Detail" {
+	//} else if tableName == "Oil_Demand_Analysis_Product_Detail" {
-		switch sheetName {
+	//	switch sheetName {
-		case "Chart1":
+	//	case "Chart1":
-			return &OilDemandAnalysisProductDetailProcessor{}, nil
+	//		return &OilDemandAnalysisProductDetailProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Demand_Analysis_Sector_Category" {
+	//} else if tableName == "Oil_Demand_Analysis_Sector_Category" {
-		switch sheetName {
+	//	switch sheetName {
-		case "Chart1":
+	//	case "Chart1":
-			return &OilDemandAnalysisSectorCategoryProcessor{}, nil
+	//		return &OilDemandAnalysisSectorCategoryProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Demand_Analysis_Sector_Detail" {
+	//} else if tableName == "Oil_Demand_Analysis_Sector_Detail" {
-		switch sheetName {
+	//	switch sheetName {
-		case "Chart1":
+	//	case "Chart1":
-			return &OilDemandAnalysisSectorDetailProcessor{}, nil
+	//		return &OilDemandAnalysisSectorDetailProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Demand_Analysis_Scenario" {
+	//} else if tableName == "Oil_Demand_Analysis_Scenario" {
-		switch sheetName {
+	//	switch sheetName {
-		case "Chart1":
+	//	case "Chart1":
-			return &OilDemandAnalysisScenarioProcessor{}, nil
+	//		return &OilDemandAnalysisScenarioProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Upstream_Supply_Oil_Quality_Api" {
+	//} else if tableName == "Oil_Market_Cube_Upstream_Supply_Oil_Quality_Api" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &UpstreamSupplyOilQualityApiProcessor{}, nil
+	//		return &UpstreamSupplyOilQualityApiProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Upstream_Supply_Oil_Quality_Sulphur" {
+	//} else if tableName == "Oil_Market_Cube_Upstream_Supply_Oil_Quality_Sulphur" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &OilMarketCubeUpstreamSupplyOilQualitySulphurProcessor{}, nil
+	//		return &OilMarketCubeUpstreamSupplyOilQualitySulphurProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Upstream_Supply_Capacity_Capacity" {
+	//} else if tableName == "Oil_Market_Cube_Upstream_Supply_Capacity_Capacity" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &OilMarketCubeUpstreamSupplyCapacityCapacityProcessor{}, nil
+	//		return &OilMarketCubeUpstreamSupplyCapacityCapacityProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Upstream_Supply_Production" {
+	//} else if tableName == "Oil_Market_Cube_Upstream_Supply_Production" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &OilMarketCubeUpstreamSupplyProductionProcessor{}, nil
+	//		return &OilMarketCubeUpstreamSupplyProductionProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Upstream_Supply_Production_Wo_Seasonality" {
+	//} else if tableName == "Oil_Market_Cube_Upstream_Supply_Production_Wo_Seasonality" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &UpstreamSupplyProductionWoSeasonalityProcessor{}, nil
+	//		return &UpstreamSupplyProductionWoSeasonalityProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Upstream_Supply_OPEC_Policy_Reference_Production" {
+	//} else if tableName == "Oil_Market_Cube_Upstream_Supply_OPEC_Policy_Reference_Production" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &UpstreamSupplyOPECPolicyReferenceProductionProcessor{}, nil
+	//		return &UpstreamSupplyOPECPolicyReferenceProductionProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Upstream_Supply_OPEC_Policy_Target_Production" {
+	//} else if tableName == "Oil_Market_Cube_Upstream_Supply_OPEC_Policy_Target_Production" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &UpstreamSupplyOPECPolicyTargetProductionProcessor{}, nil
+	//		return &UpstreamSupplyOPECPolicyTargetProductionProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Upstream_Supply_OPEC_Policy_Target_Cut" {
+	//} else if tableName == "Oil_Market_Cube_Upstream_Supply_OPEC_Policy_Target_Cut" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &UpstreamSupplyOPECPolicyTargetCutProcessor{}, nil
+	//		return &UpstreamSupplyOPECPolicyTargetCutProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Upstream_Supply_OPEC_Policy_Actual_Cut" {
+	//} else if tableName == "Oil_Market_Cube_Upstream_Supply_OPEC_Policy_Actual_Cut" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &UpstreamSupplyOPECPolicyActualCutProcessor{}, nil
+	//		return &UpstreamSupplyOPECPolicyActualCutProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Upstream_Supply_OPEC_Policy_Compliance" {
+	//} else if tableName == "Oil_Market_Cube_Upstream_Supply_OPEC_Policy_Compliance" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &UpstreamSupplyOPECPolicyComplianceProcessor{}, nil
+	//		return &UpstreamSupplyOPECPolicyComplianceProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Upstream_Supply_OPEC_Policy_Production_Subject_To_Cut" {
+	//} else if tableName == "Oil_Market_Cube_Upstream_Supply_OPEC_Policy_Production_Subject_To_Cut" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &UpstreamSupplyOPECPolicyProductionSubjectToCutProcessor{}, nil
+	//		return &UpstreamSupplyOPECPolicyProductionSubjectToCutProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Products_Demand_Products_Demand_Mean" {
+	//} else if tableName == "Oil_Market_Cube_Products_Demand_Products_Demand_Mean" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &ProductsDemandProductsDemandMeanProcessor{}, nil
+	//		return &ProductsDemandProductsDemandMeanProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Products_Demand_Products_Demand+Sigma" {
+	//} else if tableName == "Oil_Market_Cube_Products_Demand_Products_Demand+Sigma" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &ProductsDemandProductsDemandAddSigmaProcessor{}, nil
+	//		return &ProductsDemandProductsDemandAddSigmaProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Products_Demand_Products_Demand-Sigma" {
+	//} else if tableName == "Oil_Market_Cube_Products_Demand_Products_Demand-Sigma" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &ProductsDemandProductsDemandSubSigmaProcessor{}, nil
+	//		return &ProductsDemandProductsDemandSubSigmaProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Balances_Total_Liquids_Balances" {
+	//} else if tableName == "Oil_Market_Cube_Balances_Total_Liquids_Balances" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &BalancesTotalLiquidsBalancesProcessor{}, nil
+	//		return &BalancesTotalLiquidsBalancesProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Geography_Latitude" {
+	//} else if tableName == "Oil_Market_Cube_Geography_Latitude" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &GeographyLatitudeProcessor{}, nil
+	//		return &GeographyLatitudeProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	} else if tableName == "Oil_Market_Cube_Geography_Longitude" {
+	//} else if tableName == "Oil_Market_Cube_Geography_Longitude" {
-		switch sheetName {
+	//	switch sheetName {
-		case "ExportCubeBrowser 1":
+	//	case "ExportCubeBrowser 1":
-			return &GeographyLongitudeProcessor{}, nil
+	//		return &GeographyLongitudeProcessor{}, nil
-		default:
+	//	default:
-			return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
+	//		return nil, fmt.Errorf("unknown sheetName: %s", sheetName)
-		}
+	//	}
-	}
+	//}
 
 	// 可以添加更多的逻辑来处理其他产品和类别
 	return nil, fmt.Errorf("no processor found for tableName %s and sheetName %s", tableName, sheetName)

utils/constants.go

@@ -274,7 +274,7 @@ const (
 	GET_RZD_INDEX_BY_CODE                             = "/rzd/get/rzd/index/by/code"                            // 根据指标编码获取指标
 	GET_RZD_CLASSIFY_BY_NAME                          = "/rzd/get/rzd/classify/by/name"                         // 根据分类名称查询分类
 	GET_RZD_CLASSIFY                                  = "/rzd/get/rzd/classify"                                 // 睿咨得查询分类
-	BATCH_ADD_RZD_CLASSYFY                            = "/add/rzd/batch_add_classify"                           //批量增加睿咨得分类
+	BATCH_ADD_RZD_CLASSYFY                            = "/rzd/add/rzd/batch_add_classify"                       //批量增加睿咨得分类
 	ADD_RZD_CLASSIFY                                  = "/rzd/add/rzd/classify"                                 // 新增睿咨得分类
 	ADD_BATCH_RZD_EDB_DATA                            = "/rzd/add/batch/rzd/edb/data"                           // 批量增加指标库指标数据
 	GET_RZD_EDB_INFO_BY_INDEX_CODE                    = "/rzd/get/rzd/edb/info/by/code"                         // 根据指标code获取指标信息

utils/date_util.go

@@ -510,19 +510,18 @@ func GetCurrentYearMonth() string {
 }
 
 // ConvertDateFormat 转换时间格式 MM-dd-yy --> yyyy-MM-dd
-func ConvertDateFormat(dataText string) (string, error) {
+func ConvertDateFormat(dataText string) (date time.Time, dateStr string, err error) {
 	// 定义输入和输出的时间格式
 	inputFormat := "01-02-06"    // MM-dd-yy
 	outputFormat := "2006-01-02" // yyyy-MM-dd
-
 	// 解析输入的日期
-	date, err := time.Parse(inputFormat, dataText)
+	date, err = time.ParseInLocation(inputFormat, dataText, time.Local)
 	if err != nil {
-		return "", err
+		return
 	}
-
 	// 格式化为输出格式
-	return date.Format(outputFormat), nil
+	dateStr = date.Format(outputFormat)
+	return
 }
 
 // ConvertDateFormat2 转换时间格式 yyyy-MMQ --> 取每一季度最后一天，例如 2024-01Q --> 2024-03-31