Merge branch 'refs/heads/eta_2.0.8_ly_0804@guomengyuan' into debug

services/liangyou/processor_business_logic.go

@@ -36,7 +36,7 @@ func (p *ImportCostProcessor) Process(ctx context.Context, product string, repor
 
 	// 解析关键字
 	if len(keywords) < 5 {
-		return []models.BaseFromLyData{}, fmt.Errorf("ProcessingImportCostProcessor Process() : keywords must contain at least 5 elements")
+		return []models.BaseFromLyData{}, fmt.Errorf("ImportCostProcessor Process() : keywords must contain at least 5 elements")
 	}
 
 	// 拿到 行关键字和列关键字
@@ -69,7 +69,7 @@ func (p *ImportCostProcessor) Process(ctx context.Context, product string, repor
 		targetMonths, err = utils.ParseDateAndMonth(dateText)
 	}
 	if err != nil {
-		return []models.BaseFromLyData{}, fmt.Errorf("ProcessingImportCostProcessor Process() : Failed to parse date: %v", err)
+		return []models.BaseFromLyData{}, fmt.Errorf("ImportCostProcessor Process() : Failed to parse date: %v", err)
 	}
 	fmt.Printf("Target Month: %s\n", targetMonths)
 
@@ -89,7 +89,7 @@ func (p *ImportCostProcessor) Process(ctx context.Context, product string, repor
 			}
 		}
 		if columnIdx == -1 {
-			log.Printf("ProcessingImportCostProcessor Process() : Column '%s' not found in table", columnName)
+			log.Printf("ImportCostProcessor Process() : Column '%s' not found in table", columnName)
 			continue
 		}
 
@@ -120,17 +120,17 @@ func (p *ImportCostProcessor) Process(ctx context.Context, product string, repor
 						// 指标id获取
 						indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
 						if err != nil {
-							logs.Error("ProcessingImportCostProcessor Process() : Failed to get index id: %v", err)
+							logs.Error("ImportCostProcessor Process() : Failed to get index id: %v", err)
 							continue
 						}
 
 						indexData, err := models.GetLyDataByIndexIdAndDataTime(indexId, format)
 						if err != nil {
-							logs.Error("ProcessingImportCostProcessor Process() : Failed to get data by index id and date: %v", err)
+							logs.Error("ImportCostProcessor Process() : Failed to get data by index id and date: %v", err)
 							continue
 						}
 						if len(indexData) > 0 {
-							logs.Info("ProcessingImportCostProcessor Process() : Data already exists for index %d and date %s", indexId, dateText)
+							logs.Info("ImportCostProcessor Process() : Data already exists for index %d and date %s", indexId, dateText)
 							continue
 						}
 
@@ -148,7 +148,7 @@ func (p *ImportCostProcessor) Process(ctx context.Context, product string, repor
 						}
 						result = append(result, baseFromLyData)
 					} else {
-						log.Printf("ProcessingImportCostProcessor Process() : Column index out of range for row '%s', '%s'", rowVariety, rowPort)
+						log.Printf("ImportCostProcessor Process() : Column index out of range for row '%s', '%s'", rowVariety, rowPort)
 					}
 					break
 				}
@@ -562,7 +562,7 @@ func (p *PurchaseShippingProcessor) Process(ctx context.Context, product string,
 	logs.Info("Processing purchase shipping...")
 	// 解析关键字
 	if len(keywords) < 3 {
-		return []models.BaseFromLyData{}, fmt.Errorf("SupplyDemandBalanceProcessor Process() : keywords must contain at least 3 elements")
+		return []models.BaseFromLyData{}, fmt.Errorf("PurchaseShippingProcessor Process() : keywords must contain at least 3 elements")
 	}
 
 	// 拿到 行关键字和列关键字
@@ -570,7 +570,7 @@ func (p *PurchaseShippingProcessor) Process(ctx context.Context, product string,
 
 	// 提取所有表格数据
 	tableData := getPurchaseShippingTableData(reportContent)
-	logs.Info("SupplyDemandBalanceProcessor Process() : Table data: %v", tableData)
+	logs.Info("PurchaseShippingProcessor Process() : Table data: %v", tableData)
 
 	// 提取日期信息
 	dateText, err := getDateInfo(ctx)
@@ -599,7 +599,7 @@ func (p *PurchaseShippingProcessor) Process(ctx context.Context, product string,
 		}
 	}
 	if columnIdx == -1 {
-		log.Printf("SupplyDemandBalanceProcessor Process() : Column '%s' not found in table", columnName)
+		log.Printf("PurchaseShippingProcessor Process() : Column '%s' not found in table", columnName)
 	} else {
 		// 处理表格中的每一行
 		for _, row := range rows {
@@ -615,7 +615,7 @@ func (p *PurchaseShippingProcessor) Process(ctx context.Context, product string,
 					// 指标id获取
 					indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
 					if err != nil {
-						logs.Error("SupplyDemandBalanceProcessor Process() : Failed to get index id: %v", err)
+						logs.Error("PurchaseShippingProcessor Process() : Failed to get index id: %v", err)
 						continue
 					}
 					var yearMonth string
@@ -641,7 +641,7 @@ func (p *PurchaseShippingProcessor) Process(ctx context.Context, product string,
 					valueStr := row[columnIdx]
 					value, err := strconv.ParseFloat(valueStr, 64)
 					if err != nil {
-						return []models.BaseFromLyData{}, fmt.Errorf("SupplyDemandBalanceProcessor Process() : failed to parse value '%s': %v", valueStr, err)
+						return []models.BaseFromLyData{}, fmt.Errorf("PurchaseShippingProcessor Process() : failed to parse value '%s': %v", valueStr, err)
 					}
 
 					month, err := utils.GetYearMonth(yearMonth)
@@ -650,12 +650,12 @@ func (p *PurchaseShippingProcessor) Process(ctx context.Context, product string,
 					}
 					indexData, err := models.GetLyDataByIndexIdAndDataTimeYM(indexId, month)
 					if err != nil {
-						logs.Error("SupplyDemandBalanceProcessor Process() : Failed to get data by index id and date: %v", err)
+						logs.Error("PurchaseShippingProcessor Process() : Failed to get data by index id and date: %v", err)
 						continue
 					}
 					if len(indexData) > 0 {
 						if indexData[0].Value != value {
-							logs.Info("SupplyDemandBalanceProcessor Process() : Data already exists for index %d and date %s", indexId, dateText)
+							logs.Info("PurchaseShippingProcessor Process() : Data already exists for index %d and date %s", indexId, dateText)
 
 							lyData := indexData[0]
 							time, err := utils.StringToTime(lyData.ModifyTime)
@@ -701,7 +701,7 @@ func (p *PurchaseShippingProcessor) Process(ctx context.Context, product string,
 					result = append(result, baseFromLyData)
 					continue
 				} else {
-					log.Printf("SupplyDemandBalanceProcessor Process() : Column index out of range for row '%s'", columnName)
+					log.Printf("PurchaseShippingProcessor Process() : Column index out of range for row '%s'", columnName)
 				}
 				break
 			}
@@ -851,28 +851,6 @@ func (p *ProcessingReportProcessor) Process(ctx context.Context, product string,
 				}
 				break
 			}
-
-			/*if len(row) > 0 && strings.Contains(row[0], rowName) {
-				if weekIdx < len(row) {
-					logs.Info("Value in column '%s' - '%s': %s", columnName, rowName, row[columnIdx])
-					numFlag := isNumeric(row[columnIdx])
-					if numFlag {
-						value, err := strconv.ParseFloat(row[columnIdx], 64)
-						if err != nil {
-							logs.Error("ProcessingReportProcessor Process() : Error converting value to float64: %v", err)
-							return []models.BaseFromLyData{}, err
-						}
-						// 返回BaseFromLyData对象的数据
-						baseFromLyData := models.BaseFromLyData{
-							DataTime: dateText,
-							Value:    value,
-						}
-						result = append(result, baseFromLyData)
-					}
-				} else {
-					logs.Error("ProcessingReportProcessor Process() : Column index out of range")
-				}
-			}*/
 		}
 	}
 
@@ -889,7 +867,7 @@ func (p *InventoryAnalysisProcessor) Process(ctx context.Context, product string
 
 	// 解析关键字
 	if len(keywords) < 4 {
-		return []models.BaseFromLyData{}, fmt.Errorf("SupplyDemandBalanceProcessor Process() : keywords must contain at least 4 elements")
+		return []models.BaseFromLyData{}, fmt.Errorf("InventoryAnalysisProcessor Process() : keywords must contain at least 4 elements")
 	}
 
 	// 拿到 行关键字和列关键字
@@ -901,7 +879,7 @@ func (p *InventoryAnalysisProcessor) Process(ctx context.Context, product string
 
 	// 提取所有表格数据
 	tableData := getTableData(reportContent, true)
-	logs.Info("SupplyDemandBalanceProcessor Process() : Table data: %v", tableData)
+	logs.Info("InventoryAnalysisProcessor Process() : Table data: %v", tableData)
 
 	// 提取日期信息
 	dateText, err := getDateInfo(ctx)
@@ -931,7 +909,7 @@ func (p *InventoryAnalysisProcessor) Process(ctx context.Context, product string
 		}
 	}
 	if columnIdx == -1 {
-		logs.Error("SupplyDemandBalanceProcessor Process() : Column '%s' not found in table", columnName)
+		logs.Error("InventoryAnalysisProcessor Process() : Column '%s' not found in table", columnName)
 	} else {
 		// 处理表格中的每一行
 		for _, row := range rows {
@@ -945,17 +923,17 @@ func (p *InventoryAnalysisProcessor) Process(ctx context.Context, product string
 					// 指标id获取
 					indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
 					if err != nil {
-						logs.Error("SupplyDemandBalanceProcessor Process() : Failed to get index id: %v", err)
+						logs.Error("InventoryAnalysisProcessor Process() : Failed to get index id: %v", err)
 						continue
 					}
 
 					indexData, err := models.GetLyDataByIndexIdAndDataTime(indexId, format)
 					if err != nil {
-						logs.Error("SupplyDemandBalanceProcessor Process() : Failed to get data by index id and date: %v", err)
+						logs.Error("InventoryAnalysisProcessor Process() : Failed to get data by index id and date: %v", err)
 						continue
 					}
 					if len(indexData) > 0 {
-						logs.Info("SupplyDemandBalanceProcessor Process() : Data already exists for index %d and date %s", indexId, dateText)
+						logs.Info("InventoryAnalysisProcessor Process() : Data already exists for index %d and date %s", indexId, dateText)
 						// 无需走更新逻辑，报告每周更新，即使本周和上周数据一致，也需要每周记录，如果到这里也只是说，今天这个报告被读取了两次
 						continue
 					}
@@ -963,7 +941,7 @@ func (p *InventoryAnalysisProcessor) Process(ctx context.Context, product string
 					valueStr := row[columnIdx]
 					value, err := strconv.ParseFloat(valueStr, 64)
 					if err != nil {
-						return []models.BaseFromLyData{}, fmt.Errorf("SupplyDemandBalanceProcessor Process() : failed to parse value '%s': %v", valueStr, err)
+						return []models.BaseFromLyData{}, fmt.Errorf("InventoryAnalysisProcessor Process() : failed to parse value '%s': %v", valueStr, err)
 					}
 					// 创建并添加到结果列表
 					baseFromLyData := models.BaseFromLyData{
@@ -975,7 +953,7 @@ func (p *InventoryAnalysisProcessor) Process(ctx context.Context, product string
 					result = append(result, baseFromLyData)
 					continue
 				} else {
-					log.Printf("SupplyDemandBalanceProcessor Process() : Column index out of range for row '%s', '%s'", rowVariety, columnName)
+					log.Printf("InventoryAnalysisProcessor Process() : Column index out of range for row '%s', '%s'", rowVariety, columnName)
 				}
 				break
 			}
@@ -993,7 +971,7 @@ func (p *PriceSpreadArbitrageProcessor) Process(ctx context.Context, product str
 	fmt.Println("Processing processing profit...")
 	// 解析关键字
 	if len(keywords) < 4 {
-		return []models.BaseFromLyData{}, fmt.Errorf("ProcessingProfitProcessor Process() : keywords must contain at least 4 elements")
+		return []models.BaseFromLyData{}, fmt.Errorf("PriceSpreadArbitrageProcessor Process() : keywords must contain at least 4 elements")
 	}
 
 	// 拿到 行关键字和列关键字
@@ -1036,7 +1014,7 @@ func (p *PriceSpreadArbitrageProcessor) Process(ctx context.Context, product str
 			}
 		}
 		if columnIdx == -1 {
-			log.Printf("ProcessingProfitProcessor Process() : Column '%s' not found in table", columnDate)
+			log.Printf("PriceSpreadArbitrageProcessor Process() : Column '%s' not found in table", columnDate)
 			continue
 		}
 
@@ -1051,17 +1029,17 @@ func (p *PriceSpreadArbitrageProcessor) Process(ctx context.Context, product str
 					// 指标id获取
 					indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
 					if err != nil {
-						logs.Error("ProcessingProfitProcessor Process() : Failed to get index id: %v", err)
+						logs.Error("PriceSpreadArbitrageProcessor Process() : Failed to get index id: %v", err)
 						continue
 					}
 
 					indexData, err := models.GetLyDataByIndexIdAndDataTime(indexId, format)
 					if err != nil {
-						logs.Error("ProcessingProfitProcessor Process() : Failed to get data by index id and date: %v", err)
+						logs.Error("PriceSpreadArbitrageProcessor Process() : Failed to get data by index id and date: %v", err)
 						continue
 					}
 					if len(indexData) > 0 {
-						logs.Info("ProcessingProfitProcessor Process() : Data already exists for index %d and date %s", indexId, dateText)
+						logs.Info("PriceSpreadArbitrageProcessor Process() : Data already exists for index %d and date %s", indexId, dateText)
 						// 无需走更新逻辑，报告每天更新，即使今天和每天数据一致，也需要每天记录，如果到这里也只是说，今天这个报告被读取了两次
 						continue
 					}
@@ -1080,7 +1058,7 @@ func (p *PriceSpreadArbitrageProcessor) Process(ctx context.Context, product str
 					}
 					result = append(result, baseFromLyData)
 				} else {
-					log.Printf("ProcessingProfitProcessor Process() : Column index out of range for row '%s', '%s'", rowVariety, columnDate)
+					log.Printf("PriceSpreadArbitrageProcessor Process() : Column index out of range for row '%s', '%s'", rowVariety, columnDate)
 				}
 				break
 			}
@@ -1106,7 +1084,7 @@ func (p *DailyTransactionProcessor) Process(ctx context.Context, product string,
 	areaTableData := getNoHeadTableData(reportContent)[0]
 	// 获取第二个表格
 	blocTableData := getTableData(reportContent, false)
-	logs.Info("SupplyDemandBalanceProcessor Process() : areaTableData data: %v, blocTableData data: %v", areaTableData, blocTableData)
+	logs.Info("DailyTransactionProcessor Process() : areaTableData data: %v, blocTableData data: %v", areaTableData, blocTableData)
 	// 提取日期信息
 	dateText, err := getDateInfo(ctx)
 	if err != nil {
@@ -1301,24 +1279,24 @@ func (p *DailyTransactionProcessor) Process(ctx context.Context, product string,
 					// 指标id获取
 					indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
 					if err != nil {
-						logs.Error("SupplyDemandBalanceProcessor Process() : Failed to get index id: %v", err)
+						logs.Error("DailyTransactionProcessor Process() : Failed to get index id: %v", err)
 						continue
 					}
 
 					indexData, err := models.GetLyDataByIndexIdAndDataTime(indexId, format)
 					if err != nil {
-						logs.Error("SupplyDemandBalanceProcessor Process() : Failed to get data by index id and date: %v", err)
+						logs.Error("DailyTransactionProcessor Process() : Failed to get data by index id and date: %v", err)
 						continue
 					}
 					if len(indexData) > 0 {
-						logs.Info("SupplyDemandBalanceProcessor Process() : Data already exists for index %d and date %s", indexId, dateText)
+						logs.Info("DailyTransactionProcessor Process() : Data already exists for index %d and date %s", indexId, dateText)
 						continue
 					}
 
 					valueStr := row[blocColumnIdx]
 					value, err := strconv.ParseFloat(valueStr, 64)
 					if err != nil {
-						return []models.BaseFromLyData{}, fmt.Errorf("SupplyDemandBalanceProcessor Process() : failed to parse value '%s': %v", valueStr, err)
+						return []models.BaseFromLyData{}, fmt.Errorf("DailyTransactionProcessor Process() : failed to parse value '%s': %v", valueStr, err)
 					}
 					// 创建并添加到结果列表
 					baseFromLyData := models.BaseFromLyData{
@@ -1329,7 +1307,7 @@ func (p *DailyTransactionProcessor) Process(ctx context.Context, product string,
 					}
 					result = append(result, baseFromLyData)
 				} else {
-					log.Printf("SupplyDemandBalanceProcessor Process() : Column index out of range for row '%s', '%s'", rowBloc, columnBloc)
+					log.Printf("DailyTransactionProcessor Process() : Column index out of range for row '%s', '%s'", rowBloc, columnBloc)
 				}
 				break
 			}
@@ -1862,7 +1840,7 @@ func (p *ImportExportAnalysisProcessor) Process(ctx context.Context, product str
 	fmt.Println("Processing processing profit...")
 	// 解析关键字
 	if len(keywords) < 3 {
-		return []models.BaseFromLyData{}, fmt.Errorf("ProcessingProfitProcessor Process() : keywords must contain at least 3 elements")
+		return []models.BaseFromLyData{}, fmt.Errorf("ImportExportAnalysisProcessor Process() : keywords must contain at least 3 elements")
 	}
 
 	// 拿到 行关键字和列关键字
@@ -1906,7 +1884,7 @@ func (p *ImportExportAnalysisProcessor) Process(ctx context.Context, product str
 			}
 
 			if columnIdx == -1 {
-				log.Printf("ProcessingProfitProcessor Process() : Column '%s' not found in table", columnDate)
+				log.Printf("ImportExportAnalysisProcessor Process() : Column '%s' not found in table", columnDate)
 				continue
 			}
 
@@ -1921,7 +1899,7 @@ func (p *ImportExportAnalysisProcessor) Process(ctx context.Context, product str
 						// 指标id获取
 						indexId, err := getIndexId(indexCode, indexName, classifyId, lySourceName, keywords[len(keywords)-2], keywords[len(keywords)-1])
 						if err != nil {
-							logs.Error("ProcessingProfitProcessor Process() : Failed to get index id: %v", err)
+							logs.Error("ImportExportAnalysisProcessor Process() : Failed to get index id: %v", err)
 							continue
 						}
 						atoi, err := strconv.Atoi(row[0])
@@ -1936,11 +1914,11 @@ func (p *ImportExportAnalysisProcessor) Process(ctx context.Context, product str
 
 						indexData, err := models.GetLyDataByIndexIdAndDataTime(indexId, lastDayOfMonth)
 						if err != nil {
-							logs.Error("ProcessingProfitProcessor Process() : Failed to get data by index id and date: %v", err)
+							logs.Error("ImportExportAnalysisProcessor Process() : Failed to get data by index id and date: %v", err)
 							continue
 						}
 						if len(indexData) > 0 {
-							logs.Info("ProcessingProfitProcessor Process() : Data already exists for index %d and date %s", indexId, dateText)
+							logs.Info("ImportExportAnalysisProcessor Process() : Data already exists for index %d and date %s", indexId, dateText)
 							continue
 						}
 
@@ -1959,7 +1937,7 @@ func (p *ImportExportAnalysisProcessor) Process(ctx context.Context, product str
 						result = append(result, baseFromLyData)
 						continue
 					} else {
-						log.Printf("ProcessingProfitProcessor Process() : Column index out of range for row '%s'", columnDate)
+						log.Printf("ImportExportAnalysisProcessor Process() : Column index out of range for row '%s'", columnDate)
 					}
 					break
 				}