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/mapper/AlarmMapper.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
index 908bc07..3cfede9 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
@@ -20,7 +20,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
+import org.springblade.common.entity.ReportReturnData;
import org.springblade.jfpt.alarm.entity.Alarm;
+import org.springblade.common.entity.AlarmExcel;
import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.parcel.vo.ConditionVo;
@@ -46,16 +48,22 @@
List<AlarmVO> listAll();
List<AlarmVO> selectList(String jtype, String district, String waringType, String beginTime, String endTime);
List<AlarmVO> getLimit();
- List<AlarmVO> selectListSe(String beginTime, String endTime);
List<AlarmVO> selectInfo(String id);
List<AlarmVO> selecttx(String id);
void deletejj(String id);
+ /**
+ * 查询近7天的警情数据
+ * @param beginTime 开始时间
+ * @param endTime 结束时间
+ * @return
+ */
+ List<AlarmVO> selectListSe(String beginTime, String endTime);
void s(Alarm alarm);
- void updateJtype(String id, String jtype, String bz);
+ void updateJtype(String id, String jtype, String bz,String securityArr);
void updatePoliceStatus(String id, String status);
void updateOne(Alarm alarm);
- void updateVaddress(String vaddress ,String jid);
+ void updateVaddress(String vaddress,String uids ,String jid);
void updateAaddress(String aaddress ,String jid);
List<Map<String, Object>> selectScount(String time);
@@ -86,6 +94,12 @@
List<Map<String, Object>> queryBa();
+ List<Map<String, Object>> getAlarm(@Param("alarm") AlarmVO alarm);
+
+ List<Map<String, Object>> getAlarming(@Param("alarm") AlarmVO alarm);
+
+ boolean setAlarm(@Param("alarm") AlarmVO alarm);
+
/**
* 查询当前时间段一键求助报警总次数
* @param conditionVo
@@ -107,4 +121,19 @@
*/
@SqlParser(filter = true)
List<Integer> selectAlarmTimeData(@Param("conditionVo")ConditionVo conditionVo);
+
+ List<Map<String, Object>> queryYearAlarm(String deviceNumber,List childList);
+
+ /**
+ * 导出主动报警数据表格
+ * @param alarmVO 查询条件
+ */
+ List<AlarmExcel> exportAlarm(@Param("alarm")AlarmVO alarmVO);
+
+ /**
+ * 获取实时警情图表统计数据
+ * @param alarmVO
+ * @return
+ */
+ List<ReportReturnData> getAlarmPie(@Param("alarm")AlarmVO alarmVO);
}
--
Gitblit v1.9.3