diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserCallController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserCallController.java index c9fe981b..b223298b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserCallController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserCallController.java @@ -8,6 +8,7 @@ import com.ruoyi.cai.domain.UserCall; import com.ruoyi.cai.dto.admin.vo.UserCallAdminVo; import com.ruoyi.cai.service.UserCallService; import com.ruoyi.cai.service.UserService; +import com.ruoyi.cai.trd.Agora; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; @@ -16,6 +17,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.BeanConvertUtil; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -37,6 +39,15 @@ public class UserCallController extends BaseController { private final UserCallService userCallService; private final UserService userService; + @Autowired + private Agora agora; + + @SaCheckPermission("cai:userCall:list") + @GetMapping("/closeChannel") + public R closeChannel(Long roomId){ + agora.closeChannel(roomId); + return R.ok(); + } /** * 查询通话记录列表 diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/RoomService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/RoomService.java index 5bbf5ced..114b3c7e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/RoomService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/RoomService.java @@ -142,7 +142,6 @@ public class RoomService { return roomData.getHangupTime() - roomData.getBeginTime(); } return DateUtil.currentSeconds() - beginTime; - } public Long canCallTime(Room room) {