From 2deeeb8b1e671cfeb421f973c644ffc2d3182841 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 26 Jul 2021 15:36:00 +0800
Subject: [PATCH] 修改意见问题修改

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java |   64 +++++++++++++++++++++++++++-----
 1 files changed, 54 insertions(+), 10 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..4139687 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,18 +16,17 @@
  */
 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.springblade.system.user.entity.User;
 import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
@@ -46,6 +45,16 @@
 	@Override
 	public IPage<AlarmVO> selectAlarmPage(IPage<AlarmVO> page, AlarmVO alarm) {
 		return page.setRecords(baseMapper.selectAlarmPage(page, alarm));
+	}
+
+	@Override
+	public IPage<AlarmVO> selectazPage(IPage<AlarmVO> page, AlarmVO alarm) {
+		return page.setRecords(baseMapper.selectazPage(page, alarm));
+	}
+
+	@Override
+	public List<Map<String, Object>> getChartData(AlarmVO alarm) {
+		return baseMapper.getChartData(alarm);
 	}
 
 	@Override
@@ -99,13 +108,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,String bs) {
+		baseMapper.updateJtype(id,jtype,bz,securityArr,bs);
 	}
 
 	@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
@@ -164,18 +173,33 @@
 	}
 
 	@Override
-	public List<Map<String, Object>> queryPolice() {
+	public List<User> queryPolice() {
 		return baseMapper.queryPolice();
 	}
 
 	@Override
-	public List<Map<String, Object>> queryPoliceTime(List policeIdArr) {
+	public List<AlarmVO> queryPoliceTime(List policeIdArr) {
 		return baseMapper.queryPoliceTime(policeIdArr);
 	}
 
 	@Override
 	public List<Map<String, Object>> queryBa() {
 		return baseMapper.queryBa();
+	}
+
+	@Override
+	public List<AlarmVO> getAlarm(AlarmVO alarmVO) {
+		return baseMapper.getAlarm(alarmVO);
+	}
+
+	@Override
+	public List<AlarmVO> getAlarming(AlarmVO alarmVO) {
+		return baseMapper.getAlarming(alarmVO);
+	}
+
+	@Override
+	public boolean setAlarm(AlarmVO alarmVO) {
+		return baseMapper.setAlarm(alarmVO);
 	}
 
 	/**
@@ -386,4 +410,24 @@
 	public List<AlarmExcel> exportAlarm(AlarmVO alarmVO) {
 		return baseMapper.exportAlarm(alarmVO);
 	}
+
+	/**
+	 * 获取实时警情数据集合
+	 * @param alarmVO
+	 * @return
+	 */
+	@Override
+	public List<ReportReturnData> getAlarmPie(AlarmVO alarmVO) {
+		return baseMapper.getAlarmPie(alarmVO);
+	}
+
+	/**
+	 * 查询未处理及处理中的警情总数量
+	 * @param deviceNumber 设备编号
+	 * @return
+	 */
+	@Override
+	public Integer selectEqCount(String deviceNumber) {
+		return baseMapper.selectEqCount(deviceNumber);
+	}
 }

--
Gitblit v1.9.3