【im】多方通话修改

health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/AddOtherMemberDTO.java

@@ -26,13 +26,6 @@ public class AddOtherMemberDTO {
     @Schema(title = "群组id")
     private String groupId;
 
-    /**
-     * 应急单id
-     */
-    @NotBlank(message = "应急单id不能为空")
-    @Schema(title = "应急单id")
-    private String orderId;
-
     /**
      * 邀请成员id集合
      */

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/controller/EmergencyOrderApiController.java

@@ -292,8 +292,8 @@ public class EmergencyOrderApiController {
      */
     @Operation(summary = "获取群组成员和其他专业人员")
     @GetMapping("/getGroupMemberList")
-    public Result<List<GroupMemberVO>> getGroupMemberList(@RequestParam("orderId") String orderId) {
+    public Result<List<GroupMemberVO>> getGroupMemberList(@RequestParam("sessionId") String sessionId) {
-        return Result.OK(emergencyOrderApiService.getGroupMemberList(orderId));
+        return Result.OK(emergencyOrderApiService.getGroupMemberList(sessionId));
     }
 
 

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/EmergencyOrderApiService.java

@@ -72,6 +72,6 @@ public interface EmergencyOrderApiService {
 
     List<TblHelpCentorVo> getSicknessTypeStatistic(String sex, String depart);
 
-    List<GroupMemberVO> getGroupMemberList(String orderId);
+    List<GroupMemberVO> getGroupMemberList(String sessionId);
 
 }

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java

@@ -1070,16 +1070,24 @@ public class EmergencyApiServiceImpl implements EmergencyApiService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean addGroupUser(AddOtherMemberDTO dto) {
+        String groupId = dto.getGroupId();
+        Order order = orderMapper.selectOne(new LambdaQueryWrapper<Order>()
+                .eq(Order::getSessionId, groupId)
+        );
+        if (order == null) {
+            ExceptionAssertsUtil.fail("应急单不存在");
+        }
+        String orderId = order.getId();
         dto.getMemberList().forEach(userId -> {
             OrderOperator orderOperator = orderOperatorMapper.selectOne(new LambdaQueryWrapper<OrderOperator>()
-                    .eq(OrderOperator::getOrderId, dto.getOrderId())
+                    .eq(OrderOperator::getOrderId, orderId)
                     .eq(OrderOperator::getUserId, userId)
             );
             if (orderOperator != null) {
                 return;
             }
             orderOperator = new OrderOperator();
-            orderOperator.setOrderId(dto.getOrderId());
+            orderOperator.setOrderId(orderId);
             orderOperator.setOperatorType(1);
             orderOperator.setUserId(userId);
             orderOperator.setJoinType(1);

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java

@@ -584,20 +584,22 @@ public class EmergencyOrderApiServiceImpl implements EmergencyOrderApiService {
     /**
      * 获取群组成员和其他专业人员
      *
-     * @param orderId
+     * @param sessionId
      * @return
      */
     @Override
-    public List<GroupMemberVO> getGroupMemberList(String orderId) {
+    public List<GroupMemberVO> getGroupMemberList(String sessionId) {
         List<GroupMemberVO> groupMemberVos = new ArrayList<>();
         LoginUser loginUser = GlobalUtils.getLoginUser();
 
         // 校验订单是否存在
-        Order order = orderMapper.selectById(orderId);
+        Order order = orderMapper.selectOne(new LambdaQueryWrapper<Order>()
+                .eq(Order::getSessionId, sessionId)
+        );
         if (order == null) {
             ExceptionAssertsUtil.fail("应急单不存在");
         }
-
+        String orderId = order.getId();
         // 添加发起人信息
         handleGroupMember(groupMemberVos, orderId,
                 order.getInitiatorUserId(),