From c9b04383c77f91ac309e37e70783edcf8a9298b5 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 18 五月 2024 23:24:12 +0800
Subject: [PATCH] websocket代码整理
---
smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java | 6 +-----
smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonSubscriptionFilter.java | 4 ++--
smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/AbstractJsonWebSocketMessage.java | 3 +--
smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/JsonMessageHandlerHolder.java | 2 +-
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java
index 10a62f8..0321ba0 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java
@@ -24,11 +24,7 @@
public void handle(WebSocketSession session, RealTimeDataRequestJsonWebSocketMessage message) {
List<String> workstationIdList = message.getWorkstationIdList();
List<OrderWorkstation> workstationInProcess = this.orderWorkstationService.getWorkstationInProcess(workstationIdList.stream().map(Long::valueOf).collect(Collectors.toSet()));
- Map<Long, String> orderWorkstationMap = (Map) workstationInProcess.stream().collect(Collectors.toMap((v0) -> {
- return v0.getWorkstationId();
- }, (v0) -> {
- return v0.getOrderCode();
- }));
+ Map<Long, String> orderWorkstationMap = workstationInProcess.stream().collect(Collectors.toMap(OrderWorkstation::getWorkstationId, OrderWorkstation::getOrderCode));
if (Func.isNotEmpty(workstationIdList)) {
for (String workstationId : workstationIdList) {
RealTimeDaraResponseJsonWebSocketMessage jsonWebSocketMessage = new RealTimeDaraResponseJsonWebSocketMessage();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonSubscriptionFilter.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonSubscriptionFilter.java
index cd4c1b4..5a4c3db 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonSubscriptionFilter.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonSubscriptionFilter.java
@@ -11,7 +11,7 @@
@Component
public class RealTimeDataJsonSubscriptionFilter implements SubscriptionSessionFilter<RealTimeDataRequestJsonWebSocketMessage> {
- private static Map<String, RealTimeDataRequestJsonWebSocketMessage> map = new HashMap();
+ private static Map<String, RealTimeDataRequestJsonWebSocketMessage> map = new HashMap<>();
public String type() {
return "realTimeData";
@@ -23,7 +23,7 @@
public List<String> onResponse(String messageText) {
RealTimeDaraResponseJsonWebSocketMessage responseMessage = (RealTimeDaraResponseJsonWebSocketMessage) JSONObject.parseObject(messageText, RealTimeDaraResponseJsonWebSocketMessage.class);
- return (List) map.keySet().stream().filter(key -> {
+ return map.keySet().stream().filter(key -> {
return map.get(key).getWorkstationIdList() == null || map.get(key).getWorkstationIdList().isEmpty() || (map.get(key).getWorkstationIdList().contains(responseMessage.getId()) && responseMessage.getType().equals(map.get(key).getType()));
}).collect(Collectors.toList());
}
diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/JsonMessageHandlerHolder.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/JsonMessageHandlerHolder.java
index c8f35e9..0110ab1 100644
--- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/JsonMessageHandlerHolder.java
+++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/holder/JsonMessageHandlerHolder.java
@@ -5,7 +5,7 @@
import com.qianwen.core.websocket.handler.JsonMessageHandler;
public final class JsonMessageHandlerHolder {
- private static final Map<String, JsonMessageHandler> MESSAGE_HANDLER_MAP = new ConcurrentHashMap();
+ private static final Map<String, JsonMessageHandler> MESSAGE_HANDLER_MAP = new ConcurrentHashMap<>();
private JsonMessageHandlerHolder() {
}
diff --git a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/AbstractJsonWebSocketMessage.java b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/AbstractJsonWebSocketMessage.java
index 7021aef..44c789d 100644
--- a/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/AbstractJsonWebSocketMessage.java
+++ b/smart-starter-websocket/src/main/java/com/qianwen/core/websocket/message/AbstractJsonWebSocketMessage.java
@@ -3,8 +3,7 @@
public abstract class AbstractJsonWebSocketMessage implements JsonWebSocketMessage {
private final String type;
- /* JADX INFO: Access modifiers changed from: protected */
- public AbstractJsonWebSocketMessage(String type) {
+ protected AbstractJsonWebSocketMessage(String type) {
this.type = type;
}
--
Gitblit v1.9.3