From 67feebc7abacd70b850a963fdfb52307e89b5a10 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 12 Mar 2021 16:25:17 +0800
Subject: [PATCH] 1.警情分发调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java | 4 +++-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 7 +++++--
2 files changed, 8 insertions(+), 3 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 2eba24c..3ab1dcc 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
@@ -275,7 +275,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 +306,11 @@
case "中心调度" :
map.put("中心调度",list.get(i).get("cou"));
break;
+ case "电话报警" :
+ map.put("电话报警",list.get(i).get("cou"));
+ break;
default :
- map.put("系统测试",list.get(i).get("cou"));
+ map.put("未知",list.get(i).get("cou"));
}
}
lists.add(map);
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
index 7ee8626..7e39e4e 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
@@ -121,7 +121,9 @@
@ApiOperation(value = "新增或修改", notes = "传入jingdan")
public R submit(@Valid @RequestBody Jingdan jingdan) {
//return R.status(jingdanService.saveOrUpdate(jingdan));
-
+ if ("".equals(jingdan.getType())){
+ jingdan.setType("0");
+ }
if (jingdan.getCzTime() != null && jingdan.getCzTime().equals("")){
jingdan.setCzTime(null);
}
--
Gitblit v1.9.3