通知公告问题修复

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysNoticeServiceImpl.java

@@ -3,8 +3,7 @@ package com.usky.system.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.gson.JsonObject;
-import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.exception.BusinessException;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.system.domain.SysNotice;
 import com.usky.system.domain.SysUser;
@@ -15,11 +14,8 @@ import com.usky.system.service.MceReceiveService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.sql.Wrapper;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -76,19 +72,34 @@ public class SysNoticeServiceImpl extends AbstractCrudService<SysNoticeMapper, S
         List<Long> usersIds = sysUserMapper.selectList(Wrappers.lambdaQuery(SysUser.class).select(SysUser::getUserId).in(SysUser::getDeptId, deptIds)).stream().map(SysUser::getUserId).collect(Collectors.toList());
 
         if (!deptIds.isEmpty()) {
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("infoTitle", notice.getNoticeTitle());
-            jsonObject.put("infoContent", notice.getNoticeContent());
-            jsonObject.put("infoType", 1);
-            jsonObject.put("id", insertId);
-            jsonObject.put("infoTypeName", "通知公告");
-            jsonObject.put("userName", notice.getCreateBy());
-            jsonObject.put("userIds", usersIds);
-            mceReceiveService.add(jsonObject.toString());
+            sendNotice(notice.getNoticeTitle(), insertId, notice.getCreateBy(), usersIds);
         }
+
         return insertId;
     }
 
+    /**
+     * 发送消息
+     * @param infoContent 消息内容
+     * @param id 通知公告id
+     * @param userName 发布人
+     * @param userIds 接收人
+     */
+    private void sendNotice(String infoContent, Integer id, String userName, List<Long> userIds) {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("infoTitle", "通知公告");
+        jsonObject.put("infoContent", infoContent);
+        jsonObject.put("infoType", 1);
+        jsonObject.put("id", id);
+        jsonObject.put("userName", userName);
+        jsonObject.put("userIds", userIds);
+        try {
+            mceReceiveService.add(jsonObject.toString());
+        } catch (Exception e) {
+            log.error(String.format("公告:%d，消息发送失败:%s", id, e.getMessage()));
+        }
+    }
+
     /**
      * 修改公告
      *

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -17,6 +17,7 @@
         <result property="fileUrl" column="file_url"/>
         <result property="author" column="author"/>
         <result property="deptId" column="dept_id"/>
+        <result property="tenantId" column="tenant_id"/>
     </resultMap>
 
     <sql id="selectNoticeVo">
@@ -31,7 +32,8 @@
                update_time,
                file_url,
                author,
-               dept_id
+               dept_id,
+               tenant_id
         from sys_notice
     </sql>
 
@@ -61,6 +63,9 @@
             <if test="startTime != null and endTime != null">
                 AND create_time BETWEEN #{startTime} AND #{endTime}
             </if>
+            <if test="tenantId != null and tenantId != ''">
+                AND tenant_id = #{tenantId}
+            </if>
         </where>
         order by notice_id desc
     </select>
@@ -76,6 +81,7 @@
         <if test="fileUrl != null and fileUrl != ''">file_url,</if>
         <if test="author != null and author != ''">author,</if>
         <if test="deptId != null and deptId != ''">dept_id,</if>
+        <if test="tenantId != null and tenantId != ''">tenant_id,</if>
         create_time
         )values(
         <if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle},</if>
@@ -86,6 +92,7 @@
         <if test="fileUrl != null and fileUrl != ''">#{fileUrl},</if>
         <if test="author != null and author != ''">#{author},</if>
         <if test="deptId != null and deptId != ''">#{deptId},</if>
+        <if test="tenantId != null and tenantId != ''">#{tenantId},</if>
         sysdate()
         )
     </insert>