Merge branch 'localhost-cxy' into 'master'

fix: 修改通知删除,相应的我的通知消息也一并删除

See merge request huang/thingsboard3.3.2!19

@@ -34,7 +34,7 @@ public class SysNoticeDTO extends TenantDTO {
   private String receiverType;
   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;
+  private String pointId;
 
 
   @ApiModelProperty(value = "发送状态（字典值draft_status）  0：草稿  1：已发布")
   @ApiModelProperty(value = "发送状态（字典值draft_status）  0：草稿  1：已发布")
   private String status;
   private String status;

@@ -7,6 +7,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum;
 
 
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.util.List;
 
 
 /**
 /**
  * @author: 徐浩然
  * @author: 徐浩然
@@ -25,12 +26,14 @@ public class SysNotice extends TenantBaseEntity {
   private String title;
   private String title;
   /** 内容 */
   /** 内容 */
   private String content;
   private String content;
-  /** 接收者（字典值receiver_type）  0：全部  1：组织  2：部门  3：个人 */
+  /** 接收者（字典值receiver_type） 0：全部 1：组织 2：部门 3：个人 */
   private String receiverType;
   private String receiverType;
-  /** 发送状态（字典值draft_status）  0：草稿  1：已发布 */
+  /** 发送状态（字典值draft_status） 0：草稿 1：已发布 */
   private String status;
   private String status;
   /** 发送者 */
   /** 发送者 */
   private String senderName;
   private String senderName;
   /** 发送时间 */
   /** 发送时间 */
   private LocalDateTime senderDate;
   private LocalDateTime senderDate;
+  /** 组织id */
+  private String pointId;
 }
 }

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
@@ -22,9 +23,7 @@ import org.thingsboard.server.dao.yunteng.service.SysNoticeUserService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 
 
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 /**
 /**
@@ -56,7 +55,10 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
   }
   }
 
 
   @Override
   @Override
+  @Transactional
   public boolean delete(Set<String> ids, String tenantId) {
   public boolean delete(Set<String> ids, String tenantId) {
+    //删除前先删除通知用户
+    sysNoticeUserService.deleteNoticUserByNoticeId(new ArrayList<>(ids));
     return baseMapper.delete(
     return baseMapper.delete(
             new LambdaQueryWrapper<SysNotice>()
             new LambdaQueryWrapper<SysNotice>()
                 .in(SysNotice::getId, ids)
                 .in(SysNotice::getId, ids)
@@ -65,16 +67,17 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
   }
   }
 
 
   @Override
   @Override
+  @Transactional
   public SysNoticeDTO save(SysNoticeDTO sysNoticeDTO, String tenantId) {
   public SysNoticeDTO save(SysNoticeDTO sysNoticeDTO, String tenantId) {
     SysNotice sysNotice = sysNoticeDTO.getEntity(SysNotice.class);
     SysNotice sysNotice = sysNoticeDTO.getEntity(SysNotice.class);
     // 设置为草稿
     // 设置为草稿
     sysNotice.setTenantId(tenantId);
     sysNotice.setTenantId(tenantId);
+    // 接收者字典值判断
     if (sysNoticeDTO.getReceiverType() == null
     if (sysNoticeDTO.getReceiverType() == null
         || (!sysNoticeDTO.getReceiverType().equals(FastIotConstants.ReceiverType.ALL)
         || (!sysNoticeDTO.getReceiverType().equals(FastIotConstants.ReceiverType.ALL)
-            && sysNoticeDTO.getPointId() == null)) {
+            && StringUtils.isEmpty(sysNoticeDTO.getPointId()))) {
       throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.name());
       throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.name());
     }
     }
-
     List<String> userList;
     List<String> userList;
     switch (sysNotice.getReceiverType()) {
     switch (sysNotice.getReceiverType()) {
       case FastIotConstants.ReceiverType.ALL:
       case FastIotConstants.ReceiverType.ALL:
@@ -90,13 +93,14 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
         break;
         break;
       case FastIotConstants.ReceiverType.ORGANIZATION:
       case FastIotConstants.ReceiverType.ORGANIZATION:
         // 判断传入的集合id是否为空
         // 判断传入的集合id是否为空
-        if (sysNoticeDTO.getPointId() == null || sysNoticeDTO.getPointId().size() == 0) {
+        if (StringUtils.isEmpty(sysNoticeDTO.getPointId())) {
           throw new EntityCreationException(ErrorMessage.GET_CURRENT_USER_EXCEPTION.name());
           throw new EntityCreationException(ErrorMessage.GET_CURRENT_USER_EXCEPTION.name());
         }
         }
         // 获取当前组织下的所有用户
         // 获取当前组织下的所有用户
+        //把拿到的数据用,分割成数组
         userList =
         userList =
             userOrganizationMappingService.getUserIdByOrganizationIds(
             userOrganizationMappingService.getUserIdByOrganizationIds(
-                tenantId, sysNoticeDTO.getPointId().toArray(String[]::new));
+                tenantId, sysNoticeDTO.getPointId().split(","));
         break;
         break;
       default:
       default:
         throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.name());
         throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.name());
@@ -104,6 +108,7 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
     if (userList.isEmpty()) {
     if (userList.isEmpty()) {
       throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.name());
       throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.name());
     }
     }
+    //sysNotice.setPointId(String.join(",", sysNoticeDTO.getPointId()));
     // 如果为空,则新增
     // 如果为空,则新增
     if (sysNotice.getId() == null) {
     if (sysNotice.getId() == null) {
       baseMapper.insert(sysNotice);
       baseMapper.insert(sysNotice);

@@ -71,16 +71,17 @@ public class SysNoticeUserServiceImpl
   public void saveSysNoticeUser(
   public void saveSysNoticeUser(
       List<String> userIds, String tenantId, String noticeId, String status) {
       List<String> userIds, String tenantId, String noticeId, String status) {
     List<SysNoticeUser> sysNoticeUserList = new ArrayList<>();
     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());
+    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
   @Override
@@ -104,6 +105,14 @@ public class SysNoticeUserServiceImpl
     return baseMapper.updateSysNoticeUsersStatusByNoticeId(id, status);
     return baseMapper.updateSysNoticeUsersStatusByNoticeId(id, status);
   }
   }
 
 
+  @Override
+  public boolean deleteNoticUserByNoticeId(List<String> noticeId) {
+
+    return baseMapper.delete(
+            new LambdaQueryWrapper<SysNoticeUser>().in(SysNoticeUser::getNoticeId, noticeId))
+        > 0;
+  }
+
   private YtPageData<SysNoticeUserDTO> getPage(Map<String, Object> queryMap) {
   private YtPageData<SysNoticeUserDTO> getPage(Map<String, Object> queryMap) {
     IPage<SysNoticeUser> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, true);
     IPage<SysNoticeUser> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, true);
     IPage<SysNoticeUserDTO> pageDto = baseMapper.page(page, queryMap);
     IPage<SysNoticeUserDTO> pageDto = baseMapper.page(page, queryMap);

@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.validation.annotation.Validated;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SysNoticeDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SysNoticeDTO;
 import org.thingsboard.server.dao.yunteng.entities.SysNotice;
 import org.thingsboard.server.dao.yunteng.entities.SysNotice;
 
 
 import java.util.Map;
 import java.util.Map;
+import java.util.Set;
 
 
 /**
 /**
  * @author: 徐浩然
  * @author: 徐浩然
@@ -28,4 +31,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
    * @return 消息详情
    * @return 消息详情
    */
    */
   SysNoticeDTO get(@Param("id") String id, @Param("tenantId") String tenantId);
   SysNoticeDTO get(@Param("id") String id, @Param("tenantId") String tenantId);
+
+
+
 }
 }

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

@@ -25,4 +25,6 @@ public interface SysNoticeUserService {
     List<String> getSysNoticeUserIdsByNoticeId(String noticeId);
     List<String> getSysNoticeUserIdsByNoticeId(String noticeId);
 
 
     boolean updateSysNoticeUsersStatusByNoticeId(String noticeId, String status);
     boolean updateSysNoticeUsersStatusByNoticeId(String noticeId, String status);
+
+    boolean deleteNoticUserByNoticeId(List<String> noticeId);
 }
 }

@@ -16,6 +16,7 @@
         <result property="createTime" column="create_time"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="tenantId" column="tenant_id"/>
+        <result property="pointId" column="point_id"/>
     </resultMap>
     </resultMap>
 
 
     <sql id="dict">
     <sql id="dict">
@@ -45,7 +46,8 @@
         sn.updater updater,
         sn.updater updater,
         sn.create_time create_time,
         sn.create_time create_time,
         sn.update_time update_time,
         sn.update_time update_time,
-        sn.tenant_id tenant_id
+        sn.tenant_id tenant_id,
+        sn.point_id  point_id
         FROM sys_notice sn
         FROM sys_notice sn
     </sql>
     </sql>
     <select id="page" resultMap="sysNotice">
     <select id="page" resultMap="sysNotice">
@@ -62,4 +64,5 @@
         sn.tenant_id = #{tenantId}
         sn.tenant_id = #{tenantId}
         AND sn.id = #{id}
         AND sn.id = #{id}
     </select>
     </select>
+
 </mapper>
 </mapper>