lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

09-15-netty优化,系统消息发送方法添加roomId

Browse Source
This commit is contained in:
青云
2025-09-15 16:28:54 +08:00
parent e7c50c770e
commit da20820627
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusLandTransferLedgerController.java
View File

@ -167,7 +167,9 @@ public class BusLandTransferLedgerController extends BaseController {
} }
} }
} }
areaSum = areaSum.add(busLandTransferLedger.getDesignArea()); if (busLandTransferLedger.getDesignArea()!=null) {
areaSum = areaSum.add(busLandTransferLedger.getDesignArea());
}
} }
map.put("areaSum",areaSum); map.put("areaSum",areaSum);
map.put("transferAreaSum",transferAreaSum); map.put("transferAreaSum",transferAreaSum);

40
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java
View File

@ -37,26 +37,30 @@ import java.util.concurrent.ConcurrentHashMap;
public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocketFrame> { public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocketFrame> {
// 移除 @Autowired 注解 // 移除 @Autowired 注解
private static ChatHistoryServiceImpl chatHistoryService;
private static ChatGroupServiceImpl chatGroupService;
private static SysUserServiceImpl sysUserService;
private static SysOssServiceImpl sysOssService;
@Autowired @Autowired
public void setChatHistoryService(ChatHistoryServiceImpl service) { private ChatHistoryServiceImpl chatHistoryService;
chatHistoryService = service;
}
@Autowired @Autowired
public void setChatGroupService(ChatGroupServiceImpl service){ private ChatGroupServiceImpl chatGroupService;
chatGroupService = service;
}
@Autowired @Autowired
public void setSysUserService(SysUserServiceImpl service){ private SysUserServiceImpl sysUserService;
sysUserService = service;
}
@Autowired @Autowired
public void setSysOssService(SysOssServiceImpl service){ private SysOssServiceImpl sysOssService;
sysOssService = service; // @Autowired
} // public void setChatHistoryService(ChatHistoryServiceImpl service) {
// chatHistoryService = service;
// }
// @Autowired
// public void setChatGroupService(ChatGroupServiceImpl service){
// chatGroupService = service;
// }
// @Autowired
// public void setSysUserService(SysUserServiceImpl service){
// sysUserService = service;
// }
// @Autowired
// public void setSysOssService(SysOssServiceImpl service){
// sysOssService = service;
// }
// 存储所有连接的客户端Channel // 存储所有连接的客户端Channel
private static ChannelGroup channelGroup = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE); private static ChannelGroup channelGroup = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE);
@ -456,6 +460,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
chatHistory.setMessageDate(new Date()); chatHistory.setMessageDate(new Date());
chatHistory.setIsRead("1");//未读 chatHistory.setIsRead("1");//未读
chatHistoryService.save(chatHistory); chatHistoryService.save(chatHistory);
jsonObject.put("roomId", groupServiceOne.getId());
} }
//2:考勤消息 //2:考勤消息
@ -483,6 +488,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
chatHistory.setMessageDate(new Date()); chatHistory.setMessageDate(new Date());
chatHistory.setIsRead("1");//未读 chatHistory.setIsRead("1");//未读
chatHistoryService.save(chatHistory); chatHistoryService.save(chatHistory);
jsonObject.put("roomId", groupServiceOne.getId());
} }
//安全消息 //安全消息
@ -510,6 +516,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
chatHistory.setMessageDate(new Date()); chatHistory.setMessageDate(new Date());
chatHistory.setIsRead("1");//未读 chatHistory.setIsRead("1");//未读
chatHistoryService.save(chatHistory); chatHistoryService.save(chatHistory);
jsonObject.put("roomId", groupServiceOne.getId());
} }
//质量消息 //质量消息
@ -537,6 +544,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
chatHistory.setMessageDate(new Date()); chatHistory.setMessageDate(new Date());
chatHistory.setIsRead("1");//未读 chatHistory.setIsRead("1");//未读
chatHistoryService.save(chatHistory); chatHistoryService.save(chatHistory);
jsonObject.put("roomId", groupServiceOne.getId());
} }
default -> { default -> {