From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/alarm/controller/AlarmController.java | 67 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java b/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java
index 14b8e54..ac50ef9 100644
--- a/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java
+++ b/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java
@@ -766,6 +766,54 @@
}
/**
+ * 查询当前保安需要处理和未处理的巡逻任务
+ * @param alarmVO 需包含保安人员id,状态 status 1 查当前保安收到的巡逻和已接收的巡逻,已处理完成的 2：未接收的 3：处理完成的
+ * @param response
+ * @param query 分页对象
+ * @return
+ */
+ @GetMapping("/APP-getPatrolListPage")
+ public R getPatrolListPage(AlarmVO alarmVO, HttpServletResponse response,Query query) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ Map<String, Object> map = new HashMap<>(2);
+ //获取部门数据
+ List<DeptVo> deptVos = deptFeignApi.selDeptList();
+
+ List<AlarmVO> page = new ArrayList<>();
+ //不分页的情况
+ if (null == query.getCurrent()) {
+ //获取警情数量的集合
+ map.put("number",alarmService.getPatrolNumber(alarmVO));
+ //获取警情数据
+ page = alarmService.getPatrolList(alarmVO);
+ }
+ for (int j = 0; j < page.size(); j++) {
+ if (null!=page.get(j).getDeptId()){
+ String[] split = page.get(j).getDeptId().split(",");
+ List<String> list = Arrays.asList(split);
+ StringBuffer deptNameBuiffer = new StringBuffer();
+ //数据匹配封装
+ for (String deptId:list) {
+ for (DeptVo deptVo:deptVos) {
+ if (deptId.equals(deptVo.getId().toString())){
+ deptNameBuiffer.append(deptVo.getDeptName()).append(",");
+ }
+ }
+ }
+ //封装部门名称数据
+ page.get(j).setDeptName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
+ }
+ }
+ //封装数据
+ map.put("page",page);
+ //返回数据
+ return R.data(map);
+ }
+
+
+ /**
* APP警情接受
* @param alarmVO
* @param response
@@ -812,4 +860,23 @@
return R.status(false);
}
+ /**
+ * 一周警情统计(主动报警+被动报警类型（体温异常，红码，违禁品）) 2021-3-16 arsn 柱状图展示
+ * @param response
+ * @return
+ */
+ @GetMapping("/countAlarm")
+ public R countAlarm(HttpServletResponse response,ConditionVo conditionVo) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ //创建类型，时间对象，分别存取类型，时间数据
+ List<String> times = new ArrayList<>();
+ times = DateUtils.pastDay(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+ Map<String, Object> alarmData = alarmService.selectAlarmData();
+ alarmData.put("times",times);
+ //返回数据
+ return R.data(alarmData);
+ }
+
}
--
Gitblit v1.9.3