设备子系统———大修发送超期消息业务调整

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/EquipmentSendNotifyService.java

@@ -57,6 +57,7 @@ public interface EquipmentSendNotifyService {
      * @param taskquantity
      * @param taskId
      * @param userId
+     * @param fileItemId
      */
     void sendPlanningTasksNotify(String planyear, String belongfactory, Integer taskquantity, String taskId,List<String> userId,String fileItemId);
 

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquipmentSendNotifyServiceImpl.java

@@ -42,6 +42,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.rongwei.safecommon.utils.SaveConstans.FileName.DEVICE_REPEATEDLY_FAILS_FILE_NAME;
+import static com.rongwei.safecommon.utils.SaveConstans.FileName.PLANNING_TASK_FILE_NAME;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyContent.*;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyTitle.*;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.*;
@@ -212,11 +213,18 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
 
     @Override
     public void sendPlanningTasksNotify(String planyear, String belongfactory, Integer taskquantity, String taskId,List<String> userId,String fileItemId) {
+        String notifyId = SecurityUtil.getUUID();
+        String formatFileNameAndId = PLANNING_TASK_FILE_NAME+"-;-"+fileItemId;
         CXCommonUtils.deleteSendNotify("mobilePlanningTask", null);
         // 发送消息提醒
-        CXCommonUtils.sendNotify(PLANNING_TASK_TITLE,
-                String.format(PLANNING_TASK_CONTENT, planyear, belongfactory, taskquantity),
-                null, userId.stream().distinct().collect(Collectors.toList()), taskId, MOBILE_PLANNING_TASK, true);
+        CXCommonUtils.sendNotify(notifyId,PLANNING_TASK_TITLE,
+                String.format(PLANNING_TASK_CONTENT, planyear, belongfactory, taskquantity),formatFileNameAndId
+                , userId.stream().distinct().collect(Collectors.toList()), taskId, MOBILE_PLANNING_TASK, true);
+        SysFileItemDo sysFileItemDo = new SysFileItemDo();
+        sysFileItemDo.setId(fileItemId);
+        sysFileItemDo.setRelationid(notifyId);
+        sysFileItemDo.setFilename(PLANNING_TASK_FILE_NAME);
+        sysFileItemService.updateById(sysFileItemDo);
     }
 
     /**