From a4ff2b571be305e2641c9dd67797f4102e795ebb Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 25 Apr 2021 10:47:56 +0800
Subject: [PATCH] 1.App警情反馈接口调整 2.租户接口新增

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java |   34 ++++++++++++++++++++++++++++++----
 1 files changed, 30 insertions(+), 4 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 28fedfd..fd89a0f 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
@@ -18,6 +18,7 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.entity.ReportReturnData;
 import org.springblade.jfpt.alarm.constant.AlarmTimeConstant;
 import org.springblade.jfpt.alarm.entity.Alarm;
 import org.springblade.jfpt.alarm.mapper.AlarmMapper;
@@ -96,13 +97,13 @@
 	}
 
 	@Override
-	public void updateJtype(String id,String jtype,String bz) {
-		baseMapper.updateJtype(id,jtype,bz);
+	public void updateJtype(String id,String jtype,String bz,String securityArr) {
+		baseMapper.updateJtype(id,jtype,bz,securityArr);
 	}
 
 	@Override
-	public void updateVaddress(String vaddress, String jid) {
-		baseMapper.updateVaddress(vaddress, jid);
+	public void updateVaddress(String vaddress,String uids, String jid) {
+		baseMapper.updateVaddress(vaddress,uids ,jid);
 	}
 
 	@Override
@@ -173,6 +174,21 @@
 	@Override
 	public List<Map<String, Object>> queryBa() {
 		return baseMapper.queryBa();
+	}
+
+	@Override
+	public List<Map<String, Object>> 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);
 	}
 
 	/**
@@ -383,4 +399,14 @@
 	public List<AlarmExcel> exportAlarm(AlarmVO alarmVO) {
 		return baseMapper.exportAlarm(alarmVO);
 	}
+
+	/**
+	 * 获取实时警情数据集合
+	 * @param alarmVO
+	 * @return
+	 */
+	@Override
+	public List<ReportReturnData> getAlarmPie(AlarmVO alarmVO) {
+		return baseMapper.getAlarmPie(alarmVO);
+	}
 }

--
Gitblit v1.9.3