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 | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 ea74c75..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")
@@ -152,11 +175,11 @@
* @return
*/
@PostMapping("/selectList")
- public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam String jtype, String addvcd, String waringType, String beginTime, String endTime, HttpServletResponse response) {
+ public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam String jtype, String district, String waringType, String beginTime, String endTime, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
- return R.data(alarmService.selectList(jtype,addvcd,waringType,beginTime,endTime));
+ return R.data(alarmService.selectList(jtype,district,waringType,beginTime,endTime));
}
/**
--
Gitblit v1.9.3