Prechádzať zdrojové kódy

修改分时图数据查询问题

zhou.xiaoning 4 rokov pred
rodič
commit
bb1876af6d
2 zmenil súbory, kde vykonal 10 pridanie a 9 odobranie
  1. 6 6
      config/config.xml
  2. 4 3
      controllers/quote/history.go

+ 6 - 6
config/config.xml

@@ -13,11 +13,11 @@
     <DbAddress value="192.168.31.117"/>
     <DbName value="orcl"/>
     <DbPort value="1521"/>
-    <DbUser value="mtp2_test171"/>
+    <DbUser value="mtp2_test114"/>
     <DbPwd value="muchinfo"/>
   </DbSetting>
   <RedisSetting>
-    <Address value="192.168.31.171"/>
+    <Address value="192.168.31.114"/>
     <Port value="5007"/>
     <Timeout value="3"/>
     <ConnNum value="1"/>
@@ -25,11 +25,11 @@
     <Pwd value=""/>
   </RedisSetting>
   <MqSetting>
-    <Url value="amqp://guest:guest@192.168.31.171:5020/test"/>
+    <Url value="amqp://guest:guest@192.168.31.114:5020/test"/>
     <Exchange value="entry"/>
   </MqSetting>
   <MongoDBSetting>
-    <HostName value="192.168.31.171"/>
+    <HostName value="192.168.31.114"/>
     <Port value="5025"/>
     <DBName value="HistoryQuote"/>
     <Username value="quote_test01"/>
@@ -38,8 +38,8 @@
   <MySQLSetting>
     <Host value="192.168.30.140"/>
     <Port value="3306"/>
-    <DBName value="historyquote_test171"/>
-    <Username value="root"/>
+    <DBName value="historyquote_test114"/>
+    <Username value="quote_test114"/>
     <Password value="123456"/>
   </MySQLSetting>
 </Configuration>

+ 4 - 3
controllers/quote/history.go

@@ -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{