fix(emergency): 修复添加群成员错误提示、成员查询遗漏和日志缺少异常栈
- addGroupUser: IM添加失败时改用友好提示,内部错误记日志 - EmergencyOrderApiServiceImpl: 员工成员查询去掉operatorType过滤,补充兜底覆盖;userId去重 - EmergencyCloudManager: 微服务调用失败日志补充异常栈
This commit is contained in:
+3
-2
@@ -13,7 +13,6 @@ import com.renkang.anyan.client.AnYanClient;
|
|||||||
import com.renkang.anyan.model.dto.EmergencyContactParam;
|
import com.renkang.anyan.model.dto.EmergencyContactParam;
|
||||||
import com.renkang.anyan.model.vo.EmergencyContactVO;
|
import com.renkang.anyan.model.vo.EmergencyContactVO;
|
||||||
import com.renkang.emergency.api.service.EmergencyApiService;
|
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.CallBack;
|
||||||
import com.renkang.emergency.bean.request.EmergencyCall;
|
import com.renkang.emergency.bean.request.EmergencyCall;
|
||||||
import com.renkang.emergency.bean.request.EmergencySocket;
|
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.AddOtherMemberDTO;
|
||||||
import com.renkang.emergency.entity.dto.RemoveGroupMemberDTO;
|
import com.renkang.emergency.entity.dto.RemoveGroupMemberDTO;
|
||||||
import com.renkang.emergency.entity.vo.CreateGroupMagVO;
|
import com.renkang.emergency.entity.vo.CreateGroupMagVO;
|
||||||
|
import com.renkang.emergency.largeScreen.mapper.LargeScreenDataMapper;
|
||||||
import com.renkang.emergency.manager.EmergencyCloudManager;
|
import com.renkang.emergency.manager.EmergencyCloudManager;
|
||||||
import com.renkang.emergency.mapper.*;
|
import com.renkang.emergency.mapper.*;
|
||||||
import com.renkang.emergency.service.IEmergencyCenterService;
|
import com.renkang.emergency.service.IEmergencyCenterService;
|
||||||
@@ -1379,7 +1379,8 @@ public class EmergencyApiServiceImpl implements EmergencyApiService {
|
|||||||
Result<AddGroupMemberVO> addGroupMemberVoResult = iMHelloApi.addGroupMember(addGroupMemberDTO);
|
Result<AddGroupMemberVO> addGroupMemberVoResult = iMHelloApi.addGroupMember(addGroupMemberDTO);
|
||||||
String actionStatus = addGroupMemberVoResult.getResult().getActionStatus();
|
String actionStatus = addGroupMemberVoResult.getResult().getActionStatus();
|
||||||
if (!"OK".equals(actionStatus)) {
|
if (!"OK".equals(actionStatus)) {
|
||||||
ExceptionAssertsUtil.fail(addGroupMemberVoResult.getResult().getErrorInfo());
|
log.error("添加群成员失败, actionStatus: {}, errorInfo: {}", actionStatus, addGroupMemberVoResult.getResult().getErrorInfo());
|
||||||
|
ExceptionAssertsUtil.fail("添加群成员失败");
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -786,11 +786,11 @@ public class EmergencyOrderApiServiceImpl implements EmergencyOrderApiService {
|
|||||||
profUsers.forEach(u -> profUserMap.put(u.getUserId(), u));
|
profUsers.forEach(u -> profUserMap.put(u.getUserId(), u));
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询员工成员的系统用户信息
|
// 查询员工成员的系统用户信息(所有profUserMap未命中的userId都走SysUser兜底)
|
||||||
List<String> employeeUserIds = orderOperators.stream()
|
List<String> employeeUserIds = orderOperators.stream()
|
||||||
.filter(op -> op.getOperatorType() != null && op.getOperatorType() == 2)
|
|
||||||
.map(OrderOperator::getUserId)
|
.map(OrderOperator::getUserId)
|
||||||
.filter(uid -> !profUserMap.containsKey(uid))
|
.filter(uid -> !profUserMap.containsKey(uid))
|
||||||
|
.distinct()
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
Map<String, LoginUserNew> sysUserMap = new HashMap<>();
|
Map<String, LoginUserNew> sysUserMap = new HashMap<>();
|
||||||
if (!employeeUserIds.isEmpty()) {
|
if (!employeeUserIds.isEmpty()) {
|
||||||
|
|||||||
+1
-1
@@ -46,7 +46,7 @@ public class EmergencyCloudManager {
|
|||||||
// TODO 微服务调用会发送post请求 暂时将 listUserByIds修改为post
|
// TODO 微服务调用会发送post请求 暂时将 listUserByIds修改为post
|
||||||
list = sysBaseAPI.listUserByIds(listUser);
|
list = sysBaseAPI.listUserByIds(listUser);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error("微服务调用失败(system listUserByIds)");
|
logger.error("微服务调用失败(system listUserByIds)", e);
|
||||||
}
|
}
|
||||||
if (CollectionUtils.isEmpty(list)) {
|
if (CollectionUtils.isEmpty(list)) {
|
||||||
return map;
|
return map;
|
||||||
|
|||||||
Reference in New Issue
Block a user