Commit 52892fed280a0b25950d57067648a94eeea48d5a

Authored by 潘钊
2 parents 7631c99f 2e8f3701

Merge branch 'jiading' of http://222.66.0.204:8090/panzhaov5/bsth_control into jiading

src/main/java/com/bsth/repository/StationRouteRepository.java
@@ -84,7 +84,7 @@ public interface StationRouteRepository extends BaseRepository<StationRoute, Int @@ -84,7 +84,7 @@ public interface StationRouteRepository extends BaseRepository<StationRoute, Int
84 "r.versions AS 'stationRoute.versions' FROM bsth_c_stationroute r WHERE r.line = ?1 and r.directions = ?2 and r.destroy=0) a " + 84 "r.versions AS 'stationRoute.versions' FROM bsth_c_stationroute r WHERE r.line = ?1 and r.directions = ?2 and r.destroy=0) a " +
85 "LEFT JOIN bsth_c_station b " + 85 "LEFT JOIN bsth_c_station b " +
86 "ON a.`stationRoute.station` = b.id ORDER BY a.`stationRoute.stationRouteCode` ASC", nativeQuery=true) 86 "ON a.`stationRoute.station` = b.id ORDER BY a.`stationRoute.stationRouteCode` ASC", nativeQuery=true)
87 - List<Object[]> findPoints(int line,int directions); 87 + List<Object[]> findPoints(int line, int directions);
88 88
89 @Query("select r from StationRoute r where r.line.id=?1 and r.destroy=0 order by r.directions ASC ,r.stationRouteCode ASC") 89 @Query("select r from StationRoute r where r.line.id=?1 and r.destroy=0 order by r.directions ASC ,r.stationRouteCode ASC")
90 // @Query(value = "SELECT * from bsth_c_stationroute line = ?1 and destroy=0 bsth_c_station ORDER BY directions ASC, stationRouteCode ASC", nativeQuery=true) 90 // @Query(value = "SELECT * from bsth_c_stationroute line = ?1 and destroy=0 bsth_c_station ORDER BY directions ASC, stationRouteCode ASC", nativeQuery=true)
@@ -306,11 +306,11 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int @@ -306,11 +306,11 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
306 306
307 @Modifying 307 @Modifying
308 @Query(value="update bsth_c_stationroute set distances =?2 where id = ?1 ", nativeQuery=true) 308 @Query(value="update bsth_c_stationroute set distances =?2 where id = ?1 ", nativeQuery=true)
309 - public void upddis(Integer id,Double dis); 309 + public void upddis(Integer id, Double dis);
310 310
311 @Modifying 311 @Modifying
312 @Query(value="UPDATE bsth_c_stationroute set station_route_code = (station_route_code+10) where line = ?1 and directions = ?2 and station_route_code >=?3 and destroy = 0", nativeQuery=true) 312 @Query(value="UPDATE bsth_c_stationroute set station_route_code = (station_route_code+10) where line = ?1 and directions = ?2 and station_route_code >=?3 and destroy = 0", nativeQuery=true)
313 - public void stationUpdStationRouteCode(Integer line,Integer dir,Integer routeCod); 313 + public void stationUpdStationRouteCode(Integer line, Integer dir, Integer routeCod);
314 314
315 /** 315 /**
316 * 更新路线前撤销线路原有站点 316 * 更新路线前撤销线路原有站点
@@ -320,7 +320,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int @@ -320,7 +320,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
320 */ 320 */
321 @Modifying 321 @Modifying
322 @Query(value="UPDATE bsth_c_stationroute set destroy = 1 where line = ?1 and directions = ?2", nativeQuery=true) 322 @Query(value="UPDATE bsth_c_stationroute set destroy = 1 where line = ?1 and directions = ?2", nativeQuery=true)
323 - public void stationRouteUpdDestroy(Integer line,Integer dir); 323 + public void stationRouteUpdDestroy(Integer line, Integer dir);
324 324
325 @Modifying 325 @Modifying
326 @Query(value="UPDATE bsth_c_stationroute set destroy = 1 where id = ?1", nativeQuery=true) 326 @Query(value="UPDATE bsth_c_stationroute set destroy = 1 where id = ?1", nativeQuery=true)
@@ -334,7 +334,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int @@ -334,7 +334,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
334 */ 334 */
335 @Modifying 335 @Modifying
336 @Query(value="insert into (select * from bsth_c_stationroute_cache where line = ?1 and directions = ?2) bsth_c_stationroute", nativeQuery=true) 336 @Query(value="insert into (select * from bsth_c_stationroute_cache where line = ?1 and directions = ?2) bsth_c_stationroute", nativeQuery=true)
337 - public void stationRouteUpdate(Integer line,Integer dir); 337 + public void stationRouteUpdate(Integer line, Integer dir);
338 338
339 // 更具线路批量撤销 339 // 更具线路批量撤销
340 @Modifying 340 @Modifying