diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java
new file mode 100644
index 0000000..8d3da10
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum MessageTypeEnum {
+
+    METER_CERTIFICATE("1", "计量人员证书到期提醒"),
+    MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
+    STANDARD_EQUIPMENT("3", "标准装置到期提醒");
+
+    private String code;
+    private String value;
+
+    MessageTypeEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java
new file mode 100644
index 0000000..8d3da10
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum MessageTypeEnum {
+
+    METER_CERTIFICATE("1", "计量人员证书到期提醒"),
+    MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
+    STANDARD_EQUIPMENT("3", "标准装置到期提醒");
+
+    private String code;
+    private String value;
+
+    MessageTypeEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
index 9cd0c0d..c6b26c3 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
@@ -2,6 +2,7 @@
 
 public enum MeterRoleTypeEnum {
 
+    ADMIN("1", "管理员"),
     METER_DEPT_ADMIN("1586711737844137956", "计量部门负责人");
 
     private String code;

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java
new file mode 100644
index 0000000..8d3da10
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum MessageTypeEnum {
+
+    METER_CERTIFICATE("1", "计量人员证书到期提醒"),
+    MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
+    STANDARD_EQUIPMENT("3", "标准装置到期提醒");
+
+    private String code;
+    private String value;
+
+    MessageTypeEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
index 9cd0c0d..c6b26c3 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
@@ -2,6 +2,7 @@
 
 public enum MeterRoleTypeEnum {
 
+    ADMIN("1", "管理员"),
     METER_DEPT_ADMIN("1586711737844137956", "计量部门负责人");
 
     private String code;
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index 7aaf965..69c225f 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -49,6 +49,9 @@
         LEFT JOIN sys_dept t3 on t2.dept_id = t3.id
         <where>
             and t1.is_del = 0
+            <if test="request.userId != null  and request.userId != ''">
+                and t2.account = #{request.userId}
+            </if>
             <if test="request.staffNo != null  and request.staffNo != ''">
                 and t2.staff_no like CONCAT('%',#{request.staffNo},'%')
             </if>
@@ -77,18 +80,19 @@
     </select>
     <select id="queryReminderList" resultType="com.casic.missiles.model.workbench.WorkbenchRemindMessage">
         SELECT
-            su.ID AS remind_id,
+            su.id AS remind_id,
+            su.dept_id AS remind_dept_id,
             mc.id AS business_id,
             mc.certificate_no AS business_code,
             mc.certificate_name AS message_content
         FROM
             meter_certificate AS mc
-            LEFT JOIN meter_staff ms ON mc.staff_id = ms.id
-            LEFT JOIN sys_user su ON ms.account = su.ACCOUNT
+                LEFT JOIN meter_staff ms ON mc.staff_id = ms.id
+                LEFT JOIN sys_user su ON ms.account = su.ACCOUNT
         WHERE
-            DATE_FORMAT( mc.valid_date, '%Y-%m-%d' ) = DATE_SUB(
-                curdate(),
-                INTERVAL - 30 DAY)
+                DATE_FORMAT( mc.valid_date, '%Y-%m-%d' ) = DATE_SUB(
+                    curdate(),
+                    INTERVAL - 30 DAY)
     </select>
 
 </mapper>

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java
new file mode 100644
index 0000000..8d3da10
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum MessageTypeEnum {
+
+    METER_CERTIFICATE("1", "计量人员证书到期提醒"),
+    MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
+    STANDARD_EQUIPMENT("3", "标准装置到期提醒");
+
+    private String code;
+    private String value;
+
+    MessageTypeEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
index 9cd0c0d..c6b26c3 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
@@ -2,6 +2,7 @@
 
 public enum MeterRoleTypeEnum {
 
+    ADMIN("1", "管理员"),
     METER_DEPT_ADMIN("1586711737844137956", "计量部门负责人");
 
     private String code;
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index 7aaf965..69c225f 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -49,6 +49,9 @@
         LEFT JOIN sys_dept t3 on t2.dept_id = t3.id
         <where>
             and t1.is_del = 0
+            <if test="request.userId != null  and request.userId != ''">
+                and t2.account = #{request.userId}
+            </if>
             <if test="request.staffNo != null  and request.staffNo != ''">
                 and t2.staff_no like CONCAT('%',#{request.staffNo},'%')
             </if>
@@ -77,18 +80,19 @@
     </select>
     <select id="queryReminderList" resultType="com.casic.missiles.model.workbench.WorkbenchRemindMessage">
         SELECT
-            su.ID AS remind_id,
+            su.id AS remind_id,
+            su.dept_id AS remind_dept_id,
             mc.id AS business_id,
             mc.certificate_no AS business_code,
             mc.certificate_name AS message_content
         FROM
             meter_certificate AS mc
-            LEFT JOIN meter_staff ms ON mc.staff_id = ms.id
-            LEFT JOIN sys_user su ON ms.account = su.ACCOUNT
+                LEFT JOIN meter_staff ms ON mc.staff_id = ms.id
+                LEFT JOIN sys_user su ON ms.account = su.ACCOUNT
         WHERE
-            DATE_FORMAT( mc.valid_date, '%Y-%m-%d' ) = DATE_SUB(
-                curdate(),
-                INTERVAL - 30 DAY)
+                DATE_FORMAT( mc.valid_date, '%Y-%m-%d' ) = DATE_SUB(
+                    curdate(),
+                    INTERVAL - 30 DAY)
     </select>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
index 5e30e4f..11942ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
@@ -96,10 +96,13 @@
     @TableField("update_time")
     private String updateTime;
 
-    public WorkbenchRemindMessage(Long remindId, Long businessId, String businessCode, String messageContent, Integer status, Long createUser, String createUserName) {
+    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageTitle, String messageContent, Integer status, Long createUser, String createUserName) {
         this.remindId = remindId;
+        this.remindDeptId = remindDeptId;
         this.businessId = businessId;
         this.businessCode = businessCode;
+        this.messageType = messageType;
+        this.messageTitle = messageTitle;
         this.messageContent = messageContent;
         this.status = status;
         this.createUser = createUser;

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java
new file mode 100644
index 0000000..8d3da10
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum MessageTypeEnum {
+
+    METER_CERTIFICATE("1", "计量人员证书到期提醒"),
+    MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
+    STANDARD_EQUIPMENT("3", "标准装置到期提醒");
+
+    private String code;
+    private String value;
+
+    MessageTypeEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
index 9cd0c0d..c6b26c3 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
@@ -2,6 +2,7 @@
 
 public enum MeterRoleTypeEnum {
 
+    ADMIN("1", "管理员"),
     METER_DEPT_ADMIN("1586711737844137956", "计量部门负责人");
 
     private String code;
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index 7aaf965..69c225f 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -49,6 +49,9 @@
         LEFT JOIN sys_dept t3 on t2.dept_id = t3.id
         <where>
             and t1.is_del = 0
+            <if test="request.userId != null  and request.userId != ''">
+                and t2.account = #{request.userId}
+            </if>
             <if test="request.staffNo != null  and request.staffNo != ''">
                 and t2.staff_no like CONCAT('%',#{request.staffNo},'%')
             </if>
@@ -77,18 +80,19 @@
     </select>
     <select id="queryReminderList" resultType="com.casic.missiles.model.workbench.WorkbenchRemindMessage">
         SELECT
-            su.ID AS remind_id,
+            su.id AS remind_id,
+            su.dept_id AS remind_dept_id,
             mc.id AS business_id,
             mc.certificate_no AS business_code,
             mc.certificate_name AS message_content
         FROM
             meter_certificate AS mc
-            LEFT JOIN meter_staff ms ON mc.staff_id = ms.id
-            LEFT JOIN sys_user su ON ms.account = su.ACCOUNT
+                LEFT JOIN meter_staff ms ON mc.staff_id = ms.id
+                LEFT JOIN sys_user su ON ms.account = su.ACCOUNT
         WHERE
-            DATE_FORMAT( mc.valid_date, '%Y-%m-%d' ) = DATE_SUB(
-                curdate(),
-                INTERVAL - 30 DAY)
+                DATE_FORMAT( mc.valid_date, '%Y-%m-%d' ) = DATE_SUB(
+                    curdate(),
+                    INTERVAL - 30 DAY)
     </select>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
index 5e30e4f..11942ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
@@ -96,10 +96,13 @@
     @TableField("update_time")
     private String updateTime;
 
-    public WorkbenchRemindMessage(Long remindId, Long businessId, String businessCode, String messageContent, Integer status, Long createUser, String createUserName) {
+    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageTitle, String messageContent, Integer status, Long createUser, String createUserName) {
         this.remindId = remindId;
+        this.remindDeptId = remindDeptId;
         this.businessId = businessId;
         this.businessCode = businessCode;
+        this.messageType = messageType;
+        this.messageTitle = messageTitle;
         this.messageContent = messageContent;
         this.status = status;
         this.createUser = createUser;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
index 6c31948..ce076b0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
@@ -21,9 +21,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterCertificateImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.ExportEnum;
-import com.casic.missiles.enums.MeterDictEnum;
+import com.casic.missiles.enums.*;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper;
 import com.casic.missiles.mapper.meter.MeterCertificateMapper;
@@ -182,7 +180,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(),idDto.getId(),meterCertificate.getCertificateNo(),meterCertificate.getCertificateName(),0,user.getId(),user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(),Long.parseLong(userInfo.getDeptId()),idDto.getId(),meterCertificate.getCertificateNo(), MessageTypeEnum.METER_CERTIFICATE.getCode(),MessageTypeEnum.METER_CERTIFICATE.getValue(),meterCertificate.getCertificateName(),0,user.getId(),user.getName());
         if(messageMapper.insert(remindMessage)>0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()),JSONObject.toJSONString(remindMessage));
@@ -210,10 +208,18 @@
             Map<Long, List<WorkbenchRemindMessage>> collect = list.parallelStream().collect(Collectors.groupingBy(WorkbenchRemindMessage::getBusinessId));
             // 移除已经发送过消息的证书信息
             messageIds.forEach(collect::remove);
-            collect.keySet().forEach(dtoList -> {
-                // 讲需要发送消息的证书整合
-                messageList.addAll(collect.get(dtoList));
-            });
+            // 讲需要发送消息的证书整合
+            for (Long id : collect.keySet()) {
+                messageList.addAll(collect.get(id));
+            }
+            // 补充业务数据
+            for (WorkbenchRemindMessage message : messageList) {
+                message.setMessageType(MessageTypeEnum.METER_CERTIFICATE.getCode());
+                message.setMessageTitle(MessageTypeEnum.METER_CERTIFICATE.getValue());
+                message.setStatus(0);
+                message.setCreateUser(Long.valueOf(MeterRoleTypeEnum.ADMIN.getCode()));
+                message.setCreateUserName(MeterRoleTypeEnum.ADMIN.getValue());
+            }
             log.info("定时任务新增消息表："+messageList);
             messageService.saveBatch(messageList);
             webSocket.sendMessage(messageList);

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java
new file mode 100644
index 0000000..8d3da10
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MessageTypeEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum MessageTypeEnum {
+
+    METER_CERTIFICATE("1", "计量人员证书到期提醒"),
+    MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
+    STANDARD_EQUIPMENT("3", "标准装置到期提醒");
+
+    private String code;
+    private String value;
+
+    MessageTypeEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
index 9cd0c0d..c6b26c3 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterRoleTypeEnum.java
@@ -2,6 +2,7 @@
 
 public enum MeterRoleTypeEnum {
 
+    ADMIN("1", "管理员"),
     METER_DEPT_ADMIN("1586711737844137956", "计量部门负责人");
 
     private String code;
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index 7aaf965..69c225f 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -49,6 +49,9 @@
         LEFT JOIN sys_dept t3 on t2.dept_id = t3.id
         <where>
             and t1.is_del = 0
+            <if test="request.userId != null  and request.userId != ''">
+                and t2.account = #{request.userId}
+            </if>
             <if test="request.staffNo != null  and request.staffNo != ''">
                 and t2.staff_no like CONCAT('%',#{request.staffNo},'%')
             </if>
@@ -77,18 +80,19 @@
     </select>
     <select id="queryReminderList" resultType="com.casic.missiles.model.workbench.WorkbenchRemindMessage">
         SELECT
-            su.ID AS remind_id,
+            su.id AS remind_id,
+            su.dept_id AS remind_dept_id,
             mc.id AS business_id,
             mc.certificate_no AS business_code,
             mc.certificate_name AS message_content
         FROM
             meter_certificate AS mc
-            LEFT JOIN meter_staff ms ON mc.staff_id = ms.id
-            LEFT JOIN sys_user su ON ms.account = su.ACCOUNT
+                LEFT JOIN meter_staff ms ON mc.staff_id = ms.id
+                LEFT JOIN sys_user su ON ms.account = su.ACCOUNT
         WHERE
-            DATE_FORMAT( mc.valid_date, '%Y-%m-%d' ) = DATE_SUB(
-                curdate(),
-                INTERVAL - 30 DAY)
+                DATE_FORMAT( mc.valid_date, '%Y-%m-%d' ) = DATE_SUB(
+                    curdate(),
+                    INTERVAL - 30 DAY)
     </select>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
index 5e30e4f..11942ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
@@ -96,10 +96,13 @@
     @TableField("update_time")
     private String updateTime;
 
-    public WorkbenchRemindMessage(Long remindId, Long businessId, String businessCode, String messageContent, Integer status, Long createUser, String createUserName) {
+    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageTitle, String messageContent, Integer status, Long createUser, String createUserName) {
         this.remindId = remindId;
+        this.remindDeptId = remindDeptId;
         this.businessId = businessId;
         this.businessCode = businessCode;
+        this.messageType = messageType;
+        this.messageTitle = messageTitle;
         this.messageContent = messageContent;
         this.status = status;
         this.createUser = createUser;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
index 6c31948..ce076b0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
@@ -21,9 +21,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterCertificateImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.enums.BusinessExceptionEnum;
-import com.casic.missiles.enums.ExportEnum;
-import com.casic.missiles.enums.MeterDictEnum;
+import com.casic.missiles.enums.*;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.meter.MeterCertificateExpireMessageMapper;
 import com.casic.missiles.mapper.meter.MeterCertificateMapper;
@@ -182,7 +180,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(),idDto.getId(),meterCertificate.getCertificateNo(),meterCertificate.getCertificateName(),0,user.getId(),user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(),Long.parseLong(userInfo.getDeptId()),idDto.getId(),meterCertificate.getCertificateNo(), MessageTypeEnum.METER_CERTIFICATE.getCode(),MessageTypeEnum.METER_CERTIFICATE.getValue(),meterCertificate.getCertificateName(),0,user.getId(),user.getName());
         if(messageMapper.insert(remindMessage)>0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()),JSONObject.toJSONString(remindMessage));
@@ -210,10 +208,18 @@
             Map<Long, List<WorkbenchRemindMessage>> collect = list.parallelStream().collect(Collectors.groupingBy(WorkbenchRemindMessage::getBusinessId));
             // 移除已经发送过消息的证书信息
             messageIds.forEach(collect::remove);
-            collect.keySet().forEach(dtoList -> {
-                // 讲需要发送消息的证书整合
-                messageList.addAll(collect.get(dtoList));
-            });
+            // 讲需要发送消息的证书整合
+            for (Long id : collect.keySet()) {
+                messageList.addAll(collect.get(id));
+            }
+            // 补充业务数据
+            for (WorkbenchRemindMessage message : messageList) {
+                message.setMessageType(MessageTypeEnum.METER_CERTIFICATE.getCode());
+                message.setMessageTitle(MessageTypeEnum.METER_CERTIFICATE.getValue());
+                message.setStatus(0);
+                message.setCreateUser(Long.valueOf(MeterRoleTypeEnum.ADMIN.getCode()));
+                message.setCreateUserName(MeterRoleTypeEnum.ADMIN.getValue());
+            }
             log.info("定时任务新增消息表："+messageList);
             messageService.saveBatch(messageList);
             webSocket.sendMessage(messageList);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java
index e0ed48e..663d024 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterWorkbenchServiceImpl.java
@@ -68,6 +68,7 @@
             certificateList.forEach(bean->{
                 MeterWorkbenchResponse certificateResponse = new MeterWorkbenchResponse();
                 BeanUtils.copyProperties(bean, certificateResponse);
+                certificateResponse.setMeterAdmin(true);
                 resList.add(certificateResponse);
             });
         }else{
@@ -86,6 +87,7 @@
             certificateList.forEach(bean->{
                 MeterWorkbenchResponse certificateResponse = new MeterWorkbenchResponse();
                 BeanUtils.copyProperties(bean, certificateResponse);
+                certificateResponse.setMeterAdmin(false);
                 // 判断证书过期时间于当前时间差多少天
                 int days = (int) ((DateUtil.parseDate(bean.getValidDate()).getTime() - DateUtil.parseDate(DateUtil.formatDate(new Date())).getTime()) / (1000*3600*24));
                 if(days>0){