|
|
@@ -436,6 +436,7 @@ func QueryTSData(c *gin.Context) {
|
|
|
// 获取目标时间段的历史数据(1分钟周期)
|
|
|
// 这里要注意:由于交易库和行情库由于GoodsCode大小写不一定对得上,所以在使用交易库的商品查询行情数据时间,都要使用OutGoodsCode字段
|
|
|
cycleDatas, err := models.GetHistoryCycleDatas(models.CycleTypeMinutes1, queryTSDataRsp.OutGoodsCode, &queryTSDataRsp.StartTime, &queryTSDataRsp.EndTime, 0, true)
|
|
|
+ fmt.Println(cycleDatas[len(cycleDatas)-1])
|
|
|
if err != nil {
|
|
|
logger.GetLogger().Errorf("QueryTSData failed: %s", err.Error())
|
|
|
appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
|
|
|
@@ -448,7 +449,7 @@ func QueryTSData(c *gin.Context) {
|
|
|
diff := sources.Sub(queryTSDataRsp.StartTime)
|
|
|
if diff.Minutes() > 0 {
|
|
|
minute := int(diff.Minutes())
|
|
|
- for i := 0; i < minute; i++ {
|
|
|
+ for i := 1; i <= minute; i++ {
|
|
|
st := cycleDatas[0].ST - i*60
|
|
|
stt := time.Unix(int64(st), 0).Format("2006-01-02 15:04:05")
|
|
|
cycleDatas = append(cycleDatas, models.CycleData{
|
|
|
@@ -490,7 +491,7 @@ func QueryTSData(c *gin.Context) {
|
|
|
diff = endTime.Sub(sources)
|
|
|
if diff.Minutes() > 0 {
|
|
|
minute := int(diff.Minutes())
|
|
|
- for i := 0; i < minute; i++ {
|
|
|
+ for i := 1; i <= minute; i++ {
|
|
|
st := cycleDatas[index].ST + i*60
|
|
|
stt := time.Unix(int64(st), 0).Format("2006-01-02 15:04:05")
|
|
|
cycleDatas = append(cycleDatas, models.CycleData{
|
|
|
@@ -573,7 +574,7 @@ func QueryTSData(c *gin.Context) {
|
|
|
|
|
|
diff := endTime.Sub(queryTSDataRsp.StartTime)
|
|
|
minute := int(diff.Minutes())
|
|
|
- for i := 0; i < minute; i++ {
|
|
|
+ for i := 1; i <= minute; i++ {
|
|
|
st := int(queryTSDataRsp.StartTime.Unix()) + i*60
|
|
|
stt := time.Unix(int64(st), 0).Format("2006-01-02 15:04:05")
|
|
|
cycleDatas = append(cycleDatas, models.CycleData{
|