From 47a458ca867f700ad8dfe8bccdbb6bf59ca2d301 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 11 May 2021 15:54:02 +0800
Subject: [PATCH] APP接口调整

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
index 5e0ae86..bdb5ad0 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
@@ -26,6 +26,7 @@
 import org.springblade.common.entity.AlarmExcel;
 import org.springblade.jfpt.alarm.vo.AlarmVO;
 import org.springblade.jfpt.parcel.vo.ConditionVo;
+import org.springblade.system.user.entity.User;
 import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
@@ -162,12 +163,12 @@
 	}
 
 	@Override
-	public List<Map<String, Object>> queryPolice() {
+	public List<User> queryPolice() {
 		return baseMapper.queryPolice();
 	}
 
 	@Override
-	public List<Map<String, Object>> queryPoliceTime(List policeIdArr) {
+	public List<AlarmVO> queryPoliceTime(List policeIdArr) {
 		return baseMapper.queryPoliceTime(policeIdArr);
 	}
 
@@ -177,10 +178,20 @@
 	}
 
 	@Override
-	public List<Map<String, Object>> getAlarm(AlarmVO alarmVO) {
+	public List<AlarmVO> getAlarm(AlarmVO alarmVO) {
 		return baseMapper.getAlarm(alarmVO);
 	}
 
+	@Override
+	public List<Map<String, Object>> getAlarming(AlarmVO alarmVO) {
+		return baseMapper.getAlarming(alarmVO);
+	}
+
+	@Override
+	public boolean setAlarm(AlarmVO alarmVO) {
+		return baseMapper.setAlarm(alarmVO);
+	}
+
 	/**
 	 * 查询当前时间段一键求助报警总次数
 	 * @param conditionVo

--
Gitblit v1.9.3