From 221e416007007dc61d531248deea883d406255b5 Mon Sep 17 00:00:00 2001
From: chents <78666437@qq.com>
Date: Thu, 11 May 2023 16:10:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/business/controller/CommonApiController.java | 7 -------
 .../business/service/impl/StationHintServiceImpl.java    | 2 --
 .../modules/business/vo/CurrentCarInfoVo.java            | 9 ++++++++-
 .../java/org/springblade/modules/job/CarInfoTask.java    | 2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/controller/CommonApiController.java b/src/main/java/org/springblade/modules/business/controller/CommonApiController.java
index 1481c74..0f44e1f 100644
--- a/src/main/java/org/springblade/modules/business/controller/CommonApiController.java
+++ b/src/main/java/org/springblade/modules/business/controller/CommonApiController.java
@@ -435,8 +435,6 @@ public class CommonApiController extends BladeController {
 			resultMap.put("activityData", busLine.getActivity());
 			resultMap.put("scenicData", busLine.getScenic());
 			resultMap.put("speed",info.getSpeed());
-			List<imgVo> imgListR = (List<imgVo>) redisTemplate.opsForValue().get("imgList-info");
-			if (CollectionUtils.isEmpty(imgListR)){
 				List<BusLine> busLineList = stationHintService.getBusLineByName(nextSite.getSname());
 				QueryWrapper<PocBusLineImg> queryWrapper = new QueryWrapper<>();
 				queryWrapper.select("img_url","img_type");
@@ -444,12 +442,7 @@ public class CommonApiController extends BladeController {
 				ArrayList<imgVo> imgList = getImgVos(queryWrapper);
 				redisTemplate.opsForValue().set("imgList-info", imgList);
 				resultMap.put("imgData", imgList);
-				//定时任务缓存
-				carInfoTask.setCarInfo(resultMap);
-				return R.data(resultMap);
 			}
-			resultMap.put("imgData", imgListR);
-		}
 		//定时任务缓存
 		carInfoTask.setCarInfo(resultMap);
 		return R.data(resultMap);
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 1cbc7b8..50cf9da 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
@@ -163,8 +163,6 @@ public class StationHintServiceImpl extends BaseServiceImpl<BusLineMapper,BusLin
         QueryWrapper<PocBusLineImg> wrapper = new QueryWrapper<>();
         wrapper.eq("bus_line_id", busLine.getId());
         proBusLineImgMapper.delete(wrapper);
-        //刪除缓存
-        redisTemplate.delete("imgList-info");
         // 插入新的图片列表
         if (imgList != null && !imgList.isEmpty()) {
             for (PocBusLineImg img : imgList) {
diff --git a/src/main/java/org/springblade/modules/business/vo/CurrentCarInfoVo.java b/src/main/java/org/springblade/modules/business/vo/CurrentCarInfoVo.java
index d01660f..f2f5a70 100644
--- a/src/main/java/org/springblade/modules/business/vo/CurrentCarInfoVo.java
+++ b/src/main/java/org/springblade/modules/business/vo/CurrentCarInfoVo.java
@@ -3,6 +3,8 @@ package org.springblade.modules.business.vo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: Chents
@@ -25,5 +27,10 @@ public class CurrentCarInfoVo implements Serializable {
     //下一站
     private String downStation;
     //当前车辆距离上一站点百分比
-     private double percentage;
+    private double percentage;
+     //景点信息
+    private Map<String,Object> infoMap;
+
+    private List<String> imgList;
+
 }
diff --git a/src/main/java/org/springblade/modules/job/CarInfoTask.java b/src/main/java/org/springblade/modules/job/CarInfoTask.java
index 0aa9363..7de8044 100644
--- a/src/main/java/org/springblade/modules/job/CarInfoTask.java
+++ b/src/main/java/org/springblade/modules/job/CarInfoTask.java
@@ -41,7 +41,7 @@ public class CarInfoTask {
         System.out.println("======存入实时车辆信息到redis成功=========");
     }
 
-    //@Scheduled(cron = "0/1 * * * * ?")
+    @Scheduled(cron = "0/1 * * * * ?")
     public void parseCarInfo() {
         //从redis获取数据
         Map<String,Object> carInfoMap = (Map<String,Object> ) redisTemplate.opsForValue().get("current_car_info");