java/NTTravel.git

			@@ -3,6 +3,7 @@

			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;
			@@ -11,6 +12,10 @@
			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;
			@@ -68,7 +73,7 @@
			@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).eq("state",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()));
			@@ -84,6 +89,21 @@
			}


			@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)