From c302589567b7b556d8dfd7fca8cf3cf215d1a390 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Wed, 24 Feb 2021 20:31:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
index 92b0b47..726417f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -88,6 +88,29 @@
}
/**
+ * 查询所有
+ * @return
+ */
+ @GetMapping("/listAll")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入alarm")
+ public R<List> listAll() {
+ List pages = alarmService.listAll();
+ return R.data(pages);
+ }
+
+ /**
+ * 获取最后一个记录
+ */
+ @GetMapping("/getLimit")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入alarm")
+ public R<List<AlarmVO>> getLimit(AlarmVO alarm, Query query) {
+ List<AlarmVO> pages = alarmService.getLimit();
+ return R.data(pages);
+ }
+
+ /**
* 新增
*/
@PostMapping("/save")
--
Gitblit v1.9.3