From 9615b3d082a87fd0c6c3337d098a99caf32e452a Mon Sep 17 00:00:00 2001
From: chents <78666437@qq.com>
Date: Fri, 12 May 2023 11:02:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87=E6=9C=89?=
 =?UTF-8?q?=E7=9A=84=E7=AB=99=E4=B8=8D=E6=98=BE=E7=A4=BABUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/business/service/IStationHintService.java    | 2 +-
 .../business/service/impl/StationHintServiceImpl.java    | 9 ++++++---
 .../modules/websocket/service/WebsocketService.java      | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/service/IStationHintService.java b/src/main/java/org/springblade/modules/business/service/IStationHintService.java
index d433124..5ed0f8a 100644
--- a/src/main/java/org/springblade/modules/business/service/IStationHintService.java
+++ b/src/main/java/org/springblade/modules/business/service/IStationHintService.java
@@ -34,5 +34,5 @@ public interface IStationHintService extends BaseService<BusLine> {
     R<List<StationHintVo>> QueryBusLineMessage(String linename, String updown);
 
     //根据name获取返回id
-    List<BusLine> getBusLineByName(String name);
+    BusLine getBusLineByName(String name,String weizhi);
 }
diff --git a/src/main/java/org/springblade/modules/business/service/impl/StationHintServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/StationHintServiceImpl.java
index a0b75de..44fe3e6 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/StationHintServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/StationHintServiceImpl.java
@@ -1,6 +1,7 @@
 package org.springblade.modules.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
@@ -31,6 +32,7 @@ import java.util.stream.Collectors;
  * @author chents
  */
 @Service
+@Slf4j
 public class StationHintServiceImpl extends BaseServiceImpl<BusLineMapper, BusLine> implements IStationHintService {
 
     @Resource
@@ -138,12 +140,13 @@ public class StationHintServiceImpl extends BaseServiceImpl<BusLineMapper, BusLi
     }
 
     @Override
-    public List<BusLine> getBusLineByName(String name) {
+    public BusLine getBusLineByName(String name,String weizhi) {
         QueryWrapper<BusLine> busLineQueryWrapper = new QueryWrapper<>();
         busLineQueryWrapper.select("id");
         busLineQueryWrapper.eq("sname_key", name);
-        List<BusLine> busLines = busLineMapper.selectList(busLineQueryWrapper);
-        return busLines;
+        busLineQueryWrapper.eq("location", weizhi);
+        BusLine busLine = busLineMapper.selectOne(busLineQueryWrapper);
+        return busLine;
     }
 
 
diff --git a/src/main/java/org/springblade/modules/websocket/service/WebsocketService.java b/src/main/java/org/springblade/modules/websocket/service/WebsocketService.java
index 6d49507..19b4ed3 100644
--- a/src/main/java/org/springblade/modules/websocket/service/WebsocketService.java
+++ b/src/main/java/org/springblade/modules/websocket/service/WebsocketService.java
@@ -54,7 +54,7 @@ public class WebsocketService extends TextWebSocketHandler {
             return;
         }
         for (WebSocketSession session : sessionMap.get(webSocketMessage.getTitle())) {
-            TextMessage tm = new TextMessage(webSocketMessage.getContent().toString());
+            TextMessage tm = new TextMessage(webSocketMessage.getContent());
             try {
                 Set<String> strings = sessionMap.keySet();
                 session.sendMessage(tm);