From 0a95da31c73a7e136ded4b9c409ef0b9676ef6cd Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 23 Apr 2024 18:53:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=96=B0=E5=A2=9E=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zcloud/controller/map/MapController.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java
index 61111842..4fd206c1 100644
--- a/src/main/java/com/zcloud/controller/map/MapController.java
+++ b/src/main/java/com/zcloud/controller/map/MapController.java
@@ -922,7 +922,7 @@ public class MapController extends BaseController {
         }
     }
 
-    @RequestMapping(value = "/getAlarmList")
+    @RequestMapping(value = "/getAllDwMessage")
     @ResponseBody
     public Object getAlarmList() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
@@ -934,7 +934,10 @@ public class MapController extends BaseController {
             alarmGet.getPage().setCurrent("1");
             alarmGet.getPage().setSize("20");
             alarmGet.setCorpId(pd.getString("corpId"));
-            return dwService.getAlarmList(alarmGet);
+            map.put("result", "success");
+            map.put("alarmList",dwService.getAlarmList(alarmGet));
+            map.put("orthermessage",dwService.getAllMessage());
+            return map;
         }else {
             PageData value = usersService.getPersonByCardNo(pd);
             map.put("result", "success");