From 6ab9373c0d0d3dbec39e0435142be1ccef0aa41e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 20 Mar 2021 18:00:31 +0800
Subject: [PATCH] 报警分发接口完成
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 4 ++--
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 12 ++++++------
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 2 +-
6 files changed, 12 insertions(+), 12 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 6f4ef73..1c518de 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
@@ -444,7 +444,7 @@
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(operation.getJid(),operation.getJtype(),operation.getBz(),operation.getZctime());
+ 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 c130880..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,7 @@
void deletejj(String id);
void s(Alarm alarm);
- void updateJtype(String id, String jtype, String bz,String jjtime);
+ void updateJtype(String id, String jtype, String bz);
void updatePoliceStatus(String id, String status);
void updateOne(Alarm alarm);
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 4e0cd8b..84b75a0 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
@@ -277,7 +277,7 @@
<update id="updateJtype">
- update sys_alarm SET jtype=#{jtype},bz=#{bz},jjTime=#{jjtime} where id=#{id}
+ update sys_alarm SET jtype=#{jtype},bz=#{bz} where id=#{id}
</update>
<update id="updatePoliceStatus">
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 beb3b1f..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,7 @@
void updateOne(Alarm alarm);
List<Map<String, Object>> selectScount(String time);
List<AlarmVO> selectListSe(String beginTime, String endTime);
- void updateJtype(String id, String jtype, String bz, String jjtime);
+ 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 9a87906..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,8 @@
}
@Override
- public void updateJtype(String id,String jtype,String bz,String jjtime) {
- baseMapper.updateJtype(id,jtype,bz,jjtime);
+ public void updateJtype(String id,String jtype,String bz) {
+ baseMapper.updateJtype(id,jtype,bz);
}
@Override
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
index 91a096f..ff09a20 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
@@ -1723,17 +1723,17 @@
if (police.size() != 0){
alarm.setAlarmId( police.get(0).get("alarmId").toString());
alarm.setAlarmPeople( police.get(0).get("alarmPeople").toString());
-// Date date = new Date();
-// SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// alarm.setJjTime(dateFormat.format(date));
+ Date date = new Date();
+ SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ alarm.setJjTime(dateFormat.format(date));
serverHandler.alarmService.updatePoliceStatus( police.get(0).get("alarmId").toString(),"1");
}else {
alarm.setAlarmId( online_police.get(0).get("id").toString());
alarm.setAlarmPeople(online_police.get(0).get("name").toString());
-// Date date = new Date();
-// SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// alarm.setJjTime(dateFormat.format(date));
+ Date date = new Date();
+ SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ alarm.setJjTime(dateFormat.format(date));
serverHandler.alarmService.updatePoliceStatus(online_police.get(0).get("id").toString(),"1");
}
--
Gitblit v1.9.3