Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/bus/modules/bus/dao/RouteTimeTableDAO.java

@@ -16,4 +16,6 @@ public interface RouteTimeTableDAO {
 	List<RouteTimeTable> list();
 	RouteTimeTable findByRouteId(String routeId);
 	List<RouteTimeTable> search(Map<String, Object> searchParams, List<Sort> sortList);
+
+	List<RouteTimeTable> findListByRouteId(String routeId);
 }

common/src/main/java/com/jpsoft/bus/modules/bus/service/RouteTimeTableService.java

@@ -15,4 +15,6 @@ public interface RouteTimeTableService {
 	List<RouteTimeTable> list();
     RouteTimeTable findByRouteId(String routeId);
 	Page<RouteTimeTable> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
+
+	List<RouteTimeTable> findListByRouteId(String routeId);
 }

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/RouteTimeTableServiceImpl.java

@@ -29,14 +29,14 @@ public class RouteTimeTableServiceImpl implements RouteTimeTableService {
 	public int insert(RouteTimeTable model) {
 		// TODO Auto-generated method stub
 		//model.setId(UUID.randomUUID().toString());
-		
+
 		return routeTimeTableDAO.insert(model);
 	}
 
 	@Override
 	public int update(RouteTimeTable model) {
 		// TODO Auto-generated method stub
-		return routeTimeTableDAO.update(model);		
+		return routeTimeTableDAO.update(model);
 	}
 
 	@Override
@@ -49,10 +49,10 @@ public class RouteTimeTableServiceImpl implements RouteTimeTableService {
 	public boolean exist(String id) {
 		// TODO Auto-generated method stub
 		int count = routeTimeTableDAO.exist(id);
-		
+
 		return count > 0 ? true : false;
 	}
-	
+
 	@Override
 	public List<RouteTimeTable> list() {
 		// TODO Auto-generated method stub
@@ -63,13 +63,18 @@ public class RouteTimeTableServiceImpl implements RouteTimeTableService {
     public RouteTimeTable findByRouteId(String routeId){
         return routeTimeTableDAO.findByRouteId(routeId);
     }
-		
+
 	@Override
 	public Page<RouteTimeTable> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
         Page<RouteTimeTable> page = PageHelper.startPage(1,10).doSelectPage(()->{
             routeTimeTableDAO.search(searchParams,sortList);
         });
-        
+
         return page;
 	}
+
+	@Override
+	public List<RouteTimeTable> findListByRouteId(String routeId) {
+		return routeTimeTableDAO.findListByRouteId(routeId);
+	}
 }

common/src/main/resources/mapper/bus/RouteTimeTable.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- namespace必须指向DAO接口 -->
 <mapper namespace="com.jpsoft.bus.modules.bus.dao.RouteTimeTableDAO">
@@ -81,7 +81,7 @@
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="RouteTimeTableMap">
-		select 
+		select
 id_,name_,sort_,start_time,end_time,route_id,create_by,create_time,update_by,update_time,del_flag		from bus_route_time_table where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
@@ -108,4 +108,11 @@ id_,name_,sort_,start_time,end_time,route_id,create_by,create_time,update_by,upd
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="findListByRouteId" resultMap="RouteTimeTableMap">
+		<![CDATA[
+		select * from bus_route_time_table
+		where del_flag = 0
+		and route_id = #{routeId}
+		]]>
+	</select>
 </mapper>

web/src/main/java/com/jpsoft/bus/modules/mobile/controller/PassengerApiController.java

@@ -65,6 +65,9 @@ public class PassengerApiController {
     @Autowired
     private BaiduService baiduService;
 
+    @Autowired
+    private RouteTimeTableService routeTimeTableService;
+
     @Autowired
     private HelpCenterService helpCenterService;
 
@@ -1317,9 +1320,12 @@ public class PassengerApiController {
 
             List<StationInfo> stationInfoList = stationInfoService.findByRouteId(id);
 
+            //线路时刻表
+            List<RouteTimeTable> routeTimeTableList = routeTimeTableService.findListByRouteId(routeInfo.getId());
 
             Map<String, Object> map = new HashMap<>();
             map.put("routeInfo", routeInfo);
+            map.put("routeTimeTableList",routeTimeTableList);
             map.put("stationInfoList", stationInfoList);