From 18052721bf3ab2a239d551d58bf916bc32ba564a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 30 Apr 2021 11:38:54 +0800
Subject: [PATCH] webcosket调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java | 7 ++++---
1 files changed, 4 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 3cfede9..ce6d514 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,13 @@
*/
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);
--
Gitblit v1.9.3