1.ftp上传换成站点路由名称,

2.线路版本更新是带上站点行业编码

1.ftp上传换成站点路由名称,
2.线路版本更新是带上站点行业编码
游瑞烽
1 parent 135aed2f
Showing 3 changed files with 33 additions and 31 deletions
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
@@ -30,11 +30,11 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	// 查询最大ID
 	@Query(value = "SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_sectionroute) k" , nativeQuery=true)
-	public long sectionRouteMaxId();
+	long sectionRouteMaxId();
 	// 查询最大ID
 	@Query(value = "SELECT IFNULL(num,0) as maxId from (SELECT MAX(sectionroute_code) as num FROM bsth_c_sectionroute where line_code = 601010 and directions = 1 and destroy = 0) k" , nativeQuery=true)
-	public int sectionRouteCodeMaxId();
+	int sectionRouteCodeMaxId();
 	/**
 	 * @Description :TODO(查询路段信息)
@@ -173,15 +173,15 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	@Modifying
 	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+1) where line = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
-	public void sectionUpdSectionRouteCode(Integer line,Integer dir,Integer routeCod);
+	void sectionUpdSectionRouteCode(Integer line,Integer dir,Integer routeCod);
 	@Modifying
 	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+1) where line_code = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
-	public void sectionUpdSectionRouteCode(String lineCode,Integer dir,int routeCod);
+	void sectionUpdSectionRouteCode(String lineCode,Integer dir,int routeCod);
 	@Modifying
 	@Query(value="UPDATE bsth_c_sectionroute set destroy = 1 where id = ?1", nativeQuery=true)
-	public void sectionRouteIsDestroyUpdBatch(Integer id);
+	void sectionRouteIsDestroyUpdBatch(Integer id);
 	/**
      * 更新路线前撤销线路原有路段
@@ -191,22 +191,22 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
      */
     @Modifying
     @Query(value="UPDATE bsth_c_sectionroute  set destroy = 1 where line = ?1  and directions = ?2", nativeQuery=true)
-    public void sectionRouteUpdDestroy(Integer line,Integer dir);
+    void sectionRouteUpdDestroy(Integer line,Integer dir);
     @Modifying
     @Query(value="update bsth_c_sectionroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1   ", nativeQuery=true)
-	public void sectionRouteDir(Integer line);
+	void sectionRouteDir(Integer line);
     // 更具线路批量撤销
     @Modifying
     @Query(value="UPDATE SectionRoute sr set sr.destroy = 1 where sr.line.id = ?1  and sr.lineCode = ?2")
-	public void batchUpdate(Integer lineId, String lineCode);
+	void batchUpdate(Integer lineId, String lineCode);
     // 批量删除
     @Modifying
-    @Query(value="delete from SectionRoute sr where sr.line.id = ?1  and sr.lineCode = ?2")
-	public void batchDelete(Integer lineId, String lineCode);
+    @Query(value="delete from SectionRoute sr where sr.lineCode = ?1")
+	void batchDelete(String lineCode);
     @Query("select r from SectionRoute r where r.line.id=?1 and r.directions=?2 and r.destroy=0 order by r.sectionrouteCode")
-	public List<SectionRoute> findByLine(Integer lineId, Integer dir);
+	List<SectionRoute> findByLine(Integer lineId, Integer dir);
 }
@@ -229,12 +229,13 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 				   "a.station_route_code," +
 				   "b.station_cod," +
 				   "a.distances,"+
-				   "s.station_name," +
+				   "a.station_name," +
 				   "a.directions FROM (SELECT " +
 				   "s.station_mark," +
 				   "s.station_route_code," +
 				   "s.directions," +
 				   "s.distances,"+
+					"s.station_name," +
 				   "s.station FROM bsth_c_stationroute s where  s.line = ?1 and s.destroy=0) a " +
 				   "LEFT JOIN bsth_c_station b " +
 				   " on a.station = b.id ORDER BY a.directions ASC ) k ORDER BY k.directions,k.station_route_code ASC", nativeQuery=true)
@@ -499,8 +500,8 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
     // 批量删除    
     @Modifying
-    @Query(value="delete from StationRoute sr where sr.line.id = ?1  and sr.lineCode = ?2")
-	void batchDelete(Integer lineId, String lineCode);
+    @Query(value="delete from StationRoute sr where sr.lineCode = ?1")
+	void batchDelete(String lineCode);
     // 批量修改站点行业编码
@@ -13,6 +13,8 @@ import com.bsth.repository.LineRepository;
 import com.bsth.repository.LineVersionsRepository;
 import com.bsth.repository.LsSectionRouteRepository;
 import com.bsth.repository.LsStationRouteRepository;
+import com.bsth.repository.SectionRouteRepository;
+import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.LineVersionsService;
 import com.bsth.service.SectionRouteService;
 import com.bsth.service.StationRouteService;
@@ -59,12 +61,12 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
     @Autowired
     StationRouteService stationRouteService;
-    
+
     @Autowired
-    com.bsth.repository.SectionRouteRepository  sectionRouteRepository ;
-    
+	SectionRouteRepository sectionRouteRepository ;
+
     @Autowired
-    com.bsth.repository.StationRouteRepository  stationRouteRepository ;
+	StationRouteRepository stationRouteRepository ;
     @Autowired
     LsSectionRouteRepository  lsSectionRouteRepository ;
@@ -136,18 +138,16 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
     		List<LsStationRoute> lsStationRoutes = lsStationRouteRepository.findupdated(lineId, lineCode, versions);
     		if (lsSectionRoutes.size() != 0 && lsStationRoutes.size() != 0) {
     			// 更新
-    			final List<SectionRoute> sectionRoutes = JSONArray.parseArray(JSON.toJSONString(lsSectionRoutes), SectionRoute.class);
-    			final List<StationRoute> stationRoutes = JSONArray.parseArray(JSON.toJSONString(lsStationRoutes), StationRoute.class);
-    			//sectionRouteService.batchUpdate(lineId, lineCode);
-    			//sectionRouteRepository.batchDelete(lineId, lineCode);
-    			
+				final List<StationRoute> stationRoutes = JSONArray.parseArray(JSON.toJSONString(lsStationRoutes), StationRoute.class);
+				final List<SectionRoute> sectionRoutes = JSONArray.parseArray(JSON.toJSONString(lsSectionRoutes), SectionRoute.class);
+
+				// 只能使用jdbc插入，应为历史表同步到当前表的时候，带有id，用jpa会报错
     			jdbcTemplate.update("delete from bsth_c_stationroute where line = ?  and line_code = ?", lineId, lineCode);
-    			
     			String stationSql ="insert into bsth_c_stationroute(id,line,station,station_name,station_route_code,"
     					+ "line_code,station_code,station_mark,directions,distances,to_time,destroy,versions,"
-    					+ "create_date,update_date) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+    					+ "create_date,update_date,industry_code) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
     			jdbcTemplate.batchUpdate(stationSql, new BatchPreparedStatementSetter() {
-					
+
 					@Override
 					public void setValues(PreparedStatement ps, int i) throws SQLException {
 						StationRoute sRoute = stationRoutes.get(i);
@@ -166,9 +166,10 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 						ps.setInt(12, sRoute.getDestroy());
 						ps.setInt(13, sRoute.getVersions());
 						ps.setDate(14, new java.sql.Date(sRoute.getCreateDate().getTime()));
-						ps.setDate(15, new java.sql.Date(sRoute.getUpdateDate().getTime()));						
+						ps.setDate(15, new java.sql.Date(sRoute.getUpdateDate().getTime()));
+						ps.setString(16,sRoute.getIndustryCode());
 					}
-					
+
 					@Override
 					public int getBatchSize() {
 						// TODO Auto-generated method stub
@@ -176,12 +177,12 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 					}
 				} );
     			jdbcTemplate.update("delete from bsth_c_sectionroute where line = ?  and line_code = ?", lineId, lineCode);
-    			
+
     			String sectionSql ="insert into bsth_c_sectionroute(id,line_code,section_code,sectionroute_code,"
     					+ "directions,line,section,create_date,update_date,versions,"
     					+ "destroy) values(?,?,?,?,?,?,?,?,?,?,?)";
     			jdbcTemplate.batchUpdate(sectionSql, new BatchPreparedStatementSetter() {
-					
+
 					@Override
 					public void setValues(PreparedStatement ps, int i) throws SQLException {
 						SectionRoute sRoute = sectionRoutes.get(i);
@@ -197,7 +198,7 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 						ps.setInt(10, sRoute.getVersions());
 						ps.setInt(11, sRoute.getDestroy());
 					}
-					
+
 					@Override
 					public int getBatchSize() {
 						// TODO Auto-generated method stub