From 01fcd5a2e991b141d5523fc59a400faa6fafd451 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 15:13:01 +0800
Subject: [PATCH] app接口

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 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..0ec8c89 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,15 @@
  */
 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.common.entity.ReportReturnData;
 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;
 
@@ -98,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
@@ -377,4 +376,22 @@
 		return baseMapper.queryYearAlarm(deviceNumber,childList);
 	}
 
+	/**
+	 * 导出主动报警数据表格
+	 * @param alarmVO 查询条件
+	 */
+	@Override
+	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