From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 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..fa21e15 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
@@ -3,9 +3,19 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.support.WafKit;
+import com.stylefeng.guns.modular.crossCity.dao.ICarMapper;
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.model.Car;
+import com.stylefeng.guns.modular.system.model.CarService;
+import com.stylefeng.guns.modular.system.model.Company;
+import com.stylefeng.guns.modular.system.service.ICompanyService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import io.swagger.annotations.Api;
@@ -19,8 +29,10 @@
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;
/**
* 线路控制器
@@ -32,6 +44,10 @@
@Autowired
private ILineService lineService;
+ @Autowired
+ private ILineSiteService lineSiteService;
+ @Autowired
+ private ISiteService siteService;
@@ -55,17 +71,40 @@
@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){
- List<Line> isOpen = lineService.selectList(new EntityWrapper<Line>().eq("isOpen", 1));
+ @ApiOperation(value = "获取热门路线", tags = {"用户端-跨城"}, notes = "")
+ public ResultUtil<List<Line>> recomand(){
+ List<Line> isOpen = lineService.selectList(new EntityWrapper<Line>().eq("isOpen", 1).eq("state",1).orderBy("sortBy",false));
+
+ 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);
}
+
+ @Autowired
+ private ICarMapper carMapper;
+
+ @Autowired
+ private ICompanyService companyService;
+
+ @ResponseBody
+ @RequestMapping(value = "/base/line/confirm", method = RequestMethod.POST)
+ @ApiOperation(value = "判断当前是否需要摆渡车", tags = {"用户端-跨城"}, notes = "")
+ public ResultUtil confirm(Integer carId){
+ Car car = carMapper.selectById(carId);
+ Company company = companyService.selectById(car.getCompanyId());
+ return ResultUtil.success(company.getIsNeedFerry());
+ }
+
+
// @ResponseBody
// @RequestMapping(value = "/base/line/scanCodeQueryLines", method = RequestMethod.POST)
// @ApiOperation(value = "扫码获取线路信息", tags = {"用户端-跨城"}, notes = "")
--
Gitblit v1.7.1