From 9d2babb8bb99d55d76eab0558fd9f510652b270c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 11 六月 2024 15:16:17 +0800
Subject: [PATCH] 6.11
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java | 11 ++++++++---
1 files changed, 8 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..0ddbee4 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
@@ -5,6 +5,7 @@
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;
@@ -23,8 +24,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,14 +68,16 @@
@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));
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);
--
Gitblit v1.7.1