From 63d906d388418fe7f8cf9b3952d0e8a2598f8ea9 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:18 +0800
Subject: [PATCH] app接口
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 a2018e6..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
@@ -34,8 +34,7 @@
import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.alarm.wrapper.AlarmWrapper;
import org.springblade.jfpt.animalheat.service.AnimalHeatService;
-import org.springblade.jfpt.alarm.vo.AlarmExcel;
-import org.springblade.jfpt.animalheat.vo.AnimalHeatExcel;
+import org.springblade.common.entity.AlarmExcel;
import org.springblade.jfpt.healthcode.service.IhealthcodeService;
import org.springblade.jfpt.operation.service.IOperationService;
import org.springblade.jfpt.operation.vo.OperationVO;
@@ -470,7 +469,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());
+ alarmService.updateJtype(operation.getJid(),operation.getJtype(),operation.getBz(),operation.getSecurityArr());
alarmService.updatePoliceStatus(operation.getRid(),"0");
operationService.save(operation);
return R.success("修改成功");
@@ -632,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