From 9d4e322f4d4d8c1b941185c7c95d6df08937aff1 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 20 Mar 2021 18:00:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 40 +---------------------------------------
1 files changed, 1 insertions(+), 39 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
index 2b07ac9..5c0cb30 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -173,45 +173,7 @@
}
- //警情分发测试代码
- //查询所有闲置的接警员
- List<Map<String, Object>> policeList = alarmService.queryPolice();
- List<Map<String, Object>> online_police = new ArrayList<>();
- for (int i = 0; i < policeList.size(); i++) {
- if (policeList.get(i).get("work_status").equals(0)){
- //System.out.println(policeList.get(i).get("real_name"));
- online_police.add(policeList.get(i));
- }
- }
-
- if (online_police.size() == 0){
- online_police = policeList;
- }
-
- List policeIdArr = new ArrayList();
-
- //将闲置状态的人员id存入数组
- for (int i = 0; i < online_police.size(); i++) {
- policeIdArr.add(online_police.get(i).get("id"));
- }
-
- //通过id计算接警员最后一次接警时间，倒序返回闲置最久的人员，派发任务
- List<Map<String, Object>> police = alarmService.queryPoliceTime(policeIdArr);
-
- if (police.size() != 0){
- alarm.setAlarmId((String) police.get(0).get("alarmId"));
- alarm.setAlarmPeople((String) police.get(0).get("alarmPeople"));
- Date date = new Date();
- SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- alarm.setJjTime(dateFormat.format(date));
- }else {
- alarm.setAlarmId((String) online_police.get(0).get("id"));
- alarm.setAlarmPeople((String) online_police.get(0).get("name"));
- Date date = new Date();
- SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- alarm.setJjTime(dateFormat.format(date));
- }
return null;
@@ -432,7 +394,7 @@
types = Arrays.asList(type);
//获取时间集合数据(今天及今天之前6天的日期)
times = DateUtils.pastDay(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
- //1.统计7天内一键求助警情数量数据
+ //1.统计7天内一键求助警情数量数据 3-20 修改展示紧急求助
Map<String,Object> alarmData = alarmService.selectAlarmData();
alarmData.put("name","一键求助");
//2.统计7天内违禁品的数量数据
--
Gitblit v1.9.3