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/service/IAlarmService.java | 5 ++++-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 8 ++++++--
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java | 3 ++-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 9 +++++++--
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 14 +++++++++++---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/operation/vo/OperationVO.java | 4 ++++
6 files changed, 34 insertions(+), 9 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 bcc5948..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
@@ -33,6 +33,9 @@
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;
@@ -59,6 +62,8 @@
private final IAlarmService alarmService;
private final AnimalHeatService animalHeatService;
+
+ private final IOperationService operationService;
private IhealthcodeService ihealthcodeService;
@@ -470,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("修改成功");
}
+
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
index 33df04f..8940488 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
@@ -51,7 +51,8 @@
void deletejj(String id);
void s(Alarm alarm);
- void updateJtype(String id, String czTime, String bz);
+ void updateJtype(String id, String jtype, String bz);
+ void updatePoliceStatus(String id, String status);
void updateOne(Alarm alarm);
List<Map<String, Object>> selectScount(String time);
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 b120c62..7db4617 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
@@ -36,7 +36,7 @@
<select id="selectAlarmPage" resultMap="alarmResultMap">
select
- a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
+ a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,a.bz,
a.deviceNumber,a.region,a.district,
a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
@@ -277,7 +277,11 @@
<update id="updateJtype">
- update sys_alarm SET jtype=1,czTime=#{czTime},bz=#{bz} where id=#{id}
+ update sys_alarm SET jtype=#{jtype},bz=#{bz} where id=#{id}
+ </update>
+
+ <update id="updatePoliceStatus">selectAlarmPage
+ update jfpth.blade_user SET work_status=#{status} where id=#{id}
</update>
<!--查询当天警情总数-->
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
index 50d997f..4e8bb52 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
@@ -51,7 +51,10 @@
void updateOne(Alarm alarm);
List<Map<String, Object>> selectScount(String time);
List<AlarmVO> selectListSe(String beginTime, String endTime);
- void updateJtype(String id, String czTime, String bz);
+ void updateJtype(String id, String jtype, String bz);
+
+ void updatePoliceStatus(String id, String status);
+
/**
* 查询警情总数
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
index 716df96..b35f171 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
@@ -98,8 +98,13 @@
}
@Override
- public void updateJtype(String id,String czTime,String bz) {
- baseMapper.updateJtype(id,czTime,bz);
+ public void updateJtype(String id,String jtype,String bz) {
+ baseMapper.updateJtype(id,jtype,bz);
+ }
+
+ @Override
+ public void updatePoliceStatus(String id,String status) {
+ baseMapper.updatePoliceStatus(id,status);
}
/**
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/operation/vo/OperationVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/operation/vo/OperationVO.java
index e240459..1ed2a4c 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/operation/vo/OperationVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/operation/vo/OperationVO.java
@@ -32,5 +32,9 @@
@ApiModel(value = "OperationVO对象", description = "OperationVO对象")
public class OperationVO extends Operation {
private static final long serialVersionUID = 1L;
+ private String jid;
+ private String jtype;
+ private String rid;
+ private String bz;
}
--
Gitblit v1.9.3