diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
index 1a265da..baa169b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
@@ -2,6 +2,7 @@
 
 
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDpDTO;
 import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
@@ -101,5 +102,19 @@
     public ReturnDTO alarmStatistics(@RequestBody TimeRequestDTO timeRequestDTO) {
         return ReturnUtil.success(iCockpitService.alarmTotalStatistics(timeRequestDTO.getTimeType()));
     }
+
+    @ApiOperation("事件地图上告警点位接口")
+    @PostMapping("/alarmMapList")
+    @ResponseBody
+    public ReturnDTO alarmMapList() {
+        return ReturnUtil.success(iCockpitService.alarmMapList());
+    }
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO detail(@RequestBody IdDTO idDTO) {
+        return ReturnUtil.success(iCockpitService.detail(idDTO.getId()));
+    }
 }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
index 1a265da..baa169b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
@@ -2,6 +2,7 @@
 
 
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDpDTO;
 import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
@@ -101,5 +102,19 @@
     public ReturnDTO alarmStatistics(@RequestBody TimeRequestDTO timeRequestDTO) {
         return ReturnUtil.success(iCockpitService.alarmTotalStatistics(timeRequestDTO.getTimeType()));
     }
+
+    @ApiOperation("事件地图上告警点位接口")
+    @PostMapping("/alarmMapList")
+    @ResponseBody
+    public ReturnDTO alarmMapList() {
+        return ReturnUtil.success(iCockpitService.alarmMapList());
+    }
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO detail(@RequestBody IdDTO idDTO) {
+        return ReturnUtil.success(iCockpitService.detail(idDTO.getId()));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java
index d3a472d..91d4d28 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,9 +40,12 @@
 
     List<AlarmRecordDpDTO> alarmList(@Param("deptStrs") String deptStrs);
 
+    List<AlarmMapDTO> alarmMapList(@Param("deptStrs") String deptStrs);
+
     List<AlarmTrendResponseDTO> alarmTrend(@Param("deptStrs") String deptStrs, @Param("timeType") String timeType);
 
     List<AlarmTotalDTO> alarmTotalStatistics(@Param("deptStrs") String deptStrs, @Param("timeType") String timeType);
 
+    Map<String,Object> detail(@Param("id") Long id);
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
index 1a265da..baa169b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
@@ -2,6 +2,7 @@
 
 
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDpDTO;
 import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
@@ -101,5 +102,19 @@
     public ReturnDTO alarmStatistics(@RequestBody TimeRequestDTO timeRequestDTO) {
         return ReturnUtil.success(iCockpitService.alarmTotalStatistics(timeRequestDTO.getTimeType()));
     }
+
+    @ApiOperation("事件地图上告警点位接口")
+    @PostMapping("/alarmMapList")
+    @ResponseBody
+    public ReturnDTO alarmMapList() {
+        return ReturnUtil.success(iCockpitService.alarmMapList());
+    }
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO detail(@RequestBody IdDTO idDTO) {
+        return ReturnUtil.success(iCockpitService.detail(idDTO.getId()));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java
index d3a472d..91d4d28 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,9 +40,12 @@
 
     List<AlarmRecordDpDTO> alarmList(@Param("deptStrs") String deptStrs);
 
+    List<AlarmMapDTO> alarmMapList(@Param("deptStrs") String deptStrs);
+
     List<AlarmTrendResponseDTO> alarmTrend(@Param("deptStrs") String deptStrs, @Param("timeType") String timeType);
 
     List<AlarmTotalDTO> alarmTotalStatistics(@Param("deptStrs") String deptStrs, @Param("timeType") String timeType);
 
+    Map<String,Object> detail(@Param("id") Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml
index 485a7f6..f30204c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml
@@ -248,7 +248,6 @@
     </select>
 
     <select id="alarmTotalStatistics" resultType="com.casic.missiles.modular.alarm.dto.AlarmTotalDTO">
-
         SELECT
             count(1) as `value`,
             av.DEPTID,
@@ -273,4 +272,55 @@
             av.DEPTID,
             av.processStatus
     </select>
+
+    <select id="alarmMapList" resultType="com.casic.missiles.modular.alarm.dto.AlarmMapDTO">
+        SELECT
+            av.id,
+            av.DEPTID,
+            av.DEVCODE,
+            av.ledgerNumber,
+            av.ledgerName,
+            av.place,
+            av.latGaode,
+            av.lngGaode
+        FROM
+            alarm_records_view av
+        WHERE
+            av.`STATUS` = 1 AND av.exceptionType =0
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+    </select>
+    <select id="detail" resultType="java.util.Map">
+        SELECT
+            rd.*,
+            bt.TYPE_NAME AS devTypeName,
+            rd.POSITION,
+            rd.LEDGER_NUMBER AS tagNumber,
+            lr.ledgerName,
+            lr.DEPTID,
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner,
+            lr.id as ledgerId,
+            lr.type as watchObject,
+            ay.ALARM_CATEGORY as alarmCategory
+        FROM
+            alarm_records rd
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+                LEFT JOIN alarm_type ay on ay.id=rd.ALARM_TYPE_ID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
+
+    </select>
 </mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
index 1a265da..baa169b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
@@ -2,6 +2,7 @@
 
 
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDpDTO;
 import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
@@ -101,5 +102,19 @@
     public ReturnDTO alarmStatistics(@RequestBody TimeRequestDTO timeRequestDTO) {
         return ReturnUtil.success(iCockpitService.alarmTotalStatistics(timeRequestDTO.getTimeType()));
     }
+
+    @ApiOperation("事件地图上告警点位接口")
+    @PostMapping("/alarmMapList")
+    @ResponseBody
+    public ReturnDTO alarmMapList() {
+        return ReturnUtil.success(iCockpitService.alarmMapList());
+    }
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO detail(@RequestBody IdDTO idDTO) {
+        return ReturnUtil.success(iCockpitService.detail(idDTO.getId()));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java
index d3a472d..91d4d28 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,9 +40,12 @@
 
     List<AlarmRecordDpDTO> alarmList(@Param("deptStrs") String deptStrs);
 
+    List<AlarmMapDTO> alarmMapList(@Param("deptStrs") String deptStrs);
+
     List<AlarmTrendResponseDTO> alarmTrend(@Param("deptStrs") String deptStrs, @Param("timeType") String timeType);
 
     List<AlarmTotalDTO> alarmTotalStatistics(@Param("deptStrs") String deptStrs, @Param("timeType") String timeType);
 
+    Map<String,Object> detail(@Param("id") Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml
index 485a7f6..f30204c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml
@@ -248,7 +248,6 @@
     </select>
 
     <select id="alarmTotalStatistics" resultType="com.casic.missiles.modular.alarm.dto.AlarmTotalDTO">
-
         SELECT
             count(1) as `value`,
             av.DEPTID,
@@ -273,4 +272,55 @@
             av.DEPTID,
             av.processStatus
     </select>
+
+    <select id="alarmMapList" resultType="com.casic.missiles.modular.alarm.dto.AlarmMapDTO">
+        SELECT
+            av.id,
+            av.DEPTID,
+            av.DEVCODE,
+            av.ledgerNumber,
+            av.ledgerName,
+            av.place,
+            av.latGaode,
+            av.lngGaode
+        FROM
+            alarm_records_view av
+        WHERE
+            av.`STATUS` = 1 AND av.exceptionType =0
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+    </select>
+    <select id="detail" resultType="java.util.Map">
+        SELECT
+            rd.*,
+            bt.TYPE_NAME AS devTypeName,
+            rd.POSITION,
+            rd.LEDGER_NUMBER AS tagNumber,
+            lr.ledgerName,
+            lr.DEPTID,
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner,
+            lr.id as ledgerId,
+            lr.type as watchObject,
+            ay.ALARM_CATEGORY as alarmCategory
+        FROM
+            alarm_records rd
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+                LEFT JOIN alarm_type ay on ay.id=rd.ALARM_TYPE_ID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
+
+    </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmMapDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmMapDTO.java
new file mode 100644
index 0000000..4acf2ed
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmMapDTO.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.modular.alarm.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+
+@Data
+public class AlarmMapDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("位号，闸井/场站用")
+    private String ledgerNumber;
+
+    @ApiModelProperty("位置")
+    private String place;
+
+    @ApiModelProperty("名称，闸井/场站用")
+    private String ledgerName;
+
+    @ApiModelProperty("设备编号")
+    private String devcode;
+
+    @ApiModelProperty("经度（高德）")
+    private String lngGaode;
+
+    @ApiModelProperty("纬度（高德）")
+    private String latGaode;
+
+    @ApiModelProperty("报警id")
+    private Long id;
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
index 1a265da..baa169b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
@@ -2,6 +2,7 @@
 
 
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDpDTO;
 import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
@@ -101,5 +102,19 @@
     public ReturnDTO alarmStatistics(@RequestBody TimeRequestDTO timeRequestDTO) {
         return ReturnUtil.success(iCockpitService.alarmTotalStatistics(timeRequestDTO.getTimeType()));
     }
+
+    @ApiOperation("事件地图上告警点位接口")
+    @PostMapping("/alarmMapList")
+    @ResponseBody
+    public ReturnDTO alarmMapList() {
+        return ReturnUtil.success(iCockpitService.alarmMapList());
+    }
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO detail(@RequestBody IdDTO idDTO) {
+        return ReturnUtil.success(iCockpitService.detail(idDTO.getId()));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java
index d3a472d..91d4d28 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,9 +40,12 @@
 
     List<AlarmRecordDpDTO> alarmList(@Param("deptStrs") String deptStrs);
 
+    List<AlarmMapDTO> alarmMapList(@Param("deptStrs") String deptStrs);
+
     List<AlarmTrendResponseDTO> alarmTrend(@Param("deptStrs") String deptStrs, @Param("timeType") String timeType);
 
     List<AlarmTotalDTO> alarmTotalStatistics(@Param("deptStrs") String deptStrs, @Param("timeType") String timeType);
 
+    Map<String,Object> detail(@Param("id") Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml
index 485a7f6..f30204c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml
@@ -248,7 +248,6 @@
     </select>
 
     <select id="alarmTotalStatistics" resultType="com.casic.missiles.modular.alarm.dto.AlarmTotalDTO">
-
         SELECT
             count(1) as `value`,
             av.DEPTID,
@@ -273,4 +272,55 @@
             av.DEPTID,
             av.processStatus
     </select>
+
+    <select id="alarmMapList" resultType="com.casic.missiles.modular.alarm.dto.AlarmMapDTO">
+        SELECT
+            av.id,
+            av.DEPTID,
+            av.DEVCODE,
+            av.ledgerNumber,
+            av.ledgerName,
+            av.place,
+            av.latGaode,
+            av.lngGaode
+        FROM
+            alarm_records_view av
+        WHERE
+            av.`STATUS` = 1 AND av.exceptionType =0
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+    </select>
+    <select id="detail" resultType="java.util.Map">
+        SELECT
+            rd.*,
+            bt.TYPE_NAME AS devTypeName,
+            rd.POSITION,
+            rd.LEDGER_NUMBER AS tagNumber,
+            lr.ledgerName,
+            lr.DEPTID,
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner,
+            lr.id as ledgerId,
+            lr.type as watchObject,
+            ay.ALARM_CATEGORY as alarmCategory
+        FROM
+            alarm_records rd
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+                LEFT JOIN alarm_type ay on ay.id=rd.ALARM_TYPE_ID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
+
+    </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmMapDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmMapDTO.java
new file mode 100644
index 0000000..4acf2ed
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmMapDTO.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.modular.alarm.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+
+@Data
+public class AlarmMapDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("位号，闸井/场站用")
+    private String ledgerNumber;
+
+    @ApiModelProperty("位置")
+    private String place;
+
+    @ApiModelProperty("名称，闸井/场站用")
+    private String ledgerName;
+
+    @ApiModelProperty("设备编号")
+    private String devcode;
+
+    @ApiModelProperty("经度（高德）")
+    private String lngGaode;
+
+    @ApiModelProperty("纬度（高德）")
+    private String latGaode;
+
+    @ApiModelProperty("报警id")
+    private Long id;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ICockpitService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ICockpitService.java
index b34e921..098c507 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ICockpitService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ICockpitService.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.alarm.dto.AlarmMapDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDpDTO;
 import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
 import com.casic.missiles.modular.alarm.dto.SfqDTO;
@@ -39,5 +40,9 @@
 
     List<AlarmRecordDpDTO> alarmList();
 
+    List<AlarmMapDTO> alarmMapList();
+
+    Map<String, Object> detail(Long id);
+
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
index 1a265da..baa169b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/CockpitController.java
@@ -2,6 +2,7 @@
 
 
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDpDTO;
 import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
@@ -101,5 +102,19 @@
     public ReturnDTO alarmStatistics(@RequestBody TimeRequestDTO timeRequestDTO) {
         return ReturnUtil.success(iCockpitService.alarmTotalStatistics(timeRequestDTO.getTimeType()));
     }
+
+    @ApiOperation("事件地图上告警点位接口")
+    @PostMapping("/alarmMapList")
+    @ResponseBody
+    public ReturnDTO alarmMapList() {
+        return ReturnUtil.success(iCockpitService.alarmMapList());
+    }
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO detail(@RequestBody IdDTO idDTO) {
+        return ReturnUtil.success(iCockpitService.detail(idDTO.getId()));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java
index d3a472d..91d4d28 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/CockpitMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,9 +40,12 @@
 
     List<AlarmRecordDpDTO> alarmList(@Param("deptStrs") String deptStrs);
 
+    List<AlarmMapDTO> alarmMapList(@Param("deptStrs") String deptStrs);
+
     List<AlarmTrendResponseDTO> alarmTrend(@Param("deptStrs") String deptStrs, @Param("timeType") String timeType);
 
     List<AlarmTotalDTO> alarmTotalStatistics(@Param("deptStrs") String deptStrs, @Param("timeType") String timeType);
 
+    Map<String,Object> detail(@Param("id") Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml
index 485a7f6..f30204c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/CockpitMapper.xml
@@ -248,7 +248,6 @@
     </select>
 
     <select id="alarmTotalStatistics" resultType="com.casic.missiles.modular.alarm.dto.AlarmTotalDTO">
-
         SELECT
             count(1) as `value`,
             av.DEPTID,
@@ -273,4 +272,55 @@
             av.DEPTID,
             av.processStatus
     </select>
+
+    <select id="alarmMapList" resultType="com.casic.missiles.modular.alarm.dto.AlarmMapDTO">
+        SELECT
+            av.id,
+            av.DEPTID,
+            av.DEVCODE,
+            av.ledgerNumber,
+            av.ledgerName,
+            av.place,
+            av.latGaode,
+            av.lngGaode
+        FROM
+            alarm_records_view av
+        WHERE
+            av.`STATUS` = 1 AND av.exceptionType =0
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+    </select>
+    <select id="detail" resultType="java.util.Map">
+        SELECT
+            rd.*,
+            bt.TYPE_NAME AS devTypeName,
+            rd.POSITION,
+            rd.LEDGER_NUMBER AS tagNumber,
+            lr.ledgerName,
+            lr.DEPTID,
+            lr.lngGaode,
+            lr.latGaode,
+            lr.manageType,
+            sd.full_name AS deptName,
+            lr.propertyOwner,
+            lr.id as ledgerId,
+            lr.type as watchObject,
+            ay.ALARM_CATEGORY as alarmCategory
+        FROM
+            alarm_records rd
+                LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
+                LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
+                LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
+                AND bl.VALID = 1
+                LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+                AND lr.type = bl.type
+                AND bl.VALID = 1
+                AND lr.VALID = 1
+                LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+                LEFT JOIN alarm_type ay on ay.id=rd.ALARM_TYPE_ID
+        WHERE
+            rd.STATUS = 1  and  rd.ID=#{id}
+
+    </select>
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmMapDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmMapDTO.java
new file mode 100644
index 0000000..4acf2ed
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmMapDTO.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.modular.alarm.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+
+@Data
+public class AlarmMapDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("位号，闸井/场站用")
+    private String ledgerNumber;
+
+    @ApiModelProperty("位置")
+    private String place;
+
+    @ApiModelProperty("名称，闸井/场站用")
+    private String ledgerName;
+
+    @ApiModelProperty("设备编号")
+    private String devcode;
+
+    @ApiModelProperty("经度（高德）")
+    private String lngGaode;
+
+    @ApiModelProperty("纬度（高德）")
+    private String latGaode;
+
+    @ApiModelProperty("报警id")
+    private Long id;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ICockpitService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ICockpitService.java
index b34e921..098c507 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ICockpitService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ICockpitService.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.alarm.dto.AlarmMapDTO;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDpDTO;
 import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
 import com.casic.missiles.modular.alarm.dto.SfqDTO;
@@ -39,5 +40,9 @@
 
     List<AlarmRecordDpDTO> alarmList();
 
+    List<AlarmMapDTO> alarmMapList();
+
+    Map<String, Object> detail(Long id);
+
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/CockpitServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/CockpitServiceImpl.java
index 9456de3..3f03593 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/CockpitServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/CockpitServiceImpl.java
@@ -7,8 +7,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDeptService;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.DictEnum;
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
 import com.casic.missiles.modular.alarm.dao.CockpitMapper;
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
@@ -36,6 +38,8 @@
 
     private final CommonServer commonServer;
     private final AbstractDeptService abstractDeptService;
+    private final AbstractDictService abstractDictService;
+    private final ApprovalLogMapper approvalLogMapper;
 
     @Override
     public List<CommonResponseDTO> overall(SfqDTO sfqDTO) {
@@ -252,4 +256,35 @@
         }
         return resultMapList;
     }
+
+    @Override
+    public List<AlarmMapDTO> alarmMapList() {
+        return this.baseMapper.alarmMapList(commonServer.getDeptIds());
+    }
+
+    @Override
+    public Map<String, Object> detail(Long id) {
+        Map<String, Object> resultMap = this.baseMapper.detail(id);
+        resultMap.put("alarmCategory", abstractDictService.getDictNameByCode("alarmCategory", resultMap.get("alarmCategory").toString()));
+        resultMap.put("processStatusName", ApprovalStatusEnum.getValue(resultMap.get("PROCESS_STATUS").toString()));
+        //0：自有，1：自管
+        resultMap.put("manageType", DictEnum.MANAGE_TYPE.equals(resultMap.get("manageType").toString()) ? "自有" : "自管");
+        //设置确认上个处置内容
+        resultMap.put("processContent", "未处置");
+        resultMap.put("confirmContent", "未确认");
+        String processStatus = resultMap.get("PROCESS_STATUS").toString();
+        if (ApprovalStatusEnum.CONFIRMED.getCode().equals(processStatus) ||
+                ApprovalStatusEnum.UNPROCESS.equals(processStatus) ||
+                ApprovalStatusEnum.PROCESSED.getCode().equals(processStatus) ||
+                ApprovalStatusEnum.FINISHED.getCode().equals(processStatus)) {
+            String confirmMsg = approvalLogMapper.getMsg(id, ApprovalStatusEnum.CONFIRMED.getCode());
+            String confirmMsg1 = approvalLogMapper.getMsg(id, ApprovalStatusEnum.UNPROCESS.getCode());
+            String processMsg = approvalLogMapper.getMsg(id, ApprovalStatusEnum.PROCESSED.getCode());
+            if (ObjectUtil.isNotEmpty(confirmMsg) || ObjectUtil.isNotEmpty(confirmMsg1))
+                resultMap.put("confirmContent", ObjectUtil.isNotEmpty(confirmMsg) ? confirmMsg : confirmMsg1);
+            if (ObjectUtil.isNotEmpty(processMsg))
+                resultMap.put("processContent", processMsg);
+        }
+        return resultMap;
+    }
 }