From 491902192b61a683996b414b9e6e1ff8a8ff099f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 17:05:08 +0800
Subject: [PATCH] app接口
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java | 3 +++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 4 ++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java | 4 +++-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java | 4 ++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 5 +++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 14 ++++++++++++++
6 files changed, 33 insertions(+), 1 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 5fb86ec..3190118 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
@@ -646,4 +646,18 @@
return R.data(alarmService.getAlarm(alarmVO));
}
+ /**
+ * APP警情接受
+ * @param alarmVO
+ * @param response
+ * @return
+ */
+ @PostMapping("/APP-setAlarm")
+ public R setAlarm(AlarmVO alarmVO, 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");
+ return R.status(alarmService.setAlarm(alarmVO));
+ }
+
}
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 afe844e..93d0879 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
@@ -94,7 +94,9 @@
List<Map<String, Object>> queryBa();
- List<Map<String, Object>> getAlarm(AlarmVO alarm);
+ List<Map<String, Object>> getAlarm(@Param("alarm") AlarmVO alarm);
+
+ boolean setAlarm(@Param("alarm") AlarmVO 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 9f10dcf..498b9e5 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
@@ -564,6 +564,10 @@
</select>
+ <update id="setAlarm">
+ update sys_alarm SET securityId=#{alarm.securityId} where id=#{alarm.id}
+ </update>
+
<update id="updateVaddress">
update sys_alarm SET vaddress=#{vaddress},uids=#{uids} where id=#{jid}
</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 4bdffc2..f60ad82 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
@@ -87,6 +87,8 @@
List<Map<String, Object>> getAlarm(AlarmVO alarmVO);
+ boolean setAlarm(AlarmVO alarmVO);
+
/**
* 查询当前时间段一键求助报警总次数
* @param conditionVo
@@ -135,4 +137,5 @@
* @return
*/
List<ReportReturnData> getAlarmPie(AlarmVO alarmVO);
+
}
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 5e0ae86..8d807c6 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
@@ -181,6 +181,11 @@
return baseMapper.getAlarm(alarmVO);
}
+ @Override
+ public boolean setAlarm(AlarmVO alarmVO) {
+ return baseMapper.setAlarm(alarmVO);
+ }
+
/**
* 查询当前时间段一键求助报警总次数
* @param conditionVo
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
index 1856f4e..95ae08d 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
@@ -50,4 +50,8 @@
private String threeId;
private String deptId;
private String timeDesc;
+
+ private String securityArr;
+ private String securityId;
+
}
--
Gitblit v1.9.3