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 0f44e1f..32bffcf 100644 --- a/src/main/java/org/springblade/modules/business/controller/CommonApiController.java +++ b/src/main/java/org/springblade/modules/business/controller/CommonApiController.java @@ -27,6 +27,7 @@ import org.springblade.modules.business.vo.*; import org.springblade.modules.job.CarInfoTask; import org.springblade.upload.entity.PocBusLineImg; import org.springblade.upload.mapper.ProBusLineImgMapper; +import org.springblade.upload.service.IProBusLineImgService; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; @@ -59,8 +60,9 @@ public class CommonApiController extends BladeController { private final IStationHintService stationHintService; - @Resource - ProBusLineImgMapper proBusLineImgMapper; + + private final IProBusLineImgService proBusLineImgService; + /** * 设置车牌号 @@ -436,11 +438,8 @@ public class CommonApiController extends BladeController { resultMap.put("scenicData", busLine.getScenic()); resultMap.put("speed",info.getSpeed()); List busLineList = stationHintService.getBusLineByName(nextSite.getSname()); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("img_url","img_type"); - queryWrapper.eq("bus_line_id",busLineList.get(0).getId()); - ArrayList imgList = getImgVos(queryWrapper); - redisTemplate.opsForValue().set("imgList-info", imgList); + List imgList = proBusLineImgService.getImgByid(busLineList.get(0).getId()); + redisTemplate.opsForValue().set("imgList-info", imgList); resultMap.put("imgData", imgList); } //定时任务缓存 @@ -448,19 +447,5 @@ public class CommonApiController extends BladeController { return R.data(resultMap); } - @NotNull - private ArrayList getImgVos(QueryWrapper queryWrapper) { - List pocBusLineImgs = proBusLineImgMapper.selectList(queryWrapper); - ArrayList imgList = new ArrayList<>(); - for(PocBusLineImg pocBusLineImg : pocBusLineImgs){ - imgVo img = new imgVo(); - img.setImgUrl(pocBusLineImg.getImgUrl()); - img.setImgType(pocBusLineImg.getImgType()); - img.setBusLineId(pocBusLineImg.getBusLineId()); - imgList.add(img); - } - return imgList; - } - } diff --git a/src/main/java/org/springblade/upload/service/IProBusLineImgService.java b/src/main/java/org/springblade/upload/service/IProBusLineImgService.java index b74691e..ecf3357 100644 --- a/src/main/java/org/springblade/upload/service/IProBusLineImgService.java +++ b/src/main/java/org/springblade/upload/service/IProBusLineImgService.java @@ -1,9 +1,15 @@ package org.springblade.upload.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springblade.core.tool.api.R; +import org.springblade.modules.business.vo.imgVo; +import org.springblade.upload.entity.PocBusLineImg; import org.springframework.web.multipart.MultipartFile; +import java.util.ArrayList; +import java.util.List; + /** * 文件 Service 接口 * @@ -16,4 +22,7 @@ public interface IProBusLineImgService { R upload(MultipartFile file, Integer imgType,Long busLineId); R queryList(Long id); + + List getImgByid(Long id); + } diff --git a/src/main/java/org/springblade/upload/service/impl/ProBusLineImgImpl.java b/src/main/java/org/springblade/upload/service/impl/ProBusLineImgImpl.java index a92e654..16591f2 100644 --- a/src/main/java/org/springblade/upload/service/impl/ProBusLineImgImpl.java +++ b/src/main/java/org/springblade/upload/service/impl/ProBusLineImgImpl.java @@ -1,7 +1,10 @@ package org.springblade.upload.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; import org.springblade.core.tool.api.R; +import org.springblade.modules.business.vo.imgVo; import org.springblade.upload.entity.PocBusLineImg; import org.springblade.upload.mapper.ProBusLineImgMapper; import org.springblade.upload.service.IProBusLineImgService; @@ -11,7 +14,9 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import java.util.UUID; @@ -63,4 +68,22 @@ public class ProBusLineImgImpl implements IProBusLineImgService { return R.data(pocBusLineImg); } + + @Override + public List getImgByid(Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("img_url","img_type"); + queryWrapper.eq("bus_line_id",id); + List pocBusLineImgs = pocBusLineImgMapper.selectList(queryWrapper); + ArrayList imgList = new ArrayList<>(); + for(PocBusLineImg pocBusLineImg : pocBusLineImgs){ + imgVo img = new imgVo(); + img.setImgUrl(pocBusLineImg.getImgUrl()); + img.setImgType(pocBusLineImg.getImgType()); + img.setBusLineId(pocBusLineImg.getBusLineId()); + imgList.add(img); + } + return imgList; + } + }