多人饮食超时定时器

bbfdc13f · Future · 451bc9c9 · bbfdc13f · bbfdc13f · bbfdc13f
Commit bbfdc13f authored Mar 28, 2022 by Future
10 changed files
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -31,6 +31,11 @@
            <groupId>io.geekidea.springbootplus</groupId>
            <artifactId>core</artifactId>
        </dependency>
+        <dependency>
+            <groupId>io.geekidea.springbootplus</groupId>
+            <artifactId>scheduled</artifactId>
+        </dependency>
    </dependencies>
    <build>

--- a/core/src/main/java/com/wecloud/im/service/ImMultiRtcRoomMemberService.java
+++ b/core/src/main/java/com/wecloud/im/service/ImMultiRtcRoomMemberService.java
@@ -17,6 +17,6 @@ public interface ImMultiRtcRoomMemberService extends BaseService<ImMultiRtcRoomM
     * @param roomId
     * @param state
     */
-    void changeRoomMemberState(ImClient currentClient, String roomId, Integer state);
+    void changeRoomMemberState(Long fkClientId, String roomId, Integer state);
 }
--- a/core/src/main/java/com/wecloud/im/service/impl/ImMultiRtcRoomMemberServiceImpl.java
+++ b/core/src/main/java/com/wecloud/im/service/impl/ImMultiRtcRoomMemberServiceImpl.java
@@ -23,10 +23,10 @@ public class ImMultiRtcRoomMemberServiceImpl extends BaseServiceImpl<ImMultiRtcR
    private ImMultiRtcRoomMemberMapper imMultiRtcRoomMemberMapper;
    @Override
-    public void changeRoomMemberState(ImClient currentClient, String roomId, Integer state) {
+    public void changeRoomMemberState(Long fkClientId, String roomId, Integer state) {
        this.update(new UpdateWrapper<ImMultiRtcRoomMember>().lambda()
                .eq(ImMultiRtcRoomMember::getRoomId, roomId)
-                .eq(ImMultiRtcRoomMember::getFkClientId, currentClient.getId())
+                .eq(ImMultiRtcRoomMember::getFkClientId, fkClientId)
                .set(ImMultiRtcRoomMember::getState, state));
    }
 }
--- a/core/src/main/java/com/wecloud/multimeet/service/MultiMeetService.java
+++ b/core/src/main/java/com/wecloud/multimeet/service/MultiMeetService.java
@@ -44,4 +44,9 @@ public interface MultiMeetService {
     */
    void notAnswered(NotAnsweredMultiMeetParam param);
+    /**
+     * 呼叫超时逻辑处理
+     */
+    void callingTimeout();
 }
--- a/core/src/main/java/com/wecloud/multimeet/service/impl/MultiMeetServiceImpl.java
+++ b/core/src/main/java/com/wecloud/multimeet/service/impl/MultiMeetServiceImpl.java
@@ -27,6 +27,8 @@ import com.wecloud.multimeet.service.WsMultiMeetWrite;
 import com.wecloud.utils.SnowflakeUtil;
 import io.geekidea.springbootplus.framework.common.exception.BusinessException;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -101,20 +103,28 @@ public class MultiMeetServiceImpl implements MultiMeetService {
                continue;
            }
            // 占线 通知邀请方
-            ImMultiRtcRoomMember rtcRoomMember = imMultiRtcRoomMemberService.getOne(new QueryWrapper<ImMultiRtcRoomMember>().lambda()
+            ImMultiRtcRoomMember busyMember = imMultiRtcRoomMemberService.getOne(new QueryWrapper<ImMultiRtcRoomMember>().lambda()
                    .eq(ImMultiRtcRoomMember::getClientId, toClientId)
                    .in(ImMultiRtcRoomMember::getState, Lists.newArrayList(MultiRtcMemberStateEnum.ANSWERED.getCode(), MultiRtcMemberStateEnum.CALLING.getCode())));
-            if (rtcRoomMember != null && Lists.newArrayList(MultiRtcMemberStateEnum.ANSWERED.getCode(), MultiRtcMemberStateEnum.CALLING.getCode()).contains(rtcRoomMember.getState())) {
+            if (busyMember != null && Lists.newArrayList(MultiRtcMemberStateEnum.ANSWERED.getCode(), MultiRtcMemberStateEnum.CALLING.getCode()).contains(busyMember.getState())) {
                MultiMeetBusyResponse multiMeetBusyResponse = new MultiMeetBusyResponse();
                multiMeetBusyResponse.setConversationId(param.getConversationId());
                multiMeetBusyResponse.setRoomId(param.getRoomId());
                multiMeetBusyResponse.setClientId(currentClient.getClientId());
-                multiMeetBusyResponse.setBusyClientId(rtcRoomMember.getClientId());
+                multiMeetBusyResponse.setBusyClientId(busyMember.getClientId());
                multiMeetBusyResponse.setTimestamp(System.currentTimeMillis());
                wsMultiMeetWrite.busy(multiMeetBusyResponse, currentClient.getId());
                continue;
            }
+            ImMultiRtcRoomMember rtcRoomMember = imMultiRtcRoomMemberService.getOne(new QueryWrapper<ImMultiRtcRoomMember>().lambda()
+                    .eq(ImMultiRtcRoomMember::getClientId, toClientId)
+                    .eq(ImMultiRtcRoomMember::getRoomId, param.getRoomId()));
+            if (rtcRoomMember != null) {
+                // 该房间已邀请过一次，再次发起邀请
+                rtcRoomMember.setState(MultiRtcMemberStateEnum.CALLING.getCode());
+                imMultiRtcRoomMemberService.updateById(rtcRoomMember);
+                continue;
+            }
            ImMultiRtcRoomMember roomMember = new ImMultiRtcRoomMember();
            roomMember.setId(SnowflakeUtil.getId());
            roomMember.setFkRtcRoomId(rtcRoom.getId());
@@ -125,7 +135,6 @@ public class MultiMeetServiceImpl implements MultiMeetService {
            roomMember.setCreateTime(new Date());
            roomMember.setUpdateTime(new Date());
            roomMembersToSave.add(roomMember);
            RoomMemberDto roomMemberDto = new RoomMemberDto();
            roomMemberDto.setFkClientId(toClient.getId());
            roomMemberDto.setClientId(toClient.getClientId());
@@ -161,7 +170,7 @@ public class MultiMeetServiceImpl implements MultiMeetService {
    @Override
    public void reject(RejectToMultiMeetParam param) {
        ImClient currentClient = imClientService.getCurrentClient();
-        imMultiRtcRoomMemberService.changeRoomMemberState(currentClient, param.getRoomId(), MultiRtcMemberStateEnum.REJECTED.getCode());
+        imMultiRtcRoomMemberService.changeRoomMemberState(currentClient.getId(), param.getRoomId(), MultiRtcMemberStateEnum.REJECTED.getCode());
        List<ImMultiRtcRoomMember> rtcRoomMemberList = imMultiRtcRoomMemberService.list(
                new QueryWrapper<ImMultiRtcRoomMember>().lambda()
                        .eq(ImMultiRtcRoomMember::getRoomId, param.getRoomId())
@@ -198,7 +207,7 @@ public class MultiMeetServiceImpl implements MultiMeetService {
            imMultiRtcRoomService.deleteMultiRtcRoomCache(currentClient.getFkAppid(), param.getRoomId());
            imMultiRtcRoomService.updateMultiRtcRoomState(param.getRoomId(), MultiRtcRoomStateEnum.MEETING.getCode());
        }
-        imMultiRtcRoomMemberService.changeRoomMemberState(currentClient, param.getRoomId(), MultiRtcMemberStateEnum.ANSWERED.getCode());
+        imMultiRtcRoomMemberService.changeRoomMemberState(currentClient.getId(), param.getRoomId(), MultiRtcMemberStateEnum.ANSWERED.getCode());
        List<ImMultiRtcRoomMember> rtcRoomMemberList = imMultiRtcRoomMemberService.list(
                new QueryWrapper<ImMultiRtcRoomMember>().lambda()
                        .eq(ImMultiRtcRoomMember::getRoomId, param.getRoomId())
@@ -226,7 +235,7 @@ public class MultiMeetServiceImpl implements MultiMeetService {
    @Override
    public void leave(LeaveFromMultiMeetParam param) {
        ImClient currentClient = imClientService.getCurrentClient();
-        imMultiRtcRoomMemberService.changeRoomMemberState(currentClient, param.getRoomId(), MultiRtcMemberStateEnum.LEAVE.getCode());
+        imMultiRtcRoomMemberService.changeRoomMemberState(currentClient.getId(), param.getRoomId(), MultiRtcMemberStateEnum.LEAVE.getCode());
        List<ImMultiRtcRoomMember> rtcRoomMemberList = imMultiRtcRoomMemberService.list(
                new QueryWrapper<ImMultiRtcRoomMember>().lambda()
                        .eq(ImMultiRtcRoomMember::getRoomId, param.getRoomId())
@@ -253,7 +262,26 @@ public class MultiMeetServiceImpl implements MultiMeetService {
    @Override
    public void notAnswered(NotAnsweredMultiMeetParam param) {
        ImClient currentClient = imClientService.getCurrentClient();
-        imMultiRtcRoomMemberService.changeRoomMemberState(currentClient, param.getRoomId(), MultiRtcMemberStateEnum.NOT_ANSWERED.getCode());
+        imMultiRtcRoomMemberService.changeRoomMemberState(currentClient.getId(), param.getRoomId(), MultiRtcMemberStateEnum.NOT_ANSWERED.getCode());
+    }
+    @Override
+    public void callingTimeout() {
+        // 10 秒之前的时间
+        Date tenSecondsBefore = DateUtils.addSeconds(new Date(), -10);
+        // 获取呼叫时间为10秒之前 并且状态为呼叫中的会议成员
+        List<ImMultiRtcRoomMember> rtcRoomMemberList = imMultiRtcRoomMemberService.list(
+                new QueryWrapper<ImMultiRtcRoomMember>().lambda()
+                        .eq(ImMultiRtcRoomMember::getCallTime, tenSecondsBefore)
+                        .eq(ImMultiRtcRoomMember::getState, MultiRtcMemberStateEnum.CALLING.getCode())
+        );
+        if (CollectionUtils.isEmpty(rtcRoomMemberList)) {
+            return;
+        }
+        for (ImMultiRtcRoomMember roomMember : rtcRoomMemberList) {
+            roomMember.setState(MultiRtcMemberStateEnum.NOT_ANSWERED.getCode());
+        }
+        imMultiRtcRoomMemberService.updateBatchById(rtcRoomMemberList);
    }
 }
--- a/docs/db/feature-cluster增量.sql
+++ b/docs/db/feature-cluster增量.sql
 -- 在feature-cluster 2021年12月22日之后，需要执行的的sql增量脚本
@@ -146,6 +146,7 @@ CREATE TABLE `im_multi_rtc_room_member`
    PRIMARY KEY (`id`) USING BTREE,
    KEY `idx_fk_rtc_room_id` (`fk_rtc_room_id`) USING BTREE,
    KEY `idx_room_id` (`room_id`) USING BTREE,
+    KEY `idx_call_time_state` (`call_time`, `state`) USING BTREE,
    KEY `idx_client_id` (`client_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='多人音视频房间成员表';

--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@
        <module>generator</module>
        <module>core</module>
        <module>client</module>
+        <module>scheduled</module>
        <!--        <module>api-app</module>-->
        <!--        <module>distribution</module>-->
        <!--        <module>admin</module>-->

--- a/scheduled/pom.xml
+++ b/scheduled/pom.xml
@@ -15,10 +15,12 @@
    <description>任务调度JOB模块</description>
    <dependencies>
-        <!--        <dependency>-->
-        <!--            <groupId>io.geekidea.springbootplus</groupId>-->
+        <dependency>
-        <!--            <artifactId>example</artifactId>-->
+            <groupId>io.geekidea.springbootplus</groupId>
-        <!--        </dependency>-->
+            <artifactId>core</artifactId>
+        </dependency>
    </dependencies>
 </project>
--- a/scheduled/src/main/java/io/geekidea/springbootplus/scheduled/HelloScheduled.java
+++ b/scheduled/src/main/java/io/geekidea/springbootplus/scheduled/HelloScheduled.java
@@ -31,7 +31,7 @@ public class HelloScheduled {
    /**
     * 每小时执行一次
     */
-    @Scheduled(cron = "0 0 0/1 * * ? ")
+//    @Scheduled(cron = "*/5 * * * * ? ")
    public void hello() throws Exception {
        log.info("HelloScheduled...");
    }

--- a/scheduled/src/main/java/io/geekidea/springbootplus/scheduled/MultiMeetScheduled.java
+++ b/scheduled/src/main/java/io/geekidea/springbootplus/scheduled/MultiMeetScheduled.java
+package io.geekidea.springbootplus.scheduled;
+import com.wecloud.multimeet.service.MultiMeetService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+/**
+ * @Author wenzhida
+ * @Date 2022/3/28 16:34
+ * @Description 多人音视频相关定时器
+ */
+@Slf4j
+@Component
+public class MultiMeetScheduled {
+    @Autowired
+    private MultiMeetService multiMeetService;
+    /**
+     * 呼叫超时处理
+     * 每5秒执行一次
+     */
+    @Scheduled(cron = "*/5 * * * * ?")
+    public void callingTimeout() {
+        log.info("呼叫超时处理开始...");
+        multiMeetService.callingTimeout();
+        log.info("呼叫超时处理结束...");
+    }
+}