From dd202fbaa4caea48aa5a0df620b87a6e41dba429 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 12 Mar 2021 16:24:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
index 792c3c6..b05517c 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
@@ -40,7 +40,9 @@
 	 * @return
 	 */
 	List<AlarmVO> selectAlarmPage(IPage page, AlarmVO alarm);
+	List<AlarmVO> listAll();
 	List<AlarmVO> selectList(String jtype, String district, String waringType, String beginTime, String endTime);
+	List<AlarmVO> getLimit();
 	List<AlarmVO> selectListSe(String beginTime, String endTime);
 	List<AlarmVO> selectInfo(String id);
 	List<AlarmVO> selecttx(String id);
@@ -52,4 +54,9 @@
 
 	List<Map<String, Object>> selectScount(String time);
 
+	/**
+	 * 查询警情总数
+	 * @return
+	 */
+    Integer selectAlarmCount();
 }

--
Gitblit v1.9.3