diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java
index ed9544f0..068f9ed0 100644
--- a/src/main/java/com/zcloud/controller/map/MapController.java
+++ b/src/main/java/com/zcloud/controller/map/MapController.java
@@ -7,6 +7,7 @@ import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.service.bus.CorpInfoService;
 import com.zcloud.service.dw.DwService;
+import com.zcloud.service.dw.dto.AlarmGet;
 import com.zcloud.service.dw.dto.MapGet;
 import com.zcloud.service.dw.dto.MapInfo;
 import com.zcloud.service.dw.dto.TraceGet;
@@ -919,6 +920,27 @@ public class MapController extends BaseController {
         }
     }
 
+    @RequestMapping(value = "/getAlarmList")
+    @ResponseBody
+    public Object getAlarmList() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        PageData pd = this.getPageData();
+        // TODO 判断是否是公司人员定位
+        if (pd.get("corpId") != null && "035958e685cf4850bc40151c5e0617a6".equals(pd.getString("corpId"))) {
+            AlarmGet alarmGet = new AlarmGet();
+            alarmGet.setPage(new com.zcloud.service.dw.dto.Page());
+            alarmGet.getPage().setCurrent("1");
+            alarmGet.getPage().setSize("20");
+            alarmGet.setCorpId(pd.getString("corpId"));
+            return dwService.getAlarmList(alarmGet);
+        }else {
+            PageData value = usersService.getPersonByCardNo(pd);
+            map.put("result", "success");
+            map.put("pd", value);
+            return map;
+        }
+    }
+
 
 
     /**
diff --git a/src/main/java/com/zcloud/service/dw/dto/AlarmGet.java b/src/main/java/com/zcloud/service/dw/dto/AlarmGet.java
index a79155f2..e4c5044a 100644
--- a/src/main/java/com/zcloud/service/dw/dto/AlarmGet.java
+++ b/src/main/java/com/zcloud/service/dw/dto/AlarmGet.java
@@ -8,6 +8,7 @@ public class AlarmGet {
     private String startTime;
     private String endTime;
     private String status;
+    private String corpId;
     private Page page;
 
 }