From e54fa07c75837a4455d75193fdb33b757262fd21 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期五, 24 五月 2024 09:29:58 +0800 Subject: [PATCH] 5.24 --- UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java index ed252dc..be3e554 100644 --- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java +++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java @@ -4,7 +4,11 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.stylefeng.guns.core.support.WafKit; import com.stylefeng.guns.modular.crossCity.model.Line; +import com.stylefeng.guns.modular.crossCity.model.LineSite; import com.stylefeng.guns.modular.crossCity.server.ILineService; +import com.stylefeng.guns.modular.crossCity.server.ILineSiteService; +import com.stylefeng.guns.modular.crossCity.server.ISiteService; +import com.stylefeng.guns.modular.crossCity.server.impl.LineSiteServiceImpl; import com.stylefeng.guns.modular.crossCity.warpper.LineWarpper; import com.stylefeng.guns.modular.system.util.ResultUtil; import com.stylefeng.guns.modular.system.warpper.BaseWarpper; @@ -32,6 +36,10 @@ @Autowired private ILineService lineService; + @Autowired + private ILineSiteService lineSiteService; + @Autowired + private ISiteService siteService; @@ -55,17 +63,23 @@ @ResponseBody @RequestMapping(value = "/base/line/recomand", method = RequestMethod.POST) - @ApiOperation(value = "根据选择的起点和终点获取线路", tags = {"用户端-跨城"}, notes = "") - @ApiImplicitParams({ - @ApiImplicitParam(value = "起始站点id", name = "startId", required = true, dataType = "int"), - @ApiImplicitParam(value = "终点站点id", name = "endId", required = true, dataType = "int"), - @ApiImplicitParam(value = "司机id", name = "driverId", required = false, dataType = "int") - }) - public ResultUtil<List<Line>> recomand(Integer startId, Integer endId, Integer driverId){ + @ApiOperation(value = "获取热门路线", tags = {"用户端-跨城"}, notes = "") + public ResultUtil<List<Line>> recomand(){ List<Line> isOpen = lineService.selectList(new EntityWrapper<Line>().eq("isOpen", 1)); + + for (Line line : isOpen) { + List<LineSite> lineId = lineSiteService.selectList(new EntityWrapper<LineSite>().eq("lineId", line.getId())); + for (LineSite lineSite : lineId) { + siteService.selectById(lineSite.getSiteId()); + } + + } + return ResultUtil.success(isOpen); } + + // @ResponseBody // @RequestMapping(value = "/base/line/scanCodeQueryLines", method = RequestMethod.POST) // @ApiOperation(value = "扫码获取线路信息", tags = {"用户端-跨城"}, notes = "") -- Gitblit v1.7.1