消息提醒空值判断，数据为空复制空字符串

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafetyMeetingImpl.java

@@ -1,7 +1,7 @@
 package com.rongwei.sfcommon.sys.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwe.scentity.domian.AspSafetyMeeting;
 import com.rongwei.safecommon.utils.CXCommonUtils;
@@ -9,7 +9,6 @@ import com.rongwei.sfcommon.sys.dao.AspSafetyMeetingDao;
 import com.rongwei.sfcommon.sys.service.AspSafetyMeetingService;
 import org.springframework.stereotype.Service;
 
-import java.sql.Array;
 import java.util.Arrays;
 import java.util.List;
 
@@ -25,13 +24,19 @@ public class AspSafetyMeetingImpl extends ServiceImpl<AspSafetyMeetingDao, AspSa
         list.forEach(item -> {
             //处理需要接收消息的人
             List<String> userIdList = Arrays.asList(item.getMeetingparticipationid().split(","));
+            String meetingHeader = ObjectUtil.isNotEmpty(item.getMeetingheader()) ? item.getMeetingheader() : "";
+            String meetingTitle = ObjectUtil.isNotEmpty(item.getMeetingtitle()) ? item.getMeetingtitle() : "";
+            String meetingDate = ObjectUtil.isNotEmpty(item.getMeetingdate()) ? DateUtil.format(item.getMeetingdate(), "yyyy-MM-dd HH:mm:ss") : "";
+            String meetingAddress = ObjectUtil.isNotEmpty(item.getMeetingaddress()) ? item.getMeetingaddress() : "";
+            String meetingRemark = ObjectUtil.isNotEmpty(item.getMeetingremark()) ? item.getMeetingremark() : "";
+
             //发送消息
             CXCommonUtils.sendNotify("会议提醒",
-                    "由【" + item.getMeetingheader() + "】主持的【"
-                            + item.getMeetingtitle() + "】，将于【"
-                            + DateUtil.format(item.getMeetingdate(), "yyyy-MM-dd HH:mm:ss") + "】在【"
-                            + item.getMeetingaddress() + "】召开会议、会议说明：【"
-                            + item.getMeetingremark() + "】，请届时参加！",
+                    "由【" + meetingHeader + "】主持的【"
+                            + meetingTitle + "】，将于【"
+                            + meetingDate + "】在【"
+                            + meetingAddress + "】召开会议、会议说明：【"
+                            + meetingRemark + "】，请届时参加！",
                     null,
                     userIdList,
                     item.getId(),

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/CheckItemsServiceImpl.java

@@ -81,10 +81,16 @@ public class CheckItemsServiceImpl extends ServiceImpl<CheckItemsDao, CheckItems
         //根据设备的所属工厂给自己工厂的设备管理员发送消息
         list.forEach(item -> {
             if (ObjectUtil.isNotEmpty(item.getTenantid())) {
+                String typeName = ObjectUtil.isNotEmpty(item.getTypeName()) ? item.getTypeName() : "";
+                String checkItemCode = ObjectUtil.isNotEmpty(item.getCheckitemcode()) ? item.getCheckitemcode() : "";
+                String checkItemName = ObjectUtil.isNotEmpty(item.getCheckitemname()) ? item.getCheckitemname() : "";
+                String nextCheckDate = ObjectUtil.isNotEmpty(item.getNextcheckdate()) ? DateUtil.format(item.getNextcheckdate(), "yyy-MM-dd") : "";
+
+
                 //发送消息
                 CXCommonUtils.sendNotify("特种设备提醒",
                         "【设备年检提醒】，您好，有如下设备即将年检到期，请及时处理：" +
-                                "设备类型：【" + item.getTypeName() + "】，设备编号：【" + item.getCheckitemcode() + "】，设备名称：【" + item.getCheckitemname() + "】，年检日期：【" + DateUtil.format(item.getNextcheckdate(), "yyy-MM-dd") + "】",
+                                "设备类型：【" + typeName + "】，设备编号：【" + checkItemCode + "】，设备名称：【" + checkItemName + "】，年检日期：【" + nextCheckDate + "】",
                         null,
                         equManager.get(item.getTenantid()),
                         item.getId(),