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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
new file mode 100644
index 0000000..fd1748b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 挂起记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("suspend_log")
+@ApiModel(value = "SuspendLog对象", description = "挂起记录")
+public class SuspendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    @TableField("SUSPEND_REASON")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    @TableField("SUSPEND_TIME")
+    private String suspendTime;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_PERSON")
+    private String createPerson;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    public SuspendLog() {
+    }
+
+    public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson) {
+        this.alarmId = alarmId;
+        this.suspendReason = suspendReason;
+        this.suspendTime = suspendTime;
+        this.createPerson = createPerson;
+    }
+}

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
new file mode 100644
index 0000000..fd1748b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 挂起记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("suspend_log")
+@ApiModel(value = "SuspendLog对象", description = "挂起记录")
+public class SuspendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    @TableField("SUSPEND_REASON")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    @TableField("SUSPEND_TIME")
+    private String suspendTime;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_PERSON")
+    private String createPerson;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    public SuspendLog() {
+    }
+
+    public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson) {
+        this.alarmId = alarmId;
+        this.suspendReason = suspendReason;
+        this.suspendTime = suspendTime;
+        this.createPerson = createPerson;
+    }
+}
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 812d274..f285f96 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
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 
 /**
@@ -20,6 +22,12 @@
 
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
-    boolean  view(Long id);
+    AlarmRecords  view(Long id);
+
+    boolean  suspend(SuspendDTO suspendDTO);
+
+    boolean  remind(RemindDTO remindDTO);
+
+    boolean  read(Long id);
 
 }

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
new file mode 100644
index 0000000..fd1748b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 挂起记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("suspend_log")
+@ApiModel(value = "SuspendLog对象", description = "挂起记录")
+public class SuspendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    @TableField("SUSPEND_REASON")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    @TableField("SUSPEND_TIME")
+    private String suspendTime;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_PERSON")
+    private String createPerson;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    public SuspendLog() {
+    }
+
+    public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson) {
+        this.alarmId = alarmId;
+        this.suspendReason = suspendReason;
+        this.suspendTime = suspendTime;
+        this.createPerson = createPerson;
+    }
+}
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 812d274..f285f96 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
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 
 /**
@@ -20,6 +22,12 @@
 
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
-    boolean  view(Long id);
+    AlarmRecords  view(Long id);
+
+    boolean  suspend(SuspendDTO suspendDTO);
+
+    boolean  remind(RemindDTO remindDTO);
+
+    boolean  read(Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
new file mode 100644
index 0000000..f711ef8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 审批记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IApprovalLogService extends IService<ApprovalLog> {
+
+}

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
new file mode 100644
index 0000000..fd1748b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 挂起记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("suspend_log")
+@ApiModel(value = "SuspendLog对象", description = "挂起记录")
+public class SuspendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    @TableField("SUSPEND_REASON")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    @TableField("SUSPEND_TIME")
+    private String suspendTime;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_PERSON")
+    private String createPerson;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    public SuspendLog() {
+    }
+
+    public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson) {
+        this.alarmId = alarmId;
+        this.suspendReason = suspendReason;
+        this.suspendTime = suspendTime;
+        this.createPerson = createPerson;
+    }
+}
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 812d274..f285f96 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
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 
 /**
@@ -20,6 +22,12 @@
 
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
-    boolean  view(Long id);
+    AlarmRecords  view(Long id);
+
+    boolean  suspend(SuspendDTO suspendDTO);
+
+    boolean  remind(RemindDTO remindDTO);
+
+    boolean  read(Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
new file mode 100644
index 0000000..f711ef8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 审批记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IApprovalLogService extends IService<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
new file mode 100644
index 0000000..683c548
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 提醒记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IRemindLogService extends IService<RemindLog> {
+
+}

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
new file mode 100644
index 0000000..fd1748b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 挂起记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("suspend_log")
+@ApiModel(value = "SuspendLog对象", description = "挂起记录")
+public class SuspendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    @TableField("SUSPEND_REASON")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    @TableField("SUSPEND_TIME")
+    private String suspendTime;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_PERSON")
+    private String createPerson;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    public SuspendLog() {
+    }
+
+    public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson) {
+        this.alarmId = alarmId;
+        this.suspendReason = suspendReason;
+        this.suspendTime = suspendTime;
+        this.createPerson = createPerson;
+    }
+}
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 812d274..f285f96 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
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 
 /**
@@ -20,6 +22,12 @@
 
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
-    boolean  view(Long id);
+    AlarmRecords  view(Long id);
+
+    boolean  suspend(SuspendDTO suspendDTO);
+
+    boolean  remind(RemindDTO remindDTO);
+
+    boolean  read(Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
new file mode 100644
index 0000000..f711ef8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 审批记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IApprovalLogService extends IService<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
new file mode 100644
index 0000000..683c548
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 提醒记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IRemindLogService extends IService<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
new file mode 100644
index 0000000..b95eeae
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 挂起记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface ISuspendLogService extends IService<SuspendLog> {
+
+}

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
new file mode 100644
index 0000000..fd1748b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 挂起记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("suspend_log")
+@ApiModel(value = "SuspendLog对象", description = "挂起记录")
+public class SuspendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    @TableField("SUSPEND_REASON")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    @TableField("SUSPEND_TIME")
+    private String suspendTime;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_PERSON")
+    private String createPerson;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    public SuspendLog() {
+    }
+
+    public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson) {
+        this.alarmId = alarmId;
+        this.suspendReason = suspendReason;
+        this.suspendTime = suspendTime;
+        this.createPerson = createPerson;
+    }
+}
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 812d274..f285f96 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
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 
 /**
@@ -20,6 +22,12 @@
 
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
-    boolean  view(Long id);
+    AlarmRecords  view(Long id);
+
+    boolean  suspend(SuspendDTO suspendDTO);
+
+    boolean  remind(RemindDTO remindDTO);
+
+    boolean  read(Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
new file mode 100644
index 0000000..f711ef8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 审批记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IApprovalLogService extends IService<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
new file mode 100644
index 0000000..683c548
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 提醒记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IRemindLogService extends IService<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
new file mode 100644
index 0000000..b95eeae
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 挂起记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface ISuspendLogService extends IService<SuspendLog> {
+
+}
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 8e8cfa2..01e1d2f 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
@@ -2,12 +2,27 @@
 
 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.datascope.DataScope;
+import com.casic.missiles.enums.ApprovalStatusEnum;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper;
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+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 lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,24 +32,93 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class AlarmRecordsServiceImpl extends ServiceImpl<AlarmRecordsMapper, AlarmRecords> implements IAlarmRecordsService {
 
+    private final ApprovalLogMapper approvalLogMapper;
+    private final AbstractPermissionContext permissionContext;
+    private final SuspendLogMapper suspendLogMapper;
+    private final RemindLogMapper remindLogMapper;
+
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
 
-        return this.baseMapper.pageList(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        });
+        return alarmRecordsPage;
     }
 
     @Override
     public Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
-
-        return this.baseMapper.historyListPage(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否");
+        });
+        return alarmRecordsPage;
     }
 
     @Override
-    public boolean view(Long id) {
+    public AlarmRecords view(Long id) {
         AlarmRecords alarmRecords = this.baseMapper.view(id);
-        return false;
+        alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        //0：自有，1：自管
+        alarmRecords.setManageType(DictEnum.MANAGE_TYPE.equals(alarmRecords.getManageType()) ? "自有" : "自管");
+        return alarmRecords;
+    }
+
+    @Transactional
+    @Override
+    public boolean suspend(SuspendDTO suspendDTO) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(suspendDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.SUSPEND.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(suspendDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.SUSPEND.getCode()));
+        //3、写入挂起日志表
+        return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(), suspendDTO.getSuspendReason(), suspendDTO.getSuspendTime(), loginPersonName))>0?true:false;
+    }
+
+    @Transactional
+    @Override
+    public boolean read(Long id) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(id);
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.READ.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        return approvalLogMapper.insert( new ApprovalLog(id,"1",permissionContext.getAuthService().getLoginUser().getName(),ApprovalStatusEnum.READ.getCode()))>0?true:false;
+
+    }
+
+
+    @Transactional
+    @Override
+    public boolean remind(RemindDTO remindDTO) {
+        //toDo:1、提醒app推送,需要对接
+        //2、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(remindDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNCONFIRM.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //3、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(remindDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.UNCONFIRM.getCode()));
+        //4、写入提醒日志表
+        return remindLogMapper.insert(RemindLog.builder()
+                .alarmId(remindDTO.getAlarmId())
+                .remindContent(remindDTO.getRemindContent())
+                .remindPerson(remindDTO.getRemindPerson())
+                .telephone(remindDTO.getTelephone())
+                .remindPerson(loginPersonName).build())>0?true:false;
+
     }
 }

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
new file mode 100644
index 0000000..fd1748b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 挂起记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("suspend_log")
+@ApiModel(value = "SuspendLog对象", description = "挂起记录")
+public class SuspendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    @TableField("SUSPEND_REASON")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    @TableField("SUSPEND_TIME")
+    private String suspendTime;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_PERSON")
+    private String createPerson;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    public SuspendLog() {
+    }
+
+    public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson) {
+        this.alarmId = alarmId;
+        this.suspendReason = suspendReason;
+        this.suspendTime = suspendTime;
+        this.createPerson = createPerson;
+    }
+}
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 812d274..f285f96 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
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 
 /**
@@ -20,6 +22,12 @@
 
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
-    boolean  view(Long id);
+    AlarmRecords  view(Long id);
+
+    boolean  suspend(SuspendDTO suspendDTO);
+
+    boolean  remind(RemindDTO remindDTO);
+
+    boolean  read(Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
new file mode 100644
index 0000000..f711ef8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 审批记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IApprovalLogService extends IService<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
new file mode 100644
index 0000000..683c548
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 提醒记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IRemindLogService extends IService<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
new file mode 100644
index 0000000..b95eeae
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 挂起记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface ISuspendLogService extends IService<SuspendLog> {
+
+}
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 8e8cfa2..01e1d2f 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
@@ -2,12 +2,27 @@
 
 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.datascope.DataScope;
+import com.casic.missiles.enums.ApprovalStatusEnum;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper;
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+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 lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,24 +32,93 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class AlarmRecordsServiceImpl extends ServiceImpl<AlarmRecordsMapper, AlarmRecords> implements IAlarmRecordsService {
 
+    private final ApprovalLogMapper approvalLogMapper;
+    private final AbstractPermissionContext permissionContext;
+    private final SuspendLogMapper suspendLogMapper;
+    private final RemindLogMapper remindLogMapper;
+
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
 
-        return this.baseMapper.pageList(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        });
+        return alarmRecordsPage;
     }
 
     @Override
     public Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
-
-        return this.baseMapper.historyListPage(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否");
+        });
+        return alarmRecordsPage;
     }
 
     @Override
-    public boolean view(Long id) {
+    public AlarmRecords view(Long id) {
         AlarmRecords alarmRecords = this.baseMapper.view(id);
-        return false;
+        alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        //0：自有，1：自管
+        alarmRecords.setManageType(DictEnum.MANAGE_TYPE.equals(alarmRecords.getManageType()) ? "自有" : "自管");
+        return alarmRecords;
+    }
+
+    @Transactional
+    @Override
+    public boolean suspend(SuspendDTO suspendDTO) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(suspendDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.SUSPEND.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(suspendDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.SUSPEND.getCode()));
+        //3、写入挂起日志表
+        return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(), suspendDTO.getSuspendReason(), suspendDTO.getSuspendTime(), loginPersonName))>0?true:false;
+    }
+
+    @Transactional
+    @Override
+    public boolean read(Long id) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(id);
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.READ.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        return approvalLogMapper.insert( new ApprovalLog(id,"1",permissionContext.getAuthService().getLoginUser().getName(),ApprovalStatusEnum.READ.getCode()))>0?true:false;
+
+    }
+
+
+    @Transactional
+    @Override
+    public boolean remind(RemindDTO remindDTO) {
+        //toDo:1、提醒app推送,需要对接
+        //2、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(remindDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNCONFIRM.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //3、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(remindDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.UNCONFIRM.getCode()));
+        //4、写入提醒日志表
+        return remindLogMapper.insert(RemindLog.builder()
+                .alarmId(remindDTO.getAlarmId())
+                .remindContent(remindDTO.getRemindContent())
+                .remindPerson(remindDTO.getRemindPerson())
+                .telephone(remindDTO.getTelephone())
+                .remindPerson(loginPersonName).build())>0?true:false;
+
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
index 8d21055..0bd5b9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -12,7 +11,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
new file mode 100644
index 0000000..fd1748b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 挂起记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("suspend_log")
+@ApiModel(value = "SuspendLog对象", description = "挂起记录")
+public class SuspendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    @TableField("SUSPEND_REASON")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    @TableField("SUSPEND_TIME")
+    private String suspendTime;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_PERSON")
+    private String createPerson;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    public SuspendLog() {
+    }
+
+    public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson) {
+        this.alarmId = alarmId;
+        this.suspendReason = suspendReason;
+        this.suspendTime = suspendTime;
+        this.createPerson = createPerson;
+    }
+}
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 812d274..f285f96 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
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 
 /**
@@ -20,6 +22,12 @@
 
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
-    boolean  view(Long id);
+    AlarmRecords  view(Long id);
+
+    boolean  suspend(SuspendDTO suspendDTO);
+
+    boolean  remind(RemindDTO remindDTO);
+
+    boolean  read(Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
new file mode 100644
index 0000000..f711ef8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 审批记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IApprovalLogService extends IService<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
new file mode 100644
index 0000000..683c548
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 提醒记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IRemindLogService extends IService<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
new file mode 100644
index 0000000..b95eeae
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 挂起记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface ISuspendLogService extends IService<SuspendLog> {
+
+}
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 8e8cfa2..01e1d2f 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
@@ -2,12 +2,27 @@
 
 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.datascope.DataScope;
+import com.casic.missiles.enums.ApprovalStatusEnum;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper;
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+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 lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,24 +32,93 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class AlarmRecordsServiceImpl extends ServiceImpl<AlarmRecordsMapper, AlarmRecords> implements IAlarmRecordsService {
 
+    private final ApprovalLogMapper approvalLogMapper;
+    private final AbstractPermissionContext permissionContext;
+    private final SuspendLogMapper suspendLogMapper;
+    private final RemindLogMapper remindLogMapper;
+
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
 
-        return this.baseMapper.pageList(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        });
+        return alarmRecordsPage;
     }
 
     @Override
     public Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
-
-        return this.baseMapper.historyListPage(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否");
+        });
+        return alarmRecordsPage;
     }
 
     @Override
-    public boolean view(Long id) {
+    public AlarmRecords view(Long id) {
         AlarmRecords alarmRecords = this.baseMapper.view(id);
-        return false;
+        alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        //0：自有，1：自管
+        alarmRecords.setManageType(DictEnum.MANAGE_TYPE.equals(alarmRecords.getManageType()) ? "自有" : "自管");
+        return alarmRecords;
+    }
+
+    @Transactional
+    @Override
+    public boolean suspend(SuspendDTO suspendDTO) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(suspendDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.SUSPEND.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(suspendDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.SUSPEND.getCode()));
+        //3、写入挂起日志表
+        return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(), suspendDTO.getSuspendReason(), suspendDTO.getSuspendTime(), loginPersonName))>0?true:false;
+    }
+
+    @Transactional
+    @Override
+    public boolean read(Long id) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(id);
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.READ.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        return approvalLogMapper.insert( new ApprovalLog(id,"1",permissionContext.getAuthService().getLoginUser().getName(),ApprovalStatusEnum.READ.getCode()))>0?true:false;
+
+    }
+
+
+    @Transactional
+    @Override
+    public boolean remind(RemindDTO remindDTO) {
+        //toDo:1、提醒app推送,需要对接
+        //2、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(remindDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNCONFIRM.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //3、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(remindDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.UNCONFIRM.getCode()));
+        //4、写入提醒日志表
+        return remindLogMapper.insert(RemindLog.builder()
+                .alarmId(remindDTO.getAlarmId())
+                .remindContent(remindDTO.getRemindContent())
+                .remindPerson(remindDTO.getRemindPerson())
+                .telephone(remindDTO.getTelephone())
+                .remindPerson(loginPersonName).build())>0?true:false;
+
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
index 8d21055..0bd5b9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -12,7 +11,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
new file mode 100644
index 0000000..3cf81e5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.service.IApprovalLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 审批记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class ApprovalLogServiceImpl extends ServiceImpl<ApprovalLogMapper, ApprovalLog> implements IApprovalLogService {
+
+}

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
new file mode 100644
index 0000000..fd1748b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 挂起记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("suspend_log")
+@ApiModel(value = "SuspendLog对象", description = "挂起记录")
+public class SuspendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    @TableField("SUSPEND_REASON")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    @TableField("SUSPEND_TIME")
+    private String suspendTime;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_PERSON")
+    private String createPerson;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    public SuspendLog() {
+    }
+
+    public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson) {
+        this.alarmId = alarmId;
+        this.suspendReason = suspendReason;
+        this.suspendTime = suspendTime;
+        this.createPerson = createPerson;
+    }
+}
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 812d274..f285f96 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
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 
 /**
@@ -20,6 +22,12 @@
 
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
-    boolean  view(Long id);
+    AlarmRecords  view(Long id);
+
+    boolean  suspend(SuspendDTO suspendDTO);
+
+    boolean  remind(RemindDTO remindDTO);
+
+    boolean  read(Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
new file mode 100644
index 0000000..f711ef8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 审批记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IApprovalLogService extends IService<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
new file mode 100644
index 0000000..683c548
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 提醒记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IRemindLogService extends IService<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
new file mode 100644
index 0000000..b95eeae
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 挂起记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface ISuspendLogService extends IService<SuspendLog> {
+
+}
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 8e8cfa2..01e1d2f 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
@@ -2,12 +2,27 @@
 
 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.datascope.DataScope;
+import com.casic.missiles.enums.ApprovalStatusEnum;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper;
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+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 lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,24 +32,93 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class AlarmRecordsServiceImpl extends ServiceImpl<AlarmRecordsMapper, AlarmRecords> implements IAlarmRecordsService {
 
+    private final ApprovalLogMapper approvalLogMapper;
+    private final AbstractPermissionContext permissionContext;
+    private final SuspendLogMapper suspendLogMapper;
+    private final RemindLogMapper remindLogMapper;
+
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
 
-        return this.baseMapper.pageList(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        });
+        return alarmRecordsPage;
     }
 
     @Override
     public Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
-
-        return this.baseMapper.historyListPage(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否");
+        });
+        return alarmRecordsPage;
     }
 
     @Override
-    public boolean view(Long id) {
+    public AlarmRecords view(Long id) {
         AlarmRecords alarmRecords = this.baseMapper.view(id);
-        return false;
+        alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        //0：自有，1：自管
+        alarmRecords.setManageType(DictEnum.MANAGE_TYPE.equals(alarmRecords.getManageType()) ? "自有" : "自管");
+        return alarmRecords;
+    }
+
+    @Transactional
+    @Override
+    public boolean suspend(SuspendDTO suspendDTO) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(suspendDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.SUSPEND.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(suspendDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.SUSPEND.getCode()));
+        //3、写入挂起日志表
+        return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(), suspendDTO.getSuspendReason(), suspendDTO.getSuspendTime(), loginPersonName))>0?true:false;
+    }
+
+    @Transactional
+    @Override
+    public boolean read(Long id) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(id);
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.READ.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        return approvalLogMapper.insert( new ApprovalLog(id,"1",permissionContext.getAuthService().getLoginUser().getName(),ApprovalStatusEnum.READ.getCode()))>0?true:false;
+
+    }
+
+
+    @Transactional
+    @Override
+    public boolean remind(RemindDTO remindDTO) {
+        //toDo:1、提醒app推送,需要对接
+        //2、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(remindDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNCONFIRM.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //3、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(remindDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.UNCONFIRM.getCode()));
+        //4、写入提醒日志表
+        return remindLogMapper.insert(RemindLog.builder()
+                .alarmId(remindDTO.getAlarmId())
+                .remindContent(remindDTO.getRemindContent())
+                .remindPerson(remindDTO.getRemindPerson())
+                .telephone(remindDTO.getTelephone())
+                .remindPerson(loginPersonName).build())>0?true:false;
+
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
index 8d21055..0bd5b9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -12,7 +11,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
new file mode 100644
index 0000000..3cf81e5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.service.IApprovalLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 审批记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class ApprovalLogServiceImpl extends ServiceImpl<ApprovalLogMapper, ApprovalLog> implements IApprovalLogService {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java
new file mode 100644
index 0000000..56ebe22
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.casic.missiles.modular.alarm.service.IRemindLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 提醒记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class RemindLogServiceImpl extends ServiceImpl<RemindLogMapper, RemindLog> implements IRemindLogService {
+
+}

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
new file mode 100644
index 0000000..fd1748b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 挂起记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("suspend_log")
+@ApiModel(value = "SuspendLog对象", description = "挂起记录")
+public class SuspendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    @TableField("SUSPEND_REASON")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    @TableField("SUSPEND_TIME")
+    private String suspendTime;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_PERSON")
+    private String createPerson;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    public SuspendLog() {
+    }
+
+    public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson) {
+        this.alarmId = alarmId;
+        this.suspendReason = suspendReason;
+        this.suspendTime = suspendTime;
+        this.createPerson = createPerson;
+    }
+}
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 812d274..f285f96 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
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 
 /**
@@ -20,6 +22,12 @@
 
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
-    boolean  view(Long id);
+    AlarmRecords  view(Long id);
+
+    boolean  suspend(SuspendDTO suspendDTO);
+
+    boolean  remind(RemindDTO remindDTO);
+
+    boolean  read(Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
new file mode 100644
index 0000000..f711ef8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 审批记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IApprovalLogService extends IService<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
new file mode 100644
index 0000000..683c548
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 提醒记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IRemindLogService extends IService<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
new file mode 100644
index 0000000..b95eeae
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 挂起记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface ISuspendLogService extends IService<SuspendLog> {
+
+}
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 8e8cfa2..01e1d2f 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
@@ -2,12 +2,27 @@
 
 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.datascope.DataScope;
+import com.casic.missiles.enums.ApprovalStatusEnum;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper;
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+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 lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,24 +32,93 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class AlarmRecordsServiceImpl extends ServiceImpl<AlarmRecordsMapper, AlarmRecords> implements IAlarmRecordsService {
 
+    private final ApprovalLogMapper approvalLogMapper;
+    private final AbstractPermissionContext permissionContext;
+    private final SuspendLogMapper suspendLogMapper;
+    private final RemindLogMapper remindLogMapper;
+
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
 
-        return this.baseMapper.pageList(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        });
+        return alarmRecordsPage;
     }
 
     @Override
     public Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
-
-        return this.baseMapper.historyListPage(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否");
+        });
+        return alarmRecordsPage;
     }
 
     @Override
-    public boolean view(Long id) {
+    public AlarmRecords view(Long id) {
         AlarmRecords alarmRecords = this.baseMapper.view(id);
-        return false;
+        alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        //0：自有，1：自管
+        alarmRecords.setManageType(DictEnum.MANAGE_TYPE.equals(alarmRecords.getManageType()) ? "自有" : "自管");
+        return alarmRecords;
+    }
+
+    @Transactional
+    @Override
+    public boolean suspend(SuspendDTO suspendDTO) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(suspendDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.SUSPEND.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(suspendDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.SUSPEND.getCode()));
+        //3、写入挂起日志表
+        return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(), suspendDTO.getSuspendReason(), suspendDTO.getSuspendTime(), loginPersonName))>0?true:false;
+    }
+
+    @Transactional
+    @Override
+    public boolean read(Long id) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(id);
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.READ.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        return approvalLogMapper.insert( new ApprovalLog(id,"1",permissionContext.getAuthService().getLoginUser().getName(),ApprovalStatusEnum.READ.getCode()))>0?true:false;
+
+    }
+
+
+    @Transactional
+    @Override
+    public boolean remind(RemindDTO remindDTO) {
+        //toDo:1、提醒app推送,需要对接
+        //2、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(remindDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNCONFIRM.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //3、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(remindDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.UNCONFIRM.getCode()));
+        //4、写入提醒日志表
+        return remindLogMapper.insert(RemindLog.builder()
+                .alarmId(remindDTO.getAlarmId())
+                .remindContent(remindDTO.getRemindContent())
+                .remindPerson(remindDTO.getRemindPerson())
+                .telephone(remindDTO.getTelephone())
+                .remindPerson(loginPersonName).build())>0?true:false;
+
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
index 8d21055..0bd5b9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -12,7 +11,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
new file mode 100644
index 0000000..3cf81e5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.service.IApprovalLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 审批记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class ApprovalLogServiceImpl extends ServiceImpl<ApprovalLogMapper, ApprovalLog> implements IApprovalLogService {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java
new file mode 100644
index 0000000..56ebe22
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.casic.missiles.modular.alarm.service.IRemindLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 提醒记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class RemindLogServiceImpl extends ServiceImpl<RemindLogMapper, RemindLog> implements IRemindLogService {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java
new file mode 100644
index 0000000..7225cff
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.casic.missiles.modular.alarm.service.ISuspendLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 挂起记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class SuspendLogServiceImpl extends ServiceImpl<SuspendLogMapper, SuspendLog> implements ISuspendLogService {
+
+}

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
new file mode 100644
index 0000000..fd1748b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 挂起记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("suspend_log")
+@ApiModel(value = "SuspendLog对象", description = "挂起记录")
+public class SuspendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    @TableField("SUSPEND_REASON")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    @TableField("SUSPEND_TIME")
+    private String suspendTime;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_PERSON")
+    private String createPerson;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    public SuspendLog() {
+    }
+
+    public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson) {
+        this.alarmId = alarmId;
+        this.suspendReason = suspendReason;
+        this.suspendTime = suspendTime;
+        this.createPerson = createPerson;
+    }
+}
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 812d274..f285f96 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
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 
 /**
@@ -20,6 +22,12 @@
 
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
-    boolean  view(Long id);
+    AlarmRecords  view(Long id);
+
+    boolean  suspend(SuspendDTO suspendDTO);
+
+    boolean  remind(RemindDTO remindDTO);
+
+    boolean  read(Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
new file mode 100644
index 0000000..f711ef8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 审批记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IApprovalLogService extends IService<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
new file mode 100644
index 0000000..683c548
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 提醒记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IRemindLogService extends IService<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
new file mode 100644
index 0000000..b95eeae
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 挂起记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface ISuspendLogService extends IService<SuspendLog> {
+
+}
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 8e8cfa2..01e1d2f 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
@@ -2,12 +2,27 @@
 
 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.datascope.DataScope;
+import com.casic.missiles.enums.ApprovalStatusEnum;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper;
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+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 lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,24 +32,93 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class AlarmRecordsServiceImpl extends ServiceImpl<AlarmRecordsMapper, AlarmRecords> implements IAlarmRecordsService {
 
+    private final ApprovalLogMapper approvalLogMapper;
+    private final AbstractPermissionContext permissionContext;
+    private final SuspendLogMapper suspendLogMapper;
+    private final RemindLogMapper remindLogMapper;
+
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
 
-        return this.baseMapper.pageList(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        });
+        return alarmRecordsPage;
     }
 
     @Override
     public Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
-
-        return this.baseMapper.historyListPage(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否");
+        });
+        return alarmRecordsPage;
     }
 
     @Override
-    public boolean view(Long id) {
+    public AlarmRecords view(Long id) {
         AlarmRecords alarmRecords = this.baseMapper.view(id);
-        return false;
+        alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        //0：自有，1：自管
+        alarmRecords.setManageType(DictEnum.MANAGE_TYPE.equals(alarmRecords.getManageType()) ? "自有" : "自管");
+        return alarmRecords;
+    }
+
+    @Transactional
+    @Override
+    public boolean suspend(SuspendDTO suspendDTO) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(suspendDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.SUSPEND.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(suspendDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.SUSPEND.getCode()));
+        //3、写入挂起日志表
+        return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(), suspendDTO.getSuspendReason(), suspendDTO.getSuspendTime(), loginPersonName))>0?true:false;
+    }
+
+    @Transactional
+    @Override
+    public boolean read(Long id) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(id);
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.READ.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        return approvalLogMapper.insert( new ApprovalLog(id,"1",permissionContext.getAuthService().getLoginUser().getName(),ApprovalStatusEnum.READ.getCode()))>0?true:false;
+
+    }
+
+
+    @Transactional
+    @Override
+    public boolean remind(RemindDTO remindDTO) {
+        //toDo:1、提醒app推送,需要对接
+        //2、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(remindDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNCONFIRM.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //3、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(remindDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.UNCONFIRM.getCode()));
+        //4、写入提醒日志表
+        return remindLogMapper.insert(RemindLog.builder()
+                .alarmId(remindDTO.getAlarmId())
+                .remindContent(remindDTO.getRemindContent())
+                .remindPerson(remindDTO.getRemindPerson())
+                .telephone(remindDTO.getTelephone())
+                .remindPerson(loginPersonName).build())>0?true:false;
+
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
index 8d21055..0bd5b9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -12,7 +11,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
new file mode 100644
index 0000000..3cf81e5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.service.IApprovalLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 审批记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class ApprovalLogServiceImpl extends ServiceImpl<ApprovalLogMapper, ApprovalLog> implements IApprovalLogService {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java
new file mode 100644
index 0000000..56ebe22
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.casic.missiles.modular.alarm.service.IRemindLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 提醒记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class RemindLogServiceImpl extends ServiceImpl<RemindLogMapper, RemindLog> implements IRemindLogService {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java
new file mode 100644
index 0000000..7225cff
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.casic.missiles.modular.alarm.service.ISuspendLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 挂起记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class SuspendLogServiceImpl extends ServiceImpl<SuspendLogMapper, SuspendLog> implements ISuspendLogService {
+
+}
diff --git a/casic-data/pom.xml b/casic-data/pom.xml
index 3195876..9eb9b59 100644
--- a/casic-data/pom.xml
+++ b/casic-data/pom.xml
@@ -40,7 +40,12 @@
             <version>2.4.5</version>
         </dependency>
 
-
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.18</version>
+            <scope>compile</scope>
+        </dependency>
         <!--其他-->
 
         <dependency>

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
new file mode 100644
index 0000000..fd1748b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 挂起记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("suspend_log")
+@ApiModel(value = "SuspendLog对象", description = "挂起记录")
+public class SuspendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    @TableField("SUSPEND_REASON")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    @TableField("SUSPEND_TIME")
+    private String suspendTime;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_PERSON")
+    private String createPerson;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    public SuspendLog() {
+    }
+
+    public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson) {
+        this.alarmId = alarmId;
+        this.suspendReason = suspendReason;
+        this.suspendTime = suspendTime;
+        this.createPerson = createPerson;
+    }
+}
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 812d274..f285f96 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
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 
 /**
@@ -20,6 +22,12 @@
 
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
-    boolean  view(Long id);
+    AlarmRecords  view(Long id);
+
+    boolean  suspend(SuspendDTO suspendDTO);
+
+    boolean  remind(RemindDTO remindDTO);
+
+    boolean  read(Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
new file mode 100644
index 0000000..f711ef8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 审批记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IApprovalLogService extends IService<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
new file mode 100644
index 0000000..683c548
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 提醒记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IRemindLogService extends IService<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
new file mode 100644
index 0000000..b95eeae
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 挂起记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface ISuspendLogService extends IService<SuspendLog> {
+
+}
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 8e8cfa2..01e1d2f 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
@@ -2,12 +2,27 @@
 
 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.datascope.DataScope;
+import com.casic.missiles.enums.ApprovalStatusEnum;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper;
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+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 lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,24 +32,93 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class AlarmRecordsServiceImpl extends ServiceImpl<AlarmRecordsMapper, AlarmRecords> implements IAlarmRecordsService {
 
+    private final ApprovalLogMapper approvalLogMapper;
+    private final AbstractPermissionContext permissionContext;
+    private final SuspendLogMapper suspendLogMapper;
+    private final RemindLogMapper remindLogMapper;
+
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
 
-        return this.baseMapper.pageList(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        });
+        return alarmRecordsPage;
     }
 
     @Override
     public Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
-
-        return this.baseMapper.historyListPage(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否");
+        });
+        return alarmRecordsPage;
     }
 
     @Override
-    public boolean view(Long id) {
+    public AlarmRecords view(Long id) {
         AlarmRecords alarmRecords = this.baseMapper.view(id);
-        return false;
+        alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        //0：自有，1：自管
+        alarmRecords.setManageType(DictEnum.MANAGE_TYPE.equals(alarmRecords.getManageType()) ? "自有" : "自管");
+        return alarmRecords;
+    }
+
+    @Transactional
+    @Override
+    public boolean suspend(SuspendDTO suspendDTO) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(suspendDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.SUSPEND.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(suspendDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.SUSPEND.getCode()));
+        //3、写入挂起日志表
+        return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(), suspendDTO.getSuspendReason(), suspendDTO.getSuspendTime(), loginPersonName))>0?true:false;
+    }
+
+    @Transactional
+    @Override
+    public boolean read(Long id) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(id);
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.READ.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        return approvalLogMapper.insert( new ApprovalLog(id,"1",permissionContext.getAuthService().getLoginUser().getName(),ApprovalStatusEnum.READ.getCode()))>0?true:false;
+
+    }
+
+
+    @Transactional
+    @Override
+    public boolean remind(RemindDTO remindDTO) {
+        //toDo:1、提醒app推送,需要对接
+        //2、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(remindDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNCONFIRM.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //3、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(remindDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.UNCONFIRM.getCode()));
+        //4、写入提醒日志表
+        return remindLogMapper.insert(RemindLog.builder()
+                .alarmId(remindDTO.getAlarmId())
+                .remindContent(remindDTO.getRemindContent())
+                .remindPerson(remindDTO.getRemindPerson())
+                .telephone(remindDTO.getTelephone())
+                .remindPerson(loginPersonName).build())>0?true:false;
+
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
index 8d21055..0bd5b9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -12,7 +11,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
new file mode 100644
index 0000000..3cf81e5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.service.IApprovalLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 审批记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class ApprovalLogServiceImpl extends ServiceImpl<ApprovalLogMapper, ApprovalLog> implements IApprovalLogService {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java
new file mode 100644
index 0000000..56ebe22
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.casic.missiles.modular.alarm.service.IRemindLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 提醒记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class RemindLogServiceImpl extends ServiceImpl<RemindLogMapper, RemindLog> implements IRemindLogService {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java
new file mode 100644
index 0000000..7225cff
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.casic.missiles.modular.alarm.service.ISuspendLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 挂起记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class SuspendLogServiceImpl extends ServiceImpl<SuspendLogMapper, SuspendLog> implements ISuspendLogService {
+
+}
diff --git a/casic-data/pom.xml b/casic-data/pom.xml
index 3195876..9eb9b59 100644
--- a/casic-data/pom.xml
+++ b/casic-data/pom.xml
@@ -40,7 +40,12 @@
             <version>2.4.5</version>
         </dependency>
 
-
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.18</version>
+            <scope>compile</scope>
+        </dependency>
         <!--其他-->
 
         <dependency>
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java
index f817b78..0212e42 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java
@@ -2,22 +2,43 @@
 
 //1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置
 
-public interface ApprovalStatusEnum {
-    String PROCESS_STATUS = "processStatus";
-    //未读
-    String UNREAD = "1";
-    //已读
-    String READ = "2";
-    //挂起
-    String SUSPEND = "3";
-    //待现场确认
-    String UNCONFIRM = "4";
-    //已确认
-    String CONFIRMED = "5";
-    //待处置
-    String UNPROCESS = "6";
-    //已处置
-    String PROCESSED = "7";
-    //删除
-    String DELETED = "8";
+public enum ApprovalStatusEnum {
+
+    UNREAD("1", "未读"),
+    READ("2", "已读"),
+    SUSPEND("3", "挂起"),
+    UNCONFIRM("4", "待现场确认"),
+    CONFIRMED("5", "已确认"),
+    UNPROCESS("6", "待处置"),
+    PROCESSED("7", "已处置"),
+    DELETED("8", "删除");
+
+    private String code;
+    private String value;
+
+    ApprovalStatusEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+
+    public static String getValue(String code){
+        for(ApprovalStatusEnum approvalStatusEnum :values()){
+            if(approvalStatusEnum.code.equals(code)){
+                return approvalStatusEnum.value;
+            }
+        }
+        return "";
+    }
+
+
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
 }

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
new file mode 100644
index 0000000..fd1748b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 挂起记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("suspend_log")
+@ApiModel(value = "SuspendLog对象", description = "挂起记录")
+public class SuspendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    @TableField("SUSPEND_REASON")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    @TableField("SUSPEND_TIME")
+    private String suspendTime;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_PERSON")
+    private String createPerson;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    public SuspendLog() {
+    }
+
+    public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson) {
+        this.alarmId = alarmId;
+        this.suspendReason = suspendReason;
+        this.suspendTime = suspendTime;
+        this.createPerson = createPerson;
+    }
+}
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 812d274..f285f96 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
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 
 /**
@@ -20,6 +22,12 @@
 
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
-    boolean  view(Long id);
+    AlarmRecords  view(Long id);
+
+    boolean  suspend(SuspendDTO suspendDTO);
+
+    boolean  remind(RemindDTO remindDTO);
+
+    boolean  read(Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
new file mode 100644
index 0000000..f711ef8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 审批记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IApprovalLogService extends IService<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
new file mode 100644
index 0000000..683c548
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 提醒记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IRemindLogService extends IService<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
new file mode 100644
index 0000000..b95eeae
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 挂起记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface ISuspendLogService extends IService<SuspendLog> {
+
+}
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 8e8cfa2..01e1d2f 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
@@ -2,12 +2,27 @@
 
 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.datascope.DataScope;
+import com.casic.missiles.enums.ApprovalStatusEnum;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper;
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+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 lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,24 +32,93 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class AlarmRecordsServiceImpl extends ServiceImpl<AlarmRecordsMapper, AlarmRecords> implements IAlarmRecordsService {
 
+    private final ApprovalLogMapper approvalLogMapper;
+    private final AbstractPermissionContext permissionContext;
+    private final SuspendLogMapper suspendLogMapper;
+    private final RemindLogMapper remindLogMapper;
+
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
 
-        return this.baseMapper.pageList(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        });
+        return alarmRecordsPage;
     }
 
     @Override
     public Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
-
-        return this.baseMapper.historyListPage(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否");
+        });
+        return alarmRecordsPage;
     }
 
     @Override
-    public boolean view(Long id) {
+    public AlarmRecords view(Long id) {
         AlarmRecords alarmRecords = this.baseMapper.view(id);
-        return false;
+        alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        //0：自有，1：自管
+        alarmRecords.setManageType(DictEnum.MANAGE_TYPE.equals(alarmRecords.getManageType()) ? "自有" : "自管");
+        return alarmRecords;
+    }
+
+    @Transactional
+    @Override
+    public boolean suspend(SuspendDTO suspendDTO) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(suspendDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.SUSPEND.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(suspendDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.SUSPEND.getCode()));
+        //3、写入挂起日志表
+        return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(), suspendDTO.getSuspendReason(), suspendDTO.getSuspendTime(), loginPersonName))>0?true:false;
+    }
+
+    @Transactional
+    @Override
+    public boolean read(Long id) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(id);
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.READ.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        return approvalLogMapper.insert( new ApprovalLog(id,"1",permissionContext.getAuthService().getLoginUser().getName(),ApprovalStatusEnum.READ.getCode()))>0?true:false;
+
+    }
+
+
+    @Transactional
+    @Override
+    public boolean remind(RemindDTO remindDTO) {
+        //toDo:1、提醒app推送,需要对接
+        //2、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(remindDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNCONFIRM.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //3、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(remindDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.UNCONFIRM.getCode()));
+        //4、写入提醒日志表
+        return remindLogMapper.insert(RemindLog.builder()
+                .alarmId(remindDTO.getAlarmId())
+                .remindContent(remindDTO.getRemindContent())
+                .remindPerson(remindDTO.getRemindPerson())
+                .telephone(remindDTO.getTelephone())
+                .remindPerson(loginPersonName).build())>0?true:false;
+
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
index 8d21055..0bd5b9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -12,7 +11,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
new file mode 100644
index 0000000..3cf81e5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.service.IApprovalLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 审批记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class ApprovalLogServiceImpl extends ServiceImpl<ApprovalLogMapper, ApprovalLog> implements IApprovalLogService {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java
new file mode 100644
index 0000000..56ebe22
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.casic.missiles.modular.alarm.service.IRemindLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 提醒记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class RemindLogServiceImpl extends ServiceImpl<RemindLogMapper, RemindLog> implements IRemindLogService {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java
new file mode 100644
index 0000000..7225cff
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.casic.missiles.modular.alarm.service.ISuspendLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 挂起记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class SuspendLogServiceImpl extends ServiceImpl<SuspendLogMapper, SuspendLog> implements ISuspendLogService {
+
+}
diff --git a/casic-data/pom.xml b/casic-data/pom.xml
index 3195876..9eb9b59 100644
--- a/casic-data/pom.xml
+++ b/casic-data/pom.xml
@@ -40,7 +40,12 @@
             <version>2.4.5</version>
         </dependency>
 
-
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.18</version>
+            <scope>compile</scope>
+        </dependency>
         <!--其他-->
 
         <dependency>
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java
index f817b78..0212e42 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java
@@ -2,22 +2,43 @@
 
 //1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置
 
-public interface ApprovalStatusEnum {
-    String PROCESS_STATUS = "processStatus";
-    //未读
-    String UNREAD = "1";
-    //已读
-    String READ = "2";
-    //挂起
-    String SUSPEND = "3";
-    //待现场确认
-    String UNCONFIRM = "4";
-    //已确认
-    String CONFIRMED = "5";
-    //待处置
-    String UNPROCESS = "6";
-    //已处置
-    String PROCESSED = "7";
-    //删除
-    String DELETED = "8";
+public enum ApprovalStatusEnum {
+
+    UNREAD("1", "未读"),
+    READ("2", "已读"),
+    SUSPEND("3", "挂起"),
+    UNCONFIRM("4", "待现场确认"),
+    CONFIRMED("5", "已确认"),
+    UNPROCESS("6", "待处置"),
+    PROCESSED("7", "已处置"),
+    DELETED("8", "删除");
+
+    private String code;
+    private String value;
+
+    ApprovalStatusEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+
+    public static String getValue(String code){
+        for(ApprovalStatusEnum approvalStatusEnum :values()){
+            if(approvalStatusEnum.code.equals(code)){
+                return approvalStatusEnum.value;
+            }
+        }
+        return "";
+    }
+
+
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
 }
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java
index 97f6cfc..8262ca9 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java
@@ -48,4 +48,10 @@
     String IS_USED= "1";
     //监控对象
     String WATCH_OBJECT= "watchObject";
+    //误报
+    String REAL_ALARM= "0";
+    //0：自有，1：自管
+    String MANAGE_TYPE= "0";
+
+
 }

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
new file mode 100644
index 0000000..fd1748b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 挂起记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("suspend_log")
+@ApiModel(value = "SuspendLog对象", description = "挂起记录")
+public class SuspendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    @TableField("SUSPEND_REASON")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    @TableField("SUSPEND_TIME")
+    private String suspendTime;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_PERSON")
+    private String createPerson;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    public SuspendLog() {
+    }
+
+    public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson) {
+        this.alarmId = alarmId;
+        this.suspendReason = suspendReason;
+        this.suspendTime = suspendTime;
+        this.createPerson = createPerson;
+    }
+}
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 812d274..f285f96 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
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 
 /**
@@ -20,6 +22,12 @@
 
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
-    boolean  view(Long id);
+    AlarmRecords  view(Long id);
+
+    boolean  suspend(SuspendDTO suspendDTO);
+
+    boolean  remind(RemindDTO remindDTO);
+
+    boolean  read(Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
new file mode 100644
index 0000000..f711ef8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 审批记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IApprovalLogService extends IService<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
new file mode 100644
index 0000000..683c548
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 提醒记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IRemindLogService extends IService<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
new file mode 100644
index 0000000..b95eeae
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 挂起记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface ISuspendLogService extends IService<SuspendLog> {
+
+}
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 8e8cfa2..01e1d2f 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
@@ -2,12 +2,27 @@
 
 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.datascope.DataScope;
+import com.casic.missiles.enums.ApprovalStatusEnum;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper;
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+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 lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,24 +32,93 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class AlarmRecordsServiceImpl extends ServiceImpl<AlarmRecordsMapper, AlarmRecords> implements IAlarmRecordsService {
 
+    private final ApprovalLogMapper approvalLogMapper;
+    private final AbstractPermissionContext permissionContext;
+    private final SuspendLogMapper suspendLogMapper;
+    private final RemindLogMapper remindLogMapper;
+
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
 
-        return this.baseMapper.pageList(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        });
+        return alarmRecordsPage;
     }
 
     @Override
     public Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
-
-        return this.baseMapper.historyListPage(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否");
+        });
+        return alarmRecordsPage;
     }
 
     @Override
-    public boolean view(Long id) {
+    public AlarmRecords view(Long id) {
         AlarmRecords alarmRecords = this.baseMapper.view(id);
-        return false;
+        alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        //0：自有，1：自管
+        alarmRecords.setManageType(DictEnum.MANAGE_TYPE.equals(alarmRecords.getManageType()) ? "自有" : "自管");
+        return alarmRecords;
+    }
+
+    @Transactional
+    @Override
+    public boolean suspend(SuspendDTO suspendDTO) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(suspendDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.SUSPEND.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(suspendDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.SUSPEND.getCode()));
+        //3、写入挂起日志表
+        return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(), suspendDTO.getSuspendReason(), suspendDTO.getSuspendTime(), loginPersonName))>0?true:false;
+    }
+
+    @Transactional
+    @Override
+    public boolean read(Long id) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(id);
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.READ.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        return approvalLogMapper.insert( new ApprovalLog(id,"1",permissionContext.getAuthService().getLoginUser().getName(),ApprovalStatusEnum.READ.getCode()))>0?true:false;
+
+    }
+
+
+    @Transactional
+    @Override
+    public boolean remind(RemindDTO remindDTO) {
+        //toDo:1、提醒app推送,需要对接
+        //2、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(remindDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNCONFIRM.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //3、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(remindDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.UNCONFIRM.getCode()));
+        //4、写入提醒日志表
+        return remindLogMapper.insert(RemindLog.builder()
+                .alarmId(remindDTO.getAlarmId())
+                .remindContent(remindDTO.getRemindContent())
+                .remindPerson(remindDTO.getRemindPerson())
+                .telephone(remindDTO.getTelephone())
+                .remindPerson(loginPersonName).build())>0?true:false;
+
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
index 8d21055..0bd5b9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -12,7 +11,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
new file mode 100644
index 0000000..3cf81e5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.service.IApprovalLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 审批记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class ApprovalLogServiceImpl extends ServiceImpl<ApprovalLogMapper, ApprovalLog> implements IApprovalLogService {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java
new file mode 100644
index 0000000..56ebe22
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.casic.missiles.modular.alarm.service.IRemindLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 提醒记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class RemindLogServiceImpl extends ServiceImpl<RemindLogMapper, RemindLog> implements IRemindLogService {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java
new file mode 100644
index 0000000..7225cff
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.casic.missiles.modular.alarm.service.ISuspendLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 挂起记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class SuspendLogServiceImpl extends ServiceImpl<SuspendLogMapper, SuspendLog> implements ISuspendLogService {
+
+}
diff --git a/casic-data/pom.xml b/casic-data/pom.xml
index 3195876..9eb9b59 100644
--- a/casic-data/pom.xml
+++ b/casic-data/pom.xml
@@ -40,7 +40,12 @@
             <version>2.4.5</version>
         </dependency>
 
-
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.18</version>
+            <scope>compile</scope>
+        </dependency>
         <!--其他-->
 
         <dependency>
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java
index f817b78..0212e42 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java
@@ -2,22 +2,43 @@
 
 //1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置
 
-public interface ApprovalStatusEnum {
-    String PROCESS_STATUS = "processStatus";
-    //未读
-    String UNREAD = "1";
-    //已读
-    String READ = "2";
-    //挂起
-    String SUSPEND = "3";
-    //待现场确认
-    String UNCONFIRM = "4";
-    //已确认
-    String CONFIRMED = "5";
-    //待处置
-    String UNPROCESS = "6";
-    //已处置
-    String PROCESSED = "7";
-    //删除
-    String DELETED = "8";
+public enum ApprovalStatusEnum {
+
+    UNREAD("1", "未读"),
+    READ("2", "已读"),
+    SUSPEND("3", "挂起"),
+    UNCONFIRM("4", "待现场确认"),
+    CONFIRMED("5", "已确认"),
+    UNPROCESS("6", "待处置"),
+    PROCESSED("7", "已处置"),
+    DELETED("8", "删除");
+
+    private String code;
+    private String value;
+
+    ApprovalStatusEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+
+    public static String getValue(String code){
+        for(ApprovalStatusEnum approvalStatusEnum :values()){
+            if(approvalStatusEnum.code.equals(code)){
+                return approvalStatusEnum.value;
+            }
+        }
+        return "";
+    }
+
+
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
 }
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java
index 97f6cfc..8262ca9 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java
@@ -48,4 +48,10 @@
     String IS_USED= "1";
     //监控对象
     String WATCH_OBJECT= "watchObject";
+    //误报
+    String REAL_ALARM= "0";
+    //0：自有，1：自管
+    String MANAGE_TYPE= "0";
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java
index 96b8c6e..3fc108a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java
@@ -65,8 +65,8 @@
 
                 //策略配置
                 .strategyConfig(builder -> {
-                    builder.addInclude("alarm_type_devicetype") // 设置需要生成的表名
-                            .addTablePrefix("alarm_") // 设置过滤表前缀
+                    builder.addInclude("approval_log","suspend_log","remind_log") // 设置需要生成的表名
+                            .addTablePrefix() // 设置过滤表前缀
                             .entityBuilder() //实体类配置
                             .enableLombok() //使用lombok
                             .enableTableFieldAnnotation()//实体类字段注解

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 3bb3564..77a299c 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
@@ -14,6 +14,8 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -92,5 +94,35 @@
         });
         return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
     }
+
+    @ApiOperation("挂起")
+    @PostMapping("/suspend")
+    @ResponseBody
+    public ReturnDTO suspend(@RequestBody SuspendDTO suspendDTO) {
+        Assert.isFalse(Objects.isNull(suspendDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.suspend(suspendDTO));
+    }
+
+    @ApiOperation("已读")
+    @PostMapping("/read")
+    @ResponseBody
+    public ReturnDTO read(@RequestBody IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.read(idDTO.getId()));
+    }
+
+    @ApiOperation("提醒责任人")
+    @PostMapping("/remind")
+    @ResponseBody
+    public ReturnDTO remind(@RequestBody RemindDTO remindDTO) {
+        Assert.isFalse(Objects.isNull(remindDTO.getAlarmId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iAlarmRecordsService.remind(remindDTO));
+    }
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
new file mode 100644
index 0000000..becb272
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/ApprovalLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/approvalLog")
+public class ApprovalLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
new file mode 100644
index 0000000..ee6a40a
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/RemindLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 提醒记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/remindLog")
+public class RemindLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
new file mode 100644
index 0000000..872c4d3
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SuspendLogController.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 挂起记录 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@RestController
+@RequestMapping("/system/suspendLog")
+public class SuspendLogController {
+
+}
+
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
new file mode 100644
index 0000000..543772d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 审批记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface ApprovalLogMapper extends BaseMapper<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
new file mode 100644
index 0000000..0a226de
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 提醒记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface RemindLogMapper extends BaseMapper<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
new file mode 100644
index 0000000..6d98c9d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 挂起记录 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Mapper
+public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 7f4324e..1725724 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -30,6 +30,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID as deptid
         FROM
         alarm_records rd
@@ -40,6 +41,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS =1
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -57,6 +59,7 @@
         bt.TYPE_NAME AS devTypeName,
         lr.POSITION,
         lr.TAG_NUMBER as tagNumber,
+        sd.full_name as deptName,
         lr.DEPTID
         FROM
         alarm_records rd
@@ -67,6 +70,7 @@
         LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
+        LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
         where rd.STATUS = 0
         <if test="request.devCode != null and request.devCode !='' ">
             and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -84,6 +88,9 @@
             lr.POSITION,
             lr.TAG_NUMBER as tagNumber,
             lr.DEPTID,
+            lr.LNG_GAODE as lngGaode,
+            lr.LAT_GAODE as latGaode,
+            lr.DEPTID,
             lr.MANAGE_TYPE as manageType,
             sd.full_name as deptName,
             sd1.full_name as responsibleDeptName
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
new file mode 100644
index 0000000..07eddef
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/ApprovalLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.ApprovalLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.ApprovalLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="APPROVAL_STATUS" property="approvalStatus" />
+        <result column="APPROVAL_PERSON" property="approvalPerson" />
+        <result column="APPROVAL_TIME" property="approvalTime" />
+        <result column="DESCN" property="descn" />
+        <result column="FLOW_STATUS" property="flowStatus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, APPROVAL_STATUS, APPROVAL_PERSON, APPROVAL_TIME, DESCN, FLOW_STATUS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
new file mode 100644
index 0000000..9671f37
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/RemindLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.RemindLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.RemindLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="REMIND_PERSON" property="remindPerson" />
+        <result column="TELEPHONE" property="telephone" />
+        <result column="REMIND_CONTENT" property="remindContent" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATE_TIME" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, REMIND_PERSON, TELEPHONE, REMIND_CONTENT, CREATE_USER, CREATE_TIME
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
new file mode 100644
index 0000000..5901f40
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/SuspendLogMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.alarm.dao.SuspendLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.SuspendLog">
+        <id column="ID" property="id" />
+        <result column="ALARM_ID" property="alarmId" />
+        <result column="SUSPEND_REASON" property="suspendReason" />
+        <result column="SUSPEND_TIME" property="suspendTime" />
+        <result column="CREATE_PERSON" property="createPerson" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="DESCN" property="descn" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, ALARM_ID, SUSPEND_REASON, SUSPEND_TIME, CREATE_PERSON, CREATE_TIME, DESCN
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
new file mode 100644
index 0000000..0e822a5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/RemindDTO.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RemindDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    private String remindContent;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
new file mode 100644
index 0000000..8d6d5fe
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/SuspendDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SuspendDTO {
+
+    @ApiModelProperty(value = "报警主键id",required = true)
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    private String suspendTime;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index facec65..8482de1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -98,4 +98,25 @@
     @ApiModelProperty("管理单位")
     @TableField(exist = false)
     private String deptName;
+
+    @ApiModelProperty("处置状态名称")
+    @TableField(exist = false)
+    private String processStatusName;
+
+    @ApiModelProperty("是否误报名称")
+    @TableField(exist = false)
+    private String realAlarmName;
+
+    @ApiModelProperty("管理方式")
+    @TableField(exist = false)
+    private String manageType;
+
+    @ApiModelProperty("报警经度高德")
+    @TableField(exist = false)
+    private String lngGaode;
+
+    @ApiModelProperty("报警纬度高德")
+    @TableField(exist = false)
+    private String latGaode;
+
 }
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
new file mode 100644
index 0000000..31e584f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/ApprovalLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 审批记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("approval_log")
+@ApiModel(value = "ApprovalLog对象", description = "审批记录")
+public class ApprovalLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("1:通过，0：不通过)")
+    @TableField("APPROVAL_STATUS")
+    private String approvalStatus;
+
+    @ApiModelProperty("审批人")
+    @TableField("APPROVAL_PERSON")
+    private String approvalPerson;
+
+    @ApiModelProperty("审批时间")
+    @TableField("APPROVAL_TIME")
+    private Date approvalTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    @ApiModelProperty("流程状态，1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置)")
+    @TableField("FLOW_STATUS")
+    private String flowStatus;
+
+    public ApprovalLog() {
+    }
+
+    public ApprovalLog(Long alarmId, String approvalStatus, String approvalPerson, String flowStatus) {
+        this.alarmId = alarmId;
+        this.approvalStatus = approvalStatus;
+        this.approvalPerson = approvalPerson;
+        this.flowStatus = flowStatus;
+    }
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
new file mode 100644
index 0000000..e373fd9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/RemindLog.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 提醒记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Builder
+@Getter
+@Setter
+@TableName("remind_log")
+@ApiModel(value = "RemindLog对象", description = "提醒记录")
+public class RemindLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("提醒人员")
+    @TableField("REMIND_PERSON")
+    private String remindPerson;
+
+    @ApiModelProperty("联系方式")
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @ApiModelProperty("提醒内容")
+    @TableField("REMIND_CONTENT")
+    private String remindContent;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_USER")
+    private String createUser;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
new file mode 100644
index 0000000..fd1748b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/SuspendLog.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.modular.alarm.entity;
+
+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;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 挂起记录
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Getter
+@Setter
+@TableName("suspend_log")
+@ApiModel(value = "SuspendLog对象", description = "挂起记录")
+public class SuspendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+    @ApiModelProperty("挂起原因")
+    @TableField("SUSPEND_REASON")
+    private String suspendReason;
+
+    @ApiModelProperty("挂起时间")
+    @TableField("SUSPEND_TIME")
+    private String suspendTime;
+
+    @ApiModelProperty("创建人")
+    @TableField("CREATE_PERSON")
+    private String createPerson;
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty("备注")
+    @TableField("DESCN")
+    private String descn;
+
+    public SuspendLog() {
+    }
+
+    public SuspendLog(Long alarmId, String suspendReason, String suspendTime, String createPerson) {
+        this.alarmId = alarmId;
+        this.suspendReason = suspendReason;
+        this.suspendTime = suspendTime;
+        this.createPerson = createPerson;
+    }
+}
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 812d274..f285f96 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
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 
 /**
@@ -20,6 +22,12 @@
 
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
-    boolean  view(Long id);
+    AlarmRecords  view(Long id);
+
+    boolean  suspend(SuspendDTO suspendDTO);
+
+    boolean  remind(RemindDTO remindDTO);
+
+    boolean  read(Long id);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
new file mode 100644
index 0000000..f711ef8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IApprovalLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 审批记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IApprovalLogService extends IService<ApprovalLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
new file mode 100644
index 0000000..683c548
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IRemindLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 提醒记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface IRemindLogService extends IService<RemindLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
new file mode 100644
index 0000000..b95eeae
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/ISuspendLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 挂起记录 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+public interface ISuspendLogService extends IService<SuspendLog> {
+
+}
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 8e8cfa2..01e1d2f 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
@@ -2,12 +2,27 @@
 
 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.datascope.DataScope;
+import com.casic.missiles.enums.ApprovalStatusEnum;
+import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper;
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO;
+import com.casic.missiles.modular.alarm.dto.RemindDTO;
+import com.casic.missiles.modular.alarm.dto.SuspendDTO;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+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 lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,24 +32,93 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class AlarmRecordsServiceImpl extends ServiceImpl<AlarmRecordsMapper, AlarmRecords> implements IAlarmRecordsService {
 
+    private final ApprovalLogMapper approvalLogMapper;
+    private final AbstractPermissionContext permissionContext;
+    private final SuspendLogMapper suspendLogMapper;
+    private final RemindLogMapper remindLogMapper;
+
     @Override
     public Page<AlarmRecords> pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
 
-        return this.baseMapper.pageList(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        });
+        return alarmRecordsPage;
     }
 
     @Override
     public Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
-
-        return this.baseMapper.historyListPage(page,request,dataScope);
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope);
+        List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
+        alarmRecordsList.forEach(alarmRecords -> {
+            alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否");
+        });
+        return alarmRecordsPage;
     }
 
     @Override
-    public boolean view(Long id) {
+    public AlarmRecords view(Long id) {
         AlarmRecords alarmRecords = this.baseMapper.view(id);
-        return false;
+        alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus()));
+        //0：自有，1：自管
+        alarmRecords.setManageType(DictEnum.MANAGE_TYPE.equals(alarmRecords.getManageType()) ? "自有" : "自管");
+        return alarmRecords;
+    }
+
+    @Transactional
+    @Override
+    public boolean suspend(SuspendDTO suspendDTO) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(suspendDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.SUSPEND.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(suspendDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.SUSPEND.getCode()));
+        //3、写入挂起日志表
+        return suspendLogMapper.insert(new SuspendLog(suspendDTO.getAlarmId(), suspendDTO.getSuspendReason(), suspendDTO.getSuspendTime(), loginPersonName))>0?true:false;
+    }
+
+    @Transactional
+    @Override
+    public boolean read(Long id) {
+        //1、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(id);
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.READ.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //2、写入流程日志
+        return approvalLogMapper.insert( new ApprovalLog(id,"1",permissionContext.getAuthService().getLoginUser().getName(),ApprovalStatusEnum.READ.getCode()))>0?true:false;
+
+    }
+
+
+    @Transactional
+    @Override
+    public boolean remind(RemindDTO remindDTO) {
+        //toDo:1、提醒app推送,需要对接
+        //2、更新报警表流程状态
+        AlarmRecords alarmRecords = new AlarmRecords();
+        alarmRecords.setId(remindDTO.getAlarmId());
+        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNCONFIRM.getCode());
+        this.baseMapper.updateById(alarmRecords) ;
+        //3、写入流程日志
+        String loginPersonName = permissionContext.getAuthService().getLoginUser().getName();
+        approvalLogMapper.insert( new ApprovalLog(remindDTO.getAlarmId(),"1",loginPersonName,ApprovalStatusEnum.UNCONFIRM.getCode()));
+        //4、写入提醒日志表
+        return remindLogMapper.insert(RemindLog.builder()
+                .alarmId(remindDTO.getAlarmId())
+                .remindContent(remindDTO.getRemindContent())
+                .remindPerson(remindDTO.getRemindPerson())
+                .telephone(remindDTO.getTelephone())
+                .remindPerson(loginPersonName).build())>0?true:false;
+
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
index 8d21055..0bd5b9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmTypeServiceImpl.java
@@ -1,6 +1,5 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -12,7 +11,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
new file mode 100644
index 0000000..3cf81e5
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/ApprovalLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.casic.missiles.modular.alarm.dao.ApprovalLogMapper;
+import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.service.IApprovalLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 审批记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class ApprovalLogServiceImpl extends ServiceImpl<ApprovalLogMapper, ApprovalLog> implements IApprovalLogService {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java
new file mode 100644
index 0000000..56ebe22
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/RemindLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.alarm.dao.RemindLogMapper;
+import com.casic.missiles.modular.alarm.entity.RemindLog;
+import com.casic.missiles.modular.alarm.service.IRemindLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 提醒记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class RemindLogServiceImpl extends ServiceImpl<RemindLogMapper, RemindLog> implements IRemindLogService {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java
new file mode 100644
index 0000000..7225cff
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SuspendLogServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+import com.casic.missiles.modular.alarm.dao.SuspendLogMapper;
+import com.casic.missiles.modular.alarm.entity.SuspendLog;
+import com.casic.missiles.modular.alarm.service.ISuspendLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 挂起记录 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-14
+ */
+@Service
+public class SuspendLogServiceImpl extends ServiceImpl<SuspendLogMapper, SuspendLog> implements ISuspendLogService {
+
+}
diff --git a/casic-data/pom.xml b/casic-data/pom.xml
index 3195876..9eb9b59 100644
--- a/casic-data/pom.xml
+++ b/casic-data/pom.xml
@@ -40,7 +40,12 @@
             <version>2.4.5</version>
         </dependency>
 
-
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.18</version>
+            <scope>compile</scope>
+        </dependency>
         <!--其他-->
 
         <dependency>
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java
index f817b78..0212e42 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java
@@ -2,22 +2,43 @@
 
 //1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置
 
-public interface ApprovalStatusEnum {
-    String PROCESS_STATUS = "processStatus";
-    //未读
-    String UNREAD = "1";
-    //已读
-    String READ = "2";
-    //挂起
-    String SUSPEND = "3";
-    //待现场确认
-    String UNCONFIRM = "4";
-    //已确认
-    String CONFIRMED = "5";
-    //待处置
-    String UNPROCESS = "6";
-    //已处置
-    String PROCESSED = "7";
-    //删除
-    String DELETED = "8";
+public enum ApprovalStatusEnum {
+
+    UNREAD("1", "未读"),
+    READ("2", "已读"),
+    SUSPEND("3", "挂起"),
+    UNCONFIRM("4", "待现场确认"),
+    CONFIRMED("5", "已确认"),
+    UNPROCESS("6", "待处置"),
+    PROCESSED("7", "已处置"),
+    DELETED("8", "删除");
+
+    private String code;
+    private String value;
+
+    ApprovalStatusEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+
+    public static String getValue(String code){
+        for(ApprovalStatusEnum approvalStatusEnum :values()){
+            if(approvalStatusEnum.code.equals(code)){
+                return approvalStatusEnum.value;
+            }
+        }
+        return "";
+    }
+
+
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
 }
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java
index 97f6cfc..8262ca9 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/DictEnum.java
@@ -48,4 +48,10 @@
     String IS_USED= "1";
     //监控对象
     String WATCH_OBJECT= "watchObject";
+    //误报
+    String REAL_ALARM= "0";
+    //0：自有，1：自管
+    String MANAGE_TYPE= "0";
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java
index 96b8c6e..3fc108a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CodeGenerator.java
@@ -65,8 +65,8 @@
 
                 //策略配置
                 .strategyConfig(builder -> {
-                    builder.addInclude("alarm_type_devicetype") // 设置需要生成的表名
-                            .addTablePrefix("alarm_") // 设置过滤表前缀
+                    builder.addInclude("approval_log","suspend_log","remind_log") // 设置需要生成的表名
+                            .addTablePrefix() // 设置过滤表前缀
                             .entityBuilder() //实体类配置
                             .enableLombok() //使用lombok
                             .enableTableFieldAnnotation()//实体类字段注解
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 97ca243..6b9c5c1 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -119,6 +119,11 @@
             <artifactId>casic-public</artifactId>
             <version>${pro.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-data</artifactId>
+            <version>${pro.version}</version>
+        </dependency>
         <!--spring boot依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>