diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 641232b..b29adfc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -35,8 +35,11 @@
 import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
+import com.casic.missiles.service.system.IMessagePushService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -87,6 +90,9 @@
     @Autowired
     private IDeptService deptService;
 
+    @Autowired
+    private  IMessagePushService messagePushService;
+
     /**
      * 分页查询
      *
@@ -355,9 +361,9 @@
         List<EquipmentFixedAssets> equipmentFixedAssetsList = this.baseMapper.selectList(wrapper);
         List<Dept> deptList = deptService.list();
         Map<Long, String> meterOrganizeMap = deptList.stream()
-                .collect(Collectors.toMap(Dept::getId,Dept::getSimpleName));
+                .collect(Collectors.toMap(Dept::getId, Dept::getSimpleName));
         for (EquipmentFixedAssets equipmentFixedAssets : equipmentFixedAssetsList) {
-            if(Objects.nonNull(equipmentFixedAssets.getUseDept())){
+            if (Objects.nonNull(equipmentFixedAssets.getUseDept())) {
                 equipmentFixedAssets.setUseDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getUseDept())));
             }
 //            if(Objects.nonNull(equipmentFixedAssets.getMesureDept())){
@@ -443,6 +449,7 @@
         if (fixedAssets != null) {
             WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(), fixedAssets.getUseDept(), idDTO.getId(), fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), fixedAssets.getEquipmentName(), 0, user.getId(), user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
+                Boolean sendFlag = messagePushService.pushToUser(remindMessage);
                 return ReturnUtil.success();
             }
         }

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 641232b..b29adfc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -35,8 +35,11 @@
 import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
+import com.casic.missiles.service.system.IMessagePushService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -87,6 +90,9 @@
     @Autowired
     private IDeptService deptService;
 
+    @Autowired
+    private  IMessagePushService messagePushService;
+
     /**
      * 分页查询
      *
@@ -355,9 +361,9 @@
         List<EquipmentFixedAssets> equipmentFixedAssetsList = this.baseMapper.selectList(wrapper);
         List<Dept> deptList = deptService.list();
         Map<Long, String> meterOrganizeMap = deptList.stream()
-                .collect(Collectors.toMap(Dept::getId,Dept::getSimpleName));
+                .collect(Collectors.toMap(Dept::getId, Dept::getSimpleName));
         for (EquipmentFixedAssets equipmentFixedAssets : equipmentFixedAssetsList) {
-            if(Objects.nonNull(equipmentFixedAssets.getUseDept())){
+            if (Objects.nonNull(equipmentFixedAssets.getUseDept())) {
                 equipmentFixedAssets.setUseDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getUseDept())));
             }
 //            if(Objects.nonNull(equipmentFixedAssets.getMesureDept())){
@@ -443,6 +449,7 @@
         if (fixedAssets != null) {
             WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(), fixedAssets.getUseDept(), idDTO.getId(), fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), fixedAssets.getEquipmentName(), 0, user.getId(), user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
+                Boolean sendFlag = messagePushService.pushToUser(remindMessage);
                 return ReturnUtil.success();
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java
index cc7ac21..7005291 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java
@@ -278,6 +278,7 @@
      */
     @Override
     public ReturnDTO remind(Long id) {
+
         // todo 依赖质量管理里的溯源的证书管理，需要完善
         return updateRemindTime(id,new Date());
     }

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 641232b..b29adfc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -35,8 +35,11 @@
 import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
+import com.casic.missiles.service.system.IMessagePushService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -87,6 +90,9 @@
     @Autowired
     private IDeptService deptService;
 
+    @Autowired
+    private  IMessagePushService messagePushService;
+
     /**
      * 分页查询
      *
@@ -355,9 +361,9 @@
         List<EquipmentFixedAssets> equipmentFixedAssetsList = this.baseMapper.selectList(wrapper);
         List<Dept> deptList = deptService.list();
         Map<Long, String> meterOrganizeMap = deptList.stream()
-                .collect(Collectors.toMap(Dept::getId,Dept::getSimpleName));
+                .collect(Collectors.toMap(Dept::getId, Dept::getSimpleName));
         for (EquipmentFixedAssets equipmentFixedAssets : equipmentFixedAssetsList) {
-            if(Objects.nonNull(equipmentFixedAssets.getUseDept())){
+            if (Objects.nonNull(equipmentFixedAssets.getUseDept())) {
                 equipmentFixedAssets.setUseDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getUseDept())));
             }
 //            if(Objects.nonNull(equipmentFixedAssets.getMesureDept())){
@@ -443,6 +449,7 @@
         if (fixedAssets != null) {
             WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(), fixedAssets.getUseDept(), idDTO.getId(), fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), fixedAssets.getEquipmentName(), 0, user.getId(), user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
+                Boolean sendFlag = messagePushService.pushToUser(remindMessage);
                 return ReturnUtil.success();
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java
index cc7ac21..7005291 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java
@@ -278,6 +278,7 @@
      */
     @Override
     public ReturnDTO remind(Long id) {
+
         // todo 依赖质量管理里的溯源的证书管理，需要完善
         return updateRemindTime(id,new Date());
     }
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 331c784..816d02a 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
@@ -35,11 +35,13 @@
 import com.casic.missiles.model.system.UserInfo;
 import com.casic.missiles.model.workbench.WorkbenchRemindMessage;
 import com.casic.missiles.service.meter.MeterCertificateService;
+import com.casic.missiles.service.system.IMessagePushService;
 import com.casic.missiles.service.workbench.IWorkbenchRemindMessageService;
 import com.casic.missiles.utils.ExportUtils;
 import com.casic.missiles.utils.MinioUtil;
 import com.casic.missiles.utils.WebSocket;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -189,6 +191,10 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Autowired
+    private IMessagePushService messagePushService;
+
+
     @Override
     public void regularExpirationReminder() {
         List<WorkbenchRemindMessage> messageList = new ArrayList<>();
@@ -221,6 +227,7 @@
                 message.setStatus(0);
                 message.setCreateUser(Long.valueOf(MeterRoleTypeEnum.ADMIN.getCode()));
                 message.setCreateUserName(MeterRoleTypeEnum.ADMIN.getValue());
+                messagePushService.pushToUser(message);
             }
             log.info("定时任务新增消息表："+messageList);
             messageService.saveBatch(messageList);

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 641232b..b29adfc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -35,8 +35,11 @@
 import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
+import com.casic.missiles.service.system.IMessagePushService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -87,6 +90,9 @@
     @Autowired
     private IDeptService deptService;
 
+    @Autowired
+    private  IMessagePushService messagePushService;
+
     /**
      * 分页查询
      *
@@ -355,9 +361,9 @@
         List<EquipmentFixedAssets> equipmentFixedAssetsList = this.baseMapper.selectList(wrapper);
         List<Dept> deptList = deptService.list();
         Map<Long, String> meterOrganizeMap = deptList.stream()
-                .collect(Collectors.toMap(Dept::getId,Dept::getSimpleName));
+                .collect(Collectors.toMap(Dept::getId, Dept::getSimpleName));
         for (EquipmentFixedAssets equipmentFixedAssets : equipmentFixedAssetsList) {
-            if(Objects.nonNull(equipmentFixedAssets.getUseDept())){
+            if (Objects.nonNull(equipmentFixedAssets.getUseDept())) {
                 equipmentFixedAssets.setUseDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getUseDept())));
             }
 //            if(Objects.nonNull(equipmentFixedAssets.getMesureDept())){
@@ -443,6 +449,7 @@
         if (fixedAssets != null) {
             WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(), fixedAssets.getUseDept(), idDTO.getId(), fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), fixedAssets.getEquipmentName(), 0, user.getId(), user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
+                Boolean sendFlag = messagePushService.pushToUser(remindMessage);
                 return ReturnUtil.success();
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java
index cc7ac21..7005291 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java
@@ -278,6 +278,7 @@
      */
     @Override
     public ReturnDTO remind(Long id) {
+
         // todo 依赖质量管理里的溯源的证书管理，需要完善
         return updateRemindTime(id,new Date());
     }
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 331c784..816d02a 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
@@ -35,11 +35,13 @@
 import com.casic.missiles.model.system.UserInfo;
 import com.casic.missiles.model.workbench.WorkbenchRemindMessage;
 import com.casic.missiles.service.meter.MeterCertificateService;
+import com.casic.missiles.service.system.IMessagePushService;
 import com.casic.missiles.service.workbench.IWorkbenchRemindMessageService;
 import com.casic.missiles.utils.ExportUtils;
 import com.casic.missiles.utils.MinioUtil;
 import com.casic.missiles.utils.WebSocket;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -189,6 +191,10 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Autowired
+    private IMessagePushService messagePushService;
+
+
     @Override
     public void regularExpirationReminder() {
         List<WorkbenchRemindMessage> messageList = new ArrayList<>();
@@ -221,6 +227,7 @@
                 message.setStatus(0);
                 message.setCreateUser(Long.valueOf(MeterRoleTypeEnum.ADMIN.getCode()));
                 message.setCreateUserName(MeterRoleTypeEnum.ADMIN.getValue());
+                messagePushService.pushToUser(message);
             }
             log.info("定时任务新增消息表："+messageList);
             messageService.saveBatch(messageList);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
index 89d9200..4078c88 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
@@ -45,8 +45,11 @@
      * @param filePrintRegister 证书文件注册
      */
     public static String filePrintGenerate(FilePrintRegister filePrintRegister) throws RuntimeException {
-        //1、按照模板填充数据,并导出word
+        //1、按照模板填充数据,并导出word，执行填充行数之后，再进行页数的填充
         String wordOldUrl = exportWord(filePrintRegister.getTemplatePath(), filePrintRegister.getTemDir(), filePrintRegister.getFileName(), filePrintRegister.getParams());
+//        Document document = new Document();
+//        document.loadFromFile(wordOldUrl);
+//        document.getPageCount();
         //设置透明属性  1、获取照片 2、签章背景透明设置 3、设置照片路径和照片类型进行图片保存
 //        for (ElectronicImage electronicSeal : filePrintRegister.getElectronicImageList()) {
 //            BufferedImage bi = readImage(electronicSeal.getElectronicSealImageUrl());
@@ -147,19 +150,24 @@
             if (ObjectUtils.isEmpty(textSelections) || StringUtils.isEmpty(electronicSeal.getElectronicSealImageUrl())) {
                 throw new RuntimeException("image url is empty  or key word not exist in the word template ...");
             }
-            Paragraph paragraph = textSelections[keyWordIndex > -1 ? 0 : textSelections.length - 1].getAsOneRange().getOwnerParagraph();
-            //添加公司印章
-            DocPicture docPicture = paragraph.appendPicture(electronicSeal.getElectronicSealImageUrl());
-            //设置图片位于文字顶层
-            docPicture.setTextWrappingStyle(TextWrappingStyle.In_Front_Of_Text);
-            //指定电子章位置
-            //水平位置
-            docPicture.setHorizontalPosition(electronicSeal.getHorizontal());
-            //垂直位置
-            docPicture.setVerticalPosition(electronicSeal.getVertical());
-            //设置电子章大小
-            docPicture.setWidth(electronicSeal.getStampWidth());
-            docPicture.setHeight(electronicSeal.getStampHeight());
+            //多处关键字添加同一个签章
+            for(int keyWordIndex=0;keyWordIndex<textSelections.length;keyWordIndex++){
+                Paragraph paragraph = textSelections[keyWordIndex].getAsOneRange().getOwnerParagraph();
+                textSelections[keyWordIndex].getCount();
+
+                //添加公司印章
+                DocPicture docPicture = paragraph.appendPicture(electronicSeal.getElectronicSealImageUrl());
+                //设置图片位于文字顶层
+                docPicture.setTextWrappingStyle(TextWrappingStyle.In_Front_Of_Text);
+                //指定电子章位置
+                //水平位置
+                docPicture.setHorizontalPosition(electronicSeal.getHorizontal());
+                //垂直位置
+                docPicture.setVerticalPosition(electronicSeal.getVertical());
+                //设置电子章大小
+                docPicture.setWidth(electronicSeal.getStampWidth());
+                docPicture.setHeight(electronicSeal.getStampHeight());
+            }
         }
 
         //保存添加电子章的Word文档

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 641232b..b29adfc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -35,8 +35,11 @@
 import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
+import com.casic.missiles.service.system.IMessagePushService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -87,6 +90,9 @@
     @Autowired
     private IDeptService deptService;
 
+    @Autowired
+    private  IMessagePushService messagePushService;
+
     /**
      * 分页查询
      *
@@ -355,9 +361,9 @@
         List<EquipmentFixedAssets> equipmentFixedAssetsList = this.baseMapper.selectList(wrapper);
         List<Dept> deptList = deptService.list();
         Map<Long, String> meterOrganizeMap = deptList.stream()
-                .collect(Collectors.toMap(Dept::getId,Dept::getSimpleName));
+                .collect(Collectors.toMap(Dept::getId, Dept::getSimpleName));
         for (EquipmentFixedAssets equipmentFixedAssets : equipmentFixedAssetsList) {
-            if(Objects.nonNull(equipmentFixedAssets.getUseDept())){
+            if (Objects.nonNull(equipmentFixedAssets.getUseDept())) {
                 equipmentFixedAssets.setUseDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getUseDept())));
             }
 //            if(Objects.nonNull(equipmentFixedAssets.getMesureDept())){
@@ -443,6 +449,7 @@
         if (fixedAssets != null) {
             WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(), fixedAssets.getUseDept(), idDTO.getId(), fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), fixedAssets.getEquipmentName(), 0, user.getId(), user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
+                Boolean sendFlag = messagePushService.pushToUser(remindMessage);
                 return ReturnUtil.success();
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java
index cc7ac21..7005291 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java
@@ -278,6 +278,7 @@
      */
     @Override
     public ReturnDTO remind(Long id) {
+
         // todo 依赖质量管理里的溯源的证书管理，需要完善
         return updateRemindTime(id,new Date());
     }
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 331c784..816d02a 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
@@ -35,11 +35,13 @@
 import com.casic.missiles.model.system.UserInfo;
 import com.casic.missiles.model.workbench.WorkbenchRemindMessage;
 import com.casic.missiles.service.meter.MeterCertificateService;
+import com.casic.missiles.service.system.IMessagePushService;
 import com.casic.missiles.service.workbench.IWorkbenchRemindMessageService;
 import com.casic.missiles.utils.ExportUtils;
 import com.casic.missiles.utils.MinioUtil;
 import com.casic.missiles.utils.WebSocket;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -189,6 +191,10 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Autowired
+    private IMessagePushService messagePushService;
+
+
     @Override
     public void regularExpirationReminder() {
         List<WorkbenchRemindMessage> messageList = new ArrayList<>();
@@ -221,6 +227,7 @@
                 message.setStatus(0);
                 message.setCreateUser(Long.valueOf(MeterRoleTypeEnum.ADMIN.getCode()));
                 message.setCreateUserName(MeterRoleTypeEnum.ADMIN.getValue());
+                messagePushService.pushToUser(message);
             }
             log.info("定时任务新增消息表："+messageList);
             messageService.saveBatch(messageList);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
index 89d9200..4078c88 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
@@ -45,8 +45,11 @@
      * @param filePrintRegister 证书文件注册
      */
     public static String filePrintGenerate(FilePrintRegister filePrintRegister) throws RuntimeException {
-        //1、按照模板填充数据,并导出word
+        //1、按照模板填充数据,并导出word，执行填充行数之后，再进行页数的填充
         String wordOldUrl = exportWord(filePrintRegister.getTemplatePath(), filePrintRegister.getTemDir(), filePrintRegister.getFileName(), filePrintRegister.getParams());
+//        Document document = new Document();
+//        document.loadFromFile(wordOldUrl);
+//        document.getPageCount();
         //设置透明属性  1、获取照片 2、签章背景透明设置 3、设置照片路径和照片类型进行图片保存
 //        for (ElectronicImage electronicSeal : filePrintRegister.getElectronicImageList()) {
 //            BufferedImage bi = readImage(electronicSeal.getElectronicSealImageUrl());
@@ -147,19 +150,24 @@
             if (ObjectUtils.isEmpty(textSelections) || StringUtils.isEmpty(electronicSeal.getElectronicSealImageUrl())) {
                 throw new RuntimeException("image url is empty  or key word not exist in the word template ...");
             }
-            Paragraph paragraph = textSelections[keyWordIndex > -1 ? 0 : textSelections.length - 1].getAsOneRange().getOwnerParagraph();
-            //添加公司印章
-            DocPicture docPicture = paragraph.appendPicture(electronicSeal.getElectronicSealImageUrl());
-            //设置图片位于文字顶层
-            docPicture.setTextWrappingStyle(TextWrappingStyle.In_Front_Of_Text);
-            //指定电子章位置
-            //水平位置
-            docPicture.setHorizontalPosition(electronicSeal.getHorizontal());
-            //垂直位置
-            docPicture.setVerticalPosition(electronicSeal.getVertical());
-            //设置电子章大小
-            docPicture.setWidth(electronicSeal.getStampWidth());
-            docPicture.setHeight(electronicSeal.getStampHeight());
+            //多处关键字添加同一个签章
+            for(int keyWordIndex=0;keyWordIndex<textSelections.length;keyWordIndex++){
+                Paragraph paragraph = textSelections[keyWordIndex].getAsOneRange().getOwnerParagraph();
+                textSelections[keyWordIndex].getCount();
+
+                //添加公司印章
+                DocPicture docPicture = paragraph.appendPicture(electronicSeal.getElectronicSealImageUrl());
+                //设置图片位于文字顶层
+                docPicture.setTextWrappingStyle(TextWrappingStyle.In_Front_Of_Text);
+                //指定电子章位置
+                //水平位置
+                docPicture.setHorizontalPosition(electronicSeal.getHorizontal());
+                //垂直位置
+                docPicture.setVerticalPosition(electronicSeal.getVertical());
+                //设置电子章大小
+                docPicture.setWidth(electronicSeal.getStampWidth());
+                docPicture.setHeight(electronicSeal.getStampHeight());
+            }
         }
 
         //保存添加电子章的Word文档
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java
index 890411d..eb28827 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java
@@ -49,7 +49,11 @@
     }
 
 
-
+    @Override
+    protected void customizedSignNamesParamCreator() {
+        keyParamList = Arrays.asList("发起人", "审核人", "批准人");
+        customizedSignNames = Arrays.asList("校准人", "核验人", "批准人" );
+    }
 
     /**
      * 定制化电子签章文件

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 641232b..b29adfc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -35,8 +35,11 @@
 import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
+import com.casic.missiles.service.system.IMessagePushService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -87,6 +90,9 @@
     @Autowired
     private IDeptService deptService;
 
+    @Autowired
+    private  IMessagePushService messagePushService;
+
     /**
      * 分页查询
      *
@@ -355,9 +361,9 @@
         List<EquipmentFixedAssets> equipmentFixedAssetsList = this.baseMapper.selectList(wrapper);
         List<Dept> deptList = deptService.list();
         Map<Long, String> meterOrganizeMap = deptList.stream()
-                .collect(Collectors.toMap(Dept::getId,Dept::getSimpleName));
+                .collect(Collectors.toMap(Dept::getId, Dept::getSimpleName));
         for (EquipmentFixedAssets equipmentFixedAssets : equipmentFixedAssetsList) {
-            if(Objects.nonNull(equipmentFixedAssets.getUseDept())){
+            if (Objects.nonNull(equipmentFixedAssets.getUseDept())) {
                 equipmentFixedAssets.setUseDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getUseDept())));
             }
 //            if(Objects.nonNull(equipmentFixedAssets.getMesureDept())){
@@ -443,6 +449,7 @@
         if (fixedAssets != null) {
             WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(), fixedAssets.getUseDept(), idDTO.getId(), fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), fixedAssets.getEquipmentName(), 0, user.getId(), user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
+                Boolean sendFlag = messagePushService.pushToUser(remindMessage);
                 return ReturnUtil.success();
             }
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java
index cc7ac21..7005291 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java
@@ -278,6 +278,7 @@
      */
     @Override
     public ReturnDTO remind(Long id) {
+
         // todo 依赖质量管理里的溯源的证书管理，需要完善
         return updateRemindTime(id,new Date());
     }
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 331c784..816d02a 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
@@ -35,11 +35,13 @@
 import com.casic.missiles.model.system.UserInfo;
 import com.casic.missiles.model.workbench.WorkbenchRemindMessage;
 import com.casic.missiles.service.meter.MeterCertificateService;
+import com.casic.missiles.service.system.IMessagePushService;
 import com.casic.missiles.service.workbench.IWorkbenchRemindMessageService;
 import com.casic.missiles.utils.ExportUtils;
 import com.casic.missiles.utils.MinioUtil;
 import com.casic.missiles.utils.WebSocket;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -189,6 +191,10 @@
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Autowired
+    private IMessagePushService messagePushService;
+
+
     @Override
     public void regularExpirationReminder() {
         List<WorkbenchRemindMessage> messageList = new ArrayList<>();
@@ -221,6 +227,7 @@
                 message.setStatus(0);
                 message.setCreateUser(Long.valueOf(MeterRoleTypeEnum.ADMIN.getCode()));
                 message.setCreateUserName(MeterRoleTypeEnum.ADMIN.getValue());
+                messagePushService.pushToUser(message);
             }
             log.info("定时任务新增消息表："+messageList);
             messageService.saveBatch(messageList);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
index 89d9200..4078c88 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
@@ -45,8 +45,11 @@
      * @param filePrintRegister 证书文件注册
      */
     public static String filePrintGenerate(FilePrintRegister filePrintRegister) throws RuntimeException {
-        //1、按照模板填充数据,并导出word
+        //1、按照模板填充数据,并导出word，执行填充行数之后，再进行页数的填充
         String wordOldUrl = exportWord(filePrintRegister.getTemplatePath(), filePrintRegister.getTemDir(), filePrintRegister.getFileName(), filePrintRegister.getParams());
+//        Document document = new Document();
+//        document.loadFromFile(wordOldUrl);
+//        document.getPageCount();
         //设置透明属性  1、获取照片 2、签章背景透明设置 3、设置照片路径和照片类型进行图片保存
 //        for (ElectronicImage electronicSeal : filePrintRegister.getElectronicImageList()) {
 //            BufferedImage bi = readImage(electronicSeal.getElectronicSealImageUrl());
@@ -147,19 +150,24 @@
             if (ObjectUtils.isEmpty(textSelections) || StringUtils.isEmpty(electronicSeal.getElectronicSealImageUrl())) {
                 throw new RuntimeException("image url is empty  or key word not exist in the word template ...");
             }
-            Paragraph paragraph = textSelections[keyWordIndex > -1 ? 0 : textSelections.length - 1].getAsOneRange().getOwnerParagraph();
-            //添加公司印章
-            DocPicture docPicture = paragraph.appendPicture(electronicSeal.getElectronicSealImageUrl());
-            //设置图片位于文字顶层
-            docPicture.setTextWrappingStyle(TextWrappingStyle.In_Front_Of_Text);
-            //指定电子章位置
-            //水平位置
-            docPicture.setHorizontalPosition(electronicSeal.getHorizontal());
-            //垂直位置
-            docPicture.setVerticalPosition(electronicSeal.getVertical());
-            //设置电子章大小
-            docPicture.setWidth(electronicSeal.getStampWidth());
-            docPicture.setHeight(electronicSeal.getStampHeight());
+            //多处关键字添加同一个签章
+            for(int keyWordIndex=0;keyWordIndex<textSelections.length;keyWordIndex++){
+                Paragraph paragraph = textSelections[keyWordIndex].getAsOneRange().getOwnerParagraph();
+                textSelections[keyWordIndex].getCount();
+
+                //添加公司印章
+                DocPicture docPicture = paragraph.appendPicture(electronicSeal.getElectronicSealImageUrl());
+                //设置图片位于文字顶层
+                docPicture.setTextWrappingStyle(TextWrappingStyle.In_Front_Of_Text);
+                //指定电子章位置
+                //水平位置
+                docPicture.setHorizontalPosition(electronicSeal.getHorizontal());
+                //垂直位置
+                docPicture.setVerticalPosition(electronicSeal.getVertical());
+                //设置电子章大小
+                docPicture.setWidth(electronicSeal.getStampWidth());
+                docPicture.setHeight(electronicSeal.getStampHeight());
+            }
         }
 
         //保存添加电子章的Word文档
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java
index 890411d..eb28827 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java
@@ -49,7 +49,11 @@
     }
 
 
-
+    @Override
+    protected void customizedSignNamesParamCreator() {
+        keyParamList = Arrays.asList("发起人", "审核人", "批准人");
+        customizedSignNames = Arrays.asList("校准人", "核验人", "批准人" );
+    }
 
     /**
      * 定制化电子签章文件
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/site/CalibrationFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/site/CalibrationFileData.java
index 902ac9e..261882a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/site/CalibrationFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/site/CalibrationFileData.java
@@ -56,6 +56,7 @@
     /**
      * 文件自定义名称参数构建器
      */
+    @Override
     protected void customizedSignNamesParamCreator() {
         keyParamList = Arrays.asList("审核人", "批准人");
         customizedSignNames = Arrays.asList("技术负责人审核", "计量测试站主任批准");