|
@@ -512,41 +512,41 @@ type MarketOverviewData struct {
|
|
} `json:"records"`
|
|
} `json:"records"`
|
|
}
|
|
}
|
|
|
|
|
|
-func MockGnData() []byte {
|
|
|
|
- demoJson := `{
|
|
|
|
- "code": "000000",
|
|
|
|
- "msg": "处理成功",
|
|
|
|
- "time": "2024-09-24T07:12:40.020Z",
|
|
|
|
- "data": {
|
|
|
|
- "result": true,
|
|
|
|
- "total": 6,
|
|
|
|
- "records": [
|
|
|
|
- {
|
|
|
|
- "CATEGORY": "市场简况",
|
|
|
|
- "CONTENT": " 产地需求保持,煤价延续上涨。榆林区域销售良好,同时受保供加码影响,市场煤持续收缩,支撑煤价继续小涨。6100K价格1080元/吨,环比涨5元/吨;5800K价格1025元/吨,环比涨10元/吨。鄂尔多斯区域拉运积极性保持,市场情绪平稳。5500K价格890元/吨、5000K价格755元/吨、4500K价格645元/吨,均环比持平。晋北区域坑口采购需求持续向好,叠加港口价格上涨传导,报价普遍上调。大同5000K价格860元/吨,环比涨20元/吨;朔州5500KS1.5价格1010元/吨,环比涨20元/吨;朔州4500S1.6价格755元/吨,环比涨10元/吨;忻州5000S1.3价格815元/吨,环比涨15元/吨。\n 港口方面:近期产地市场煤持续收缩,发港调货难度增加,港口流通货源补充不足,支撑贸易商情绪保持乐观。而在高温、水电乏力和工业企业开工率上升影响下,电厂日耗保持高位,采购需求有所释放。5500K价格1160元/吨,环比涨5元/吨;5000K价格1030元/吨,环比涨5元/吨;4500K价格910元/吨,环比涨5元/吨。",
|
|
|
|
- "CREATE_ORIGIN_TIME": null,
|
|
|
|
- "CREATE_TIME": "2024-12-20 14:30:53",
|
|
|
|
- "DATA_DATE": "2022-08-17 00:00:00",
|
|
|
|
- "DATA_SOURCE": "CCTD",
|
|
|
|
- "DATA_SOURCE_CODE": "S02",
|
|
|
|
- "DES": null,
|
|
|
|
- "ID": 645,
|
|
|
|
- "IS_VALID_DATA": 1,
|
|
|
|
- "PERSON": null,
|
|
|
|
- "TITLE": "CCTD2022-08-17市场简况",
|
|
|
|
- "UPDATE_ORIGIN_TIME": null,
|
|
|
|
- "UPDATE_TIME": "2024-12-20 14:30:53"
|
|
|
|
- }
|
|
|
|
- ]
|
|
|
|
- }
|
|
|
|
-}`
|
|
|
|
-
|
|
|
|
- return []byte(demoJson)
|
|
|
|
-}
|
|
|
|
|
|
+// func MockGnData() []byte {
|
|
|
|
+// demoJson := `{
|
|
|
|
+// "code": "000000",
|
|
|
|
+// "msg": "处理成功",
|
|
|
|
+// "time": "2024-09-24T07:12:40.020Z",
|
|
|
|
+// "data": {
|
|
|
|
+// "result": true,
|
|
|
|
+// "total": 6,
|
|
|
|
+// "records": [
|
|
|
|
+// {
|
|
|
|
+// "CATEGORY": "市场简况",
|
|
|
|
+// "CONTENT": " 产地需求保持,煤价延续上涨。榆林区域销售良好,同时受保供加码影响,市场煤持续收缩,支撑煤价继续小涨。6100K价格1080元/吨,环比涨5元/吨;5800K价格1025元/吨,环比涨10元/吨。鄂尔多斯区域拉运积极性保持,市场情绪平稳。5500K价格890元/吨、5000K价格755元/吨、4500K价格645元/吨,均环比持平。晋北区域坑口采购需求持续向好,叠加港口价格上涨传导,报价普遍上调。大同5000K价格860元/吨,环比涨20元/吨;朔州5500KS1.5价格1010元/吨,环比涨20元/吨;朔州4500S1.6价格755元/吨,环比涨10元/吨;忻州5000S1.3价格815元/吨,环比涨15元/吨。\n 港口方面:近期产地市场煤持续收缩,发港调货难度增加,港口流通货源补充不足,支撑贸易商情绪保持乐观。而在高温、水电乏力和工业企业开工率上升影响下,电厂日耗保持高位,采购需求有所释放。5500K价格1160元/吨,环比涨5元/吨;5000K价格1030元/吨,环比涨5元/吨;4500K价格910元/吨,环比涨5元/吨。",
|
|
|
|
+// "CREATE_ORIGIN_TIME": null,
|
|
|
|
+// "CREATE_TIME": "2024-12-20 14:30:53",
|
|
|
|
+// "DATA_DATE": "2022-08-17 00:00:00",
|
|
|
|
+// "DATA_SOURCE": "CCTD",
|
|
|
|
+// "DATA_SOURCE_CODE": "S02",
|
|
|
|
+// "DES": null,
|
|
|
|
+// "ID": 645,
|
|
|
|
+// "IS_VALID_DATA": 1,
|
|
|
|
+// "PERSON": null,
|
|
|
|
+// "TITLE": "CCTD2022-08-17市场简况",
|
|
|
|
+// "UPDATE_ORIGIN_TIME": null,
|
|
|
|
+// "UPDATE_TIME": "2024-12-20 14:30:53"
|
|
|
|
+// }
|
|
|
|
+// ]
|
|
|
|
+// }
|
|
|
|
+// }`
|
|
|
|
+
|
|
|
|
+// return []byte(demoJson)
|
|
|
|
+// }
|
|
|
|
|
|
type MarketOverviewResp struct {
|
|
type MarketOverviewResp struct {
|
|
Code string `json:"code"`
|
|
Code string `json:"code"`
|
|
- Msg string `json:"msg"`
|
|
|
|
|
|
+ Mesg string `json:"mesg"`
|
|
Time string `json:"time"`
|
|
Time string `json:"time"`
|
|
Data struct {
|
|
Data struct {
|
|
Result bool `json:"result"`
|
|
Result bool `json:"result"`
|
|
@@ -577,20 +577,19 @@ func GetMarketOverview(param interface{}) (resp *MarketOverviewResp, err error)
|
|
}
|
|
}
|
|
}()
|
|
}()
|
|
|
|
|
|
- // urlStr := global.CONFIG.Gn.DataAccessMarketUrl
|
|
|
|
|
|
+ urlStr := global.CONFIG.Gn.DataAccessMarketUrl
|
|
|
|
|
|
- result := MockGnData()
|
|
|
|
- // // 获取token
|
|
|
|
- // token, err := GetGnAccessToken(false)
|
|
|
|
- // if err != nil {
|
|
|
|
- // return
|
|
|
|
- // }
|
|
|
|
|
|
+ // 获取token
|
|
|
|
+ token, err := GetGnAccessToken(false)
|
|
|
|
+ if err != nil {
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
|
|
- // // 请求
|
|
|
|
- // result, err := HttpPostGn(urlStr, token, param, 0)
|
|
|
|
- // if err != nil {
|
|
|
|
- // return
|
|
|
|
- // }
|
|
|
|
|
|
+ // 请求
|
|
|
|
+ result, err := HttpPostGn(urlStr, token, param, 0)
|
|
|
|
+ if err != nil {
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
|
|
// 解析响应结果
|
|
// 解析响应结果
|
|
err = json.Unmarshal(result, &resp)
|
|
err = json.Unmarshal(result, &resp)
|