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 | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
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 89e4b28..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
@@ -120,6 +120,19 @@
@ApiOperationSupport(order = 6)
@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);
+ }
+ if (jingdan.getGalarmTime() != null && jingdan.getGalarmTime().equals("")){
+ jingdan.setGalarmTime(null);
+ }
+ if (jingdan.getHandleTime() != null && jingdan.getHandleTime().equals("")){
+ jingdan.setHandleTime(null);
+ }
return R.status(jingdanService.saveOrUpdate(jingdan));
}
@@ -213,7 +226,7 @@
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
- jingdanService.insert(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
+ jingdanService.inserts(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
return R.success("成功");
}
@@ -233,10 +246,7 @@
}
@PostMapping("/updateInfo")
- public R updateInfo(String id, String handleP, String handName, String handletype, String type, 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");
+ public R updateInfo(String id, String handleP, String handName, String handletype, String type) {
jingdanService.updateInfo(id, handleP, handName,handletype,type);
return R.success("修改成功");
}
--
Gitblit v1.9.3