diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java
new file mode 100644
index 0000000..020216b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.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-22
+ */
+@RestController
+@RequestMapping("/system/messageLog")
+public class MessageLogController {
+
+}
+

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java
new file mode 100644
index 0000000..020216b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.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-22
+ */
+@RestController
+@RequestMapping("/system/messageLog")
+public class MessageLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e298440..c5ec280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.alarm.controller;
 
 
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO;
+import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
 import com.casic.missiles.modular.alarm.service.IOverViewService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -28,7 +34,10 @@
 public class OverViewController extends ExportController {
 
     private final IOverViewService iOverViewService;
-    private final AbstractPermissionContext permissionContext;
+
+    private final IMessageLogService iMessageLogService;
+
+    private final IAlarmRecordsService iAlarmRecordsService;
 
     @ApiOperation("基本概况")
     @PostMapping("/overall")
@@ -45,26 +54,15 @@
         return ReturnUtil.success(iOverViewService.deviceStatus());
     }
 
-//    @ApiOperation("报警趋势分析")
-//    @PostMapping("/alarmTrend")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmTrend() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
-//    }
 
-    @ApiOperation("消息通知（待开发）")
+    @ApiOperation("消息通知")
     @PostMapping("/note")
     @ResponseBody
-    public ReturnDTO<AlarmCompanyResponseDTO> note(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+    public ReturnDTO<MessageLog> note() {
+        //toDo:查看权限
+        Page<MessageLog> page = PageFactory.defaultPage();
+        Page<MessageLog> messageLogPage = iMessageLogService.page(page);
+        return ReturnUtil.success(super.packForBT(messageLogPage));
     }
 
     @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
@@ -72,11 +70,8 @@
     @ResponseBody
     public ReturnDTO<AlarmCompanyResponseDTO> pop() {
 
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pop()));
+
     }
 
 
@@ -84,10 +79,8 @@
     @PostMapping("/alarmPosition")
     @ResponseBody
     public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType = "";
-        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, alarmPositionRequestDTO));
     }
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java
new file mode 100644
index 0000000..020216b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.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-22
+ */
+@RestController
+@RequestMapping("/system/messageLog")
+public class MessageLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e298440..c5ec280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.alarm.controller;
 
 
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO;
+import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
 import com.casic.missiles.modular.alarm.service.IOverViewService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -28,7 +34,10 @@
 public class OverViewController extends ExportController {
 
     private final IOverViewService iOverViewService;
-    private final AbstractPermissionContext permissionContext;
+
+    private final IMessageLogService iMessageLogService;
+
+    private final IAlarmRecordsService iAlarmRecordsService;
 
     @ApiOperation("基本概况")
     @PostMapping("/overall")
@@ -45,26 +54,15 @@
         return ReturnUtil.success(iOverViewService.deviceStatus());
     }
 
-//    @ApiOperation("报警趋势分析")
-//    @PostMapping("/alarmTrend")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmTrend() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
-//    }
 
-    @ApiOperation("消息通知（待开发）")
+    @ApiOperation("消息通知")
     @PostMapping("/note")
     @ResponseBody
-    public ReturnDTO<AlarmCompanyResponseDTO> note(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+    public ReturnDTO<MessageLog> note() {
+        //toDo:查看权限
+        Page<MessageLog> page = PageFactory.defaultPage();
+        Page<MessageLog> messageLogPage = iMessageLogService.page(page);
+        return ReturnUtil.success(super.packForBT(messageLogPage));
     }
 
     @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
@@ -72,11 +70,8 @@
     @ResponseBody
     public ReturnDTO<AlarmCompanyResponseDTO> pop() {
 
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pop()));
+
     }
 
 
@@ -84,10 +79,8 @@
     @PostMapping("/alarmPosition")
     @ResponseBody
     public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType = "";
-        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, alarmPositionRequestDTO));
     }
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 19c050d..52af21e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -25,4 +25,7 @@
 
     AlarmRecords view(@Param("id") Long id);
 
+    Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
+
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java
new file mode 100644
index 0000000..020216b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.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-22
+ */
+@RestController
+@RequestMapping("/system/messageLog")
+public class MessageLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e298440..c5ec280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.alarm.controller;
 
 
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO;
+import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
 import com.casic.missiles.modular.alarm.service.IOverViewService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -28,7 +34,10 @@
 public class OverViewController extends ExportController {
 
     private final IOverViewService iOverViewService;
-    private final AbstractPermissionContext permissionContext;
+
+    private final IMessageLogService iMessageLogService;
+
+    private final IAlarmRecordsService iAlarmRecordsService;
 
     @ApiOperation("基本概况")
     @PostMapping("/overall")
@@ -45,26 +54,15 @@
         return ReturnUtil.success(iOverViewService.deviceStatus());
     }
 
-//    @ApiOperation("报警趋势分析")
-//    @PostMapping("/alarmTrend")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmTrend() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
-//    }
 
-    @ApiOperation("消息通知（待开发）")
+    @ApiOperation("消息通知")
     @PostMapping("/note")
     @ResponseBody
-    public ReturnDTO<AlarmCompanyResponseDTO> note(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+    public ReturnDTO<MessageLog> note() {
+        //toDo:查看权限
+        Page<MessageLog> page = PageFactory.defaultPage();
+        Page<MessageLog> messageLogPage = iMessageLogService.page(page);
+        return ReturnUtil.success(super.packForBT(messageLogPage));
     }
 
     @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
@@ -72,11 +70,8 @@
     @ResponseBody
     public ReturnDTO<AlarmCompanyResponseDTO> pop() {
 
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pop()));
+
     }
 
 
@@ -84,10 +79,8 @@
     @PostMapping("/alarmPosition")
     @ResponseBody
     public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType = "";
-        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, alarmPositionRequestDTO));
     }
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 19c050d..52af21e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -25,4 +25,7 @@
 
     AlarmRecords view(@Param("id") Long id);
 
+    Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
new file mode 100644
index 0000000..281593e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 协议管理	 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+@Mapper
+public interface MessageLogMapper extends BaseMapper<MessageLog> {
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java
new file mode 100644
index 0000000..020216b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.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-22
+ */
+@RestController
+@RequestMapping("/system/messageLog")
+public class MessageLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e298440..c5ec280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.alarm.controller;
 
 
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO;
+import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
 import com.casic.missiles.modular.alarm.service.IOverViewService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -28,7 +34,10 @@
 public class OverViewController extends ExportController {
 
     private final IOverViewService iOverViewService;
-    private final AbstractPermissionContext permissionContext;
+
+    private final IMessageLogService iMessageLogService;
+
+    private final IAlarmRecordsService iAlarmRecordsService;
 
     @ApiOperation("基本概况")
     @PostMapping("/overall")
@@ -45,26 +54,15 @@
         return ReturnUtil.success(iOverViewService.deviceStatus());
     }
 
-//    @ApiOperation("报警趋势分析")
-//    @PostMapping("/alarmTrend")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmTrend() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
-//    }
 
-    @ApiOperation("消息通知（待开发）")
+    @ApiOperation("消息通知")
     @PostMapping("/note")
     @ResponseBody
-    public ReturnDTO<AlarmCompanyResponseDTO> note(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+    public ReturnDTO<MessageLog> note() {
+        //toDo:查看权限
+        Page<MessageLog> page = PageFactory.defaultPage();
+        Page<MessageLog> messageLogPage = iMessageLogService.page(page);
+        return ReturnUtil.success(super.packForBT(messageLogPage));
     }
 
     @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
@@ -72,11 +70,8 @@
     @ResponseBody
     public ReturnDTO<AlarmCompanyResponseDTO> pop() {
 
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pop()));
+
     }
 
 
@@ -84,10 +79,8 @@
     @PostMapping("/alarmPosition")
     @ResponseBody
     public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType = "";
-        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, alarmPositionRequestDTO));
     }
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 19c050d..52af21e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -25,4 +25,7 @@
 
     AlarmRecords view(@Param("id") Long id);
 
+    Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
new file mode 100644
index 0000000..281593e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 协议管理	 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+@Mapper
+public interface MessageLogMapper extends BaseMapper<MessageLog> {
+
+}
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 63be4f7..31d7d32 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
@@ -38,7 +38,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -67,7 +67,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -109,4 +109,20 @@
 
     </select>
 
+
+    <select id="pop" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        SELECT
+        rd.*,
+        FROM
+        alarm_records rd
+        LEFT JOIN bus_ledger_all_view lr ON lr.ledgerCode = bl.LEDGER_CODE
+        where rd.STATUS =1
+        and rd.PROCESS_STATUS <![CDATA[ > ]]> 3
+        and rd.PROCESS_STATUS <![CDATA[ < ]]> 3
+        <if test="deptStrs != null and deptStrs !='' ">
+            and lr.DEPTID in (${deptStrs})
+        </if>
+        ORDER BY rd.TS DESC
+    </select>
+
 </mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java
new file mode 100644
index 0000000..020216b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.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-22
+ */
+@RestController
+@RequestMapping("/system/messageLog")
+public class MessageLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e298440..c5ec280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.alarm.controller;
 
 
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO;
+import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
 import com.casic.missiles.modular.alarm.service.IOverViewService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -28,7 +34,10 @@
 public class OverViewController extends ExportController {
 
     private final IOverViewService iOverViewService;
-    private final AbstractPermissionContext permissionContext;
+
+    private final IMessageLogService iMessageLogService;
+
+    private final IAlarmRecordsService iAlarmRecordsService;
 
     @ApiOperation("基本概况")
     @PostMapping("/overall")
@@ -45,26 +54,15 @@
         return ReturnUtil.success(iOverViewService.deviceStatus());
     }
 
-//    @ApiOperation("报警趋势分析")
-//    @PostMapping("/alarmTrend")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmTrend() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
-//    }
 
-    @ApiOperation("消息通知（待开发）")
+    @ApiOperation("消息通知")
     @PostMapping("/note")
     @ResponseBody
-    public ReturnDTO<AlarmCompanyResponseDTO> note(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+    public ReturnDTO<MessageLog> note() {
+        //toDo:查看权限
+        Page<MessageLog> page = PageFactory.defaultPage();
+        Page<MessageLog> messageLogPage = iMessageLogService.page(page);
+        return ReturnUtil.success(super.packForBT(messageLogPage));
     }
 
     @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
@@ -72,11 +70,8 @@
     @ResponseBody
     public ReturnDTO<AlarmCompanyResponseDTO> pop() {
 
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pop()));
+
     }
 
 
@@ -84,10 +79,8 @@
     @PostMapping("/alarmPosition")
     @ResponseBody
     public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType = "";
-        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, alarmPositionRequestDTO));
     }
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 19c050d..52af21e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -25,4 +25,7 @@
 
     AlarmRecords view(@Param("id") Long id);
 
+    Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
new file mode 100644
index 0000000..281593e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 协议管理	 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+@Mapper
+public interface MessageLogMapper extends BaseMapper<MessageLog> {
+
+}
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 63be4f7..31d7d32 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
@@ -38,7 +38,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -67,7 +67,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -109,4 +109,20 @@
 
     </select>
 
+
+    <select id="pop" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        SELECT
+        rd.*,
+        FROM
+        alarm_records rd
+        LEFT JOIN bus_ledger_all_view lr ON lr.ledgerCode = bl.LEDGER_CODE
+        where rd.STATUS =1
+        and rd.PROCESS_STATUS <![CDATA[ > ]]> 3
+        and rd.PROCESS_STATUS <![CDATA[ < ]]> 3
+        <if test="deptStrs != null and deptStrs !='' ">
+            and lr.DEPTID in (${deptStrs})
+        </if>
+        ORDER BY rd.TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
new file mode 100644
index 0000000..6143aaa
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -0,0 +1,20 @@
+<?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.MessageLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.MessageLog">
+        <id column="ID" property="id" />
+        <result column="MESSAGE_TYPE" property="messageType" />
+        <result column="MESSAGE_TYPE_DETAIL" property="messageTypeDetail" />
+        <result column="MESSAGE_CONTENT" property="messageContent" />
+        <result column="REMARK" property="remark" />
+        <result column="TS" property="ts" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, MESSAGE_TYPE, MESSAGE_TYPE_DETAIL, MESSAGE_CONTENT, REMARK, TS
+    </sql>
+
+</mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java
new file mode 100644
index 0000000..020216b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.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-22
+ */
+@RestController
+@RequestMapping("/system/messageLog")
+public class MessageLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e298440..c5ec280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.alarm.controller;
 
 
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO;
+import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
 import com.casic.missiles.modular.alarm.service.IOverViewService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -28,7 +34,10 @@
 public class OverViewController extends ExportController {
 
     private final IOverViewService iOverViewService;
-    private final AbstractPermissionContext permissionContext;
+
+    private final IMessageLogService iMessageLogService;
+
+    private final IAlarmRecordsService iAlarmRecordsService;
 
     @ApiOperation("基本概况")
     @PostMapping("/overall")
@@ -45,26 +54,15 @@
         return ReturnUtil.success(iOverViewService.deviceStatus());
     }
 
-//    @ApiOperation("报警趋势分析")
-//    @PostMapping("/alarmTrend")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmTrend() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
-//    }
 
-    @ApiOperation("消息通知（待开发）")
+    @ApiOperation("消息通知")
     @PostMapping("/note")
     @ResponseBody
-    public ReturnDTO<AlarmCompanyResponseDTO> note(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+    public ReturnDTO<MessageLog> note() {
+        //toDo:查看权限
+        Page<MessageLog> page = PageFactory.defaultPage();
+        Page<MessageLog> messageLogPage = iMessageLogService.page(page);
+        return ReturnUtil.success(super.packForBT(messageLogPage));
     }
 
     @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
@@ -72,11 +70,8 @@
     @ResponseBody
     public ReturnDTO<AlarmCompanyResponseDTO> pop() {
 
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pop()));
+
     }
 
 
@@ -84,10 +79,8 @@
     @PostMapping("/alarmPosition")
     @ResponseBody
     public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType = "";
-        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, alarmPositionRequestDTO));
     }
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 19c050d..52af21e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -25,4 +25,7 @@
 
     AlarmRecords view(@Param("id") Long id);
 
+    Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
new file mode 100644
index 0000000..281593e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 协议管理	 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+@Mapper
+public interface MessageLogMapper extends BaseMapper<MessageLog> {
+
+}
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 63be4f7..31d7d32 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
@@ -38,7 +38,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -67,7 +67,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -109,4 +109,20 @@
 
     </select>
 
+
+    <select id="pop" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        SELECT
+        rd.*,
+        FROM
+        alarm_records rd
+        LEFT JOIN bus_ledger_all_view lr ON lr.ledgerCode = bl.LEDGER_CODE
+        where rd.STATUS =1
+        and rd.PROCESS_STATUS <![CDATA[ > ]]> 3
+        and rd.PROCESS_STATUS <![CDATA[ < ]]> 3
+        <if test="deptStrs != null and deptStrs !='' ">
+            and lr.DEPTID in (${deptStrs})
+        </if>
+        ORDER BY rd.TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
new file mode 100644
index 0000000..6143aaa
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -0,0 +1,20 @@
+<?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.MessageLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.MessageLog">
+        <id column="ID" property="id" />
+        <result column="MESSAGE_TYPE" property="messageType" />
+        <result column="MESSAGE_TYPE_DETAIL" property="messageTypeDetail" />
+        <result column="MESSAGE_CONTENT" property="messageContent" />
+        <result column="REMARK" property="remark" />
+        <result column="TS" property="ts" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, MESSAGE_TYPE, MESSAGE_TYPE_DETAIL, MESSAGE_CONTENT, REMARK, TS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index b146224..2925d1c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -79,6 +79,7 @@
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
+        order by ap.alarmSum desc
     </select>
 
     <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java
new file mode 100644
index 0000000..020216b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.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-22
+ */
+@RestController
+@RequestMapping("/system/messageLog")
+public class MessageLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e298440..c5ec280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.alarm.controller;
 
 
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO;
+import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
 import com.casic.missiles.modular.alarm.service.IOverViewService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -28,7 +34,10 @@
 public class OverViewController extends ExportController {
 
     private final IOverViewService iOverViewService;
-    private final AbstractPermissionContext permissionContext;
+
+    private final IMessageLogService iMessageLogService;
+
+    private final IAlarmRecordsService iAlarmRecordsService;
 
     @ApiOperation("基本概况")
     @PostMapping("/overall")
@@ -45,26 +54,15 @@
         return ReturnUtil.success(iOverViewService.deviceStatus());
     }
 
-//    @ApiOperation("报警趋势分析")
-//    @PostMapping("/alarmTrend")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmTrend() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
-//    }
 
-    @ApiOperation("消息通知（待开发）")
+    @ApiOperation("消息通知")
     @PostMapping("/note")
     @ResponseBody
-    public ReturnDTO<AlarmCompanyResponseDTO> note(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+    public ReturnDTO<MessageLog> note() {
+        //toDo:查看权限
+        Page<MessageLog> page = PageFactory.defaultPage();
+        Page<MessageLog> messageLogPage = iMessageLogService.page(page);
+        return ReturnUtil.success(super.packForBT(messageLogPage));
     }
 
     @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
@@ -72,11 +70,8 @@
     @ResponseBody
     public ReturnDTO<AlarmCompanyResponseDTO> pop() {
 
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pop()));
+
     }
 
 
@@ -84,10 +79,8 @@
     @PostMapping("/alarmPosition")
     @ResponseBody
     public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType = "";
-        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, alarmPositionRequestDTO));
     }
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 19c050d..52af21e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -25,4 +25,7 @@
 
     AlarmRecords view(@Param("id") Long id);
 
+    Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
new file mode 100644
index 0000000..281593e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 协议管理	 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+@Mapper
+public interface MessageLogMapper extends BaseMapper<MessageLog> {
+
+}
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 63be4f7..31d7d32 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
@@ -38,7 +38,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -67,7 +67,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -109,4 +109,20 @@
 
     </select>
 
+
+    <select id="pop" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        SELECT
+        rd.*,
+        FROM
+        alarm_records rd
+        LEFT JOIN bus_ledger_all_view lr ON lr.ledgerCode = bl.LEDGER_CODE
+        where rd.STATUS =1
+        and rd.PROCESS_STATUS <![CDATA[ > ]]> 3
+        and rd.PROCESS_STATUS <![CDATA[ < ]]> 3
+        <if test="deptStrs != null and deptStrs !='' ">
+            and lr.DEPTID in (${deptStrs})
+        </if>
+        ORDER BY rd.TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
new file mode 100644
index 0000000..6143aaa
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -0,0 +1,20 @@
+<?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.MessageLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.MessageLog">
+        <id column="ID" property="id" />
+        <result column="MESSAGE_TYPE" property="messageType" />
+        <result column="MESSAGE_TYPE_DETAIL" property="messageTypeDetail" />
+        <result column="MESSAGE_CONTENT" property="messageContent" />
+        <result column="REMARK" property="remark" />
+        <result column="TS" property="ts" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, MESSAGE_TYPE, MESSAGE_TYPE_DETAIL, MESSAGE_CONTENT, REMARK, TS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index b146224..2925d1c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -79,6 +79,7 @@
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
+        order by ap.alarmSum desc
     </select>
 
     <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
new file mode 100644
index 0000000..0c3d9f8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -0,0 +1,57 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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-22
+ */
+@Getter
+@Setter
+@TableName("message_log")
+@ApiModel(value = "MessageLog对象", description = "消息通知管理	")
+public class MessageLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("消息类型（1、报警类、2确认/处置类、3消警类、4施工类）")
+    @TableField("MESSAGE_TYPE")
+    private String messageType;
+
+    @ApiModelProperty("消息类型详细")
+    @TableField("MESSAGE_TYPE_DETAIL")
+    private String messageTypeDetail;
+
+    @ApiModelProperty("消息内容")
+    @TableField("MESSAGE_CONTENT")
+    private String messageContent;
+
+    @ApiModelProperty("备注")
+    @TableField("REMARK")
+    private String remark;
+
+    @ApiModelProperty("创建时间")
+    @TableField("TS")
+    private Date ts;
+
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java
new file mode 100644
index 0000000..020216b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.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-22
+ */
+@RestController
+@RequestMapping("/system/messageLog")
+public class MessageLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e298440..c5ec280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.alarm.controller;
 
 
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO;
+import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
 import com.casic.missiles.modular.alarm.service.IOverViewService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -28,7 +34,10 @@
 public class OverViewController extends ExportController {
 
     private final IOverViewService iOverViewService;
-    private final AbstractPermissionContext permissionContext;
+
+    private final IMessageLogService iMessageLogService;
+
+    private final IAlarmRecordsService iAlarmRecordsService;
 
     @ApiOperation("基本概况")
     @PostMapping("/overall")
@@ -45,26 +54,15 @@
         return ReturnUtil.success(iOverViewService.deviceStatus());
     }
 
-//    @ApiOperation("报警趋势分析")
-//    @PostMapping("/alarmTrend")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmTrend() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
-//    }
 
-    @ApiOperation("消息通知（待开发）")
+    @ApiOperation("消息通知")
     @PostMapping("/note")
     @ResponseBody
-    public ReturnDTO<AlarmCompanyResponseDTO> note(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+    public ReturnDTO<MessageLog> note() {
+        //toDo:查看权限
+        Page<MessageLog> page = PageFactory.defaultPage();
+        Page<MessageLog> messageLogPage = iMessageLogService.page(page);
+        return ReturnUtil.success(super.packForBT(messageLogPage));
     }
 
     @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
@@ -72,11 +70,8 @@
     @ResponseBody
     public ReturnDTO<AlarmCompanyResponseDTO> pop() {
 
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pop()));
+
     }
 
 
@@ -84,10 +79,8 @@
     @PostMapping("/alarmPosition")
     @ResponseBody
     public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType = "";
-        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, alarmPositionRequestDTO));
     }
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 19c050d..52af21e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -25,4 +25,7 @@
 
     AlarmRecords view(@Param("id") Long id);
 
+    Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
new file mode 100644
index 0000000..281593e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 协议管理	 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+@Mapper
+public interface MessageLogMapper extends BaseMapper<MessageLog> {
+
+}
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 63be4f7..31d7d32 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
@@ -38,7 +38,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -67,7 +67,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -109,4 +109,20 @@
 
     </select>
 
+
+    <select id="pop" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        SELECT
+        rd.*,
+        FROM
+        alarm_records rd
+        LEFT JOIN bus_ledger_all_view lr ON lr.ledgerCode = bl.LEDGER_CODE
+        where rd.STATUS =1
+        and rd.PROCESS_STATUS <![CDATA[ > ]]> 3
+        and rd.PROCESS_STATUS <![CDATA[ < ]]> 3
+        <if test="deptStrs != null and deptStrs !='' ">
+            and lr.DEPTID in (${deptStrs})
+        </if>
+        ORDER BY rd.TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
new file mode 100644
index 0000000..6143aaa
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -0,0 +1,20 @@
+<?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.MessageLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.MessageLog">
+        <id column="ID" property="id" />
+        <result column="MESSAGE_TYPE" property="messageType" />
+        <result column="MESSAGE_TYPE_DETAIL" property="messageTypeDetail" />
+        <result column="MESSAGE_CONTENT" property="messageContent" />
+        <result column="REMARK" property="remark" />
+        <result column="TS" property="ts" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, MESSAGE_TYPE, MESSAGE_TYPE_DETAIL, MESSAGE_CONTENT, REMARK, TS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index b146224..2925d1c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -79,6 +79,7 @@
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
+        order by ap.alarmSum desc
     </select>
 
     <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
new file mode 100644
index 0000000..0c3d9f8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -0,0 +1,57 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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-22
+ */
+@Getter
+@Setter
+@TableName("message_log")
+@ApiModel(value = "MessageLog对象", description = "消息通知管理	")
+public class MessageLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("消息类型（1、报警类、2确认/处置类、3消警类、4施工类）")
+    @TableField("MESSAGE_TYPE")
+    private String messageType;
+
+    @ApiModelProperty("消息类型详细")
+    @TableField("MESSAGE_TYPE_DETAIL")
+    private String messageTypeDetail;
+
+    @ApiModelProperty("消息内容")
+    @TableField("MESSAGE_CONTENT")
+    private String messageContent;
+
+    @ApiModelProperty("备注")
+    @TableField("REMARK")
+    private String remark;
+
+    @ApiModelProperty("创建时间")
+    @TableField("TS")
+    private Date ts;
+
+
+}
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 80db26d..8013db0 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
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<AlarmRecords>  pop();
+
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
     AlarmRecords  view(Long id);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java
new file mode 100644
index 0000000..020216b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.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-22
+ */
+@RestController
+@RequestMapping("/system/messageLog")
+public class MessageLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e298440..c5ec280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.alarm.controller;
 
 
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO;
+import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
 import com.casic.missiles.modular.alarm.service.IOverViewService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -28,7 +34,10 @@
 public class OverViewController extends ExportController {
 
     private final IOverViewService iOverViewService;
-    private final AbstractPermissionContext permissionContext;
+
+    private final IMessageLogService iMessageLogService;
+
+    private final IAlarmRecordsService iAlarmRecordsService;
 
     @ApiOperation("基本概况")
     @PostMapping("/overall")
@@ -45,26 +54,15 @@
         return ReturnUtil.success(iOverViewService.deviceStatus());
     }
 
-//    @ApiOperation("报警趋势分析")
-//    @PostMapping("/alarmTrend")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmTrend() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
-//    }
 
-    @ApiOperation("消息通知（待开发）")
+    @ApiOperation("消息通知")
     @PostMapping("/note")
     @ResponseBody
-    public ReturnDTO<AlarmCompanyResponseDTO> note(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+    public ReturnDTO<MessageLog> note() {
+        //toDo:查看权限
+        Page<MessageLog> page = PageFactory.defaultPage();
+        Page<MessageLog> messageLogPage = iMessageLogService.page(page);
+        return ReturnUtil.success(super.packForBT(messageLogPage));
     }
 
     @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
@@ -72,11 +70,8 @@
     @ResponseBody
     public ReturnDTO<AlarmCompanyResponseDTO> pop() {
 
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pop()));
+
     }
 
 
@@ -84,10 +79,8 @@
     @PostMapping("/alarmPosition")
     @ResponseBody
     public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType = "";
-        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, alarmPositionRequestDTO));
     }
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 19c050d..52af21e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -25,4 +25,7 @@
 
     AlarmRecords view(@Param("id") Long id);
 
+    Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
new file mode 100644
index 0000000..281593e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 协议管理	 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+@Mapper
+public interface MessageLogMapper extends BaseMapper<MessageLog> {
+
+}
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 63be4f7..31d7d32 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
@@ -38,7 +38,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -67,7 +67,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -109,4 +109,20 @@
 
     </select>
 
+
+    <select id="pop" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        SELECT
+        rd.*,
+        FROM
+        alarm_records rd
+        LEFT JOIN bus_ledger_all_view lr ON lr.ledgerCode = bl.LEDGER_CODE
+        where rd.STATUS =1
+        and rd.PROCESS_STATUS <![CDATA[ > ]]> 3
+        and rd.PROCESS_STATUS <![CDATA[ < ]]> 3
+        <if test="deptStrs != null and deptStrs !='' ">
+            and lr.DEPTID in (${deptStrs})
+        </if>
+        ORDER BY rd.TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
new file mode 100644
index 0000000..6143aaa
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -0,0 +1,20 @@
+<?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.MessageLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.MessageLog">
+        <id column="ID" property="id" />
+        <result column="MESSAGE_TYPE" property="messageType" />
+        <result column="MESSAGE_TYPE_DETAIL" property="messageTypeDetail" />
+        <result column="MESSAGE_CONTENT" property="messageContent" />
+        <result column="REMARK" property="remark" />
+        <result column="TS" property="ts" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, MESSAGE_TYPE, MESSAGE_TYPE_DETAIL, MESSAGE_CONTENT, REMARK, TS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index b146224..2925d1c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -79,6 +79,7 @@
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
+        order by ap.alarmSum desc
     </select>
 
     <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
new file mode 100644
index 0000000..0c3d9f8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -0,0 +1,57 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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-22
+ */
+@Getter
+@Setter
+@TableName("message_log")
+@ApiModel(value = "MessageLog对象", description = "消息通知管理	")
+public class MessageLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("消息类型（1、报警类、2确认/处置类、3消警类、4施工类）")
+    @TableField("MESSAGE_TYPE")
+    private String messageType;
+
+    @ApiModelProperty("消息类型详细")
+    @TableField("MESSAGE_TYPE_DETAIL")
+    private String messageTypeDetail;
+
+    @ApiModelProperty("消息内容")
+    @TableField("MESSAGE_CONTENT")
+    private String messageContent;
+
+    @ApiModelProperty("备注")
+    @TableField("REMARK")
+    private String remark;
+
+    @ApiModelProperty("创建时间")
+    @TableField("TS")
+    private Date ts;
+
+
+}
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 80db26d..8013db0 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
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<AlarmRecords>  pop();
+
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
     AlarmRecords  view(Long id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
new file mode 100644
index 0000000..975d25e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+
+/**
+ * <p>
+ * 消息通知管理	 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+public interface IMessageLogService extends IService<MessageLog> {
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java
new file mode 100644
index 0000000..020216b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.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-22
+ */
+@RestController
+@RequestMapping("/system/messageLog")
+public class MessageLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e298440..c5ec280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.alarm.controller;
 
 
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO;
+import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
 import com.casic.missiles.modular.alarm.service.IOverViewService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -28,7 +34,10 @@
 public class OverViewController extends ExportController {
 
     private final IOverViewService iOverViewService;
-    private final AbstractPermissionContext permissionContext;
+
+    private final IMessageLogService iMessageLogService;
+
+    private final IAlarmRecordsService iAlarmRecordsService;
 
     @ApiOperation("基本概况")
     @PostMapping("/overall")
@@ -45,26 +54,15 @@
         return ReturnUtil.success(iOverViewService.deviceStatus());
     }
 
-//    @ApiOperation("报警趋势分析")
-//    @PostMapping("/alarmTrend")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmTrend() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
-//    }
 
-    @ApiOperation("消息通知（待开发）")
+    @ApiOperation("消息通知")
     @PostMapping("/note")
     @ResponseBody
-    public ReturnDTO<AlarmCompanyResponseDTO> note(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+    public ReturnDTO<MessageLog> note() {
+        //toDo:查看权限
+        Page<MessageLog> page = PageFactory.defaultPage();
+        Page<MessageLog> messageLogPage = iMessageLogService.page(page);
+        return ReturnUtil.success(super.packForBT(messageLogPage));
     }
 
     @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
@@ -72,11 +70,8 @@
     @ResponseBody
     public ReturnDTO<AlarmCompanyResponseDTO> pop() {
 
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pop()));
+
     }
 
 
@@ -84,10 +79,8 @@
     @PostMapping("/alarmPosition")
     @ResponseBody
     public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType = "";
-        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, alarmPositionRequestDTO));
     }
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 19c050d..52af21e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -25,4 +25,7 @@
 
     AlarmRecords view(@Param("id") Long id);
 
+    Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
new file mode 100644
index 0000000..281593e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 协议管理	 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+@Mapper
+public interface MessageLogMapper extends BaseMapper<MessageLog> {
+
+}
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 63be4f7..31d7d32 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
@@ -38,7 +38,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -67,7 +67,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -109,4 +109,20 @@
 
     </select>
 
+
+    <select id="pop" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        SELECT
+        rd.*,
+        FROM
+        alarm_records rd
+        LEFT JOIN bus_ledger_all_view lr ON lr.ledgerCode = bl.LEDGER_CODE
+        where rd.STATUS =1
+        and rd.PROCESS_STATUS <![CDATA[ > ]]> 3
+        and rd.PROCESS_STATUS <![CDATA[ < ]]> 3
+        <if test="deptStrs != null and deptStrs !='' ">
+            and lr.DEPTID in (${deptStrs})
+        </if>
+        ORDER BY rd.TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
new file mode 100644
index 0000000..6143aaa
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -0,0 +1,20 @@
+<?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.MessageLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.MessageLog">
+        <id column="ID" property="id" />
+        <result column="MESSAGE_TYPE" property="messageType" />
+        <result column="MESSAGE_TYPE_DETAIL" property="messageTypeDetail" />
+        <result column="MESSAGE_CONTENT" property="messageContent" />
+        <result column="REMARK" property="remark" />
+        <result column="TS" property="ts" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, MESSAGE_TYPE, MESSAGE_TYPE_DETAIL, MESSAGE_CONTENT, REMARK, TS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index b146224..2925d1c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -79,6 +79,7 @@
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
+        order by ap.alarmSum desc
     </select>
 
     <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
new file mode 100644
index 0000000..0c3d9f8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -0,0 +1,57 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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-22
+ */
+@Getter
+@Setter
+@TableName("message_log")
+@ApiModel(value = "MessageLog对象", description = "消息通知管理	")
+public class MessageLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("消息类型（1、报警类、2确认/处置类、3消警类、4施工类）")
+    @TableField("MESSAGE_TYPE")
+    private String messageType;
+
+    @ApiModelProperty("消息类型详细")
+    @TableField("MESSAGE_TYPE_DETAIL")
+    private String messageTypeDetail;
+
+    @ApiModelProperty("消息内容")
+    @TableField("MESSAGE_CONTENT")
+    private String messageContent;
+
+    @ApiModelProperty("备注")
+    @TableField("REMARK")
+    private String remark;
+
+    @ApiModelProperty("创建时间")
+    @TableField("TS")
+    private Date ts;
+
+
+}
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 80db26d..8013db0 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
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<AlarmRecords>  pop();
+
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
     AlarmRecords  view(Long id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
new file mode 100644
index 0000000..975d25e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+
+/**
+ * <p>
+ * 消息通知管理	 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+public interface IMessageLogService extends IService<MessageLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
index 38ae078..0b30b68 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
@@ -20,7 +20,7 @@
 
     List<CommonResponseDTO>  deviceStatus();
 
-    List<AlarmPositionResponseDTO>  alarmPosition(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
+    List<AlarmPositionResponseDTO>  alarmPosition(String alarmType ,AlarmPositionRequestDTO alarmPositionRequestDTO);
 
 
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java
new file mode 100644
index 0000000..020216b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.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-22
+ */
+@RestController
+@RequestMapping("/system/messageLog")
+public class MessageLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e298440..c5ec280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.alarm.controller;
 
 
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO;
+import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
 import com.casic.missiles.modular.alarm.service.IOverViewService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -28,7 +34,10 @@
 public class OverViewController extends ExportController {
 
     private final IOverViewService iOverViewService;
-    private final AbstractPermissionContext permissionContext;
+
+    private final IMessageLogService iMessageLogService;
+
+    private final IAlarmRecordsService iAlarmRecordsService;
 
     @ApiOperation("基本概况")
     @PostMapping("/overall")
@@ -45,26 +54,15 @@
         return ReturnUtil.success(iOverViewService.deviceStatus());
     }
 
-//    @ApiOperation("报警趋势分析")
-//    @PostMapping("/alarmTrend")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmTrend() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
-//    }
 
-    @ApiOperation("消息通知（待开发）")
+    @ApiOperation("消息通知")
     @PostMapping("/note")
     @ResponseBody
-    public ReturnDTO<AlarmCompanyResponseDTO> note(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+    public ReturnDTO<MessageLog> note() {
+        //toDo:查看权限
+        Page<MessageLog> page = PageFactory.defaultPage();
+        Page<MessageLog> messageLogPage = iMessageLogService.page(page);
+        return ReturnUtil.success(super.packForBT(messageLogPage));
     }
 
     @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
@@ -72,11 +70,8 @@
     @ResponseBody
     public ReturnDTO<AlarmCompanyResponseDTO> pop() {
 
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pop()));
+
     }
 
 
@@ -84,10 +79,8 @@
     @PostMapping("/alarmPosition")
     @ResponseBody
     public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType = "";
-        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, alarmPositionRequestDTO));
     }
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 19c050d..52af21e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -25,4 +25,7 @@
 
     AlarmRecords view(@Param("id") Long id);
 
+    Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
new file mode 100644
index 0000000..281593e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 协议管理	 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+@Mapper
+public interface MessageLogMapper extends BaseMapper<MessageLog> {
+
+}
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 63be4f7..31d7d32 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
@@ -38,7 +38,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -67,7 +67,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -109,4 +109,20 @@
 
     </select>
 
+
+    <select id="pop" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        SELECT
+        rd.*,
+        FROM
+        alarm_records rd
+        LEFT JOIN bus_ledger_all_view lr ON lr.ledgerCode = bl.LEDGER_CODE
+        where rd.STATUS =1
+        and rd.PROCESS_STATUS <![CDATA[ > ]]> 3
+        and rd.PROCESS_STATUS <![CDATA[ < ]]> 3
+        <if test="deptStrs != null and deptStrs !='' ">
+            and lr.DEPTID in (${deptStrs})
+        </if>
+        ORDER BY rd.TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
new file mode 100644
index 0000000..6143aaa
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -0,0 +1,20 @@
+<?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.MessageLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.MessageLog">
+        <id column="ID" property="id" />
+        <result column="MESSAGE_TYPE" property="messageType" />
+        <result column="MESSAGE_TYPE_DETAIL" property="messageTypeDetail" />
+        <result column="MESSAGE_CONTENT" property="messageContent" />
+        <result column="REMARK" property="remark" />
+        <result column="TS" property="ts" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, MESSAGE_TYPE, MESSAGE_TYPE_DETAIL, MESSAGE_CONTENT, REMARK, TS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index b146224..2925d1c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -79,6 +79,7 @@
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
+        order by ap.alarmSum desc
     </select>
 
     <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
new file mode 100644
index 0000000..0c3d9f8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -0,0 +1,57 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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-22
+ */
+@Getter
+@Setter
+@TableName("message_log")
+@ApiModel(value = "MessageLog对象", description = "消息通知管理	")
+public class MessageLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("消息类型（1、报警类、2确认/处置类、3消警类、4施工类）")
+    @TableField("MESSAGE_TYPE")
+    private String messageType;
+
+    @ApiModelProperty("消息类型详细")
+    @TableField("MESSAGE_TYPE_DETAIL")
+    private String messageTypeDetail;
+
+    @ApiModelProperty("消息内容")
+    @TableField("MESSAGE_CONTENT")
+    private String messageContent;
+
+    @ApiModelProperty("备注")
+    @TableField("REMARK")
+    private String remark;
+
+    @ApiModelProperty("创建时间")
+    @TableField("TS")
+    private Date ts;
+
+
+}
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 80db26d..8013db0 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
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<AlarmRecords>  pop();
+
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
     AlarmRecords  view(Long id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
new file mode 100644
index 0000000..975d25e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+
+/**
+ * <p>
+ * 消息通知管理	 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+public interface IMessageLogService extends IService<MessageLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
index 38ae078..0b30b68 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
@@ -20,7 +20,7 @@
 
     List<CommonResponseDTO>  deviceStatus();
 
-    List<AlarmPositionResponseDTO>  alarmPosition(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
+    List<AlarmPositionResponseDTO>  alarmPosition(String alarmType ,AlarmPositionRequestDTO alarmPositionRequestDTO);
 
 
 
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 85def7b..1e8fe66 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
@@ -1,10 +1,12 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper;
@@ -25,6 +27,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -55,6 +58,19 @@
     }
 
     @Override
+    public Page<AlarmRecords> pop() {
+        String deptIdStr = "";
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) {
+            permissionContext.getAuthService().getLoginUserDataScope().getDeptIds()
+                    .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(","));
+        }
+        Page<AlarmRecords> page = PageFactory.defaultPage();
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pop(page,deptIdStr);
+        return alarmRecordsPage;
+    }
+
+    @Override
     public Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope);
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java
new file mode 100644
index 0000000..020216b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.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-22
+ */
+@RestController
+@RequestMapping("/system/messageLog")
+public class MessageLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e298440..c5ec280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.alarm.controller;
 
 
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO;
+import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
 import com.casic.missiles.modular.alarm.service.IOverViewService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -28,7 +34,10 @@
 public class OverViewController extends ExportController {
 
     private final IOverViewService iOverViewService;
-    private final AbstractPermissionContext permissionContext;
+
+    private final IMessageLogService iMessageLogService;
+
+    private final IAlarmRecordsService iAlarmRecordsService;
 
     @ApiOperation("基本概况")
     @PostMapping("/overall")
@@ -45,26 +54,15 @@
         return ReturnUtil.success(iOverViewService.deviceStatus());
     }
 
-//    @ApiOperation("报警趋势分析")
-//    @PostMapping("/alarmTrend")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmTrend() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
-//    }
 
-    @ApiOperation("消息通知（待开发）")
+    @ApiOperation("消息通知")
     @PostMapping("/note")
     @ResponseBody
-    public ReturnDTO<AlarmCompanyResponseDTO> note(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+    public ReturnDTO<MessageLog> note() {
+        //toDo:查看权限
+        Page<MessageLog> page = PageFactory.defaultPage();
+        Page<MessageLog> messageLogPage = iMessageLogService.page(page);
+        return ReturnUtil.success(super.packForBT(messageLogPage));
     }
 
     @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
@@ -72,11 +70,8 @@
     @ResponseBody
     public ReturnDTO<AlarmCompanyResponseDTO> pop() {
 
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pop()));
+
     }
 
 
@@ -84,10 +79,8 @@
     @PostMapping("/alarmPosition")
     @ResponseBody
     public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType = "";
-        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, alarmPositionRequestDTO));
     }
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 19c050d..52af21e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -25,4 +25,7 @@
 
     AlarmRecords view(@Param("id") Long id);
 
+    Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
new file mode 100644
index 0000000..281593e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 协议管理	 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+@Mapper
+public interface MessageLogMapper extends BaseMapper<MessageLog> {
+
+}
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 63be4f7..31d7d32 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
@@ -38,7 +38,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -67,7 +67,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -109,4 +109,20 @@
 
     </select>
 
+
+    <select id="pop" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        SELECT
+        rd.*,
+        FROM
+        alarm_records rd
+        LEFT JOIN bus_ledger_all_view lr ON lr.ledgerCode = bl.LEDGER_CODE
+        where rd.STATUS =1
+        and rd.PROCESS_STATUS <![CDATA[ > ]]> 3
+        and rd.PROCESS_STATUS <![CDATA[ < ]]> 3
+        <if test="deptStrs != null and deptStrs !='' ">
+            and lr.DEPTID in (${deptStrs})
+        </if>
+        ORDER BY rd.TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
new file mode 100644
index 0000000..6143aaa
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -0,0 +1,20 @@
+<?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.MessageLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.MessageLog">
+        <id column="ID" property="id" />
+        <result column="MESSAGE_TYPE" property="messageType" />
+        <result column="MESSAGE_TYPE_DETAIL" property="messageTypeDetail" />
+        <result column="MESSAGE_CONTENT" property="messageContent" />
+        <result column="REMARK" property="remark" />
+        <result column="TS" property="ts" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, MESSAGE_TYPE, MESSAGE_TYPE_DETAIL, MESSAGE_CONTENT, REMARK, TS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index b146224..2925d1c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -79,6 +79,7 @@
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
+        order by ap.alarmSum desc
     </select>
 
     <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
new file mode 100644
index 0000000..0c3d9f8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -0,0 +1,57 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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-22
+ */
+@Getter
+@Setter
+@TableName("message_log")
+@ApiModel(value = "MessageLog对象", description = "消息通知管理	")
+public class MessageLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("消息类型（1、报警类、2确认/处置类、3消警类、4施工类）")
+    @TableField("MESSAGE_TYPE")
+    private String messageType;
+
+    @ApiModelProperty("消息类型详细")
+    @TableField("MESSAGE_TYPE_DETAIL")
+    private String messageTypeDetail;
+
+    @ApiModelProperty("消息内容")
+    @TableField("MESSAGE_CONTENT")
+    private String messageContent;
+
+    @ApiModelProperty("备注")
+    @TableField("REMARK")
+    private String remark;
+
+    @ApiModelProperty("创建时间")
+    @TableField("TS")
+    private Date ts;
+
+
+}
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 80db26d..8013db0 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
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<AlarmRecords>  pop();
+
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
     AlarmRecords  view(Long id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
new file mode 100644
index 0000000..975d25e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+
+/**
+ * <p>
+ * 消息通知管理	 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+public interface IMessageLogService extends IService<MessageLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
index 38ae078..0b30b68 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
@@ -20,7 +20,7 @@
 
     List<CommonResponseDTO>  deviceStatus();
 
-    List<AlarmPositionResponseDTO>  alarmPosition(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
+    List<AlarmPositionResponseDTO>  alarmPosition(String alarmType ,AlarmPositionRequestDTO alarmPositionRequestDTO);
 
 
 
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 85def7b..1e8fe66 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
@@ -1,10 +1,12 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper;
@@ -25,6 +27,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -55,6 +58,19 @@
     }
 
     @Override
+    public Page<AlarmRecords> pop() {
+        String deptIdStr = "";
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) {
+            permissionContext.getAuthService().getLoginUserDataScope().getDeptIds()
+                    .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(","));
+        }
+        Page<AlarmRecords> page = PageFactory.defaultPage();
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pop(page,deptIdStr);
+        return alarmRecordsPage;
+    }
+
+    @Override
     public Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope);
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
new file mode 100644
index 0000000..03811ab
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.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.MessageLogMapper;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 协议管理	 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+@Service
+public class MessageLogServiceImpl extends ServiceImpl<MessageLogMapper, MessageLog> implements IMessageLogService {
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java
new file mode 100644
index 0000000..020216b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.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-22
+ */
+@RestController
+@RequestMapping("/system/messageLog")
+public class MessageLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e298440..c5ec280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.alarm.controller;
 
 
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO;
+import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
 import com.casic.missiles.modular.alarm.service.IOverViewService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -28,7 +34,10 @@
 public class OverViewController extends ExportController {
 
     private final IOverViewService iOverViewService;
-    private final AbstractPermissionContext permissionContext;
+
+    private final IMessageLogService iMessageLogService;
+
+    private final IAlarmRecordsService iAlarmRecordsService;
 
     @ApiOperation("基本概况")
     @PostMapping("/overall")
@@ -45,26 +54,15 @@
         return ReturnUtil.success(iOverViewService.deviceStatus());
     }
 
-//    @ApiOperation("报警趋势分析")
-//    @PostMapping("/alarmTrend")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmTrend() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
-//    }
 
-    @ApiOperation("消息通知（待开发）")
+    @ApiOperation("消息通知")
     @PostMapping("/note")
     @ResponseBody
-    public ReturnDTO<AlarmCompanyResponseDTO> note(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+    public ReturnDTO<MessageLog> note() {
+        //toDo:查看权限
+        Page<MessageLog> page = PageFactory.defaultPage();
+        Page<MessageLog> messageLogPage = iMessageLogService.page(page);
+        return ReturnUtil.success(super.packForBT(messageLogPage));
     }
 
     @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
@@ -72,11 +70,8 @@
     @ResponseBody
     public ReturnDTO<AlarmCompanyResponseDTO> pop() {
 
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pop()));
+
     }
 
 
@@ -84,10 +79,8 @@
     @PostMapping("/alarmPosition")
     @ResponseBody
     public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType = "";
-        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, alarmPositionRequestDTO));
     }
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 19c050d..52af21e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -25,4 +25,7 @@
 
     AlarmRecords view(@Param("id") Long id);
 
+    Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
new file mode 100644
index 0000000..281593e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 协议管理	 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+@Mapper
+public interface MessageLogMapper extends BaseMapper<MessageLog> {
+
+}
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 63be4f7..31d7d32 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
@@ -38,7 +38,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -67,7 +67,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -109,4 +109,20 @@
 
     </select>
 
+
+    <select id="pop" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        SELECT
+        rd.*,
+        FROM
+        alarm_records rd
+        LEFT JOIN bus_ledger_all_view lr ON lr.ledgerCode = bl.LEDGER_CODE
+        where rd.STATUS =1
+        and rd.PROCESS_STATUS <![CDATA[ > ]]> 3
+        and rd.PROCESS_STATUS <![CDATA[ < ]]> 3
+        <if test="deptStrs != null and deptStrs !='' ">
+            and lr.DEPTID in (${deptStrs})
+        </if>
+        ORDER BY rd.TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
new file mode 100644
index 0000000..6143aaa
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -0,0 +1,20 @@
+<?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.MessageLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.MessageLog">
+        <id column="ID" property="id" />
+        <result column="MESSAGE_TYPE" property="messageType" />
+        <result column="MESSAGE_TYPE_DETAIL" property="messageTypeDetail" />
+        <result column="MESSAGE_CONTENT" property="messageContent" />
+        <result column="REMARK" property="remark" />
+        <result column="TS" property="ts" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, MESSAGE_TYPE, MESSAGE_TYPE_DETAIL, MESSAGE_CONTENT, REMARK, TS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index b146224..2925d1c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -79,6 +79,7 @@
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
+        order by ap.alarmSum desc
     </select>
 
     <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
new file mode 100644
index 0000000..0c3d9f8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -0,0 +1,57 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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-22
+ */
+@Getter
+@Setter
+@TableName("message_log")
+@ApiModel(value = "MessageLog对象", description = "消息通知管理	")
+public class MessageLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("消息类型（1、报警类、2确认/处置类、3消警类、4施工类）")
+    @TableField("MESSAGE_TYPE")
+    private String messageType;
+
+    @ApiModelProperty("消息类型详细")
+    @TableField("MESSAGE_TYPE_DETAIL")
+    private String messageTypeDetail;
+
+    @ApiModelProperty("消息内容")
+    @TableField("MESSAGE_CONTENT")
+    private String messageContent;
+
+    @ApiModelProperty("备注")
+    @TableField("REMARK")
+    private String remark;
+
+    @ApiModelProperty("创建时间")
+    @TableField("TS")
+    private Date ts;
+
+
+}
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 80db26d..8013db0 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
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<AlarmRecords>  pop();
+
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
     AlarmRecords  view(Long id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
new file mode 100644
index 0000000..975d25e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+
+/**
+ * <p>
+ * 消息通知管理	 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+public interface IMessageLogService extends IService<MessageLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
index 38ae078..0b30b68 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
@@ -20,7 +20,7 @@
 
     List<CommonResponseDTO>  deviceStatus();
 
-    List<AlarmPositionResponseDTO>  alarmPosition(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
+    List<AlarmPositionResponseDTO>  alarmPosition(String alarmType ,AlarmPositionRequestDTO alarmPositionRequestDTO);
 
 
 
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 85def7b..1e8fe66 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
@@ -1,10 +1,12 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper;
@@ -25,6 +27,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -55,6 +58,19 @@
     }
 
     @Override
+    public Page<AlarmRecords> pop() {
+        String deptIdStr = "";
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) {
+            permissionContext.getAuthService().getLoginUserDataScope().getDeptIds()
+                    .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(","));
+        }
+        Page<AlarmRecords> page = PageFactory.defaultPage();
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pop(page,deptIdStr);
+        return alarmRecordsPage;
+    }
+
+    @Override
     public Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope);
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
new file mode 100644
index 0000000..03811ab
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.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.MessageLogMapper;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 协议管理	 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+@Service
+public class MessageLogServiceImpl extends ServiceImpl<MessageLogMapper, MessageLog> implements IMessageLogService {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 5fb7610..a3e50f3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -3,7 +3,6 @@
 import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dao.OverViewMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
@@ -29,7 +28,6 @@
 @Service
 public class OverViewServiceImpl extends ServiceImpl<OverViewMapper, AlarmRecords> implements IOverViewService {
 
-    private final AbstractDeptService abstractDeptService;
     private final AbstractPermissionContext permissionContext;
 
     @Override
@@ -43,10 +41,9 @@
     }
 
     @Override
-    public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, List<Long> deptIds, AlarmPositionRequestDTO request) {
+    public List<AlarmPositionResponseDTO> alarmPosition(String alarmType,  AlarmPositionRequestDTO request) {
         //Todo:加入报警类型
-        String deptStrs = deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(","));
-        List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, deptStrs, request);
+        List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
         });

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.java
new file mode 100644
index 0000000..020216b
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/MessageLogController.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-22
+ */
+@RestController
+@RequestMapping("/system/messageLog")
+public class MessageLogController {
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e298440..c5ec280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -1,11 +1,17 @@
 package com.casic.missiles.modular.alarm.controller;
 
 
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO;
+import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
 import com.casic.missiles.modular.alarm.service.IOverViewService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -28,7 +34,10 @@
 public class OverViewController extends ExportController {
 
     private final IOverViewService iOverViewService;
-    private final AbstractPermissionContext permissionContext;
+
+    private final IMessageLogService iMessageLogService;
+
+    private final IAlarmRecordsService iAlarmRecordsService;
 
     @ApiOperation("基本概况")
     @PostMapping("/overall")
@@ -45,26 +54,15 @@
         return ReturnUtil.success(iOverViewService.deviceStatus());
     }
 
-//    @ApiOperation("报警趋势分析")
-//    @PostMapping("/alarmTrend")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmTrend() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
-//    }
 
-    @ApiOperation("消息通知（待开发）")
+    @ApiOperation("消息通知")
     @PostMapping("/note")
     @ResponseBody
-    public ReturnDTO<AlarmCompanyResponseDTO> note(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+    public ReturnDTO<MessageLog> note() {
+        //toDo:查看权限
+        Page<MessageLog> page = PageFactory.defaultPage();
+        Page<MessageLog> messageLogPage = iMessageLogService.page(page);
+        return ReturnUtil.success(super.packForBT(messageLogPage));
     }
 
     @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
@@ -72,11 +70,8 @@
     @ResponseBody
     public ReturnDTO<AlarmCompanyResponseDTO> pop() {
 
-        //toDo:公司分类
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType = "";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
-        return null;
+        return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pop()));
+
     }
 
 
@@ -84,10 +79,8 @@
     @PostMapping("/alarmPosition")
     @ResponseBody
     public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType = "";
-        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return ReturnUtil.success(iOverViewService.alarmPosition(alarmType, alarmPositionRequestDTO));
     }
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 19c050d..52af21e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -25,4 +25,7 @@
 
     AlarmRecords view(@Param("id") Long id);
 
+    Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
+
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
new file mode 100644
index 0000000..281593e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/MessageLogMapper.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 协议管理	 Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+@Mapper
+public interface MessageLogMapper extends BaseMapper<MessageLog> {
+
+}
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 63be4f7..31d7d32 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
@@ -38,7 +38,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -67,7 +67,7 @@
         LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
         LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
         AND bl.VALID = 1
-        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
@@ -109,4 +109,20 @@
 
     </select>
 
+
+    <select id="pop" resultType="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        SELECT
+        rd.*,
+        FROM
+        alarm_records rd
+        LEFT JOIN bus_ledger_all_view lr ON lr.ledgerCode = bl.LEDGER_CODE
+        where rd.STATUS =1
+        and rd.PROCESS_STATUS <![CDATA[ > ]]> 3
+        and rd.PROCESS_STATUS <![CDATA[ < ]]> 3
+        <if test="deptStrs != null and deptStrs !='' ">
+            and lr.DEPTID in (${deptStrs})
+        </if>
+        ORDER BY rd.TS DESC
+    </select>
+
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
new file mode 100644
index 0000000..6143aaa
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/MessageLogMapper.xml
@@ -0,0 +1,20 @@
+<?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.MessageLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.MessageLog">
+        <id column="ID" property="id" />
+        <result column="MESSAGE_TYPE" property="messageType" />
+        <result column="MESSAGE_TYPE_DETAIL" property="messageTypeDetail" />
+        <result column="MESSAGE_CONTENT" property="messageContent" />
+        <result column="REMARK" property="remark" />
+        <result column="TS" property="ts" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, MESSAGE_TYPE, MESSAGE_TYPE_DETAIL, MESSAGE_CONTENT, REMARK, TS
+    </sql>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
index b146224..2925d1c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -79,6 +79,7 @@
         SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM  alarm_position_group ap
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
+        order by ap.alarmSum desc
     </select>
 
     <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
new file mode 100644
index 0000000..0c3d9f8
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -0,0 +1,57 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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-22
+ */
+@Getter
+@Setter
+@TableName("message_log")
+@ApiModel(value = "MessageLog对象", description = "消息通知管理	")
+public class MessageLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("消息类型（1、报警类、2确认/处置类、3消警类、4施工类）")
+    @TableField("MESSAGE_TYPE")
+    private String messageType;
+
+    @ApiModelProperty("消息类型详细")
+    @TableField("MESSAGE_TYPE_DETAIL")
+    private String messageTypeDetail;
+
+    @ApiModelProperty("消息内容")
+    @TableField("MESSAGE_CONTENT")
+    private String messageContent;
+
+    @ApiModelProperty("备注")
+    @TableField("REMARK")
+    private String remark;
+
+    @ApiModelProperty("创建时间")
+    @TableField("TS")
+    private Date ts;
+
+
+}
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 80db26d..8013db0 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
@@ -22,6 +22,8 @@
 
     Page<AlarmRecords>  pageList(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
+    Page<AlarmRecords>  pop();
+
     Page<AlarmRecords>  historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope);
 
     AlarmRecords  view(Long id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
new file mode 100644
index 0000000..975d25e
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+
+/**
+ * <p>
+ * 消息通知管理	 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+public interface IMessageLogService extends IService<MessageLog> {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
index 38ae078..0b30b68 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
@@ -20,7 +20,7 @@
 
     List<CommonResponseDTO>  deviceStatus();
 
-    List<AlarmPositionResponseDTO>  alarmPosition(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
+    List<AlarmPositionResponseDTO>  alarmPosition(String alarmType ,AlarmPositionRequestDTO alarmPositionRequestDTO);
 
 
 
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 85def7b..1e8fe66 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
@@ -1,10 +1,12 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 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.core.page.PageFactory;
 import com.casic.missiles.enums.ApprovalStatusEnum;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper;
@@ -25,6 +27,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -55,6 +58,19 @@
     }
 
     @Override
+    public Page<AlarmRecords> pop() {
+        String deptIdStr = "";
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) {
+            permissionContext.getAuthService().getLoginUserDataScope().getDeptIds()
+                    .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(","));
+        }
+        Page<AlarmRecords> page = PageFactory.defaultPage();
+        Page<AlarmRecords> alarmRecordsPage = this.baseMapper.pop(page,deptIdStr);
+        return alarmRecordsPage;
+    }
+
+    @Override
     public Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, AlarmRecordDTO request, DataScope dataScope) {
         Page<AlarmRecords> alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope);
         List<AlarmRecords> alarmRecordsList = alarmRecordsPage.getRecords();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
new file mode 100644
index 0000000..03811ab
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.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.MessageLogMapper;
+import com.casic.missiles.modular.alarm.entity.MessageLog;
+import com.casic.missiles.modular.alarm.service.IMessageLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 协议管理	 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-22
+ */
+@Service
+public class MessageLogServiceImpl extends ServiceImpl<MessageLogMapper, MessageLog> implements IMessageLogService {
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 5fb7610..a3e50f3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -3,7 +3,6 @@
 import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.application.service.AbstractDeptService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.alarm.dao.OverViewMapper;
 import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
@@ -29,7 +28,6 @@
 @Service
 public class OverViewServiceImpl extends ServiceImpl<OverViewMapper, AlarmRecords> implements IOverViewService {
 
-    private final AbstractDeptService abstractDeptService;
     private final AbstractPermissionContext permissionContext;
 
     @Override
@@ -43,10 +41,9 @@
     }
 
     @Override
-    public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, List<Long> deptIds, AlarmPositionRequestDTO request) {
+    public List<AlarmPositionResponseDTO> alarmPosition(String alarmType,  AlarmPositionRequestDTO request) {
         //Todo:加入报警类型
-        String deptStrs = deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(","));
-        List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, deptStrs, request);
+        List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
             alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
         });
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 3fc108a..00f773d 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,7 +65,7 @@
 
                 //策略配置
                 .strategyConfig(builder -> {
-                    builder.addInclude("approval_log","suspend_log","remind_log") // 设置需要生成的表名
+                    builder.addInclude("message_log") // 设置需要生成的表名
                             .addTablePrefix() // 设置过滤表前缀
                             .entityBuilder() //实体类配置
                             .enableLombok() //使用lombok