From 5470d21a35286abe41fafc25a7deaabefd7c55da Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 28 五月 2024 14:30:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 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 23b8ed9..d80b9e2 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 @@ -1,7 +1,15 @@ package com.stylefeng.guns.modular.crossCity.controller; +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.model.Site; 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; @@ -15,8 +23,11 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import java.sql.Wrapper; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Vector; /** * 线路控制器 @@ -28,6 +39,10 @@ @Autowired private ILineService lineService; + @Autowired + private ILineSiteService lineSiteService; + @Autowired + private ISiteService siteService; @@ -49,6 +64,27 @@ } } + @ResponseBody + @RequestMapping(value = "/base/line/recomand", method = RequestMethod.POST) + @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())); + List<Site> sites =new ArrayList<>(); + for (LineSite lineSite : lineId) { + Site site = siteService.selectById(lineSite.getSiteId()); + sites.add(site); + } + line.setSites(sites); + } + + return ResultUtil.success(isOpen); + } + + + // @ResponseBody // @RequestMapping(value = "/base/line/scanCodeQueryLines", method = RequestMethod.POST) // @ApiOperation(value = "扫码获取线路信息", tags = {"用户端-跨城"}, notes = "") -- Gitblit v1.7.1