From 9d6f5ab26f707ccdd5b5ffcdb4af6925a0f5bd57 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 19 Mar 2021 10:20:28 +0800
Subject: [PATCH] 警情记录、状态修改，人员状态修改接口合并
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 144 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 137 insertions(+), 7 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 6195519..2b07ac9 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
@@ -31,6 +31,14 @@
import org.springblade.jfpt.alarm.service.IAlarmService;
import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.alarm.wrapper.AlarmWrapper;
+import org.springblade.jfpt.animalheat.service.AnimalHeatService;
+import org.springblade.jfpt.healthcode.service.IhealthcodeService;
+import org.springblade.jfpt.operation.entity.Operation;
+import org.springblade.jfpt.operation.service.IOperationService;
+import org.springblade.jfpt.operation.vo.OperationVO;
+import org.springblade.jfpt.parcel.service.ParcelService;
+import org.springblade.jfpt.parcel.util.DateUtils;
+import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -52,6 +60,14 @@
public class AlarmController extends BladeController {
private final IAlarmService alarmService;
+
+ private final AnimalHeatService animalHeatService;
+
+ private final IOperationService operationService;
+
+ private IhealthcodeService ihealthcodeService;
+
+ private ParcelService parcelService;
/**
* 详情
@@ -152,7 +168,54 @@
if (alarm.getAlarmTime() != null && alarm.getAlarmTime().equals("")){
alarm.setAlarmTime(null);
}
- return R.status(alarmService.saveOrUpdate(alarm));
+ if (alarm.getCid() != null && alarm.getCid().equals("")){
+ alarm.setCid("0");
+ }
+
+
+ //警情分发测试代码
+ //查询所有闲置的接警员
+ 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));
}
@@ -275,7 +338,7 @@
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
String time = df.format(new Date());// new Date()为获取当前系统时间
ArrayList<String> strings = pastDay(time);
- String[] str={"医疗求助","火警","紧急求救","盗警","普通报警","交通","中心调度","系统测试","未知"};
+ String[] str={"医疗求助","火警","紧急求救","盗警","普通报警","交通","中心调度","电话报警"};
Map<String, Object> maps = new HashMap<String, Object>();
for (int j=0;j<strings.size();j++){
Map<String, Object> map = new HashMap<String, Object>();
@@ -306,8 +369,8 @@
case "中心调度" :
map.put("中心调度",list.get(i).get("cou"));
break;
- case "系统测试" :
- map.put("系统测试",list.get(i).get("cou"));
+ case "电话报警" :
+ map.put("电话报警",list.get(i).get("cou"));
break;
default :
map.put("未知",list.get(i).get("cou"));
@@ -320,6 +383,8 @@
listc.add(maps);
return R.data(listc);
}
+
+
public static String getPastDate(int past) {
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - past);
@@ -327,6 +392,68 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
String result = format.format(today);
return result;
+ }
+
+
+ /**
+ * 主动报警统计 饼图展示
+ * @param response
+ * @param conditionVo status 0:本日 1：本月 2：本月
+ * @return
+ */
+ @GetMapping("/selectAlarmSum")
+ public R selectAlarmSum(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");
+ //返回数据
+ return R.data(alarmService.selectAlarmSum(conditionVo));
+ }
+
+
+
+ /**
+ * 一周警情统计(主动报警+被动报警类型（体温异常，红码，违禁品）) 2021-3-16 arsn 柱状图展示
+ * @param response
+ * @return
+ */
+ @GetMapping("/selectAlertScount")
+ public R selectAlertScount(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");
+ //创建类型，时间对象，分别存取类型，时间数据
+ Map<String, Object> map = new HashMap<>();
+ List<String> types = new ArrayList<>();
+ List<String> times = new ArrayList<>();
+ List<Map<String, Object>> dataList = new ArrayList<>();
+ //获取类型集合数据
+ String [] type = {"一键求助","违禁品","红色健康码","体温异常"};
+ types = Arrays.asList(type);
+ //获取时间集合数据(今天及今天之前6天的日期)
+ times = DateUtils.pastDay(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+ //1.统计7天内一键求助警情数量数据
+ Map<String,Object> alarmData = alarmService.selectAlarmData();
+ alarmData.put("name","一键求助");
+ //2.统计7天内违禁品的数量数据
+ Map<String,Object> parcelData = parcelService.selectParcelData();
+ parcelData.put("name","违禁品");
+ //3.统计7天内红色健康码人数数量数据
+ Map<String,Object> healthcodeData = ihealthcodeService.selectHealthcodeData();
+ healthcodeData.put("name","红色健康码");
+ //4.统计7天内体温异常人数数量数据
+ Map<String,Object> animalData = animalHeatService.selectAnimalData();
+ animalData.put("name","体温异常");
+ //封装数据
+ dataList.add(alarmData);
+ dataList.add(parcelData);
+ dataList.add(healthcodeData);
+ dataList.add(animalData);
+ map.put("types",types);
+ map.put("times",times);
+ map.put("dataList",dataList);
+ //返回数据
+ return R.data(map);
}
/**
@@ -348,15 +475,18 @@
/**
- * 修改警情类型
+ * 修改警情类型/同时修改人员状态
*/
@PostMapping("/updateJtype")
- public R updateJtype(String id, String czTime, String bz, HttpServletResponse response) {
+ public R updateJtype(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");
- alarmService.updateJtype(id,czTime,bz);
+ alarmService.updateJtype(operation.getJid(),operation.getJtype(),operation.getBz());
+ alarmService.updatePoliceStatus(operation.getRid(),"0");
+ operationService.save(operation);
return R.success("修改成功");
}
+
}
--
Gitblit v1.9.3