From 8b4825afee9300eee48ffdc61dd87e46f19a1201 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 23 Apr 2021 16:36:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 45102d2..5fb86ec 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
@@ -631,4 +631,19 @@
List<AlarmExcel> list = alarmService.exportAlarm(alarmVO);
ExcelUtil.export(response, "主动报警数据" + DateUtil.time(), "主动报警数据表", list, AlarmExcel.class);
}
+
+ /**
+ * APP查询警情
+ * @param alarmVO
+ * @param response
+ * @return
+ */
+ @PostMapping("/APP-getAlarm")
+ public R getAlarm(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.data(alarmService.getAlarm(alarmVO));
+ }
+
}
--
Gitblit v1.9.3