From 09ac94dec8713cde58cc88e477355a5484e230bb Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 02 Apr 2021 11:11:32 +0800
Subject: [PATCH] 1.统计报警设备数量
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 80 +++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 41 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..673024f 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,49 +173,11 @@
}
- //警情分发测试代码
- //查询所有闲置的接警员
- 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;
- //return R.status(alarmService.saveOrUpdate(alarm));
+ //return null;
+ return R.status(alarmService.saveOrUpdate(alarm));
}
@@ -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天内违禁品的数量数据
@@ -488,5 +450,41 @@
return R.success("修改成功");
}
+ /**
+ * 查询所有保安信息
+ */
+ @PostMapping("/queryBa")
+ public R queryBa(OperationVO operation, HttpServletResponse response) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ return R.data(alarmService.queryBa());
+ }
+
+
+ /**
+ * 统计预警设备数量
+ * @param response
+ * @return
+ */
+ @GetMapping("/selectEq")
+ public R selectEq(HttpServletResponse response) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ List<Map<String, Object>> lists = new ArrayList<>();
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
+ String time = df.format(new Date());// new Date()为获取当前系统时间
+ ArrayList<String> strings = pastDay(time);
+ Map<String, Object> maps = new HashMap<String, Object>();
+ for (int j=0;j<strings.size();j++){
+ Map<String, Object> map = new HashMap<String, Object>();
+ List<Map<String, Object>> list = alarmService.selectEq(strings.get(j));
+ map.put("time",strings.get(j));
+ map.put("Coun",list.size());
+ lists.add(map);
+ }
+ return R.data(lists);
+ }
}
--
Gitblit v1.9.3