From 1a5a2dcb3f82ef675990dc7337488c9fb427b5f0 Mon Sep 17 00:00:00 2001 From: pengjie <2413927716@qq.com> Date: Mon, 20 Jul 2026 10:26:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(emergency):=20=E4=BF=AE=E5=A4=8D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=BE=A4=E6=88=90=E5=91=98=E9=94=99=E8=AF=AF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E3=80=81=E6=88=90=E5=91=98=E6=9F=A5=E8=AF=A2=E9=81=97?= =?UTF-8?q?=E6=BC=8F=E5=92=8C=E6=97=A5=E5=BF=97=E7=BC=BA=E5=B0=91=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - addGroupUser: IM添加失败时改用友好提示，内部错误记日志 - EmergencyOrderApiServiceImpl: 员工成员查询去掉operatorType过滤，补充兜底覆盖；userId去重 - EmergencyCloudManager: 微服务调用失败日志补充异常栈 --- .../emergency/api/service/impl/EmergencyApiServiceImpl.java | 5 +++-- .../api/service/impl/EmergencyOrderApiServiceImpl.java | 4 ++-- .../com/renkang/emergency/manager/EmergencyCloudManager.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java index c491646..7b361aa 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyApiServiceImpl.java @@ -13,7 +13,6 @@ import com.renkang.anyan.client.AnYanClient; import com.renkang.anyan.model.dto.EmergencyContactParam; import com.renkang.anyan.model.vo.EmergencyContactVO; import com.renkang.emergency.api.service.EmergencyApiService; -import com.renkang.emergency.largeScreen.mapper.LargeScreenDataMapper; import com.renkang.emergency.bean.request.CallBack; import com.renkang.emergency.bean.request.EmergencyCall; import com.renkang.emergency.bean.request.EmergencySocket; @@ -24,6 +23,7 @@ import com.renkang.emergency.entity.*; import com.renkang.emergency.entity.dto.AddOtherMemberDTO; import com.renkang.emergency.entity.dto.RemoveGroupMemberDTO; import com.renkang.emergency.entity.vo.CreateGroupMagVO; +import com.renkang.emergency.largeScreen.mapper.LargeScreenDataMapper; import com.renkang.emergency.manager.EmergencyCloudManager; import com.renkang.emergency.mapper.*; import com.renkang.emergency.service.IEmergencyCenterService; @@ -1379,7 +1379,8 @@ public class EmergencyApiServiceImpl implements EmergencyApiService { Result addGroupMemberVoResult = iMHelloApi.addGroupMember(addGroupMemberDTO); String actionStatus = addGroupMemberVoResult.getResult().getActionStatus(); if (!"OK".equals(actionStatus)) { - ExceptionAssertsUtil.fail(addGroupMemberVoResult.getResult().getErrorInfo()); + log.error("添加群成员失败, actionStatus: {}, errorInfo: {}", actionStatus, addGroupMemberVoResult.getResult().getErrorInfo()); + ExceptionAssertsUtil.fail("添加群成员失败"); } return true; } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java index 9129660..80925c8 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java @@ -786,11 +786,11 @@ public class EmergencyOrderApiServiceImpl implements EmergencyOrderApiService { profUsers.forEach(u -> profUserMap.put(u.getUserId(), u)); } - // 查询员工成员的系统用户信息 + // 查询员工成员的系统用户信息（所有profUserMap未命中的userId都走SysUser兜底） List employeeUserIds = orderOperators.stream() - .filter(op -> op.getOperatorType() != null && op.getOperatorType() == 2) .map(OrderOperator::getUserId) .filter(uid -> !profUserMap.containsKey(uid)) + .distinct() .collect(Collectors.toList()); Map sysUserMap = new HashMap<>(); if (!employeeUserIds.isEmpty()) { diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/manager/EmergencyCloudManager.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/manager/EmergencyCloudManager.java index 3d5162e..0dbd011 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/manager/EmergencyCloudManager.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/manager/EmergencyCloudManager.java @@ -46,7 +46,7 @@ public class EmergencyCloudManager { // TODO 微服务调用会发送post请求 暂时将 listUserByIds修改为post list = sysBaseAPI.listUserByIds(listUser); } catch (Exception e) { - logger.error("微服务调用失败(system listUserByIds)"); + logger.error("微服务调用失败(system listUserByIds)", e); } if (CollectionUtils.isEmpty(list)) { return map;