09-17-netty连接后初始化只创建系统消息
This commit is contained in:
@ -186,30 +186,28 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
|
|||||||
}
|
}
|
||||||
|
|
||||||
//考勤
|
//考勤
|
||||||
if (!isHaveAttendanceRoom){
|
// if (!isHaveAttendanceRoom){
|
||||||
ChatGroup chatGroup = new ChatGroup();
|
// ChatGroup chatGroup = new ChatGroup();
|
||||||
chatGroup.setType(String.valueOf(3));
|
// chatGroup.setType(String.valueOf(3));
|
||||||
chatGroup.setMembers("["+ChatRoomEnum.ATTENDANCE.getRoomId() +", "+loginUser.getUserId()+"]");
|
// chatGroup.setMembers("["+ChatRoomEnum.ATTENDANCE.getRoomId() +", "+loginUser.getUserId()+"]");
|
||||||
chatGroupService.save(chatGroup);
|
// chatGroupService.save(chatGroup);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
//安全
|
// //安全
|
||||||
if (!isHaveSafeRoom){
|
// if (!isHaveSafeRoom){
|
||||||
ChatGroup chatGroup = new ChatGroup();
|
// ChatGroup chatGroup = new ChatGroup();
|
||||||
chatGroup.setType(String.valueOf(4));
|
// chatGroup.setType(String.valueOf(4));
|
||||||
chatGroup.setMembers("["+ChatRoomEnum.SAFE.getRoomId() +", "+loginUser.getUserId()+"]");
|
// chatGroup.setMembers("["+ChatRoomEnum.SAFE.getRoomId() +", "+loginUser.getUserId()+"]");
|
||||||
// chatGroup.setMembers("[101, "+loginUser.getUserId()+"]");
|
// chatGroupService.save(chatGroup);
|
||||||
chatGroupService.save(chatGroup);
|
// }
|
||||||
}
|
//
|
||||||
|
// //质量
|
||||||
//质量
|
// if (!isHaveQualityRoom){
|
||||||
if (!isHaveQualityRoom){
|
// ChatGroup chatGroup = new ChatGroup();
|
||||||
ChatGroup chatGroup = new ChatGroup();
|
// chatGroup.setType(String.valueOf(5));
|
||||||
chatGroup.setType(String.valueOf(5));
|
// chatGroup.setMembers("["+ChatRoomEnum.QUALITY.getRoomId() +", "+loginUser.getUserId()+"]");
|
||||||
chatGroup.setMembers("["+ChatRoomEnum.QUALITY.getRoomId() +", "+loginUser.getUserId()+"]");
|
// chatGroupService.save(chatGroup);
|
||||||
// chatGroup.setMembers("[102, "+loginUser.getUserId()+"]");
|
// }
|
||||||
chatGroupService.save(chatGroup);
|
|
||||||
}
|
|
||||||
|
|
||||||
//等待全部创建完成后 初次创建系统房间后 发送一条初始化信息
|
//等待全部创建完成后 初次创建系统房间后 发送一条初始化信息
|
||||||
if (!isHaveSystemRoom) {
|
if (!isHaveSystemRoom) {
|
||||||
@ -480,11 +478,9 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
|
|||||||
groupServiceOne.setMembers("["+ChatRoomEnum.SYSTEM.getRoomId()+", "+userId+"]");
|
groupServiceOne.setMembers("["+ChatRoomEnum.SYSTEM.getRoomId()+", "+userId+"]");
|
||||||
groupServiceOne.setLastMessage(message);
|
groupServiceOne.setLastMessage(message);
|
||||||
groupServiceOne.setLastMessageTime(new Date());
|
groupServiceOne.setLastMessageTime(new Date());
|
||||||
// chatGroupService.save(groupServiceOne);
|
|
||||||
}else {
|
}else {
|
||||||
groupServiceOne.setLastMessage(message);
|
groupServiceOne.setLastMessage(message);
|
||||||
groupServiceOne.setLastMessageTime(new Date());
|
groupServiceOne.setLastMessageTime(new Date());
|
||||||
// chatGroupService.updateById(groupServiceOne);
|
|
||||||
}
|
}
|
||||||
chatHistory = new ChatHistory();
|
chatHistory = new ChatHistory();
|
||||||
//发送方设置为99 表示系统消息
|
//发送方设置为99 表示系统消息
|
||||||
@ -493,13 +489,11 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
|
|||||||
chatHistory.setMessage(jsonObject.toString());
|
chatHistory.setMessage(jsonObject.toString());
|
||||||
chatHistory.setMessageDate(new Date());
|
chatHistory.setMessageDate(new Date());
|
||||||
chatHistory.setIsRead("1");//未读
|
chatHistory.setIsRead("1");//未读
|
||||||
// chatHistoryService.save(chatHistory);
|
|
||||||
jsonObject.put("roomId", groupServiceOne.getId());
|
jsonObject.put("roomId", groupServiceOne.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
//2:考勤消息
|
//2:考勤消息
|
||||||
case "1" ->{
|
case "1" ->{
|
||||||
// lambdaQueryWrapper.eq(ChatGroup::getMembers,"[100, "+userId+"]");
|
|
||||||
lambdaQueryWrapper.eq(ChatGroup::getMembers,"["+ChatRoomEnum.ATTENDANCE.getRoomId()+", "+userId+"]");
|
lambdaQueryWrapper.eq(ChatGroup::getMembers,"["+ChatRoomEnum.ATTENDANCE.getRoomId()+", "+userId+"]");
|
||||||
groupServiceOne = chatGroupService.getOne(lambdaQueryWrapper);
|
groupServiceOne = chatGroupService.getOne(lambdaQueryWrapper);
|
||||||
//如果给成员发送考勤消息 而该成员还没有建立过连接从而没有考勤房间 则创建该成员考勤消息房间
|
//如果给成员发送考勤消息 而该成员还没有建立过连接从而没有考勤房间 则创建该成员考勤消息房间
|
||||||
@ -509,11 +503,9 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
|
|||||||
groupServiceOne.setMembers("["+ChatRoomEnum.ATTENDANCE.getRoomId()+", "+userId+"]");
|
groupServiceOne.setMembers("["+ChatRoomEnum.ATTENDANCE.getRoomId()+", "+userId+"]");
|
||||||
groupServiceOne.setLastMessage(message);
|
groupServiceOne.setLastMessage(message);
|
||||||
groupServiceOne.setLastMessageTime(new Date());
|
groupServiceOne.setLastMessageTime(new Date());
|
||||||
// chatGroupService.save(groupServiceOne);
|
|
||||||
}else {
|
}else {
|
||||||
groupServiceOne.setLastMessage(message);
|
groupServiceOne.setLastMessage(message);
|
||||||
groupServiceOne.setLastMessageTime(new Date());
|
groupServiceOne.setLastMessageTime(new Date());
|
||||||
// chatGroupService.updateById(groupServiceOne);
|
|
||||||
}
|
}
|
||||||
chatHistory = new ChatHistory();
|
chatHistory = new ChatHistory();
|
||||||
//发送方设置为100 表示系统消息中的考勤消息
|
//发送方设置为100 表示系统消息中的考勤消息
|
||||||
@ -522,7 +514,6 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
|
|||||||
chatHistory.setMessage(jsonObject.toString());
|
chatHistory.setMessage(jsonObject.toString());
|
||||||
chatHistory.setMessageDate(new Date());
|
chatHistory.setMessageDate(new Date());
|
||||||
chatHistory.setIsRead("1");//未读
|
chatHistory.setIsRead("1");//未读
|
||||||
// chatHistoryService.save(chatHistory);
|
|
||||||
jsonObject.put("roomId", groupServiceOne.getId());
|
jsonObject.put("roomId", groupServiceOne.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -537,11 +528,9 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
|
|||||||
groupServiceOne.setMembers("["+ChatRoomEnum.SAFE.getRoomId()+", "+userId+"]");
|
groupServiceOne.setMembers("["+ChatRoomEnum.SAFE.getRoomId()+", "+userId+"]");
|
||||||
groupServiceOne.setLastMessage(message);
|
groupServiceOne.setLastMessage(message);
|
||||||
groupServiceOne.setLastMessageTime(new Date());
|
groupServiceOne.setLastMessageTime(new Date());
|
||||||
// chatGroupService.save(groupServiceOne);
|
|
||||||
}else {
|
}else {
|
||||||
groupServiceOne.setLastMessage(message);
|
groupServiceOne.setLastMessage(message);
|
||||||
groupServiceOne.setLastMessageTime(new Date());
|
groupServiceOne.setLastMessageTime(new Date());
|
||||||
// chatGroupService.updateById(groupServiceOne);
|
|
||||||
}
|
}
|
||||||
chatHistory = new ChatHistory();
|
chatHistory = new ChatHistory();
|
||||||
//发送方设置为101 表示系统消息中的安全消息
|
//发送方设置为101 表示系统消息中的安全消息
|
||||||
@ -550,7 +539,6 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
|
|||||||
chatHistory.setMessage(jsonObject.toString());
|
chatHistory.setMessage(jsonObject.toString());
|
||||||
chatHistory.setMessageDate(new Date());
|
chatHistory.setMessageDate(new Date());
|
||||||
chatHistory.setIsRead("1");//未读
|
chatHistory.setIsRead("1");//未读
|
||||||
// chatHistoryService.save(chatHistory);
|
|
||||||
jsonObject.put("roomId", groupServiceOne.getId());
|
jsonObject.put("roomId", groupServiceOne.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -565,7 +553,6 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
|
|||||||
groupServiceOne.setMembers("["+ChatRoomEnum.QUALITY.getRoomId()+", "+userId+"]");
|
groupServiceOne.setMembers("["+ChatRoomEnum.QUALITY.getRoomId()+", "+userId+"]");
|
||||||
groupServiceOne.setLastMessage(message);
|
groupServiceOne.setLastMessage(message);
|
||||||
groupServiceOne.setLastMessageTime(new Date());
|
groupServiceOne.setLastMessageTime(new Date());
|
||||||
// chatGroupService.save(groupServiceOne);
|
|
||||||
}else {
|
}else {
|
||||||
groupServiceOne.setLastMessage(message);
|
groupServiceOne.setLastMessage(message);
|
||||||
groupServiceOne.setLastMessageTime(new Date());
|
groupServiceOne.setLastMessageTime(new Date());
|
||||||
|
|||||||
Reference in New Issue
Block a user