fix: 修改用户通知BUG,当前用户只能查看自己的通知

@@ -58,6 +58,26 @@ public class YtNoticeUserController extends BaseController {
     if (type != null) {
       queryMap.put("type", type.name());
     }
+    //接收者id,当前所属用户的id
+    queryMap.put("receiverId",getCurrentUser().getCurrentUserId());
+    return sysNoticeUserService.page(queryMap);
+  }
+
+  @GetMapping(
+          path = "page/{noticeId}",
+          params = {PAGE_SIZE, PAGE})
+  @ApiOperation("通知用户分页")
+  public YtPageData<SysNoticeUserDTO> pageByNoticeId (
+          @PathVariable("noticeId") String noticeId,
+          @RequestParam(PAGE_SIZE) int pageSize,
+          @RequestParam(PAGE) int page,
+          @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+          @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) throws ThingsboardException{
+    Map<String, Object> queryMap = getMap(pageSize, page, orderBy, orderType);
+    queryMap.put("noticeId",noticeId);
+    if (orderType != null) {
+      queryMap.put(ORDER_TYPE, orderType.name());
+    }
     return sysNoticeUserService.page(queryMap);
   }
 
@@ -77,7 +97,7 @@ public class YtNoticeUserController extends BaseController {
     queryMap.put(PAGE_SIZE, pageSize);
     queryMap.put(PAGE, page);
     queryMap.put(ORDER_FILED, orderBy);
-    queryMap.put("tenantId", getCurrentUser().getCurrentUserId());
+    queryMap.put("tenantId", getCurrentUser().getCurrentTenantId());
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }

@@ -22,20 +22,25 @@ public class SysNoticeDTO extends TenantDTO {
   private static final long serialVersionUID = 3466370312762440488L;
   @ApiModelProperty(value = "通知类型",required = true)
   private SysNoticeTypeEnum type;
+
   @ApiModelProperty(value = "标题",required = true)
   private String title;
+
   @ApiModelProperty(value = "内容",required = true)
   private String content;
+
   @ApiModelProperty(value = "接收者（字典值receiver_type）  0：全部  1：组织  2：部门  3：个人",required = true)
   private String receiverType;
-  @ApiModelProperty(value = "根据receiverType不同变化，，0:传null，1:组织id，2:部门id，3:用户id",required = true)
+
+  @ApiModelProperty(value = "根据receiverType不同变化，0:传null，1:组织id，2:部门id，3:用户id",required = true)
   private List<String> pointId;
-  @ApiModelProperty(value = "接收者ID，用逗号分开")
-  private String receiverTypeIds;
+
   @ApiModelProperty(value = "发送状态（字典值draft_status）  0：草稿  1：已发布")
   private String status;
+
   @ApiModelProperty(value = "发送者")
   private String senderName;
+
   @ApiModelProperty(value = "发送时间")
   private LocalDateTime senderDate;
 }

@@ -18,12 +18,14 @@ public class SysNoticeUserDTO extends TenantDTO {
   private static final long serialVersionUID = -5421685500963791707L;
   @ApiModelProperty(value = "接收者ID")
   private String receiverId;
+  @ApiModelProperty(value = "接收者")
+  private UserDTO user;
   @ApiModelProperty(value = "通知ID")
-  private String NoticeId;
+  private String noticeId;
   @ApiModelProperty(value = "阅读状态 0：未读 1：已读")
-  private String ReadStatus;
+  private String readStatus;
   @ApiModelProperty(value = "阅读时间")
-  private LocalDateTime ReadDate;
+  private LocalDateTime readDate;
   @ApiModelProperty(value = "通知类型")
   private SysNoticeTypeEnum type;
   @ApiModelProperty(value = "发送者")

@@ -27,8 +27,6 @@ public class SysNotice extends TenantBaseEntity {
   private String content;
   /** 接收者（字典值receiver_type）  0：全部  1：组织  2：部门  3：个人 */
   private String receiverType;
-  /** 接收者ID，用逗号分开 */
-  private String receiverTypeIds;
   /** 发送状态（字典值draft_status）  0：草稿  1：已发布 */
   private String status;
   /** 发送者 */

@@ -23,18 +23,11 @@ public class SysNoticeUser extends TenantBaseEntity {
   /** 接收者ID */
   private String receiverId;
   /** 通知ID */
-  private String NoticeId;
+  private String noticeId;
   /** 阅读状态 0：未读 1：已读 */
-  private String ReadStatus;
+  private String readStatus;
   /** 阅读时间 */
-  private LocalDateTime ReadDate;
-  /** 通知类型 */
-  @TableField(exist = false)
-  private SysNoticeTypeEnum type;
-  /** 发送者 */
-  @TableField(exist = false)
-  private String senderName;
-  /** 发送时间 */
-  @TableField(exist = false)
-  private LocalDateTime senderDate;
+  private LocalDateTime readDate;
+  /** 通知用户状态: 0 草稿 1已发布 */
+  private String status;
 }

@@ -4,26 +4,24 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.EntityCreationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.SysNoticeDTO;
+import org.thingsboard.server.common.data.yunteng.dto.SysNoticeUserDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.SysNotice;
-import org.thingsboard.server.dao.yunteng.entities.SysNoticeUser;
 import org.thingsboard.server.dao.yunteng.entities.User;
 import org.thingsboard.server.dao.yunteng.mapper.SysNoticeMapper;
 import org.thingsboard.server.dao.yunteng.mapper.UserMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.SysNoticeService;
+import org.thingsboard.server.dao.yunteng.service.SysNoticeUserService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -43,6 +41,7 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
   private final SysNoticeUserServiceImpl sysNoticeUserService;
   private final UserOrganizationMappingService userOrganizationMappingService;
   private final UserMapper userMapper;
+  private final SysNoticeUserService noticeUserService;
 
   @Override
   public YtPageData<SysNoticeDTO> page(Map<String, Object> queryMap) {
@@ -70,50 +69,57 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
     SysNotice sysNotice = sysNoticeDTO.getEntity(SysNotice.class);
     // 设置为草稿
     sysNotice.setTenantId(tenantId);
-    // 拼接需要发送的名单
-    // ReceiverType为空,getPointId有值,也抛异常
-    // ReceiverType,getPointId同时为空,抛异常
-    // ReceiverType为其他任何值都抛异常
     if (sysNoticeDTO.getReceiverType() == null
         || (!sysNoticeDTO.getReceiverType().equals(FastIotConstants.ReceiverType.ALL)
             && sysNoticeDTO.getPointId() == null)) {
       throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.name());
     }
-    LambdaQueryWrapper<User> wrapper =
-        new LambdaQueryWrapper<User>().eq(User::getTenantId, sysNotice.getTenantId());
+
+    List<String> userList;
     switch (sysNotice.getReceiverType()) {
       case FastIotConstants.ReceiverType.ALL:
-        // 全部
-        sysNotice.setReceiverTypeIds(
-            userMapper.selectList(wrapper).stream()
+        // 获取全部用户ID
+        userList =
+            userMapper
+                .selectList(
+                    new LambdaQueryWrapper<User>().eq(User::getTenantId, sysNotice.getTenantId()))
+                .stream()
                 .map(User::getId)
-                .collect(Collectors.joining(",")));
+                .distinct()
+                .collect(Collectors.toList());
         break;
       case FastIotConstants.ReceiverType.ORGANIZATION:
-        // 组织内
-        sysNotice.setReceiverTypeIds(
-                String.join(",", userOrganizationMappingService
-                        .getUserIdByOrganizationIds(
-                                tenantId, sysNoticeDTO.getPointId().toArray(String[]::new))));
-        break;
-      case FastIotConstants.ReceiverType.PERSONAL:
-        // 个人
-        sysNotice.setReceiverTypeIds(
-                String.join(",", sysNoticeDTO.getPointId()));
+        // 判断传入的集合id是否为空
+        if (sysNoticeDTO.getPointId() == null || sysNoticeDTO.getPointId().size() == 0) {
+          throw new EntityCreationException(ErrorMessage.GET_CURRENT_USER_EXCEPTION.name());
+        }
+        // 获取当前组织下的所有用户
+        userList =
+            userOrganizationMappingService.getUserIdByOrganizationIds(
+                tenantId, sysNoticeDTO.getPointId().toArray(String[]::new));
         break;
       default:
         throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.name());
     }
-    if (StringUtils.isEmpty(sysNotice.getReceiverTypeIds())) {
+    if (userList.isEmpty()) {
       throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.name());
     }
     // 如果为空,则新增
     if (sysNotice.getId() == null) {
       baseMapper.insert(sysNotice);
+      // 保存用户通知表
+      noticeUserService.saveSysNoticeUser(
+              userList, tenantId, sysNotice.getId(), sysNoticeDTO.getStatus());
+      sysNotice.copyToDTO(sysNoticeDTO);
     } else {
+      List<String> sysNoticeUserList =  noticeUserService.getSysNoticeUserIdsByNoticeId(sysNotice.getId());
+      //更改通知用户的状态
+      if(null == sysNoticeUserList || sysNoticeUserList.size()<1){
+        throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.name());
+      }
+      noticeUserService.updateSysNoticeUsersStatusByNoticeId(sysNotice.getId(),sysNotice.getStatus());
       baseMapper.updateById(sysNotice);
     }
-    sysNotice.copyToDTO(sysNoticeDTO);
     return sysNoticeDTO;
   }
 
@@ -134,25 +140,6 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
             new LambdaQueryWrapper<SysNotice>()
                 .eq(SysNotice::getId, sysNoticeDTO.getId())
                 .eq(SysNotice::getTenantId, tenantId));
-
-    if (update > 0) {
-      // 发送消息
-      String[] split = sysNotice.getReceiverTypeIds().split(",");
-      List<SysNoticeUser> list = new ArrayList<>(split.length);
-      for (String s : split) {
-        SysNoticeUser sysNoticeUser = new SysNoticeUser();
-        sysNoticeUser.setReceiverId(s);
-        sysNoticeUser.setNoticeId(sysNotice.getId());
-        sysNoticeUser.setTenantId(sysNotice.getTenantId());
-        sysNoticeUser.setReadStatus(FastIotConstants.ReadState.UNREAD);
-        list.add(sysNoticeUser);
-      }
-      if (ObjectUtils.isEmpty(list) || !sysNoticeUserService.insertBatch(list, 100)) {
-        // 通知失败
-        throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.name());
-      }
-    }
-    sysNotice.copyToDTO(SysNoticeDTO.class);
-    return sysNoticeDTO;
+    return sysNotice.getDTO(SysNoticeDTO.class);
   }
 }

 package org.thingsboard.server.dao.yunteng.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.SysNoticeUserDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.SysNoticeUser;
+import org.thingsboard.server.dao.yunteng.entities.User;
 import org.thingsboard.server.dao.yunteng.mapper.SysNoticeUserMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.SysNoticeUserService;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author: 徐浩然
@@ -30,16 +39,21 @@ public class SysNoticeUserServiceImpl
   }
 
   @Override
+  public YtPageData<SysNoticeUserDTO> pageByNoticeId(Map<String, Object> queryMap) {
+    return getPage(queryMap);
+  }
+
+  @Override
   public YtPageData<SysNoticeUserDTO> read(Map<String, Object> queryMap, String currentUserId) {
     queryMap.put("creator", currentUserId);
     return getPage(queryMap);
   }
 
   @Override
-  public SysNoticeUserDTO get(String id,String tenantId) {
-    SysNoticeUser sysNoticeUser =
-        baseMapper.get(id, tenantId).getEntity(SysNoticeUser.class);
-    if (!FastIotConstants.ReadState.READ.equals(sysNoticeUser.getReadStatus()) || sysNoticeUser.getReadDate() == null) {
+  public SysNoticeUserDTO get(String id, String tenantId) {
+    SysNoticeUser sysNoticeUser = baseMapper.get(id, tenantId).getEntity(SysNoticeUser.class);
+    if (!FastIotConstants.ReadState.READ.equals(sysNoticeUser.getReadStatus())
+        || sysNoticeUser.getReadDate() == null) {
       // 设置已读
       sysNoticeUser.setReadStatus(FastIotConstants.ReadState.READ);
       sysNoticeUser.setReadDate(LocalDateTime.now());
@@ -53,6 +67,43 @@ public class SysNoticeUserServiceImpl
     return sysNoticeUser.getDTO(SysNoticeUserDTO.class);
   }
 
+  @Override
+  public void saveSysNoticeUser(
+      List<String> userIds, String tenantId, String noticeId, String status) {
+    List<SysNoticeUser> sysNoticeUserList = new ArrayList<>();
+    userIds.forEach(userId ->{
+      SysNoticeUser sysNoticeUser = new SysNoticeUser();
+      sysNoticeUser.setNoticeId(noticeId);
+      sysNoticeUser.setStatus(status);
+      sysNoticeUser.setTenantId(tenantId);
+      sysNoticeUser.setReadStatus(FastIotConstants.ReadState.UNREAD);
+      sysNoticeUser.setReceiverId(userId);
+      sysNoticeUserList.add(sysNoticeUser);
+    });
+    insertBatch(sysNoticeUserList,sysNoticeUserList.size());
+  }
+
+  @Override
+  public List<String> getSysNoticeUserIdsByNoticeId(String noticeId) {
+    if (StringUtils.isAllEmpty(noticeId)) {
+      throw new YtDataValidationException(ErrorMessage.INTERNAL_ERROR.name());
+    }
+    return baseMapper
+        .selectList(
+            new LambdaQueryWrapper<SysNoticeUser>().eq(SysNoticeUser::getNoticeId, noticeId))
+        .stream()
+        .map(SysNoticeUser::getId)
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public boolean updateSysNoticeUsersStatusByNoticeId(String id, String status) {
+    if (StringUtils.isAllEmpty(id) || StringUtils.isAllEmpty(status)) {
+      throw new YtDataValidationException(ErrorMessage.INTERNAL_ERROR.name());
+    }
+    return baseMapper.updateSysNoticeUsersStatusByNoticeId(id, status);
+  }
+
   private YtPageData<SysNoticeUserDTO> getPage(Map<String, Object> queryMap) {
     IPage<SysNoticeUser> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, true);
     IPage<SysNoticeUserDTO> pageDto = baseMapper.page(page, queryMap);

@@ -47,6 +47,7 @@ public class UserOrganizationMappingServiceImpl implements UserOrganizationMappi
               new LambdaQueryWrapper<UserOrganizationMapping>()
                   .in(UserOrganizationMapping::getOrganizationId, collect))
           .stream()
+          .distinct()
           .map(UserOrganizationMapping::getUserId)
           .collect(Collectors.toList());
     }

@@ -29,4 +29,6 @@ public interface SysNoticeUserMapper extends BaseMapper<SysNoticeUser> {
    * @return
    */
   SysNoticeUserDTO get(@Param("id") String id, @Param("tenantId") String tenantId);
+
+  boolean updateSysNoticeUsersStatusByNoticeId(@Param("noticeId")String noticeId, @Param("status")String status);
 }

@@ -3,6 +3,7 @@ package org.thingsboard.server.dao.yunteng.service;
 import org.thingsboard.server.common.data.yunteng.dto.SysNoticeUserDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -13,7 +14,15 @@ import java.util.Map;
 public interface SysNoticeUserService {
     YtPageData<SysNoticeUserDTO> page(Map<String, Object> queryMap);
 
+    YtPageData<SysNoticeUserDTO> pageByNoticeId(Map<String, Object> queryMap);
+
     YtPageData<SysNoticeUserDTO> read(Map<String, Object> queryMap, String currentUserId);
 
     SysNoticeUserDTO get(String id,String tenantId);
+
+    void saveSysNoticeUser (List<String> userIds, String tenantId,String noticeId,String status);
+
+    List<String> getSysNoticeUserIdsByNoticeId(String noticeId);
+
+    boolean updateSysNoticeUsersStatusByNoticeId(String noticeId, String status);
 }

@@ -8,7 +8,6 @@
         <result property="title" column="title"/>
         <result property="content" column="content"/>
         <result property="receiverType" column="receiver_type"/>
-        <result property="receiverTypeIds" column="receiver_type_ids"/>
         <result property="status" column="status"/>
         <result property="senderName" column="sender_name"/>
         <result property="senderDate" column="sender_date"/>
@@ -36,7 +35,6 @@
         <include refid="dict"/>
         AND sd.dict_code = 'receiver_type' AND sdi.item_value = sn.receiver_type
         ) receiver_type,
-        sn.receiver_type_ids receiver_type_ids,
         (
         <include refid="dict"/>
         AND sd.dict_code = 'draft_status' AND sdi.item_value = sn.status

@@ -13,7 +13,13 @@
         <result property="updateTime" column="update_time"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="id" column="id"/>
-        <association property="sysNotice" javaType="org.thingsboard.server.common.data.yunteng.dto.SysNoticeDTO">
+        <association property="user" column="receiver_id"
+                     javaType="org.thingsboard.server.common.data.yunteng.dto.UserDTO">
+            <result property="realName" column="real_name"/>
+        </association>
+        <association property="sysNotice" column="notice_id"
+                     javaType="org.thingsboard.server.common.data.yunteng.dto.SysNoticeDTO">
+            <result property="id" column="id"/>
             <result property="type" column="type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
             <result property="senderName" column="sender_name"/>
             <result property="senderDate" column="sender_date"/>
@@ -36,13 +42,16 @@
                snu.updater     updater,
                snu.create_time create_time,
                snu.update_time update_time,
-               snu.tenant_id tenant_id,
+               snu.tenant_id   tenant_id,
+               su.real_name    real_name,
                snu.id          id,
                sn.type AS      type,
                sn.sender_name  sender_name,
-               sn.sender_date  sender_date
+               sn.sender_date  sender_date,
+               sn.id   AS      id
         FROM sys_notice_user snu
                  LEFT JOIN sys_notice sn ON sn.id = snu.notice_id
+                 LEFT JOIN sys_user su ON snu.receiver_id = su.id
     </sql>
     <select id="page" resultMap="sysNoticeUser">
         <include refid="columns"/>
@@ -54,6 +63,12 @@
         <if test="queryMap.creator != null">
             AND sn.creator = #{queryMap.creator}
         </if>
+        <if test="queryMap.receiverId != null">
+            AND snu.receiver_id = #{queryMap.receiverId}
+        </if>
+        <if test="queryMap.noticeId != null">
+            AND snu.notice_id = #{queryMap.noticeId}
+        </if>
     </select>
     <select id="get" resultMap="sysNoticeUser">
         <include refid="columns"/>
@@ -61,4 +76,9 @@
         snu.tenant_id = #{tenantId}
         AND snu.id = #{id}
     </select>
+    <update id="updateSysNoticeUsersStatusByNoticeId">
+        UPDATE sys_notice_user
+        SET status =#{status}
+        WHERE notice_id = #{noticeId}
+    </update>
 </mapper>