From c7d05af4e7ebf92b67308df21bde17282c0c50f1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 May 2021 21:44:06 +0800
Subject: [PATCH] 1.警情导出bug修复 2.警情统计接口修改 3.一键报警设备接收报文时修改设备状态
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 12 +++++++++---
1 files changed, 9 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 8d807c6..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,11 +178,16 @@
}
@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);
}
--
Gitblit v1.9.3