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/mapper/AlarmMapper.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 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..e56ebab 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,10 +20,12 @@
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;
+import org.springblade.system.user.entity.User;
import java.util.List;
import java.util.Map;
@@ -44,18 +46,27 @@
* @return
*/
List<AlarmVO> selectAlarmPage(IPage page, AlarmVO alarm);
+ List<AlarmVO> selectazPage(IPage page, AlarmVO alarm);
+ List<Map<String,Object>> getChartData(AlarmVO alarm);
List<AlarmVO> listAll();
List<AlarmVO> selectList(String jtype, String district, String waringType, String beginTime, String endTime);
List<AlarmVO> getLimit();
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,String bs);
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);
@@ -80,11 +91,17 @@
*/
List<Map<String, Object>> selectAlarmSum(@Param("conditionVo") ConditionVo conditionVo);
- List<Map<String, Object>> queryPolice();
+ List<User> queryPolice();
- List<Map<String, Object>> queryPoliceTime(List policeIdArr);
+ List<AlarmVO> queryPoliceTime(List policeIdArr);
List<Map<String, Object>> queryBa();
+
+ List<AlarmVO> getAlarm(@Param("alarm") AlarmVO alarm);
+
+ List<AlarmVO> getAlarming(@Param("alarm") AlarmVO alarm);
+
+ boolean setAlarm(@Param("alarm") AlarmVO alarm);
/**
* 查询当前时间段一键求助报警总次数
@@ -115,4 +132,18 @@
* @param alarmVO 查询条件
*/
List<AlarmExcel> exportAlarm(@Param("alarm")AlarmVO alarmVO);
+
+ /**
+ * 获取实时警情图表统计数据
+ * @param alarmVO
+ * @return
+ */
+ List<ReportReturnData> getAlarmPie(@Param("alarm")AlarmVO alarmVO);
+
+ /**
+ * 查询未处理及处理中的警情总数量
+ * @param deviceNumber 设备编号
+ * @return
+ */
+ Integer selectEqCount(String deviceNumber);
}
--
Gitblit v1.9.3