From 7c1281a689e9f6caeae44e1977940615616acb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 7 Aug 2025 10:56:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-528=20app=E7=AB=AF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E8=A7=86=E9=A2=91=E9=80=9A=E8=AF=9D=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/TicketController.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java index 72a54ddb..7dd8730e 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java @@ -1249,33 +1249,33 @@ public class TicketController extends ControllerBase { VUtils.trueThrowBusinessError(!Objects.equals(ticket.getState(), TicketState.Processing.getState())) .throwMessage("当前工单状态不允许请求通话"); Integer handlerUserId = Arrays.stream(ticket.getHandle().split(",")).map(Integer::parseInt).findFirst().get(); - if (StrUtil.equals(Constant.FROM_APP,ticket.getUserPlatform())) { + if (StrUtil.equals(Constant.FROM_APP, ticket.getUserPlatform())) { VUtils.trueThrowBusinessError(!Objects.equals(AdminUserUtil.getUserId(), handlerUserId)) .throwMessage("不是工单主负责人无权限呼叫"); - }else { + } else { 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; - if (userIdCreate){ - sendUserId=ticket.getUserId(); - receiveUserId=handlerUserId; - sendUserFrom=Constant.FROM_ADMIN; - receiveUserFrom=Constant.FROM_ADMIN; - }else { - sendUserId=handlerUserId; - receiveUserId=ticket.getUserId(); - sendUserFrom=Constant.FROM_ADMIN; - receiveUserFrom=Constant.FROM_APP; + boolean userIdCreate = StrUtil.equals(ticket.getUserPlatform(), Constant.FROM_ADMIN) && Objects.equals(ticket.getUserId(), AdminUserUtil.getUserId()); + Integer sendUserId = 0, receiveUserId = 0; + String sendUserFrom, receiveUserFrom; + if (userIdCreate) { + sendUserId = ticket.getUserId(); + receiveUserId = handlerUserId; + sendUserFrom = Constant.FROM_ADMIN; + receiveUserFrom = Constant.FROM_ADMIN; + } else { + sendUserId = handlerUserId; + receiveUserId = ticket.getUserId(); + sendUserFrom = Constant.FROM_ADMIN; + receiveUserFrom = Constant.FROM_APP; } - ticketCallService.add(ticketId, sendUserId,sendUserFrom, receiveUserId, receiveUserFrom); - AdminUser adminUser = adminUserService.getById(handlerUserId); + ticketCallService.add(ticketId, sendUserId, sendUserFrom, receiveUserId, receiveUserFrom); + AdminUser adminUser = adminUserService.getById(sendUserId); uniPushService.send(new UniPushMessage() - .setSenderId("admin-uid-" + handlerUserId) - .setReceiverId(ticket.getUserPlatform()+"-uid-" + ticket.getUserId()) + .setSenderId("admin-uid-" + sendUserId) + .setReceiverId(receiveUserFrom + "-uid-" + receiveUserId) .setSendData(new UniPushMessageBody() .setTitle("视频通话") .setContent(adminUser.getUserName() + "请求与您视频通话") @@ -1289,10 +1289,10 @@ public class TicketController extends ControllerBase { ) ) ); - if (StrUtil.equals(Constant.FROM_APP,ticket.getUserPlatform())) { + if (StrUtil.equals(Constant.FROM_APP, ticket.getUserPlatform())) { ssePushService.sendTicketCallToApp(adminUser, ticket.getUserId(), ticketId); - }else { - ssePushService.sendTicketCallToAdmin(adminUser, ticket.getUserId(), ticketId); + } else { + ssePushService.sendTicketCallToAdmin(adminUser, receiveUserId, ticketId); } ticketEventPublisher.publishTicketCallBeginEvent(ticketId, adminUser.getUserName()); return ApiResult.success();