zwxi 1 year ago
parent
commit
47daf1cce8

+ 2 - 2
controllers/base_from_ths_ds.go

@@ -117,13 +117,13 @@ func (this *ThsDsController) Refresh() {
 	dataItem, err := services.GetEdbDataFromThsDs(edbInfo.StockCode, req.EdbCode, req.StartDate, utils.BASE_END_DATE, edbInfo.TerminalCode)
 	if err != nil {
 		br.Msg = "获取指标信息失败!"
-		br.ErrMsg = "获取指标信息失败 GetEdbDataFromThs,Err:" + err.Error()
+		br.ErrMsg = "获取指标信息失败 GetEdbDataFromThsDs,Err:" + err.Error()
 		return
 	}
 	err = models.RefreshEdbDataFromThsDs(req.EdbInfoId, req.EdbCode, req.StartDate, dataItem)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "刷新指标信息失败!"
-		br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromThs,Err:" + err.Error()
+		br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromThsDs,Err:" + err.Error()
 		return
 	}
 	// 更新指标最大最小值

+ 1 - 1
services/base_from_ths_ds.go

@@ -98,7 +98,7 @@ func getEdbDataFromThsDsApp(stockCode, edbCode, startDate, endDate string, num i
 		return
 	}
 	thsUrl := serverUrl + `edbInfo/ths/ds?StockCode=%s&EdbCode=%s&StartDate=%s&EndDate=%s`
-	thsUrl = fmt.Sprintf(thsUrl, stockCode, edbCode, "2023-11-01", "2023-11-05")
+	thsUrl = fmt.Sprintf(thsUrl, stockCode, edbCode, startDate, endDate)
 	utils.FileLog.Info("thsUrl:" + thsUrl)
 	body, err := http.Get(thsUrl)
 	utils.FileLog.Info("ths result:" + string(body))

+ 2 - 2
services/base_from_ths_ds_http.go

@@ -35,8 +35,8 @@ func getEdbDataFromThsDsHttp(stockCode, edbCode, startDate, endDate, thsRefreshT
 	}
 	dataMap := map[string]interface{}{
 		"codes":     stockCode,
-		"startdate": "2023-11-06",
-		"enddate":   "2023-12-06",
+		"startdate": startDate,
+		"enddate":   endDate,
 		"indipara":  indipara,
 	}