From 7be7ce64197e84dd30f8a8ebda5f0ad3c3ad966d Mon Sep 17 00:00:00 2001
From: liu_li <421691338@qq.com>
Date: Fri, 12 Aug 2022 21:09:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8A=A5=E8=AD=A6=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../storeroom3d/controller/AlarmLogController.java       | 6 ++++--
 .../modules/storeroom3d/service/AlarmInfoService.java    | 9 ++++++++-
 .../storeroom3d/service/impl/AlarmInfoServiceImpl.java   | 7 ++++++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmLogController.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmLogController.java
index aff83f3..84090f9 100644
--- a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmLogController.java
+++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmLogController.java
@@ -45,8 +45,10 @@ public class AlarmLogController {
         return ApiResponse.success(ResponseStatus.SUCCESS);
     }
 
-    public void exportAlarmLog(HttpServletResponse response,AlarmLogCriteria criteria){
-       // alarmInfoService.dowload(alarmInfoService.alarmLogList(criteria),response);
+    @ApiOperation("导出报警日志")
+    @AnonymousGetMapping(value = "download")
+    public void exportAlarmLog(HttpServletResponse response,AlarmLogCriteria criteria) throws Exception {
+        alarmInfoService.download(alarmInfoService.queryAll(criteria),response);
     }
 }
 
diff --git a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/AlarmInfoService.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/AlarmInfoService.java
index 7a1f87f..8ee6738 100644
--- a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/AlarmInfoService.java
+++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/AlarmInfoService.java
@@ -47,6 +47,13 @@ public interface AlarmInfoService {
      * @param response \
      * @throws Exception 、
      */
-    void dowload(List<AlarmLog> queryAll, HttpServletResponse response) throws Exception;
+    void download(List<AlarmLog> queryAll, HttpServletResponse response) throws Exception;
+
+    /**
+     * 查询全部，不分页
+     * @param criteria /
+     * @return /
+     */
+    List<AlarmLog> queryAll(AlarmLogCriteria criteria);
 
 }
diff --git a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/AlarmInfoServiceImpl.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/AlarmInfoServiceImpl.java
index 0988275..bf5ca33 100644
--- a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/AlarmInfoServiceImpl.java
+++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/AlarmInfoServiceImpl.java
@@ -174,7 +174,7 @@ public class AlarmInfoServiceImpl implements AlarmInfoService {
     }
 
     @Override
-    public void dowload(List<AlarmLog> queryAll, HttpServletResponse response) throws Exception {
+    public void download(List<AlarmLog> queryAll, HttpServletResponse response) throws Exception {
         List<Map<String, Object>> list = new ArrayList<>();
         for (AlarmLog alarmLog : queryAll) {
             Map<String, Object> map = new LinkedHashMap<>();
@@ -190,6 +190,11 @@ public class AlarmInfoServiceImpl implements AlarmInfoService {
 
     }
 
+    @Override
+    public List<AlarmLog> queryAll(AlarmLogCriteria criteria) {
+        return null;
+    }
+
     /**
      * 修改报警状态
      *