From 1f9bb7708751a9364ae69d9de5a95c1643ccb3da Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 14 Apr 2021 21:29:58 +0800
Subject: [PATCH] 为导出报表提供实时警情,违禁品,包裹,健康码,体温导出数据接口

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 1ddf045..28fedfd 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
@@ -16,16 +16,14 @@
  */
 package org.springblade.jfpt.alarm.service.impl;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.jfpt.alarm.constant.AlarmTimeConstant;
 import org.springblade.jfpt.alarm.entity.Alarm;
 import org.springblade.jfpt.alarm.mapper.AlarmMapper;
 import org.springblade.jfpt.alarm.service.IAlarmService;
+import org.springblade.common.entity.AlarmExcel;
 import org.springblade.jfpt.alarm.vo.AlarmVO;
-import org.springblade.jfpt.parcel.util.DateUtils;
 import org.springblade.jfpt.parcel.vo.ConditionVo;
 import org.springframework.stereotype.Service;
 
@@ -377,4 +375,12 @@
 		return baseMapper.queryYearAlarm(deviceNumber,childList);
 	}
 
+	/**
+	 * 导出主动报警数据表格
+	 * @param alarmVO 查询条件
+	 */
+	@Override
+	public List<AlarmExcel> exportAlarm(AlarmVO alarmVO) {
+		return baseMapper.exportAlarm(alarmVO);
+	}
 }

--
Gitblit v1.9.3