Merge pull request open-falcon#364 from bonfy/master

[alarm_events_controller]fix limit params of AlarmLists api
Mecki-Zhang · Jan 24, 2018 · 1b2175d · 1b2175d
2 parents ca233fa + 65c84d1
commit 1b2175d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/modules/api/app/controller/alarm/alarm_events_controller.go b/modules/api/app/controller/alarm/alarm_events_controller.go
@@ -142,7 +142,13 @@ func AlarmLists(c *gin.Context) {
 		if inputs.Limit >= 50 {
 			inputs.Limit = 50
 		}
-		perparedSql = fmt.Sprintf("select * from %s %s  order by timestamp DESC limit %d,%d", f.TableName(), filterCollector, inputs.Page, inputs.Limit)
+
+		// if page stands for step page
+		// {"page":0} for actual page 1
+		// step = page * limit
+		step := inputs.Page * inputs.Limit
+
+		perparedSql = fmt.Sprintf("select * from %s %s  order by timestamp DESC limit %d,%d", f.TableName(), filterCollector, step, inputs.Limit)
 	}
 	db.Alarm.Raw(perparedSql).Find(&cevens)
 	h.JSONR(c, cevens)