From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
index bf3b601..afe844e 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
@@ -20,8 +20,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
+import org.springblade.common.entity.ReportReturnData;
import org.springblade.jfpt.alarm.entity.Alarm;
-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.vo.ConditionVo;
@@ -50,12 +51,19 @@
List<AlarmVO> selectInfo(String id);
List<AlarmVO> selecttx(String id);
void deletejj(String id);
+
+ /**
+ * 查询近7天的警情数据
+ * @param beginTime 开始时间
+ * @param endTime 结束时间
+ * @return
+ */
List<AlarmVO> selectListSe(String beginTime, String endTime);
void s(Alarm alarm);
- void updateJtype(String id, String jtype, String bz);
+ void updateJtype(String id, String jtype, String bz,String securityArr);
void updatePoliceStatus(String id, String status);
void updateOne(Alarm alarm);
- void updateVaddress(String vaddress ,String jid);
+ void updateVaddress(String vaddress,String uids ,String jid);
void updateAaddress(String aaddress ,String jid);
List<Map<String, Object>> selectScount(String time);
@@ -86,6 +94,8 @@
List<Map<String, Object>> queryBa();
+ List<Map<String, Object>> getAlarm(AlarmVO alarm);
+
/**
* 查询当前时间段一键求助报警总次数
* @param conditionVo
@@ -115,4 +125,11 @@
* @param alarmVO 查询条件
*/
List<AlarmExcel> exportAlarm(@Param("alarm")AlarmVO alarmVO);
+
+ /**
+ * 获取实时警情图表统计数据
+ * @param alarmVO
+ * @return
+ */
+ List<ReportReturnData> getAlarmPie(@Param("alarm")AlarmVO alarmVO);
}
--
Gitblit v1.9.3