Showing
2 changed files
with
4 additions
and
2 deletions
| ... | @@ -83,7 +83,7 @@ public class WebSocketServer extends TextWebSocketHandler { | ... | @@ -83,7 +83,7 @@ public class WebSocketServer extends TextWebSocketHandler { |
| 83 | public static <T> void sendMessageByUserTypes(List<UserTypeEnum> userTypes, List<String> authUserIds, SocketMessage<T> socketMessage) throws IOException { | 83 | public static <T> void sendMessageByUserTypes(List<UserTypeEnum> userTypes, List<String> authUserIds, SocketMessage<T> socketMessage) throws IOException { |
| 84 | final var keys = userSessions.keySet().stream() | 84 | final var keys = userSessions.keySet().stream() |
| 85 | .filter(userSessionData -> userTypes.contains(userSessionData.getUserType())) | 85 | .filter(userSessionData -> userTypes.contains(userSessionData.getUserType())) |
| 86 | - .filter(userSessionData -> authUserIds.contains(userSessionData.getUserId())) | 86 | + .filter(userSessionData -> authUserIds.isEmpty() || authUserIds.contains(userSessionData.getUserId())) |
| 87 | .collect(Collectors.toList()); | 87 | .collect(Collectors.toList()); |
| 88 | sendMessageToUsers(keys, socketMessage); | 88 | sendMessageToUsers(keys, socketMessage); |
| 89 | } | 89 | } | ... | ... |
| ... | @@ -89,6 +89,7 @@ import java.time.LocalDate; | ... | @@ -89,6 +89,7 @@ import java.time.LocalDate; |
| 89 | import java.time.LocalDateTime; | 89 | import java.time.LocalDateTime; |
| 90 | import java.time.ZoneOffset; | 90 | import java.time.ZoneOffset; |
| 91 | import java.util.ArrayList; | 91 | import java.util.ArrayList; |
| 92 | +import java.util.Collections; | ||
| 92 | import java.util.HashMap; | 93 | import java.util.HashMap; |
| 93 | import java.util.List; | 94 | import java.util.List; |
| 94 | import java.util.concurrent.TimeUnit; | 95 | import java.util.concurrent.TimeUnit; |
| ... | @@ -606,6 +607,7 @@ public class OrderServiceRpcClient { | ... | @@ -606,6 +607,7 @@ public class OrderServiceRpcClient { |
| 606 | // 用餐时间为当天,并且非在线支付餐单,发送消息给客户端 | 607 | // 用餐时间为当天,并且非在线支付餐单,发送消息给客户端 |
| 607 | if (createOrderDto.getMealTime().toLocalDate().equals(LocalDate.now()) && menuById.getResponse().getOrderRuleJson().getModeOfPayment() != ModeOfPaymentEnum.ONLINE) { | 608 | if (createOrderDto.getMealTime().toLocalDate().equals(LocalDate.now()) && menuById.getResponse().getOrderRuleJson().getModeOfPayment() != ModeOfPaymentEnum.ONLINE) { |
| 608 | final var userIds = clientResourceTagServiceRpcClient.getOperatorIdsByStallIds(List.of(createOrderDto.getStallId())).stream().map(SingleResourceLabelEntityRefsResponse::getEntityId).distinct().map(String::valueOf).collect(Collectors.toList()); | 609 | final var userIds = clientResourceTagServiceRpcClient.getOperatorIdsByStallIds(List.of(createOrderDto.getStallId())).stream().map(SingleResourceLabelEntityRefsResponse::getEntityId).distinct().map(String::valueOf).collect(Collectors.toList()); |
| 610 | + log.info("received userIds:{}", userIds); | ||
| 609 | final var orderCreateSuccessData = OrderCreateSuccessData.builder() | 611 | final var orderCreateSuccessData = OrderCreateSuccessData.builder() |
| 610 | .orderId(orderResponse.getId()) | 612 | .orderId(orderResponse.getId()) |
| 611 | .build(); | 613 | .build(); |
| ... | @@ -617,7 +619,7 @@ public class OrderServiceRpcClient { | ... | @@ -617,7 +619,7 @@ public class OrderServiceRpcClient { |
| 617 | .data(orderCreateSuccessData) | 619 | .data(orderCreateSuccessData) |
| 618 | .build(); | 620 | .build(); |
| 619 | try { | 621 | try { |
| 620 | - WebSocketServer.sendMessageByUserTypes(List.of(UserTypeEnum.CLIENT, UserTypeEnum.KDS), userIds, data); | 622 | + WebSocketServer.sendMessageByUserTypes(List.of(UserTypeEnum.CLIENT, UserTypeEnum.KDS), Collections.emptyList(), data); |
| 621 | } catch (IOException e) { | 623 | } catch (IOException e) { |
| 622 | log.error("Failed to send message to user", e); | 624 | log.error("Failed to send message to user", e); |
| 623 | } | 625 | } | ... | ... |
-
Please register or login to post a comment