rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: bug-528 app端添加管理功能 

调整视频通话逻辑
This commit is contained in:
曹鹏飞 2025-08-07 18:46:38 +08:00
parent 3502560143
commit c6328d251d
10 changed files with 72 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TestController.java
View File

@ -49,10 +49,10 @@ public class TestController extends ControllerBase{
}
}
@GetMapping("test")
public ApiResult<Boolean> test(@RequestParam Integer userId){
return ApiResult.success(ticketCallService.isInCall(userId));
}
// @GetMapping("test")
// public ApiResult<Boolean> test(@RequestParam Integer userId){
// return ApiResult.success(ticketCallService.isInCall(userId));
// }
/**
* 翻译为日语

22
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
View File

@ -1256,7 +1256,6 @@ public class TicketController extends ControllerBase {
VUtils.trueThrowBusinessError(!Objects.equals(ticket.getUserId(), AdminUserUtil.getUserId()) && !Objects.equals(AdminUserUtil.getUserId(), handlerUserId))
.throwMessage("无权限呼叫");
}
VUtils.trueThrowBusinessError(ticketCallService.isInCall(ticket.getUserId())).throwMessage("对方正在通话中");
boolean userIdCreate = StrUtil.equals(ticket.getUserPlatform(), Constant.FROM_ADMIN) && Objects.equals(ticket.getUserId(), AdminUserUtil.getUserId());
Integer sendUserId = 0, receiveUserId = 0;
String sendUserFrom, receiveUserFrom;
@ -1271,6 +1270,7 @@ public class TicketController extends ControllerBase {
sendUserFrom = Constant.FROM_ADMIN;
receiveUserFrom = Constant.FROM_APP;
}
VUtils.trueThrowBusinessError(ticketCallJoinService.isInCall(ticket.getId(), receiveUserFrom, receiveUserId)).throwMessage("对方正在通话中");
ticketCallService.add(ticketId, sendUserId, sendUserFrom, receiveUserId, receiveUserFrom);
AdminUser adminUser = adminUserService.getById(sendUserId);
uniPushService.send(new UniPushMessage()
@ -1347,7 +1347,7 @@ public class TicketController extends ControllerBase {
VUtils.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("工单不存在");
VUtils.trueThrowBusinessError(!Objects.equals(ticket.getState(), TicketState.Processing.getState()))
.throwMessage("当前工单状态不允许请求通话");
VUtils.trueThrowBusinessError(ticketCallService.isInCall(AdminUserUtil.getUserId()))
VUtils.trueThrowBusinessError(ticketCallJoinService.isInCall(ticket.getId(), Constant.FROM_ADMIN, AdminUserUtil.getUserId()))
.throwMessage("您已加入别的通话中");
ticketCallJoinService.join(ticketId, AdminUserUtil.getUserId(),Constant.FROM_ADMIN);
ssePushService.sendTicketCallJoinedToAdmin(AdminUserUtil.getUserId(), ticketId);
@ -1374,13 +1374,8 @@ public class TicketController extends ControllerBase {
*/
@PostMapping("call/hangUp")
public ApiResult<Void> hangUp(@Valid @RequestBody TicketCallHangUpRequest request) {
TicketCall ticketCall = ticketCallService.lambdaQuery()
.eq(TicketCall::getTicketId, request.getTicketId())
.ne(TicketCall::getState, 2)
.last("limit 1")
.one();
TicketCall ticketCall = ticketCallService.getLast(request.getTicketId());
if (Objects.isNull(ticketCall)) return ApiResult.success();
boolean flag=false;
if (request.getReject()) {
AdminUser adminUser = adminUserService.getById(AdminUserUtil.getUserId());
if (StrUtil.equals(request.getFrom(), "app")) {
@ -1401,7 +1396,6 @@ public class TicketController extends ControllerBase {
)
);
ssePushService.sendTicketCallHangUpToApp(request.getTicketId(), request.getFromUserId(), adminUser);
flag=ticketCallJoinService.hangUp(request.getTicketId(), AdminUserUtil.getUserId(), Constant.FROM_ADMIN, true);
}else if (StrUtil.equals(request.getFrom(), "admin")) {
if (Objects.equals(request.getFromUserId(), AdminUserUtil.getUserId())){
Ticket ticket = ticketService.getById(request.getTicketId());
@ -1423,7 +1417,6 @@ public class TicketController extends ControllerBase {
)
);
ssePushService.sendTicketCallCancelToAdmin(request.getTicketId(), handlerId, adminUser);
flag=ticketCallService.hangUp(request.getTicketId(), AdminUserUtil.getUserId(), Constant.FROM_ADMIN, true);
}else {
uniPushService.send(new UniPushMessage()
.setSenderId("admin-uid-" + adminUser.getId())
@ -1442,17 +1435,10 @@ public class TicketController extends ControllerBase {
)
);
ssePushService.sendTicketCallHangUpToAdmin(request.getTicketId(), request.getFromUserId(), adminUser);
flag=ticketCallJoinService.hangUp(ticketCall.getId(), AdminUserUtil.getUserId(), Constant.FROM_ADMIN, true);
}
}
}else {
if (StrUtil.equals(request.getFrom(), "app") || Objects.equals(request.getFromUserId(), AdminUserUtil.getUserId())) {
flag=ticketCallService.hangUp(request.getTicketId(), AdminUserUtil.getUserId(), Constant.FROM_ADMIN, false);
}else {
flag=ticketCallJoinService.hangUp(ticketCall.getId(), AdminUserUtil.getUserId(), Constant.FROM_ADMIN, false);
}
}
if (flag){
if (ticketCallJoinService.hangUp(ticketCall.getId(), AdminUserUtil.getUserId(), Constant.FROM_ADMIN, request.getReject())) {
ticketEventPublisher.publishTicketCallEndEvent(request.getTicketId());
}
return ApiResult.success();

12
nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java
View File

@ -504,7 +504,7 @@ public class TicketController extends ControllerBase {
VUtils.trueThrowBusinessError(!Objects.equals(AppUserUtil.getUserId(), ticket.getUserId()))
.throwMessage("不是工单创建人无权限呼叫");
Integer handlerUserId = Arrays.stream(ticket.getHandle().split(",")).map(Integer::parseInt).findFirst().get();
VUtils.trueThrowBusinessError(ticketCallService.isInCall(handlerUserId)).throwMessage("对方正在通话中");
VUtils.trueThrowBusinessError(ticketCallJoinService.isInCall(ticket.getId(), Constant.FROM_ADMIN, handlerUserId)).throwMessage("对方正在通话中");
AppUser appUser = appUserService.getById(ticket.getUserId());
uniPushService.send(new UniPushMessage()
.setSenderId(ticket.getUserPlatform()+"-uid-" + ticket.getUserId())
@ -541,7 +541,7 @@ public class TicketController extends ControllerBase {
VUtils.trueThrowBusinessError(!StrUtil.equals(ticket.getUserPlatform(), AppUserUtil.getFrom())
|| !Objects.equals(AppUserUtil.getUserId(), ticket.getUserId()))
.throwMessage("不是创建人无法加入通话");
VUtils.trueThrowBusinessError(ticketCallService.isInCall(AppUserUtil.getUserId()))
VUtils.trueThrowBusinessError(ticketCallJoinService.isInCall(ticket.getId(), Constant.FROM_APP, AppUserUtil.getUserId()))
.throwMessage("您已加入别的通话中");
ticketCallJoinService.join(ticketId, AppUserUtil.getUserId(), Constant.FROM_APP);
ssePushService.sendTicketCallJoinedToApp(AppUserUtil.getUserId(), ticketId);
@ -615,13 +615,7 @@ public class TicketController extends ControllerBase {
ssePushService.sendTicketCallHangUpToAdmin(request.getTicketId(), request.getFromUserId(), appUser);
}
}
boolean flag;
if (StrUtil.equals(request.getFrom(), Constant.FROM_APP)) {
flag = ticketCallService.hangUp(ticketCall.getId(), AppUserUtil.getUserId(), Constant.FROM_APP, request.getReject());
} else {
flag = ticketCallJoinService.hangUp(ticketCall.getId(), AppUserUtil.getUserId(), Constant.FROM_APP, request.getReject());
}
if (flag) {
if (ticketCallJoinService.hangUp(ticketCall.getId(), AppUserUtil.getUserId(), Constant.FROM_APP, request.getReject())) {
ticketEventPublisher.publishTicketCallEndEvent(request.getTicketId());
}
return ApiResult.success();

21
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketCall.java
View File

@ -1,7 +1,6 @@
package com.nflg.mobilebroken.repository.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
@ -35,16 +34,16 @@ public class TicketCall implements Serializable {
*/
private Integer ticketId;
/**
* 呼叫来源，app或者admin
*/
@TableField("`from`")
private String from;
/**
* 呼叫人id
*/
private Integer callerUserId;
// /**
// * 呼叫来源，app或者admin
// */
// @TableField("`from`")
// private String from;
//
// /**
// * 呼叫人id
// */
// private Integer callerUserId;
/**
* 状态，0-呼叫中；1-通话中；2-已结束

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketCallJoinMapper.java
View File

@ -13,5 +13,5 @@ import com.nflg.mobilebroken.repository.entity.TicketCallJoin;
*/
public interface TicketCallJoinMapper extends BaseMapper<TicketCallJoin> {
boolean isInCall(Integer userId);
boolean isInCall(Integer ticketId, String from, Integer userId);
}

4
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketCallJoinService.java
View File

@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull;
*/
public interface ITicketCallJoinService extends IService<TicketCallJoin> {
boolean isInCall(Integer userId);
boolean isInCall(Integer ticketId, String from, Integer userId);
void join(@Valid @NotNull Integer ticketId, Integer userId, String from);
@ -25,6 +25,4 @@ public interface ITicketCallJoinService extends IService<TicketCallJoin> {
boolean hangUp(Integer callId, Integer userId, String from, boolean reject);
void add(Integer callId, Integer userId, String from);
void hangUpAll(Integer id);
}

4
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketCallService.java
View File

@ -15,11 +15,11 @@ import javax.validation.constraints.NotNull;
*/
public interface ITicketCallService extends IService<TicketCall> {
boolean isInCall(Integer userId);
// boolean isInCall(Integer userId);
void add(Integer ticketId, Integer callerUserId,String callerUserFrom, Integer calledUserId, String calledUserFrom);
boolean hangUp(@NotNull Integer ticketId, Integer userId, String from, boolean reject);
// boolean hangUp(@NotNull Integer ticketId, Integer userId, String from, boolean reject);
TicketCall getLast(@NotNull Integer ticketId);
}

21
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketCallJoinServiceImpl.java
View File

@ -31,8 +31,8 @@ public class TicketCallJoinServiceImpl extends ServiceImpl<TicketCallJoinMapper,
private ITicketCallService ticketCallService;
@Override
public boolean isInCall(Integer userId) {
return baseMapper.isInCall(userId);
public boolean isInCall(Integer ticketId, String from, Integer userId) {
return baseMapper.isInCall(ticketId, from, userId);
}
@Transactional
@ -84,7 +84,14 @@ public class TicketCallJoinServiceImpl extends ServiceImpl<TicketCallJoinMapper,
.set(TicketCallJoin::getState, 2)
.set(reject, TicketCallJoin::getHangupTime, LocalDateTime.now())
.eq(TicketCallJoin::getCallId, callId)
.ne(TicketCallJoin::getFrom, from)
.update();
} else {
lambdaUpdate()
.set(TicketCallJoin::getState, 2)
.set(reject, TicketCallJoin::getHangupTime, LocalDateTime.now())
.eq(TicketCallJoin::getCallId, callId)
.eq(TicketCallJoin::getUserId, userId)
.eq(TicketCallJoin::getFrom, from)
.update();
}
if (!lambdaQuery()
@ -119,12 +126,4 @@ public class TicketCallJoinServiceImpl extends ServiceImpl<TicketCallJoinMapper,
);
}
}
@Override
public void hangUpAll(Integer id) {
lambdaUpdate()
.set(TicketCallJoin::getState, 2)
.eq(TicketCallJoin::getCallId, id)
.update();
}
}

68
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketCallServiceImpl.java
View File

@ -1,8 +1,6 @@
package com.nflg.mobilebroken.repository.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.mobilebroken.common.constant.Constant;
import com.nflg.mobilebroken.repository.entity.TicketCall;
import com.nflg.mobilebroken.repository.entity.TicketCallJoin;
import com.nflg.mobilebroken.repository.mapper.TicketCallMapper;
@ -13,7 +11,6 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.Objects;
/**
* <p>
@ -29,26 +26,33 @@ public class TicketCallServiceImpl extends ServiceImpl<TicketCallMapper, TicketC
@Resource
private ITicketCallJoinService ticketCallJoinService;
@Override
public boolean isInCall(Integer userId) {
return lambdaQuery()
.eq(TicketCall::getState, 1)
.eq(TicketCall::getCallerUserId, userId)
.exists()
||
ticketCallJoinService.isInCall(userId);
}
// @Override
// public boolean isInCall(Integer userId) {
// return lambdaQuery()
// .eq(TicketCall::getState, 1)
// .eq(TicketCall::getCallerUserId, userId)
// .exists()
// ||
// ticketCallJoinService.isInCall(userId);
// }
@Transactional
@Override
public void add(Integer ticketId, Integer callerUserId,String callerUserFrom, Integer calledUserId, String calledUserFrom) {
TicketCall ticketCall = new TicketCall()
.setTicketId(ticketId)
.setCallerUserId(callerUserId)
// .setCallerUserId(callerUserId)
.setState(0)
.setFrom(callerUserFrom)
// .setFrom(callerUserFrom)
.setCreateTime(LocalDateTime.now());
save(ticketCall);
ticketCallJoinService.save(new TicketCallJoin()
.setCallId(ticketCall.getId())
.setFrom(callerUserFrom)
.setUserId(callerUserId)
.setState(0)
.setCreateTime(LocalDateTime.now())
);
ticketCallJoinService.save(new TicketCallJoin()
.setCallId(ticketCall.getId())
.setFrom(calledUserFrom)
@ -58,24 +62,24 @@ public class TicketCallServiceImpl extends ServiceImpl<TicketCallMapper, TicketC
);
}
@Override
public boolean hangUp(Integer ticketId, Integer userId, String from, boolean reject) {
TicketCall ticketCall = getLast(ticketId);
boolean flag = false;
if (Objects.nonNull(ticketCall)){
if ((Objects.equals(ticketCall.getCallerUserId(), userId) && StrUtil.equals(ticketCall.getFrom(), Constant.FROM_APP))
|| ticketCallJoinService.allIsHangUp(ticketCall.getId())){
ticketCall.setState(2);
ticketCallJoinService.hangUpAll(ticketCall.getId());
if (reject) {
ticketCall.setHangupTime(LocalDateTime.now());
}
updateById(ticketCall);
}
flag=ticketCallJoinService.hangUp(ticketCall.getId(), userId, from, reject);
}
return flag;
}
// @Override
// public boolean hangUp(Integer ticketId, Integer userId, String from, boolean reject) {
// TicketCall ticketCall = getLast(ticketId);
// boolean flag = false;
// if (Objects.nonNull(ticketCall)){
// if ((Objects.equals(ticketCall.getCallerUserId(), userId) && StrUtil.equals(ticketCall.getFrom(), Constant.FROM_APP))
// || ticketCallJoinService.allIsHangUp(ticketCall.getId())){
// ticketCall.setState(2);
// ticketCallJoinService.hangUpAll(ticketCall.getId());
// if (reject) {
// ticketCall.setHangupTime(LocalDateTime.now());
// }
// updateById(ticketCall);
// }
// flag=ticketCallJoinService.hangUp(ticketCall.getId(), userId, from, reject);
// }
// return flag;
// }
@Override
public TicketCall getLast(Integer ticketId) {

2
nflg-mobilebroken-repository/src/main/resources/mapper/TicketCallJoinMapper.xml
View File

@ -7,6 +7,6 @@
INNER JOIN ticket_call_join tcj ON tc.id = tcj.call_id
WHERE tc.state = 1
AND tcj.state = 1
AND tcj.user_id = #{userId}
AND tcj.user_id = #{userId} and tcj.from = #{from} and tc.ticket_id = #{ticketId}
</select>
</mapper>