From 22ec0c881390e3bbc82843dee323c71949a2f3a9 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 25 Apr 2021 10:30:14 +0800
Subject: [PATCH] app接口
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 6 +++++-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java | 5 ++---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 2 +-
3 files changed, 8 insertions(+), 5 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 a7061d6..5fa76a6 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
@@ -678,7 +678,7 @@
Date date = new Date();// 获取当前时间
//System.out.println("现在时间：" + sdf.format(date)); // 输出已经格式化的现在时间（24小时制）
- Operation operation = null;
+ Operation operation = new Operation();
operation.setJid(alarmVO.getId().toString());
operation.setSnumber(alarmVO.getSecurityId());
operation.setZc("接受任务");
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index 46ac4cd..52ccd43 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -404,7 +404,11 @@
<update id="updateJtype">
- update sys_alarm SET jtype=#{jtype},bz=#{bz}
+ update sys_alarm SET jtype=#{jtype}
+
+ <if test="bz!=null and bz!=''">
+ ,bz=#{bz}
+ </if>
<if test="securityArr!=null and id!=''">
,securityArr =#{securityArr}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
index 8f9db0e..aa9c79a 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
@@ -274,7 +274,7 @@
Date date = new Date();// 获取当前时间
//System.out.println("现在时间：" + sdf.format(date)); // 输出已经格式化的现在时间（24小时制）
- Operation operation = null;
+ Operation operation = new Operation();
operation.setJid(feedback.getJid());
operation.setSnumber(feedback.getSnumber());
operation.setZc("任务反馈提交,警情结束");
@@ -298,8 +298,7 @@
wj.setAddress(string3);
iWjService.insertfeed(wj);
}
-
- alarmService.updatePoliceStatus(feedback.getJid(),"2");
+ alarmService.updateJtype(operation.getJid(),"2",null,null);
return R.success("新增成功");
}
--
Gitblit v1.9.3