临时提交

This commit is contained in:
lin
2025-10-10 17:08:32 +08:00
parent d90b0aaff6
commit b13207db92
7 changed files with 232 additions and 48 deletions

View File

@@ -44,12 +44,12 @@ public class GroupServiceImpl implements IGroupService {
@Override
public void add(Group group) {
Assert.notNull(group, "参数不可为NULL");
Assert.notNull(group.getDeviceId(), "设备编号不可为NULL");
Assert.isTrue(group.getDeviceId().trim().length() == 20, "设备编号必须为20位");
Assert.notNull(group.getName(), "设备编号不可为NULL");
Assert.notNull(group.getDeviceId(), "分组编号不可为NULL");
Assert.isTrue(group.getDeviceId().trim().length() == 20, "分组编号必须为20位");
Assert.notNull(group.getName(), "分组名称不可为NULL");
GbCode gbCode = GbCode.decode(group.getDeviceId());
Assert.notNull(gbCode, "设备编号不满足国标定义");
Assert.notNull(gbCode, "分组编号不满足国标定义");
// 查询数据库中已经存在的.
List<Group> groupListInDb = groupManager.queryInGroupListByDeviceId(Lists.newArrayList(group));

View File

@@ -277,6 +277,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
(channelIdArrayFromSub != null? channelIdArrayFromSub[0]: null);
String requesterId = SipUtils.getUserIdFromFromHeader(request);
CallIdHeader callIdHeader = (CallIdHeader) request.getHeader(CallIdHeader.NAME);
if (requesterId == null || channelId == null) {
log.warn("[解析INVITE消息] 无法从请求中获取到来源id返回400错误");
throw new InviteDecodeException(Response.BAD_REQUEST, "request decode fail");