From 5ee338a5e19319386f2f6298d22a8e4ac96dc7cb Mon Sep 17 00:00:00 2001 From: Administrator <admin> Date: Thu, 06 May 2021 15:24:42 +0800 Subject: [PATCH] 1.设备故障状态合并到设备状态中，设备状态接口修改 2.警情处理完成后修改设备状态为正常，修改警情处理接口 --- blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java index f60ad82..eb9fa7a 100644 --- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java +++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java @@ -23,6 +23,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 java.util.List; import java.util.Map; @@ -79,13 +80,15 @@ */ List<Map<String,Object>> selectAlarmSum(ConditionVo conditionVo); - List<Map<String, Object>> queryPolice(); + List<User> queryPolice(); - List<Map<String, Object>> queryPoliceTime(List policeIdArr); + List<AlarmVO> queryPoliceTime(List policeIdArr); List<Map<String, Object>> queryBa(); - List<Map<String, Object>> getAlarm(AlarmVO alarmVO); + List<AlarmVO> getAlarm(AlarmVO alarmVO); + + List<Map<String, Object>> getAlarming(AlarmVO alarmVO); boolean setAlarm(AlarmVO alarmVO); -- Gitblit v1.9.3