Browse Source

睿姿得数据爬取

gmy 4 months ago
parent
commit
721fcc3dce
2 changed files with 29 additions and 10 deletions
  1. 22 3
      services/ruizide/data_processor.go
  2. 7 7
      services/ruizide/processor_business_logic.go

+ 22 - 3
services/ruizide/data_processor.go

@@ -273,8 +273,8 @@ func resolverNet() {
 func main() {
 	var tableNameList = []string{
 		//"Oil_Demand_Signals_Weekly_Report",
-		//"Supply_Revision_Analysis",
-		//"Oil_Market_Cube_Upstream_Supply_Oil_Quality_Api",
+		"Supply_Revision_Analysis",
+		/*"Oil_Market_Cube_Upstream_Supply_Oil_Quality_Api",
 		"Oil_Market_Cube_Upstream_Supply_Oil_Quality_Sulphur",
 		"Oil_Market_Cube_Upstream_Supply_Capacity_Capacity",
 		"Oil_Market_Cube_Upstream_Supply_Production",
@@ -290,7 +290,7 @@ func main() {
 		"Oil_Market_Cube_Products_Demand_Products_Demand-Sigma",
 		"Oil_Market_Cube_Balances_Total_Liquids_Balances",
 		"Oil_Market_Cube_Geography_Latitude",
-		"Oil_Market_Cube_Geography_Longitude",
+		"Oil_Market_Cube_Geography_Longitude",*/
 	}
 	for _, tableName := range tableNameList {
 		var fileName string
@@ -331,8 +331,27 @@ func main() {
 			}
 			if strings.Contains(sheetName, "Demand - Jet Fuel") {
 				continue
+			}
+			if strings.Contains(sheetName, "Demand - Maritime Bunker") {
+				continue
 			}*/
 
+			if strings.Contains(sheetName, "Chart1") {
+				continue
+			}
+			if strings.Contains(sheetName, "Chart2") {
+				continue
+			}
+			if strings.Contains(sheetName, "Chart3") {
+				continue
+			}
+			if strings.Contains(sheetName, "Chart4") {
+				continue
+			}
+			if strings.Contains(sheetName, "Chart5") {
+				continue
+			}
+
 			// 获取工作表的最大行数
 			maxRow, err := f.GetRows(sheetName) // 直接获取所有行数据
 			if err != nil {

+ 7 - 7
services/ruizide/processor_business_logic.go

@@ -932,8 +932,8 @@ func (p *SupplyRevisionAnalysisChartFourProcessor) Process(tableName string, she
 	indexNameTwo := "Supply Revision Analysis" + "/" + indexNameColPrefix + "/" + "Previous"
 
 	// 生成指标编码
-	indexCodeOne, err := getIndexId("Supply Revision Analysis "+indexNameColPrefix, "Current", "")
-	indexCodeTwo, err := getIndexId("Supply Revision Analysis "+indexNameColPrefix, "Previous", "")
+	indexCodeOne, err := getIndexId("Supply Revision Analysis "+indexNameColPrefix, "current", "")
+	indexCodeTwo, err := getIndexId("Supply Revision Analysis "+indexNameColPrefix, "previous", "")
 
 	var indexInfoList []*models.IndexInfo
 	var valueOne float64
@@ -946,7 +946,7 @@ func (p *SupplyRevisionAnalysisChartFourProcessor) Process(tableName string, she
 		}
 	}
 
-	dataTimeOne := rowData[1]
+	dataTimeOne := rowData[0]
 	formatOne, err := utils.ConvertDateFormat4(dataTimeOne)
 	if err != nil {
 		return nil, err
@@ -1014,12 +1014,12 @@ func (p *SupplyRevisionAnalysisChartFiveProcessor) Process(tableName string, she
 
 	// step_2: 指标
 	// 指标名称
-	indexNameOne := "Supply Revision Analysis" + "/" + indexNameColPrefix + "/" + "Current"
-	indexNameTwo := "Supply Revision Analysis" + "/" + indexNameColPrefix + "/" + "Previous"
+	indexNameOne := "Supply Revision Analysis" + "/" + indexNameColPrefix + "/" + "Current/Chat5"
+	indexNameTwo := "Supply Revision Analysis" + "/" + indexNameColPrefix + "/" + "Previous/Chat5"
 
 	// 生成指标编码
-	indexCodeOne, err := getIndexId("Supply Revision Analysis "+indexNameColPrefix, "Current", "")
-	indexCodeTwo, err := getIndexId("Supply Revision Analysis "+indexNameColPrefix, "Previous", "")
+	indexCodeOne, err := getIndexId("Supply Revision Analysis "+indexNameColPrefix, "currentchat5", "")
+	indexCodeTwo, err := getIndexId("Supply Revision Analysis "+indexNameColPrefix, "previouschat5", "")
 
 	var indexInfoList []*models.IndexInfo
 	var valueOne float64