删除会议时把收藏也给删除了

Author: heavyrian2012

src/main/java/cn/wildfirechat/app/conference/ConferenceCleanupService.java

@@ -2,6 +2,7 @@
 
 import cn.wildfirechat.app.jpa.ConferenceEntity;
 import cn.wildfirechat.app.jpa.ConferenceEntityRepository;
+import cn.wildfirechat.app.jpa.UserConferenceRepository;
 import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.sdk.ConferenceAdmin;
 import cn.wildfirechat.sdk.model.IMResult;
@@ -24,6 +25,9 @@ public class ConferenceCleanupService {
     @Autowired
     private ConferenceServiceImpl conferenceServiceImpl;
 
+    @Autowired
+    private UserConferenceRepository userConferenceRepository;
+
     /**
      * 每5分钟检查一次过期会议，并调用SDK销毁
      */
@@ -53,6 +57,10 @@ public void cleanupExpiredConferences() {
 
                 // 记录会议结束并更新使用量（使用计划的endTime作为实际结束时间）
                 conferenceServiceImpl.endConferenceAndUpdateUsage(conference.id, conference.endTime);
+
+                // 删除该会议的所有收藏记录
+                userConferenceRepository.deleteByConferenceId(conference.id);
+                LOG.info("已删除会议的收藏记录: {}", conference.id);
 
                 // 从数据库删除会议记录
                 conferenceEntityRepository.delete(conference);

src/main/java/cn/wildfirechat/app/conference/ConferenceServiceImpl.java

@@ -231,6 +231,10 @@ public RestResult destroyConference(String conferenceId) {
             long actualEndTime = System.currentTimeMillis() / 1000;
             // 记录会议结束，更新使用时长
             endConferenceAndUpdateUsage(conferenceId, actualEndTime);
+
+            // 删除该会议的所有收藏记录
+            userConferenceRepository.deleteByConferenceId(conferenceId);
+            LOG.info("已删除会议的收藏记录: conferenceId={}", conferenceId);
 
             conferenceEntityRepository.deleteById(conferenceId);
             LOG.info("会议已从数据库删除: conferenceId={}", conferenceId);

src/main/java/cn/wildfirechat/app/jpa/UserConferenceRepository.java

@@ -17,6 +17,11 @@ public interface UserConferenceRepository extends PagingAndSortingRepository<Use
     @Query(value = "delete from user_conference where user_id = ?1 and conference_id = ?2", nativeQuery = true)
     void deleteByUserIdAndConferenceId(String userId, String conferenceId);
 
+    @Transactional
+    @Modifying
+    @Query(value = "delete from user_conference where conference_id = ?1", nativeQuery = true)
+    void deleteByConferenceId(String conferenceId);
+
     @Query(value = "select c.* from user_conference uc, conference c where uc.user_id = ?1 and uc.conference_id = c.id and (c.end_time = 0 or c.end_time > ?2) order by c.id desc", nativeQuery = true)
     List<ConferenceDTO> findByUserId(String userId, long now);