zwxi 1 год назад
Родитель
Сommit
c3a1c08ce1
4 измененных файлов с 81 добавлено и 4 удалено
  1. BIN
      eta_data_analysis
  2. 76 0
      services/commodity_coal.go
  3. 1 1
      utils/config.go
  4. 4 3
      utils/constants.go

BIN
eta_data_analysis


+ 76 - 0
services/commodity_coal_coastal.go → services/commodity_coal.go

@@ -483,3 +483,79 @@ func Inland(path string) (err error) {
 
 	return
 }
+
+func Mtjh(path string) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println("RefreshDataFromCoalCoastal  Err:" + err.Error())
+			utils.FileLog.Info(fmt.Sprintf("RefreshDataFromCoalCoastal, Err: %s", err))
+		}
+	}()
+	path = "/Users/xi/Desktop/煤炭江湖数据定制化服务——中国主流港口煤炭库存20231129.xlsx"
+	//path := "D:\\瑞茂通-中国煤炭市场网数据\\442家晋陕蒙、沿海8省、内陆17省历史数据\\CⅢ-8-16 25省市库存和日耗情况(CCTD).xlsx"
+
+	var xlFile *xlsx.File
+	exist, err := PathExists(path)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	if exist {
+		xlFile, err = xlsx.OpenFile(path)
+		if err != nil {
+			fmt.Println("OpenFile err:", err)
+			return
+		}
+	} else {
+		fmt.Println("Not Exist")
+		return
+	}
+
+	sheetDatas := make([]models.SheetData, 0)
+	for _, sheet := range xlFile.Sheets {
+		data := sheet
+		sheetData := models.SheetData{
+			Name:     data.Name,
+			MaxRow:   data.MaxRow,
+			MaxCol:   data.MaxCol,
+			Hidden:   data.Hidden,
+			Selected: data.Selected,
+		}
+		rows := make([]models.Row, 0)
+		for _, v := range data.Rows {
+			cells := make([]models.Cell, 0)
+			for _, cell := range v.Cells {
+				cells = append(cells, models.Cell{
+					Value: cell.String(),
+				})
+			}
+			row := models.Row{
+				Cells: cells,
+			}
+			rows = append(rows, row)
+		}
+		sheetData.Rows = rows
+		sheetDatas = append(sheetDatas, sheetData)
+	}
+
+	params := make(map[string]interface{})
+	params["SheetData"] = sheetDatas
+	result, e := PostEdbLib(params, utils.LIB_ROUTE_COAL_MINE_MTJH)
+	if e != nil {
+		b, _ := json.Marshal(params)
+		fmt.Println(e)
+		utils.FileLog.Info(fmt.Sprintf("PostEdbLib err: %s, params: %s", e.Error(), string(b)))
+		return
+	}
+	resp := new(models.BaseEdbLibResponse)
+	if e := json.Unmarshal(result, &resp); e != nil {
+		utils.FileLog.Info(fmt.Sprintf("json.Unmarshal err: %s", e))
+		return
+	}
+	if resp.Ret != 200 {
+		utils.FileLog.Info(fmt.Sprintf("Msg: %s, ErrMsg: %s", resp.Msg, resp.ErrMsg))
+		return
+	}
+
+	return
+}

+ 1 - 1
utils/config.go

@@ -45,7 +45,7 @@ var (
 // 中国煤炭网
 var (
 	CoalMineFilePath string //excel文件地址
-	CoalMineOpen     string //是否配置涌益生猪数据源,1已配置
+	CoalMineOpen     string //是否配置中国煤炭网数据源,1已配置
 )
 
 var TerminalCode string

+ 4 - 3
utils/constants.go

@@ -234,7 +234,8 @@ const (
 	LIB_ROUTE_COAL_MINE_JSM_HISTORY = "/coal_mine/jsm/history" //jsm三省煤炭网历史数据处理excel数据并入库 数据地址
 	LIB_ROUTE_COAL_MINE_COASTAL_HISTORY = "/coal_mine/coastal/history" //沿海煤炭网历史数据处理excel数据并入库 数据地址
 	LIB_ROUTE_COAL_MINE_INLAND_HISTORY = "/coal_mine/inland/history" //内陆三省煤炭网历史数据处理excel数据并入库 数据地址
-	LIB_ROUTE_COAL_MINE_JSM = "/coal_mine/jsm" //jsm三省煤炭网历史数据处理excel数据并入库 数据地址
-	LIB_ROUTE_COAL_MINE_COASTAL = "/coal_mine/coastal" //沿海煤炭网历史数据处理excel数据并入库 数据地址
-	LIB_ROUTE_COAL_MINE_INLAND = "/coal_mine/inland" //内陆三省煤炭网历史数据处理excel数据并入库 数据地址
+	LIB_ROUTE_COAL_MINE_JSM = "/coal_mine/jsm" //jsm三省煤炭网数据处理excel数据并入库 数据地址
+	LIB_ROUTE_COAL_MINE_COASTAL = "/coal_mine/coastal" //沿海煤炭网数据处理excel数据并入库 数据地址
+	LIB_ROUTE_COAL_MINE_INLAND = "/coal_mine/inland" //内陆三省煤炭网数据处理excel数据并入库 数据地址
+	LIB_ROUTE_COAL_MINE_MTJH = "/mtjh/data" //煤炭江湖数据处理excel数据并入库 数据地址
 )