From 31ce6be2d56798d9509e6d90335999064351f7f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 10 十二月 2024 16:06:26 +0800
Subject: [PATCH] 12.10
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 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 be3e554..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,13 +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;
@@ -23,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;
/**
* 线路控制器
@@ -65,20 +73,37 @@
@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));
+ 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) {
- siteService.selectById(lineSite.getSiteId());
+ 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)
--
Gitblit v1.7.1