diff --git a/src/main/java/org/springblade/modules/job/CarInfoTask.java b/src/main/java/org/springblade/modules/job/CarInfoTask.java index 65ff020..babdd9e 100644 --- a/src/main/java/org/springblade/modules/job/CarInfoTask.java +++ b/src/main/java/org/springblade/modules/job/CarInfoTask.java @@ -181,15 +181,17 @@ public class CarInfoTask { resultMap.put("activityData", ""); resultMap.put("scenicData", ""); resultMap.put("imgData", ""); + resultMap.put("busNo", ""); resultMap.put("speed", ""); } else { resultMap.put("siteTips", busLine.getTips()); resultMap.put("articleData", busLine.getActicle()); resultMap.put("activityData", busLine.getActivity()); resultMap.put("scenicData", busLine.getScenic()); + resultMap.put("busNo", info.getBusno()); resultMap.put("speed", info.getSpeed()); - List busLineList = stationHintService.getBusLineByName(nextSite.getSname()); - Long busLineId = busLineList.get(0).getId(); + BusLine busLineByName = stationHintService.getBusLineByName(nextSite.getSname(),nextSite.getWeizhi()); + Long busLineId = busLineByName.getId(); List imgList = proBusLineImgService.getImgByid(busLineId); resultMap.put("imgData", imgList); } @@ -208,7 +210,7 @@ public class CarInfoTask { websocketService.broadcast(message); } - @Scheduled(cron = "0/1 * * * * ?") + //@Scheduled(cron = "0/1 * * * * ?") public void getCarSpeed() { String carNo = CarInfoCache.getPushCarNo(); CarInfoVO info = carInfoService.getCarInfo(carNo);