From 16abd944c4331a31e99c28564c9b8a31bfbbfefc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 21:14:15 +0800
Subject: [PATCH] 海康设备接口调用工具类修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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..c27de39 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;
@@ -44,6 +45,24 @@
@Override
public IPage<AlarmVO> selectAlarmPage(IPage<AlarmVO> page, AlarmVO alarm) {
return page.setRecords(baseMapper.selectAlarmPage(page, alarm));
+ }
+
+ @Override
+ public IPage<AlarmVO> selectazPage(IPage<AlarmVO> page, AlarmVO alarm) {
+ return page.setRecords(baseMapper.selectazPage(page, alarm));
+ }
+
+ @Override
+ public List<Map<String, Object>> getChartData(AlarmVO alarm) {
+ return baseMapper.getChartData(alarm);
+ }
+ @Override
+ public List<Map<String, Object>> getChartDataAlarm(AlarmVO alarm) {
+ return baseMapper.getChartDataAlarm(alarm);
+ }
+ @Override
+ public List<Map<String, Object>> getChartDataAlarmBs(AlarmVO alarm) {
+ return baseMapper.getChartDataAlarmBs(alarm);
}
@Override
@@ -97,8 +116,8 @@
}
@Override
- public void updateJtype(String id,String jtype,String bz,String securityArr) {
- baseMapper.updateJtype(id,jtype,bz,securityArr);
+ public void updateJtype(String id,String jtype,String bz,String securityArr,String bs) {
+ baseMapper.updateJtype(id,jtype,bz,securityArr,bs);
}
@Override
@@ -162,12 +181,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,8 +196,13 @@
}
@Override
- public List<Map<String, Object>> getAlarm(AlarmVO alarmVO) {
+ public List<AlarmVO> getAlarm(AlarmVO alarmVO) {
return baseMapper.getAlarm(alarmVO);
+ }
+
+ @Override
+ public List<AlarmVO> getAlarming(AlarmVO alarmVO) {
+ return baseMapper.getAlarming(alarmVO);
}
@Override
@@ -404,4 +428,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