From aa8ecde02d63168e11cdd693c84cd4de5fe2e04e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 17 May 2021 20:26:25 +0800
Subject: [PATCH] 1.考勤打卡接口修改，根据坐标判断是否在多边形区域内 2.考勤打卡接口修改，根据打卡时间判断打卡的状态
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java | 16 +++++++++++++---
1 files changed, 13 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 93d0879..fb80f99 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
@@ -25,6 +25,7 @@
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;
@@ -88,13 +89,15 @@
*/
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<Map<String, Object>> getAlarm(@Param("alarm") AlarmVO alarm);
+ List<AlarmVO> getAlarm(@Param("alarm") AlarmVO alarm);
+
+ List<Map<String, Object>> getAlarming(@Param("alarm") AlarmVO alarm);
boolean setAlarm(@Param("alarm") AlarmVO alarm);
@@ -134,4 +137,11 @@
* @return
*/
List<ReportReturnData> getAlarmPie(@Param("alarm")AlarmVO alarmVO);
+
+ /**
+ * 查询未处理及处理中的警情总数量
+ * @param deviceNumber 设备编号
+ * @return
+ */
+ Integer selectEqCount(String deviceNumber);
}
--
Gitblit v1.9.3