From 9c3a3ac2f9ba5865098b5f19b9b0fedfc409f3d7 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 28 May 2021 15:33:11 +0800
Subject: [PATCH] 视频录制问题修改

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 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 0ec8c89..b8453e0 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,18 +163,33 @@
 	}
 
 	@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);
 	}
 
 	@Override
 	public List<Map<String, Object>> queryBa() {
 		return baseMapper.queryBa();
+	}
+
+	@Override
+	public List<AlarmVO> getAlarm(AlarmVO alarmVO) {
+		return baseMapper.getAlarm(alarmVO);
+	}
+
+	@Override
+	public List<AlarmVO> getAlarming(AlarmVO alarmVO) {
+		return baseMapper.getAlarming(alarmVO);
+	}
+
+	@Override
+	public boolean setAlarm(AlarmVO alarmVO) {
+		return baseMapper.setAlarm(alarmVO);
 	}
 
 	/**
@@ -394,4 +410,14 @@
 	public List<ReportReturnData> getAlarmPie(AlarmVO alarmVO) {
 		return baseMapper.getAlarmPie(alarmVO);
 	}
+
+	/**
+	 * 查询未处理及处理中的警情总数量
+	 * @param deviceNumber 设备编号
+	 * @return
+	 */
+	@Override
+	public Integer selectEqCount(String deviceNumber) {
+		return baseMapper.selectEqCount(deviceNumber);
+	}
 }

--
Gitblit v1.9.3