diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index 85de121..361cb89 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -18,4 +18,22 @@
     private Long orderCount;
     @ApiModelProperty(value = "校准业务数量", dataType = "Long")
     private Long calibrationOrderCount;
+
+    @ApiModelProperty(value = "城市", dataType = "String")
+    private String 城市名称;
+    public String get城市名称() {
+        return this.cityName;
+    }
+
+    @ApiModelProperty(value = "检定业务", dataType = "Long")
+    private Long 检定业务数量;
+    public Long get检定业务数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "校准业务", dataType = "Long")
+    private Long 校准业务数量;
+    public Long get校准业务数量() {
+        return this.calibrationOrderCount;
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index 85de121..361cb89 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -18,4 +18,22 @@
     private Long orderCount;
     @ApiModelProperty(value = "校准业务数量", dataType = "Long")
     private Long calibrationOrderCount;
+
+    @ApiModelProperty(value = "城市", dataType = "String")
+    private String 城市名称;
+    public String get城市名称() {
+        return this.cityName;
+    }
+
+    @ApiModelProperty(value = "检定业务", dataType = "Long")
+    private Long 检定业务数量;
+    public Long get检定业务数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "校准业务", dataType = "Long")
+    private Long 校准业务数量;
+    public Long get校准业务数量() {
+        return this.calibrationOrderCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 92ee332..9a69a66 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -35,4 +35,29 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+    @ApiModelProperty(value = "产值总计(元)", dataType = "String")
+    private String 产值总计;
+    public String get实验室名称() {
+        return this.deptName;
+    }
+
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public String get产值总计() {
+        return this.outPutYuan;
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index 85de121..361cb89 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -18,4 +18,22 @@
     private Long orderCount;
     @ApiModelProperty(value = "校准业务数量", dataType = "Long")
     private Long calibrationOrderCount;
+
+    @ApiModelProperty(value = "城市", dataType = "String")
+    private String 城市名称;
+    public String get城市名称() {
+        return this.cityName;
+    }
+
+    @ApiModelProperty(value = "检定业务", dataType = "Long")
+    private Long 检定业务数量;
+    public Long get检定业务数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "校准业务", dataType = "Long")
+    private Long 校准业务数量;
+    public Long get校准业务数量() {
+        return this.calibrationOrderCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 92ee332..9a69a66 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -35,4 +35,29 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+    @ApiModelProperty(value = "产值总计(元)", dataType = "String")
+    private String 产值总计;
+    public String get实验室名称() {
+        return this.deptName;
+    }
+
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public String get产值总计() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
new file mode 100644
index 0000000..68df1e2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireDeviceStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index 85de121..361cb89 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -18,4 +18,22 @@
     private Long orderCount;
     @ApiModelProperty(value = "校准业务数量", dataType = "Long")
     private Long calibrationOrderCount;
+
+    @ApiModelProperty(value = "城市", dataType = "String")
+    private String 城市名称;
+    public String get城市名称() {
+        return this.cityName;
+    }
+
+    @ApiModelProperty(value = "检定业务", dataType = "Long")
+    private Long 检定业务数量;
+    public Long get检定业务数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "校准业务", dataType = "Long")
+    private Long 校准业务数量;
+    public Long get校准业务数量() {
+        return this.calibrationOrderCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 92ee332..9a69a66 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -35,4 +35,29 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+    @ApiModelProperty(value = "产值总计(元)", dataType = "String")
+    private String 产值总计;
+    public String get实验室名称() {
+        return this.deptName;
+    }
+
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public String get产值总计() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
new file mode 100644
index 0000000..68df1e2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireDeviceStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
new file mode 100644
index 0000000..f379431
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireEquipmentStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index 85de121..361cb89 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -18,4 +18,22 @@
     private Long orderCount;
     @ApiModelProperty(value = "校准业务数量", dataType = "Long")
     private Long calibrationOrderCount;
+
+    @ApiModelProperty(value = "城市", dataType = "String")
+    private String 城市名称;
+    public String get城市名称() {
+        return this.cityName;
+    }
+
+    @ApiModelProperty(value = "检定业务", dataType = "Long")
+    private Long 检定业务数量;
+    public Long get检定业务数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "校准业务", dataType = "Long")
+    private Long 校准业务数量;
+    public Long get校准业务数量() {
+        return this.calibrationOrderCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 92ee332..9a69a66 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -35,4 +35,29 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+    @ApiModelProperty(value = "产值总计(元)", dataType = "String")
+    private String 产值总计;
+    public String get实验室名称() {
+        return this.deptName;
+    }
+
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public String get产值总计() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
new file mode 100644
index 0000000..68df1e2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireDeviceStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
new file mode 100644
index 0000000..f379431
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireEquipmentStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
index 888f2c7..c38d3f4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
@@ -21,4 +21,29 @@
     private Long deviceCount;
     @ApiModelProperty(value = "人数", dataType = "Long")
     private Long staffCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String 实验室;
+    public String get实验室() {
+        return this.deptName;
+    }
+
+    @ApiModelProperty(value = "装置数量", dataType = "Long")
+    private Long 装置数量;
+    public Long get装置数量() {
+        return this.equipmentCount;
+    }
+
+    @ApiModelProperty(value = "设备数量", dataType = "Long")
+    private Long 设备数量;
+    public Long get设备数量() {
+        return this.deviceCount;
+    }
+
+    @ApiModelProperty(value = "人数", dataType = "Long")
+    private Long 人数;
+    public Long get人数() {
+        return this.staffCount;
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index 85de121..361cb89 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -18,4 +18,22 @@
     private Long orderCount;
     @ApiModelProperty(value = "校准业务数量", dataType = "Long")
     private Long calibrationOrderCount;
+
+    @ApiModelProperty(value = "城市", dataType = "String")
+    private String 城市名称;
+    public String get城市名称() {
+        return this.cityName;
+    }
+
+    @ApiModelProperty(value = "检定业务", dataType = "Long")
+    private Long 检定业务数量;
+    public Long get检定业务数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "校准业务", dataType = "Long")
+    private Long 校准业务数量;
+    public Long get校准业务数量() {
+        return this.calibrationOrderCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 92ee332..9a69a66 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -35,4 +35,29 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+    @ApiModelProperty(value = "产值总计(元)", dataType = "String")
+    private String 产值总计;
+    public String get实验室名称() {
+        return this.deptName;
+    }
+
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public String get产值总计() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
new file mode 100644
index 0000000..68df1e2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireDeviceStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
new file mode 100644
index 0000000..f379431
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireEquipmentStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
index 888f2c7..c38d3f4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
@@ -21,4 +21,29 @@
     private Long deviceCount;
     @ApiModelProperty(value = "人数", dataType = "Long")
     private Long staffCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String 实验室;
+    public String get实验室() {
+        return this.deptName;
+    }
+
+    @ApiModelProperty(value = "装置数量", dataType = "Long")
+    private Long 装置数量;
+    public Long get装置数量() {
+        return this.equipmentCount;
+    }
+
+    @ApiModelProperty(value = "设备数量", dataType = "Long")
+    private Long 设备数量;
+    public Long get设备数量() {
+        return this.deviceCount;
+    }
+
+    @ApiModelProperty(value = "人数", dataType = "Long")
+    private Long 人数;
+    public Long get人数() {
+        return this.staffCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
index 5256f19..b39e87f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
@@ -42,4 +42,17 @@
     @JSONField(serialize = false)
     @ApiModelProperty(hidden = true)
     private Integer postPrice;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "营收金额(元)", dataType = "String")
+    private String 营收金额;
+    public String get营收金额() {
+        return this.amountYuan;
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index 85de121..361cb89 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -18,4 +18,22 @@
     private Long orderCount;
     @ApiModelProperty(value = "校准业务数量", dataType = "Long")
     private Long calibrationOrderCount;
+
+    @ApiModelProperty(value = "城市", dataType = "String")
+    private String 城市名称;
+    public String get城市名称() {
+        return this.cityName;
+    }
+
+    @ApiModelProperty(value = "检定业务", dataType = "Long")
+    private Long 检定业务数量;
+    public Long get检定业务数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "校准业务", dataType = "Long")
+    private Long 校准业务数量;
+    public Long get校准业务数量() {
+        return this.calibrationOrderCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 92ee332..9a69a66 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -35,4 +35,29 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+    @ApiModelProperty(value = "产值总计(元)", dataType = "String")
+    private String 产值总计;
+    public String get实验室名称() {
+        return this.deptName;
+    }
+
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public String get产值总计() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
new file mode 100644
index 0000000..68df1e2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireDeviceStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
new file mode 100644
index 0000000..f379431
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireEquipmentStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
index 888f2c7..c38d3f4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
@@ -21,4 +21,29 @@
     private Long deviceCount;
     @ApiModelProperty(value = "人数", dataType = "Long")
     private Long staffCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String 实验室;
+    public String get实验室() {
+        return this.deptName;
+    }
+
+    @ApiModelProperty(value = "装置数量", dataType = "Long")
+    private Long 装置数量;
+    public Long get装置数量() {
+        return this.equipmentCount;
+    }
+
+    @ApiModelProperty(value = "设备数量", dataType = "Long")
+    private Long 设备数量;
+    public Long get设备数量() {
+        return this.deviceCount;
+    }
+
+    @ApiModelProperty(value = "人数", dataType = "Long")
+    private Long 人数;
+    public Long get人数() {
+        return this.staffCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
index 5256f19..b39e87f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
@@ -42,4 +42,17 @@
     @JSONField(serialize = false)
     @ApiModelProperty(hidden = true)
     private Integer postPrice;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "营收金额(元)", dataType = "String")
+    private String 营收金额;
+    public String get营收金额() {
+        return this.amountYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
index 643b1fc..8553342 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
@@ -36,4 +36,30 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "人员", dataType = "String")
+    private String 人员;
+    @ApiModelProperty(value = "已检测", dataType = "Integer")
+    private Integer 已检测;
+    @ApiModelProperty(value = "报告数", dataType = "Integer")
+    private Integer 报告数;
+    @ApiModelProperty(value = "产值", dataType = "Integer")
+    private String 产值;
+
+    public String get人员() {
+        return this.staffName;
+    }
+
+    public Integer get已检测() {
+        return this.samples;
+    }
+
+    public Integer get报告数() {
+        return this.certificates;
+    }
+
+    public String get产值() {
+        return this.outPutYuan;
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index 85de121..361cb89 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -18,4 +18,22 @@
     private Long orderCount;
     @ApiModelProperty(value = "校准业务数量", dataType = "Long")
     private Long calibrationOrderCount;
+
+    @ApiModelProperty(value = "城市", dataType = "String")
+    private String 城市名称;
+    public String get城市名称() {
+        return this.cityName;
+    }
+
+    @ApiModelProperty(value = "检定业务", dataType = "Long")
+    private Long 检定业务数量;
+    public Long get检定业务数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "校准业务", dataType = "Long")
+    private Long 校准业务数量;
+    public Long get校准业务数量() {
+        return this.calibrationOrderCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 92ee332..9a69a66 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -35,4 +35,29 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+    @ApiModelProperty(value = "产值总计(元)", dataType = "String")
+    private String 产值总计;
+    public String get实验室名称() {
+        return this.deptName;
+    }
+
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public String get产值总计() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
new file mode 100644
index 0000000..68df1e2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireDeviceStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
new file mode 100644
index 0000000..f379431
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireEquipmentStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
index 888f2c7..c38d3f4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
@@ -21,4 +21,29 @@
     private Long deviceCount;
     @ApiModelProperty(value = "人数", dataType = "Long")
     private Long staffCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String 实验室;
+    public String get实验室() {
+        return this.deptName;
+    }
+
+    @ApiModelProperty(value = "装置数量", dataType = "Long")
+    private Long 装置数量;
+    public Long get装置数量() {
+        return this.equipmentCount;
+    }
+
+    @ApiModelProperty(value = "设备数量", dataType = "Long")
+    private Long 设备数量;
+    public Long get设备数量() {
+        return this.deviceCount;
+    }
+
+    @ApiModelProperty(value = "人数", dataType = "Long")
+    private Long 人数;
+    public Long get人数() {
+        return this.staffCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
index 5256f19..b39e87f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
@@ -42,4 +42,17 @@
     @JSONField(serialize = false)
     @ApiModelProperty(hidden = true)
     private Integer postPrice;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "营收金额(元)", dataType = "String")
+    private String 营收金额;
+    public String get营收金额() {
+        return this.amountYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
index 643b1fc..8553342 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
@@ -36,4 +36,30 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "人员", dataType = "String")
+    private String 人员;
+    @ApiModelProperty(value = "已检测", dataType = "Integer")
+    private Integer 已检测;
+    @ApiModelProperty(value = "报告数", dataType = "Integer")
+    private Integer 报告数;
+    @ApiModelProperty(value = "产值", dataType = "Integer")
+    private String 产值;
+
+    public String get人员() {
+        return this.staffName;
+    }
+
+    public Integer get已检测() {
+        return this.samples;
+    }
+
+    public Integer get报告数() {
+        return this.certificates;
+    }
+
+    public String get产值() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
index 62535e2..e3b542c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
@@ -14,4 +14,18 @@
     private String month;
     @ApiModelProperty(value = "业务量", dataType = "Integer")
     private Integer traffic;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    @ApiModelProperty(value = "业务量", dataType = "Integer")
+    private Integer 业务量;
+
+    public String get月份() {
+        return this.month;
+    }
+
+    public Integer get业务量() {
+        return this.traffic;
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index 85de121..361cb89 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -18,4 +18,22 @@
     private Long orderCount;
     @ApiModelProperty(value = "校准业务数量", dataType = "Long")
     private Long calibrationOrderCount;
+
+    @ApiModelProperty(value = "城市", dataType = "String")
+    private String 城市名称;
+    public String get城市名称() {
+        return this.cityName;
+    }
+
+    @ApiModelProperty(value = "检定业务", dataType = "Long")
+    private Long 检定业务数量;
+    public Long get检定业务数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "校准业务", dataType = "Long")
+    private Long 校准业务数量;
+    public Long get校准业务数量() {
+        return this.calibrationOrderCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 92ee332..9a69a66 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -35,4 +35,29 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+    @ApiModelProperty(value = "产值总计(元)", dataType = "String")
+    private String 产值总计;
+    public String get实验室名称() {
+        return this.deptName;
+    }
+
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public String get产值总计() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
new file mode 100644
index 0000000..68df1e2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireDeviceStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
new file mode 100644
index 0000000..f379431
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireEquipmentStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
index 888f2c7..c38d3f4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
@@ -21,4 +21,29 @@
     private Long deviceCount;
     @ApiModelProperty(value = "人数", dataType = "Long")
     private Long staffCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String 实验室;
+    public String get实验室() {
+        return this.deptName;
+    }
+
+    @ApiModelProperty(value = "装置数量", dataType = "Long")
+    private Long 装置数量;
+    public Long get装置数量() {
+        return this.equipmentCount;
+    }
+
+    @ApiModelProperty(value = "设备数量", dataType = "Long")
+    private Long 设备数量;
+    public Long get设备数量() {
+        return this.deviceCount;
+    }
+
+    @ApiModelProperty(value = "人数", dataType = "Long")
+    private Long 人数;
+    public Long get人数() {
+        return this.staffCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
index 5256f19..b39e87f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
@@ -42,4 +42,17 @@
     @JSONField(serialize = false)
     @ApiModelProperty(hidden = true)
     private Integer postPrice;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "营收金额(元)", dataType = "String")
+    private String 营收金额;
+    public String get营收金额() {
+        return this.amountYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
index 643b1fc..8553342 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
@@ -36,4 +36,30 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "人员", dataType = "String")
+    private String 人员;
+    @ApiModelProperty(value = "已检测", dataType = "Integer")
+    private Integer 已检测;
+    @ApiModelProperty(value = "报告数", dataType = "Integer")
+    private Integer 报告数;
+    @ApiModelProperty(value = "产值", dataType = "Integer")
+    private String 产值;
+
+    public String get人员() {
+        return this.staffName;
+    }
+
+    public Integer get已检测() {
+        return this.samples;
+    }
+
+    public Integer get报告数() {
+        return this.certificates;
+    }
+
+    public String get产值() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
index 62535e2..e3b542c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
@@ -14,4 +14,18 @@
     private String month;
     @ApiModelProperty(value = "业务量", dataType = "Integer")
     private Integer traffic;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    @ApiModelProperty(value = "业务量", dataType = "Integer")
+    private Integer 业务量;
+
+    public String get月份() {
+        return this.month;
+    }
+
+    public Integer get业务量() {
+        return this.traffic;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
index f4a7c77..c398773 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
@@ -26,4 +26,24 @@
     //总计检定金额
     @ApiModelProperty(value = "总计检定金额（单位元）", dataType = "String")
     private String totalAmountYuan;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    @ApiModelProperty(value = "业务次数", dataType = "Integer")
+    private Integer 业务次数;
+    @ApiModelProperty(value = "业务金额", dataType = "String")
+    private String 业务金额;
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get业务次数() {
+        return this.businessFrequency;
+    }
+
+    public String get业务金额() {
+        return this.totalAmountYuan;
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index 85de121..361cb89 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -18,4 +18,22 @@
     private Long orderCount;
     @ApiModelProperty(value = "校准业务数量", dataType = "Long")
     private Long calibrationOrderCount;
+
+    @ApiModelProperty(value = "城市", dataType = "String")
+    private String 城市名称;
+    public String get城市名称() {
+        return this.cityName;
+    }
+
+    @ApiModelProperty(value = "检定业务", dataType = "Long")
+    private Long 检定业务数量;
+    public Long get检定业务数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "校准业务", dataType = "Long")
+    private Long 校准业务数量;
+    public Long get校准业务数量() {
+        return this.calibrationOrderCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 92ee332..9a69a66 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -35,4 +35,29 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+    @ApiModelProperty(value = "产值总计(元)", dataType = "String")
+    private String 产值总计;
+    public String get实验室名称() {
+        return this.deptName;
+    }
+
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public String get产值总计() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
new file mode 100644
index 0000000..68df1e2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireDeviceStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
new file mode 100644
index 0000000..f379431
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireEquipmentStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
index 888f2c7..c38d3f4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
@@ -21,4 +21,29 @@
     private Long deviceCount;
     @ApiModelProperty(value = "人数", dataType = "Long")
     private Long staffCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String 实验室;
+    public String get实验室() {
+        return this.deptName;
+    }
+
+    @ApiModelProperty(value = "装置数量", dataType = "Long")
+    private Long 装置数量;
+    public Long get装置数量() {
+        return this.equipmentCount;
+    }
+
+    @ApiModelProperty(value = "设备数量", dataType = "Long")
+    private Long 设备数量;
+    public Long get设备数量() {
+        return this.deviceCount;
+    }
+
+    @ApiModelProperty(value = "人数", dataType = "Long")
+    private Long 人数;
+    public Long get人数() {
+        return this.staffCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
index 5256f19..b39e87f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
@@ -42,4 +42,17 @@
     @JSONField(serialize = false)
     @ApiModelProperty(hidden = true)
     private Integer postPrice;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "营收金额(元)", dataType = "String")
+    private String 营收金额;
+    public String get营收金额() {
+        return this.amountYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
index 643b1fc..8553342 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
@@ -36,4 +36,30 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "人员", dataType = "String")
+    private String 人员;
+    @ApiModelProperty(value = "已检测", dataType = "Integer")
+    private Integer 已检测;
+    @ApiModelProperty(value = "报告数", dataType = "Integer")
+    private Integer 报告数;
+    @ApiModelProperty(value = "产值", dataType = "Integer")
+    private String 产值;
+
+    public String get人员() {
+        return this.staffName;
+    }
+
+    public Integer get已检测() {
+        return this.samples;
+    }
+
+    public Integer get报告数() {
+        return this.certificates;
+    }
+
+    public String get产值() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
index 62535e2..e3b542c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
@@ -14,4 +14,18 @@
     private String month;
     @ApiModelProperty(value = "业务量", dataType = "Integer")
     private Integer traffic;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    @ApiModelProperty(value = "业务量", dataType = "Integer")
+    private Integer 业务量;
+
+    public String get月份() {
+        return this.month;
+    }
+
+    public Integer get业务量() {
+        return this.traffic;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
index f4a7c77..c398773 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
@@ -26,4 +26,24 @@
     //总计检定金额
     @ApiModelProperty(value = "总计检定金额（单位元）", dataType = "String")
     private String totalAmountYuan;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    @ApiModelProperty(value = "业务次数", dataType = "Integer")
+    private Integer 业务次数;
+    @ApiModelProperty(value = "业务金额", dataType = "String")
+    private String 业务金额;
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get业务次数() {
+        return this.businessFrequency;
+    }
+
+    public String get业务金额() {
+        return this.totalAmountYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
index fc0aeeb..4db5fcb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
@@ -233,14 +233,14 @@
      * 使用人
      */
     @TableField("use_person")
-    @ApiModelProperty(value = "使用人", dataType = "Long", required = false)
+    @ApiModelProperty(value = "使用人", dataType = "String", required = false)
     private Long usePerson;
 
     /**
      * 使用人名称
      */
     @TableField(exist = false)
-    @ApiModelProperty(value = "使用人", dataType = "Long", required = false)
+    @ApiModelProperty(value = "使用人", dataType = "String", required = false)
     private String usePersonName;
 
     /**
@@ -585,4 +585,28 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "申请设备关联id", dataType = "String", required = false)
     private String applyRelationId;
+
+
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "设备名称", dataType = "String")
+    private String 设备名称;
+    public String get设备名称() {
+        return this.equipmentName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    private String 负责人;
+    public String get负责人() {
+        return this.usePersonName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "到期时间", dataType = "String")
+    private String 到期时间;
+    public String get到期时间() {
+        return this.validDate;
+    }
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index 85de121..361cb89 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -18,4 +18,22 @@
     private Long orderCount;
     @ApiModelProperty(value = "校准业务数量", dataType = "Long")
     private Long calibrationOrderCount;
+
+    @ApiModelProperty(value = "城市", dataType = "String")
+    private String 城市名称;
+    public String get城市名称() {
+        return this.cityName;
+    }
+
+    @ApiModelProperty(value = "检定业务", dataType = "Long")
+    private Long 检定业务数量;
+    public Long get检定业务数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "校准业务", dataType = "Long")
+    private Long 校准业务数量;
+    public Long get校准业务数量() {
+        return this.calibrationOrderCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 92ee332..9a69a66 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -35,4 +35,29 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+    @ApiModelProperty(value = "产值总计(元)", dataType = "String")
+    private String 产值总计;
+    public String get实验室名称() {
+        return this.deptName;
+    }
+
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public String get产值总计() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
new file mode 100644
index 0000000..68df1e2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireDeviceStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
new file mode 100644
index 0000000..f379431
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireEquipmentStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
index 888f2c7..c38d3f4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
@@ -21,4 +21,29 @@
     private Long deviceCount;
     @ApiModelProperty(value = "人数", dataType = "Long")
     private Long staffCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String 实验室;
+    public String get实验室() {
+        return this.deptName;
+    }
+
+    @ApiModelProperty(value = "装置数量", dataType = "Long")
+    private Long 装置数量;
+    public Long get装置数量() {
+        return this.equipmentCount;
+    }
+
+    @ApiModelProperty(value = "设备数量", dataType = "Long")
+    private Long 设备数量;
+    public Long get设备数量() {
+        return this.deviceCount;
+    }
+
+    @ApiModelProperty(value = "人数", dataType = "Long")
+    private Long 人数;
+    public Long get人数() {
+        return this.staffCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
index 5256f19..b39e87f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
@@ -42,4 +42,17 @@
     @JSONField(serialize = false)
     @ApiModelProperty(hidden = true)
     private Integer postPrice;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "营收金额(元)", dataType = "String")
+    private String 营收金额;
+    public String get营收金额() {
+        return this.amountYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
index 643b1fc..8553342 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
@@ -36,4 +36,30 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "人员", dataType = "String")
+    private String 人员;
+    @ApiModelProperty(value = "已检测", dataType = "Integer")
+    private Integer 已检测;
+    @ApiModelProperty(value = "报告数", dataType = "Integer")
+    private Integer 报告数;
+    @ApiModelProperty(value = "产值", dataType = "Integer")
+    private String 产值;
+
+    public String get人员() {
+        return this.staffName;
+    }
+
+    public Integer get已检测() {
+        return this.samples;
+    }
+
+    public Integer get报告数() {
+        return this.certificates;
+    }
+
+    public String get产值() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
index 62535e2..e3b542c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
@@ -14,4 +14,18 @@
     private String month;
     @ApiModelProperty(value = "业务量", dataType = "Integer")
     private Integer traffic;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    @ApiModelProperty(value = "业务量", dataType = "Integer")
+    private Integer 业务量;
+
+    public String get月份() {
+        return this.month;
+    }
+
+    public Integer get业务量() {
+        return this.traffic;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
index f4a7c77..c398773 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
@@ -26,4 +26,24 @@
     //总计检定金额
     @ApiModelProperty(value = "总计检定金额（单位元）", dataType = "String")
     private String totalAmountYuan;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    @ApiModelProperty(value = "业务次数", dataType = "Integer")
+    private Integer 业务次数;
+    @ApiModelProperty(value = "业务金额", dataType = "String")
+    private String 业务金额;
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get业务次数() {
+        return this.businessFrequency;
+    }
+
+    public String get业务金额() {
+        return this.totalAmountYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
index fc0aeeb..4db5fcb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
@@ -233,14 +233,14 @@
      * 使用人
      */
     @TableField("use_person")
-    @ApiModelProperty(value = "使用人", dataType = "Long", required = false)
+    @ApiModelProperty(value = "使用人", dataType = "String", required = false)
     private Long usePerson;
 
     /**
      * 使用人名称
      */
     @TableField(exist = false)
-    @ApiModelProperty(value = "使用人", dataType = "Long", required = false)
+    @ApiModelProperty(value = "使用人", dataType = "String", required = false)
     private String usePersonName;
 
     /**
@@ -585,4 +585,28 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "申请设备关联id", dataType = "String", required = false)
     private String applyRelationId;
+
+
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "设备名称", dataType = "String")
+    private String 设备名称;
+    public String get设备名称() {
+        return this.equipmentName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    private String 负责人;
+    public String get负责人() {
+        return this.usePersonName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "到期时间", dataType = "String")
+    private String 到期时间;
+    public String get到期时间() {
+        return this.validDate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java
index ac275b4..fb79491 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java
@@ -391,4 +391,27 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "关联检定规程列表", dataType = "List")
     private List<EquipmentStandardVerifyRegulation> verifyRegulationList;
+
+
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "标准装置名称", dataType = "String")
+    private String 标准装置名称;
+    public String get标准装置名称() {
+        return this.standardName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    private String 负责人;
+    public String get负责人() {
+        return this.laboratoryOwnerName;
+    }
+    // TODO: 2023/6/26 质量模块完成后需调整这里使用validTime
+    @TableField(exist = false)
+    @ApiModelProperty(value = "到期时间", dataType = "String")
+    private String 到期时间;
+    public String get到期时间() {
+        return this.remindTime;
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index 85de121..361cb89 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -18,4 +18,22 @@
     private Long orderCount;
     @ApiModelProperty(value = "校准业务数量", dataType = "Long")
     private Long calibrationOrderCount;
+
+    @ApiModelProperty(value = "城市", dataType = "String")
+    private String 城市名称;
+    public String get城市名称() {
+        return this.cityName;
+    }
+
+    @ApiModelProperty(value = "检定业务", dataType = "Long")
+    private Long 检定业务数量;
+    public Long get检定业务数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "校准业务", dataType = "Long")
+    private Long 校准业务数量;
+    public Long get校准业务数量() {
+        return this.calibrationOrderCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 92ee332..9a69a66 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -35,4 +35,29 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+    @ApiModelProperty(value = "产值总计(元)", dataType = "String")
+    private String 产值总计;
+    public String get实验室名称() {
+        return this.deptName;
+    }
+
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public String get产值总计() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
new file mode 100644
index 0000000..68df1e2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireDeviceStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
new file mode 100644
index 0000000..f379431
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireEquipmentStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
index 888f2c7..c38d3f4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
@@ -21,4 +21,29 @@
     private Long deviceCount;
     @ApiModelProperty(value = "人数", dataType = "Long")
     private Long staffCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String 实验室;
+    public String get实验室() {
+        return this.deptName;
+    }
+
+    @ApiModelProperty(value = "装置数量", dataType = "Long")
+    private Long 装置数量;
+    public Long get装置数量() {
+        return this.equipmentCount;
+    }
+
+    @ApiModelProperty(value = "设备数量", dataType = "Long")
+    private Long 设备数量;
+    public Long get设备数量() {
+        return this.deviceCount;
+    }
+
+    @ApiModelProperty(value = "人数", dataType = "Long")
+    private Long 人数;
+    public Long get人数() {
+        return this.staffCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
index 5256f19..b39e87f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
@@ -42,4 +42,17 @@
     @JSONField(serialize = false)
     @ApiModelProperty(hidden = true)
     private Integer postPrice;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "营收金额(元)", dataType = "String")
+    private String 营收金额;
+    public String get营收金额() {
+        return this.amountYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
index 643b1fc..8553342 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
@@ -36,4 +36,30 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "人员", dataType = "String")
+    private String 人员;
+    @ApiModelProperty(value = "已检测", dataType = "Integer")
+    private Integer 已检测;
+    @ApiModelProperty(value = "报告数", dataType = "Integer")
+    private Integer 报告数;
+    @ApiModelProperty(value = "产值", dataType = "Integer")
+    private String 产值;
+
+    public String get人员() {
+        return this.staffName;
+    }
+
+    public Integer get已检测() {
+        return this.samples;
+    }
+
+    public Integer get报告数() {
+        return this.certificates;
+    }
+
+    public String get产值() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
index 62535e2..e3b542c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
@@ -14,4 +14,18 @@
     private String month;
     @ApiModelProperty(value = "业务量", dataType = "Integer")
     private Integer traffic;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    @ApiModelProperty(value = "业务量", dataType = "Integer")
+    private Integer 业务量;
+
+    public String get月份() {
+        return this.month;
+    }
+
+    public Integer get业务量() {
+        return this.traffic;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
index f4a7c77..c398773 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
@@ -26,4 +26,24 @@
     //总计检定金额
     @ApiModelProperty(value = "总计检定金额（单位元）", dataType = "String")
     private String totalAmountYuan;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    @ApiModelProperty(value = "业务次数", dataType = "Integer")
+    private Integer 业务次数;
+    @ApiModelProperty(value = "业务金额", dataType = "String")
+    private String 业务金额;
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get业务次数() {
+        return this.businessFrequency;
+    }
+
+    public String get业务金额() {
+        return this.totalAmountYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
index fc0aeeb..4db5fcb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
@@ -233,14 +233,14 @@
      * 使用人
      */
     @TableField("use_person")
-    @ApiModelProperty(value = "使用人", dataType = "Long", required = false)
+    @ApiModelProperty(value = "使用人", dataType = "String", required = false)
     private Long usePerson;
 
     /**
      * 使用人名称
      */
     @TableField(exist = false)
-    @ApiModelProperty(value = "使用人", dataType = "Long", required = false)
+    @ApiModelProperty(value = "使用人", dataType = "String", required = false)
     private String usePersonName;
 
     /**
@@ -585,4 +585,28 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "申请设备关联id", dataType = "String", required = false)
     private String applyRelationId;
+
+
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "设备名称", dataType = "String")
+    private String 设备名称;
+    public String get设备名称() {
+        return this.equipmentName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    private String 负责人;
+    public String get负责人() {
+        return this.usePersonName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "到期时间", dataType = "String")
+    private String 到期时间;
+    public String get到期时间() {
+        return this.validDate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java
index ac275b4..fb79491 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java
@@ -391,4 +391,27 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "关联检定规程列表", dataType = "List")
     private List<EquipmentStandardVerifyRegulation> verifyRegulationList;
+
+
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "标准装置名称", dataType = "String")
+    private String 标准装置名称;
+    public String get标准装置名称() {
+        return this.standardName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    private String 负责人;
+    public String get负责人() {
+        return this.laboratoryOwnerName;
+    }
+    // TODO: 2023/6/26 质量模块完成后需调整这里使用validTime
+    @TableField(exist = false)
+    @ApiModelProperty(value = "到期时间", dataType = "String")
+    private String 到期时间;
+    public String get到期时间() {
+        return this.remindTime;
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 687e93a..0d9eb13 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -10,8 +10,8 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.flowable.AllApproveDTO;
 import com.casic.missiles.dto.flowable.ToBeApprovedDTO;
-import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.system.SystemFlowForm;
 import com.casic.missiles.service.IBaseApprovalService;
@@ -375,7 +375,9 @@
             HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
                     .notDeleted()
                     .processInstanceId(task.getProcessInstanceId()).singleResult();
-            historicProcessInstances.add(historicProcessInstance);
+            if(Objects.nonNull(historicProcessInstance)){
+                historicProcessInstances.add(historicProcessInstance);
+            }
         }
         return historicProcessInstances;
     }
@@ -473,7 +475,9 @@
                     .processInstanceId(task.getProcessInstanceId())
                     .processInstanceBusinessStatus(failStatus)
                     .singleResult();
-            historicProcessInstances.add(historicProcessInstance);
+            if(Objects.nonNull(historicProcessInstance)){
+                historicProcessInstances.add(historicProcessInstance);
+            }
         }
         return historicProcessInstances;
     }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index 85de121..361cb89 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -18,4 +18,22 @@
     private Long orderCount;
     @ApiModelProperty(value = "校准业务数量", dataType = "Long")
     private Long calibrationOrderCount;
+
+    @ApiModelProperty(value = "城市", dataType = "String")
+    private String 城市名称;
+    public String get城市名称() {
+        return this.cityName;
+    }
+
+    @ApiModelProperty(value = "检定业务", dataType = "Long")
+    private Long 检定业务数量;
+    public Long get检定业务数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "校准业务", dataType = "Long")
+    private Long 校准业务数量;
+    public Long get校准业务数量() {
+        return this.calibrationOrderCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 92ee332..9a69a66 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -35,4 +35,29 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+    @ApiModelProperty(value = "产值总计(元)", dataType = "String")
+    private String 产值总计;
+    public String get实验室名称() {
+        return this.deptName;
+    }
+
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public String get产值总计() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
new file mode 100644
index 0000000..68df1e2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireDeviceStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
new file mode 100644
index 0000000..f379431
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireEquipmentStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
index 888f2c7..c38d3f4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
@@ -21,4 +21,29 @@
     private Long deviceCount;
     @ApiModelProperty(value = "人数", dataType = "Long")
     private Long staffCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String 实验室;
+    public String get实验室() {
+        return this.deptName;
+    }
+
+    @ApiModelProperty(value = "装置数量", dataType = "Long")
+    private Long 装置数量;
+    public Long get装置数量() {
+        return this.equipmentCount;
+    }
+
+    @ApiModelProperty(value = "设备数量", dataType = "Long")
+    private Long 设备数量;
+    public Long get设备数量() {
+        return this.deviceCount;
+    }
+
+    @ApiModelProperty(value = "人数", dataType = "Long")
+    private Long 人数;
+    public Long get人数() {
+        return this.staffCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
index 5256f19..b39e87f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
@@ -42,4 +42,17 @@
     @JSONField(serialize = false)
     @ApiModelProperty(hidden = true)
     private Integer postPrice;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "营收金额(元)", dataType = "String")
+    private String 营收金额;
+    public String get营收金额() {
+        return this.amountYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
index 643b1fc..8553342 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
@@ -36,4 +36,30 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "人员", dataType = "String")
+    private String 人员;
+    @ApiModelProperty(value = "已检测", dataType = "Integer")
+    private Integer 已检测;
+    @ApiModelProperty(value = "报告数", dataType = "Integer")
+    private Integer 报告数;
+    @ApiModelProperty(value = "产值", dataType = "Integer")
+    private String 产值;
+
+    public String get人员() {
+        return this.staffName;
+    }
+
+    public Integer get已检测() {
+        return this.samples;
+    }
+
+    public Integer get报告数() {
+        return this.certificates;
+    }
+
+    public String get产值() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
index 62535e2..e3b542c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
@@ -14,4 +14,18 @@
     private String month;
     @ApiModelProperty(value = "业务量", dataType = "Integer")
     private Integer traffic;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    @ApiModelProperty(value = "业务量", dataType = "Integer")
+    private Integer 业务量;
+
+    public String get月份() {
+        return this.month;
+    }
+
+    public Integer get业务量() {
+        return this.traffic;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
index f4a7c77..c398773 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
@@ -26,4 +26,24 @@
     //总计检定金额
     @ApiModelProperty(value = "总计检定金额（单位元）", dataType = "String")
     private String totalAmountYuan;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    @ApiModelProperty(value = "业务次数", dataType = "Integer")
+    private Integer 业务次数;
+    @ApiModelProperty(value = "业务金额", dataType = "String")
+    private String 业务金额;
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get业务次数() {
+        return this.businessFrequency;
+    }
+
+    public String get业务金额() {
+        return this.totalAmountYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
index fc0aeeb..4db5fcb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
@@ -233,14 +233,14 @@
      * 使用人
      */
     @TableField("use_person")
-    @ApiModelProperty(value = "使用人", dataType = "Long", required = false)
+    @ApiModelProperty(value = "使用人", dataType = "String", required = false)
     private Long usePerson;
 
     /**
      * 使用人名称
      */
     @TableField(exist = false)
-    @ApiModelProperty(value = "使用人", dataType = "Long", required = false)
+    @ApiModelProperty(value = "使用人", dataType = "String", required = false)
     private String usePersonName;
 
     /**
@@ -585,4 +585,28 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "申请设备关联id", dataType = "String", required = false)
     private String applyRelationId;
+
+
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "设备名称", dataType = "String")
+    private String 设备名称;
+    public String get设备名称() {
+        return this.equipmentName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    private String 负责人;
+    public String get负责人() {
+        return this.usePersonName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "到期时间", dataType = "String")
+    private String 到期时间;
+    public String get到期时间() {
+        return this.validDate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java
index ac275b4..fb79491 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java
@@ -391,4 +391,27 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "关联检定规程列表", dataType = "List")
     private List<EquipmentStandardVerifyRegulation> verifyRegulationList;
+
+
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "标准装置名称", dataType = "String")
+    private String 标准装置名称;
+    public String get标准装置名称() {
+        return this.standardName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    private String 负责人;
+    public String get负责人() {
+        return this.laboratoryOwnerName;
+    }
+    // TODO: 2023/6/26 质量模块完成后需调整这里使用validTime
+    @TableField(exist = false)
+    @ApiModelProperty(value = "到期时间", dataType = "String")
+    private String 到期时间;
+    public String get到期时间() {
+        return this.remindTime;
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 687e93a..0d9eb13 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -10,8 +10,8 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.flowable.AllApproveDTO;
 import com.casic.missiles.dto.flowable.ToBeApprovedDTO;
-import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.system.SystemFlowForm;
 import com.casic.missiles.service.IBaseApprovalService;
@@ -375,7 +375,9 @@
             HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
                     .notDeleted()
                     .processInstanceId(task.getProcessInstanceId()).singleResult();
-            historicProcessInstances.add(historicProcessInstance);
+            if(Objects.nonNull(historicProcessInstance)){
+                historicProcessInstances.add(historicProcessInstance);
+            }
         }
         return historicProcessInstances;
     }
@@ -473,7 +475,9 @@
                     .processInstanceId(task.getProcessInstanceId())
                     .processInstanceBusinessStatus(failStatus)
                     .singleResult();
-            historicProcessInstances.add(historicProcessInstance);
+            if(Objects.nonNull(historicProcessInstance)){
+                historicProcessInstances.add(historicProcessInstance);
+            }
         }
         return historicProcessInstances;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/AssetMonitorServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/AssetMonitorServiceImpl.java
index 43f3c5d..cf809a6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/AssetMonitorServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/AssetMonitorServiceImpl.java
@@ -7,10 +7,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.business.board.BoardDeptComprehensiveRequest;
 import com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.enums.system.ApplyFromIdEnum;
@@ -97,6 +94,38 @@
     }
 
     @Override
+    public List<ExpireDeviceStatisticsResponse> expireDeviceStatistics() {
+        List<ExpireDeviceStatisticsResponse> list = meterFixedAssetsMapper.selectExpireDeviceStatistics();
+        List<String> dateList = com.casic.missiles.utils.DateUtils.getCurrentDateMonthList();
+        List<ExpireDeviceStatisticsResponse> finalList = new ArrayList<>();
+        if(CollectionUtils.isEmpty(list)){
+            for (String date : dateList) {
+                ExpireDeviceStatisticsResponse statisticsResponse = new ExpireDeviceStatisticsResponse();
+                statisticsResponse.setMonth(date);
+                statisticsResponse.setExpiredQuantity(0);
+                finalList.add(statisticsResponse);
+            }
+        }else{
+            for (String date : dateList) {
+                Integer flag = 0;
+                for (ExpireDeviceStatisticsResponse dto : list) {
+                    if (dto.getMonth().equals(date)) {
+                        finalList.add(dto);
+                        flag = 1;
+                    }
+                }
+                if (flag == 0) {
+                    ExpireDeviceStatisticsResponse statisticsResponse = new ExpireDeviceStatisticsResponse();
+                    statisticsResponse.setMonth(date);
+                    statisticsResponse.setExpiredQuantity(0);
+                    finalList.add(statisticsResponse);
+                }
+            }
+        }
+        return finalList;
+    }
+
+    @Override
     public List<EquipmentFixedAssets> expireDeviceList() {
         FixedAssetRequest request = new FixedAssetRequest();
         request.setAssetType(1);
@@ -189,6 +218,38 @@
         return resultPage.getRecords();
     }
 
+    @Override
+    public List<ExpireEquipmentStatisticsResponse> expireEquipmentStatistics() {
+        List<ExpireEquipmentStatisticsResponse> list = meterStandardEquipmentMapper.selectExpireEquipmentStatistics();
+        List<String> dateList = com.casic.missiles.utils.DateUtils.getCurrentDateMonthList();
+        List<ExpireEquipmentStatisticsResponse> finalList = new ArrayList<>();
+        if(CollectionUtils.isEmpty(list)){
+            for (String date : dateList) {
+                ExpireEquipmentStatisticsResponse statisticsResponse = new ExpireEquipmentStatisticsResponse();
+                statisticsResponse.setMonth(date);
+                statisticsResponse.setExpiredQuantity(0);
+                finalList.add(statisticsResponse);
+            }
+        }else{
+            for (String date : dateList) {
+                Integer flag = 0;
+                for (ExpireEquipmentStatisticsResponse dto : list) {
+                    if (dto.getMonth().equals(date)) {
+                        finalList.add(dto);
+                        flag = 1;
+                    }
+                }
+                if (flag == 0) {
+                    ExpireEquipmentStatisticsResponse statisticsResponse = new ExpireEquipmentStatisticsResponse();
+                    statisticsResponse.setMonth(date);
+                    statisticsResponse.setExpiredQuantity(0);
+                    finalList.add(statisticsResponse);
+                }
+            }
+        }
+        return finalList;
+    }
+
     private Long getApplyCount(String fromId){
         Long count = 0L;
         List<String> businessKeys = getPassedList(getProcDefId(fromId));

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index 85de121..361cb89 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -18,4 +18,22 @@
     private Long orderCount;
     @ApiModelProperty(value = "校准业务数量", dataType = "Long")
     private Long calibrationOrderCount;
+
+    @ApiModelProperty(value = "城市", dataType = "String")
+    private String 城市名称;
+    public String get城市名称() {
+        return this.cityName;
+    }
+
+    @ApiModelProperty(value = "检定业务", dataType = "Long")
+    private Long 检定业务数量;
+    public Long get检定业务数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "校准业务", dataType = "Long")
+    private Long 校准业务数量;
+    public Long get校准业务数量() {
+        return this.calibrationOrderCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 92ee332..9a69a66 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -35,4 +35,29 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+    @ApiModelProperty(value = "产值总计(元)", dataType = "String")
+    private String 产值总计;
+    public String get实验室名称() {
+        return this.deptName;
+    }
+
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public String get产值总计() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
new file mode 100644
index 0000000..68df1e2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireDeviceStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
new file mode 100644
index 0000000..f379431
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireEquipmentStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
index 888f2c7..c38d3f4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
@@ -21,4 +21,29 @@
     private Long deviceCount;
     @ApiModelProperty(value = "人数", dataType = "Long")
     private Long staffCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String 实验室;
+    public String get实验室() {
+        return this.deptName;
+    }
+
+    @ApiModelProperty(value = "装置数量", dataType = "Long")
+    private Long 装置数量;
+    public Long get装置数量() {
+        return this.equipmentCount;
+    }
+
+    @ApiModelProperty(value = "设备数量", dataType = "Long")
+    private Long 设备数量;
+    public Long get设备数量() {
+        return this.deviceCount;
+    }
+
+    @ApiModelProperty(value = "人数", dataType = "Long")
+    private Long 人数;
+    public Long get人数() {
+        return this.staffCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
index 5256f19..b39e87f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
@@ -42,4 +42,17 @@
     @JSONField(serialize = false)
     @ApiModelProperty(hidden = true)
     private Integer postPrice;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "营收金额(元)", dataType = "String")
+    private String 营收金额;
+    public String get营收金额() {
+        return this.amountYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
index 643b1fc..8553342 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
@@ -36,4 +36,30 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "人员", dataType = "String")
+    private String 人员;
+    @ApiModelProperty(value = "已检测", dataType = "Integer")
+    private Integer 已检测;
+    @ApiModelProperty(value = "报告数", dataType = "Integer")
+    private Integer 报告数;
+    @ApiModelProperty(value = "产值", dataType = "Integer")
+    private String 产值;
+
+    public String get人员() {
+        return this.staffName;
+    }
+
+    public Integer get已检测() {
+        return this.samples;
+    }
+
+    public Integer get报告数() {
+        return this.certificates;
+    }
+
+    public String get产值() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
index 62535e2..e3b542c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
@@ -14,4 +14,18 @@
     private String month;
     @ApiModelProperty(value = "业务量", dataType = "Integer")
     private Integer traffic;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    @ApiModelProperty(value = "业务量", dataType = "Integer")
+    private Integer 业务量;
+
+    public String get月份() {
+        return this.month;
+    }
+
+    public Integer get业务量() {
+        return this.traffic;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
index f4a7c77..c398773 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
@@ -26,4 +26,24 @@
     //总计检定金额
     @ApiModelProperty(value = "总计检定金额（单位元）", dataType = "String")
     private String totalAmountYuan;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    @ApiModelProperty(value = "业务次数", dataType = "Integer")
+    private Integer 业务次数;
+    @ApiModelProperty(value = "业务金额", dataType = "String")
+    private String 业务金额;
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get业务次数() {
+        return this.businessFrequency;
+    }
+
+    public String get业务金额() {
+        return this.totalAmountYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
index fc0aeeb..4db5fcb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
@@ -233,14 +233,14 @@
      * 使用人
      */
     @TableField("use_person")
-    @ApiModelProperty(value = "使用人", dataType = "Long", required = false)
+    @ApiModelProperty(value = "使用人", dataType = "String", required = false)
     private Long usePerson;
 
     /**
      * 使用人名称
      */
     @TableField(exist = false)
-    @ApiModelProperty(value = "使用人", dataType = "Long", required = false)
+    @ApiModelProperty(value = "使用人", dataType = "String", required = false)
     private String usePersonName;
 
     /**
@@ -585,4 +585,28 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "申请设备关联id", dataType = "String", required = false)
     private String applyRelationId;
+
+
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "设备名称", dataType = "String")
+    private String 设备名称;
+    public String get设备名称() {
+        return this.equipmentName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    private String 负责人;
+    public String get负责人() {
+        return this.usePersonName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "到期时间", dataType = "String")
+    private String 到期时间;
+    public String get到期时间() {
+        return this.validDate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java
index ac275b4..fb79491 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java
@@ -391,4 +391,27 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "关联检定规程列表", dataType = "List")
     private List<EquipmentStandardVerifyRegulation> verifyRegulationList;
+
+
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "标准装置名称", dataType = "String")
+    private String 标准装置名称;
+    public String get标准装置名称() {
+        return this.standardName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    private String 负责人;
+    public String get负责人() {
+        return this.laboratoryOwnerName;
+    }
+    // TODO: 2023/6/26 质量模块完成后需调整这里使用validTime
+    @TableField(exist = false)
+    @ApiModelProperty(value = "到期时间", dataType = "String")
+    private String 到期时间;
+    public String get到期时间() {
+        return this.remindTime;
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 687e93a..0d9eb13 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -10,8 +10,8 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.flowable.AllApproveDTO;
 import com.casic.missiles.dto.flowable.ToBeApprovedDTO;
-import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.system.SystemFlowForm;
 import com.casic.missiles.service.IBaseApprovalService;
@@ -375,7 +375,9 @@
             HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
                     .notDeleted()
                     .processInstanceId(task.getProcessInstanceId()).singleResult();
-            historicProcessInstances.add(historicProcessInstance);
+            if(Objects.nonNull(historicProcessInstance)){
+                historicProcessInstances.add(historicProcessInstance);
+            }
         }
         return historicProcessInstances;
     }
@@ -473,7 +475,9 @@
                     .processInstanceId(task.getProcessInstanceId())
                     .processInstanceBusinessStatus(failStatus)
                     .singleResult();
-            historicProcessInstances.add(historicProcessInstance);
+            if(Objects.nonNull(historicProcessInstance)){
+                historicProcessInstances.add(historicProcessInstance);
+            }
         }
         return historicProcessInstances;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/AssetMonitorServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/AssetMonitorServiceImpl.java
index 43f3c5d..cf809a6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/AssetMonitorServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/AssetMonitorServiceImpl.java
@@ -7,10 +7,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.business.board.BoardDeptComprehensiveRequest;
 import com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.enums.system.ApplyFromIdEnum;
@@ -97,6 +94,38 @@
     }
 
     @Override
+    public List<ExpireDeviceStatisticsResponse> expireDeviceStatistics() {
+        List<ExpireDeviceStatisticsResponse> list = meterFixedAssetsMapper.selectExpireDeviceStatistics();
+        List<String> dateList = com.casic.missiles.utils.DateUtils.getCurrentDateMonthList();
+        List<ExpireDeviceStatisticsResponse> finalList = new ArrayList<>();
+        if(CollectionUtils.isEmpty(list)){
+            for (String date : dateList) {
+                ExpireDeviceStatisticsResponse statisticsResponse = new ExpireDeviceStatisticsResponse();
+                statisticsResponse.setMonth(date);
+                statisticsResponse.setExpiredQuantity(0);
+                finalList.add(statisticsResponse);
+            }
+        }else{
+            for (String date : dateList) {
+                Integer flag = 0;
+                for (ExpireDeviceStatisticsResponse dto : list) {
+                    if (dto.getMonth().equals(date)) {
+                        finalList.add(dto);
+                        flag = 1;
+                    }
+                }
+                if (flag == 0) {
+                    ExpireDeviceStatisticsResponse statisticsResponse = new ExpireDeviceStatisticsResponse();
+                    statisticsResponse.setMonth(date);
+                    statisticsResponse.setExpiredQuantity(0);
+                    finalList.add(statisticsResponse);
+                }
+            }
+        }
+        return finalList;
+    }
+
+    @Override
     public List<EquipmentFixedAssets> expireDeviceList() {
         FixedAssetRequest request = new FixedAssetRequest();
         request.setAssetType(1);
@@ -189,6 +218,38 @@
         return resultPage.getRecords();
     }
 
+    @Override
+    public List<ExpireEquipmentStatisticsResponse> expireEquipmentStatistics() {
+        List<ExpireEquipmentStatisticsResponse> list = meterStandardEquipmentMapper.selectExpireEquipmentStatistics();
+        List<String> dateList = com.casic.missiles.utils.DateUtils.getCurrentDateMonthList();
+        List<ExpireEquipmentStatisticsResponse> finalList = new ArrayList<>();
+        if(CollectionUtils.isEmpty(list)){
+            for (String date : dateList) {
+                ExpireEquipmentStatisticsResponse statisticsResponse = new ExpireEquipmentStatisticsResponse();
+                statisticsResponse.setMonth(date);
+                statisticsResponse.setExpiredQuantity(0);
+                finalList.add(statisticsResponse);
+            }
+        }else{
+            for (String date : dateList) {
+                Integer flag = 0;
+                for (ExpireEquipmentStatisticsResponse dto : list) {
+                    if (dto.getMonth().equals(date)) {
+                        finalList.add(dto);
+                        flag = 1;
+                    }
+                }
+                if (flag == 0) {
+                    ExpireEquipmentStatisticsResponse statisticsResponse = new ExpireEquipmentStatisticsResponse();
+                    statisticsResponse.setMonth(date);
+                    statisticsResponse.setExpiredQuantity(0);
+                    finalList.add(statisticsResponse);
+                }
+            }
+        }
+        return finalList;
+    }
+
     private Long getApplyCount(String fromId){
         Long count = 0L;
         List<String> businessKeys = getPassedList(getProcDefId(fromId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
index f8cfcdf..6691348 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
@@ -54,7 +54,7 @@
                 BusTrendResponse busTrendResponse = new BusTrendResponse();
                 busTrendResponse.setDimension(date);
                 busTrendResponse.setOrderCount(0);
-                list.add(busTrendResponse);
+                finalList.add(busTrendResponse);
             }
         }else{
             for (String date : dateList) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a9ab124..8d41a35 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -1,18 +1,12 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.core.application.enums.LoginType;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.model.auth.CasicCustomToken;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.core.util.RSAUtils;
-import com.casic.missiles.enums.business.FilePrintTypeEnum;
-import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
-import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -20,11 +14,11 @@
 import com.casic.missiles.modular.interfaces.log.LogManager;
 import com.casic.missiles.modular.interfaces.log.factory.LogTaskFactory;
 import com.casic.missiles.modular.system.dto.LoginSuccessDTO;
+import com.casic.missiles.service.listeners.register.PrintFileRegister;
 import com.casic.missiles.service.meter.MeterCertificateService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
@@ -59,7 +53,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "wp";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
index 285f088..f4edabc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/AssetMonitorController.java
@@ -2,10 +2,7 @@
 
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import com.casic.missiles.service.cockpit.IAssetMonitorService;
@@ -17,6 +14,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 计量管理驾驶舱-资产监控
  * @Author: wangpeng
@@ -45,6 +44,12 @@
         return ReturnUtil.success(assetMonitorService.equipment());
     }
 
+    @ApiOperation("本年各月设备到期数量")
+    @GetMapping("/expireDeviceStatistics")
+    public ReturnDTO<List<ExpireDeviceStatisticsResponse>> expireDeviceStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireDeviceStatistics());
+    }
+
     @ApiOperation("本月设备到期详情")
     @GetMapping("/expireDeviceList")
     public ReturnDTO<EquipmentFixedAssets> expireDeviceList() {
@@ -69,6 +74,13 @@
         return ReturnUtil.success(assetMonitorService.standardEquipment());
     }
 
+    // TODO: 2023/6/26 该接口数据需质量模块中的证书支持，目前使用remind_time统计不正确，待后续修改
+    @ApiOperation("本年各月装置到期数量")
+    @GetMapping("/expireEquipmentStatistics")
+    public ReturnDTO<List<ExpireEquipmentStatisticsResponse>> expireEquipmentStatistics() {
+        return ReturnUtil.success(assetMonitorService.expireEquipmentStatistics());
+    }
+
     @ApiOperation("本月装置到期详情")
     @GetMapping("/expireEquipmentList")
     public ReturnDTO<EquipmentStandardEquipment> expireEquipmentList() {
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index b91ac52..866f420 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse;
 import com.casic.missiles.dto.equipment.EquipmentOrSampleDto;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
@@ -10,7 +11,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +37,6 @@
     List<EquipmentRemindExport> remindList(@Param("fixedAssetRequest")FixedAssetRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireDeviceStatisticsResponse> selectExpireDeviceStatistics();
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
index f1dd0fb..fc6aaba 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 import org.apache.ibatis.annotations.Param;
@@ -29,5 +30,7 @@
     List<EquipmentStandardEquipment> remindListPage(@Param("request") StandardEquipmentRequest request);
 
     Integer selectRemindQuantity();
+
+    List<ExpireEquipmentStatisticsResponse> selectExpireEquipmentStatistics();
 }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 5f4f707..6721a66 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -218,4 +218,11 @@
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
 
+    <select id="selectExpireDeviceStatistics" resultType="com.casic.missiles.dto.cockpit.ExpireDeviceStatisticsResponse">
+        SELECT DATE_FORMAT(valid_date,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_fixed_assets
+        WHERE is_del = 0
+        AND DATE_FORMAT(valid_date,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(valid_date,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index b6cabee..61afdb4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -86,4 +86,13 @@
         WHERE mse.is_del = 0
         AND CURRENT_TIMESTAMP >= mse.remind_time
     </select>
+
+    <select id="selectExpireEquipmentStatistics"
+            resultType="com.casic.missiles.dto.cockpit.ExpireEquipmentStatisticsResponse">
+        SELECT DATE_FORMAT(remind_time,'%Y-%m') AS month, COUNT(id) AS expiredQuantity
+        FROM equipment_standard_equipment
+        WHERE is_del = 0
+        AND DATE_FORMAT(remind_time,'%Y') = DATE_FORMAT(CURDATE(),'%Y')
+        GROUP BY DATE_FORMAT(remind_time,'%Y-%m')
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
index bb8083c..1c1e731 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptComprehensiveResponse.java
@@ -72,4 +72,67 @@
     @ApiModelProperty(hidden = true)
     private Integer deptRepairDevices = 0;
 
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+
+    @ApiModelProperty(value = "总样品数量", dataType = "Integer")
+    private Integer 总样品数量;
+
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+
+    @ApiModelProperty(value = "超期样品总数", dataType = "Integer")
+    private Integer 超期样品总数;
+
+    @ApiModelProperty(value = "超期率", dataType = "String")
+    private String 超期率;
+
+    @ApiModelProperty(value = "设备检定及时率", dataType = "String")
+    private String 设备检定及时率;
+
+    @ApiModelProperty(value = "设备检定合格率", dataType = "String")
+    private String 设备检定合格率;
+
+    @ApiModelProperty(value = "设备维修率", dataType = "String")
+    private String 设备维修率;
+
+    public String get实验室名称() {
+        return this.deptName;
+    }
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get总样品数量() {
+        return this.samplesTotal;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public Integer get超期样品总数() {
+        return this.expireSamples;
+    }
+
+    public String get超期率() {
+        return this.expireRate;
+    }
+
+    public String get设备检定及时率() {
+        return this.deviceTimelyRate;
+    }
+
+    public String get设备检定合格率() {
+        return this.deviceQualifyRate;
+    }
+
+    public String get设备维修率() {
+        return this.deviceRepairRate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
index 04913e4..7fa62b6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java
@@ -99,4 +99,29 @@
     @ApiModelProperty(value = "证书单位地址", dataType = "String")
     private String certificationCompanyAddress;
 
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "下单时间", dataType = "String")
+    private String 下单时间;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "样品数量", dataType = "String")
+    private Integer 样品数量;
+
+    public String get下单时间() {
+        return this.orderTime;
+    }
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
index 2e729be..568c3b1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/AdviceResponse.java
@@ -18,4 +18,23 @@
     private String adviceTypeName;
     @ApiModelProperty(value = "投诉时间", dataType = "String")
     private String adviceTime;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    @ApiModelProperty(value = "投诉类型", dataType = "String")
+    private String 投诉类型;
+    public String get投诉类型() {
+        return this.adviceTypeName;
+    }
+
+    @ApiModelProperty(value = "投诉时间", dataType = "String")
+    private String 投诉时间;
+    public String get投诉时间() {
+        return this.adviceTime;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
index 208b090..3f13fbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/BusTrendResponse.java
@@ -18,4 +18,23 @@
     private Integer orderCount;
     @ApiModelProperty(value = "样品数量", dataType = "Integer")
     private Integer sampleCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "订单数量", dataType = "Integer")
+    private Integer 订单数量;
+    public Integer get订单数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "样品数量", dataType = "Integer")
+    private Integer 样品数量;
+    public Integer get样品数量() {
+        return this.sampleCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
index 85de121..361cb89 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CityTopResponse.java
@@ -18,4 +18,22 @@
     private Long orderCount;
     @ApiModelProperty(value = "校准业务数量", dataType = "Long")
     private Long calibrationOrderCount;
+
+    @ApiModelProperty(value = "城市", dataType = "String")
+    private String 城市名称;
+    public String get城市名称() {
+        return this.cityName;
+    }
+
+    @ApiModelProperty(value = "检定业务", dataType = "Long")
+    private Long 检定业务数量;
+    public Long get检定业务数量() {
+        return this.orderCount;
+    }
+
+    @ApiModelProperty(value = "校准业务", dataType = "Long")
+    private Long 校准业务数量;
+    public Long get校准业务数量() {
+        return this.calibrationOrderCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
index 92ee332..9a69a66 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/CockpitDeptOutputListResponse.java
@@ -35,4 +35,29 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String 实验室名称;
+    @ApiModelProperty(value = "检定样品数量", dataType = "Integer")
+    private Integer 检定样品数量;
+    @ApiModelProperty(value = "出具证书数量", dataType = "Integer")
+    private Integer 出具证书数量;
+    @ApiModelProperty(value = "产值总计(元)", dataType = "String")
+    private String 产值总计;
+    public String get实验室名称() {
+        return this.deptName;
+    }
+
+    public Integer get检定样品数量() {
+        return this.samples;
+    }
+
+    public Integer get出具证书数量() {
+        return this.certificates;
+    }
+
+    public String get产值总计() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
new file mode 100644
index 0000000..68df1e2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireDeviceStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireDeviceStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
new file mode 100644
index 0000000..f379431
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ExpireEquipmentStatisticsResponse.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.dto.cockpit;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/6/25 17:03
+ */
+@Data
+public class ExpireEquipmentStatisticsResponse {
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String month;
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer expiredQuantity;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    public String get月份() {
+        return this.month;
+    }
+    @ApiModelProperty(value = "到期数量", dataType = "Integer")
+    private Integer 到期数量;
+    public Integer get到期数量() {
+        return this.expiredQuantity;
+    }
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
index 888f2c7..c38d3f4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/LabAssetsResponse.java
@@ -21,4 +21,29 @@
     private Long deviceCount;
     @ApiModelProperty(value = "人数", dataType = "Long")
     private Long staffCount;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String 实验室;
+    public String get实验室() {
+        return this.deptName;
+    }
+
+    @ApiModelProperty(value = "装置数量", dataType = "Long")
+    private Long 装置数量;
+    public Long get装置数量() {
+        return this.equipmentCount;
+    }
+
+    @ApiModelProperty(value = "设备数量", dataType = "Long")
+    private Long 设备数量;
+    public Long get设备数量() {
+        return this.deviceCount;
+    }
+
+    @ApiModelProperty(value = "人数", dataType = "Long")
+    private Long 人数;
+    public Long get人数() {
+        return this.staffCount;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
index 5256f19..b39e87f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/ManageTrendResponse.java
@@ -42,4 +42,17 @@
     @JSONField(serialize = false)
     @ApiModelProperty(hidden = true)
     private Integer postPrice;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "String")
+    private String 月份;
+    public String get月份() {
+        return this.dimension;
+    }
+
+    @ApiModelProperty(value = "营收金额(元)", dataType = "String")
+    private String 营收金额;
+    public String get营收金额() {
+        return this.amountYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
index 643b1fc..8553342 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/StaffAnalyseListResponse.java
@@ -36,4 +36,30 @@
         }
         return outPutYuan;
     }
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "人员", dataType = "String")
+    private String 人员;
+    @ApiModelProperty(value = "已检测", dataType = "Integer")
+    private Integer 已检测;
+    @ApiModelProperty(value = "报告数", dataType = "Integer")
+    private Integer 报告数;
+    @ApiModelProperty(value = "产值", dataType = "Integer")
+    private String 产值;
+
+    public String get人员() {
+        return this.staffName;
+    }
+
+    public Integer get已检测() {
+        return this.samples;
+    }
+
+    public Integer get报告数() {
+        return this.certificates;
+    }
+
+    public String get产值() {
+        return this.outPutYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
index 62535e2..e3b542c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/cockpit/TrafficStatisticsResponse.java
@@ -14,4 +14,18 @@
     private String month;
     @ApiModelProperty(value = "业务量", dataType = "Integer")
     private Integer traffic;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "月份", dataType = "Integer")
+    private String 月份;
+    @ApiModelProperty(value = "业务量", dataType = "Integer")
+    private Integer 业务量;
+
+    public String get月份() {
+        return this.month;
+    }
+
+    public Integer get业务量() {
+        return this.traffic;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
index f4a7c77..c398773 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java
@@ -26,4 +26,24 @@
     //总计检定金额
     @ApiModelProperty(value = "总计检定金额（单位元）", dataType = "String")
     private String totalAmountYuan;
+
+    //山海鲸使用参数
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    private String 公司名称;
+    @ApiModelProperty(value = "业务次数", dataType = "Integer")
+    private Integer 业务次数;
+    @ApiModelProperty(value = "业务金额", dataType = "String")
+    private String 业务金额;
+
+    public String get公司名称() {
+        return this.customerName;
+    }
+
+    public Integer get业务次数() {
+        return this.businessFrequency;
+    }
+
+    public String get业务金额() {
+        return this.totalAmountYuan;
+    }
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
index fc0aeeb..4db5fcb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
@@ -233,14 +233,14 @@
      * 使用人
      */
     @TableField("use_person")
-    @ApiModelProperty(value = "使用人", dataType = "Long", required = false)
+    @ApiModelProperty(value = "使用人", dataType = "String", required = false)
     private Long usePerson;
 
     /**
      * 使用人名称
      */
     @TableField(exist = false)
-    @ApiModelProperty(value = "使用人", dataType = "Long", required = false)
+    @ApiModelProperty(value = "使用人", dataType = "String", required = false)
     private String usePersonName;
 
     /**
@@ -585,4 +585,28 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "申请设备关联id", dataType = "String", required = false)
     private String applyRelationId;
+
+
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "设备名称", dataType = "String")
+    private String 设备名称;
+    public String get设备名称() {
+        return this.equipmentName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    private String 负责人;
+    public String get负责人() {
+        return this.usePersonName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "到期时间", dataType = "String")
+    private String 到期时间;
+    public String get到期时间() {
+        return this.validDate;
+    }
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java
index ac275b4..fb79491 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardEquipment.java
@@ -391,4 +391,27 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "关联检定规程列表", dataType = "List")
     private List<EquipmentStandardVerifyRegulation> verifyRegulationList;
+
+
+    //山海鲸使用参数
+    @TableField(exist = false)
+    @ApiModelProperty(value = "标准装置名称", dataType = "String")
+    private String 标准装置名称;
+    public String get标准装置名称() {
+        return this.standardName;
+    }
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    private String 负责人;
+    public String get负责人() {
+        return this.laboratoryOwnerName;
+    }
+    // TODO: 2023/6/26 质量模块完成后需调整这里使用validTime
+    @TableField(exist = false)
+    @ApiModelProperty(value = "到期时间", dataType = "String")
+    private String 到期时间;
+    public String get到期时间() {
+        return this.remindTime;
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 687e93a..0d9eb13 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -10,8 +10,8 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.flowable.AllApproveDTO;
 import com.casic.missiles.dto.flowable.ToBeApprovedDTO;
-import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.system.SystemFlowForm;
 import com.casic.missiles.service.IBaseApprovalService;
@@ -375,7 +375,9 @@
             HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
                     .notDeleted()
                     .processInstanceId(task.getProcessInstanceId()).singleResult();
-            historicProcessInstances.add(historicProcessInstance);
+            if(Objects.nonNull(historicProcessInstance)){
+                historicProcessInstances.add(historicProcessInstance);
+            }
         }
         return historicProcessInstances;
     }
@@ -473,7 +475,9 @@
                     .processInstanceId(task.getProcessInstanceId())
                     .processInstanceBusinessStatus(failStatus)
                     .singleResult();
-            historicProcessInstances.add(historicProcessInstance);
+            if(Objects.nonNull(historicProcessInstance)){
+                historicProcessInstances.add(historicProcessInstance);
+            }
         }
         return historicProcessInstances;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/AssetMonitorServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/AssetMonitorServiceImpl.java
index 43f3c5d..cf809a6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/AssetMonitorServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/AssetMonitorServiceImpl.java
@@ -7,10 +7,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.business.board.BoardDeptComprehensiveRequest;
 import com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse;
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.dto.equipment.FixedAssetRequest;
 import com.casic.missiles.dto.equipment.StandardEquipmentRequest;
 import com.casic.missiles.enums.system.ApplyFromIdEnum;
@@ -97,6 +94,38 @@
     }
 
     @Override
+    public List<ExpireDeviceStatisticsResponse> expireDeviceStatistics() {
+        List<ExpireDeviceStatisticsResponse> list = meterFixedAssetsMapper.selectExpireDeviceStatistics();
+        List<String> dateList = com.casic.missiles.utils.DateUtils.getCurrentDateMonthList();
+        List<ExpireDeviceStatisticsResponse> finalList = new ArrayList<>();
+        if(CollectionUtils.isEmpty(list)){
+            for (String date : dateList) {
+                ExpireDeviceStatisticsResponse statisticsResponse = new ExpireDeviceStatisticsResponse();
+                statisticsResponse.setMonth(date);
+                statisticsResponse.setExpiredQuantity(0);
+                finalList.add(statisticsResponse);
+            }
+        }else{
+            for (String date : dateList) {
+                Integer flag = 0;
+                for (ExpireDeviceStatisticsResponse dto : list) {
+                    if (dto.getMonth().equals(date)) {
+                        finalList.add(dto);
+                        flag = 1;
+                    }
+                }
+                if (flag == 0) {
+                    ExpireDeviceStatisticsResponse statisticsResponse = new ExpireDeviceStatisticsResponse();
+                    statisticsResponse.setMonth(date);
+                    statisticsResponse.setExpiredQuantity(0);
+                    finalList.add(statisticsResponse);
+                }
+            }
+        }
+        return finalList;
+    }
+
+    @Override
     public List<EquipmentFixedAssets> expireDeviceList() {
         FixedAssetRequest request = new FixedAssetRequest();
         request.setAssetType(1);
@@ -189,6 +218,38 @@
         return resultPage.getRecords();
     }
 
+    @Override
+    public List<ExpireEquipmentStatisticsResponse> expireEquipmentStatistics() {
+        List<ExpireEquipmentStatisticsResponse> list = meterStandardEquipmentMapper.selectExpireEquipmentStatistics();
+        List<String> dateList = com.casic.missiles.utils.DateUtils.getCurrentDateMonthList();
+        List<ExpireEquipmentStatisticsResponse> finalList = new ArrayList<>();
+        if(CollectionUtils.isEmpty(list)){
+            for (String date : dateList) {
+                ExpireEquipmentStatisticsResponse statisticsResponse = new ExpireEquipmentStatisticsResponse();
+                statisticsResponse.setMonth(date);
+                statisticsResponse.setExpiredQuantity(0);
+                finalList.add(statisticsResponse);
+            }
+        }else{
+            for (String date : dateList) {
+                Integer flag = 0;
+                for (ExpireEquipmentStatisticsResponse dto : list) {
+                    if (dto.getMonth().equals(date)) {
+                        finalList.add(dto);
+                        flag = 1;
+                    }
+                }
+                if (flag == 0) {
+                    ExpireEquipmentStatisticsResponse statisticsResponse = new ExpireEquipmentStatisticsResponse();
+                    statisticsResponse.setMonth(date);
+                    statisticsResponse.setExpiredQuantity(0);
+                    finalList.add(statisticsResponse);
+                }
+            }
+        }
+        return finalList;
+    }
+
     private Long getApplyCount(String fromId){
         Long count = 0L;
         List<String> businessKeys = getPassedList(getProcDefId(fromId));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
index f8cfcdf..6691348 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
@@ -54,7 +54,7 @@
                 BusTrendResponse busTrendResponse = new BusTrendResponse();
                 busTrendResponse.setDimension(date);
                 busTrendResponse.setOrderCount(0);
-                list.add(busTrendResponse);
+                finalList.add(busTrendResponse);
             }
         }else{
             for (String date : dateList) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/cockpit/IAssetMonitorService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/cockpit/IAssetMonitorService.java
index 43cd4be..7414db3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/cockpit/IAssetMonitorService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/cockpit/IAssetMonitorService.java
@@ -1,9 +1,6 @@
 package com.casic.missiles.service.cockpit;
 
-import com.casic.missiles.dto.cockpit.AssetManagementResponse;
-import com.casic.missiles.dto.cockpit.DeviceMeasureResponse;
-import com.casic.missiles.dto.cockpit.EquipmentResponse;
-import com.casic.missiles.dto.cockpit.StandardEquipmentResponse;
+import com.casic.missiles.dto.cockpit.*;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStandardEquipment;
 
@@ -19,6 +16,8 @@
 
     EquipmentResponse equipment();
 
+    List<ExpireDeviceStatisticsResponse> expireDeviceStatistics();
+
     List<EquipmentFixedAssets> expireDeviceList();
 
     DeviceMeasureResponse deviceMeasure();
@@ -26,4 +25,7 @@
     StandardEquipmentResponse standardEquipment();
 
     List<EquipmentStandardEquipment> expireEquipmentList();
+
+    List<ExpireEquipmentStatisticsResponse> expireEquipmentStatistics();
+
 }