From 36afc3a1f1437b8a3283dc0bf6475e96fded05a7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 12 Apr 2021 22:35:36 +0800
Subject: [PATCH] 新增主动报警alarm,健康码,体温,包裹,违禁品导出数据接口

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 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 29bbdc0..bf3b601 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
@@ -16,10 +16,12 @@
  */
 package org.springblade.jfpt.alarm.mapper;
 
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.jfpt.alarm.entity.Alarm;
+import org.springblade.jfpt.alarm.vo.AlarmExcel;
 import org.springblade.jfpt.alarm.vo.AlarmVO;
 import org.springblade.jfpt.parcel.vo.ConditionVo;
 
@@ -45,11 +47,10 @@
 	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);
-
+	List<AlarmVO> selectListSe(String beginTime, String endTime);
 	void s(Alarm alarm);
 	void updateJtype(String id, String jtype, String bz);
 	void updatePoliceStatus(String id, String status);
@@ -91,4 +92,27 @@
 	 * @return
 	 */
 	Integer selAlarmTimeCount(@Param("conditionVo") ConditionVo conditionVo);
+
+	/**
+	 * 查询当前时间段内一键求助报警的数据集合
+	 * @param conditionVo
+	 * @return
+	 */
+	List<Alarm> selectAlarmList(@Param("conditionVo")ConditionVo conditionVo);
+
+	/**
+	 * 统计时间段内一键求助警情数量数据
+	 * @param conditionVo
+	 * @return
+	 */
+	@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);
 }

--
Gitblit v1.9.3