jfpt-BladeX.git

			@@ -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);
			}
			}