From 66e71e5d4cb5bb3706f7c3662bbf7859f690ba84 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 09 May 2021 11:59:38 +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..ee6c4b9 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<Map<String, Object>> 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