diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 3644556..4aa5e25 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -42,7 +42,7 @@
 public class AlarmRecordsController extends ExportController {
     private final AbstractDictService dictService;
     private final IAlarmRecordsService iAlarmRecordsService;
-    private final AbstractPermissionContext  permissionContext;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询当前告警分页接口")
     @PostMapping("/listPage")
@@ -53,7 +53,7 @@
 
         Page<AlarmRecords> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope)));
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request, dataScope)));
     }
 
     @ApiOperation("查询历史告警分页接口")
@@ -65,7 +65,7 @@
 
         Page<AlarmRecords> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope)));
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request, dataScope)));
     }
 
 //    @ApiOperation("新增")
@@ -125,5 +125,15 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
     }
+
+    @ApiOperation("报警节点流程展示")
+    @PostMapping("/nodeDetail")
+    @ResponseBody
+    public ReturnDTO nodeDetail(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
+    }
 }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 3644556..4aa5e25 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -42,7 +42,7 @@
 public class AlarmRecordsController extends ExportController {
     private final AbstractDictService dictService;
     private final IAlarmRecordsService iAlarmRecordsService;
-    private final AbstractPermissionContext  permissionContext;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询当前告警分页接口")
     @PostMapping("/listPage")
@@ -53,7 +53,7 @@
 
         Page<AlarmRecords> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope)));
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request, dataScope)));
     }
 
     @ApiOperation("查询历史告警分页接口")
@@ -65,7 +65,7 @@
 
         Page<AlarmRecords> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope)));
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request, dataScope)));
     }
 
 //    @ApiOperation("新增")
@@ -125,5 +125,15 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
     }
+
+    @ApiOperation("报警节点流程展示")
+    @PostMapping("/nodeDetail")
+    @ResponseBody
+    public ReturnDTO nodeDetail(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 543772d..6ea0b48 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -3,6 +3,11 @@
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,4 +20,11 @@
 @Mapper
 public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
 
+    @Select("SELECT al.ID,al.ALARM_ID,al.APPROVAL_PERSON,al.APPROVAL_TIME,al.APPROVAL_STATUS,al.DESCN,al.FLOW_STATUS,su.DEPT_ID " +
+            "FROM " +
+            " `approval_log` al " +
+            " LEFT JOIN sys_user su ON al.APPROVAL_PERSON_ID = su.ID  " +
+            "WHERE  al.ALARM_ID = #{alarmId}")
+    List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 3644556..4aa5e25 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -42,7 +42,7 @@
 public class AlarmRecordsController extends ExportController {
     private final AbstractDictService dictService;
     private final IAlarmRecordsService iAlarmRecordsService;
-    private final AbstractPermissionContext  permissionContext;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询当前告警分页接口")
     @PostMapping("/listPage")
@@ -53,7 +53,7 @@
 
         Page<AlarmRecords> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope)));
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request, dataScope)));
     }
 
     @ApiOperation("查询历史告警分页接口")
@@ -65,7 +65,7 @@
 
         Page<AlarmRecords> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope)));
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request, dataScope)));
     }
 
 //    @ApiOperation("新增")
@@ -125,5 +125,15 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
     }
+
+    @ApiOperation("报警节点流程展示")
+    @PostMapping("/nodeDetail")
+    @ResponseBody
+    public ReturnDTO nodeDetail(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 543772d..6ea0b48 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -3,6 +3,11 @@
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,4 +20,11 @@
 @Mapper
 public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
 
+    @Select("SELECT al.ID,al.ALARM_ID,al.APPROVAL_PERSON,al.APPROVAL_TIME,al.APPROVAL_STATUS,al.DESCN,al.FLOW_STATUS,su.DEPT_ID " +
+            "FROM " +
+            " `approval_log` al " +
+            " LEFT JOIN sys_user su ON al.APPROVAL_PERSON_ID = su.ID  " +
+            "WHERE  al.ALARM_ID = #{alarmId}")
+    List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
index b3fe40c..32d1cbf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -63,11 +64,29 @@
     public ApprovalLog() {
     }
 
-    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus,Long approvalPersonId) {
+    public ApprovalLog(Long alarmId,
+                       String approvalStatus,
+                       String approvalPerson,
+                       String flowStatus,
+                       Long approvalPersonId) {
         this.alarmId = alarmId;
         this.approvalStatus = approvalStatus;
         this.approvalPerson = approvalPerson;
         this.flowStatus = flowStatus;
         this.approvalPersonId = approvalPersonId;
     }
+
+    public ApprovalLog(Long alarmId,
+                       String approvalStatus,
+                       String approvalPerson,
+                       String flowStatus,
+                       Long approvalPersonId,
+                       String descn) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.approvalPersonId = approvalPersonId;
+        this.descn = descn;
+        this.flowStatus = flowStatus;
+    }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 3644556..4aa5e25 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -42,7 +42,7 @@
 public class AlarmRecordsController extends ExportController {
     private final AbstractDictService dictService;
     private final IAlarmRecordsService iAlarmRecordsService;
-    private final AbstractPermissionContext  permissionContext;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询当前告警分页接口")
     @PostMapping("/listPage")
@@ -53,7 +53,7 @@
 
         Page<AlarmRecords> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope)));
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request, dataScope)));
     }
 
     @ApiOperation("查询历史告警分页接口")
@@ -65,7 +65,7 @@
 
         Page<AlarmRecords> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope)));
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request, dataScope)));
     }
 
 //    @ApiOperation("新增")
@@ -125,5 +125,15 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
     }
+
+    @ApiOperation("报警节点流程展示")
+    @PostMapping("/nodeDetail")
+    @ResponseBody
+    public ReturnDTO nodeDetail(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 543772d..6ea0b48 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -3,6 +3,11 @@
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,4 +20,11 @@
 @Mapper
 public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
 
+    @Select("SELECT al.ID,al.ALARM_ID,al.APPROVAL_PERSON,al.APPROVAL_TIME,al.APPROVAL_STATUS,al.DESCN,al.FLOW_STATUS,su.DEPT_ID " +
+            "FROM " +
+            " `approval_log` al " +
+            " LEFT JOIN sys_user su ON al.APPROVAL_PERSON_ID = su.ID  " +
+            "WHERE  al.ALARM_ID = #{alarmId}")
+    List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
index b3fe40c..32d1cbf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -63,11 +64,29 @@
     public ApprovalLog() {
     }
 
-    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus,Long approvalPersonId) {
+    public ApprovalLog(Long alarmId,
+                       String approvalStatus,
+                       String approvalPerson,
+                       String flowStatus,
+                       Long approvalPersonId) {
         this.alarmId = alarmId;
         this.approvalStatus = approvalStatus;
         this.approvalPerson = approvalPerson;
         this.flowStatus = flowStatus;
         this.approvalPersonId = approvalPersonId;
     }
+
+    public ApprovalLog(Long alarmId,
+                       String approvalStatus,
+                       String approvalPerson,
+                       String flowStatus,
+                       Long approvalPersonId,
+                       String descn) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.approvalPersonId = approvalPersonId;
+        this.descn = descn;
+        this.flowStatus = flowStatus;
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index af572ad..f1e3986 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -43,4 +43,6 @@
 
     boolean processByApp(Map resultParams);
 
+    List<Map<String,Object>> nodeDetail(Long alarmId);
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 3644556..4aa5e25 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -42,7 +42,7 @@
 public class AlarmRecordsController extends ExportController {
     private final AbstractDictService dictService;
     private final IAlarmRecordsService iAlarmRecordsService;
-    private final AbstractPermissionContext  permissionContext;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询当前告警分页接口")
     @PostMapping("/listPage")
@@ -53,7 +53,7 @@
 
         Page<AlarmRecords> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope)));
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request, dataScope)));
     }
 
     @ApiOperation("查询历史告警分页接口")
@@ -65,7 +65,7 @@
 
         Page<AlarmRecords> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope)));
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request, dataScope)));
     }
 
 //    @ApiOperation("新增")
@@ -125,5 +125,15 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
     }
+
+    @ApiOperation("报警节点流程展示")
+    @PostMapping("/nodeDetail")
+    @ResponseBody
+    public ReturnDTO nodeDetail(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 543772d..6ea0b48 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -3,6 +3,11 @@
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,4 +20,11 @@
 @Mapper
 public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
 
+    @Select("SELECT al.ID,al.ALARM_ID,al.APPROVAL_PERSON,al.APPROVAL_TIME,al.APPROVAL_STATUS,al.DESCN,al.FLOW_STATUS,su.DEPT_ID " +
+            "FROM " +
+            " `approval_log` al " +
+            " LEFT JOIN sys_user su ON al.APPROVAL_PERSON_ID = su.ID  " +
+            "WHERE  al.ALARM_ID = #{alarmId}")
+    List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
index b3fe40c..32d1cbf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -63,11 +64,29 @@
     public ApprovalLog() {
     }
 
-    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus,Long approvalPersonId) {
+    public ApprovalLog(Long alarmId,
+                       String approvalStatus,
+                       String approvalPerson,
+                       String flowStatus,
+                       Long approvalPersonId) {
         this.alarmId = alarmId;
         this.approvalStatus = approvalStatus;
         this.approvalPerson = approvalPerson;
         this.flowStatus = flowStatus;
         this.approvalPersonId = approvalPersonId;
     }
+
+    public ApprovalLog(Long alarmId,
+                       String approvalStatus,
+                       String approvalPerson,
+                       String flowStatus,
+                       Long approvalPersonId,
+                       String descn) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.approvalPersonId = approvalPersonId;
+        this.descn = descn;
+        this.flowStatus = flowStatus;
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index af572ad..f1e3986 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -43,4 +43,6 @@
 
     boolean processByApp(Map resultParams);
 
+    List<Map<String,Object>> nodeDetail(Long alarmId);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 6a1ffe1..6c589af 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -3,10 +3,12 @@
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDeptService;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
@@ -22,6 +24,7 @@
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.system.model.Dept;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -50,6 +53,7 @@
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
     private final AbstractDeptService abstractDeptService;
+    private final AbstractDictService abstractDictService;
 
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
@@ -145,9 +149,12 @@
         this.baseMapper.updateById(alarmRecords);
         //2、写入流程日志
         AuthUser user = permissionContext.getAuthService().getLoginUser();
-        approvalLogMapper.insert(new ApprovalLog(suspendDTO.getAlarmId(), "1",
-                user != null ? user.getName() : "", ApprovalStatusEnum.SUSPEND.getCode(),
-                user != null ? user.getId() : null));
+        approvalLogMapper.insert(new ApprovalLog(suspendDTO.getAlarmId(),
+                "1",
+                user != null ? user.getName() : "",
+                ApprovalStatusEnum.SUSPEND.getCode(),
+                user != null ? user.getId() : null,
+                suspendDTO.getSuspendTime() + "|" + suspendDTO.getSuspendReason()));
         //3、写入挂起日志表
         Date expireTime = DateUtil.offsetHour(new Date(), Integer.decode(suspendDTO.getSuspendTime()));
         return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(),
@@ -232,11 +239,32 @@
     }
 
     @Override
+    public List<Map<String, Object>> nodeDetail(Long alarmId) {
+        List<Map<String, Object>> resultMapList = approvalLogMapper.getListByAlarmId(alarmId);
+        resultMapList.forEach(map -> {
+            map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString()));
+            map.put("dept_name", getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())));
+        });
+        return resultMapList;
+    }
+
+    @Override
     public boolean processByApp(Map resultParams) {
         return false;
     }
 
 
+    public String getDeptNamesByDeptId(Long deptId) {
+        List<Long> deptIds = abstractDeptService.getParentListById(deptId);
+        deptIds.add(deptId);
+        QueryWrapper<Dept> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("id",deptIds);
+        List<Dept> deptList = abstractDeptService.list(queryWrapper);
+        List<String> nameList = deptList.stream().map(Dept::getFullName).collect(Collectors.toList());
+        return String.join("/", nameList);
+    }
+
+
     public String getDeptIds(Long deptId) {
         if (ObjectUtil.isNotEmpty(deptId)) {
             //获取子级单位

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 3644556..4aa5e25 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -42,7 +42,7 @@
 public class AlarmRecordsController extends ExportController {
     private final AbstractDictService dictService;
     private final IAlarmRecordsService iAlarmRecordsService;
-    private final AbstractPermissionContext  permissionContext;
+    private final AbstractPermissionContext permissionContext;
 
     @ApiOperation("查询当前告警分页接口")
     @PostMapping("/listPage")
@@ -53,7 +53,7 @@
 
         Page<AlarmRecords> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope)));
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request, dataScope)));
     }
 
     @ApiOperation("查询历史告警分页接口")
@@ -65,7 +65,7 @@
 
         Page<AlarmRecords> page = PageFactory.defaultPage();
 
-        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope)));
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request, dataScope)));
     }
 
 //    @ApiOperation("新增")
@@ -125,5 +125,15 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
     }
+
+    @ApiOperation("报警节点流程展示")
+    @PostMapping("/nodeDetail")
+    @ResponseBody
+    public ReturnDTO nodeDetail(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.nodeDetail(idDTO.getId()));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 543772d..6ea0b48 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -3,6 +3,11 @@
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,4 +20,11 @@
 @Mapper
 public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
 
+    @Select("SELECT al.ID,al.ALARM_ID,al.APPROVAL_PERSON,al.APPROVAL_TIME,al.APPROVAL_STATUS,al.DESCN,al.FLOW_STATUS,su.DEPT_ID " +
+            "FROM " +
+            " `approval_log` al " +
+            " LEFT JOIN sys_user su ON al.APPROVAL_PERSON_ID = su.ID  " +
+            "WHERE  al.ALARM_ID = #{alarmId}")
+    List<Map<String, Object>> getListByAlarmId(@Param("alarmId") Long alarmId);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
index b3fe40c..32d1cbf 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -63,11 +64,29 @@
     public ApprovalLog() {
     }
 
-    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus,Long approvalPersonId) {
+    public ApprovalLog(Long alarmId,
+                       String approvalStatus,
+                       String approvalPerson,
+                       String flowStatus,
+                       Long approvalPersonId) {
         this.alarmId = alarmId;
         this.approvalStatus = approvalStatus;
         this.approvalPerson = approvalPerson;
         this.flowStatus = flowStatus;
         this.approvalPersonId = approvalPersonId;
     }
+
+    public ApprovalLog(Long alarmId,
+                       String approvalStatus,
+                       String approvalPerson,
+                       String flowStatus,
+                       Long approvalPersonId,
+                       String descn) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.approvalPersonId = approvalPersonId;
+        this.descn = descn;
+        this.flowStatus = flowStatus;
+    }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index af572ad..f1e3986 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -43,4 +43,6 @@
 
     boolean processByApp(Map resultParams);
 
+    List<Map<String,Object>> nodeDetail(Long alarmId);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 6a1ffe1..6c589af 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -3,10 +3,12 @@
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDeptService;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
@@ -22,6 +24,7 @@
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.system.model.Dept;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -50,6 +53,7 @@
     private final SuspendLogMapper suspendLogMapper;
     private final RemindLogMapper remindLogMapper;
     private final AbstractDeptService abstractDeptService;
+    private final AbstractDictService abstractDictService;
 
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
@@ -145,9 +149,12 @@
         this.baseMapper.updateById(alarmRecords);
         //2、写入流程日志
         AuthUser user = permissionContext.getAuthService().getLoginUser();
-        approvalLogMapper.insert(new ApprovalLog(suspendDTO.getAlarmId(), "1",
-                user != null ? user.getName() : "", ApprovalStatusEnum.SUSPEND.getCode(),
-                user != null ? user.getId() : null));
+        approvalLogMapper.insert(new ApprovalLog(suspendDTO.getAlarmId(),
+                "1",
+                user != null ? user.getName() : "",
+                ApprovalStatusEnum.SUSPEND.getCode(),
+                user != null ? user.getId() : null,
+                suspendDTO.getSuspendTime() + "|" + suspendDTO.getSuspendReason()));
         //3、写入挂起日志表
         Date expireTime = DateUtil.offsetHour(new Date(), Integer.decode(suspendDTO.getSuspendTime()));
         return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(),
@@ -232,11 +239,32 @@
     }
 
     @Override
+    public List<Map<String, Object>> nodeDetail(Long alarmId) {
+        List<Map<String, Object>> resultMapList = approvalLogMapper.getListByAlarmId(alarmId);
+        resultMapList.forEach(map -> {
+            map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString()));
+            map.put("dept_name", getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())));
+        });
+        return resultMapList;
+    }
+
+    @Override
     public boolean processByApp(Map resultParams) {
         return false;
     }
 
 
+    public String getDeptNamesByDeptId(Long deptId) {
+        List<Long> deptIds = abstractDeptService.getParentListById(deptId);
+        deptIds.add(deptId);
+        QueryWrapper<Dept> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("id",deptIds);
+        List<Dept> deptList = abstractDeptService.list(queryWrapper);
+        List<String> nameList = deptList.stream().map(Dept::getFullName).collect(Collectors.toList());
+        return String.join("/", nameList);
+    }
+
+
     public String getDeptIds(Long deptId) {
         if (ObjectUtil.isNotEmpty(deptId)) {
             //获取子级单位
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 9d488e3..fc65471 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -107,6 +107,7 @@
 
     @Override
     public List<Map<String, Object>> cellAnalysis(CommonRequestDTO request) {
+        //toDo:采集时间字段配置
         List<Map<String, Object>> resultMap = new ArrayList<>();
         DeviceDataEnum deviceDataEnum = DeviceDataEnum.typeOf(request.getTypeName());
         if(null!=deviceDataEnum){