diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
index 7b9ddf4..4992ab1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
@@ -5,8 +5,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmTypeRequestDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmStaticsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -45,13 +44,11 @@
     @ApiOperation("各类报警统计")
     @PostMapping("/alarmType")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+    public ReturnDTO<CommonResponseDTO> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
         String alarmType="";
-        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,dataScope.getDeptIds(),alarmTypeRequestDTO));
+        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,alarmTypeRequestDTO));
     }
-//
+
 //    @ApiOperation("报警趋势分析")
 //    @PostMapping("/alarmTrend")
 //    @ResponseBody
@@ -61,21 +58,22 @@
 //        String alarmType="";
 //        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
 //    }
-//
-//    @ApiOperation("各单位报警统计")
-//    @PostMapping("/alarmCompany")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmCompany() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds()));
-//    }
+
+    @ApiOperation("各单位报警统计")
+    @PostMapping("/alarmCompany")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> alarmCompany(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+
+        //toDo:公司分类
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        String alarmType="";
+        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds(),alarmPositionRequestDTO));
+    }
 
     @ApiOperation("异常位置分析")
     @PostMapping("/alarmPosition")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+    public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType="";

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
index 7b9ddf4..4992ab1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
@@ -5,8 +5,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmTypeRequestDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmStaticsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -45,13 +44,11 @@
     @ApiOperation("各类报警统计")
     @PostMapping("/alarmType")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+    public ReturnDTO<CommonResponseDTO> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
         String alarmType="";
-        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,dataScope.getDeptIds(),alarmTypeRequestDTO));
+        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,alarmTypeRequestDTO));
     }
-//
+
 //    @ApiOperation("报警趋势分析")
 //    @PostMapping("/alarmTrend")
 //    @ResponseBody
@@ -61,21 +58,22 @@
 //        String alarmType="";
 //        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
 //    }
-//
-//    @ApiOperation("各单位报警统计")
-//    @PostMapping("/alarmCompany")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmCompany() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds()));
-//    }
+
+    @ApiOperation("各单位报警统计")
+    @PostMapping("/alarmCompany")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> alarmCompany(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+
+        //toDo:公司分类
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        String alarmType="";
+        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds(),alarmPositionRequestDTO));
+    }
 
     @ApiOperation("异常位置分析")
     @PostMapping("/alarmPosition")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+    public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType="";
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
new file mode 100644
index 0000000..e298440
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -0,0 +1,94 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.service.IOverViewService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 首页展示 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-17
+ */
+@Api(tags = "首页展示接口模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/homePage/apis")
+public class OverViewController extends ExportController {
+
+    private final IOverViewService iOverViewService;
+    private final AbstractPermissionContext permissionContext;
+
+    @ApiOperation("基本概况")
+    @PostMapping("/overall")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> overall() {
+        //toDo:管线长度无法统计，暂定前端写入
+        return ReturnUtil.success(iOverViewService.overall());
+    }
+
+    @ApiOperation("设备运行情况，1：在线，0：离线，2：停用")
+    @PostMapping("/deviceStatus")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> deviceStatus() {
+        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("消息通知（待开发）")
+    @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;
+    }
+
+    @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
+    @PostMapping("/pop")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> pop() {
+
+        //toDo:公司分类
+//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+//        String alarmType = "";
+//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return null;
+    }
+
+
+    @ApiOperation("异常位置分析")
+    @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));
+    }
+
+}
+

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
index 7b9ddf4..4992ab1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
@@ -5,8 +5,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmTypeRequestDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmStaticsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -45,13 +44,11 @@
     @ApiOperation("各类报警统计")
     @PostMapping("/alarmType")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+    public ReturnDTO<CommonResponseDTO> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
         String alarmType="";
-        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,dataScope.getDeptIds(),alarmTypeRequestDTO));
+        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,alarmTypeRequestDTO));
     }
-//
+
 //    @ApiOperation("报警趋势分析")
 //    @PostMapping("/alarmTrend")
 //    @ResponseBody
@@ -61,21 +58,22 @@
 //        String alarmType="";
 //        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
 //    }
-//
-//    @ApiOperation("各单位报警统计")
-//    @PostMapping("/alarmCompany")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmCompany() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds()));
-//    }
+
+    @ApiOperation("各单位报警统计")
+    @PostMapping("/alarmCompany")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> alarmCompany(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+
+        //toDo:公司分类
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        String alarmType="";
+        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds(),alarmPositionRequestDTO));
+    }
 
     @ApiOperation("异常位置分析")
     @PostMapping("/alarmPosition")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+    public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType="";
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
new file mode 100644
index 0000000..e298440
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -0,0 +1,94 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.service.IOverViewService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 首页展示 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-17
+ */
+@Api(tags = "首页展示接口模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/homePage/apis")
+public class OverViewController extends ExportController {
+
+    private final IOverViewService iOverViewService;
+    private final AbstractPermissionContext permissionContext;
+
+    @ApiOperation("基本概况")
+    @PostMapping("/overall")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> overall() {
+        //toDo:管线长度无法统计，暂定前端写入
+        return ReturnUtil.success(iOverViewService.overall());
+    }
+
+    @ApiOperation("设备运行情况，1：在线，0：离线，2：停用")
+    @PostMapping("/deviceStatus")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> deviceStatus() {
+        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("消息通知（待开发）")
+    @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;
+    }
+
+    @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
+    @PostMapping("/pop")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> pop() {
+
+        //toDo:公司分类
+//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+//        String alarmType = "";
+//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return null;
+    }
+
+
+    @ApiOperation("异常位置分析")
+    @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));
+    }
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
index acd97dc..0028d7f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
@@ -9,6 +9,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,7 +30,11 @@
                                                  @Param("request") AlarmPositionRequestDTO request);
 
     List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
-                                      @Param("deptIds") String deptIds,
+                                      @Param("deptStrs") String deptStrs,
                                       @Param("request") AlarmTypeRequestDTO request);
 
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
index 7b9ddf4..4992ab1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
@@ -5,8 +5,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmTypeRequestDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmStaticsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -45,13 +44,11 @@
     @ApiOperation("各类报警统计")
     @PostMapping("/alarmType")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+    public ReturnDTO<CommonResponseDTO> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
         String alarmType="";
-        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,dataScope.getDeptIds(),alarmTypeRequestDTO));
+        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,alarmTypeRequestDTO));
     }
-//
+
 //    @ApiOperation("报警趋势分析")
 //    @PostMapping("/alarmTrend")
 //    @ResponseBody
@@ -61,21 +58,22 @@
 //        String alarmType="";
 //        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
 //    }
-//
-//    @ApiOperation("各单位报警统计")
-//    @PostMapping("/alarmCompany")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmCompany() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds()));
-//    }
+
+    @ApiOperation("各单位报警统计")
+    @PostMapping("/alarmCompany")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> alarmCompany(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+
+        //toDo:公司分类
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        String alarmType="";
+        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds(),alarmPositionRequestDTO));
+    }
 
     @ApiOperation("异常位置分析")
     @PostMapping("/alarmPosition")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+    public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType="";
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
new file mode 100644
index 0000000..e298440
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -0,0 +1,94 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.service.IOverViewService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 首页展示 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-17
+ */
+@Api(tags = "首页展示接口模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/homePage/apis")
+public class OverViewController extends ExportController {
+
+    private final IOverViewService iOverViewService;
+    private final AbstractPermissionContext permissionContext;
+
+    @ApiOperation("基本概况")
+    @PostMapping("/overall")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> overall() {
+        //toDo:管线长度无法统计，暂定前端写入
+        return ReturnUtil.success(iOverViewService.overall());
+    }
+
+    @ApiOperation("设备运行情况，1：在线，0：离线，2：停用")
+    @PostMapping("/deviceStatus")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> deviceStatus() {
+        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("消息通知（待开发）")
+    @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;
+    }
+
+    @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
+    @PostMapping("/pop")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> pop() {
+
+        //toDo:公司分类
+//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+//        String alarmType = "";
+//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return null;
+    }
+
+
+    @ApiOperation("异常位置分析")
+    @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));
+    }
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
index acd97dc..0028d7f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
@@ -9,6 +9,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,7 +30,11 @@
                                                  @Param("request") AlarmPositionRequestDTO request);
 
     List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
-                                      @Param("deptIds") String deptIds,
+                                      @Param("deptStrs") String deptStrs,
                                       @Param("request") AlarmTypeRequestDTO request);
 
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
new file mode 100644
index 0000000..7cdb865
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -0,0 +1,38 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报警管理（暂定） Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@Mapper
+public interface OverViewMapper extends BaseMapper<AlarmRecords> {
+
+    List<CommonResponseDTO> overall(@Param("deptStrs") String deptStrs);
+
+    List<CommonResponseDTO> deviceStatus(@Param("deptStrs") String deptStrs);
+
+    List<AlarmPositionResponseDTO> alarmPosition(@Param("alarmType") String alarmType,
+                                                 @Param("deptIds") String deptIds,
+                                                 @Param("request") AlarmPositionRequestDTO request);
+
+    List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
+                                      @Param("deptStrs") String deptStrs,
+                                      @Param("request") AlarmTypeRequestDTO request);
+
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
index 7b9ddf4..4992ab1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
@@ -5,8 +5,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmTypeRequestDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmStaticsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -45,13 +44,11 @@
     @ApiOperation("各类报警统计")
     @PostMapping("/alarmType")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+    public ReturnDTO<CommonResponseDTO> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
         String alarmType="";
-        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,dataScope.getDeptIds(),alarmTypeRequestDTO));
+        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,alarmTypeRequestDTO));
     }
-//
+
 //    @ApiOperation("报警趋势分析")
 //    @PostMapping("/alarmTrend")
 //    @ResponseBody
@@ -61,21 +58,22 @@
 //        String alarmType="";
 //        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
 //    }
-//
-//    @ApiOperation("各单位报警统计")
-//    @PostMapping("/alarmCompany")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmCompany() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds()));
-//    }
+
+    @ApiOperation("各单位报警统计")
+    @PostMapping("/alarmCompany")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> alarmCompany(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+
+        //toDo:公司分类
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        String alarmType="";
+        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds(),alarmPositionRequestDTO));
+    }
 
     @ApiOperation("异常位置分析")
     @PostMapping("/alarmPosition")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+    public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType="";
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
new file mode 100644
index 0000000..e298440
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -0,0 +1,94 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.service.IOverViewService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 首页展示 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-17
+ */
+@Api(tags = "首页展示接口模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/homePage/apis")
+public class OverViewController extends ExportController {
+
+    private final IOverViewService iOverViewService;
+    private final AbstractPermissionContext permissionContext;
+
+    @ApiOperation("基本概况")
+    @PostMapping("/overall")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> overall() {
+        //toDo:管线长度无法统计，暂定前端写入
+        return ReturnUtil.success(iOverViewService.overall());
+    }
+
+    @ApiOperation("设备运行情况，1：在线，0：离线，2：停用")
+    @PostMapping("/deviceStatus")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> deviceStatus() {
+        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("消息通知（待开发）")
+    @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;
+    }
+
+    @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
+    @PostMapping("/pop")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> pop() {
+
+        //toDo:公司分类
+//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+//        String alarmType = "";
+//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return null;
+    }
+
+
+    @ApiOperation("异常位置分析")
+    @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));
+    }
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
index acd97dc..0028d7f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
@@ -9,6 +9,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,7 +30,11 @@
                                                  @Param("request") AlarmPositionRequestDTO request);
 
     List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
-                                      @Param("deptIds") String deptIds,
+                                      @Param("deptStrs") String deptStrs,
                                       @Param("request") AlarmTypeRequestDTO request);
 
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
new file mode 100644
index 0000000..7cdb865
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -0,0 +1,38 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报警管理（暂定） Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@Mapper
+public interface OverViewMapper extends BaseMapper<AlarmRecords> {
+
+    List<CommonResponseDTO> overall(@Param("deptStrs") String deptStrs);
+
+    List<CommonResponseDTO> deviceStatus(@Param("deptStrs") String deptStrs);
+
+    List<AlarmPositionResponseDTO> alarmPosition(@Param("alarmType") String alarmType,
+                                                 @Param("deptIds") String deptIds,
+                                                 @Param("request") AlarmPositionRequestDTO request);
+
+    List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
+                                      @Param("deptStrs") String deptStrs,
+                                      @Param("request") AlarmTypeRequestDTO request);
+
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
+}
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 1725724..63be4f7 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 lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
index 7b9ddf4..4992ab1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
@@ -5,8 +5,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmTypeRequestDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmStaticsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -45,13 +44,11 @@
     @ApiOperation("各类报警统计")
     @PostMapping("/alarmType")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+    public ReturnDTO<CommonResponseDTO> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
         String alarmType="";
-        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,dataScope.getDeptIds(),alarmTypeRequestDTO));
+        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,alarmTypeRequestDTO));
     }
-//
+
 //    @ApiOperation("报警趋势分析")
 //    @PostMapping("/alarmTrend")
 //    @ResponseBody
@@ -61,21 +58,22 @@
 //        String alarmType="";
 //        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
 //    }
-//
-//    @ApiOperation("各单位报警统计")
-//    @PostMapping("/alarmCompany")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmCompany() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds()));
-//    }
+
+    @ApiOperation("各单位报警统计")
+    @PostMapping("/alarmCompany")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> alarmCompany(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+
+        //toDo:公司分类
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        String alarmType="";
+        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds(),alarmPositionRequestDTO));
+    }
 
     @ApiOperation("异常位置分析")
     @PostMapping("/alarmPosition")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+    public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType="";
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
new file mode 100644
index 0000000..e298440
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -0,0 +1,94 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.service.IOverViewService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 首页展示 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-17
+ */
+@Api(tags = "首页展示接口模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/homePage/apis")
+public class OverViewController extends ExportController {
+
+    private final IOverViewService iOverViewService;
+    private final AbstractPermissionContext permissionContext;
+
+    @ApiOperation("基本概况")
+    @PostMapping("/overall")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> overall() {
+        //toDo:管线长度无法统计，暂定前端写入
+        return ReturnUtil.success(iOverViewService.overall());
+    }
+
+    @ApiOperation("设备运行情况，1：在线，0：离线，2：停用")
+    @PostMapping("/deviceStatus")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> deviceStatus() {
+        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("消息通知（待开发）")
+    @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;
+    }
+
+    @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
+    @PostMapping("/pop")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> pop() {
+
+        //toDo:公司分类
+//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+//        String alarmType = "";
+//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return null;
+    }
+
+
+    @ApiOperation("异常位置分析")
+    @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));
+    }
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
index acd97dc..0028d7f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
@@ -9,6 +9,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,7 +30,11 @@
                                                  @Param("request") AlarmPositionRequestDTO request);
 
     List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
-                                      @Param("deptIds") String deptIds,
+                                      @Param("deptStrs") String deptStrs,
                                       @Param("request") AlarmTypeRequestDTO request);
 
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
new file mode 100644
index 0000000..7cdb865
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -0,0 +1,38 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报警管理（暂定） Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@Mapper
+public interface OverViewMapper extends BaseMapper<AlarmRecords> {
+
+    List<CommonResponseDTO> overall(@Param("deptStrs") String deptStrs);
+
+    List<CommonResponseDTO> deviceStatus(@Param("deptStrs") String deptStrs);
+
+    List<AlarmPositionResponseDTO> alarmPosition(@Param("alarmType") String alarmType,
+                                                 @Param("deptIds") String deptIds,
+                                                 @Param("request") AlarmPositionRequestDTO request);
+
+    List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
+                                      @Param("deptStrs") String deptStrs,
+                                      @Param("request") AlarmTypeRequestDTO request);
+
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
+}
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 1725724..63be4f7 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 lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 432c042..35b366f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -78,4 +78,74 @@
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
     </select>
+
+    <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH alarms AS ( SELECT count(1) as sum,alarmType  from alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType) SELECT
+        ay.alarm_type AS `name`,
+        IFNULL(alarms.sum ,0) AS `value`
+        FROM
+        alarm_type ay
+        LEFT JOIN alarms ON ay.id = alarms.alarmType
+    </select>
+
+
+    <select id="alarmCompany" resultType="com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO">
+
+        SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType ,av.DEPTID
+
+    </select>
+
 </mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
index 7b9ddf4..4992ab1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
@@ -5,8 +5,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmTypeRequestDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmStaticsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -45,13 +44,11 @@
     @ApiOperation("各类报警统计")
     @PostMapping("/alarmType")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+    public ReturnDTO<CommonResponseDTO> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
         String alarmType="";
-        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,dataScope.getDeptIds(),alarmTypeRequestDTO));
+        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,alarmTypeRequestDTO));
     }
-//
+
 //    @ApiOperation("报警趋势分析")
 //    @PostMapping("/alarmTrend")
 //    @ResponseBody
@@ -61,21 +58,22 @@
 //        String alarmType="";
 //        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
 //    }
-//
-//    @ApiOperation("各单位报警统计")
-//    @PostMapping("/alarmCompany")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmCompany() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds()));
-//    }
+
+    @ApiOperation("各单位报警统计")
+    @PostMapping("/alarmCompany")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> alarmCompany(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+
+        //toDo:公司分类
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        String alarmType="";
+        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds(),alarmPositionRequestDTO));
+    }
 
     @ApiOperation("异常位置分析")
     @PostMapping("/alarmPosition")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+    public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType="";
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
new file mode 100644
index 0000000..e298440
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -0,0 +1,94 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.service.IOverViewService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 首页展示 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-17
+ */
+@Api(tags = "首页展示接口模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/homePage/apis")
+public class OverViewController extends ExportController {
+
+    private final IOverViewService iOverViewService;
+    private final AbstractPermissionContext permissionContext;
+
+    @ApiOperation("基本概况")
+    @PostMapping("/overall")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> overall() {
+        //toDo:管线长度无法统计，暂定前端写入
+        return ReturnUtil.success(iOverViewService.overall());
+    }
+
+    @ApiOperation("设备运行情况，1：在线，0：离线，2：停用")
+    @PostMapping("/deviceStatus")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> deviceStatus() {
+        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("消息通知（待开发）")
+    @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;
+    }
+
+    @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
+    @PostMapping("/pop")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> pop() {
+
+        //toDo:公司分类
+//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+//        String alarmType = "";
+//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return null;
+    }
+
+
+    @ApiOperation("异常位置分析")
+    @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));
+    }
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
index acd97dc..0028d7f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
@@ -9,6 +9,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,7 +30,11 @@
                                                  @Param("request") AlarmPositionRequestDTO request);
 
     List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
-                                      @Param("deptIds") String deptIds,
+                                      @Param("deptStrs") String deptStrs,
                                       @Param("request") AlarmTypeRequestDTO request);
 
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
new file mode 100644
index 0000000..7cdb865
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -0,0 +1,38 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报警管理（暂定） Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@Mapper
+public interface OverViewMapper extends BaseMapper<AlarmRecords> {
+
+    List<CommonResponseDTO> overall(@Param("deptStrs") String deptStrs);
+
+    List<CommonResponseDTO> deviceStatus(@Param("deptStrs") String deptStrs);
+
+    List<AlarmPositionResponseDTO> alarmPosition(@Param("alarmType") String alarmType,
+                                                 @Param("deptIds") String deptIds,
+                                                 @Param("request") AlarmPositionRequestDTO request);
+
+    List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
+                                      @Param("deptStrs") String deptStrs,
+                                      @Param("request") AlarmTypeRequestDTO request);
+
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
+}
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 1725724..63be4f7 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 lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 432c042..35b366f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -78,4 +78,74 @@
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
     </select>
+
+    <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH alarms AS ( SELECT count(1) as sum,alarmType  from alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType) SELECT
+        ay.alarm_type AS `name`,
+        IFNULL(alarms.sum ,0) AS `value`
+        FROM
+        alarm_type ay
+        LEFT JOIN alarms ON ay.id = alarms.alarmType
+    </select>
+
+
+    <select id="alarmCompany" resultType="com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO">
+
+        SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType ,av.DEPTID
+
+    </select>
+
 </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
new file mode 100644
index 0000000..ae707a1
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -0,0 +1,153 @@
+<?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.OverViewMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        <id column="ID" property="id"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="LEDGER_CODE" property="ledgerCode"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_CONTENT" property="alarmContent"/>
+        <result column="ALARM_VALUE" property="alarmValue"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_TIME" property="alarmTime"/>
+        <result column="STATUS" property="status"/>
+        <result column="ALARM_MSG" property="alarmMsg"/>
+        <result column="PROCESS_STATUS" property="processStatus"/>
+        <result column="PROCESS_TIME" property="processTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID
+        , DEVCODE, LEDGER_CODE, ALARM_TYPE, ALARM_CONTENT, ALARM_VALUE, ALARM_LEVEL, ALARM_TIME, `STATUS`, ALARM_MSG, PROCESS_STATUS, PROCESS_TIME
+    </sql>
+
+    <select id="overall" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+        SELECT count(1) as `value`,"zj" as `name` FROM bus_ledger bl where bl.VALID=1 and   bl.TYPE=1
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bl.DEPTID in (${deptStrs})
+        </if>
+        UNION ALL
+        SELECT count(1) as `value`,"tyz" as `name` FROM bus_ledger bl where bl.VALID=1 and   bl.TYPE=2
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bl.DEPTID in (${deptStrs})
+        </if>
+    </select>
+
+
+    <select id="deviceStatus" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH device_temp AS	(SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device`  bd
+            LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID
+            LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID
+            <where>
+                <if test="deptStrs != null and deptStrs !='' ">
+                    and lr.DEPTID in (${deptStrs})
+                </if>
+            </where>
+            )
+        SELECT count(1) as `value`, '2' as `name` FROM device_temp bt where bt.VALID>1
+        UNION ALL
+        SELECT count(1) as `value`, bt.ONLINE_STATE as `name` FROM device_temp bt where bt.VALID>0 GROUP BY bt.ONLINE_STATE
+    </select>
+
+    <select id="alarmPosition" resultType="com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO">
+        WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+        </where>
+        GROUP BY ledgerCode)
+        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
+    </select>
+
+    <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH alarms AS ( SELECT count(1) as sum,alarmType  from alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType) SELECT
+        ay.alarm_type AS `name`,
+        IFNULL(alarms.sum ,0) AS `value`
+        FROM
+        alarm_type ay
+        LEFT JOIN alarms ON ay.id = alarms.alarmType
+    </select>
+
+
+    <select id="alarmCompany" resultType="com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO">
+
+        SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType ,av.DEPTID
+
+    </select>
+
+</mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
index 7b9ddf4..4992ab1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
@@ -5,8 +5,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmTypeRequestDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmStaticsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -45,13 +44,11 @@
     @ApiOperation("各类报警统计")
     @PostMapping("/alarmType")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+    public ReturnDTO<CommonResponseDTO> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
         String alarmType="";
-        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,dataScope.getDeptIds(),alarmTypeRequestDTO));
+        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,alarmTypeRequestDTO));
     }
-//
+
 //    @ApiOperation("报警趋势分析")
 //    @PostMapping("/alarmTrend")
 //    @ResponseBody
@@ -61,21 +58,22 @@
 //        String alarmType="";
 //        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
 //    }
-//
-//    @ApiOperation("各单位报警统计")
-//    @PostMapping("/alarmCompany")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmCompany() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds()));
-//    }
+
+    @ApiOperation("各单位报警统计")
+    @PostMapping("/alarmCompany")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> alarmCompany(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+
+        //toDo:公司分类
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        String alarmType="";
+        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds(),alarmPositionRequestDTO));
+    }
 
     @ApiOperation("异常位置分析")
     @PostMapping("/alarmPosition")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+    public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType="";
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
new file mode 100644
index 0000000..e298440
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -0,0 +1,94 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.service.IOverViewService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 首页展示 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-17
+ */
+@Api(tags = "首页展示接口模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/homePage/apis")
+public class OverViewController extends ExportController {
+
+    private final IOverViewService iOverViewService;
+    private final AbstractPermissionContext permissionContext;
+
+    @ApiOperation("基本概况")
+    @PostMapping("/overall")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> overall() {
+        //toDo:管线长度无法统计，暂定前端写入
+        return ReturnUtil.success(iOverViewService.overall());
+    }
+
+    @ApiOperation("设备运行情况，1：在线，0：离线，2：停用")
+    @PostMapping("/deviceStatus")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> deviceStatus() {
+        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("消息通知（待开发）")
+    @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;
+    }
+
+    @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
+    @PostMapping("/pop")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> pop() {
+
+        //toDo:公司分类
+//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+//        String alarmType = "";
+//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return null;
+    }
+
+
+    @ApiOperation("异常位置分析")
+    @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));
+    }
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
index acd97dc..0028d7f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
@@ -9,6 +9,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,7 +30,11 @@
                                                  @Param("request") AlarmPositionRequestDTO request);
 
     List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
-                                      @Param("deptIds") String deptIds,
+                                      @Param("deptStrs") String deptStrs,
                                       @Param("request") AlarmTypeRequestDTO request);
 
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
new file mode 100644
index 0000000..7cdb865
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -0,0 +1,38 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报警管理（暂定） Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@Mapper
+public interface OverViewMapper extends BaseMapper<AlarmRecords> {
+
+    List<CommonResponseDTO> overall(@Param("deptStrs") String deptStrs);
+
+    List<CommonResponseDTO> deviceStatus(@Param("deptStrs") String deptStrs);
+
+    List<AlarmPositionResponseDTO> alarmPosition(@Param("alarmType") String alarmType,
+                                                 @Param("deptIds") String deptIds,
+                                                 @Param("request") AlarmPositionRequestDTO request);
+
+    List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
+                                      @Param("deptStrs") String deptStrs,
+                                      @Param("request") AlarmTypeRequestDTO request);
+
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
+}
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 1725724..63be4f7 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 lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 432c042..35b366f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -78,4 +78,74 @@
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
     </select>
+
+    <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH alarms AS ( SELECT count(1) as sum,alarmType  from alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType) SELECT
+        ay.alarm_type AS `name`,
+        IFNULL(alarms.sum ,0) AS `value`
+        FROM
+        alarm_type ay
+        LEFT JOIN alarms ON ay.id = alarms.alarmType
+    </select>
+
+
+    <select id="alarmCompany" resultType="com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO">
+
+        SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType ,av.DEPTID
+
+    </select>
+
 </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
new file mode 100644
index 0000000..ae707a1
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -0,0 +1,153 @@
+<?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.OverViewMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        <id column="ID" property="id"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="LEDGER_CODE" property="ledgerCode"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_CONTENT" property="alarmContent"/>
+        <result column="ALARM_VALUE" property="alarmValue"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_TIME" property="alarmTime"/>
+        <result column="STATUS" property="status"/>
+        <result column="ALARM_MSG" property="alarmMsg"/>
+        <result column="PROCESS_STATUS" property="processStatus"/>
+        <result column="PROCESS_TIME" property="processTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID
+        , DEVCODE, LEDGER_CODE, ALARM_TYPE, ALARM_CONTENT, ALARM_VALUE, ALARM_LEVEL, ALARM_TIME, `STATUS`, ALARM_MSG, PROCESS_STATUS, PROCESS_TIME
+    </sql>
+
+    <select id="overall" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+        SELECT count(1) as `value`,"zj" as `name` FROM bus_ledger bl where bl.VALID=1 and   bl.TYPE=1
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bl.DEPTID in (${deptStrs})
+        </if>
+        UNION ALL
+        SELECT count(1) as `value`,"tyz" as `name` FROM bus_ledger bl where bl.VALID=1 and   bl.TYPE=2
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bl.DEPTID in (${deptStrs})
+        </if>
+    </select>
+
+
+    <select id="deviceStatus" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH device_temp AS	(SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device`  bd
+            LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID
+            LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID
+            <where>
+                <if test="deptStrs != null and deptStrs !='' ">
+                    and lr.DEPTID in (${deptStrs})
+                </if>
+            </where>
+            )
+        SELECT count(1) as `value`, '2' as `name` FROM device_temp bt where bt.VALID>1
+        UNION ALL
+        SELECT count(1) as `value`, bt.ONLINE_STATE as `name` FROM device_temp bt where bt.VALID>0 GROUP BY bt.ONLINE_STATE
+    </select>
+
+    <select id="alarmPosition" resultType="com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO">
+        WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+        </where>
+        GROUP BY ledgerCode)
+        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
+    </select>
+
+    <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH alarms AS ( SELECT count(1) as sum,alarmType  from alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType) SELECT
+        ay.alarm_type AS `name`,
+        IFNULL(alarms.sum ,0) AS `value`
+        FROM
+        alarm_type ay
+        LEFT JOIN alarms ON ay.id = alarms.alarmType
+    </select>
+
+
+    <select id="alarmCompany" resultType="com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO">
+
+        SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType ,av.DEPTID
+
+    </select>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmCompanyResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmCompanyResponseDTO.java
new file mode 100644
index 0000000..7d4d81d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmCompanyResponseDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmCompanyResponseDTO {
+
+    @ApiModelProperty("报警数量")
+    private Long alarmSum;
+
+    @ApiModelProperty("部门 ")
+    private Long deptid;
+
+    @ApiModelProperty("报警类型")
+    private Long alarmType;
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
index 7b9ddf4..4992ab1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
@@ -5,8 +5,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmTypeRequestDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmStaticsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -45,13 +44,11 @@
     @ApiOperation("各类报警统计")
     @PostMapping("/alarmType")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+    public ReturnDTO<CommonResponseDTO> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
         String alarmType="";
-        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,dataScope.getDeptIds(),alarmTypeRequestDTO));
+        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,alarmTypeRequestDTO));
     }
-//
+
 //    @ApiOperation("报警趋势分析")
 //    @PostMapping("/alarmTrend")
 //    @ResponseBody
@@ -61,21 +58,22 @@
 //        String alarmType="";
 //        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
 //    }
-//
-//    @ApiOperation("各单位报警统计")
-//    @PostMapping("/alarmCompany")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmCompany() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds()));
-//    }
+
+    @ApiOperation("各单位报警统计")
+    @PostMapping("/alarmCompany")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> alarmCompany(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+
+        //toDo:公司分类
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        String alarmType="";
+        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds(),alarmPositionRequestDTO));
+    }
 
     @ApiOperation("异常位置分析")
     @PostMapping("/alarmPosition")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+    public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType="";
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
new file mode 100644
index 0000000..e298440
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -0,0 +1,94 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.service.IOverViewService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 首页展示 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-17
+ */
+@Api(tags = "首页展示接口模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/homePage/apis")
+public class OverViewController extends ExportController {
+
+    private final IOverViewService iOverViewService;
+    private final AbstractPermissionContext permissionContext;
+
+    @ApiOperation("基本概况")
+    @PostMapping("/overall")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> overall() {
+        //toDo:管线长度无法统计，暂定前端写入
+        return ReturnUtil.success(iOverViewService.overall());
+    }
+
+    @ApiOperation("设备运行情况，1：在线，0：离线，2：停用")
+    @PostMapping("/deviceStatus")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> deviceStatus() {
+        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("消息通知（待开发）")
+    @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;
+    }
+
+    @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
+    @PostMapping("/pop")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> pop() {
+
+        //toDo:公司分类
+//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+//        String alarmType = "";
+//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return null;
+    }
+
+
+    @ApiOperation("异常位置分析")
+    @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));
+    }
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
index acd97dc..0028d7f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
@@ -9,6 +9,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,7 +30,11 @@
                                                  @Param("request") AlarmPositionRequestDTO request);
 
     List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
-                                      @Param("deptIds") String deptIds,
+                                      @Param("deptStrs") String deptStrs,
                                       @Param("request") AlarmTypeRequestDTO request);
 
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
new file mode 100644
index 0000000..7cdb865
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -0,0 +1,38 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报警管理（暂定） Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@Mapper
+public interface OverViewMapper extends BaseMapper<AlarmRecords> {
+
+    List<CommonResponseDTO> overall(@Param("deptStrs") String deptStrs);
+
+    List<CommonResponseDTO> deviceStatus(@Param("deptStrs") String deptStrs);
+
+    List<AlarmPositionResponseDTO> alarmPosition(@Param("alarmType") String alarmType,
+                                                 @Param("deptIds") String deptIds,
+                                                 @Param("request") AlarmPositionRequestDTO request);
+
+    List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
+                                      @Param("deptStrs") String deptStrs,
+                                      @Param("request") AlarmTypeRequestDTO request);
+
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
+}
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 1725724..63be4f7 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 lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 432c042..35b366f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -78,4 +78,74 @@
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
     </select>
+
+    <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH alarms AS ( SELECT count(1) as sum,alarmType  from alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType) SELECT
+        ay.alarm_type AS `name`,
+        IFNULL(alarms.sum ,0) AS `value`
+        FROM
+        alarm_type ay
+        LEFT JOIN alarms ON ay.id = alarms.alarmType
+    </select>
+
+
+    <select id="alarmCompany" resultType="com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO">
+
+        SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType ,av.DEPTID
+
+    </select>
+
 </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
new file mode 100644
index 0000000..ae707a1
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -0,0 +1,153 @@
+<?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.OverViewMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        <id column="ID" property="id"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="LEDGER_CODE" property="ledgerCode"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_CONTENT" property="alarmContent"/>
+        <result column="ALARM_VALUE" property="alarmValue"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_TIME" property="alarmTime"/>
+        <result column="STATUS" property="status"/>
+        <result column="ALARM_MSG" property="alarmMsg"/>
+        <result column="PROCESS_STATUS" property="processStatus"/>
+        <result column="PROCESS_TIME" property="processTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID
+        , DEVCODE, LEDGER_CODE, ALARM_TYPE, ALARM_CONTENT, ALARM_VALUE, ALARM_LEVEL, ALARM_TIME, `STATUS`, ALARM_MSG, PROCESS_STATUS, PROCESS_TIME
+    </sql>
+
+    <select id="overall" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+        SELECT count(1) as `value`,"zj" as `name` FROM bus_ledger bl where bl.VALID=1 and   bl.TYPE=1
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bl.DEPTID in (${deptStrs})
+        </if>
+        UNION ALL
+        SELECT count(1) as `value`,"tyz" as `name` FROM bus_ledger bl where bl.VALID=1 and   bl.TYPE=2
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bl.DEPTID in (${deptStrs})
+        </if>
+    </select>
+
+
+    <select id="deviceStatus" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH device_temp AS	(SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device`  bd
+            LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID
+            LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID
+            <where>
+                <if test="deptStrs != null and deptStrs !='' ">
+                    and lr.DEPTID in (${deptStrs})
+                </if>
+            </where>
+            )
+        SELECT count(1) as `value`, '2' as `name` FROM device_temp bt where bt.VALID>1
+        UNION ALL
+        SELECT count(1) as `value`, bt.ONLINE_STATE as `name` FROM device_temp bt where bt.VALID>0 GROUP BY bt.ONLINE_STATE
+    </select>
+
+    <select id="alarmPosition" resultType="com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO">
+        WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+        </where>
+        GROUP BY ledgerCode)
+        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
+    </select>
+
+    <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH alarms AS ( SELECT count(1) as sum,alarmType  from alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType) SELECT
+        ay.alarm_type AS `name`,
+        IFNULL(alarms.sum ,0) AS `value`
+        FROM
+        alarm_type ay
+        LEFT JOIN alarms ON ay.id = alarms.alarmType
+    </select>
+
+
+    <select id="alarmCompany" resultType="com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO">
+
+        SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType ,av.DEPTID
+
+    </select>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmCompanyResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmCompanyResponseDTO.java
new file mode 100644
index 0000000..7d4d81d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmCompanyResponseDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmCompanyResponseDTO {
+
+    @ApiModelProperty("报警数量")
+    private Long alarmSum;
+
+    @ApiModelProperty("部门 ")
+    private Long deptid;
+
+    @ApiModelProperty("报警类型")
+    private Long alarmType;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java
index 4c1b2ea..fa10d45 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java
@@ -22,6 +22,9 @@
 
     List<AlarmPositionResponseDTO>  alarmPosition(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
 
-    List<CommonResponseDTO>  alarmType(String alarmType , List<Long> deptIds,AlarmTypeRequestDTO alarmTypeRequestDTO);
+    List<CommonResponseDTO>  alarmType(String alarmType ,AlarmTypeRequestDTO alarmTypeRequestDTO);
+
+    List<AlarmCompanyResponseDTO>  alarmCompany(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
+
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
index 7b9ddf4..4992ab1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
@@ -5,8 +5,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmTypeRequestDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmStaticsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -45,13 +44,11 @@
     @ApiOperation("各类报警统计")
     @PostMapping("/alarmType")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+    public ReturnDTO<CommonResponseDTO> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
         String alarmType="";
-        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,dataScope.getDeptIds(),alarmTypeRequestDTO));
+        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,alarmTypeRequestDTO));
     }
-//
+
 //    @ApiOperation("报警趋势分析")
 //    @PostMapping("/alarmTrend")
 //    @ResponseBody
@@ -61,21 +58,22 @@
 //        String alarmType="";
 //        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
 //    }
-//
-//    @ApiOperation("各单位报警统计")
-//    @PostMapping("/alarmCompany")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmCompany() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds()));
-//    }
+
+    @ApiOperation("各单位报警统计")
+    @PostMapping("/alarmCompany")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> alarmCompany(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+
+        //toDo:公司分类
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        String alarmType="";
+        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds(),alarmPositionRequestDTO));
+    }
 
     @ApiOperation("异常位置分析")
     @PostMapping("/alarmPosition")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+    public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType="";
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
new file mode 100644
index 0000000..e298440
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -0,0 +1,94 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.service.IOverViewService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 首页展示 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-17
+ */
+@Api(tags = "首页展示接口模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/homePage/apis")
+public class OverViewController extends ExportController {
+
+    private final IOverViewService iOverViewService;
+    private final AbstractPermissionContext permissionContext;
+
+    @ApiOperation("基本概况")
+    @PostMapping("/overall")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> overall() {
+        //toDo:管线长度无法统计，暂定前端写入
+        return ReturnUtil.success(iOverViewService.overall());
+    }
+
+    @ApiOperation("设备运行情况，1：在线，0：离线，2：停用")
+    @PostMapping("/deviceStatus")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> deviceStatus() {
+        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("消息通知（待开发）")
+    @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;
+    }
+
+    @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
+    @PostMapping("/pop")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> pop() {
+
+        //toDo:公司分类
+//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+//        String alarmType = "";
+//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return null;
+    }
+
+
+    @ApiOperation("异常位置分析")
+    @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));
+    }
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
index acd97dc..0028d7f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
@@ -9,6 +9,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,7 +30,11 @@
                                                  @Param("request") AlarmPositionRequestDTO request);
 
     List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
-                                      @Param("deptIds") String deptIds,
+                                      @Param("deptStrs") String deptStrs,
                                       @Param("request") AlarmTypeRequestDTO request);
 
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
new file mode 100644
index 0000000..7cdb865
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -0,0 +1,38 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报警管理（暂定） Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@Mapper
+public interface OverViewMapper extends BaseMapper<AlarmRecords> {
+
+    List<CommonResponseDTO> overall(@Param("deptStrs") String deptStrs);
+
+    List<CommonResponseDTO> deviceStatus(@Param("deptStrs") String deptStrs);
+
+    List<AlarmPositionResponseDTO> alarmPosition(@Param("alarmType") String alarmType,
+                                                 @Param("deptIds") String deptIds,
+                                                 @Param("request") AlarmPositionRequestDTO request);
+
+    List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
+                                      @Param("deptStrs") String deptStrs,
+                                      @Param("request") AlarmTypeRequestDTO request);
+
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
+}
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 1725724..63be4f7 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 lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 432c042..35b366f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -78,4 +78,74 @@
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
     </select>
+
+    <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH alarms AS ( SELECT count(1) as sum,alarmType  from alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType) SELECT
+        ay.alarm_type AS `name`,
+        IFNULL(alarms.sum ,0) AS `value`
+        FROM
+        alarm_type ay
+        LEFT JOIN alarms ON ay.id = alarms.alarmType
+    </select>
+
+
+    <select id="alarmCompany" resultType="com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO">
+
+        SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType ,av.DEPTID
+
+    </select>
+
 </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
new file mode 100644
index 0000000..ae707a1
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -0,0 +1,153 @@
+<?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.OverViewMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        <id column="ID" property="id"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="LEDGER_CODE" property="ledgerCode"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_CONTENT" property="alarmContent"/>
+        <result column="ALARM_VALUE" property="alarmValue"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_TIME" property="alarmTime"/>
+        <result column="STATUS" property="status"/>
+        <result column="ALARM_MSG" property="alarmMsg"/>
+        <result column="PROCESS_STATUS" property="processStatus"/>
+        <result column="PROCESS_TIME" property="processTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID
+        , DEVCODE, LEDGER_CODE, ALARM_TYPE, ALARM_CONTENT, ALARM_VALUE, ALARM_LEVEL, ALARM_TIME, `STATUS`, ALARM_MSG, PROCESS_STATUS, PROCESS_TIME
+    </sql>
+
+    <select id="overall" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+        SELECT count(1) as `value`,"zj" as `name` FROM bus_ledger bl where bl.VALID=1 and   bl.TYPE=1
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bl.DEPTID in (${deptStrs})
+        </if>
+        UNION ALL
+        SELECT count(1) as `value`,"tyz" as `name` FROM bus_ledger bl where bl.VALID=1 and   bl.TYPE=2
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bl.DEPTID in (${deptStrs})
+        </if>
+    </select>
+
+
+    <select id="deviceStatus" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH device_temp AS	(SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device`  bd
+            LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID
+            LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID
+            <where>
+                <if test="deptStrs != null and deptStrs !='' ">
+                    and lr.DEPTID in (${deptStrs})
+                </if>
+            </where>
+            )
+        SELECT count(1) as `value`, '2' as `name` FROM device_temp bt where bt.VALID>1
+        UNION ALL
+        SELECT count(1) as `value`, bt.ONLINE_STATE as `name` FROM device_temp bt where bt.VALID>0 GROUP BY bt.ONLINE_STATE
+    </select>
+
+    <select id="alarmPosition" resultType="com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO">
+        WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+        </where>
+        GROUP BY ledgerCode)
+        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
+    </select>
+
+    <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH alarms AS ( SELECT count(1) as sum,alarmType  from alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType) SELECT
+        ay.alarm_type AS `name`,
+        IFNULL(alarms.sum ,0) AS `value`
+        FROM
+        alarm_type ay
+        LEFT JOIN alarms ON ay.id = alarms.alarmType
+    </select>
+
+
+    <select id="alarmCompany" resultType="com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO">
+
+        SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType ,av.DEPTID
+
+    </select>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmCompanyResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmCompanyResponseDTO.java
new file mode 100644
index 0000000..7d4d81d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmCompanyResponseDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmCompanyResponseDTO {
+
+    @ApiModelProperty("报警数量")
+    private Long alarmSum;
+
+    @ApiModelProperty("部门 ")
+    private Long deptid;
+
+    @ApiModelProperty("报警类型")
+    private Long alarmType;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java
index 4c1b2ea..fa10d45 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java
@@ -22,6 +22,9 @@
 
     List<AlarmPositionResponseDTO>  alarmPosition(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
 
-    List<CommonResponseDTO>  alarmType(String alarmType , List<Long> deptIds,AlarmTypeRequestDTO alarmTypeRequestDTO);
+    List<CommonResponseDTO>  alarmType(String alarmType ,AlarmTypeRequestDTO alarmTypeRequestDTO);
+
+    List<AlarmCompanyResponseDTO>  alarmCompany(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
+
 
 }
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
new file mode 100644
index 0000000..38ae078
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报警管理（暂定） 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+public interface IOverViewService extends IService<AlarmRecords> {
+
+    List<CommonResponseDTO>  overall();
+
+    List<CommonResponseDTO>  deviceStatus();
+
+    List<AlarmPositionResponseDTO>  alarmPosition(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
+
+
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
index 7b9ddf4..4992ab1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
@@ -5,8 +5,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmTypeRequestDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmStaticsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -45,13 +44,11 @@
     @ApiOperation("各类报警统计")
     @PostMapping("/alarmType")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+    public ReturnDTO<CommonResponseDTO> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
         String alarmType="";
-        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,dataScope.getDeptIds(),alarmTypeRequestDTO));
+        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,alarmTypeRequestDTO));
     }
-//
+
 //    @ApiOperation("报警趋势分析")
 //    @PostMapping("/alarmTrend")
 //    @ResponseBody
@@ -61,21 +58,22 @@
 //        String alarmType="";
 //        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
 //    }
-//
-//    @ApiOperation("各单位报警统计")
-//    @PostMapping("/alarmCompany")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmCompany() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds()));
-//    }
+
+    @ApiOperation("各单位报警统计")
+    @PostMapping("/alarmCompany")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> alarmCompany(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+
+        //toDo:公司分类
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        String alarmType="";
+        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds(),alarmPositionRequestDTO));
+    }
 
     @ApiOperation("异常位置分析")
     @PostMapping("/alarmPosition")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+    public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType="";
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
new file mode 100644
index 0000000..e298440
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -0,0 +1,94 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.service.IOverViewService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 首页展示 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-17
+ */
+@Api(tags = "首页展示接口模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/homePage/apis")
+public class OverViewController extends ExportController {
+
+    private final IOverViewService iOverViewService;
+    private final AbstractPermissionContext permissionContext;
+
+    @ApiOperation("基本概况")
+    @PostMapping("/overall")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> overall() {
+        //toDo:管线长度无法统计，暂定前端写入
+        return ReturnUtil.success(iOverViewService.overall());
+    }
+
+    @ApiOperation("设备运行情况，1：在线，0：离线，2：停用")
+    @PostMapping("/deviceStatus")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> deviceStatus() {
+        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("消息通知（待开发）")
+    @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;
+    }
+
+    @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
+    @PostMapping("/pop")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> pop() {
+
+        //toDo:公司分类
+//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+//        String alarmType = "";
+//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return null;
+    }
+
+
+    @ApiOperation("异常位置分析")
+    @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));
+    }
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
index acd97dc..0028d7f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
@@ -9,6 +9,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,7 +30,11 @@
                                                  @Param("request") AlarmPositionRequestDTO request);
 
     List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
-                                      @Param("deptIds") String deptIds,
+                                      @Param("deptStrs") String deptStrs,
                                       @Param("request") AlarmTypeRequestDTO request);
 
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
new file mode 100644
index 0000000..7cdb865
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -0,0 +1,38 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报警管理（暂定） Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@Mapper
+public interface OverViewMapper extends BaseMapper<AlarmRecords> {
+
+    List<CommonResponseDTO> overall(@Param("deptStrs") String deptStrs);
+
+    List<CommonResponseDTO> deviceStatus(@Param("deptStrs") String deptStrs);
+
+    List<AlarmPositionResponseDTO> alarmPosition(@Param("alarmType") String alarmType,
+                                                 @Param("deptIds") String deptIds,
+                                                 @Param("request") AlarmPositionRequestDTO request);
+
+    List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
+                                      @Param("deptStrs") String deptStrs,
+                                      @Param("request") AlarmTypeRequestDTO request);
+
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
+}
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 1725724..63be4f7 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 lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 432c042..35b366f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -78,4 +78,74 @@
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
     </select>
+
+    <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH alarms AS ( SELECT count(1) as sum,alarmType  from alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType) SELECT
+        ay.alarm_type AS `name`,
+        IFNULL(alarms.sum ,0) AS `value`
+        FROM
+        alarm_type ay
+        LEFT JOIN alarms ON ay.id = alarms.alarmType
+    </select>
+
+
+    <select id="alarmCompany" resultType="com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO">
+
+        SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType ,av.DEPTID
+
+    </select>
+
 </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
new file mode 100644
index 0000000..ae707a1
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -0,0 +1,153 @@
+<?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.OverViewMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        <id column="ID" property="id"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="LEDGER_CODE" property="ledgerCode"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_CONTENT" property="alarmContent"/>
+        <result column="ALARM_VALUE" property="alarmValue"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_TIME" property="alarmTime"/>
+        <result column="STATUS" property="status"/>
+        <result column="ALARM_MSG" property="alarmMsg"/>
+        <result column="PROCESS_STATUS" property="processStatus"/>
+        <result column="PROCESS_TIME" property="processTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID
+        , DEVCODE, LEDGER_CODE, ALARM_TYPE, ALARM_CONTENT, ALARM_VALUE, ALARM_LEVEL, ALARM_TIME, `STATUS`, ALARM_MSG, PROCESS_STATUS, PROCESS_TIME
+    </sql>
+
+    <select id="overall" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+        SELECT count(1) as `value`,"zj" as `name` FROM bus_ledger bl where bl.VALID=1 and   bl.TYPE=1
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bl.DEPTID in (${deptStrs})
+        </if>
+        UNION ALL
+        SELECT count(1) as `value`,"tyz" as `name` FROM bus_ledger bl where bl.VALID=1 and   bl.TYPE=2
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bl.DEPTID in (${deptStrs})
+        </if>
+    </select>
+
+
+    <select id="deviceStatus" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH device_temp AS	(SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device`  bd
+            LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID
+            LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID
+            <where>
+                <if test="deptStrs != null and deptStrs !='' ">
+                    and lr.DEPTID in (${deptStrs})
+                </if>
+            </where>
+            )
+        SELECT count(1) as `value`, '2' as `name` FROM device_temp bt where bt.VALID>1
+        UNION ALL
+        SELECT count(1) as `value`, bt.ONLINE_STATE as `name` FROM device_temp bt where bt.VALID>0 GROUP BY bt.ONLINE_STATE
+    </select>
+
+    <select id="alarmPosition" resultType="com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO">
+        WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+        </where>
+        GROUP BY ledgerCode)
+        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
+    </select>
+
+    <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH alarms AS ( SELECT count(1) as sum,alarmType  from alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType) SELECT
+        ay.alarm_type AS `name`,
+        IFNULL(alarms.sum ,0) AS `value`
+        FROM
+        alarm_type ay
+        LEFT JOIN alarms ON ay.id = alarms.alarmType
+    </select>
+
+
+    <select id="alarmCompany" resultType="com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO">
+
+        SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType ,av.DEPTID
+
+    </select>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmCompanyResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmCompanyResponseDTO.java
new file mode 100644
index 0000000..7d4d81d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmCompanyResponseDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmCompanyResponseDTO {
+
+    @ApiModelProperty("报警数量")
+    private Long alarmSum;
+
+    @ApiModelProperty("部门 ")
+    private Long deptid;
+
+    @ApiModelProperty("报警类型")
+    private Long alarmType;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java
index 4c1b2ea..fa10d45 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java
@@ -22,6 +22,9 @@
 
     List<AlarmPositionResponseDTO>  alarmPosition(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
 
-    List<CommonResponseDTO>  alarmType(String alarmType , List<Long> deptIds,AlarmTypeRequestDTO alarmTypeRequestDTO);
+    List<CommonResponseDTO>  alarmType(String alarmType ,AlarmTypeRequestDTO alarmTypeRequestDTO);
+
+    List<AlarmCompanyResponseDTO>  alarmCompany(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
+
 
 }
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
new file mode 100644
index 0000000..38ae078
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报警管理（暂定） 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+public interface IOverViewService extends IService<AlarmRecords> {
+
+    List<CommonResponseDTO>  overall();
+
+    List<CommonResponseDTO>  deviceStatus();
+
+    List<AlarmPositionResponseDTO>  alarmPosition(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
+
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index 6502946..28707b1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 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.AlarmStaticsMapper;
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
@@ -9,6 +13,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -24,31 +29,52 @@
 @Service
 public class AlarmStaticsServiceImpl extends ServiceImpl<AlarmStaticsMapper, AlarmRecords> implements IAlarmStaticsService {
 
+    private final AbstractDeptService abstractDeptService;
+    private final AbstractPermissionContext permissionContext;
+
     @Override
     public List<AlarmOverDTO> overall(String alarmType, List<Long> deptIds) {
         String deptStrs = deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(","));
         //Todo:加入报警类型
-        return this.baseMapper.overall(alarmType,deptStrs);
+        return this.baseMapper.overall(alarmType, deptStrs);
     }
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, List<Long> deptIds, 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, deptStrs, request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
-            alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType())?"闸井":("2".equals(alarmPositionResponseDTO.getType())?"场站":"管线"));
+            alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
         });
-        return  alarmPositionResponseDTOList;
+        return alarmPositionResponseDTOList;
     }
 
     @Override
-    public List<CommonResponseDTO> alarmType(String alarmType, List<Long> deptIds, AlarmTypeRequestDTO request) {
-        String deptStrs = deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(","));
-        List<CommonResponseDTO> commonResponseDTOList =  this.baseMapper.alarmType(alarmType,deptStrs,request);
-//        alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
-//            alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType())?"闸井":("2".equals(alarmPositionResponseDTO.getType())?"场站":"管线"));
-//        });
-        return  commonResponseDTOList;
+    public List<CommonResponseDTO> alarmType(String alarmType, AlarmTypeRequestDTO request) {
+
+        return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request);
+    }
+
+
+    public String getDeptIds(Long deptId) {
+        List<Long> deptIds = new ArrayList<>();
+        if (ObjectUtil.isNotEmpty(deptId)) {
+            //获取子级单位
+            deptIds = abstractDeptService.getIdsRecursionByPid(deptId, "");
+            deptIds.add(deptId);
+        } else {
+            //获取登录权限
+            DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+            if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) {
+                deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds();
+            }
+        }
+        return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(","));
+    }
+
+    @Override
+    public List<AlarmCompanyResponseDTO> alarmCompany(String alarmType, List<Long> deptIds, AlarmPositionRequestDTO request) {
+        return  this.baseMapper.alarmCompany(alarmType, "", request);
     }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
index 7b9ddf4..4992ab1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java
@@ -5,8 +5,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO;
-import com.casic.missiles.modular.alarm.dto.AlarmTypeRequestDTO;
+import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.service.IAlarmStaticsService;
 import com.casic.missiles.util.ReturnUtil;
@@ -45,13 +44,11 @@
     @ApiOperation("各类报警统计")
     @PostMapping("/alarmType")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
-
-        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+    public ReturnDTO<CommonResponseDTO> alarmType(@RequestBody AlarmTypeRequestDTO alarmTypeRequestDTO) {
         String alarmType="";
-        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,dataScope.getDeptIds(),alarmTypeRequestDTO));
+        return ReturnUtil.success(iAlarmStaticsService.alarmType(alarmType,alarmTypeRequestDTO));
     }
-//
+
 //    @ApiOperation("报警趋势分析")
 //    @PostMapping("/alarmTrend")
 //    @ResponseBody
@@ -61,21 +58,22 @@
 //        String alarmType="";
 //        return ReturnUtil.success(iAlarmStaticsService.alarmTrend(alarmType,dataScope.getDeptIds()));
 //    }
-//
-//    @ApiOperation("各单位报警统计")
-//    @PostMapping("/alarmCompany")
-//    @ResponseBody
-//    public ReturnDTO<AlarmRecords> alarmCompany() {
-//
-//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-//        String alarmType="";
-//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds()));
-//    }
+
+    @ApiOperation("各单位报警统计")
+    @PostMapping("/alarmCompany")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> alarmCompany(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+
+        //toDo:公司分类
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        String alarmType="";
+        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType,dataScope.getDeptIds(),alarmPositionRequestDTO));
+    }
 
     @ApiOperation("异常位置分析")
     @PostMapping("/alarmPosition")
     @ResponseBody
-    public ReturnDTO<AlarmRecords> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
+    public ReturnDTO<AlarmPositionResponseDTO> alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) {
 
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         String alarmType="";
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
new file mode 100644
index 0000000..e298440
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -0,0 +1,94 @@
+package com.casic.missiles.modular.alarm.controller;
+
+
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.service.IOverViewService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 首页展示 前端控制器
+ * </p>
+ *
+ * @author zt
+ * @since 2024-08-17
+ */
+@Api(tags = "首页展示接口模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/homePage/apis")
+public class OverViewController extends ExportController {
+
+    private final IOverViewService iOverViewService;
+    private final AbstractPermissionContext permissionContext;
+
+    @ApiOperation("基本概况")
+    @PostMapping("/overall")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> overall() {
+        //toDo:管线长度无法统计，暂定前端写入
+        return ReturnUtil.success(iOverViewService.overall());
+    }
+
+    @ApiOperation("设备运行情况，1：在线，0：离线，2：停用")
+    @PostMapping("/deviceStatus")
+    @ResponseBody
+    public ReturnDTO<CommonResponseDTO> deviceStatus() {
+        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("消息通知（待开发）")
+    @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;
+    }
+
+    @ApiOperation("弹窗参见报警分页列表(实时推送待开发)")
+    @PostMapping("/pop")
+    @ResponseBody
+    public ReturnDTO<AlarmCompanyResponseDTO> pop() {
+
+        //toDo:公司分类
+//        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+//        String alarmType = "";
+//        return ReturnUtil.success(iAlarmStaticsService.alarmCompany(alarmType, dataScope.getDeptIds(), alarmPositionRequestDTO));
+        return null;
+    }
+
+
+    @ApiOperation("异常位置分析")
+    @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));
+    }
+
+}
+
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
index acd97dc..0028d7f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmStaticsMapper.java
@@ -9,6 +9,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,7 +30,11 @@
                                                  @Param("request") AlarmPositionRequestDTO request);
 
     List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
-                                      @Param("deptIds") String deptIds,
+                                      @Param("deptStrs") String deptStrs,
                                       @Param("request") AlarmTypeRequestDTO request);
 
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
new file mode 100644
index 0000000..7cdb865
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -0,0 +1,38 @@
+package com.casic.missiles.modular.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报警管理（暂定） Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@Mapper
+public interface OverViewMapper extends BaseMapper<AlarmRecords> {
+
+    List<CommonResponseDTO> overall(@Param("deptStrs") String deptStrs);
+
+    List<CommonResponseDTO> deviceStatus(@Param("deptStrs") String deptStrs);
+
+    List<AlarmPositionResponseDTO> alarmPosition(@Param("alarmType") String alarmType,
+                                                 @Param("deptIds") String deptIds,
+                                                 @Param("request") AlarmPositionRequestDTO request);
+
+    List<CommonResponseDTO> alarmType(@Param("alarmType") String alarmType,
+                                      @Param("deptStrs") String deptStrs,
+                                      @Param("request") AlarmTypeRequestDTO request);
+
+    List<AlarmCompanyResponseDTO> alarmCompany(@Param("alarmType") String alarmType,
+                                       @Param("deptStrs") String deptStrs,
+                                       @Param("request") AlarmPositionRequestDTO request);
+
+}
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 1725724..63be4f7 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 lr ON lr.ID = bl.LEDGER_ID
+        LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
         AND bl.VALID = 1
         AND lr.VALID =1
         LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 432c042..35b366f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -78,4 +78,74 @@
         left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode
         left join sys_dept ad on bv.deptid= ad.id
     </select>
+
+    <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH alarms AS ( SELECT count(1) as sum,alarmType  from alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType) SELECT
+        ay.alarm_type AS `name`,
+        IFNULL(alarms.sum ,0) AS `value`
+        FROM
+        alarm_type ay
+        LEFT JOIN alarms ON ay.id = alarms.alarmType
+    </select>
+
+
+    <select id="alarmCompany" resultType="com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO">
+
+        SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType ,av.DEPTID
+
+    </select>
+
 </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
new file mode 100644
index 0000000..ae707a1
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/OverViewMapper.xml
@@ -0,0 +1,153 @@
+<?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.OverViewMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.alarm.entity.AlarmRecords">
+        <id column="ID" property="id"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="LEDGER_CODE" property="ledgerCode"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_CONTENT" property="alarmContent"/>
+        <result column="ALARM_VALUE" property="alarmValue"/>
+        <result column="ALARM_LEVEL" property="alarmLevel"/>
+        <result column="ALARM_TIME" property="alarmTime"/>
+        <result column="STATUS" property="status"/>
+        <result column="ALARM_MSG" property="alarmMsg"/>
+        <result column="PROCESS_STATUS" property="processStatus"/>
+        <result column="PROCESS_TIME" property="processTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID
+        , DEVCODE, LEDGER_CODE, ALARM_TYPE, ALARM_CONTENT, ALARM_VALUE, ALARM_LEVEL, ALARM_TIME, `STATUS`, ALARM_MSG, PROCESS_STATUS, PROCESS_TIME
+    </sql>
+
+    <select id="overall" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+        SELECT count(1) as `value`,"zj" as `name` FROM bus_ledger bl where bl.VALID=1 and   bl.TYPE=1
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bl.DEPTID in (${deptStrs})
+        </if>
+        UNION ALL
+        SELECT count(1) as `value`,"tyz" as `name` FROM bus_ledger bl where bl.VALID=1 and   bl.TYPE=2
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bl.DEPTID in (${deptStrs})
+        </if>
+    </select>
+
+
+    <select id="deviceStatus" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH device_temp AS	(SELECT bd.VALID,bd.ONLINE_STATE FROM `bus_device`  bd
+            LEFT join bus_device_ledger lr on lr.DEVICE_ID=bd.ID
+            LEFT join bus_ledger_all_view bv on lr.LEDGER_ID=bv.ID
+            <where>
+                <if test="deptStrs != null and deptStrs !='' ">
+                    and lr.DEPTID in (${deptStrs})
+                </if>
+            </where>
+            )
+        SELECT count(1) as `value`, '2' as `name` FROM device_temp bt where bt.VALID>1
+        UNION ALL
+        SELECT count(1) as `value`, bt.ONLINE_STATE as `name` FROM device_temp bt where bt.VALID>0 GROUP BY bt.ONLINE_STATE
+    </select>
+
+    <select id="alarmPosition" resultType="com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO">
+        WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+        </where>
+        GROUP BY ledgerCode)
+        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
+    </select>
+
+    <select id="alarmType" resultType="com.casic.missiles.modular.alarm.dto.CommonResponseDTO">
+
+        WITH alarms AS ( SELECT count(1) as sum,alarmType  from alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType) SELECT
+        ay.alarm_type AS `name`,
+        IFNULL(alarms.sum ,0) AS `value`
+        FROM
+        alarm_type ay
+        LEFT JOIN alarms ON ay.id = alarms.alarmType
+    </select>
+
+
+    <select id="alarmCompany" resultType="com.casic.missiles.modular.alarm.dto.AlarmCompanyResponseDTO">
+
+        SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av
+
+        <where>
+            <if test="request.timeType ==1 ">
+                and  av.alarmTime >= CURDATE()
+            </if>
+            <if test="request.timeType ==2 ">
+                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            </if>
+            <if test="request.timeType ==3 ">
+                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            </if>
+            <if test="request.begTime != null and request.begTime !='' ">
+                and av.alarmTime >= #{request.begTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !='' ">
+                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            </if>
+            <if test="request.ledgerType != null and request.ledgerType !='' ">
+                and av.watchObject = #{request.ledgerType}
+            </if>
+            <if test="deptStrs != null and deptStrs !='' ">
+                and av.DEPTID in (${deptStrs})
+            </if>
+        </where>
+
+        GROUP BY av.alarmType ,av.DEPTID
+
+    </select>
+
+</mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmCompanyResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmCompanyResponseDTO.java
new file mode 100644
index 0000000..7d4d81d
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmCompanyResponseDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlarmCompanyResponseDTO {
+
+    @ApiModelProperty("报警数量")
+    private Long alarmSum;
+
+    @ApiModelProperty("部门 ")
+    private Long deptid;
+
+    @ApiModelProperty("报警类型")
+    private Long alarmType;
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java
index 4c1b2ea..fa10d45 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmStaticsService.java
@@ -22,6 +22,9 @@
 
     List<AlarmPositionResponseDTO>  alarmPosition(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
 
-    List<CommonResponseDTO>  alarmType(String alarmType , List<Long> deptIds,AlarmTypeRequestDTO alarmTypeRequestDTO);
+    List<CommonResponseDTO>  alarmType(String alarmType ,AlarmTypeRequestDTO alarmTypeRequestDTO);
+
+    List<AlarmCompanyResponseDTO>  alarmCompany(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
+
 
 }
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
new file mode 100644
index 0000000..38ae078
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IOverViewService.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.modular.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.alarm.dto.*;
+import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报警管理（暂定） 服务类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+public interface IOverViewService extends IService<AlarmRecords> {
+
+    List<CommonResponseDTO>  overall();
+
+    List<CommonResponseDTO>  deviceStatus();
+
+    List<AlarmPositionResponseDTO>  alarmPosition(String alarmType , List<Long> deptIds,AlarmPositionRequestDTO alarmPositionRequestDTO);
+
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
index 6502946..28707b1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 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.AlarmStaticsMapper;
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
@@ -9,6 +13,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -24,31 +29,52 @@
 @Service
 public class AlarmStaticsServiceImpl extends ServiceImpl<AlarmStaticsMapper, AlarmRecords> implements IAlarmStaticsService {
 
+    private final AbstractDeptService abstractDeptService;
+    private final AbstractPermissionContext permissionContext;
+
     @Override
     public List<AlarmOverDTO> overall(String alarmType, List<Long> deptIds) {
         String deptStrs = deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(","));
         //Todo:加入报警类型
-        return this.baseMapper.overall(alarmType,deptStrs);
+        return this.baseMapper.overall(alarmType, deptStrs);
     }
 
     @Override
     public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, List<Long> deptIds, 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, deptStrs, request);
         alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
-            alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType())?"闸井":("2".equals(alarmPositionResponseDTO.getType())?"场站":"管线"));
+            alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
         });
-        return  alarmPositionResponseDTOList;
+        return alarmPositionResponseDTOList;
     }
 
     @Override
-    public List<CommonResponseDTO> alarmType(String alarmType, List<Long> deptIds, AlarmTypeRequestDTO request) {
-        String deptStrs = deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(","));
-        List<CommonResponseDTO> commonResponseDTOList =  this.baseMapper.alarmType(alarmType,deptStrs,request);
-//        alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
-//            alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType())?"闸井":("2".equals(alarmPositionResponseDTO.getType())?"场站":"管线"));
-//        });
-        return  commonResponseDTOList;
+    public List<CommonResponseDTO> alarmType(String alarmType, AlarmTypeRequestDTO request) {
+
+        return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request);
+    }
+
+
+    public String getDeptIds(Long deptId) {
+        List<Long> deptIds = new ArrayList<>();
+        if (ObjectUtil.isNotEmpty(deptId)) {
+            //获取子级单位
+            deptIds = abstractDeptService.getIdsRecursionByPid(deptId, "");
+            deptIds.add(deptId);
+        } else {
+            //获取登录权限
+            DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+            if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) {
+                deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds();
+            }
+        }
+        return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(","));
+    }
+
+    @Override
+    public List<AlarmCompanyResponseDTO> alarmCompany(String alarmType, List<Long> deptIds, AlarmPositionRequestDTO request) {
+        return  this.baseMapper.alarmCompany(alarmType, "", request);
     }
 }
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
new file mode 100644
index 0000000..5fb7610
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -0,0 +1,67 @@
+package com.casic.missiles.modular.alarm.service.impl;
+
+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;
+import com.casic.missiles.modular.alarm.dto.AlarmPositionResponseDTO;
+import com.casic.missiles.modular.alarm.dto.CommonResponseDTO;
+import com.casic.missiles.modular.alarm.entity.AlarmRecords;
+import com.casic.missiles.modular.alarm.service.IOverViewService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 报警管理（暂定） 服务实现类
+ * </p>
+ *
+ * @author zt
+ * @since 2024-07-16
+ */
+@RequiredArgsConstructor
+@Service
+public class OverViewServiceImpl extends ServiceImpl<OverViewMapper, AlarmRecords> implements IOverViewService {
+
+    private final AbstractDeptService abstractDeptService;
+    private final AbstractPermissionContext permissionContext;
+
+    @Override
+    public List<CommonResponseDTO> overall() {
+        return this.baseMapper.overall(getDeptIds());
+    }
+
+    @Override
+    public List<CommonResponseDTO> deviceStatus() {
+        return this.baseMapper.deviceStatus(getDeptIds());
+    }
+
+    @Override
+    public List<AlarmPositionResponseDTO> alarmPosition(String alarmType, List<Long> deptIds, AlarmPositionRequestDTO request) {
+        //Todo:加入报警类型
+        String deptStrs = deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(","));
+        List<AlarmPositionResponseDTO> alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, deptStrs, request);
+        alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> {
+            alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线"));
+        });
+        return alarmPositionResponseDTOList;
+    }
+
+    public String getDeptIds() {
+        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(","));
+        }
+        return deptIdStr;
+    }
+
+}