From 1d69f242bf4189875db9ce171a10343f99ba6557 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 22 Apr 2021 18:03:53 +0800
Subject: [PATCH] 1.录制视频添加用户id

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 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 ec3ea37..d4d8113 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,17 +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.jfpt.alarm.vo.AlarmExcel;
+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;
 
@@ -104,8 +102,8 @@
 	}
 
 	@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
@@ -386,4 +384,14 @@
 	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